From 36617cb77d96ace0fb4753dba7ec45e67a702a3b Mon Sep 17 00:00:00 2001
From: Adam Bird <Archez@users.noreply.github.com>
Date: Sat, 4 Nov 2023 17:48:43 -0400
Subject: [PATCH 01/38] fix master sword check not being behind door of time
 and some other logic checks (#3353)

---
 .../location_access/locacc_castle_town.cpp       |  2 +-
 .../locacc_gerudo_training_grounds.cpp           |  2 +-
 .../location_access/locacc_ice_cavern.cpp        | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
index 24fdc8ccb..dab5ceb36 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
@@ -52,7 +52,6 @@ void AreaTable_Init_CastleTown() {
 
   areaTable[TEMPLE_OF_TIME] = Area("Temple of Time", "Temple of Time", TEMPLE_OF_TIME, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(TOT_MASTER_SWORD, {[]{return IsAdult;}}),
                   LocationAccess(TOT_LIGHT_ARROWS_CUTSCENE, {[]{return IsAdult && CanTriggerLACS;}}),
                 }, {
                   //Exits
@@ -65,6 +64,7 @@ void AreaTable_Init_CastleTown() {
                   //EventAccess(&TimeTravel, {[]{return true;}}),
                 }, {
                   //Locations
+                  LocationAccess(TOT_MASTER_SWORD, {[]{return IsAdult;}}),
                   LocationAccess(SHEIK_AT_TEMPLE, {[]{return ForestMedallion && IsAdult;}}),
                 }, {
                   //Exits
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp
index 93ffca145..15a9e4e64 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp
@@ -69,7 +69,7 @@ void AreaTable_Init_GerudoTrainingGrounds() {
 
   areaTable[GERUDO_TRAINING_GROUNDS_HAMMER_ROOM] = Area("Gerudo Training Grounds Hammer Room", "Gerudo Training Grounds", GERUDO_TRAINING_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(GERUDO_TRAINING_GROUNDS_HAMMER_ROOM_CLEAR_CHEST,  {[]{return CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MEGATON_HAMMER);}}),
+                  LocationAccess(GERUDO_TRAINING_GROUNDS_HAMMER_ROOM_CLEAR_CHEST,  {[]{return CanAdultAttack || CanChildAttack;}}),
                   LocationAccess(GERUDO_TRAINING_GROUNDS_HAMMER_ROOM_SWITCH_CHEST, {[]{return CanUse(MEGATON_HAMMER) || (CanTakeDamage && LogicFlamingChests);}}),
                 }, {
                   //Exits
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp
index 551cfc978..a7f74f83c 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp
@@ -13,7 +13,7 @@ void AreaTable_Init_IceCavern() {
   areaTable[ICE_CAVERN_ENTRYWAY] = Area("Ice Cavern Entryway", "Ice Cavern", ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(ICE_CAVERN_BEGINNING,    {[]{return Dungeon::IceCavern.IsVanilla();}}),
-                  Entrance(ICE_CAVERN_MQ_BEGINNING, {[]{return Dungeon::IceCavern.IsMQ() && CanUseProjectile;}}),
+                  Entrance(ICE_CAVERN_MQ_BEGINNING, {[]{return Dungeon::IceCavern.IsMQ();}}),
                   Entrance(ZORAS_FOUNTAIN,          {[]{return true;}}),
   });
 
@@ -24,7 +24,7 @@ void AreaTable_Init_IceCavern() {
   areaTable[ICE_CAVERN_BEGINNING] = Area("Ice Cavern Beginning", "Ice Cavern", ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
                   Entrance(ICE_CAVERN_ENTRYWAY, {[]{return true;}}),
-                  Entrance(ICE_CAVERN_MAIN,     {[]{return Here(ICE_CAVERN_BEGINNING, []{return (CanUse(MASTER_SWORD) || CanUse(KOKIRI_SWORD) || CanUse(BIGGORON_SWORD)) || HasExplosives || CanUse(DINS_FIRE);});}}),
+                  Entrance(ICE_CAVERN_MAIN,     {[]{return Here(ICE_CAVERN_BEGINNING, []{return (CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) || CanUse(RG_MEGATON_HAMMER) || HasExplosives || CanUse(HOOKSHOT) || CanUse(DINS_FIRE);});}}),
   });
 
   areaTable[ICE_CAVERN_MAIN] = Area("Ice Cavern", "Ice Cavern", ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {
@@ -53,7 +53,7 @@ void AreaTable_Init_IceCavern() {
   }, {}, {
                   //Exits
                   Entrance(ICE_CAVERN_ENTRYWAY,             {[]{return true;}}),
-                  Entrance(ICE_CAVERN_MQ_MAP_ROOM,          {[]{return CanUse(MASTER_SWORD) || CanUse(KOKIRI_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(DINS_FIRE) || (HasExplosives && (CanUse(STICKS) || CanUse(SLINGSHOT) || CanUse(BOW)));}}),
+                  Entrance(ICE_CAVERN_MQ_MAP_ROOM,          {[]{return CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MEGATON_HAMMER) || CanUse(DINS_FIRE) || (HasExplosives && (CanUse(KOKIRI_SWORD) || CanUse(STICKS) || CanUse(SLINGSHOT) || CanUse(BOW)));}}),
                   Entrance(ICE_CAVERN_MQ_COMPASS_ROOM,      {[]{return IsAdult && BlueFire;}}),
                   Entrance(ICE_CAVERN_MQ_IRON_BOOTS_REGION, {[]{return BlueFire;}}),
   });
@@ -63,15 +63,15 @@ void AreaTable_Init_IceCavern() {
                   EventAccess(&BlueFireAccess,  {[]{return BlueFireAccess || (HasBottle && CanJumpslash);}}),
   }, {
                   //Locations
-                  LocationAccess(ICE_CAVERN_MQ_MAP_CHEST, {[]{return BlueFire && (CanJumpslash || CanUseProjectile);}}),
+                  LocationAccess(ICE_CAVERN_MQ_MAP_CHEST, {[]{return BlueFire && (CanJumpslash || HasExplosives || CanUseProjectile);}}),
   }, {});
 
   areaTable[ICE_CAVERN_MQ_IRON_BOOTS_REGION] = Area("Ice Cavern MQ Iron Boots Region", "Ice Cavern", ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
-                  LocationAccess(ICE_CAVERN_MQ_IRON_BOOTS_CHEST, {[]{return IsAdult && (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) ;}}),
-                  LocationAccess(SHEIK_IN_ICE_CAVERN,            {[]{return IsAdult;}}),
-                  LocationAccess(ICE_CAVERN_MQ_GS_ICE_BLOCK,     {[]{return (IsAdult && CanJumpslash) || CanUseProjectile;}}),
-                  LocationAccess(ICE_CAVERN_MQ_GS_SCARECROW,     {[]{return (CanUse(SCARECROW) || (HoverBoots && CanUse(LONGSHOT)) || LogicIceMQScarecrow) && IsAdult;}}),
+                  LocationAccess(ICE_CAVERN_MQ_IRON_BOOTS_CHEST, {[]{return IsAdult && (CanJumpslash || CanUse(RG_MEGATON_HAMMER));}}),
+                  LocationAccess(SHEIK_IN_ICE_CAVERN,            {[]{return IsAdult && (CanJumpslash || CanUse(RG_MEGATON_HAMMER));}}),
+                  LocationAccess(ICE_CAVERN_MQ_GS_ICE_BLOCK,     {[]{return CanAdultAttack || CanChildAttack;}}),
+                  LocationAccess(ICE_CAVERN_MQ_GS_SCARECROW,     {[]{return CanUse(SCARECROW) || (HoverBoots && CanUse(LONGSHOT)) || (LogicIceMQScarecrow && IsAdult);}}),
                     //Tricks: (CanUse(SCARECROW) || (HoverBoots && CanUse(LONGSHOT)) || LogicIceMQScarecrow) && IsAdult
   }, {});
 

From 678578823f627dd406b6dbe7d8d2c9dbdeaf624d Mon Sep 17 00:00:00 2001
From: Eric Hoey <121978037+A-Green-Spoon@users.noreply.github.com>
Date: Sat, 4 Nov 2023 17:49:41 -0400
Subject: [PATCH 02/38] Fix preset strings for spocks (#3349)

---
 soh/soh/Enhancements/presets.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/soh/soh/Enhancements/presets.h b/soh/soh/Enhancements/presets.h
index b113c705a..ed639bc1f 100644
--- a/soh/soh/Enhancements/presets.h
+++ b/soh/soh/Enhancements/presets.h
@@ -816,7 +816,7 @@ const std::vector<PresetEntry> spockRacePresetEntries = {
     PRESET_ENTRY_S32("gRandomizeDampeHint", 1),
     PRESET_ENTRY_S32("gRandomizeDoorOfTime", RO_DOOROFTIME_OPEN),
     PRESET_ENTRY_S32("gRandomizeEnableBombchuDrops", 1),
-    PRESET_ENTRY_STRING("gRandomizeExcludedLocations", "78,142,143,228,"),
+    PRESET_ENTRY_STRING("gRandomizeExcludedLocations", "78,143,144,229,"),
     PRESET_ENTRY_S32("gRandomizeForest", RO_FOREST_OPEN),
     PRESET_ENTRY_S32("gRandomizeFullWallets", 1),
     PRESET_ENTRY_S32("gRandomizeGanonTrial", RO_GANONS_TRIALS_SKIP),
@@ -908,7 +908,7 @@ const std::vector<PresetEntry> spockRaceNoLogicPresetEntries = {
     PRESET_ENTRY_S32("gRandomizeDampeHint", 1),
     PRESET_ENTRY_S32("gRandomizeDoorOfTime", RO_DOOROFTIME_OPEN),
     PRESET_ENTRY_S32("gRandomizeEnableBombchuDrops", 1),
-    PRESET_ENTRY_STRING("gRandomizeExcludedLocations", "78,142,143,228,"),
+    PRESET_ENTRY_STRING("gRandomizeExcludedLocations", "78,143,144,229,"),
     PRESET_ENTRY_S32("gRandomizeForest", RO_FOREST_OPEN),
     PRESET_ENTRY_S32("gRandomizeFullWallets", 1),
     PRESET_ENTRY_S32("gRandomizeGanonTrial", RO_GANONS_TRIALS_SKIP),

From 25f05e68b3896439684c4bf8493c52489edcdfa9 Mon Sep 17 00:00:00 2001
From: Adam Bird <Archez@users.noreply.github.com>
Date: Sat, 4 Nov 2023 17:50:28 -0400
Subject: [PATCH 03/38] fix entrance rando validation missing edge cases
 (#3344)

---
 soh/soh/Enhancements/randomizer/3drando/entrance.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/soh/soh/Enhancements/randomizer/3drando/entrance.cpp b/soh/soh/Enhancements/randomizer/3drando/entrance.cpp
index bd308596e..5df67bb87 100644
--- a/soh/soh/Enhancements/randomizer/3drando/entrance.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/entrance.cpp
@@ -1232,6 +1232,11 @@ int ShuffleAllEntrances() {
     }
   }
 
+  // Validate the world one last time to ensure all special conditions are still valid
+  if (!ValidateWorld(nullptr)) {
+    return ENTRANCE_SHUFFLE_FAILURE;
+  }
+
   return ENTRANCE_SHUFFLE_SUCCESS;
 }
 

From 44ee6da0aaa640fad8a38bc160a97adeda6a0214 Mon Sep 17 00:00:00 2001
From: Adam Bird <Archez@users.noreply.github.com>
Date: Sat, 4 Nov 2023 17:52:09 -0400
Subject: [PATCH 04/38] fix quest assignment (#3343)

---
 soh/include/z64save.h                                  |  6 +++---
 soh/soh/Enhancements/boss-rush/BossRush.cpp            |  1 +
 soh/soh/SaveManager.cpp                                | 10 ++++------
 soh/src/code/z_play.c                                  |  2 +-
 soh/src/code/z_sram.c                                  |  9 ++++++++-
 .../gamestates/ovl_file_choose/z_file_choose.c         |  6 ------
 .../misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c       |  3 ---
 7 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/soh/include/z64save.h b/soh/include/z64save.h
index 9458f28c7..c7bee045f 100644
--- a/soh/include/z64save.h
+++ b/soh/include/z64save.h
@@ -279,14 +279,13 @@ typedef struct {
     /* 0x1420 */ s16 worldMapArea;
     /* 0x1422 */ s16 sunsSongState; // controls the effects of suns song
     /* 0x1424 */ s16 healthAccumulator;
-    /* 0x1426 */ u16 pendingSale;
-    /* 0x1428 */ u16 pendingSaleMod;
     // #region SOH [General]
     // Upstream TODO: Move these to their own struct or name to more obviously specific to SoH
+    /*        */ u16 pendingSale;
+    /*        */ u16 pendingSaleMod;
     /*        */ uint8_t questId;
     /*        */ uint32_t isBossRushPaused;
     /*        */ uint8_t bossRushOptions[BOSSRUSH_OPTIONS_AMOUNT];
-    /*        */ u8 mqDungeonCount;
     /*        */ u8 pendingIceTrapCount;
     /*        */ SohStats sohStats;
     /*        */ FaroresWindData backupFW;
@@ -322,6 +321,7 @@ typedef struct {
     /*        */ u32 finalSeed;
     /*        */ u8 seedIcons[5];
     /*        */ u16 randomizerInf[10];
+    /*        */ u8 mqDungeonCount;
     /*        */ u16 adultTradeItems;
     /*        */ u8 triforcePiecesCollected;
     // #endregion
diff --git a/soh/soh/Enhancements/boss-rush/BossRush.cpp b/soh/soh/Enhancements/boss-rush/BossRush.cpp
index 9c5311922..e9d94c503 100644
--- a/soh/soh/Enhancements/boss-rush/BossRush.cpp
+++ b/soh/soh/Enhancements/boss-rush/BossRush.cpp
@@ -291,6 +291,7 @@ void BossRush_InitSave() {
         gSaveContext.playerName[i] = brPlayerName[i];
     }
 
+    gSaveContext.questId = QUEST_BOSSRUSH;
     gSaveContext.isBossRushPaused = 1;
     gSaveContext.entranceIndex = 107;
     gSaveContext.cutsceneIndex = 0x8000;
diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp
index 235a7bd5f..14ab736dc 100644
--- a/soh/soh/SaveManager.cpp
+++ b/soh/soh/SaveManager.cpp
@@ -603,13 +603,11 @@ void SaveManager::InitFileNormal() {
     gSaveContext.backupFW = gSaveContext.fw;
     gSaveContext.pendingSale = ITEM_NONE;
     gSaveContext.pendingSaleMod = MOD_NONE;
+    gSaveContext.isBossRushPaused = 0;
+    gSaveContext.pendingIceTrapCount = 0;
 
-    // Boss Rush is set ahead of time in z_file_choose, otherwise init the save with the normal quest
-    if (IS_BOSS_RUSH) {
-        BossRush_InitSave();
-    } else {
-        gSaveContext.questId = QUEST_NORMAL;
-    }
+    // Init with normal quest unless only an MQ rom is provided
+    gSaveContext.questId = OTRGlobals::Instance->HasOriginal() ? QUEST_NORMAL : QUEST_MASTER;
 
     //RANDOTODO (ADD ITEMLOCATIONS TO GSAVECONTEXT)
 }
diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c
index 112a71888..bf7016884 100644
--- a/soh/src/code/z_play.c
+++ b/soh/src/code/z_play.c
@@ -1202,7 +1202,7 @@ void Play_Update(PlayState* play) {
                 play->gameplayFrames++;
                 // Gameplay stat tracking
                 if (!gSaveContext.sohStats.gameComplete &&
-                    (!IS_BOSS_RUSH || (IS_BOSS_RUSH && !gSaveContext.isBossRushPaused))) {
+                    (!IS_BOSS_RUSH || !gSaveContext.isBossRushPaused)) {
                       gSaveContext.sohStats.playTimer++;
                       gSaveContext.sohStats.sceneTimer++;
                       gSaveContext.sohStats.roomTimer++;
diff --git a/soh/src/code/z_sram.c b/soh/src/code/z_sram.c
index 057460b62..1ce20abc3 100644
--- a/soh/src/code/z_sram.c
+++ b/soh/src/code/z_sram.c
@@ -10,6 +10,8 @@
 
 void Save_LoadFile(void);
 
+void BossRush_InitSave(void);
+
 /**
  *  Initialize new save.
  *  This save has an empty inventory with 3 hearts and single magic.
@@ -33,6 +35,7 @@ void Sram_InitDebugSave(void) {
 
 void Sram_InitBossRushSave(void) {
     Save_InitFile(false);
+    BossRush_InitSave();
 }
 
 /**
@@ -221,11 +224,15 @@ void Sram_InitSave(FileChooseContext* fileChooseCtx) {
 
     gSaveContext.n64ddFlag = fileChooseCtx->n64ddFlag;
 
-    if (fileChooseCtx->questType[fileChooseCtx->buttonIndex] == QUEST_RANDOMIZER &&
+    u8 currentQuest = fileChooseCtx->questType[fileChooseCtx->buttonIndex];
+
+    if (currentQuest == QUEST_RANDOMIZER &&
         strnlen(CVarGetString("gSpoilerLog", ""), 1) != 0) {
         gSaveContext.questId = QUEST_RANDOMIZER;
 
         Randomizer_InitSaveFile();
+    } else if (currentQuest == QUEST_MASTER) {
+        gSaveContext.questId = QUEST_MASTER;
     }
 
     Save_SaveFile();
diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
index 5de6df23d..9c83f9322 100644
--- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
+++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
@@ -1293,8 +1293,6 @@ void FileChoose_UpdateQuestMenu(GameState* thisx) {
     if (CHECK_BTN_ALL(input->press.button, BTN_A)) {
         gSaveContext.questId = this->questType[this->buttonIndex];
 
-        gSaveContext.isBossRushPaused = false;
-
         if (this->questType[this->buttonIndex] == QUEST_BOSSRUSH) {
             Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
             this->prevConfigMode = this->configMode;
@@ -2819,10 +2817,6 @@ void FileChoose_ConfirmFile(GameState* thisx) {
         if (this->confirmButtonIndex == FS_BTN_CONFIRM_YES) {
             func_800AA000(300.0f, 180, 20, 100);
             Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
-            // Reset Boss Rush because it's only ever saved in memory.
-            if (IS_BOSS_RUSH) {
-                gSaveContext.questId = QUEST_NORMAL;
-            }
             this->selectMode = SM_FADE_OUT;
             func_800F6964(0xF);
         } else {
diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
index 87c4a99f5..55a5075a6 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
@@ -4307,9 +4307,6 @@ void KaleidoScope_Update(PlayState* play)
                         osSyncPrintf(VT_RST);
                     } else {
                         play->state.running = 0;
-                        if (IS_BOSS_RUSH) {
-                            gSaveContext.questId = QUEST_NORMAL;
-                        }
                         SET_NEXT_GAMESTATE(&play->state, Opening_Init, OpeningContext);
                         GameInteractor_ExecuteOnExitGame(gSaveContext.fileNum);
                     }

From e88c8e68b62ab0dd488cc8b9901059529f052a60 Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Sat, 4 Nov 2023 14:53:29 -0700
Subject: [PATCH 05/38] [Bugfix] Fixes check tracker crash on max debug file
 creation (#3309)

* Change initialization of `areasSpoiled` to improve utilization and fix crash during max debug file creation.

* Renamed `RCAreaFromSceneID` to `DungeonRCAreasBySceneID` for clarification.
---
 .../randomizer/randomizer_check_tracker.cpp            | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
index 1489b25d2..5f7790dd0 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
@@ -96,7 +96,7 @@ std::map<uint32_t, RandomizerCheck> startingShopItem = { { SCENE_KOKIRI_SHOP, RC
                                                          { SCENE_ZORA_SHOP, RC_ZD_SHOP_ITEM_1 },
                                                          { SCENE_GORON_SHOP, RC_GC_SHOP_ITEM_1 } };
 
-std::map<SceneID, RandomizerCheckArea> RCAreaFromSceneID = {
+std::map<SceneID, RandomizerCheckArea> DungeonRCAreasBySceneID = {
     {SCENE_DEKU_TREE,              RCAREA_DEKU_TREE},
     {SCENE_DODONGOS_CAVERN,        RCAREA_DODONGOS_CAVERN},
     {SCENE_JABU_JABU,              RCAREA_JABU_JABUS_BELLY},
@@ -1157,9 +1157,11 @@ bool IsVisibleInCheckTracker(RandomizerCheckObject rcObj) {
 
 void UpdateInventoryChecks() {
     //For all the areas with compasses, if you have one, spoil the area
-    for (u8 i = SCENE_DEKU_TREE; i <= SCENE_GERUDO_TRAINING_GROUND; i++)
-        if (CHECK_DUNGEON_ITEM(DUNGEON_MAP, i))
-            areasSpoiled |= (1 << RCAreaFromSceneID.at((SceneID)i));
+    for (auto [scene, area] : DungeonRCAreasBySceneID) {
+        if (CHECK_DUNGEON_ITEM(DUNGEON_MAP, scene)) {
+            areasSpoiled |= (1 << area);
+        }
+    }
 }
 
 void UpdateAreaFullyChecked(RandomizerCheckArea area) {

From 02afac704eb44d9655473c583fd722241295e153 Mon Sep 17 00:00:00 2001
From: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Date: Sat, 4 Nov 2023 21:56:03 +0000
Subject: [PATCH 06/38] Force the Sarias Song magic hint to replace all other
 Sarias Song text. (#3296)

---
 soh/soh/Enhancements/custom-message/CustomMessageTypes.h | 4 ++--
 soh/soh/Enhancements/randomizer/randomizer.cpp           | 6 +++---
 soh/soh/OTRGlobals.cpp                                   | 3 +--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/soh/soh/Enhancements/custom-message/CustomMessageTypes.h b/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
index 4ce0db90a..916e1a7f8 100644
--- a/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
+++ b/soh/soh/Enhancements/custom-message/CustomMessageTypes.h
@@ -3,8 +3,8 @@
 typedef enum {
     TEXT_CURSED_SKULLTULA_PEOPLE = 0x22,
     TEXT_SARIAS_SONG_FACE_TO_FACE= 0x160,
-    TEXT_SARIAS_SONG_FOREST_SOUNDS = 0x161,
-    TEXT_SARIAS_SONG_FOREST_TEMPLE = 0x16A,
+    TEXT_SARIAS_SONG_TEXT_START = 0x160,
+    TEXT_SARIAS_SONG_TEXT_END = 0x16D,
     TEXT_SARIA_SFM = 0x10AD,
     TEXT_ITEM_KEY_SMALL = 0x60,
     TEXT_ITEM_DUNGEON_MAP = 0x66,
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index a1f11bc10..8f88a7299 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -486,8 +486,8 @@ void Randomizer::LoadHintLocations(const char* spoilerFileName) {
             "Des grenouilles se trouvant&sous l'eau vous fixent attentivement,&tenant fermement&%g{{item}}%w.", TEXTBOX_TYPE_BLUE)
         );
         CustomMessageManager::Instance->CreateMessage(
-            Randomizer::randoMiscHintsTableID, TEXT_SARIAS_SONG_FOREST_SOUNDS,
-            CustomMessage("{{message}}", "{{message}}", "{{message}}", TEXTBOX_TYPE_BLUE)
+            Randomizer::randoMiscHintsTableID, TEXT_SARIAS_SONG_FACE_TO_FACE,
+            CustomMessage("{{message}}", "{{message}}", "{{message}}", TEXTBOX_TYPE_BLUE) //is this even used?
         );
 
 
@@ -5342,7 +5342,7 @@ CustomMessage Randomizer::GetSheikMessage(s16 scene, u16 originalTextId) {
 }
 
 CustomMessage Randomizer::GetSariaMessage(u16 originalTextId) {
-    if (originalTextId == TEXT_SARIA_SFM || originalTextId == TEXT_SARIAS_SONG_FOREST_SOUNDS || TEXT_SARIAS_SONG_FOREST_TEMPLE) {
+    if (originalTextId == TEXT_SARIA_SFM || (originalTextId >= TEXT_SARIAS_SONG_TEXT_START && originalTextId <= TEXT_SARIAS_SONG_TEXT_END)) {
         CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, TEXT_SARIAS_SONG_FACE_TO_FACE);
         CustomMessage messageEntry2 = messageEntry;
         std::string code = originalTextId == TEXT_SARIA_SFM ? "" : "\x0B";
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index 7262a56e1..f5d4836cd 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -2190,8 +2190,7 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
         } else if (Randomizer_GetSettingValue(RSK_FROGS_HINT) && textId == TEXT_FROGS_UNDERWATER) {
             messageEntry = OTRGlobals::Instance->gRandomizer->GetFrogsMessage(textId);
         } else if (Randomizer_GetSettingValue(RSK_SARIA_HINT)) {
-            if ((gPlayState->sceneNum == SCENE_SACRED_FOREST_MEADOW && textId == TEXT_SARIA_SFM) || textId == TEXT_SARIAS_SONG_FOREST_SOUNDS ||
-                textId == TEXT_SARIAS_SONG_FOREST_TEMPLE) {
+            if ((gPlayState->sceneNum == SCENE_SACRED_FOREST_MEADOW && textId == TEXT_SARIA_SFM) || (textId >= TEXT_SARIAS_SONG_TEXT_START && textId <= TEXT_SARIAS_SONG_TEXT_END)) {
                 messageEntry = OTRGlobals::Instance->gRandomizer->GetSariaMessage(textId);
             }
         }

From 6d8dfe7933b9508eb7b499ae4d1324baa71e5ab6 Mon Sep 17 00:00:00 2001
From: Adam Bird <Archez@users.noreply.github.com>
Date: Sat, 4 Nov 2023 18:08:09 -0400
Subject: [PATCH 07/38] Fix: MQ logic for Ganons Castle main area (#3275)

* fix mq logic for ganons castle main area

* update logic to use logic helpers

* add hammer check

* grouping
---
 soh/soh/Enhancements/randomizer/3drando/keys.hpp |  2 ++
 .../location_access/locacc_ganons_castle.cpp     | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/keys.hpp b/soh/soh/Enhancements/randomizer/3drando/keys.hpp
index e6e36e93d..95d31070e 100644
--- a/soh/soh/Enhancements/randomizer/3drando/keys.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/keys.hpp
@@ -1542,6 +1542,7 @@ typedef enum {
   GERUDO_TRAINING_GROUNDS_MQ_CENTRAL_MAZE_RIGHT,
 
   GANONS_CASTLE_LOBBY,
+  GANONS_CASTLE_MAIN,
   GANONS_CASTLE_DEKU_SCRUBS,
   GANONS_CASTLE_FOREST_TRIAL,
   GANONS_CASTLE_FIRE_TRIAL,
@@ -1552,6 +1553,7 @@ typedef enum {
   GANONS_CASTLE_TOWER,
 
   GANONS_CASTLE_MQ_LOBBY,
+  GANONS_CASTLE_MQ_MAIN,
   GANONS_CASTLE_MQ_DEKU_SCRUBS,
   GANONS_CASTLE_MQ_FOREST_TRIAL,
   GANONS_CASTLE_MQ_FIRE_TRIAL,
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
index fa6ab967b..007276ecb 100644
--- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
@@ -24,7 +24,13 @@ void AreaTable_Init_GanonsCastle() {
   if (Dungeon::GanonsCastle.IsVanilla()) {
   areaTable[GANONS_CASTLE_LOBBY] = Area("Ganon's Castle Lobby", "Ganon's Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(GANONS_CASTLE_ENTRYWAY,     {[]{return true;}}),
+                  Entrance(GANONS_CASTLE_ENTRYWAY, {[]{return true;}}),
+                  Entrance(GANONS_CASTLE_MAIN,     {[]{return true;}}),
+  });
+
+  areaTable[GANONS_CASTLE_MAIN] = Area("Ganon's Castle Main", "Ganon's Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+                  //Exits
+                  Entrance(GANONS_CASTLE_LOBBY,        {[]{return true;}}),
                   Entrance(GANONS_CASTLE_FOREST_TRIAL, {[]{return true;}}),
                   Entrance(GANONS_CASTLE_FIRE_TRIAL,   {[]{return true;}}),
                   Entrance(GANONS_CASTLE_WATER_TRIAL,  {[]{return true;}}),
@@ -123,7 +129,13 @@ void AreaTable_Init_GanonsCastle() {
   if (Dungeon::GanonsCastle.IsMQ()) {
   areaTable[GANONS_CASTLE_MQ_LOBBY] = Area("Ganon's Castle MQ Lobby", "Ganons Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
                   //Exits
-                  Entrance(GANONS_CASTLE_ENTRYWAY,        {[]{return (CanUse(MASTER_SWORD) || (HasExplosives || ((Nuts || Boomerang) && (Sticks || KokiriSword))));}}),
+                  Entrance(GANONS_CASTLE_ENTRYWAY, {[]{return true;}}),
+                  Entrance(GANONS_CASTLE_MQ_MAIN,  {[]{return (CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MEGATON_HAMMER)) || ((HasExplosives || Nuts || CanUse(BOOMERANG)) && CanJumpslash);}}),
+  });
+
+  areaTable[GANONS_CASTLE_MQ_MAIN] = Area("Ganon's Castle MQ Main", "Ganons Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, {
+                  //Exits
+                  Entrance(GANONS_CASTLE_MQ_LOBBY,        {[]{return true;}}),
                   Entrance(GANONS_CASTLE_MQ_FOREST_TRIAL, {[]{return true;}}),
                   Entrance(GANONS_CASTLE_MQ_FIRE_TRIAL,   {[]{return true;}}),
                   Entrance(GANONS_CASTLE_MQ_WATER_TRIAL,  {[]{return true;}}),

From e60761eb614bcd84e6f43b73c705cf22b5c61ebc Mon Sep 17 00:00:00 2001
From: aMannus <mannusmenting@gmail.com>
Date: Sat, 4 Nov 2023 23:30:01 +0100
Subject: [PATCH 08/38] Fix audio editor mistake (#3356)

---
 soh/soh/Enhancements/audio/AudioCollection.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/soh/soh/Enhancements/audio/AudioCollection.cpp b/soh/soh/Enhancements/audio/AudioCollection.cpp
index 63456f748..a5499bd4f 100644
--- a/soh/soh/Enhancements/audio/AudioCollection.cpp
+++ b/soh/soh/Enhancements/audio/AudioCollection.cpp
@@ -114,12 +114,12 @@ AudioCollection::AudioCollection() {
         SEQUENCE_MAP_ENTRY(NA_BGM_STAFF_4,                      "End Credits IV",                           "NA_BGM_STAFF_4",                 SEQ_BGM_EVENT,    false,    false), // Previously SEQ_UNUSED, so not shown anywhere?
         
         // SEQ_INSTRUMENT
-        SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 1,               "Ocarina",                                  "OCARINA_INSTRUMENT_DEFAULT",     SEQ_INSTRUMENT,   true,     false),
-        SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 2,               "Malon",                                    "OCARINA_INSTRUMENT_MALON",       SEQ_INSTRUMENT,   true,     false),
-        SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 3,               "Whistle",                                  "OCARINA_INSTRUMENT_WHISTLE",     SEQ_INSTRUMENT,   true,     false),
-        SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 4,               "Harp",                                     "OCARINA_INSTRUMENT_HARP",        SEQ_INSTRUMENT,   true,     false),
-        SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 5,               "Organ",                                    "OCARINA_INSTRUMENT_GRIND_ORGAN", SEQ_INSTRUMENT,   true,     false),
-        SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 6,               "Flute",                                    "OCARINA_INSTRUMENT_FLUTE",       SEQ_INSTRUMENT,   true,     false),
+        SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 1,               "Ocarina",                                  "OCARINA_INSTRUMENT_DEFAULT",     SEQ_INSTRUMENT,   true,     true),
+        SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 2,               "Malon",                                    "OCARINA_INSTRUMENT_MALON",       SEQ_INSTRUMENT,   true,     true),
+        SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 3,               "Whistle",                                  "OCARINA_INSTRUMENT_WHISTLE",     SEQ_INSTRUMENT,   true,     true),
+        SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 4,               "Harp",                                     "OCARINA_INSTRUMENT_HARP",        SEQ_INSTRUMENT,   true,     true),
+        SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 5,               "Organ",                                    "OCARINA_INSTRUMENT_GRIND_ORGAN", SEQ_INSTRUMENT,   true,     true),
+        SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 6,               "Flute",                                    "OCARINA_INSTRUMENT_FLUTE",       SEQ_INSTRUMENT,   true,     true),
 
         // SEQ_SFX
         SEQUENCE_MAP_ENTRY(NA_SE_EV_SMALL_DOG_BARK,             "Bark",                                     "NA_SE_EV_SMALL_DOG_BARK",        SEQ_SFX,          true,     true),

From 39a7437fc8b0454932c1c1608b8b1ebd0ff4f14f Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Sun, 5 Nov 2023 00:57:59 -0700
Subject: [PATCH 09/38] [Bugfix] Prevent crash in audio editor when shuffling
 over old CVar format (#3337)

* Add a `CVarClear` inside the check for a sequence's lock to get rid of old data.

* Rework all replacement and lock `CVarSetInteger` calls to call a function which checks for previous format with `CVarGet` to know if it needs clearing before setting either the lock or the sequence

* Swapped everything over to a migrator where it loops through the `sequenceMap` and just clears everything from there in "gAudioEditor.ReplacedSequences"
---
 soh/soh/OTRGlobals.cpp            |  1 +
 soh/soh/config/ConfigUpdaters.cpp | 10 +++++++++-
 soh/soh/config/ConfigUpdaters.h   | 16 +++++++++++-----
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index f5d4836cd..a0d785909 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -831,6 +831,7 @@ extern "C" void InitOTR() {
 
     std::shared_ptr<LUS::Config> conf = OTRGlobals::Instance->context->GetConfig(); 
     conf->RegisterConfigVersionUpdater(std::make_shared<LUS::ConfigVersion1Updater>());
+    conf->RegisterConfigVersionUpdater(std::make_shared<LUS::ConfigVersion2Updater>());
     conf->RunVersionUpdates();
 }
 
diff --git a/soh/soh/config/ConfigUpdaters.cpp b/soh/soh/config/ConfigUpdaters.cpp
index c2689e676..1951e78e1 100644
--- a/soh/soh/config/ConfigUpdaters.cpp
+++ b/soh/soh/config/ConfigUpdaters.cpp
@@ -1,7 +1,9 @@
 #include "ConfigUpdaters.h"
+#include "soh/Enhancements/audio/AudioCollection.h"
 
 namespace LUS {
     ConfigVersion1Updater::ConfigVersion1Updater() : ConfigVersionUpdater(1) {}
+    ConfigVersion2Updater::ConfigVersion2Updater() : ConfigVersionUpdater(2) {}
     
     void ConfigVersion1Updater::Update(Config* conf) {
         if (conf->GetInt("Window.Width", 640) == 640) {
@@ -60,4 +62,10 @@ namespace LUS {
         }
         CVarClear("gSeededRandomizedEnemies");
     }
-}
\ No newline at end of file
+
+    void ConfigVersion2Updater::Update(Config* conf) {
+        for (auto seq : AudioCollection::Instance->GetAllSequences()) {
+            CVarClear(std::string("gAudioEditor.ReplacedSequences." + seq.second.sfxKey).c_str());
+        }
+    }
+}
diff --git a/soh/soh/config/ConfigUpdaters.h b/soh/soh/config/ConfigUpdaters.h
index e7f684ae4..cc8f6109a 100644
--- a/soh/soh/config/ConfigUpdaters.h
+++ b/soh/soh/config/ConfigUpdaters.h
@@ -1,9 +1,15 @@
 #include "libultraship/libultraship.h"
 
 namespace LUS {
-class ConfigVersion1Updater : public ConfigVersionUpdater {
-    public:
-    ConfigVersion1Updater();
-    void Update(Config* conf);
-};
+    class ConfigVersion1Updater : public ConfigVersionUpdater {
+        public:
+        ConfigVersion1Updater();
+        void Update(Config* conf);
+    };
+
+    class ConfigVersion2Updater : public ConfigVersionUpdater {
+        public:
+        ConfigVersion2Updater();
+        void Update(Config* conf);
+    };
 }
\ No newline at end of file

From 13a8a1a5ccd07d59c15d22468bbd608ac04ca2bc Mon Sep 17 00:00:00 2001
From: aMannus <mannusmenting@gmail.com>
Date: Sun, 5 Nov 2023 14:54:23 +0100
Subject: [PATCH 10/38] Randomized Enemy Sizes (#3321)

---
 soh/soh/Enhancements/mods.cpp | 34 ++++++++++++++++++++++++++++++++++
 soh/soh/SohMenuBar.cpp        |  3 +++
 2 files changed, 37 insertions(+)

diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index c0bbb3806..008536257 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -1038,6 +1038,39 @@ void RegisterRandomizerSheikSpawn() {
     });
 }
 
+void RegisterRandomizedEnemySizes() {
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorInit>([](void* refActor) {
+        // Randomized Enemy Sizes
+        Player* player = GET_PLAYER(gPlayState);
+        Actor* actor = static_cast<Actor*>(refActor);
+
+        // Only apply to enemies and bosses. Exclude the wobbly platforms in Jabu because they need to act like platforms.
+        if (!CVarGetInteger("gRandomizedEnemySizes", 0) || (actor->category != ACTORCAT_ENEMY && actor->category != ACTORCAT_BOSS) || actor->id == ACTOR_EN_BROB) {
+            return;
+        }
+
+        float randomNumber;
+        float randomScale;
+
+        uint8_t bigActor = rand() % 2;
+
+        // Big actor. Dodongo and Volvagia are always smaller because they're impossible when bigger.
+        if (bigActor && actor->id != ACTOR_BOSS_DODONGO && actor->id != ACTOR_BOSS_FD &&
+            actor->id != ACTOR_BOSS_FD2) {
+            randomNumber = rand() % 200;
+            // Between 100% and 300% size.
+            randomScale = 1.0f + (randomNumber / 100);
+        // Small actor
+        } else {
+            randomNumber = rand() % 90;
+            // Between 10% and 100% size.
+            randomScale = 0.1f + (randomNumber / 100);
+        }
+
+        Actor_SetScale(actor, actor->scale.z * randomScale);
+    });
+}
+
 void InitMods() {
     RegisterTTS();
     RegisterInfiniteMoney();
@@ -1065,5 +1098,6 @@ void InitMods() {
     RegisterEnemyDefeatCounts();
     RegisterAltTrapTypes();
     RegisterRandomizerSheikSpawn();
+    RegisterRandomizedEnemySizes();
     NameTag_RegisterHooks();
 }
diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp
index 2a52006a4..dd202d02a 100644
--- a/soh/soh/SohMenuBar.cpp
+++ b/soh/soh/SohMenuBar.cpp
@@ -1115,6 +1115,9 @@ void DrawEnhancementsMenu() {
                 "- Random (Seeded): Enemies are randomized based on the current randomizer seed/file\n"
             );
 
+            UIWidgets::PaddedEnhancementCheckbox("Randomized Enemy Sizes", "gRandomizedEnemySizes", true, false);
+            UIWidgets::Tooltip("Enemies and Bosses spawn with random sizes.");
+
             UIWidgets::PaddedEnhancementCheckbox("Ivan the Fairy (Coop Mode)", "gIvanCoopModeEnabled", true, false);
             UIWidgets::Tooltip("Enables Ivan the Fairy upon the next map change. Player 2 can control Ivan and "
                                 "press the C-Buttons to use items and mess with Player 1!");

From 7e9efeeadb80a48279cc5744e323b1844a8cda95 Mon Sep 17 00:00:00 2001
From: Adam Bird <Archez@users.noreply.github.com>
Date: Sun, 5 Nov 2023 12:34:39 -0500
Subject: [PATCH 11/38] [OTR Archive] Store soh version in OTR files and verify
 on launch/ask to regenerate (#3218)

* parse sohver arg and store version file in otr

* parse args for soh.otr gen only

* pass soh version from built in extractor

* update launch scripts, cmake and extract steps to pass soh version

* check otr versions and error or ask to regenerate

* add wiiu core header for osfatal

* review feedback

* remove soh dummy version for lus change instead

* only configure linux script for linux

* change lus commit

* rename soh version to port version

* fix submodules

* bump OTRExporter

* clean up error messages for switch/wiiu

* strings not char array

* typo

* init wiiu before otr detection

* Add message for mac/linux extraction

* remove unneeded exits

* change version number types to u16 to fix 32bit devices

* bump otrexporter
---
 CMake/Packaging-2.cmake                      |   3 +-
 CMakeLists.txt                               |   6 +-
 OTRExporter                                  |   2 +-
 scripts/linux/appimage/{soh.sh => soh.sh.in} |   2 +-
 soh/CMakeLists.txt                           |   5 +
 soh/include/variables.h                      |   6 +-
 soh/macosx/{soh-macos.sh => soh-macos.sh.in} |   2 +-
 soh/soh/Extractor/Extract.cpp                |  11 +-
 soh/soh/OTRGlobals.cpp                       | 168 +++++++++++++++++--
 soh/src/boot/build.c.in                      |   9 +-
 10 files changed, 187 insertions(+), 27 deletions(-)
 rename scripts/linux/appimage/{soh.sh => soh.sh.in} (98%)
 rename soh/macosx/{soh-macos.sh => soh-macos.sh.in} (99%)

diff --git a/CMake/Packaging-2.cmake b/CMake/Packaging-2.cmake
index 3525ae1e4..38fcc59f3 100644
--- a/CMake/Packaging-2.cmake
+++ b/CMake/Packaging-2.cmake
@@ -24,7 +24,6 @@ if (CPACK_GENERATOR MATCHES "Bundle")
     set(CPACK_BUNDLE_NAME "soh")
     set(CPACK_BUNDLE_PLIST "macosx/Info.plist")
     set(CPACK_BUNDLE_ICON "macosx/soh.icns")
-    set(CPACK_BUNDLE_STARTUP_COMMAND "../soh/macosx/soh-macos.sh")
+    set(CPACK_BUNDLE_STARTUP_COMMAND "macosx/soh-macos.sh")
     set(CPACK_BUNDLE_APPLE_CERT_APP "-")
 endif()
-
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 92ddc528d..ee27c1e02 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,7 +97,7 @@ set_property(TARGET soh PROPERTY APPIMAGE_DESKTOP_FILE "${CMAKE_SOURCE_DIR}/scri
 set_property(TARGET soh PROPERTY APPIMAGE_ICON_FILE "${CMAKE_BINARY_DIR}/sohIcon.png")
 
 if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
-install(PROGRAMS "${CMAKE_SOURCE_DIR}/scripts/linux/appimage/soh.sh" DESTINATION . COMPONENT appimage)
+install(PROGRAMS "${CMAKE_BINARY_DIR}/linux/soh.sh" DESTINATION . COMPONENT appimage)
 install(FILES "${CMAKE_SOURCE_DIR}/soh.otr" DESTINATION . COMPONENT ship)
 install(TARGETS ZAPD DESTINATION ./assets/extractor COMPONENT extractor)
 install(DIRECTORY "${CMAKE_SOURCE_DIR}/soh/assets/extractor/" DESTINATION ./assets/extractor COMPONENT extractor)
@@ -124,7 +124,7 @@ add_custom_target(
     ExtractAssets
     # CMake versions prior to 3.17 do not have the rm command, use remove instead for older versions
     COMMAND ${CMAKE_COMMAND} -E $<IF:$<VERSION_LESS:${CMAKE_VERSION},3.17>,remove,rm> -f oot.otr oot-mq.otr soh.otr
-    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter/extract_assets.py -z "$<TARGET_FILE:ZAPD>" --non-interactive --xml-root ../soh/assets/xml --custom-otr-file soh.otr "--custom-assets-path" ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom
+    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter/extract_assets.py -z "$<TARGET_FILE:ZAPD>" --non-interactive --xml-root ../soh/assets/xml --custom-otr-file soh.otr "--custom-assets-path" ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom --port-ver "${CMAKE_PROJECT_VERSION}"
     COMMAND ${CMAKE_COMMAND} -DSYSTEM_NAME=${CMAKE_SYSTEM_NAME} -DTARGET_DIR="$<TARGET_FILE_DIR:ZAPD>" -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DBINARY_DIR=${CMAKE_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/copy-existing-otrs.cmake
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter
     COMMENT "Running asset extraction..."
@@ -146,7 +146,7 @@ add_custom_target(
     GenerateSohOtr
     # CMake versions prior to 3.17 do not have the rm command, use remove instead for older versions
     COMMAND ${CMAKE_COMMAND} -E $<IF:$<VERSION_LESS:${CMAKE_VERSION},3.17>,remove,rm> -f soh.otr
-    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter/extract_assets.py -z "$<TARGET_FILE:ZAPD>" --norom --custom-otr-file soh.otr "--custom-assets-path" ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom
+    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter/extract_assets.py -z "$<TARGET_FILE:ZAPD>" --norom --custom-otr-file soh.otr "--custom-assets-path" ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom --port-ver "${CMAKE_PROJECT_VERSION}"
     COMMAND ${CMAKE_COMMAND} -DSYSTEM_NAME=${CMAKE_SYSTEM_NAME} -DTARGET_DIR="$<TARGET_FILE_DIR:ZAPD>" -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DBINARY_DIR=${CMAKE_BINARY_DIR} -DONLYSOHOTR=On -P ${CMAKE_CURRENT_SOURCE_DIR}/copy-existing-otrs.cmake
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter
     COMMENT "Generating soh.otr..."
diff --git a/OTRExporter b/OTRExporter
index f1bc0a726..cde9a3b65 160000
--- a/OTRExporter
+++ b/OTRExporter
@@ -1 +1 @@
-Subproject commit f1bc0a726813d7e70ad471fdebd080e6fd77996a
+Subproject commit cde9a3b655570370e4ed4928e8c9f3a0f631c52e
diff --git a/scripts/linux/appimage/soh.sh b/scripts/linux/appimage/soh.sh.in
similarity index 98%
rename from scripts/linux/appimage/soh.sh
rename to scripts/linux/appimage/soh.sh.in
index 0e8414ac0..bfc3cfec6 100644
--- a/scripts/linux/appimage/soh.sh
+++ b/scripts/linux/appimage/soh.sh.in
@@ -171,7 +171,7 @@ while [[ (! -e "$SHIP_HOME"/oot.otr) || (! -e "$SHIP_HOME"/oot-mq.otr) ]]; do
                     else
                         echo "Processing..."
                     fi
-                    assets/extractor/ZAPD.out ed -eh -i assets/extractor/xmls/"${ROM}" -b tmp/rom.z64 -fl assets/extractor/filelists -o placeholder -osf placeholder -gsf 1 -rconf assets/extractor/Config_"${ROM}".xml -se OTR --otrfile "${OTRNAME}" > /dev/null 2>&1
+                    assets/extractor/ZAPD.out ed -eh -i assets/extractor/xmls/"${ROM}" -b tmp/rom.z64 -fl assets/extractor/filelists -o placeholder -osf placeholder -gsf 1 -rconf assets/extractor/Config_"${ROM}".xml -se OTR --otrfile "${OTRNAME}" --portVer "@CMAKE_PROJECT_VERSION@" > /dev/null 2>&1
                     cp "$ASSETDIR"/"$OTRNAME" "$SHIP_HOME"
                 fi
             else
diff --git a/soh/CMakeLists.txt b/soh/CMakeLists.txt
index 647c491f8..fd0c6ac25 100644
--- a/soh/CMakeLists.txt
+++ b/soh/CMakeLists.txt
@@ -757,11 +757,16 @@ INSTALL(FILES $<TARGET_PDB_FILE:soh> DESTINATION ./debug COMPONENT ship)
 INSTALL(FILES ${CMAKE_BINARY_DIR}/soh/soh.otr DESTINATION . COMPONENT ship)
 endif()
 
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/../scripts/linux/appimage/soh.sh.in ${CMAKE_BINARY_DIR}/linux/soh.sh @ONLY)
+endif()
+
 find_program(CURL NAMES curl DOC "Path to the curl program.  Used to download files.")
 execute_process(COMMAND ${CURL} -sSfL https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt -o ${CMAKE_BINARY_DIR}/gamecontrollerdb.txt OUTPUT_VARIABLE RESULT)
 
 if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
 configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/macosx/Info.plist.in ${CMAKE_BINARY_DIR}/macosx/Info.plist @ONLY)
+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/macosx/soh-macos.sh.in ${CMAKE_BINARY_DIR}/macosx/soh-macos.sh @ONLY)
 INSTALL(FILES ${CMAKE_BINARY_DIR}/gamecontrollerdb.txt DESTINATION ../MacOS COMPONENT ship)
 INSTALL(FILES ${CMAKE_BINARY_DIR}/soh/soh.otr DESTINATION ../Resources COMPONENT ship)
 elseif(NOT "${CMAKE_SYSTEM_NAME}" MATCHES "NintendoSwitch|CafeOS")
diff --git a/soh/include/variables.h b/soh/include/variables.h
index 200080bfa..2bad8335c 100644
--- a/soh/include/variables.h
+++ b/soh/include/variables.h
@@ -46,9 +46,9 @@ extern "C"
 	extern OSViMode osViModeFpalLan1;
 	extern u32 __additional_scanline;
 	extern u8 gBuildVersion[];
-	extern s16 gBuildVersionMajor;
-	extern s16 gBuildVersionMinor;
-	extern s16 gBuildVersionPatch;
+	extern u16 gBuildVersionMajor;
+	extern u16 gBuildVersionMinor;
+	extern u16 gBuildVersionPatch;
     extern u8 gBuildTeam[];
 	extern u8 gBuildDate[];
 	extern u8 gBuildMakeOption[];
diff --git a/soh/macosx/soh-macos.sh b/soh/macosx/soh-macos.sh.in
similarity index 99%
rename from soh/macosx/soh-macos.sh
rename to soh/macosx/soh-macos.sh.in
index 4b5871892..177e309f4 100755
--- a/soh/macosx/soh-macos.sh
+++ b/soh/macosx/soh-macos.sh.in
@@ -229,7 +229,7 @@ if [ ! -e "$SHIP_HOME"/oot.otr ] || [ ! -e "$SHIP_HOME"/oot-mq.otr ]; then
 		fi
 
 		osascript -e 'display notification "Generating OTR..." with title "Ship Of Harkinian"'
-		assets/extractor/ZAPD.out ed -i assets/extractor/xmls/"${ROM}" -b tmp/rom.z64 -fl assets/extractor/filelists -o placeholder -osf placeholder -gsf 1 -rconf assets/extractor/Config_"${ROM}".xml -se OTR
+		assets/extractor/ZAPD.out ed -i assets/extractor/xmls/"${ROM}" -b tmp/rom.z64 -fl assets/extractor/filelists -o placeholder -osf placeholder -gsf 1 -rconf assets/extractor/Config_"${ROM}".xml -se OTR --portVer "@CMAKE_PROJECT_VERSION@"
 		if [ -e "$ASSETDIR"/oot.otr ]; then
 			osascript -e 'display notification "OTR successfully generated" with title "Ship Of Harkinian"'
 			cp "$ASSETDIR"/oot.otr "$SHIP_HOME"/"$OTRNAME"
diff --git a/soh/soh/Extractor/Extract.cpp b/soh/soh/Extractor/Extract.cpp
index c79d26dad..4769c48f6 100644
--- a/soh/soh/Extractor/Extract.cpp
+++ b/soh/soh/Extractor/Extract.cpp
@@ -7,6 +7,7 @@
 #include "Extract.h"
 #include "portable-file-dialogs.h"
 #include <Utils/BitConverter.h>
+#include "variables.h"
 
 #ifdef unix
 #include <dirent.h>
@@ -557,9 +558,10 @@ std::string Extractor::Mkdtemp() {
 extern "C" int zapd_main(int argc, char** argv);
 
 bool Extractor::CallZapd(std::string installPath, std::string exportdir) {
-    constexpr int argc = 16;
+    constexpr int argc = 18;
     char xmlPath[1024];
     char confPath[1024];
+    char portVersion[18]; // 5 digits for int16_max (x3) + separators + terminator
     std::array<const char*, argc> argv;
     const char* version = GetZapdVerStr();
     const char* otrFile = IsMasterQuest() ? "oot-mq.otr" : "oot.otr";
@@ -581,6 +583,7 @@ bool Extractor::CallZapd(std::string installPath, std::string exportdir) {
 
     snprintf(xmlPath, 1024, "assets/extractor/xmls/%s", version);
     snprintf(confPath, 1024, "assets/extractor/Config_%s.xml", version);
+    snprintf(portVersion, 18, "%d.%d.%d", gBuildVersionMajor, gBuildVersionMinor, gBuildVersionPatch);
 
     argv[0] = "ZAPD";
     argv[1] = "ed";
@@ -598,6 +601,8 @@ bool Extractor::CallZapd(std::string installPath, std::string exportdir) {
     argv[13] = "OTR";
     argv[14] = "--otrfile";
     argv[15] = otrFile;
+    argv[16] = "--portVer";
+    argv[17] = portVersion;
 
 #ifdef _WIN32
     // Grab a handle to the command window.
@@ -606,6 +611,9 @@ bool Extractor::CallZapd(std::string installPath, std::string exportdir) {
     // Normally the command window is hidden. We want the window to be shown here so the user can see the progess of the extraction.
     ShowWindow(cmdWindow, SW_SHOW);
     SetWindowPos(cmdWindow, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);
+#else
+    // Show extraction in background message until linux/mac can have visual progress
+    SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_INFORMATION, "Extracting", "Extraction will now begin in the background.\n\nPlease be patient for the process to finish. Do not close the main program.", nullptr);
 #endif
 
     zapd_main(argc, (char**)argv.data());
@@ -623,4 +631,3 @@ bool Extractor::CallZapd(std::string installPath, std::string exportdir) {
 
     return 0;
 }
-
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index a0d785909..b96b364dd 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -66,6 +66,7 @@
 #include <port/switch/SwitchImpl.h>
 #elif defined(__WIIU__)
 #include <port/wiiu/WiiUImpl.h>
+#include <coreinit/debug.h> // OSFatal
 #endif
 
 
@@ -743,15 +744,156 @@ extern "C" void OTRExtScanner() {
     }
 }
 
+typedef struct {
+    uint16_t major;
+    uint16_t minor;
+    uint16_t patch;
+} OTRVersion;
+
+// Read the port version from an OTR file
+OTRVersion ReadPortVersionFromOTR(std::string otrPath) {
+    OTRVersion version = {};
+
+    // Use a temporary archive instance to load the otr and read the version file
+    auto archive = std::make_shared<LUS::Archive>(otrPath, "", std::unordered_set<uint32_t>(), false);
+    if (archive->IsMainMPQValid()) {
+        auto t = archive->LoadFile("portVersion", false);
+        if (t != nullptr && t->IsLoaded) {
+            auto stream = std::make_shared<LUS::MemoryStream>(t->Buffer.data(), t->Buffer.size());
+            auto reader = std::make_shared<LUS::BinaryReader>(stream);
+            LUS::Endianness endianness = (LUS::Endianness)reader->ReadUByte();
+            reader->SetEndianness(endianness);
+            version.major = reader->ReadUInt16();
+            version.minor = reader->ReadUInt16();
+            version.patch = reader->ReadUInt16();
+        }
+    }
+
+    archive = nullptr;
+
+    return version;
+}
+
+// Check that a soh.otr exists and matches the version of soh running
+// Otherwise show a message and exit
+void CheckSoHOTRVersion(std::string otrPath) {
+    std::string msg;
+
+#if defined(__SWITCH__)
+    msg = "\x1b[4;2HPlease re-extract it from the download."
+                       "\x1b[6;2HPress the Home button to exit...";
+#elif defined(__WIIU__)
+    msg = "Please extract the soh.otr from the Ship of Harkinian download\nto your folder.\n\nPress and hold the power button to shutdown...";
+#else
+    msg = "Please extract the soh.otr from the Ship of Harkinian download to your folder.\n\nExiting...";
+#endif
+
+    if (!std::filesystem::exists(otrPath)) {
+#if not defined(__SWITCH__) && not defined(__WIIU__)
+        Extractor::ShowErrorBox("soh.otr file is missing", msg.c_str());
+        exit(1);
+#elif defined(__SWITCH__)
+        LUS::Switch::PrintErrorMessageToScreen(("\x1b[2;2HYou are missing the soh.otr file." + msg).c_str());
+#elif defined(__WIIU__)
+        OSFatal(("You are missing the soh.otr file\n\n" + msg).c_str());
+#endif
+    }
+
+    OTRVersion otrVersion = ReadPortVersionFromOTR(otrPath);
+
+    if (otrVersion.major != gBuildVersionMajor || otrVersion.minor != gBuildVersionMinor || otrVersion.patch != gBuildVersionPatch) {
+#if not defined(__SWITCH__) && not defined(__WIIU__)
+        Extractor::ShowErrorBox("soh.otr file version does not match", msg.c_str());
+        exit(1);
+#elif defined(__SWITCH__)
+        LUS::Switch::PrintErrorMessageToScreen(("\x1b[2;2HYou have an old soh.otr file." + msg).c_str());
+#elif defined(__WIIU__)
+        OSFatal(("You have an old soh.otr file\n\n" + msg).c_str());
+#endif
+    }
+}
+
+// Checks the program version stored in the otr and compares the major value to soh
+// For Windows/Mac/Linux if the version doesn't match, offer to 
+void DetectOTRVersion(std::string fileName, bool isMQ) {
+    bool isOtrOld = false;
+    std::string otrPath = LUS::Context::LocateFileAcrossAppDirs(fileName, appShortName);
+
+    // Doesn't exist so nothing to do here
+    if (!std::filesystem::exists(otrPath)) {
+        return;
+    }
+
+    OTRVersion otrVersion = ReadPortVersionFromOTR(otrPath);
+
+    if (otrVersion.major != gBuildVersionMajor) {
+        isOtrOld = true;
+    }
+
+    if (isOtrOld) {
+#if not defined(__SWITCH__) && not defined(__WIIU__)
+        char msgBuf[250];
+        char version[18]; // 5 digits for int16_max (x3) + separators + terminator
+
+        if (otrVersion.major != 0 || otrVersion.minor != 0 || otrVersion.patch != 0) {
+            snprintf(version, 18, "%d.%d.%d", otrVersion.major, otrVersion.minor, otrVersion.patch);
+        } else {
+            snprintf(version, 18, "no version found");
+        }
+
+        snprintf(msgBuf, 250,
+            "The %s file was generated with a different version of Ship of Harkinian.\nOTR version: %s\n\n"
+            "You must regenerate to be able to play, otherwise the program will exit.\nWould you like to regenerate it now?",
+            fileName.c_str(), version);
+
+        if (Extractor::ShowYesNoBox("Old OTR File Found", msgBuf) == IDYES) {
+            std::string installPath = LUS::Context::GetAppBundlePath();
+            if (!std::filesystem::exists(installPath + "/assets/extractor")) {
+                Extractor::ShowErrorBox("Extractor assets not found",
+                    "Unable to regenerate. Missing assets/extractor folder needed to generate OTR file.\n\nExiting...");
+                exit(1);
+            }
+
+            Extractor extract;
+            if (!extract.Run(isMQ ? RomSearchMode::MQ : RomSearchMode::Vanilla)) {
+                Extractor::ShowErrorBox("Error", "An error occured, no OTR file was generated.\n\nExiting...");
+                exit(1);
+            }
+            extract.CallZapd(installPath, LUS::Context::GetAppDirectoryPath(appShortName));
+        } else {
+            exit(1);
+        }
+
+#elif defined(__SWITCH__)
+        LUS::Switch::PrintErrorMessageToScreen("\x1b[2;2HYou've launched the Ship with an old game OTR file."
+                                               "\x1b[4;2HPlease regenerate a new game OTR and relaunch."
+                                               "\x1b[6;2HPress the Home button to exit...");
+#elif defined(__WIIU__)
+        OSFatal("You've launched the Ship with an old a game OTR file.\n\n"
+                "Please generate a game OTR and relaunch.\n\n"
+                "Press and hold the Power button to shutdown...");
+#endif
+    }
+}
+
 extern "C" void InitOTR() {
-#if not defined (__SWITCH__) && not defined(__WIIU__)
+
+#ifdef __SWITCH__
+    LUS::Switch::Init(LUS::PreInitPhase);
+#elif defined(__WIIU__)
+    LUS::WiiU::Init(appShortName);
+#endif
+
+    CheckSoHOTRVersion(LUS::Context::GetPathRelativeToAppBundle("soh.otr"));
+
     if (!std::filesystem::exists(LUS::Context::LocateFileAcrossAppDirs("oot-mq.otr", appShortName)) &&
         !std::filesystem::exists(LUS::Context::LocateFileAcrossAppDirs("oot.otr", appShortName))){
 
+#if not defined(__SWITCH__) && not defined(__WIIU__)
         std::string installPath = LUS::Context::GetAppBundlePath();
         if (!std::filesystem::exists(installPath + "/assets/extractor")) {
             Extractor::ShowErrorBox("Extractor assets not found",
-                "No OTR files found. Missing assets/extractor folder needed to generate OTR file. Exiting...");
+                "No OTR files found. Missing assets/extractor folder needed to generate OTR file.\n\nExiting...");
             exit(1);
         }
 
@@ -759,7 +901,7 @@ extern "C" void InitOTR() {
         if (Extractor::ShowYesNoBox("No OTR Files", "No OTR files found. Generate one now?") == IDYES) {
             Extractor extract;
             if (!extract.Run()) {
-                Extractor::ShowErrorBox("Error", "An error occured, no OTR file was generated. Exiting...");
+                Extractor::ShowErrorBox("Error", "An error occured, no OTR file was generated.\n\nExiting...");
                 exit(1);
             }
             extract.CallZapd(installPath, LUS::Context::GetAppDirectoryPath(appShortName));
@@ -770,19 +912,25 @@ extern "C" void InitOTR() {
         if (Extractor::ShowYesNoBox("Extraction Complete", "ROM Extracted. Extract another?") == IDYES) {
             Extractor extract;
             if (!extract.Run(generatedOtrIsMQ ? RomSearchMode::Vanilla : RomSearchMode::MQ)) {
-                Extractor::ShowErrorBox("Error", "An error occured, an OTR file may have been generated by a different step. Continuing...");
+                Extractor::ShowErrorBox("Error", "An error occured, an OTR file may have been generated by a different step.\n\nContinuing...");
             } else {
                 extract.CallZapd(installPath, LUS::Context::GetAppDirectoryPath(appShortName));
             }
         }
-    }
-#endif
 
-#ifdef __SWITCH__
-    LUS::Switch::Init(LUS::PreInitPhase);
+#elif defined(__SWITCH__)
+        LUS::Switch::PrintErrorMessageToScreen("\x1b[2;2HYou've launched the Ship without a game OTR file."
+                                               "\x1b[4;2HPlease generate a game OTR and relaunch."
+                                               "\x1b[6;2HPress the Home button to exit...");
 #elif defined(__WIIU__)
-    LUS::WiiU::Init("soh");
+        OSFatal("You've launched the Ship without a game OTR file.\n\n"
+                "Please generate a game OTR and relaunch.\n\n"
+                "Press and hold the Power button to shutdown...");
 #endif
+    }
+
+    DetectOTRVersion("oot.otr", false);
+    DetectOTRVersion("oot-mq.otr", true);
 
     OTRGlobals::Instance = new OTRGlobals();
     CustomMessageManager::Instance = new CustomMessageManager();
@@ -2276,4 +2424,4 @@ extern "C" void Gfx_RegisterBlendedTexture(const char* name, u8* mask, u8* repla
 
 extern "C" void CheckTracker_OnMessageClose() {
     CheckTracker::CheckTrackerDialogClosed();
-}
\ No newline at end of file
+}
diff --git a/soh/src/boot/build.c.in b/soh/src/boot/build.c.in
index f4c2899cf..4fc6a17f4 100644
--- a/soh/src/boot/build.c.in
+++ b/soh/src/boot/build.c.in
@@ -1,8 +1,9 @@
+#include <libultraship/libultra.h>
+
 const char gBuildVersion[] = "@PROJECT_BUILD_NAME@ (@CMAKE_PROJECT_VERSION_MAJOR@.@CMAKE_PROJECT_VERSION_MINOR@.@CMAKE_PROJECT_VERSION_PATCH@)";
-const int gBuildVersionMajor = @CMAKE_PROJECT_VERSION_MAJOR@;
-const int gBuildVersionMinor = @CMAKE_PROJECT_VERSION_MINOR@;
-const int gBuildVersionPatch = @CMAKE_PROJECT_VERSION_PATCH@;
+const u16 gBuildVersionMajor = @CMAKE_PROJECT_VERSION_MAJOR@;
+const u16 gBuildVersionMinor = @CMAKE_PROJECT_VERSION_MINOR@;
+const u16 gBuildVersionPatch = @CMAKE_PROJECT_VERSION_PATCH@;
 const char gBuildTeam[] = "@PROJECT_TEAM@";
 const char gBuildDate[] = __DATE__ " " __TIME__;
 const char gBuildMakeOption[] = "";
-

From f1f04a55833212969ecd7e9d6dc4134d13e61cf0 Mon Sep 17 00:00:00 2001
From: Adam Bird <Archez@users.noreply.github.com>
Date: Sun, 5 Nov 2023 13:06:21 -0500
Subject: [PATCH 12/38] Add TTS for Game Over menu (#3338)

---
 .../accessibility/texts/kaleidoscope_eng.json |  2 +
 .../accessibility/texts/kaleidoscope_fra.json |  4 +-
 .../accessibility/texts/kaleidoscope_ger.json |  4 +-
 soh/soh/Enhancements/tts/tts.cpp              | 62 +++++++++++++++++++
 4 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/soh/assets/custom/accessibility/texts/kaleidoscope_eng.json b/soh/assets/custom/accessibility/texts/kaleidoscope_eng.json
index 10b016b32..a89c12889 100644
--- a/soh/assets/custom/accessibility/texts/kaleidoscope_eng.json
+++ b/soh/assets/custom/accessibility/texts/kaleidoscope_eng.json
@@ -12,6 +12,8 @@
     "equipped": "$0 - Equipped",
     "save_prompt": "Would you like to save?",
     "game_saved": "Game saved",
+    "game_over": "Game Over",
+    "continue_game": "Continue playing?",
     "assigned_to": "Assigned to $0",
     "0": "Deku Stick - $0",
     "1": "Deku Nut - $0",
diff --git a/soh/assets/custom/accessibility/texts/kaleidoscope_fra.json b/soh/assets/custom/accessibility/texts/kaleidoscope_fra.json
index 820eb4cbc..116c19a41 100644
--- a/soh/assets/custom/accessibility/texts/kaleidoscope_fra.json
+++ b/soh/assets/custom/accessibility/texts/kaleidoscope_fra.json
@@ -10,8 +10,10 @@
     "equip_menu": "Equipment",
     "overworld": "Surmonde",
     "equipped": "$0 - Équipé",
-    "save_prompt": "Voulez-vous sauvegarder?",
+    "save_prompt": "Voulez-vous sauvegarder ?",
     "game_saved": "Jeu sauvegardé",
+    "game_over": "Game Over",
+    "continue_game": "Continuer la partie ?",
     "assigned_to": "Assigné au $0",
     "0": "Bâton Mojo - $0",
     "1": "Noix Mojo - $0",
diff --git a/soh/assets/custom/accessibility/texts/kaleidoscope_ger.json b/soh/assets/custom/accessibility/texts/kaleidoscope_ger.json
index 630d933fc..649790da3 100644
--- a/soh/assets/custom/accessibility/texts/kaleidoscope_ger.json
+++ b/soh/assets/custom/accessibility/texts/kaleidoscope_ger.json
@@ -10,8 +10,10 @@
     "equip_menu": "Ausrüstung",
     "overworld": "Überwelt",
     "equipped": "$0 - Ausgerüstet",
-    "save_prompt": "Spielstand sichern?",
+    "save_prompt": "Spielstand sichern ?",
     "game_saved": "Spielstand gesichert",
+    "game_over": "Game Over",
+    "continue_game": "Spiel fortsetzen ?",
     "assigned_to": "$0 zugeordnet",
     "0": "Deku-Stab - $0",
     "1": "Deku-Nuß - $0",
diff --git a/soh/soh/Enhancements/tts/tts.cpp b/soh/soh/Enhancements/tts/tts.cpp
index 0fde40656..0b46cd18f 100644
--- a/soh/soh/Enhancements/tts/tts.cpp
+++ b/soh/soh/Enhancements/tts/tts.cpp
@@ -228,6 +228,68 @@ void RegisterOnKaleidoscopeUpdateHook() {
             return;
         }
 
+        // Game over + prompts
+        if (pauseCtx->state >= 0xC && pauseCtx->state <= 0x10) {
+            // Reset prompt tracker after state change
+            if (prevState != pauseCtx->state) {
+                prevPromptChoice = -1;
+            }
+
+            switch (pauseCtx->state) {
+                // Game over in full alpha
+                case 0xC: {
+                    // Fire once on state change
+                    if (prevState != pauseCtx->state) {
+                        auto translation = GetParameritizedText("game_over", TEXT_BANK_KALEIDO, nullptr);
+                        SpeechSynthesizer::Instance->Speak(translation.c_str(), GetLanguageCode());
+                    }
+                    break;
+                }
+                // Prompt for save
+                case 0xE: {
+                    if (prevPromptChoice != pauseCtx->promptChoice) {
+                        auto prompt = GetParameritizedText(pauseCtx->promptChoice == 0 ? "yes" : "no", TEXT_BANK_MISC, nullptr);
+                        if (prevPromptChoice == -1) {
+                            auto translation = GetParameritizedText("save_prompt", TEXT_BANK_KALEIDO, nullptr);
+                            SpeechSynthesizer::Instance->Speak((translation + " - " + prompt).c_str(), GetLanguageCode());
+                        } else {
+                            SpeechSynthesizer::Instance->Speak(prompt.c_str(), GetLanguageCode());
+                        }
+
+                        prevPromptChoice = pauseCtx->promptChoice;
+                    }
+                    break;
+                }
+                // Game saved
+                case 0xF: {
+                    // Fire once on state change
+                    if (prevState != pauseCtx->state) {
+                        auto translation = GetParameritizedText("game_saved", TEXT_BANK_KALEIDO, nullptr);
+                        SpeechSynthesizer::Instance->Speak(translation.c_str(), GetLanguageCode());
+                    }
+                    break;
+                }
+                // Prompt to continue playing
+                case 0x10: {
+                    if (prevPromptChoice != pauseCtx->promptChoice) {
+                        auto prompt = GetParameritizedText(pauseCtx->promptChoice == 0 ? "yes" : "no", TEXT_BANK_MISC, nullptr);
+                        if (prevPromptChoice == -1) {
+                            auto translation = GetParameritizedText("continue_game", TEXT_BANK_KALEIDO, nullptr);
+                            SpeechSynthesizer::Instance->Speak((translation + " - " + prompt).c_str(), GetLanguageCode());
+                        } else {
+                            SpeechSynthesizer::Instance->Speak(prompt.c_str(), GetLanguageCode());
+                        }
+
+                        prevPromptChoice = pauseCtx->promptChoice;
+                    }
+                    break;
+                }
+            }
+
+            prevState = pauseCtx->state;
+            return;
+        }
+
         // Announce page when
         // Kaleido pages are rotating and page halfway rotated
         // Or Kaleido was just opened

From 127f2651df145f1ded52ced4f6cd1d7d47c66132 Mon Sep 17 00:00:00 2001
From: krm01 <krm01@users.noreply.github.com>
Date: Sun, 5 Nov 2023 10:07:44 -0800
Subject: [PATCH 13/38] vanilla bugfix for wall climbing on edge of polys
 (#3358)

* vanilla bugfix for wall climbing on edge of polys

* rename missed vars

* add CVar toggle
---
 soh/soh/SohMenuBar.cpp                        |  2 +
 .../actors/ovl_player_actor/z_player.c        | 49 +++++++++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp
index dd202d02a..fb2ef050d 100644
--- a/soh/soh/SohMenuBar.cpp
+++ b/soh/soh/SohMenuBar.cpp
@@ -1047,6 +1047,8 @@ void DrawEnhancementsMenu() {
                                 "Fixes an incorrect calculation that acted like water underneath ground was above it.");
             UIWidgets::PaddedEnhancementCheckbox("Fix Bush Item Drops", "gBushDropFix", true, false);
             UIWidgets::Tooltip("Fixes the bushes to drop items correctly rather than spawning undefined items.");
+            UIWidgets::PaddedEnhancementCheckbox("Fix falling from vine edges", "gFixVineFall", true, false); 
+            UIWidgets::Tooltip("Prevents immediately falling off climbable surfaces if climbing on the edges."); 
 
             ImGui::EndMenu();
         }
diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c
index 556b8ccd5..09e33f2e4 100644
--- a/soh/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c
@@ -10101,6 +10101,55 @@ void func_80847BA0(PlayState* play, Player* this) {
 
         D_808535F0 = func_80041DB8(&play->colCtx, this->actor.wallPoly, this->actor.wallBgId);
 
+        if (CVarGetInteger("gFixVineFall", 0)) {
+            /* This fixes the "started climbing a wall and then immediately fell off" bug.
+            * The main idea is if a climbing wall is detected, double-check that it will
+            * still be valid once climbing begins by doing a second raycast with a small
+            * margin to make sure it still hits a climbable poly. Then update the flags
+            * in D_808535F0 again and proceed as normal.
+            */
+            if (D_808535F0 & 8) {
+                Vec3f checkPosA;
+                Vec3f checkPosB;
+                f32 yawCos;
+                f32 yawSin;
+                s32 hitWall;
+
+                /* Angle the raycast slightly out towards the side based on the angle of
+                * attack the player takes coming at the climb wall. This is necessary because
+                * the player's XZ position actually wobbles very slightly while climbing
+                * due to small rounding errors in the sin/cos lookup tables. This wobble
+                * can cause wall checks while climbing to be slightly left or right of
+                * the wall check to start the climb. By adding this buffer it accounts for
+                * any possible wobble. The end result is the player has to be further than
+                * some epsilon distance from the edge of the climbing poly to actually
+                * start the climb. I divide it by 2 to make that epsilon slightly smaller,
+                * mainly for visuals. Using the full sp9A leaves a noticeable gap on
+                * the edges that can't be climbed. But with the half distance it looks like
+                * the player is climbing right on the edge, and still works.
+                */
+                yawCos = Math_CosS(this->actor.wallYaw - (sp9A / 2) + 0x8000);
+                yawSin = Math_SinS(this->actor.wallYaw - (sp9A / 2) + 0x8000);
+                checkPosA.x = this->actor.world.pos.x + (-20.0f * yawSin);
+                checkPosA.z = this->actor.world.pos.z + (-20.0f * yawCos);
+                checkPosB.x = this->actor.world.pos.x + (50.0f * yawSin);
+                checkPosB.z = this->actor.world.pos.z + (50.0f * yawCos);
+                checkPosB.y = checkPosA.y = this->actor.world.pos.y + 26.0f;
+
+                hitWall = BgCheck_EntityLineTest1(&play->colCtx, &checkPosA, &checkPosB,
+                    &D_80858AA8, &spA0, true, false, false, true, &sp9C);
+
+                if (hitWall) {
+                    this->actor.wallPoly = spA0;
+                    this->actor.wallBgId = sp9C;
+                    this->actor.wallYaw = Math_Atan2S(spA0->normal.z, spA0->normal.x);
+                    sp9A = this->actor.shape.rot.y - (s16)(this->actor.wallYaw + 0x8000);
+
+                    D_808535F0 = func_80041DB8(&play->colCtx, this->actor.wallPoly, this->actor.wallBgId);
+                }
+            }
+        }
+
         D_80853608 = ABS(sp9A);
 
         sp9A = this->currentYaw - (s16)(this->actor.wallYaw + 0x8000);

From ecafa871952d72127427354ab0c2506596c2dab9 Mon Sep 17 00:00:00 2001
From: Caladius <Caladius@users.noreply.github.com>
Date: Sun, 5 Nov 2023 19:53:46 -0500
Subject: [PATCH 14/38] Updates from Feedback, Wallet size affects reduction
 rate and wider range of interval options. (#3335)

---
 soh/soh/Enhancements/mods.cpp | 3 ++-
 soh/soh/SohMenuBar.cpp        | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index 008536257..6d66ff055 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -369,7 +369,8 @@ void RegisterRupeeDash() {
         if (rupeeDashTimer >= rdmTime) {
             rupeeDashTimer = 0;
             if (gSaveContext.rupees > 0) {
-                Rupees_ChangeBy(-1);
+                uint16_t walletSize = (CUR_UPG_VALUE(UPG_WALLET) + 1) * -1;
+                Rupees_ChangeBy(walletSize);
             } else {
                 Health_ChangeBy(gPlayState, -16);
             }
diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp
index fb2ef050d..ceccb1173 100644
--- a/soh/soh/SohMenuBar.cpp
+++ b/soh/soh/SohMenuBar.cpp
@@ -1129,7 +1129,7 @@ void DrawEnhancementsMenu() {
 
             if (CVarGetInteger("gRupeeDash", 0)) {
                 UIWidgets::PaddedEnhancementSliderInt(
-                    "Rupee Dash Interval: %d", "##DashInterval", "gDashInterval", 3, 5, "", 5, true, true, false,
+                    "Rupee Dash Interval: %d", "##DashInterval", "gDashInterval", 1, 10, "", 5, true, true, false,
                     !CVarGetInteger("gRupeeDash", 0),
                     "This option is disabled because \"Rupee Dash Mode\" is turned off");
                 UIWidgets::Tooltip("Interval between Rupee reduction in Rupee Dash Mode");

From 87458818158313580cb74405d04a3fbce7bd408e Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Sun, 5 Nov 2023 19:21:44 -0700
Subject: [PATCH 15/38] Add UI scaling combobox with 4 options (one smaller
 than default, two larger) and experimental tag. (#3037)

---
 soh/soh/OTRGlobals.cpp | 35 +++++++++++++++++++++++++++++++++++
 soh/soh/OTRGlobals.h   | 15 +++++++++++++++
 soh/soh/SohMenuBar.cpp | 10 ++++++++++
 3 files changed, 60 insertions(+)

diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index b96b364dd..c9dc1aa07 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -46,6 +46,7 @@
 #include "variables.h"
 #include "z64.h"
 #include "macros.h"
+#include "Fonts.h"
 #include <Utils/StringHelper.h>
 #include "Enhancements/custom-message/CustomMessageManager.h"
 
@@ -129,6 +130,8 @@ Color_RGB8 kokiriColor = { 0x1E, 0x69, 0x1B };
 Color_RGB8 goronColor = { 0x64, 0x14, 0x00 };
 Color_RGB8 zoraColor = { 0x00, 0xEC, 0x64 };
 
+float previousImGuiScale;
+
 // Same as NaviColor type from OoT src (z_actor.c), but modified to be sans alpha channel for Controller LED.
 typedef struct {
     Color_RGB8 inner;
@@ -298,6 +301,12 @@ OTRGlobals::OTRGlobals() {
 
     hasMasterQuest = hasOriginal = false;
 
+    previousImGuiScale = defaultImGuiScale;
+    defaultFontSmaller = CreateDefaultFontWithSize(10.0f);
+    defaultFontLarger = CreateDefaultFontWithSize(16.0f);
+    defaultFontLargest = CreateDefaultFontWithSize(20.0f);
+    ScaleImGui();
+
     // Move the camera strings from read only memory onto the heap (writable memory)
     // This is in OTRGlobals right now because this is a place that will only ever be run once at the beginning of startup.
     // We should probably find some code in db_camera that does initialization and only run once, and then dealloc on deinitialization.
@@ -352,6 +361,32 @@ OTRGlobals::OTRGlobals() {
 OTRGlobals::~OTRGlobals() {
 }
 
+void OTRGlobals::ScaleImGui() {
+    float scale = imguiScaleOptionToValue[CVarGetInteger("gImGuiScale", defaultImGuiScale)];
+    float newScale = scale / previousImGuiScale;
+    ImGui::GetStyle().ScaleAllSizes(newScale);
+    ImGui::GetIO().FontGlobalScale = scale;
+    previousImGuiScale = scale;
+}
+
+ImFont* OTRGlobals::CreateDefaultFontWithSize(float size) {
+    auto mImGuiIo = &ImGui::GetIO();
+    ImFontConfig fontCfg = ImFontConfig();
+    fontCfg.OversampleH = fontCfg.OversampleV = 1;
+    fontCfg.PixelSnapH = true;
+    fontCfg.SizePixels = size;
+    ImFont* font = mImGuiIo->Fonts->AddFontDefault(&fontCfg);
+    // FontAwesome fonts need to have their sizes reduced by 2.0f/3.0f in order to align correctly
+    float iconFontSize = size * 2.0f / 3.0f;
+    static const ImWchar sIconsRanges[] = { ICON_MIN_FA, ICON_MAX_16_FA, 0 };
+    ImFontConfig iconsConfig;
+    iconsConfig.MergeMode = true;
+    iconsConfig.PixelSnapH = true;
+    iconsConfig.GlyphMinAdvanceX = iconFontSize;
+    mImGuiIo->Fonts->AddFontFromMemoryCompressedBase85TTF(fontawesome_compressed_data_base85, iconFontSize, &iconsConfig, sIconsRanges);
+    return font;
+}
+
 bool OTRGlobals::HasMasterQuest() {
     return hasMasterQuest;
 }
diff --git a/soh/soh/OTRGlobals.h b/soh/soh/OTRGlobals.h
index b24f59d8b..82659dbc4 100644
--- a/soh/soh/OTRGlobals.h
+++ b/soh/soh/OTRGlobals.h
@@ -21,6 +21,14 @@
 const std::string customMessageTableID = "BaseGameOverrides";
 const std::string appShortName = "soh";
 
+#ifdef __WIIU__
+const uint32_t defaultImGuiScale = 3;
+#else
+const uint32_t defaultImGuiScale = 1;
+#endif
+
+const float imguiScaleOptionToValue[4] = { 0.75f, 1.0f, 1.5f, 2.0f };
+
 class OTRGlobals
 {
 public:
@@ -30,8 +38,14 @@ public:
     std::shared_ptr<SaveStateMgr> gSaveStateMgr;
     std::shared_ptr<Randomizer> gRandomizer;
 
+    ImFont* defaultFontSmaller;
+    ImFont* defaultFontLarger;
+    ImFont* defaultFontLargest;
+
     OTRGlobals();
     ~OTRGlobals();
+    
+    void ScaleImGui();
 
     bool HasMasterQuest();
     bool HasOriginal();
@@ -42,6 +56,7 @@ private:
 	void CheckSaveFile(size_t sramSize) const;
     bool hasMasterQuest;
     bool hasOriginal;
+    ImFont* CreateDefaultFontWithSize(float size);
 };
 
 uint32_t IsGameMasterQuest();
diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp
index ceccb1173..a5fc12299 100644
--- a/soh/soh/SohMenuBar.cpp
+++ b/soh/soh/SohMenuBar.cpp
@@ -51,6 +51,8 @@ std::string GetWindowButtonText(const char* text, bool menuOpen) {
     return buttonText;
 }
 
+static const char* imguiScaleOptions[4] = { "Small", "Normal", "Large", "X-Large" };
+
     static const char* filters[3] = {
 #ifdef __WIIU__
             "",
@@ -380,7 +382,15 @@ void DrawSettingsMenu() {
             }
 
             UIWidgets::PaddedSeparator(true, true, 3.0f, 3.0f);
+            ImGui::Text("ImGui Menu Scale");
+            ImGui::SameLine();
+            ImGui::TextColored({ 0.85f, 0.35f, 0.0f, 1.0f }, "(Experimental)");
+            if (UIWidgets::EnhancementCombobox("gImGuiScale", imguiScaleOptions, 1)) {
+                OTRGlobals::Instance->ScaleImGui();
+            }
+            UIWidgets::Tooltip("Changes the scaling of the ImGui menu elements.");
 
+            UIWidgets::PaddedSeparator(true, true, 3.0f, 3.0f);
             
             static std::unordered_map<LUS::WindowBackend, const char*> windowBackendNames = {
                 { LUS::WindowBackend::DX11, "DirectX" },

From 8e00265ff81bf7fe6852b4cb7f1d6ffd521b13b0 Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Sun, 5 Nov 2023 20:04:21 -0700
Subject: [PATCH 16/38] Add checks to Windows for running in temp directory
 (running from archive), and proper file permissions (write/modify, to prevent
 things like Program Files or Windows, or other folders we couldn't know about
 that don't have proper file permissions). Instructs users as to what it
 discovered and how to fix, then exits. (#3097)

---
 soh/soh/OTRGlobals.cpp | 50 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index c9dc1aa07..7f0d8c5d6 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -911,6 +911,20 @@ void DetectOTRVersion(std::string fileName, bool isMQ) {
     }
 }
 
+bool IsSubpath(const std::filesystem::path& path, const std::filesystem::path& base) {
+    auto rel = std::filesystem::relative(path, base);
+    return !rel.empty() && rel.native()[0] != '.';
+}
+
+bool PathTestCleanup(FILE* tfile) {
+    try {
+        if (std::filesystem::exists("./text.txt")) std::filesystem::remove("./text.txt");
+        if (std::filesystem::exists("./test/")) std::filesystem::remove("./test/");
+    }
+    catch (std::filesystem::filesystem_error const& ex) { return false; }
+    return true;
+}
+
 extern "C" void InitOTR() {
 
 #ifdef __SWITCH__
@@ -918,6 +932,42 @@ extern "C" void InitOTR() {
 #elif defined(__WIIU__)
     LUS::WiiU::Init(appShortName);
 #endif
+   #ifdef _WIN32
+    char* tempVar = getenv("TEMP");
+    std::filesystem::path tempPath;
+    try {
+        tempPath = std::filesystem::canonical(tempVar);
+    } catch (std::filesystem::filesystem_error const& ex) {
+        std::string userPath = getenv("USERPROFILE");
+        userPath.append("\\AppData\\Local\\Temp");
+        tempPath = std::filesystem::canonical(userPath);
+    }
+    wchar_t buffer[MAX_PATH];
+    GetModuleFileName(NULL, buffer, _countof(buffer));
+    auto ownPath = std::filesystem::canonical(buffer).parent_path();
+    if (IsSubpath(ownPath, tempPath)) {
+        Extractor::ShowErrorBox("Error", "SoH is running in a temp folder. Extract the .zip and run again.");
+        exit(1);
+    }
+    FILE* tfile = fopen("./text.txt", "w");
+    std::filesystem::path tfolder = std::filesystem::path("./test/");
+    bool error = false;
+    try {
+        create_directories(tfolder);
+    } catch (std::filesystem::filesystem_error const& ex) {
+        error = true;
+    }
+    if (tfile == NULL || error) {
+        Extractor::ShowErrorBox("Error", "SoH does not have proper file permissions. Please move it to a folder that does and run again.");
+        PathTestCleanup(tfile);
+        exit(1);
+    }
+    fclose(tfile);
+    if (!PathTestCleanup(tfile)) {
+        Extractor::ShowErrorBox("Error", "SoH does not have proper file permissions. Please move it to a folder that does and run again.");
+        exit(1);
+    }
+#endif
 
     CheckSoHOTRVersion(LUS::Context::GetPathRelativeToAppBundle("soh.otr"));
 

From 8b78cb832abdc8e764122f5de7c348f190cf20f1 Mon Sep 17 00:00:00 2001
From: inspectredc <78732756+inspectredc@users.noreply.github.com>
Date: Mon, 6 Nov 2023 04:33:51 +0000
Subject: [PATCH 17/38] items tied to items rather than slots + dpad items now
 work (#2884)

---
 .../actors/ovl_En_Partner/z_en_partner.c      | 82 +++++++++----------
 1 file changed, 40 insertions(+), 42 deletions(-)

diff --git a/soh/src/overlays/actors/ovl_En_Partner/z_en_partner.c b/soh/src/overlays/actors/ovl_En_Partner/z_en_partner.c
index bfd4dfbbe..8780ab10c 100644
--- a/soh/src/overlays/actors/ovl_En_Partner/z_en_partner.c
+++ b/soh/src/overlays/actors/ovl_En_Partner/z_en_partner.c
@@ -510,58 +510,60 @@ void UseItem(uint8_t usedItem, u8 started, Actor* thisx, PlayState* play) {
 
     if (this->usedItem != 0xFF && this->itemTimer <= 0) {
         switch (usedItem) {
-            case SLOT_STICK:
+            case ITEM_STICK:
                 UseDekuStick(this, play, started);
                 break;
-            case SLOT_BOMB:
+            case ITEM_BOMB:
                 UseBombs(this, play, started);
                 break;
-            case SLOT_BOMBCHU:
+            case ITEM_BOMBCHU:
                 UseBombchus(this, play, started);
                 break;
-            case SLOT_NUT:
+            case ITEM_NUT:
                 UseNuts(this, play, started);
                 break;
-            case SLOT_BOW:
+            case ITEM_BOW:
                 UseBow(this, play, started, 0);
                 break;
-            case SLOT_ARROW_FIRE:
+            case ITEM_ARROW_FIRE:
                 UseBow(this, play, started, 1);
                 break;
-            case SLOT_ARROW_ICE:
+            case ITEM_ARROW_ICE:
                 UseBow(this, play, started, 2);
                 break;
-            case SLOT_ARROW_LIGHT:
+            case ITEM_ARROW_LIGHT:
                 UseBow(this, play, started, 3);
                 break;
-            case SLOT_SLINGSHOT:
+            case ITEM_SLINGSHOT:
                 UseSlingshot(this, play, started);
                 break;
-            case SLOT_OCARINA:
+            case ITEM_OCARINA_FAIRY:
+            case ITEM_OCARINA_TIME:
                 UseOcarina(this, play, started);
                 break;
-            case SLOT_HOOKSHOT:
+            case ITEM_HOOKSHOT:
+            case ITEM_LONGSHOT:
                 UseHookshot(this, play, started);
                 break;
-            case SLOT_DINS_FIRE:
+            case ITEM_DINS_FIRE:
                 UseSpell(this, play, started, 1);
                 break;
-            case SLOT_NAYRUS_LOVE:
+            case ITEM_NAYRUS_LOVE:
                 UseSpell(this, play, started, 2);
                 break;
-            case SLOT_FARORES_WIND:
+            case ITEM_FARORES_WIND:
                 UseSpell(this, play, started, 3);
                 break;
-            case SLOT_HAMMER:
+            case ITEM_HAMMER:
                 UseHammer(this, play, started);
                 break;
-            case SLOT_BOOMERANG:
+            case ITEM_BOOMERANG:
                 UseBoomerang(this, play, started);
                 break;
-            case SLOT_LENS:
+            case ITEM_LENS:
                 UseLens(this, play, started);
                 break;
-            case SLOT_BEAN:
+            case ITEM_BEAN:
                 UseBeans(this, play, started);
                 break;
         }
@@ -685,39 +687,35 @@ void EnPartner_Update(Actor* thisx, PlayState* play) {
         uint8_t released = 0;
         uint8_t current = 0;
 
+        uint16_t partnerButtons[7] = { BTN_CLEFT, BTN_CDOWN, BTN_CRIGHT, BTN_DUP, BTN_DDOWN, BTN_DLEFT, BTN_DRIGHT};
+        uint8_t buttonMax = 3;
+        if (CVarGetInteger("gDpadEquips", 0) != 0) {
+            buttonMax = ARRAY_COUNT(gSaveContext.equips.cButtonSlots);
+        }
+
         if (this->usedItem == 0xFF && this->itemTimer <= 0) {
-            if (CHECK_BTN_ALL(sControlInput.press.button, BTN_CLEFT)) {
-                this->usedItem = gSaveContext.equips.cButtonSlots[0];
-                this->usedItemButton = 0;
-                pressed = 1;
-            } else if (CHECK_BTN_ALL(sControlInput.press.button, BTN_CDOWN)) {
-                this->usedItem = gSaveContext.equips.cButtonSlots[1];
-                this->usedItemButton = 1;
-                pressed = 1;
-            } else if (CHECK_BTN_ALL(sControlInput.press.button, BTN_CRIGHT)) {
-                this->usedItem = gSaveContext.equips.cButtonSlots[2];
-                this->usedItemButton = 2;
-                pressed = 1;
+            for (uint8_t i = 0; i < buttonMax; i++) {
+                if (CHECK_BTN_ALL(sControlInput.press.button, partnerButtons[i])) {
+                    this->usedItem = gSaveContext.equips.buttonItems[i+1];
+                    this->usedItemButton = i;
+                    pressed = 1;
+                }
             }
         }
 
         if (this->usedItem != 0xFF) {
-            if (CHECK_BTN_ALL(sControlInput.cur.button, BTN_CLEFT) && this->usedItemButton == 0) {
-                current = 1;
-            } else if (CHECK_BTN_ALL(sControlInput.cur.button, BTN_CDOWN) && this->usedItemButton == 1) {
-                current = 1;
-            } else if (CHECK_BTN_ALL(sControlInput.cur.button, BTN_CRIGHT) && this->usedItemButton == 2) {
-                current = 1;
+            for (uint8_t i = 0; i < buttonMax; i++) {
+                if (CHECK_BTN_ALL(sControlInput.cur.button, partnerButtons[i]) && this->usedItemButton == i) {
+                    current = 1;
+                }
             }
         }
 
         if (this->usedItem != 0xFF) {
-            if (CHECK_BTN_ALL(sControlInput.rel.button, BTN_CLEFT) && this->usedItemButton == 0) {
-                released = 1;
-            } else if (CHECK_BTN_ALL(sControlInput.rel.button, BTN_CDOWN) && this->usedItemButton == 1) {
-                released = 1;
-            } else if (CHECK_BTN_ALL(sControlInput.rel.button, BTN_CRIGHT) && this->usedItemButton == 2) {
-                released = 1;
+            for (uint8_t i = 0; i < buttonMax; i++) {
+                if (CHECK_BTN_ALL(sControlInput.rel.button, partnerButtons[i]) && this->usedItemButton == i) {
+                    released = 1;
+                }
             }
         }
 

From 460b3d02f501904ba0a1e77af8d523534cd42e62 Mon Sep 17 00:00:00 2001
From: Adam Bird <Archez@users.noreply.github.com>
Date: Mon, 6 Nov 2023 17:44:49 -0500
Subject: [PATCH 18/38] [OTR Archive] Move shared scenes out of nonmq/mq
 folders (#3191)

* share common scenes between mq and nonmq

* move shared scenes under shared folder and bring back thieves hideout mq handling

* update headers for shared scenes

* bump submodules

* remove mq handling for mirror world song patch

* only have unique dungeons be nomq/mq variants

* bump submodules
---
 OTRExporter                                   |   2 +-
 ZAPDTR                                        |   2 +-
 .../gameplay_dangeon_keep.h                   | 138 +--
 .../objects/gameplay_keep/gameplay_keep.h     |  24 +-
 soh/assets/objects/object_am/object_am.h      |  77 +-
 soh/assets/objects/object_ani/object_ani.h    |   5 +-
 .../objects/object_anubice/object_anubice.h   |  53 +-
 .../objects/object_blkobj/object_blkobj.h     |  96 +-
 soh/assets/objects/object_box/object_box.h    |   5 +-
 soh/assets/objects/object_bv/object_bv.h      | 221 ++---
 .../object_demo_kekkai/object_demo_kekkai.h   |  96 +-
 soh/assets/objects/object_dnk/object_dnk.h    |  29 +-
 soh/assets/objects/object_dns/object_dns.h    |  29 +-
 soh/assets/objects/object_fd/object_fd.h      | 161 ++--
 soh/assets/objects/object_fd2/object_fd2.h    |  65 +-
 soh/assets/objects/object_fhg/object_fhg.h    | 120 +--
 soh/assets/objects/object_fw/object_fw.h      |   5 +-
 .../objects/object_geldb/object_geldb.h       |  95 +-
 .../object_gi_boots_2/object_gi_boots_2.h     |   6 +-
 .../object_gi_butterfly/object_gi_butterfly.h |   6 +-
 .../object_gi_clothes/object_gi_clothes.h     |   6 +-
 .../object_gi_dekupouch/object_gi_dekupouch.h |  12 +-
 .../objects/object_gi_fire/object_gi_fire.h   |  12 +-
 .../objects/object_gi_frog/object_gi_frog.h   |   6 +-
 .../object_gi_gerudo/object_gi_gerudo.h       |   6 +-
 .../object_gi_gerudomask.h                    |  12 +-
 .../objects/object_gi_ghost/object_gi_ghost.h |  12 +-
 .../object_gi_gloves/object_gi_gloves.h       |   6 +-
 .../object_gi_golonmask/object_gi_golonmask.h |  12 +-
 .../object_gi_hoverboots.h                    |   8 +-
 .../object_gi_ki_tan_mask.h                   |   6 +-
 .../object_gi_letter/object_gi_letter.h       |  12 +-
 .../object_gi_liquid/object_gi_liquid.h       |  18 +-
 .../objects/object_gi_map/object_gi_map.h     |   6 +-
 .../objects/object_gi_milk/object_gi_milk.h   |   6 +-
 .../object_gi_niwatori/object_gi_niwatori.h   |  12 +-
 .../objects/object_gi_nuts/object_gi_nuts.h   |   6 +-
 .../object_gi_ocarina/object_gi_ocarina.h     |   6 +-
 .../object_gi_ocarina_0/object_gi_ocarina_0.h |   6 +-
 .../object_gi_prescription.h                  |   6 +-
 .../objects/object_gi_purse/object_gi_purse.h |   6 +-
 .../object_gi_rabit_mask.h                    |   6 +-
 .../object_gi_shield_1/object_gi_shield_1.h   |   6 +-
 .../object_gi_shield_3/object_gi_shield_3.h   |  12 +-
 .../object_gi_soldout/object_gi_soldout.h     |   6 +-
 .../objects/object_gi_soul/object_gi_soul.h   |   6 +-
 .../object_gi_ticketstone.h                   |  12 +-
 .../object_gi_truth_mask.h                    |  12 +-
 .../object_gi_zoramask/object_gi_zoramask.h   |  12 +-
 soh/assets/objects/object_gj/object_gj.h      |  60 +-
 soh/assets/objects/object_gnd/object_gnd.h    |   6 +-
 soh/assets/objects/object_gr/object_gr.h      |  65 +-
 .../object_hakach_objects.h                   |   6 +-
 .../object_hidan_objects.h                    | 120 +--
 .../objects/object_hintnuts/object_hintnuts.h |  35 +-
 .../object_horse_ganon/object_horse_ganon.h   |  66 +-
 .../object_horse_link_child.h                 |  54 +-
 .../object_horse_normal/object_horse_normal.h |  48 +-
 .../object_horse_zelda/object_horse_zelda.h   |  72 +-
 .../objects/object_jya_obj/object_jya_obj.h   |  42 +-
 .../objects/object_link_boy/object_link_boy.h |  47 +-
 .../object_masterkokirihead.h                 |  12 +-
 soh/assets/objects/object_mb/object_mb.h      |  84 +-
 .../object_mizu_objects/object_mizu_objects.h |  84 +-
 soh/assets/objects/object_mm/object_mm.h      |  53 +-
 soh/assets/objects/object_mo/object_mo.h      |  30 +-
 soh/assets/objects/object_oE1s/object_oE1s.h  |  11 +-
 soh/assets/objects/object_oE4s/object_oE4s.h  |  11 +-
 .../objects/object_oF1d_map/object_oF1d_map.h | 101 +-
 .../objects/object_ossan/object_ossan.h       |  59 +-
 soh/assets/objects/object_owl/object_owl.h    |  48 +-
 .../object_po_composer/object_po_composer.h   |  77 +-
 .../objects/object_po_field/object_po_field.h |  65 +-
 .../object_po_sisters/object_po_sisters.h     | 167 ++--
 soh/assets/objects/object_poh/object_poh.h    |  65 +-
 soh/assets/objects/object_ps/object_ps.h      | 137 +--
 soh/assets/objects/object_rl/object_rl.h      |  12 +-
 soh/assets/objects/object_ru2/object_ru2.h    |  11 +-
 soh/assets/objects/object_sa/object_sa.h      |   5 +-
 soh/assets/objects/object_skj/object_skj.h    |  47 +-
 .../object_spot09_obj/object_spot09_obj.h     | 126 +--
 soh/assets/objects/object_sst/object_sst.h    |  95 +-
 soh/assets/objects/object_tk/object_tk.h      | 101 +-
 .../objects/object_torch2/object_torch2.h     |  11 +-
 soh/assets/objects/object_xc/object_xc.h      | 161 ++--
 soh/assets/objects/object_zl1/object_zl1.h    |   5 +-
 soh/assets/objects/object_zl2/object_zl2.h    | 197 ++--
 soh/assets/objects/object_zl4/object_zl4.h    | 185 ++--
 .../overlays/ovl_Boss_Ganon/ovl_Boss_Ganon.h  |  96 +-
 .../overlays/ovl_Boss_Sst/ovl_Boss_Sst.h      |  12 +-
 .../overlays/ovl_Demo_Shd/ovl_Demo_Shd.h      |  12 +-
 .../ovl_En_Clear_Tag/ovl_En_Clear_Tag.h       |  84 +-
 .../scenes/dungeons/Bmori1/Bmori1_room_0.h    |  58 +-
 .../scenes/dungeons/Bmori1/Bmori1_room_1.h    |  12 +-
 .../scenes/dungeons/Bmori1/Bmori1_room_10.h   |  20 +-
 .../scenes/dungeons/Bmori1/Bmori1_room_11.h   |  16 +-
 .../scenes/dungeons/Bmori1/Bmori1_room_12.h   |  38 +-
 .../scenes/dungeons/Bmori1/Bmori1_room_13.h   |  34 +-
 .../scenes/dungeons/Bmori1/Bmori1_room_14.h   |  28 +-
 .../scenes/dungeons/Bmori1/Bmori1_room_15.h   |   6 +-
 .../scenes/dungeons/Bmori1/Bmori1_room_16.h   |  14 +-
 .../scenes/dungeons/Bmori1/Bmori1_room_17.h   |  24 +-
 .../scenes/dungeons/Bmori1/Bmori1_room_18.h   |   6 +-
 .../scenes/dungeons/Bmori1/Bmori1_room_2.h    |  44 +-
 .../scenes/dungeons/Bmori1/Bmori1_room_20.h   |   6 +-
 .../scenes/dungeons/Bmori1/Bmori1_room_21.h   |   6 +-
 .../scenes/dungeons/Bmori1/Bmori1_room_22.h   |   6 +-
 .../scenes/dungeons/Bmori1/Bmori1_room_3.h    |  12 +-
 .../scenes/dungeons/Bmori1/Bmori1_room_4.h    |   8 +-
 .../scenes/dungeons/Bmori1/Bmori1_room_5.h    |  16 +-
 .../scenes/dungeons/Bmori1/Bmori1_room_6.h    |  20 +-
 .../scenes/dungeons/Bmori1/Bmori1_room_7.h    |  62 +-
 .../scenes/dungeons/Bmori1/Bmori1_room_8.h    |  72 +-
 .../scenes/dungeons/Bmori1/Bmori1_room_9.h    |  40 +-
 .../scenes/dungeons/Bmori1/Bmori1_scene.h     |  41 +-
 .../scenes/dungeons/FIRE_bs/FIRE_bs_room_0.h  |  52 +-
 .../scenes/dungeons/FIRE_bs/FIRE_bs_room_1.h  |  56 +-
 .../scenes/dungeons/FIRE_bs/FIRE_bs_scene.h   |  19 +-
 .../scenes/dungeons/HAKAdan/HAKAdan_room_0.h  |  20 +-
 .../scenes/dungeons/HAKAdan/HAKAdan_room_1.h  |   6 +-
 .../scenes/dungeons/HAKAdan/HAKAdan_room_10.h |  42 +-
 .../scenes/dungeons/HAKAdan/HAKAdan_room_11.h |  30 +-
 .../scenes/dungeons/HAKAdan/HAKAdan_room_12.h |  54 +-
 .../scenes/dungeons/HAKAdan/HAKAdan_room_13.h |   6 +-
 .../scenes/dungeons/HAKAdan/HAKAdan_room_14.h |  44 +-
 .../scenes/dungeons/HAKAdan/HAKAdan_room_15.h |  44 +-
 .../scenes/dungeons/HAKAdan/HAKAdan_room_16.h |   6 +-
 .../scenes/dungeons/HAKAdan/HAKAdan_room_17.h |  22 +-
 .../scenes/dungeons/HAKAdan/HAKAdan_room_18.h |  36 +-
 .../scenes/dungeons/HAKAdan/HAKAdan_room_19.h |  10 +-
 .../scenes/dungeons/HAKAdan/HAKAdan_room_2.h  |  60 +-
 .../scenes/dungeons/HAKAdan/HAKAdan_room_20.h |   6 +-
 .../scenes/dungeons/HAKAdan/HAKAdan_room_21.h |  42 +-
 .../scenes/dungeons/HAKAdan/HAKAdan_room_22.h |  10 +-
 .../scenes/dungeons/HAKAdan/HAKAdan_room_3.h  |  16 +-
 .../scenes/dungeons/HAKAdan/HAKAdan_room_4.h  |   6 +-
 .../scenes/dungeons/HAKAdan/HAKAdan_room_5.h  |  26 +-
 .../scenes/dungeons/HAKAdan/HAKAdan_room_6.h  |  24 +-
 .../scenes/dungeons/HAKAdan/HAKAdan_room_7.h  |   6 +-
 .../scenes/dungeons/HAKAdan/HAKAdan_room_8.h  |  26 +-
 .../scenes/dungeons/HAKAdan/HAKAdan_room_9.h  |  44 +-
 .../scenes/dungeons/HAKAdan/HAKAdan_scene.h   |  13 +-
 .../dungeons/HAKAdanCH/HAKAdanCH_room_0.h     |  96 +-
 .../dungeons/HAKAdanCH/HAKAdanCH_room_1.h     |  52 +-
 .../dungeons/HAKAdanCH/HAKAdanCH_room_2.h     |  20 +-
 .../dungeons/HAKAdanCH/HAKAdanCH_room_3.h     |   6 +-
 .../dungeons/HAKAdanCH/HAKAdanCH_room_4.h     |  10 +-
 .../dungeons/HAKAdanCH/HAKAdanCH_room_5.h     |  12 +-
 .../dungeons/HAKAdanCH/HAKAdanCH_room_6.h     |  10 +-
 .../dungeons/HAKAdanCH/HAKAdanCH_scene.h      |  17 +-
 .../dungeons/HAKAdan_bs/HAKAdan_bs_room_0.h   |  16 +-
 .../dungeons/HAKAdan_bs/HAKAdan_bs_room_1.h   |  28 +-
 .../dungeons/HAKAdan_bs/HAKAdan_bs_scene.h    |  23 +-
 .../scenes/dungeons/HIDAN/HIDAN_room_0.h      |  30 +-
 .../scenes/dungeons/HIDAN/HIDAN_room_1.h      |  38 +-
 .../scenes/dungeons/HIDAN/HIDAN_room_10.h     |  74 +-
 .../scenes/dungeons/HIDAN/HIDAN_room_11.h     |  14 +-
 .../scenes/dungeons/HIDAN/HIDAN_room_12.h     |  24 +-
 .../scenes/dungeons/HIDAN/HIDAN_room_13.h     |  30 +-
 .../scenes/dungeons/HIDAN/HIDAN_room_14.h     |   8 +-
 .../scenes/dungeons/HIDAN/HIDAN_room_15.h     |   6 +-
 .../scenes/dungeons/HIDAN/HIDAN_room_16.h     |  72 +-
 .../scenes/dungeons/HIDAN/HIDAN_room_17.h     |  36 +-
 .../scenes/dungeons/HIDAN/HIDAN_room_18.h     |  14 +-
 .../scenes/dungeons/HIDAN/HIDAN_room_19.h     |  24 +-
 .../scenes/dungeons/HIDAN/HIDAN_room_2.h      |  52 +-
 .../scenes/dungeons/HIDAN/HIDAN_room_20.h     |  38 +-
 .../scenes/dungeons/HIDAN/HIDAN_room_21.h     |  58 +-
 .../scenes/dungeons/HIDAN/HIDAN_room_22.h     |  36 +-
 .../scenes/dungeons/HIDAN/HIDAN_room_23.h     |  38 +-
 .../scenes/dungeons/HIDAN/HIDAN_room_24.h     |  24 +-
 .../scenes/dungeons/HIDAN/HIDAN_room_25.h     |  36 +-
 .../scenes/dungeons/HIDAN/HIDAN_room_26.h     |  28 +-
 .../scenes/dungeons/HIDAN/HIDAN_room_3.h      |  16 +-
 .../scenes/dungeons/HIDAN/HIDAN_room_4.h      |  48 +-
 .../scenes/dungeons/HIDAN/HIDAN_room_5.h      |  28 +-
 .../scenes/dungeons/HIDAN/HIDAN_room_6.h      |  22 +-
 .../scenes/dungeons/HIDAN/HIDAN_room_7.h      |  16 +-
 .../scenes/dungeons/HIDAN/HIDAN_room_8.h      |  56 +-
 .../scenes/dungeons/HIDAN/HIDAN_room_9.h      |  32 +-
 .../scenes/dungeons/HIDAN/HIDAN_scene.h       |  33 +-
 .../scenes/dungeons/MIZUsin/MIZUsin_room_0.h  | 102 +-
 .../scenes/dungeons/MIZUsin/MIZUsin_room_1.h  |  54 +-
 .../scenes/dungeons/MIZUsin/MIZUsin_room_10.h |  30 +-
 .../scenes/dungeons/MIZUsin/MIZUsin_room_11.h |  18 +-
 .../scenes/dungeons/MIZUsin/MIZUsin_room_12.h |  30 +-
 .../scenes/dungeons/MIZUsin/MIZUsin_room_13.h |   6 +-
 .../scenes/dungeons/MIZUsin/MIZUsin_room_14.h |  34 +-
 .../scenes/dungeons/MIZUsin/MIZUsin_room_15.h |  30 +-
 .../scenes/dungeons/MIZUsin/MIZUsin_room_16.h |  16 +-
 .../scenes/dungeons/MIZUsin/MIZUsin_room_17.h |  36 +-
 .../scenes/dungeons/MIZUsin/MIZUsin_room_18.h |  30 +-
 .../scenes/dungeons/MIZUsin/MIZUsin_room_19.h |   6 +-
 .../scenes/dungeons/MIZUsin/MIZUsin_room_2.h  |  36 +-
 .../scenes/dungeons/MIZUsin/MIZUsin_room_20.h |  42 +-
 .../scenes/dungeons/MIZUsin/MIZUsin_room_21.h |  30 +-
 .../scenes/dungeons/MIZUsin/MIZUsin_room_22.h |  98 +-
 .../scenes/dungeons/MIZUsin/MIZUsin_room_3.h  |  36 +-
 .../scenes/dungeons/MIZUsin/MIZUsin_room_4.h  |  42 +-
 .../scenes/dungeons/MIZUsin/MIZUsin_room_5.h  |  96 +-
 .../scenes/dungeons/MIZUsin/MIZUsin_room_6.h  |  76 +-
 .../scenes/dungeons/MIZUsin/MIZUsin_room_7.h  |  26 +-
 .../scenes/dungeons/MIZUsin/MIZUsin_room_8.h  | 108 +--
 .../scenes/dungeons/MIZUsin/MIZUsin_room_9.h  |  54 +-
 .../scenes/dungeons/MIZUsin/MIZUsin_scene.h   |  17 +-
 .../dungeons/MIZUsin_bs/MIZUsin_bs_room_0.h   |  34 +-
 .../dungeons/MIZUsin_bs/MIZUsin_bs_room_1.h   |  52 +-
 .../dungeons/MIZUsin_bs/MIZUsin_bs_scene.h    |   2 +-
 soh/assets/scenes/dungeons/bdan/bdan_room_0.h |   6 +-
 soh/assets/scenes/dungeons/bdan/bdan_room_1.h |   6 +-
 .../scenes/dungeons/bdan/bdan_room_12.h       |   6 +-
 .../scenes/dungeons/bdan/bdan_room_13.h       |  10 +-
 .../scenes/dungeons/bdan/bdan_room_14.h       |  14 +-
 soh/assets/scenes/dungeons/bdan/bdan_room_2.h |  14 +-
 soh/assets/scenes/dungeons/bdan/bdan_room_3.h |  14 +-
 soh/assets/scenes/dungeons/bdan/bdan_room_4.h |   6 +-
 soh/assets/scenes/dungeons/bdan/bdan_room_5.h |  20 +-
 soh/assets/scenes/dungeons/bdan/bdan_room_6.h |   6 +-
 soh/assets/scenes/dungeons/bdan/bdan_room_7.h |   6 +-
 soh/assets/scenes/dungeons/bdan/bdan_room_9.h |   6 +-
 soh/assets/scenes/dungeons/bdan/bdan_scene.h  |  24 +-
 .../dungeons/bdan_boss/bdan_boss_room_0.h     |  24 +-
 .../dungeons/bdan_boss/bdan_boss_room_1.h     |  22 +-
 .../dungeons/bdan_boss/bdan_boss_scene.h      |   2 +-
 soh/assets/scenes/dungeons/ddan/ddan_room_0.h | 116 +--
 soh/assets/scenes/dungeons/ddan/ddan_room_1.h |  34 +-
 .../scenes/dungeons/ddan/ddan_room_10.h       |  42 +-
 .../scenes/dungeons/ddan/ddan_room_11.h       |  14 +-
 .../scenes/dungeons/ddan/ddan_room_12.h       |  54 +-
 .../scenes/dungeons/ddan/ddan_room_13.h       |  16 +-
 .../scenes/dungeons/ddan/ddan_room_14.h       |  12 +-
 .../scenes/dungeons/ddan/ddan_room_15.h       |  14 +-
 .../scenes/dungeons/ddan/ddan_room_16.h       |  26 +-
 soh/assets/scenes/dungeons/ddan/ddan_room_2.h |  42 +-
 soh/assets/scenes/dungeons/ddan/ddan_room_3.h |  62 +-
 soh/assets/scenes/dungeons/ddan/ddan_room_4.h |  38 +-
 soh/assets/scenes/dungeons/ddan/ddan_room_5.h |  30 +-
 soh/assets/scenes/dungeons/ddan/ddan_room_6.h |  12 +-
 soh/assets/scenes/dungeons/ddan/ddan_room_7.h |  12 +-
 soh/assets/scenes/dungeons/ddan/ddan_room_8.h |  54 +-
 soh/assets/scenes/dungeons/ddan/ddan_room_9.h |  62 +-
 soh/assets/scenes/dungeons/ddan/ddan_scene.h  |   5 +-
 .../dungeons/ddan_boss/ddan_boss_room_0.h     |  18 +-
 .../dungeons/ddan_boss/ddan_boss_room_1.h     |  18 +-
 .../dungeons/ddan_boss/ddan_boss_scene.h      |  27 +-
 .../scenes/dungeons/ganon/ganon_room_0.h      |  36 +-
 .../scenes/dungeons/ganon/ganon_room_1.h      |  28 +-
 .../scenes/dungeons/ganon/ganon_room_2.h      |  46 +-
 .../scenes/dungeons/ganon/ganon_room_3.h      |  16 +-
 .../scenes/dungeons/ganon/ganon_room_4.h      |  56 +-
 .../scenes/dungeons/ganon/ganon_room_5.h      |  30 +-
 .../scenes/dungeons/ganon/ganon_room_6.h      |  46 +-
 .../scenes/dungeons/ganon/ganon_room_7.h      |  44 +-
 .../scenes/dungeons/ganon/ganon_room_8.h      |  44 +-
 .../scenes/dungeons/ganon/ganon_room_9.h      |  48 +-
 .../scenes/dungeons/ganon/ganon_scene.h       |  39 +-
 .../dungeons/ganon_boss/ganon_boss_room_0.h   |   2 +-
 .../dungeons/ganon_boss/ganon_boss_scene.h    | 121 +--
 .../dungeons/ganon_demo/ganon_demo_room_0.h   |   8 +-
 .../dungeons/ganon_demo/ganon_demo_scene.h    |  66 +-
 .../dungeons/ganon_final/ganon_final_room_0.h |   4 +-
 .../dungeons/ganon_final/ganon_final_scene.h  | 139 +--
 .../ganon_sonogo/ganon_sonogo_room_0.h        |  46 +-
 .../ganon_sonogo/ganon_sonogo_room_1.h        |  54 +-
 .../ganon_sonogo/ganon_sonogo_room_2.h        |  62 +-
 .../ganon_sonogo/ganon_sonogo_room_3.h        |  18 +-
 .../ganon_sonogo/ganon_sonogo_room_4.h        |  70 +-
 .../ganon_sonogo/ganon_sonogo_scene.h         |  31 +-
 .../dungeons/ganon_tou/ganon_tou_room_0.h     | 132 +--
 .../dungeons/ganon_tou/ganon_tou_scene.h      |  22 +-
 .../dungeons/ganontika/ganontika_room_0.h     |  12 +-
 .../dungeons/ganontika/ganontika_room_1.h     | 126 +--
 .../dungeons/ganontika/ganontika_room_10.h    |  24 +-
 .../dungeons/ganontika/ganontika_room_11.h    |  28 +-
 .../dungeons/ganontika/ganontika_room_12.h    |  56 +-
 .../dungeons/ganontika/ganontika_room_13.h    |  32 +-
 .../dungeons/ganontika/ganontika_room_14.h    |  44 +-
 .../dungeons/ganontika/ganontika_room_15.h    |  32 +-
 .../dungeons/ganontika/ganontika_room_16.h    |  12 +-
 .../dungeons/ganontika/ganontika_room_17.h    |  46 +-
 .../dungeons/ganontika/ganontika_room_18.h    | 106 +--
 .../dungeons/ganontika/ganontika_room_19.h    |  32 +-
 .../dungeons/ganontika/ganontika_room_2.h     |  44 +-
 .../dungeons/ganontika/ganontika_room_3.h     |  58 +-
 .../dungeons/ganontika/ganontika_room_4.h     |  32 +-
 .../dungeons/ganontika/ganontika_room_5.h     |  40 +-
 .../dungeons/ganontika/ganontika_room_6.h     |  50 +-
 .../dungeons/ganontika/ganontika_room_7.h     |  32 +-
 .../dungeons/ganontika/ganontika_room_8.h     |  48 +-
 .../dungeons/ganontika/ganontika_room_9.h     |  46 +-
 .../dungeons/ganontika/ganontika_scene.h      |  35 +-
 .../ganontikasonogo/ganontikasonogo_room_0.h  | 102 +-
 .../ganontikasonogo/ganontikasonogo_room_1.h  |  20 +-
 .../ganontikasonogo/ganontikasonogo_scene.h   |  11 +-
 .../dungeons/gerudoway/gerudoway_room_0.h     |  52 +-
 .../dungeons/gerudoway/gerudoway_room_1.h     |  72 +-
 .../dungeons/gerudoway/gerudoway_room_2.h     |  48 +-
 .../dungeons/gerudoway/gerudoway_room_3.h     |  82 +-
 .../dungeons/gerudoway/gerudoway_room_4.h     |  52 +-
 .../dungeons/gerudoway/gerudoway_room_5.h     |  48 +-
 .../dungeons/gerudoway/gerudoway_scene.h      |  55 +-
 .../dungeons/ice_doukutu/ice_doukutu_room_0.h |  26 +-
 .../dungeons/ice_doukutu/ice_doukutu_room_1.h |  32 +-
 .../ice_doukutu/ice_doukutu_room_10.h         |  12 +-
 .../ice_doukutu/ice_doukutu_room_11.h         |  16 +-
 .../dungeons/ice_doukutu/ice_doukutu_room_2.h |  12 +-
 .../dungeons/ice_doukutu/ice_doukutu_room_3.h |  22 +-
 .../dungeons/ice_doukutu/ice_doukutu_room_4.h |  22 +-
 .../dungeons/ice_doukutu/ice_doukutu_room_5.h |  16 +-
 .../dungeons/ice_doukutu/ice_doukutu_room_6.h |   8 +-
 .../dungeons/ice_doukutu/ice_doukutu_room_7.h |  12 +-
 .../dungeons/ice_doukutu/ice_doukutu_room_9.h |  22 +-
 .../dungeons/ice_doukutu/ice_doukutu_scene.h  |  36 +-
 .../dungeons/jyasinboss/jyasinboss_room_0.h   |  14 +-
 .../dungeons/jyasinboss/jyasinboss_room_1.h   |  52 +-
 .../dungeons/jyasinboss/jyasinboss_room_2.h   |  18 +-
 .../dungeons/jyasinboss/jyasinboss_room_3.h   |  96 +-
 .../dungeons/jyasinboss/jyasinboss_scene.h    |  32 +-
 .../dungeons/jyasinzou/jyasinzou_room_0.h     |  72 +-
 .../dungeons/jyasinzou/jyasinzou_room_1.h     |  38 +-
 .../dungeons/jyasinzou/jyasinzou_room_10.h    |  64 +-
 .../dungeons/jyasinzou/jyasinzou_room_11.h    |   6 +-
 .../dungeons/jyasinzou/jyasinzou_room_12.h    |   8 +-
 .../dungeons/jyasinzou/jyasinzou_room_13.h    |  28 +-
 .../dungeons/jyasinzou/jyasinzou_room_14.h    |  34 +-
 .../dungeons/jyasinzou/jyasinzou_room_15.h    |  96 +-
 .../dungeons/jyasinzou/jyasinzou_room_16.h    |  34 +-
 .../dungeons/jyasinzou/jyasinzou_room_17.h    |  28 +-
 .../dungeons/jyasinzou/jyasinzou_room_18.h    |  40 +-
 .../dungeons/jyasinzou/jyasinzou_room_19.h    |  20 +-
 .../dungeons/jyasinzou/jyasinzou_room_2.h     |  32 +-
 .../dungeons/jyasinzou/jyasinzou_room_20.h    |  56 +-
 .../dungeons/jyasinzou/jyasinzou_room_21.h    |  22 +-
 .../dungeons/jyasinzou/jyasinzou_room_22.h    |  22 +-
 .../dungeons/jyasinzou/jyasinzou_room_23.h    |  68 +-
 .../dungeons/jyasinzou/jyasinzou_room_24.h    |  36 +-
 .../dungeons/jyasinzou/jyasinzou_room_25.h    | 158 ++--
 .../dungeons/jyasinzou/jyasinzou_room_26.h    |  74 +-
 .../dungeons/jyasinzou/jyasinzou_room_27.h    |  18 +-
 .../dungeons/jyasinzou/jyasinzou_room_28.h    |  62 +-
 .../dungeons/jyasinzou/jyasinzou_room_3.h     |  26 +-
 .../dungeons/jyasinzou/jyasinzou_room_4.h     |  54 +-
 .../dungeons/jyasinzou/jyasinzou_room_5.h     | 160 ++--
 .../dungeons/jyasinzou/jyasinzou_room_6.h     |  22 +-
 .../dungeons/jyasinzou/jyasinzou_room_7.h     |  24 +-
 .../dungeons/jyasinzou/jyasinzou_room_8.h     |  50 +-
 .../dungeons/jyasinzou/jyasinzou_room_9.h     |  20 +-
 .../dungeons/jyasinzou/jyasinzou_scene.h      |  41 +-
 soh/assets/scenes/dungeons/men/men_room_0.h   |  78 +-
 soh/assets/scenes/dungeons/men/men_room_1.h   |  50 +-
 soh/assets/scenes/dungeons/men/men_room_10.h  |  42 +-
 soh/assets/scenes/dungeons/men/men_room_2.h   |  16 +-
 soh/assets/scenes/dungeons/men/men_room_3.h   |  22 +-
 soh/assets/scenes/dungeons/men/men_room_4.h   |  40 +-
 soh/assets/scenes/dungeons/men/men_room_5.h   |  18 +-
 soh/assets/scenes/dungeons/men/men_room_6.h   |  52 +-
 soh/assets/scenes/dungeons/men/men_room_7.h   |  56 +-
 soh/assets/scenes/dungeons/men/men_room_8.h   |  34 +-
 soh/assets/scenes/dungeons/men/men_room_9.h   |  22 +-
 soh/assets/scenes/dungeons/men/men_scene.h    |  17 +-
 .../moribossroom/moribossroom_room_0.h        |  24 +-
 .../moribossroom/moribossroom_room_1.h        |  76 +-
 .../moribossroom/moribossroom_scene.h         |  17 +-
 soh/assets/scenes/dungeons/ydan/ydan_room_0.h | 130 +--
 soh/assets/scenes/dungeons/ydan/ydan_room_1.h |  16 +-
 .../scenes/dungeons/ydan/ydan_room_10.h       |  12 +-
 .../scenes/dungeons/ydan/ydan_room_11.h       |  22 +-
 soh/assets/scenes/dungeons/ydan/ydan_room_2.h |  26 +-
 soh/assets/scenes/dungeons/ydan/ydan_room_3.h | 134 +--
 soh/assets/scenes/dungeons/ydan/ydan_room_4.h |  30 +-
 soh/assets/scenes/dungeons/ydan/ydan_room_5.h |  36 +-
 soh/assets/scenes/dungeons/ydan/ydan_room_6.h |  24 +-
 soh/assets/scenes/dungeons/ydan/ydan_room_7.h |  60 +-
 soh/assets/scenes/dungeons/ydan/ydan_room_8.h |   6 +-
 soh/assets/scenes/dungeons/ydan/ydan_room_9.h |  56 +-
 soh/assets/scenes/dungeons/ydan/ydan_scene.h  |   5 +-
 .../dungeons/ydan_boss/ydan_boss_room_0.h     |  50 +-
 .../dungeons/ydan_boss/ydan_boss_room_1.h     |  24 +-
 .../dungeons/ydan_boss/ydan_boss_scene.h      |  15 +-
 .../scenes/indoors/bowling/bowling_room_0.h   |   4 +-
 .../scenes/indoors/bowling/bowling_scene.h    | 149 +--
 .../daiyousei_izumi/daiyousei_izumi_room_0.h  |  16 +-
 .../daiyousei_izumi/daiyousei_izumi_scene.h   | 102 +-
 .../indoors/hairal_niwa/hairal_niwa_room_0.h  |  26 +-
 .../indoors/hairal_niwa/hairal_niwa_scene.h   | 131 +--
 .../hairal_niwa2/hairal_niwa2_room_0.h        | 118 +--
 .../indoors/hairal_niwa2/hairal_niwa2_scene.h |   2 +-
 .../hairal_niwa_n/hairal_niwa_n_room_0.h      |   4 +-
 .../hairal_niwa_n/hairal_niwa_n_scene.h       |  77 +-
 .../hakasitarelay/hakasitarelay_room_0.h      |  40 +-
 .../hakasitarelay/hakasitarelay_room_1.h      |  24 +-
 .../hakasitarelay/hakasitarelay_room_2.h      |  32 +-
 .../hakasitarelay/hakasitarelay_room_3.h      |  38 +-
 .../hakasitarelay/hakasitarelay_room_4.h      |  34 +-
 .../hakasitarelay/hakasitarelay_room_5.h      |  32 +-
 .../hakasitarelay/hakasitarelay_room_6.h      |  58 +-
 .../hakasitarelay/hakasitarelay_scene.h       |  22 +-
 soh/assets/scenes/indoors/hut/hut_room_0.h    |   2 +-
 soh/assets/scenes/indoors/hut/hut_scene.h     |   2 +-
 .../indoors/hylia_labo/hylia_labo_room_0.h    |  42 +-
 .../indoors/hylia_labo/hylia_labo_scene.h     | 175 ++--
 soh/assets/scenes/indoors/impa/impa_room_0.h  |   2 +-
 soh/assets/scenes/indoors/impa/impa_scene.h   |   2 +-
 .../scenes/indoors/kakariko/kakariko_room_0.h |   2 +-
 .../scenes/indoors/kakariko/kakariko_scene.h  |   2 +-
 .../indoors/kenjyanoma/kenjyanoma_room_0.h    | 116 +--
 .../indoors/kenjyanoma/kenjyanoma_scene.h     |   8 +-
 .../indoors/kokiri_home/kokiri_home_room_0.h  |   2 +-
 .../indoors/kokiri_home/kokiri_home_scene.h   |   2 +-
 .../kokiri_home3/kokiri_home3_room_0.h        |   2 +-
 .../indoors/kokiri_home3/kokiri_home3_scene.h |   2 +-
 .../kokiri_home4/kokiri_home4_room_0.h        |   2 +-
 .../indoors/kokiri_home4/kokiri_home4_scene.h |   2 +-
 .../kokiri_home5/kokiri_home5_room_0.h        |   2 +-
 .../indoors/kokiri_home5/kokiri_home5_scene.h |   2 +-
 soh/assets/scenes/indoors/labo/labo_room_0.h  |   2 +-
 soh/assets/scenes/indoors/labo/labo_scene.h   |   2 +-
 .../indoors/link_home/link_home_room_0.h      |   6 +-
 .../indoors/link_home/link_home_scene.h       |   6 +-
 .../scenes/indoors/mahouya/mahouya_room_0.h   |   4 +-
 .../scenes/indoors/mahouya/mahouya_scene.h    |  71 +-
 .../malon_stable/malon_stable_room_0.h        |   2 +-
 .../indoors/malon_stable/malon_stable_scene.h |   2 +-
 .../indoors/miharigoya/miharigoya_room_0.h    |  56 +-
 .../indoors/miharigoya/miharigoya_scene.h     | 108 +--
 .../scenes/indoors/nakaniwa/nakaniwa_room_0.h | 174 ++--
 .../scenes/indoors/nakaniwa/nakaniwa_scene.h  |  16 +-
 .../indoors/syatekijyou/syatekijyou_room_0.h  |  16 +-
 .../indoors/syatekijyou/syatekijyou_scene.h   | 126 +--
 .../scenes/indoors/takaraya/takaraya_room_0.h |  56 +-
 .../scenes/indoors/takaraya/takaraya_room_1.h |   8 +-
 .../scenes/indoors/takaraya/takaraya_room_2.h |   8 +-
 .../scenes/indoors/takaraya/takaraya_room_3.h |  10 +-
 .../scenes/indoors/takaraya/takaraya_room_4.h |  12 +-
 .../scenes/indoors/takaraya/takaraya_room_5.h |  16 +-
 .../scenes/indoors/takaraya/takaraya_room_6.h |  16 +-
 .../scenes/indoors/takaraya/takaraya_scene.h  |  21 +-
 soh/assets/scenes/indoors/tent/tent_room_0.h  |   2 +-
 soh/assets/scenes/indoors/tent/tent_scene.h   |   2 +-
 .../scenes/indoors/tokinoma/tokinoma_room_0.h | 132 +--
 .../scenes/indoors/tokinoma/tokinoma_room_1.h |  80 +-
 .../scenes/indoors/tokinoma/tokinoma_scene.h  |  92 +-
 .../yousei_izumi_tate_room_0.h                |   4 +-
 .../yousei_izumi_tate_scene.h                 |  63 +-
 .../yousei_izumi_yoko_room_0.h                |  16 +-
 .../yousei_izumi_yoko_scene.h                 |  96 +-
 soh/assets/scenes/misc/enrui/enrui_room_0.h   |   2 +-
 soh/assets/scenes/misc/enrui/enrui_scene.h    |   2 +-
 .../scenes/misc/entra_n/entra_n_room_0.h      |   2 +-
 .../scenes/misc/entra_n/entra_n_scene.h       |   2 +-
 .../scenes/misc/hakaana/hakaana_room_0.h      |  54 +-
 .../scenes/misc/hakaana/hakaana_scene.h       |   2 +-
 .../scenes/misc/hakaana2/hakaana2_room_0.h    |   4 +-
 .../scenes/misc/hakaana2/hakaana2_scene.h     |  93 +-
 .../misc/hakaana_ouke/hakaana_ouke_room_0.h   |  46 +-
 .../misc/hakaana_ouke/hakaana_ouke_room_1.h   |  26 +-
 .../misc/hakaana_ouke/hakaana_ouke_room_2.h   |  42 +-
 .../misc/hakaana_ouke/hakaana_ouke_scene.h    |  48 +-
 .../misc/hiral_demo/hiral_demo_room_0.h       |  20 +-
 .../scenes/misc/hiral_demo/hiral_demo_scene.h |  20 +-
 .../scenes/misc/kakariko3/kakariko3_room_0.h  |   2 +-
 .../scenes/misc/kakariko3/kakariko3_scene.h   |   2 +-
 .../scenes/misc/kakusiana/kakusiana_room_0.h  |  72 +-
 .../scenes/misc/kakusiana/kakusiana_room_1.h  |  54 +-
 .../scenes/misc/kakusiana/kakusiana_room_10.h |  76 +-
 .../scenes/misc/kakusiana/kakusiana_room_11.h |  84 +-
 .../scenes/misc/kakusiana/kakusiana_room_12.h |  84 +-
 .../scenes/misc/kakusiana/kakusiana_room_13.h |  72 +-
 .../scenes/misc/kakusiana/kakusiana_room_2.h  |  26 +-
 .../scenes/misc/kakusiana/kakusiana_room_3.h  |  42 +-
 .../scenes/misc/kakusiana/kakusiana_room_4.h  |  76 +-
 .../scenes/misc/kakusiana/kakusiana_room_5.h  |  36 +-
 .../scenes/misc/kakusiana/kakusiana_room_6.h  |  44 +-
 .../scenes/misc/kakusiana/kakusiana_room_7.h  |  58 +-
 .../scenes/misc/kakusiana/kakusiana_room_8.h  |  28 +-
 .../scenes/misc/kakusiana/kakusiana_room_9.h  |  44 +-
 .../scenes/misc/kakusiana/kakusiana_scene.h   |  17 +-
 .../scenes/misc/kinsuta/kinsuta_room_0.h      | 120 +--
 .../scenes/misc/kinsuta/kinsuta_scene.h       |   2 +-
 .../misc/market_alley/market_alley_room_0.h   |   2 +-
 .../misc/market_alley/market_alley_scene.h    |   2 +-
 .../market_alley_n/market_alley_n_room_0.h    |   4 +-
 .../market_alley_n/market_alley_n_scene.h     |   2 +-
 .../misc/market_day/market_day_room_0.h       |   2 +-
 .../scenes/misc/market_day/market_day_scene.h |   2 +-
 .../misc/market_night/market_night_room_0.h   |   2 +-
 .../misc/market_night/market_night_scene.h    |   2 +-
 .../misc/market_ruins/market_ruins_room_0.h   |   2 +-
 .../misc/market_ruins/market_ruins_scene.h    |   2 +-
 soh/assets/scenes/misc/shrine/shrine_room_0.h |   2 +-
 soh/assets/scenes/misc/shrine/shrine_scene.h  |   2 +-
 .../scenes/misc/shrine_n/shrine_n_room_0.h    |   2 +-
 .../scenes/misc/shrine_n/shrine_n_scene.h     |   2 +-
 .../scenes/misc/shrine_r/shrine_r_room_0.h    |   2 +-
 .../scenes/misc/shrine_r/shrine_r_scene.h     |   2 +-
 .../scenes/misc/turibori/turibori_room_0.h    |   4 +-
 .../scenes/misc/turibori/turibori_scene.h     | 135 +--
 .../scenes/overworld/entra/entra_room_0.h     |   2 +-
 .../scenes/overworld/entra/entra_scene.h      |   2 +-
 .../scenes/overworld/souko/souko_room_0.h     |  98 +-
 .../scenes/overworld/souko/souko_room_1.h     | 128 +--
 .../scenes/overworld/souko/souko_room_2.h     |  60 +-
 .../scenes/overworld/souko/souko_scene.h      |  35 +-
 .../scenes/overworld/spot00/spot00_room_0.h   | 890 +++++++++---------
 .../scenes/overworld/spot00/spot00_scene.h    | 364 +++----
 .../scenes/overworld/spot01/spot01_room_0.h   | 362 +++----
 .../scenes/overworld/spot01/spot01_scene.h    | 260 ++---
 .../scenes/overworld/spot02/spot02_room_0.h   | 110 +--
 .../scenes/overworld/spot02/spot02_room_1.h   | 552 +++++------
 .../scenes/overworld/spot02/spot02_scene.h    |  74 +-
 .../scenes/overworld/spot03/spot03_room_0.h   | 128 +--
 .../scenes/overworld/spot03/spot03_room_1.h   | 102 +-
 .../scenes/overworld/spot03/spot03_scene.h    |  76 +-
 .../scenes/overworld/spot04/spot04_room_0.h   | 844 ++++++++---------
 .../scenes/overworld/spot04/spot04_room_1.h   | 172 ++--
 .../scenes/overworld/spot04/spot04_room_2.h   | 282 +++---
 .../scenes/overworld/spot04/spot04_scene.h    |  76 +-
 .../scenes/overworld/spot05/spot05_room_0.h   | 148 +--
 .../scenes/overworld/spot05/spot05_scene.h    | 158 ++--
 .../scenes/overworld/spot06/spot06_room_0.h   | 148 +--
 .../scenes/overworld/spot06/spot06_scene.h    | 268 +++---
 .../scenes/overworld/spot07/spot07_room_0.h   | 140 +--
 .../scenes/overworld/spot07/spot07_room_1.h   | 268 +++---
 .../scenes/overworld/spot07/spot07_scene.h    | 116 +--
 .../scenes/overworld/spot08/spot08_room_0.h   | 252 ++---
 .../scenes/overworld/spot08/spot08_scene.h    | 166 ++--
 .../scenes/overworld/spot09/spot09_room_0.h   | 324 +++----
 .../scenes/overworld/spot09/spot09_scene.h    | 154 +--
 .../scenes/overworld/spot10/spot10_room_0.h   |   6 +-
 .../scenes/overworld/spot10/spot10_room_1.h   |  56 +-
 .../scenes/overworld/spot10/spot10_room_2.h   |  20 +-
 .../scenes/overworld/spot10/spot10_room_3.h   |  32 +-
 .../scenes/overworld/spot10/spot10_room_4.h   |   6 +-
 .../scenes/overworld/spot10/spot10_room_5.h   |  30 +-
 .../scenes/overworld/spot10/spot10_room_6.h   |  16 +-
 .../scenes/overworld/spot10/spot10_room_7.h   |   6 +-
 .../scenes/overworld/spot10/spot10_room_8.h   |   6 +-
 .../scenes/overworld/spot10/spot10_room_9.h   |  34 +-
 .../scenes/overworld/spot10/spot10_scene.h    |  46 +-
 .../scenes/overworld/spot11/spot11_room_0.h   | 152 +--
 .../scenes/overworld/spot11/spot11_scene.h    | 190 ++--
 .../scenes/overworld/spot12/spot12_room_0.h   | 398 ++++----
 .../scenes/overworld/spot12/spot12_room_1.h   | 210 ++---
 .../scenes/overworld/spot12/spot12_scene.h    | 102 +-
 .../scenes/overworld/spot13/spot13_room_0.h   |   2 +-
 .../scenes/overworld/spot13/spot13_room_1.h   | 122 +--
 .../scenes/overworld/spot13/spot13_scene.h    |  21 +-
 .../scenes/overworld/spot15/spot15_room_0.h   |  74 +-
 .../scenes/overworld/spot15/spot15_scene.h    | 255 ++---
 .../scenes/overworld/spot16/spot16_room_0.h   | 184 ++--
 .../scenes/overworld/spot16/spot16_scene.h    | 214 ++---
 .../scenes/overworld/spot17/spot17_room_0.h   |  52 +-
 .../scenes/overworld/spot17/spot17_room_1.h   | 362 +++----
 .../scenes/overworld/spot17/spot17_scene.h    | 134 +--
 .../scenes/overworld/spot18/spot18_room_0.h   | 142 +--
 .../scenes/overworld/spot18/spot18_room_1.h   | 122 +--
 .../scenes/overworld/spot18/spot18_room_2.h   | 222 ++---
 .../scenes/overworld/spot18/spot18_room_3.h   | 326 +++----
 .../scenes/overworld/spot18/spot18_scene.h    |  70 +-
 .../scenes/overworld/spot20/spot20_room_0.h   | 316 +++----
 .../scenes/overworld/spot20/spot20_scene.h    | 150 +--
 .../shops/alley_shop/alley_shop_room_0.h      |   2 +-
 .../shops/alley_shop/alley_shop_scene.h       |   2 +-
 soh/assets/scenes/shops/drag/drag_room_0.h    |   2 +-
 soh/assets/scenes/shops/drag/drag_scene.h     |   2 +-
 .../scenes/shops/face_shop/face_shop_room_0.h |   2 +-
 .../scenes/shops/face_shop/face_shop_scene.h  |   2 +-
 soh/assets/scenes/shops/golon/golon_room_0.h  |   2 +-
 soh/assets/scenes/shops/golon/golon_scene.h   |   2 +-
 .../shops/kokiri_shop/kokiri_shop_room_0.h    |   2 +-
 .../shops/kokiri_shop/kokiri_shop_scene.h     |   2 +-
 .../shops/night_shop/night_shop_room_0.h      |   2 +-
 .../shops/night_shop/night_shop_scene.h       |   2 +-
 soh/assets/scenes/shops/shop1/shop1_room_0.h  |   2 +-
 soh/assets/scenes/shops/shop1/shop1_scene.h   |   2 +-
 soh/assets/scenes/shops/zoora/zoora_room_0.h  |   2 +-
 soh/assets/scenes/shops/zoora/zoora_scene.h   |   2 +-
 .../scenes/test_levels/besitu/besitu_room_0.h |  32 +-
 .../scenes/test_levels/besitu/besitu_scene.h  |   2 +-
 .../depth_test/depth_test_room_0.h            |   2 +-
 .../test_levels/depth_test/depth_test_scene.h |   2 +-
 .../test_levels/sasatest/sasatest_room_0.h    |   8 +-
 .../test_levels/sasatest/sasatest_scene.h     |   8 +-
 .../scenes/test_levels/sutaru/sutaru_room_0.h |  20 +-
 .../scenes/test_levels/sutaru/sutaru_scene.h  |   2 +-
 .../scenes/test_levels/syotes/syotes_room_0.h |  58 +-
 .../scenes/test_levels/syotes/syotes_scene.h  |   2 +-
 .../test_levels/syotes2/syotes2_room_0.h      |  40 +-
 .../test_levels/syotes2/syotes2_scene.h       |   2 +-
 .../scenes/test_levels/test01/test01_room_0.h |  32 +-
 .../scenes/test_levels/test01/test01_scene.h  |   2 +-
 .../test_levels/testroom/testroom_room_0.h    |  16 +-
 .../test_levels/testroom/testroom_room_1.h    |  12 +-
 .../test_levels/testroom/testroom_room_2.h    |  18 +-
 .../test_levels/testroom/testroom_room_3.h    |  14 +-
 .../test_levels/testroom/testroom_room_4.h    |   2 +-
 .../test_levels/testroom/testroom_scene.h     |  13 +-
 .../nintendo_rogo_static.h                    |   6 +-
 .../cosmetics/authenticGfxPatches.cpp         |  37 +-
 soh/soh/mq_asset_hacks.h                      |  91 --
 soh/soh/z_play_otr.cpp                        |  12 +-
 soh/src/code/z_scene_table.c                  |  53 +-
 602 files changed, 14934 insertions(+), 15000 deletions(-)

diff --git a/OTRExporter b/OTRExporter
index cde9a3b65..0d8f5570a 160000
--- a/OTRExporter
+++ b/OTRExporter
@@ -1 +1 @@
-Subproject commit cde9a3b655570370e4ed4928e8c9f3a0f631c52e
+Subproject commit 0d8f5570a8e57f302ec6633d65615ee21ab39454
diff --git a/ZAPDTR b/ZAPDTR
index 9b8e224da..eff290361 160000
--- a/ZAPDTR
+++ b/ZAPDTR
@@ -1 +1 @@
-Subproject commit 9b8e224dac83aa8e47a688884ad48725f18fc293
+Subproject commit eff29036118349e142ee8efca80fd975a2a2b6ff
diff --git a/soh/assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h b/soh/assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h
index 89e6c9342..5675ef0c2 100644
--- a/soh/assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h
+++ b/soh/assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h
@@ -3,6 +3,75 @@
 
 #include "align_asset_macro.h"
 
+#define dgameplay_dangeon_keepTex_000000 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_000000"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_000000[] = dgameplay_dangeon_keepTex_000000;
+
+#define dgameplay_dangeon_keepTex_000200 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_000200"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_000200[] = dgameplay_dangeon_keepTex_000200;
+
+#define dgameplay_dangeon_keepTex_0005C0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0005C0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0005C0[] = dgameplay_dangeon_keepTex_0005C0;
+
+#define dgameplay_dangeon_keepTex_001280 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_001280"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_001280[] = dgameplay_dangeon_keepTex_001280;
+
+#define dgameplay_dangeon_keepTex_0078A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0078A0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0078A0[] = dgameplay_dangeon_keepTex_0078A0;
+
+#define dgameplay_dangeon_keepTex_007CA0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_007CA0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_007CA0[] = dgameplay_dangeon_keepTex_007CA0;
+
+#define dgameplay_dangeon_keepTex_0080A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0080A0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0080A0[] = dgameplay_dangeon_keepTex_0080A0;
+
+#define dgameplay_dangeon_keepTex_0088A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0088A0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0088A0[] = dgameplay_dangeon_keepTex_0088A0;
+
+#define dgameplay_dangeon_keepTex_00D8A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_00D8A0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_00D8A0[] = dgameplay_dangeon_keepTex_00D8A0;
+
+#define dgameplay_dangeon_keepTex_00E0A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_00E0A0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_00E0A0[] = dgameplay_dangeon_keepTex_00E0A0;
+
+#define dgameplay_dangeon_keepTex_00F8A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_00F8A0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_00F8A0[] = dgameplay_dangeon_keepTex_00F8A0;
+
+#define dgameplay_dangeon_keepTex_0108A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0108A0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0108A0[] = dgameplay_dangeon_keepTex_0108A0;
+
+#define dgameplay_dangeon_keepTex_0118A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0118A0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0118A0[] = dgameplay_dangeon_keepTex_0118A0;
+
+#define dgameplay_dangeon_keepTex_011AA0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_011AA0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_011AA0[] = dgameplay_dangeon_keepTex_011AA0;
+
+#define dgameplay_dangeon_keepTex_011CA0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_011CA0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_011CA0[] = dgameplay_dangeon_keepTex_011CA0;
+
+#define dgameplay_dangeon_keepTex_012CA0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_012CA0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_012CA0[] = dgameplay_dangeon_keepTex_012CA0;
+
+#define dgameplay_dangeon_keepTex_0134A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0134A0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0134A0[] = dgameplay_dangeon_keepTex_0134A0;
+
+#define dgameplay_dangeon_keepTex_013CA0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_013CA0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_013CA0[] = dgameplay_dangeon_keepTex_013CA0;
+
+#define dgameplay_dangeon_keepTex_013CB0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_013CB0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_013CB0[] = dgameplay_dangeon_keepTex_013CB0;
+
+#define dgameplay_dangeon_keepTex_0154B0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0154B0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0154B0[] = dgameplay_dangeon_keepTex_0154B0;
+
+#define dgameplay_dangeon_keepTex_015CB0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_015CB0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_015CB0[] = dgameplay_dangeon_keepTex_015CB0;
+
+#define dgameplay_dangeon_keepTex_0164B0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0164B0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0164B0[] = dgameplay_dangeon_keepTex_0164B0;
+
+#define dgameplay_dangeon_keepTex_016CB0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_016CB0"
+static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_016CB0[] = dgameplay_dangeon_keepTex_016CB0;
+
 #define dgUnusedCandleDL "__OTR__objects/gameplay_dangeon_keep/gUnusedCandleDL"
 static const ALIGN_ASSET(2) char gUnusedCandleDL[] = dgUnusedCandleDL;
 
@@ -147,73 +216,4 @@ static const ALIGN_ASSET(2) char gPotDL[] = dgPotDL;
 #define dgPotFragmentDL "__OTR__objects/gameplay_dangeon_keep/gPotFragmentDL"
 static const ALIGN_ASSET(2) char gPotFragmentDL[] = dgPotFragmentDL;
 
-#define dgameplay_dangeon_keepTex_000000 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_000000"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_000000[] = dgameplay_dangeon_keepTex_000000;
-
-#define dgameplay_dangeon_keepTex_000200 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_000200"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_000200[] = dgameplay_dangeon_keepTex_000200;
-
-#define dgameplay_dangeon_keepTex_0005C0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0005C0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0005C0[] = dgameplay_dangeon_keepTex_0005C0;
-
-#define dgameplay_dangeon_keepTex_001280 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_001280"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_001280[] = dgameplay_dangeon_keepTex_001280;
-
-#define dgameplay_dangeon_keepTex_0164B0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0164B0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0164B0[] = dgameplay_dangeon_keepTex_0164B0;
-
-#define dgameplay_dangeon_keepTex_00F8A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_00F8A0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_00F8A0[] = dgameplay_dangeon_keepTex_00F8A0;
-
-#define dgameplay_dangeon_keepTex_011CA0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_011CA0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_011CA0[] = dgameplay_dangeon_keepTex_011CA0;
-
-#define dgameplay_dangeon_keepTex_012CA0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_012CA0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_012CA0[] = dgameplay_dangeon_keepTex_012CA0;
-
-#define dgameplay_dangeon_keepTex_0154B0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0154B0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0154B0[] = dgameplay_dangeon_keepTex_0154B0;
-
-#define dgameplay_dangeon_keepTex_015CB0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_015CB0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_015CB0[] = dgameplay_dangeon_keepTex_015CB0;
-
-#define dgameplay_dangeon_keepTex_016CB0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_016CB0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_016CB0[] = dgameplay_dangeon_keepTex_016CB0;
-
-#define dgameplay_dangeon_keepTex_007CA0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_007CA0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_007CA0[] = dgameplay_dangeon_keepTex_007CA0;
-
-#define dgameplay_dangeon_keepTex_0078A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0078A0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0078A0[] = dgameplay_dangeon_keepTex_0078A0;
-
-#define dgameplay_dangeon_keepTex_00D8A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_00D8A0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_00D8A0[] = dgameplay_dangeon_keepTex_00D8A0;
-
-#define dgameplay_dangeon_keepTex_00E0A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_00E0A0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_00E0A0[] = dgameplay_dangeon_keepTex_00E0A0;
-
-#define dgameplay_dangeon_keepTex_0080A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0080A0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0080A0[] = dgameplay_dangeon_keepTex_0080A0;
-
-#define dgameplay_dangeon_keepTex_0088A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0088A0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0088A0[] = dgameplay_dangeon_keepTex_0088A0;
-
-#define dgameplay_dangeon_keepTex_013CB0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_013CB0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_013CB0[] = dgameplay_dangeon_keepTex_013CB0;
-
-#define dgameplay_dangeon_keepTex_0134A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0134A0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0134A0[] = dgameplay_dangeon_keepTex_0134A0;
-
-#define dgameplay_dangeon_keepTex_013CA0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_013CA0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_013CA0[] = dgameplay_dangeon_keepTex_013CA0;
-
-#define dgameplay_dangeon_keepTex_0108A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0108A0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0108A0[] = dgameplay_dangeon_keepTex_0108A0;
-
-#define dgameplay_dangeon_keepTex_0118A0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_0118A0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_0118A0[] = dgameplay_dangeon_keepTex_0118A0;
-
-#define dgameplay_dangeon_keepTex_011AA0 "__OTR__objects/gameplay_dangeon_keep/gameplay_dangeon_keepTex_011AA0"
-static const ALIGN_ASSET(2) char gameplay_dangeon_keepTex_011AA0[] = dgameplay_dangeon_keepTex_011AA0;
-
 #endif // OBJECTS_GAMEPLAY_DANGEON_KEEP_H
diff --git a/soh/assets/objects/gameplay_keep/gameplay_keep.h b/soh/assets/objects/gameplay_keep/gameplay_keep.h
index 473b2b8d6..6377e165d 100644
--- a/soh/assets/objects/gameplay_keep/gameplay_keep.h
+++ b/soh/assets/objects/gameplay_keep/gameplay_keep.h
@@ -3,6 +3,18 @@
 
 #include "align_asset_macro.h"
 
+#define dgameplay_keepTex_04C540 "__OTR__objects/gameplay_keep/gameplay_keepTex_04C540"
+static const ALIGN_ASSET(2) char gameplay_keepTex_04C540[] = dgameplay_keepTex_04C540;
+
+#define dgameplay_keepTex_04C740 "__OTR__objects/gameplay_keep/gameplay_keepTex_04C740"
+static const ALIGN_ASSET(2) char gameplay_keepTex_04C740[] = dgameplay_keepTex_04C740;
+
+#define dgameplay_keepTex_04CD40 "__OTR__objects/gameplay_keep/gameplay_keepTex_04CD40"
+static const ALIGN_ASSET(2) char gameplay_keepTex_04CD40[] = dgameplay_keepTex_04CD40;
+
+#define dgameplay_keepTex_04CF40 "__OTR__objects/gameplay_keep/gameplay_keepTex_04CF40"
+static const ALIGN_ASSET(2) char gameplay_keepTex_04CF40[] = dgameplay_keepTex_04CF40;
+
 #define dgHilite1Tex "__OTR__objects/gameplay_keep/gHilite1Tex"
 static const ALIGN_ASSET(2) char gHilite1Tex[] = dgHilite1Tex;
 
@@ -2826,18 +2838,6 @@ static const ALIGN_ASSET(2) char gEffSpark3Tex[] = dgEffSpark3Tex;
 #define dgEffSpark4Tex "__OTR__objects/gameplay_keep/gEffSpark4Tex"
 static const ALIGN_ASSET(2) char gEffSpark4Tex[] = dgEffSpark4Tex;
 
-#define dgameplay_keepTex_04C540 "__OTR__objects/gameplay_keep/gameplay_keepTex_04C540"
-static const ALIGN_ASSET(2) char gameplay_keepTex_04C540[] = dgameplay_keepTex_04C540;
-
-#define dgameplay_keepTex_04CD40 "__OTR__objects/gameplay_keep/gameplay_keepTex_04CD40"
-static const ALIGN_ASSET(2) char gameplay_keepTex_04CD40[] = dgameplay_keepTex_04CD40;
-
-#define dgameplay_keepTex_04C740 "__OTR__objects/gameplay_keep/gameplay_keepTex_04C740"
-static const ALIGN_ASSET(2) char gameplay_keepTex_04C740[] = dgameplay_keepTex_04C740;
-
-#define dgameplay_keepTex_04CF40 "__OTR__objects/gameplay_keep/gameplay_keepTex_04CF40"
-static const ALIGN_ASSET(2) char gameplay_keepTex_04CF40[] = dgameplay_keepTex_04CF40;
-
 #define dgFishSkelLimbsLimb_018F98DL_018A68 "__OTR__objects/gameplay_keep/gFishSkelLimbsLimb_018F98DL_018A68"
 static const ALIGN_ASSET(2) char gFishSkelLimbsLimb_018F98DL_018A68[] = dgFishSkelLimbsLimb_018F98DL_018A68;
 
diff --git a/soh/assets/objects/object_am/object_am.h b/soh/assets/objects/object_am/object_am.h
index 0f91c99b4..908e8c707 100644
--- a/soh/assets/objects/object_am/object_am.h
+++ b/soh/assets/objects/object_am/object_am.h
@@ -3,6 +3,45 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_amTex_002638 "__OTR__objects/object_am/object_amTex_002638"
+static const ALIGN_ASSET(2) char object_amTex_002638[] = dobject_amTex_002638;
+
+#define dobject_amTex_002838 "__OTR__objects/object_am/object_amTex_002838"
+static const ALIGN_ASSET(2) char object_amTex_002838[] = dobject_amTex_002838;
+
+#define dobject_amTex_002938 "__OTR__objects/object_am/object_amTex_002938"
+static const ALIGN_ASSET(2) char object_amTex_002938[] = dobject_amTex_002938;
+
+#define dobject_amTex_002D38 "__OTR__objects/object_am/object_amTex_002D38"
+static const ALIGN_ASSET(2) char object_amTex_002D38[] = dobject_amTex_002D38;
+
+#define dobject_amTex_002E38 "__OTR__objects/object_am/object_amTex_002E38"
+static const ALIGN_ASSET(2) char object_amTex_002E38[] = dobject_amTex_002E38;
+
+#define dobject_amTex_003038 "__OTR__objects/object_am/object_amTex_003038"
+static const ALIGN_ASSET(2) char object_amTex_003038[] = dobject_amTex_003038;
+
+#define dobject_amTex_003238 "__OTR__objects/object_am/object_amTex_003238"
+static const ALIGN_ASSET(2) char object_amTex_003238[] = dobject_amTex_003238;
+
+#define dobject_amTex_003A38 "__OTR__objects/object_am/object_amTex_003A38"
+static const ALIGN_ASSET(2) char object_amTex_003A38[] = dobject_amTex_003A38;
+
+#define dobject_amTex_003C38 "__OTR__objects/object_am/object_amTex_003C38"
+static const ALIGN_ASSET(2) char object_amTex_003C38[] = dobject_amTex_003C38;
+
+#define dobject_amTex_004438 "__OTR__objects/object_am/object_amTex_004438"
+static const ALIGN_ASSET(2) char object_amTex_004438[] = dobject_amTex_004438;
+
+#define dobject_amTex_004C38 "__OTR__objects/object_am/object_amTex_004C38"
+static const ALIGN_ASSET(2) char object_amTex_004C38[] = dobject_amTex_004C38;
+
+#define dobject_amTex_005438 "__OTR__objects/object_am/object_amTex_005438"
+static const ALIGN_ASSET(2) char object_amTex_005438[] = dobject_amTex_005438;
+
+#define dobject_amTex_005478 "__OTR__objects/object_am/object_amTex_005478"
+static const ALIGN_ASSET(2) char object_amTex_005478[] = dobject_amTex_005478;
+
 #define dgArmosSkel "__OTR__objects/object_am/gArmosSkel"
 static const ALIGN_ASSET(2) char gArmosSkel[] = dgArmosSkel;
 
@@ -30,43 +69,5 @@ static const ALIGN_ASSET(2) char gArmosSkelLimbsLimb_0058E4DL_002278[] = dgArmos
 #define dgArmosSkelLimbsLimb_005908DL_0005D0 "__OTR__objects/object_am/gArmosSkelLimbsLimb_005908DL_0005D0"
 static const ALIGN_ASSET(2) char gArmosSkelLimbsLimb_005908DL_0005D0[] = dgArmosSkelLimbsLimb_005908DL_0005D0;
 
-#define dobject_amTex_002638 "__OTR__objects/object_am/object_amTex_002638"
-static const ALIGN_ASSET(2) char object_amTex_002638[] = dobject_amTex_002638;
-
-#define dobject_amTex_003C38 "__OTR__objects/object_am/object_amTex_003C38"
-static const ALIGN_ASSET(2) char object_amTex_003C38[] = dobject_amTex_003C38;
-
-#define dobject_amTex_003238 "__OTR__objects/object_am/object_amTex_003238"
-static const ALIGN_ASSET(2) char object_amTex_003238[] = dobject_amTex_003238;
-
-#define dobject_amTex_002838 "__OTR__objects/object_am/object_amTex_002838"
-static const ALIGN_ASSET(2) char object_amTex_002838[] = dobject_amTex_002838;
-
-#define dobject_amTex_004C38 "__OTR__objects/object_am/object_amTex_004C38"
-static const ALIGN_ASSET(2) char object_amTex_004C38[] = dobject_amTex_004C38;
-
-#define dobject_amTex_003A38 "__OTR__objects/object_am/object_amTex_003A38"
-static const ALIGN_ASSET(2) char object_amTex_003A38[] = dobject_amTex_003A38;
-
-#define dobject_amTex_003038 "__OTR__objects/object_am/object_amTex_003038"
-static const ALIGN_ASSET(2) char object_amTex_003038[] = dobject_amTex_003038;
-
-#define dobject_amTex_004438 "__OTR__objects/object_am/object_amTex_004438"
-static const ALIGN_ASSET(2) char object_amTex_004438[] = dobject_amTex_004438;
-
-#define dobject_amTex_002938 "__OTR__objects/object_am/object_amTex_002938"
-static const ALIGN_ASSET(2) char object_amTex_002938[] = dobject_amTex_002938;
-
-#define dobject_amTex_002D38 "__OTR__objects/object_am/object_amTex_002D38"
-static const ALIGN_ASSET(2) char object_amTex_002D38[] = dobject_amTex_002D38;
-
-#define dobject_amTex_002E38 "__OTR__objects/object_am/object_amTex_002E38"
-static const ALIGN_ASSET(2) char object_amTex_002E38[] = dobject_amTex_002E38;
-
-#define dobject_amTex_005478 "__OTR__objects/object_am/object_amTex_005478"
-static const ALIGN_ASSET(2) char object_amTex_005478[] = dobject_amTex_005478;
-
-#define dobject_amTex_005438 "__OTR__objects/object_am/object_amTex_005438"
-static const ALIGN_ASSET(2) char object_amTex_005438[] = dobject_amTex_005438;
 
 #endif // OBJECTS_OBJECT_AM_H
diff --git a/soh/assets/objects/object_ani/object_ani.h b/soh/assets/objects/object_ani/object_ani.h
index a2b80171f..34a57f89d 100644
--- a/soh/assets/objects/object_ani/object_ani.h
+++ b/soh/assets/objects/object_ani/object_ani.h
@@ -3,6 +3,9 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_aniTex_0011D8 "__OTR__objects/object_ani/object_aniTex_0011D8"
+static const ALIGN_ASSET(2) char object_aniTex_0011D8[] = dobject_aniTex_0011D8;
+
 #define dgRoofManSkel "__OTR__objects/object_ani/gRoofManSkel"
 static const ALIGN_ASSET(2) char gRoofManSkel[] = dgRoofManSkel;
 
@@ -99,7 +102,5 @@ static const ALIGN_ASSET(2) char gRoofManGettingUpAfterKnockbackAnim[] = dgRoofM
 #define dgRoofManIdleAnim "__OTR__objects/object_ani/gRoofManIdleAnim"
 static const ALIGN_ASSET(2) char gRoofManIdleAnim[] = dgRoofManIdleAnim;
 
-#define dobject_aniTex_0011D8 "__OTR__objects/object_ani/object_aniTex_0011D8"
-static const ALIGN_ASSET(2) char object_aniTex_0011D8[] = dobject_aniTex_0011D8;
 
 #endif // OBJECTS_OBJECT_ANI_H
diff --git a/soh/assets/objects/object_anubice/object_anubice.h b/soh/assets/objects/object_anubice/object_anubice.h
index 3d0e76d01..5a2bdf514 100644
--- a/soh/assets/objects/object_anubice/object_anubice.h
+++ b/soh/assets/objects/object_anubice/object_anubice.h
@@ -3,6 +3,33 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_anubiceTex_000F90 "__OTR__objects/object_anubice/object_anubiceTex_000F90"
+static const ALIGN_ASSET(2) char object_anubiceTex_000F90[] = dobject_anubiceTex_000F90;
+
+#define dobject_anubiceTex_001090 "__OTR__objects/object_anubice/object_anubiceTex_001090"
+static const ALIGN_ASSET(2) char object_anubiceTex_001090[] = dobject_anubiceTex_001090;
+
+#define dobject_anubiceTex_001110 "__OTR__objects/object_anubice/object_anubiceTex_001110"
+static const ALIGN_ASSET(2) char object_anubiceTex_001110[] = dobject_anubiceTex_001110;
+
+#define dobject_anubiceTex_001510 "__OTR__objects/object_anubice/object_anubiceTex_001510"
+static const ALIGN_ASSET(2) char object_anubiceTex_001510[] = dobject_anubiceTex_001510;
+
+#define dobject_anubiceTex_001590 "__OTR__objects/object_anubice/object_anubiceTex_001590"
+static const ALIGN_ASSET(2) char object_anubiceTex_001590[] = dobject_anubiceTex_001590;
+
+#define dobject_anubiceTex_001610 "__OTR__objects/object_anubice/object_anubiceTex_001610"
+static const ALIGN_ASSET(2) char object_anubiceTex_001610[] = dobject_anubiceTex_001610;
+
+#define dobject_anubiceTex_001690 "__OTR__objects/object_anubice/object_anubiceTex_001690"
+static const ALIGN_ASSET(2) char object_anubiceTex_001690[] = dobject_anubiceTex_001690;
+
+#define dobject_anubiceTex_001A90 "__OTR__objects/object_anubice/object_anubiceTex_001A90"
+static const ALIGN_ASSET(2) char object_anubiceTex_001A90[] = dobject_anubiceTex_001A90;
+
+#define dobject_anubiceTex_0036A0 "__OTR__objects/object_anubice/object_anubiceTex_0036A0"
+static const ALIGN_ASSET(2) char object_anubiceTex_0036A0[] = dobject_anubiceTex_0036A0;
+
 #define dgAnubiceSkel "__OTR__objects/object_anubice/gAnubiceSkel"
 static const ALIGN_ASSET(2) char gAnubiceSkel[] = dgAnubiceSkel;
 
@@ -39,12 +66,6 @@ static const ALIGN_ASSET(2) char gAnubiceAnim_000A48[] = dgAnubiceAnim_000A48;
 #define dgAnubiceAnim_000BAC "__OTR__objects/object_anubice/gAnubiceAnim_000BAC"
 static const ALIGN_ASSET(2) char gAnubiceAnim_000BAC[] = dgAnubiceAnim_000BAC;
 
-#define dobject_anubiceTex_001690 "__OTR__objects/object_anubice/object_anubiceTex_001690"
-static const ALIGN_ASSET(2) char object_anubiceTex_001690[] = dobject_anubiceTex_001690;
-
-#define dobject_anubiceTex_0036A0 "__OTR__objects/object_anubice/object_anubiceTex_0036A0"
-static const ALIGN_ASSET(2) char object_anubiceTex_0036A0[] = dobject_anubiceTex_0036A0;
-
 #define dgAnubiceSkelLimbsLimb_0038B8DL_002CE0 "__OTR__objects/object_anubice/gAnubiceSkelLimbsLimb_0038B8DL_002CE0"
 static const ALIGN_ASSET(2) char gAnubiceSkelLimbsLimb_0038B8DL_002CE0[] = dgAnubiceSkelLimbsLimb_0038B8DL_002CE0;
 
@@ -69,25 +90,5 @@ static const ALIGN_ASSET(2) char gAnubiceSkelLimbsLimb_003930DL_003288[] = dgAnu
 #define dgAnubiceSkelLimbsLimb_003948DL_0031A0 "__OTR__objects/object_anubice/gAnubiceSkelLimbsLimb_003948DL_0031A0"
 static const ALIGN_ASSET(2) char gAnubiceSkelLimbsLimb_003948DL_0031A0[] = dgAnubiceSkelLimbsLimb_003948DL_0031A0;
 
-#define dobject_anubiceTex_001090 "__OTR__objects/object_anubice/object_anubiceTex_001090"
-static const ALIGN_ASSET(2) char object_anubiceTex_001090[] = dobject_anubiceTex_001090;
-
-#define dobject_anubiceTex_000F90 "__OTR__objects/object_anubice/object_anubiceTex_000F90"
-static const ALIGN_ASSET(2) char object_anubiceTex_000F90[] = dobject_anubiceTex_000F90;
-
-#define dobject_anubiceTex_001110 "__OTR__objects/object_anubice/object_anubiceTex_001110"
-static const ALIGN_ASSET(2) char object_anubiceTex_001110[] = dobject_anubiceTex_001110;
-
-#define dobject_anubiceTex_001510 "__OTR__objects/object_anubice/object_anubiceTex_001510"
-static const ALIGN_ASSET(2) char object_anubiceTex_001510[] = dobject_anubiceTex_001510;
-
-#define dobject_anubiceTex_001590 "__OTR__objects/object_anubice/object_anubiceTex_001590"
-static const ALIGN_ASSET(2) char object_anubiceTex_001590[] = dobject_anubiceTex_001590;
-
-#define dobject_anubiceTex_001610 "__OTR__objects/object_anubice/object_anubiceTex_001610"
-static const ALIGN_ASSET(2) char object_anubiceTex_001610[] = dobject_anubiceTex_001610;
-
-#define dobject_anubiceTex_001A90 "__OTR__objects/object_anubice/object_anubiceTex_001A90"
-static const ALIGN_ASSET(2) char object_anubiceTex_001A90[] = dobject_anubiceTex_001A90;
 
 #endif // OBJECTS_OBJECT_ANUBICE_H
diff --git a/soh/assets/objects/object_blkobj/object_blkobj.h b/soh/assets/objects/object_blkobj/object_blkobj.h
index 3e1524b3a..dbbd1f46d 100644
--- a/soh/assets/objects/object_blkobj/object_blkobj.h
+++ b/soh/assets/objects/object_blkobj/object_blkobj.h
@@ -3,17 +3,8 @@
 
 #include "align_asset_macro.h"
 
-#define dgIllusionRoomCol "__OTR__objects/object_blkobj/gIllusionRoomCol"
-static const ALIGN_ASSET(2) char gIllusionRoomCol[] = dgIllusionRoomCol;
-
-#define dgIllusionRoomNormalDL "__OTR__objects/object_blkobj/gIllusionRoomNormalDL"
-static const ALIGN_ASSET(2) char gIllusionRoomNormalDL[] = dgIllusionRoomNormalDL;
-
-#define dgIllusionRoomIllusionDL "__OTR__objects/object_blkobj/gIllusionRoomIllusionDL"
-static const ALIGN_ASSET(2) char gIllusionRoomIllusionDL[] = dgIllusionRoomIllusionDL;
-
-#define dgIllusionRoomTreeDL "__OTR__objects/object_blkobj/gIllusionRoomTreeDL"
-static const ALIGN_ASSET(2) char gIllusionRoomTreeDL[] = dgIllusionRoomTreeDL;
+#define dobject_blkobjTex_008090 "__OTR__objects/object_blkobj/object_blkobjTex_008090"
+static const ALIGN_ASSET(2) char object_blkobjTex_008090[] = dobject_blkobjTex_008090;
 
 #define dobject_blkobjTex_008890 "__OTR__objects/object_blkobj/object_blkobjTex_008890"
 static const ALIGN_ASSET(2) char object_blkobjTex_008890[] = dobject_blkobjTex_008890;
@@ -21,50 +12,41 @@ static const ALIGN_ASSET(2) char object_blkobjTex_008890[] = dobject_blkobjTex_0
 #define dobject_blkobjTex_009090 "__OTR__objects/object_blkobj/object_blkobjTex_009090"
 static const ALIGN_ASSET(2) char object_blkobjTex_009090[] = dobject_blkobjTex_009090;
 
-#define dobject_blkobjTex_00C090 "__OTR__objects/object_blkobj/object_blkobjTex_00C090"
-static const ALIGN_ASSET(2) char object_blkobjTex_00C090[] = dobject_blkobjTex_00C090;
-
-#define dobject_blkobjTex_00D090 "__OTR__objects/object_blkobj/object_blkobjTex_00D090"
-static const ALIGN_ASSET(2) char object_blkobjTex_00D090[] = dobject_blkobjTex_00D090;
-
 #define dobject_blkobjTex_009890 "__OTR__objects/object_blkobj/object_blkobjTex_009890"
 static const ALIGN_ASSET(2) char object_blkobjTex_009890[] = dobject_blkobjTex_009890;
 
-#define dobject_blkobjTex_00B890 "__OTR__objects/object_blkobj/object_blkobjTex_00B890"
-static const ALIGN_ASSET(2) char object_blkobjTex_00B890[] = dobject_blkobjTex_00B890;
-
-#define dobject_blkobjTex_00C890 "__OTR__objects/object_blkobj/object_blkobjTex_00C890"
-static const ALIGN_ASSET(2) char object_blkobjTex_00C890[] = dobject_blkobjTex_00C890;
-
-#define dobject_blkobjTex_00B090 "__OTR__objects/object_blkobj/object_blkobjTex_00B090"
-static const ALIGN_ASSET(2) char object_blkobjTex_00B090[] = dobject_blkobjTex_00B090;
-
-#define dobject_blkobjTex_00E090 "__OTR__objects/object_blkobj/object_blkobjTex_00E090"
-static const ALIGN_ASSET(2) char object_blkobjTex_00E090[] = dobject_blkobjTex_00E090;
-
-#define dobject_blkobjTex_008090 "__OTR__objects/object_blkobj/object_blkobjTex_008090"
-static const ALIGN_ASSET(2) char object_blkobjTex_008090[] = dobject_blkobjTex_008090;
-
-#define dobject_blkobjTex_00A890 "__OTR__objects/object_blkobj/object_blkobjTex_00A890"
-static const ALIGN_ASSET(2) char object_blkobjTex_00A890[] = dobject_blkobjTex_00A890;
-
-#define dobject_blkobjTex_00D890 "__OTR__objects/object_blkobj/object_blkobjTex_00D890"
-static const ALIGN_ASSET(2) char object_blkobjTex_00D890[] = dobject_blkobjTex_00D890;
-
 #define dobject_blkobjTex_00A090 "__OTR__objects/object_blkobj/object_blkobjTex_00A090"
 static const ALIGN_ASSET(2) char object_blkobjTex_00A090[] = dobject_blkobjTex_00A090;
 
+#define dobject_blkobjTex_00A890 "__OTR__objects/object_blkobj/object_blkobjTex_00A890"
+static const ALIGN_ASSET(2) char object_blkobjTex_00A890[] = dobject_blkobjTex_00A890;
+
+#define dobject_blkobjTex_00B090 "__OTR__objects/object_blkobj/object_blkobjTex_00B090"
+static const ALIGN_ASSET(2) char object_blkobjTex_00B090[] = dobject_blkobjTex_00B090;
+
+#define dobject_blkobjTex_00B890 "__OTR__objects/object_blkobj/object_blkobjTex_00B890"
+static const ALIGN_ASSET(2) char object_blkobjTex_00B890[] = dobject_blkobjTex_00B890;
+
+#define dobject_blkobjTex_00C090 "__OTR__objects/object_blkobj/object_blkobjTex_00C090"
+static const ALIGN_ASSET(2) char object_blkobjTex_00C090[] = dobject_blkobjTex_00C090;
+
+#define dobject_blkobjTex_00C890 "__OTR__objects/object_blkobj/object_blkobjTex_00C890"
+static const ALIGN_ASSET(2) char object_blkobjTex_00C890[] = dobject_blkobjTex_00C890;
+
+#define dobject_blkobjTex_00D090 "__OTR__objects/object_blkobj/object_blkobjTex_00D090"
+static const ALIGN_ASSET(2) char object_blkobjTex_00D090[] = dobject_blkobjTex_00D090;
+
+#define dobject_blkobjTex_00D890 "__OTR__objects/object_blkobj/object_blkobjTex_00D890"
+static const ALIGN_ASSET(2) char object_blkobjTex_00D890[] = dobject_blkobjTex_00D890;
+
+#define dobject_blkobjTex_00E090 "__OTR__objects/object_blkobj/object_blkobjTex_00E090"
+static const ALIGN_ASSET(2) char object_blkobjTex_00E090[] = dobject_blkobjTex_00E090;
+
 #define dobject_blkobjTex_00E890 "__OTR__objects/object_blkobj/object_blkobjTex_00E890"
 static const ALIGN_ASSET(2) char object_blkobjTex_00E890[] = dobject_blkobjTex_00E890;
 
-#define dobject_blkobjTex_013090 "__OTR__objects/object_blkobj/object_blkobjTex_013090"
-static const ALIGN_ASSET(2) char object_blkobjTex_013090[] = dobject_blkobjTex_013090;
-
-#define dobject_blkobjTex_012890 "__OTR__objects/object_blkobj/object_blkobjTex_012890"
-static const ALIGN_ASSET(2) char object_blkobjTex_012890[] = dobject_blkobjTex_012890;
-
-#define dobject_blkobjTex_012090 "__OTR__objects/object_blkobj/object_blkobjTex_012090"
-static const ALIGN_ASSET(2) char object_blkobjTex_012090[] = dobject_blkobjTex_012090;
+#define dobject_blkobjTex_00F890 "__OTR__objects/object_blkobj/object_blkobjTex_00F890"
+static const ALIGN_ASSET(2) char object_blkobjTex_00F890[] = dobject_blkobjTex_00F890;
 
 #define dobject_blkobjTex_010090 "__OTR__objects/object_blkobj/object_blkobjTex_010090"
 static const ALIGN_ASSET(2) char object_blkobjTex_010090[] = dobject_blkobjTex_010090;
@@ -78,7 +60,25 @@ static const ALIGN_ASSET(2) char object_blkobjTex_011090[] = dobject_blkobjTex_0
 #define dobject_blkobjTex_011890 "__OTR__objects/object_blkobj/object_blkobjTex_011890"
 static const ALIGN_ASSET(2) char object_blkobjTex_011890[] = dobject_blkobjTex_011890;
 
-#define dobject_blkobjTex_00F890 "__OTR__objects/object_blkobj/object_blkobjTex_00F890"
-static const ALIGN_ASSET(2) char object_blkobjTex_00F890[] = dobject_blkobjTex_00F890;
+#define dobject_blkobjTex_012090 "__OTR__objects/object_blkobj/object_blkobjTex_012090"
+static const ALIGN_ASSET(2) char object_blkobjTex_012090[] = dobject_blkobjTex_012090;
+
+#define dobject_blkobjTex_012890 "__OTR__objects/object_blkobj/object_blkobjTex_012890"
+static const ALIGN_ASSET(2) char object_blkobjTex_012890[] = dobject_blkobjTex_012890;
+
+#define dobject_blkobjTex_013090 "__OTR__objects/object_blkobj/object_blkobjTex_013090"
+static const ALIGN_ASSET(2) char object_blkobjTex_013090[] = dobject_blkobjTex_013090;
+
+#define dgIllusionRoomCol "__OTR__objects/object_blkobj/gIllusionRoomCol"
+static const ALIGN_ASSET(2) char gIllusionRoomCol[] = dgIllusionRoomCol;
+
+#define dgIllusionRoomNormalDL "__OTR__objects/object_blkobj/gIllusionRoomNormalDL"
+static const ALIGN_ASSET(2) char gIllusionRoomNormalDL[] = dgIllusionRoomNormalDL;
+
+#define dgIllusionRoomIllusionDL "__OTR__objects/object_blkobj/gIllusionRoomIllusionDL"
+static const ALIGN_ASSET(2) char gIllusionRoomIllusionDL[] = dgIllusionRoomIllusionDL;
+
+#define dgIllusionRoomTreeDL "__OTR__objects/object_blkobj/gIllusionRoomTreeDL"
+static const ALIGN_ASSET(2) char gIllusionRoomTreeDL[] = dgIllusionRoomTreeDL;
 
 #endif // OBJECTS_OBJECT_BLKOBJ_H
diff --git a/soh/assets/objects/object_box/object_box.h b/soh/assets/objects/object_box/object_box.h
index 118b0cc50..d8c4b8e89 100644
--- a/soh/assets/objects/object_box/object_box.h
+++ b/soh/assets/objects/object_box/object_box.h
@@ -3,6 +3,9 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_boxTex_004F80 "__OTR__objects/object_box/object_boxTex_004F80"
+static const ALIGN_ASSET(2) char object_boxTex_004F80[] = dobject_boxTex_004F80;
+
 #define dgTreasureChestCurveSkel "__OTR__objects/object_box/gTreasureChestCurveSkel"
 static const ALIGN_ASSET(2) char gTreasureChestCurveSkel[] = dgTreasureChestCurveSkel;
 
@@ -72,7 +75,5 @@ static const ALIGN_ASSET(2) char gTreasureChestCurveSkelLimbsLimb_005E50Curve2DL
 #define dgTreasureChestCurveSkelLimbsLimb_005E74Curve2DL_005AB8 "__OTR__objects/object_box/gTreasureChestCurveSkelLimbsLimb_005E74Curve2DL_005AB8"
 static const ALIGN_ASSET(2) char gTreasureChestCurveSkelLimbsLimb_005E74Curve2DL_005AB8[] = dgTreasureChestCurveSkelLimbsLimb_005E74Curve2DL_005AB8;
 
-#define dobject_boxTex_004F80 "__OTR__objects/object_box/object_boxTex_004F80"
-static const ALIGN_ASSET(2) char object_boxTex_004F80[] = dobject_boxTex_004F80;
 
 #endif // OBJECTS_OBJECT_BOX_H
diff --git a/soh/assets/objects/object_bv/object_bv.h b/soh/assets/objects/object_bv/object_bv.h
index fc65e6bf5..2815f1ffc 100644
--- a/soh/assets/objects/object_bv/object_bv.h
+++ b/soh/assets/objects/object_bv/object_bv.h
@@ -3,6 +3,117 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_bvTex_000040 "__OTR__objects/object_bv/object_bvTex_000040"
+static const ALIGN_ASSET(2) char object_bvTex_000040[] = dobject_bvTex_000040;
+
+#define dobject_bvTex_000840 "__OTR__objects/object_bv/object_bvTex_000840"
+static const ALIGN_ASSET(2) char object_bvTex_000840[] = dobject_bvTex_000840;
+
+#define dobject_bvTex_000A40 "__OTR__objects/object_bv/object_bvTex_000A40"
+static const ALIGN_ASSET(2) char object_bvTex_000A40[] = dobject_bvTex_000A40;
+
+#define dobject_bvTex_0051A0 "__OTR__objects/object_bv/object_bvTex_0051A0"
+static const ALIGN_ASSET(2) char object_bvTex_0051A0[] = dobject_bvTex_0051A0;
+
+#define dobject_bvTex_0052A0 "__OTR__objects/object_bv/object_bvTex_0052A0"
+static const ALIGN_ASSET(2) char object_bvTex_0052A0[] = dobject_bvTex_0052A0;
+
+#define dobject_bvTex_0053A0 "__OTR__objects/object_bv/object_bvTex_0053A0"
+static const ALIGN_ASSET(2) char object_bvTex_0053A0[] = dobject_bvTex_0053A0;
+
+#define dobject_bvTex_0055A0 "__OTR__objects/object_bv/object_bvTex_0055A0"
+static const ALIGN_ASSET(2) char object_bvTex_0055A0[] = dobject_bvTex_0055A0;
+
+#define dobject_bvTex_0059A0 "__OTR__objects/object_bv/object_bvTex_0059A0"
+static const ALIGN_ASSET(2) char object_bvTex_0059A0[] = dobject_bvTex_0059A0;
+
+#define dobject_bvTex_005DA0 "__OTR__objects/object_bv/object_bvTex_005DA0"
+static const ALIGN_ASSET(2) char object_bvTex_005DA0[] = dobject_bvTex_005DA0;
+
+#define dobject_bvTex_0065A0 "__OTR__objects/object_bv/object_bvTex_0065A0"
+static const ALIGN_ASSET(2) char object_bvTex_0065A0[] = dobject_bvTex_0065A0;
+
+#define dobject_bvTex_008F88 "__OTR__objects/object_bv/object_bvTex_008F88"
+static const ALIGN_ASSET(2) char object_bvTex_008F88[] = dobject_bvTex_008F88;
+
+#define dobject_bvTex_0117B8 "__OTR__objects/object_bv/object_bvTex_0117B8"
+static const ALIGN_ASSET(2) char object_bvTex_0117B8[] = dobject_bvTex_0117B8;
+
+#define dobject_bvTex_0119B8 "__OTR__objects/object_bv/object_bvTex_0119B8"
+static const ALIGN_ASSET(2) char object_bvTex_0119B8[] = dobject_bvTex_0119B8;
+
+#define dobject_bvTex_011BB8 "__OTR__objects/object_bv/object_bvTex_011BB8"
+static const ALIGN_ASSET(2) char object_bvTex_011BB8[] = dobject_bvTex_011BB8;
+
+#define dobject_bvTex_012CE0 "__OTR__objects/object_bv/object_bvTex_012CE0"
+static const ALIGN_ASSET(2) char object_bvTex_012CE0[] = dobject_bvTex_012CE0;
+
+#define dobject_bvTex_013660 "__OTR__objects/object_bv/object_bvTex_013660"
+static const ALIGN_ASSET(2) char object_bvTex_013660[] = dobject_bvTex_013660;
+
+#define dobject_bvTex_0170D8 "__OTR__objects/object_bv/object_bvTex_0170D8"
+static const ALIGN_ASSET(2) char object_bvTex_0170D8[] = dobject_bvTex_0170D8;
+
+#define dobject_bvTex_0171D8 "__OTR__objects/object_bv/object_bvTex_0171D8"
+static const ALIGN_ASSET(2) char object_bvTex_0171D8[] = dobject_bvTex_0171D8;
+
+#define dobject_bvTex_018770 "__OTR__objects/object_bv/object_bvTex_018770"
+static const ALIGN_ASSET(2) char object_bvTex_018770[] = dobject_bvTex_018770;
+
+#define dobject_bvTex_018D30 "__OTR__objects/object_bv/object_bvTex_018D30"
+static const ALIGN_ASSET(2) char object_bvTex_018D30[] = dobject_bvTex_018D30;
+
+#define dobject_bvTex_018E30 "__OTR__objects/object_bv/object_bvTex_018E30"
+static const ALIGN_ASSET(2) char object_bvTex_018E30[] = dobject_bvTex_018E30;
+
+#define dobject_bvTex_019BB8 "__OTR__objects/object_bv/object_bvTex_019BB8"
+static const ALIGN_ASSET(2) char object_bvTex_019BB8[] = dobject_bvTex_019BB8;
+
+#define dobject_bvTex_01A6B8 "__OTR__objects/object_bv/object_bvTex_01A6B8"
+static const ALIGN_ASSET(2) char object_bvTex_01A6B8[] = dobject_bvTex_01A6B8;
+
+#define dobject_bvTex_01B1B8 "__OTR__objects/object_bv/object_bvTex_01B1B8"
+static const ALIGN_ASSET(2) char object_bvTex_01B1B8[] = dobject_bvTex_01B1B8;
+
+#define dobject_bvTex_01BCB8 "__OTR__objects/object_bv/object_bvTex_01BCB8"
+static const ALIGN_ASSET(2) char object_bvTex_01BCB8[] = dobject_bvTex_01BCB8;
+
+#define dobject_bvTex_01C7B8 "__OTR__objects/object_bv/object_bvTex_01C7B8"
+static const ALIGN_ASSET(2) char object_bvTex_01C7B8[] = dobject_bvTex_01C7B8;
+
+#define dobject_bvTex_01D2B8 "__OTR__objects/object_bv/object_bvTex_01D2B8"
+static const ALIGN_ASSET(2) char object_bvTex_01D2B8[] = dobject_bvTex_01D2B8;
+
+#define dobject_bvTex_01DDB8 "__OTR__objects/object_bv/object_bvTex_01DDB8"
+static const ALIGN_ASSET(2) char object_bvTex_01DDB8[] = dobject_bvTex_01DDB8;
+
+#define dobject_bvTex_01E8B8 "__OTR__objects/object_bv/object_bvTex_01E8B8"
+static const ALIGN_ASSET(2) char object_bvTex_01E8B8[] = dobject_bvTex_01E8B8;
+
+#define dobject_bvTLUT_0199B0 "__OTR__objects/object_bv/object_bvTLUT_0199B0"
+static const ALIGN_ASSET(2) char object_bvTLUT_0199B0[] = dobject_bvTLUT_0199B0;
+
+#define dobject_bvTLUT_01A4B0 "__OTR__objects/object_bv/object_bvTLUT_01A4B0"
+static const ALIGN_ASSET(2) char object_bvTLUT_01A4B0[] = dobject_bvTLUT_01A4B0;
+
+#define dobject_bvTLUT_01AFB0 "__OTR__objects/object_bv/object_bvTLUT_01AFB0"
+static const ALIGN_ASSET(2) char object_bvTLUT_01AFB0[] = dobject_bvTLUT_01AFB0;
+
+#define dobject_bvTLUT_01BAB0 "__OTR__objects/object_bv/object_bvTLUT_01BAB0"
+static const ALIGN_ASSET(2) char object_bvTLUT_01BAB0[] = dobject_bvTLUT_01BAB0;
+
+#define dobject_bvTLUT_01C5B0 "__OTR__objects/object_bv/object_bvTLUT_01C5B0"
+static const ALIGN_ASSET(2) char object_bvTLUT_01C5B0[] = dobject_bvTLUT_01C5B0;
+
+#define dobject_bvTLUT_01D0B0 "__OTR__objects/object_bv/object_bvTLUT_01D0B0"
+static const ALIGN_ASSET(2) char object_bvTLUT_01D0B0[] = dobject_bvTLUT_01D0B0;
+
+#define dobject_bvTLUT_01DBB0 "__OTR__objects/object_bv/object_bvTLUT_01DBB0"
+static const ALIGN_ASSET(2) char object_bvTLUT_01DBB0[] = dobject_bvTLUT_01DBB0;
+
+#define dobject_bvTLUT_01E6B0 "__OTR__objects/object_bv/object_bvTLUT_01E6B0"
+static const ALIGN_ASSET(2) char object_bvTLUT_01E6B0[] = dobject_bvTLUT_01E6B0;
+
 #define dgBarinadeTitleCardTex "__OTR__objects/object_bv/gBarinadeTitleCardTex"
 static const ALIGN_ASSET(2) char gBarinadeTitleCardTex[] = dgBarinadeTitleCardTex;
 
@@ -183,87 +294,6 @@ static const ALIGN_ASSET(2) char gBarinadeDL_0094F8[] = dgBarinadeDL_0094F8;
 #define dgBarinadeDL_0095B0 "__OTR__objects/object_bv/gBarinadeDL_0095B0"
 static const ALIGN_ASSET(2) char gBarinadeDL_0095B0[] = dgBarinadeDL_0095B0;
 
-#define dobject_bvTex_0065A0 "__OTR__objects/object_bv/object_bvTex_0065A0"
-static const ALIGN_ASSET(2) char object_bvTex_0065A0[] = dobject_bvTex_0065A0;
-
-#define dobject_bvTex_005DA0 "__OTR__objects/object_bv/object_bvTex_005DA0"
-static const ALIGN_ASSET(2) char object_bvTex_005DA0[] = dobject_bvTex_005DA0;
-
-#define dobject_bvTex_000A40 "__OTR__objects/object_bv/object_bvTex_000A40"
-static const ALIGN_ASSET(2) char object_bvTex_000A40[] = dobject_bvTex_000A40;
-
-#define dobject_bvTex_013660 "__OTR__objects/object_bv/object_bvTex_013660"
-static const ALIGN_ASSET(2) char object_bvTex_013660[] = dobject_bvTex_013660;
-
-#define dobject_bvTex_0117B8 "__OTR__objects/object_bv/object_bvTex_0117B8"
-static const ALIGN_ASSET(2) char object_bvTex_0117B8[] = dobject_bvTex_0117B8;
-
-#define dobject_bvTex_011BB8 "__OTR__objects/object_bv/object_bvTex_011BB8"
-static const ALIGN_ASSET(2) char object_bvTex_011BB8[] = dobject_bvTex_011BB8;
-
-#define dobject_bvTex_0119B8 "__OTR__objects/object_bv/object_bvTex_0119B8"
-static const ALIGN_ASSET(2) char object_bvTex_0119B8[] = dobject_bvTex_0119B8;
-
-#define dobject_bvTex_012CE0 "__OTR__objects/object_bv/object_bvTex_012CE0"
-static const ALIGN_ASSET(2) char object_bvTex_012CE0[] = dobject_bvTex_012CE0;
-
-#define dobject_bvTex_008F88 "__OTR__objects/object_bv/object_bvTex_008F88"
-static const ALIGN_ASSET(2) char object_bvTex_008F88[] = dobject_bvTex_008F88;
-
-#define dobject_bvTex_019BB8 "__OTR__objects/object_bv/object_bvTex_019BB8"
-static const ALIGN_ASSET(2) char object_bvTex_019BB8[] = dobject_bvTex_019BB8;
-
-#define dobject_bvTLUT_0199B0 "__OTR__objects/object_bv/object_bvTLUT_0199B0"
-static const ALIGN_ASSET(2) char object_bvTLUT_0199B0[] = dobject_bvTLUT_0199B0;
-
-#define dobject_bvTex_01A6B8 "__OTR__objects/object_bv/object_bvTex_01A6B8"
-static const ALIGN_ASSET(2) char object_bvTex_01A6B8[] = dobject_bvTex_01A6B8;
-
-#define dobject_bvTLUT_01A4B0 "__OTR__objects/object_bv/object_bvTLUT_01A4B0"
-static const ALIGN_ASSET(2) char object_bvTLUT_01A4B0[] = dobject_bvTLUT_01A4B0;
-
-#define dobject_bvTex_01B1B8 "__OTR__objects/object_bv/object_bvTex_01B1B8"
-static const ALIGN_ASSET(2) char object_bvTex_01B1B8[] = dobject_bvTex_01B1B8;
-
-#define dobject_bvTLUT_01AFB0 "__OTR__objects/object_bv/object_bvTLUT_01AFB0"
-static const ALIGN_ASSET(2) char object_bvTLUT_01AFB0[] = dobject_bvTLUT_01AFB0;
-
-#define dobject_bvTex_01BCB8 "__OTR__objects/object_bv/object_bvTex_01BCB8"
-static const ALIGN_ASSET(2) char object_bvTex_01BCB8[] = dobject_bvTex_01BCB8;
-
-#define dobject_bvTLUT_01BAB0 "__OTR__objects/object_bv/object_bvTLUT_01BAB0"
-static const ALIGN_ASSET(2) char object_bvTLUT_01BAB0[] = dobject_bvTLUT_01BAB0;
-
-#define dobject_bvTex_01C7B8 "__OTR__objects/object_bv/object_bvTex_01C7B8"
-static const ALIGN_ASSET(2) char object_bvTex_01C7B8[] = dobject_bvTex_01C7B8;
-
-#define dobject_bvTLUT_01C5B0 "__OTR__objects/object_bv/object_bvTLUT_01C5B0"
-static const ALIGN_ASSET(2) char object_bvTLUT_01C5B0[] = dobject_bvTLUT_01C5B0;
-
-#define dobject_bvTex_01D2B8 "__OTR__objects/object_bv/object_bvTex_01D2B8"
-static const ALIGN_ASSET(2) char object_bvTex_01D2B8[] = dobject_bvTex_01D2B8;
-
-#define dobject_bvTLUT_01D0B0 "__OTR__objects/object_bv/object_bvTLUT_01D0B0"
-static const ALIGN_ASSET(2) char object_bvTLUT_01D0B0[] = dobject_bvTLUT_01D0B0;
-
-#define dobject_bvTex_01DDB8 "__OTR__objects/object_bv/object_bvTex_01DDB8"
-static const ALIGN_ASSET(2) char object_bvTex_01DDB8[] = dobject_bvTex_01DDB8;
-
-#define dobject_bvTLUT_01DBB0 "__OTR__objects/object_bv/object_bvTLUT_01DBB0"
-static const ALIGN_ASSET(2) char object_bvTLUT_01DBB0[] = dobject_bvTLUT_01DBB0;
-
-#define dobject_bvTex_01E8B8 "__OTR__objects/object_bv/object_bvTex_01E8B8"
-static const ALIGN_ASSET(2) char object_bvTex_01E8B8[] = dobject_bvTex_01E8B8;
-
-#define dobject_bvTLUT_01E6B0 "__OTR__objects/object_bv/object_bvTLUT_01E6B0"
-static const ALIGN_ASSET(2) char object_bvTLUT_01E6B0[] = dobject_bvTLUT_01E6B0;
-
-#define dobject_bvTex_0052A0 "__OTR__objects/object_bv/object_bvTex_0052A0"
-static const ALIGN_ASSET(2) char object_bvTex_0052A0[] = dobject_bvTex_0052A0;
-
-#define dobject_bvTex_0053A0 "__OTR__objects/object_bv/object_bvTex_0053A0"
-static const ALIGN_ASSET(2) char object_bvTex_0053A0[] = dobject_bvTex_0053A0;
-
 #define dgBarinadeBodySkelLimbsLimb_015770DL_007FD8 "__OTR__objects/object_bv/gBarinadeBodySkelLimbsLimb_015770DL_007FD8"
 static const ALIGN_ASSET(2) char gBarinadeBodySkelLimbsLimb_015770DL_007FD8[] = dgBarinadeBodySkelLimbsLimb_015770DL_007FD8;
 
@@ -360,34 +390,5 @@ static const ALIGN_ASSET(2) char gBarinadeCutSupportSkelLimbsLimb_017F88DL_017CB
 #define dgBarinadeCutSupportSkelLimbsLimb_017F94DL_017B90 "__OTR__objects/object_bv/gBarinadeCutSupportSkelLimbsLimb_017F94DL_017B90"
 static const ALIGN_ASSET(2) char gBarinadeCutSupportSkelLimbsLimb_017F94DL_017B90[] = dgBarinadeCutSupportSkelLimbsLimb_017F94DL_017B90;
 
-#define dobject_bvTex_0051A0 "__OTR__objects/object_bv/object_bvTex_0051A0"
-static const ALIGN_ASSET(2) char object_bvTex_0051A0[] = dobject_bvTex_0051A0;
-
-#define dobject_bvTex_0055A0 "__OTR__objects/object_bv/object_bvTex_0055A0"
-static const ALIGN_ASSET(2) char object_bvTex_0055A0[] = dobject_bvTex_0055A0;
-
-#define dobject_bvTex_0059A0 "__OTR__objects/object_bv/object_bvTex_0059A0"
-static const ALIGN_ASSET(2) char object_bvTex_0059A0[] = dobject_bvTex_0059A0;
-
-#define dobject_bvTex_0170D8 "__OTR__objects/object_bv/object_bvTex_0170D8"
-static const ALIGN_ASSET(2) char object_bvTex_0170D8[] = dobject_bvTex_0170D8;
-
-#define dobject_bvTex_0171D8 "__OTR__objects/object_bv/object_bvTex_0171D8"
-static const ALIGN_ASSET(2) char object_bvTex_0171D8[] = dobject_bvTex_0171D8;
-
-#define dobject_bvTex_018E30 "__OTR__objects/object_bv/object_bvTex_018E30"
-static const ALIGN_ASSET(2) char object_bvTex_018E30[] = dobject_bvTex_018E30;
-
-#define dobject_bvTex_018D30 "__OTR__objects/object_bv/object_bvTex_018D30"
-static const ALIGN_ASSET(2) char object_bvTex_018D30[] = dobject_bvTex_018D30;
-
-#define dobject_bvTex_018770 "__OTR__objects/object_bv/object_bvTex_018770"
-static const ALIGN_ASSET(2) char object_bvTex_018770[] = dobject_bvTex_018770;
-
-#define dobject_bvTex_000840 "__OTR__objects/object_bv/object_bvTex_000840"
-static const ALIGN_ASSET(2) char object_bvTex_000840[] = dobject_bvTex_000840;
-
-#define dobject_bvTex_000040 "__OTR__objects/object_bv/object_bvTex_000040"
-static const ALIGN_ASSET(2) char object_bvTex_000040[] = dobject_bvTex_000040;
 
 #endif // OBJECTS_OBJECT_BV_H
diff --git a/soh/assets/objects/object_demo_kekkai/object_demo_kekkai.h b/soh/assets/objects/object_demo_kekkai/object_demo_kekkai.h
index 5cc98d75f..50177f33e 100644
--- a/soh/assets/objects/object_demo_kekkai/object_demo_kekkai.h
+++ b/soh/assets/objects/object_demo_kekkai/object_demo_kekkai.h
@@ -3,6 +3,54 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_demo_kekkaiTex_000000 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_000000"
+static const ALIGN_ASSET(2) char object_demo_kekkaiTex_000000[] = dobject_demo_kekkaiTex_000000;
+
+#define dobject_demo_kekkaiTex_000800 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_000800"
+static const ALIGN_ASSET(2) char object_demo_kekkaiTex_000800[] = dobject_demo_kekkaiTex_000800;
+
+#define dobject_demo_kekkaiTex_001000 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_001000"
+static const ALIGN_ASSET(2) char object_demo_kekkaiTex_001000[] = dobject_demo_kekkaiTex_001000;
+
+#define dobject_demo_kekkaiTex_002450 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_002450"
+static const ALIGN_ASSET(2) char object_demo_kekkaiTex_002450[] = dobject_demo_kekkaiTex_002450;
+
+#define dobject_demo_kekkaiTex_0036A0 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_0036A0"
+static const ALIGN_ASSET(2) char object_demo_kekkaiTex_0036A0[] = dobject_demo_kekkaiTex_0036A0;
+
+#define dobject_demo_kekkaiTex_003EA0 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_003EA0"
+static const ALIGN_ASSET(2) char object_demo_kekkaiTex_003EA0[] = dobject_demo_kekkaiTex_003EA0;
+
+#define dobject_demo_kekkaiTex_004AC0 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_004AC0"
+static const ALIGN_ASSET(2) char object_demo_kekkaiTex_004AC0[] = dobject_demo_kekkaiTex_004AC0;
+
+#define dobject_demo_kekkaiTex_006140 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_006140"
+static const ALIGN_ASSET(2) char object_demo_kekkaiTex_006140[] = dobject_demo_kekkaiTex_006140;
+
+#define dobject_demo_kekkaiTex_006940 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_006940"
+static const ALIGN_ASSET(2) char object_demo_kekkaiTex_006940[] = dobject_demo_kekkaiTex_006940;
+
+#define dobject_demo_kekkaiTex_007DB0 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_007DB0"
+static const ALIGN_ASSET(2) char object_demo_kekkaiTex_007DB0[] = dobject_demo_kekkaiTex_007DB0;
+
+#define dobject_demo_kekkaiTex_0089D0 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_0089D0"
+static const ALIGN_ASSET(2) char object_demo_kekkaiTex_0089D0[] = dobject_demo_kekkaiTex_0089D0;
+
+#define dobject_demo_kekkaiTex_0092D0 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_0092D0"
+static const ALIGN_ASSET(2) char object_demo_kekkaiTex_0092D0[] = dobject_demo_kekkaiTex_0092D0;
+
+#define dobject_demo_kekkaiTex_00A440 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_00A440"
+static const ALIGN_ASSET(2) char object_demo_kekkaiTex_00A440[] = dobject_demo_kekkaiTex_00A440;
+
+#define dobject_demo_kekkaiTex_00B540 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_00B540"
+static const ALIGN_ASSET(2) char object_demo_kekkaiTex_00B540[] = dobject_demo_kekkaiTex_00B540;
+
+#define dobject_demo_kekkaiTex_00C0B0 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_00C0B0"
+static const ALIGN_ASSET(2) char object_demo_kekkaiTex_00C0B0[] = dobject_demo_kekkaiTex_00C0B0;
+
+#define dobject_demo_kekkaiTex_00C8B0 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_00C8B0"
+static const ALIGN_ASSET(2) char object_demo_kekkaiTex_00C8B0[] = dobject_demo_kekkaiTex_00C8B0;
+
 #define dgTowerBarrierDL "__OTR__objects/object_demo_kekkai/gTowerBarrierDL"
 static const ALIGN_ASSET(2) char gTowerBarrierDL[] = dgTowerBarrierDL;
 
@@ -63,52 +111,4 @@ static const ALIGN_ASSET(2) char gDemoKekkaiDL_005FF0[] = dgDemoKekkaiDL_005FF0;
 #define dgGanonsCastleDoorDL "__OTR__objects/object_demo_kekkai/gGanonsCastleDoorDL"
 static const ALIGN_ASSET(2) char gGanonsCastleDoorDL[] = dgGanonsCastleDoorDL;
 
-#define dobject_demo_kekkaiTex_000000 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_000000"
-static const ALIGN_ASSET(2) char object_demo_kekkaiTex_000000[] = dobject_demo_kekkaiTex_000000;
-
-#define dobject_demo_kekkaiTex_004AC0 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_004AC0"
-static const ALIGN_ASSET(2) char object_demo_kekkaiTex_004AC0[] = dobject_demo_kekkaiTex_004AC0;
-
-#define dobject_demo_kekkaiTex_000800 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_000800"
-static const ALIGN_ASSET(2) char object_demo_kekkaiTex_000800[] = dobject_demo_kekkaiTex_000800;
-
-#define dobject_demo_kekkaiTex_007DB0 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_007DB0"
-static const ALIGN_ASSET(2) char object_demo_kekkaiTex_007DB0[] = dobject_demo_kekkaiTex_007DB0;
-
-#define dobject_demo_kekkaiTex_00B540 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_00B540"
-static const ALIGN_ASSET(2) char object_demo_kekkaiTex_00B540[] = dobject_demo_kekkaiTex_00B540;
-
-#define dobject_demo_kekkaiTex_00C8B0 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_00C8B0"
-static const ALIGN_ASSET(2) char object_demo_kekkaiTex_00C8B0[] = dobject_demo_kekkaiTex_00C8B0;
-
-#define dobject_demo_kekkaiTex_00C0B0 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_00C0B0"
-static const ALIGN_ASSET(2) char object_demo_kekkaiTex_00C0B0[] = dobject_demo_kekkaiTex_00C0B0;
-
-#define dobject_demo_kekkaiTex_0036A0 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_0036A0"
-static const ALIGN_ASSET(2) char object_demo_kekkaiTex_0036A0[] = dobject_demo_kekkaiTex_0036A0;
-
-#define dobject_demo_kekkaiTex_003EA0 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_003EA0"
-static const ALIGN_ASSET(2) char object_demo_kekkaiTex_003EA0[] = dobject_demo_kekkaiTex_003EA0;
-
-#define dobject_demo_kekkaiTex_0089D0 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_0089D0"
-static const ALIGN_ASSET(2) char object_demo_kekkaiTex_0089D0[] = dobject_demo_kekkaiTex_0089D0;
-
-#define dobject_demo_kekkaiTex_0092D0 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_0092D0"
-static const ALIGN_ASSET(2) char object_demo_kekkaiTex_0092D0[] = dobject_demo_kekkaiTex_0092D0;
-
-#define dobject_demo_kekkaiTex_00A440 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_00A440"
-static const ALIGN_ASSET(2) char object_demo_kekkaiTex_00A440[] = dobject_demo_kekkaiTex_00A440;
-
-#define dobject_demo_kekkaiTex_006140 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_006140"
-static const ALIGN_ASSET(2) char object_demo_kekkaiTex_006140[] = dobject_demo_kekkaiTex_006140;
-
-#define dobject_demo_kekkaiTex_006940 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_006940"
-static const ALIGN_ASSET(2) char object_demo_kekkaiTex_006940[] = dobject_demo_kekkaiTex_006940;
-
-#define dobject_demo_kekkaiTex_002450 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_002450"
-static const ALIGN_ASSET(2) char object_demo_kekkaiTex_002450[] = dobject_demo_kekkaiTex_002450;
-
-#define dobject_demo_kekkaiTex_001000 "__OTR__objects/object_demo_kekkai/object_demo_kekkaiTex_001000"
-static const ALIGN_ASSET(2) char object_demo_kekkaiTex_001000[] = dobject_demo_kekkaiTex_001000;
-
 #endif // OBJECTS_OBJECT_DEMO_KEKKAI_H
diff --git a/soh/assets/objects/object_dnk/object_dnk.h b/soh/assets/objects/object_dnk/object_dnk.h
index 6fcec0b50..90a4642a3 100644
--- a/soh/assets/objects/object_dnk/object_dnk.h
+++ b/soh/assets/objects/object_dnk/object_dnk.h
@@ -3,6 +3,21 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_dnkTex_001BD0 "__OTR__objects/object_dnk/object_dnkTex_001BD0"
+static const ALIGN_ASSET(2) char object_dnkTex_001BD0[] = dobject_dnkTex_001BD0;
+
+#define dobject_dnkTex_0023D0 "__OTR__objects/object_dnk/object_dnkTex_0023D0"
+static const ALIGN_ASSET(2) char object_dnkTex_0023D0[] = dobject_dnkTex_0023D0;
+
+#define dobject_dnkTex_002650 "__OTR__objects/object_dnk/object_dnkTex_002650"
+static const ALIGN_ASSET(2) char object_dnkTex_002650[] = dobject_dnkTex_002650;
+
+#define dobject_dnkTex_0026D0 "__OTR__objects/object_dnk/object_dnkTex_0026D0"
+static const ALIGN_ASSET(2) char object_dnkTex_0026D0[] = dobject_dnkTex_0026D0;
+
+#define dobject_dnkTex_002850 "__OTR__objects/object_dnk/object_dnkTex_002850"
+static const ALIGN_ASSET(2) char object_dnkTex_002850[] = dobject_dnkTex_002850;
+
 #define dgDntStageSkel "__OTR__objects/object_dnk/gDntStageSkel"
 static const ALIGN_ASSET(2) char gDntStageSkel[] = dgDntStageSkel;
 
@@ -42,12 +57,6 @@ static const ALIGN_ASSET(2) char gDntStageNutDL[] = dgDntStageNutDL;
 #define dgDntStageWaitAnim "__OTR__objects/object_dnk/gDntStageWaitAnim"
 static const ALIGN_ASSET(2) char gDntStageWaitAnim[] = dgDntStageWaitAnim;
 
-#define dobject_dnkTex_001BD0 "__OTR__objects/object_dnk/object_dnkTex_001BD0"
-static const ALIGN_ASSET(2) char object_dnkTex_001BD0[] = dobject_dnkTex_001BD0;
-
-#define dobject_dnkTex_002850 "__OTR__objects/object_dnk/object_dnkTex_002850"
-static const ALIGN_ASSET(2) char object_dnkTex_002850[] = dobject_dnkTex_002850;
-
 #define dgDntStageSkelLimbsLimb_002A50DL_0011E0 "__OTR__objects/object_dnk/gDntStageSkelLimbsLimb_002A50DL_0011E0"
 static const ALIGN_ASSET(2) char gDntStageSkelLimbsLimb_002A50DL_0011E0[] = dgDntStageSkelLimbsLimb_002A50DL_0011E0;
 
@@ -78,13 +87,5 @@ static const ALIGN_ASSET(2) char gDntStageSkelLimbsLimb_002AB0DL_001700[] = dgDn
 #define dgDntStageSkelLimbsLimb_002ABCDL_0017B0 "__OTR__objects/object_dnk/gDntStageSkelLimbsLimb_002ABCDL_0017B0"
 static const ALIGN_ASSET(2) char gDntStageSkelLimbsLimb_002ABCDL_0017B0[] = dgDntStageSkelLimbsLimb_002ABCDL_0017B0;
 
-#define dobject_dnkTex_0023D0 "__OTR__objects/object_dnk/object_dnkTex_0023D0"
-static const ALIGN_ASSET(2) char object_dnkTex_0023D0[] = dobject_dnkTex_0023D0;
-
-#define dobject_dnkTex_002650 "__OTR__objects/object_dnk/object_dnkTex_002650"
-static const ALIGN_ASSET(2) char object_dnkTex_002650[] = dobject_dnkTex_002650;
-
-#define dobject_dnkTex_0026D0 "__OTR__objects/object_dnk/object_dnkTex_0026D0"
-static const ALIGN_ASSET(2) char object_dnkTex_0026D0[] = dobject_dnkTex_0026D0;
 
 #endif // OBJECTS_OBJECT_DNK_H
diff --git a/soh/assets/objects/object_dns/object_dns.h b/soh/assets/objects/object_dns/object_dns.h
index 630a7e9d0..4ab11c5ef 100644
--- a/soh/assets/objects/object_dns/object_dns.h
+++ b/soh/assets/objects/object_dns/object_dns.h
@@ -3,6 +3,21 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_dnsTex_0024A0 "__OTR__objects/object_dns/object_dnsTex_0024A0"
+static const ALIGN_ASSET(2) char object_dnsTex_0024A0[] = dobject_dnsTex_0024A0;
+
+#define dobject_dnsTex_002CA0 "__OTR__objects/object_dns/object_dnsTex_002CA0"
+static const ALIGN_ASSET(2) char object_dnsTex_002CA0[] = dobject_dnsTex_002CA0;
+
+#define dobject_dnsTex_002F20 "__OTR__objects/object_dns/object_dnsTex_002F20"
+static const ALIGN_ASSET(2) char object_dnsTex_002F20[] = dobject_dnsTex_002F20;
+
+#define dobject_dnsTex_002FA0 "__OTR__objects/object_dns/object_dnsTex_002FA0"
+static const ALIGN_ASSET(2) char object_dnsTex_002FA0[] = dobject_dnsTex_002FA0;
+
+#define dobject_dnsTex_003120 "__OTR__objects/object_dns/object_dnsTex_003120"
+static const ALIGN_ASSET(2) char object_dnsTex_003120[] = dobject_dnsTex_003120;
+
 #define dgDntJijiSkel "__OTR__objects/object_dns/gDntJijiSkel"
 static const ALIGN_ASSET(2) char gDntJijiSkel[] = dgDntJijiSkel;
 
@@ -54,12 +69,6 @@ static const ALIGN_ASSET(2) char gDntJijiUnkAnim[] = dgDntJijiUnkAnim;
 #define dgDntJijiWaitAnim "__OTR__objects/object_dns/gDntJijiWaitAnim"
 static const ALIGN_ASSET(2) char gDntJijiWaitAnim[] = dgDntJijiWaitAnim;
 
-#define dobject_dnsTex_0024A0 "__OTR__objects/object_dns/object_dnsTex_0024A0"
-static const ALIGN_ASSET(2) char object_dnsTex_0024A0[] = dobject_dnsTex_0024A0;
-
-#define dobject_dnsTex_003120 "__OTR__objects/object_dns/object_dnsTex_003120"
-static const ALIGN_ASSET(2) char object_dnsTex_003120[] = dobject_dnsTex_003120;
-
 #define dgDntJijiSkelLimbsLimb_003320DL_001AF0 "__OTR__objects/object_dns/gDntJijiSkelLimbsLimb_003320DL_001AF0"
 static const ALIGN_ASSET(2) char gDntJijiSkelLimbsLimb_003320DL_001AF0[] = dgDntJijiSkelLimbsLimb_003320DL_001AF0;
 
@@ -96,13 +105,5 @@ static const ALIGN_ASSET(2) char gDntJijiSkelLimbsLimb_003398DL_001A40[] = dgDnt
 #define dgDntJijiSkelLimbsLimb_0033A4DL_001990 "__OTR__objects/object_dns/gDntJijiSkelLimbsLimb_0033A4DL_001990"
 static const ALIGN_ASSET(2) char gDntJijiSkelLimbsLimb_0033A4DL_001990[] = dgDntJijiSkelLimbsLimb_0033A4DL_001990;
 
-#define dobject_dnsTex_002CA0 "__OTR__objects/object_dns/object_dnsTex_002CA0"
-static const ALIGN_ASSET(2) char object_dnsTex_002CA0[] = dobject_dnsTex_002CA0;
-
-#define dobject_dnsTex_002F20 "__OTR__objects/object_dns/object_dnsTex_002F20"
-static const ALIGN_ASSET(2) char object_dnsTex_002F20[] = dobject_dnsTex_002F20;
-
-#define dobject_dnsTex_002FA0 "__OTR__objects/object_dns/object_dnsTex_002FA0"
-static const ALIGN_ASSET(2) char object_dnsTex_002FA0[] = dobject_dnsTex_002FA0;
 
 #endif // OBJECTS_OBJECT_DNS_H
diff --git a/soh/assets/objects/object_fd/object_fd.h b/soh/assets/objects/object_fd/object_fd.h
index fb2beed84..bc0dd3d4d 100644
--- a/soh/assets/objects/object_fd/object_fd.h
+++ b/soh/assets/objects/object_fd/object_fd.h
@@ -3,6 +3,87 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_fdTex_000458 "__OTR__objects/object_fd/object_fdTex_000458"
+static const ALIGN_ASSET(2) char object_fdTex_000458[] = dobject_fdTex_000458;
+
+#define dobject_fdTex_000658 "__OTR__objects/object_fd/object_fdTex_000658"
+static const ALIGN_ASSET(2) char object_fdTex_000658[] = dobject_fdTex_000658;
+
+#define dobject_fdTex_000A78 "__OTR__objects/object_fd/object_fdTex_000A78"
+static const ALIGN_ASSET(2) char object_fdTex_000A78[] = dobject_fdTex_000A78;
+
+#define dobject_fdTex_0040A8 "__OTR__objects/object_fd/object_fdTex_0040A8"
+static const ALIGN_ASSET(2) char object_fdTex_0040A8[] = dobject_fdTex_0040A8;
+
+#define dobject_fdTex_0048A8 "__OTR__objects/object_fd/object_fdTex_0048A8"
+static const ALIGN_ASSET(2) char object_fdTex_0048A8[] = dobject_fdTex_0048A8;
+
+#define dobject_fdTex_0050A8 "__OTR__objects/object_fd/object_fdTex_0050A8"
+static const ALIGN_ASSET(2) char object_fdTex_0050A8[] = dobject_fdTex_0050A8;
+
+#define dobject_fdTex_0052A8 "__OTR__objects/object_fd/object_fdTex_0052A8"
+static const ALIGN_ASSET(2) char object_fdTex_0052A8[] = dobject_fdTex_0052A8;
+
+#define dobject_fdTex_0054A8 "__OTR__objects/object_fd/object_fdTex_0054A8"
+static const ALIGN_ASSET(2) char object_fdTex_0054A8[] = dobject_fdTex_0054A8;
+
+#define dobject_fdTex_0056A8 "__OTR__objects/object_fd/object_fdTex_0056A8"
+static const ALIGN_ASSET(2) char object_fdTex_0056A8[] = dobject_fdTex_0056A8;
+
+#define dobject_fdTex_005B60 "__OTR__objects/object_fd/object_fdTex_005B60"
+static const ALIGN_ASSET(2) char object_fdTex_005B60[] = dobject_fdTex_005B60;
+
+#define dobject_fdTex_005D60 "__OTR__objects/object_fd/object_fdTex_005D60"
+static const ALIGN_ASSET(2) char object_fdTex_005D60[] = dobject_fdTex_005D60;
+
+#define dobject_fdTex_005F60 "__OTR__objects/object_fd/object_fdTex_005F60"
+static const ALIGN_ASSET(2) char object_fdTex_005F60[] = dobject_fdTex_005F60;
+
+#define dobject_fdTex_009208 "__OTR__objects/object_fd/object_fdTex_009208"
+static const ALIGN_ASSET(2) char object_fdTex_009208[] = dobject_fdTex_009208;
+
+#define dobject_fdTex_009780 "__OTR__objects/object_fd/object_fdTex_009780"
+static const ALIGN_ASSET(2) char object_fdTex_009780[] = dobject_fdTex_009780;
+
+#define dobject_fdTex_009980 "__OTR__objects/object_fd/object_fdTex_009980"
+static const ALIGN_ASSET(2) char object_fdTex_009980[] = dobject_fdTex_009980;
+
+#define dobject_fdTex_00A050 "__OTR__objects/object_fd/object_fdTex_00A050"
+static const ALIGN_ASSET(2) char object_fdTex_00A050[] = dobject_fdTex_00A050;
+
+#define dobject_fdTex_00A918 "__OTR__objects/object_fd/object_fdTex_00A918"
+static const ALIGN_ASSET(2) char object_fdTex_00A918[] = dobject_fdTex_00A918;
+
+#define dobject_fdTex_00AA18 "__OTR__objects/object_fd/object_fdTex_00AA18"
+static const ALIGN_ASSET(2) char object_fdTex_00AA18[] = dobject_fdTex_00AA18;
+
+#define dobject_fdTex_00B458 "__OTR__objects/object_fd/object_fdTex_00B458"
+static const ALIGN_ASSET(2) char object_fdTex_00B458[] = dobject_fdTex_00B458;
+
+#define dobject_fdTex_00BC58 "__OTR__objects/object_fd/object_fdTex_00BC58"
+static const ALIGN_ASSET(2) char object_fdTex_00BC58[] = dobject_fdTex_00BC58;
+
+#define dobject_fdTex_00BE58 "__OTR__objects/object_fd/object_fdTex_00BE58"
+static const ALIGN_ASSET(2) char object_fdTex_00BE58[] = dobject_fdTex_00BE58;
+
+#define dobject_fdTex_00C058 "__OTR__objects/object_fd/object_fdTex_00C058"
+static const ALIGN_ASSET(2) char object_fdTex_00C058[] = dobject_fdTex_00C058;
+
+#define dobject_fdTex_00D170 "__OTR__objects/object_fd/object_fdTex_00D170"
+static const ALIGN_ASSET(2) char object_fdTex_00D170[] = dobject_fdTex_00D170;
+
+#define dobject_fdTex_00D438 "__OTR__objects/object_fd/object_fdTex_00D438"
+static const ALIGN_ASSET(2) char object_fdTex_00D438[] = dobject_fdTex_00D438;
+
+#define dobject_fdTLUT_000438 "__OTR__objects/object_fd/object_fdTLUT_000438"
+static const ALIGN_ASSET(2) char object_fdTLUT_000438[] = dobject_fdTLUT_000438;
+
+#define dobject_fdTLUT_000A58 "__OTR__objects/object_fd/object_fdTLUT_000A58"
+static const ALIGN_ASSET(2) char object_fdTLUT_000A58[] = dobject_fdTLUT_000A58;
+
+#define dobject_fdTLUT_0032A8 "__OTR__objects/object_fd/object_fdTLUT_0032A8"
+static const ALIGN_ASSET(2) char object_fdTLUT_0032A8[] = dobject_fdTLUT_0032A8;
+
 #define dgVolvagiaTitleCardTex "__OTR__objects/object_fd/gVolvagiaTitleCardTex"
 static const ALIGN_ASSET(2) char gVolvagiaTitleCardTex[] = dgVolvagiaTitleCardTex;
 
@@ -150,72 +231,6 @@ static const ALIGN_ASSET(2) char gVolvagiaPlatformDL[] = dgVolvagiaPlatformDL;
 #define dgVolvagiaRockDL "__OTR__objects/object_fd/gVolvagiaRockDL"
 static const ALIGN_ASSET(2) char gVolvagiaRockDL[] = dgVolvagiaRockDL;
 
-#define dobject_fdTex_005B60 "__OTR__objects/object_fd/object_fdTex_005B60"
-static const ALIGN_ASSET(2) char object_fdTex_005B60[] = dobject_fdTex_005B60;
-
-#define dobject_fdTex_005F60 "__OTR__objects/object_fd/object_fdTex_005F60"
-static const ALIGN_ASSET(2) char object_fdTex_005F60[] = dobject_fdTex_005F60;
-
-#define dobject_fdTex_005D60 "__OTR__objects/object_fd/object_fdTex_005D60"
-static const ALIGN_ASSET(2) char object_fdTex_005D60[] = dobject_fdTex_005D60;
-
-#define dobject_fdTex_009208 "__OTR__objects/object_fd/object_fdTex_009208"
-static const ALIGN_ASSET(2) char object_fdTex_009208[] = dobject_fdTex_009208;
-
-#define dobject_fdTex_00AA18 "__OTR__objects/object_fd/object_fdTex_00AA18"
-static const ALIGN_ASSET(2) char object_fdTex_00AA18[] = dobject_fdTex_00AA18;
-
-#define dobject_fdTex_00C058 "__OTR__objects/object_fd/object_fdTex_00C058"
-static const ALIGN_ASSET(2) char object_fdTex_00C058[] = dobject_fdTex_00C058;
-
-#define dobject_fdTex_00BE58 "__OTR__objects/object_fd/object_fdTex_00BE58"
-static const ALIGN_ASSET(2) char object_fdTex_00BE58[] = dobject_fdTex_00BE58;
-
-#define dobject_fdTex_00BC58 "__OTR__objects/object_fd/object_fdTex_00BC58"
-static const ALIGN_ASSET(2) char object_fdTex_00BC58[] = dobject_fdTex_00BC58;
-
-#define dobject_fdTex_00B458 "__OTR__objects/object_fd/object_fdTex_00B458"
-static const ALIGN_ASSET(2) char object_fdTex_00B458[] = dobject_fdTex_00B458;
-
-#define dobject_fdTex_0040A8 "__OTR__objects/object_fd/object_fdTex_0040A8"
-static const ALIGN_ASSET(2) char object_fdTex_0040A8[] = dobject_fdTex_0040A8;
-
-#define dobject_fdTex_0048A8 "__OTR__objects/object_fd/object_fdTex_0048A8"
-static const ALIGN_ASSET(2) char object_fdTex_0048A8[] = dobject_fdTex_0048A8;
-
-#define dobject_fdTex_00A918 "__OTR__objects/object_fd/object_fdTex_00A918"
-static const ALIGN_ASSET(2) char object_fdTex_00A918[] = dobject_fdTex_00A918;
-
-#define dobject_fdTex_00D170 "__OTR__objects/object_fd/object_fdTex_00D170"
-static const ALIGN_ASSET(2) char object_fdTex_00D170[] = dobject_fdTex_00D170;
-
-#define dobject_fdTex_00D438 "__OTR__objects/object_fd/object_fdTex_00D438"
-static const ALIGN_ASSET(2) char object_fdTex_00D438[] = dobject_fdTex_00D438;
-
-#define dobject_fdTex_009780 "__OTR__objects/object_fd/object_fdTex_009780"
-static const ALIGN_ASSET(2) char object_fdTex_009780[] = dobject_fdTex_009780;
-
-#define dobject_fdTex_009980 "__OTR__objects/object_fd/object_fdTex_009980"
-static const ALIGN_ASSET(2) char object_fdTex_009980[] = dobject_fdTex_009980;
-
-#define dobject_fdTex_000A78 "__OTR__objects/object_fd/object_fdTex_000A78"
-static const ALIGN_ASSET(2) char object_fdTex_000A78[] = dobject_fdTex_000A78;
-
-#define dobject_fdTLUT_000A58 "__OTR__objects/object_fd/object_fdTLUT_000A58"
-static const ALIGN_ASSET(2) char object_fdTLUT_000A58[] = dobject_fdTLUT_000A58;
-
-#define dobject_fdTex_000658 "__OTR__objects/object_fd/object_fdTex_000658"
-static const ALIGN_ASSET(2) char object_fdTex_000658[] = dobject_fdTex_000658;
-
-#define dobject_fdTLUT_000438 "__OTR__objects/object_fd/object_fdTLUT_000438"
-static const ALIGN_ASSET(2) char object_fdTLUT_000438[] = dobject_fdTLUT_000438;
-
-#define dobject_fdTex_000458 "__OTR__objects/object_fd/object_fdTex_000458"
-static const ALIGN_ASSET(2) char object_fdTex_000458[] = dobject_fdTex_000458;
-
-#define dobject_fdTex_00A050 "__OTR__objects/object_fd/object_fdTex_00A050"
-static const ALIGN_ASSET(2) char object_fdTex_00A050[] = dobject_fdTex_00A050;
-
 #define dgVolvagiaLeftArmSkelLimbsLimb_011480DL_0024E8 "__OTR__objects/object_fd/gVolvagiaLeftArmSkelLimbsLimb_011480DL_0024E8"
 static const ALIGN_ASSET(2) char gVolvagiaLeftArmSkelLimbsLimb_011480DL_0024E8[] = dgVolvagiaLeftArmSkelLimbsLimb_011480DL_0024E8;
 
@@ -267,19 +282,5 @@ static const ALIGN_ASSET(2) char gVolvagiaHeadSkelLimbsLimb_011630DL_0020A8[] =
 #define dgVolvagiaHeadSkelLimbsLimb_01163CDL_001DB0 "__OTR__objects/object_fd/gVolvagiaHeadSkelLimbsLimb_01163CDL_001DB0"
 static const ALIGN_ASSET(2) char gVolvagiaHeadSkelLimbsLimb_01163CDL_001DB0[] = dgVolvagiaHeadSkelLimbsLimb_01163CDL_001DB0;
 
-#define dobject_fdTex_0050A8 "__OTR__objects/object_fd/object_fdTex_0050A8"
-static const ALIGN_ASSET(2) char object_fdTex_0050A8[] = dobject_fdTex_0050A8;
-
-#define dobject_fdTex_0054A8 "__OTR__objects/object_fd/object_fdTex_0054A8"
-static const ALIGN_ASSET(2) char object_fdTex_0054A8[] = dobject_fdTex_0054A8;
-
-#define dobject_fdTex_0052A8 "__OTR__objects/object_fd/object_fdTex_0052A8"
-static const ALIGN_ASSET(2) char object_fdTex_0052A8[] = dobject_fdTex_0052A8;
-
-#define dobject_fdTex_0056A8 "__OTR__objects/object_fd/object_fdTex_0056A8"
-static const ALIGN_ASSET(2) char object_fdTex_0056A8[] = dobject_fdTex_0056A8;
-
-#define dobject_fdTLUT_0032A8 "__OTR__objects/object_fd/object_fdTLUT_0032A8"
-static const ALIGN_ASSET(2) char object_fdTLUT_0032A8[] = dobject_fdTLUT_0032A8;
 
 #endif // OBJECTS_OBJECT_FD_H
diff --git a/soh/assets/objects/object_fd2/object_fd2.h b/soh/assets/objects/object_fd2/object_fd2.h
index 736f5f1f1..047bfce57 100644
--- a/soh/assets/objects/object_fd2/object_fd2.h
+++ b/soh/assets/objects/object_fd2/object_fd2.h
@@ -3,6 +3,39 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_fd2Tex_003308 "__OTR__objects/object_fd2/object_fd2Tex_003308"
+static const ALIGN_ASSET(2) char object_fd2Tex_003308[] = dobject_fd2Tex_003308;
+
+#define dobject_fd2Tex_003B08 "__OTR__objects/object_fd2/object_fd2Tex_003B08"
+static const ALIGN_ASSET(2) char object_fd2Tex_003B08[] = dobject_fd2Tex_003B08;
+
+#define dobject_fd2Tex_004308 "__OTR__objects/object_fd2/object_fd2Tex_004308"
+static const ALIGN_ASSET(2) char object_fd2Tex_004308[] = dobject_fd2Tex_004308;
+
+#define dobject_fd2Tex_004508 "__OTR__objects/object_fd2/object_fd2Tex_004508"
+static const ALIGN_ASSET(2) char object_fd2Tex_004508[] = dobject_fd2Tex_004508;
+
+#define dobject_fd2Tex_004708 "__OTR__objects/object_fd2/object_fd2Tex_004708"
+static const ALIGN_ASSET(2) char object_fd2Tex_004708[] = dobject_fd2Tex_004708;
+
+#define dobject_fd2Tex_004908 "__OTR__objects/object_fd2/object_fd2Tex_004908"
+static const ALIGN_ASSET(2) char object_fd2Tex_004908[] = dobject_fd2Tex_004908;
+
+#define dobject_fd2Tex_004BE8 "__OTR__objects/object_fd2/object_fd2Tex_004BE8"
+static const ALIGN_ASSET(2) char object_fd2Tex_004BE8[] = dobject_fd2Tex_004BE8;
+
+#define dobject_fd2Tex_004FA0 "__OTR__objects/object_fd2/object_fd2Tex_004FA0"
+static const ALIGN_ASSET(2) char object_fd2Tex_004FA0[] = dobject_fd2Tex_004FA0;
+
+#define dobject_fd2Tex_0051A0 "__OTR__objects/object_fd2/object_fd2Tex_0051A0"
+static const ALIGN_ASSET(2) char object_fd2Tex_0051A0[] = dobject_fd2Tex_0051A0;
+
+#define dobject_fd2Tex_0053A0 "__OTR__objects/object_fd2/object_fd2Tex_0053A0"
+static const ALIGN_ASSET(2) char object_fd2Tex_0053A0[] = dobject_fd2Tex_0053A0;
+
+#define dobject_fd2TLUT_002508 "__OTR__objects/object_fd2/object_fd2TLUT_002508"
+static const ALIGN_ASSET(2) char object_fd2TLUT_002508[] = dobject_fd2TLUT_002508;
+
 #define dgHoleVolvagiaSkel "__OTR__objects/object_fd2/gHoleVolvagiaSkel"
 static const ALIGN_ASSET(2) char gHoleVolvagiaSkel[] = dgHoleVolvagiaSkel;
 
@@ -63,18 +96,6 @@ static const ALIGN_ASSET(2) char gHoleVolvagiaVtx_00DD80[] = dgHoleVolvagiaVtx_0
 #define dgHoleVolvagiaVtx_00D000 "__OTR__objects/object_fd2/gHoleVolvagiaVtx_00D000"
 static const ALIGN_ASSET(2) char gHoleVolvagiaVtx_00D000[] = dgHoleVolvagiaVtx_00D000;
 
-#define dobject_fd2Tex_004BE8 "__OTR__objects/object_fd2/object_fd2Tex_004BE8"
-static const ALIGN_ASSET(2) char object_fd2Tex_004BE8[] = dobject_fd2Tex_004BE8;
-
-#define dobject_fd2Tex_004FA0 "__OTR__objects/object_fd2/object_fd2Tex_004FA0"
-static const ALIGN_ASSET(2) char object_fd2Tex_004FA0[] = dobject_fd2Tex_004FA0;
-
-#define dobject_fd2Tex_0053A0 "__OTR__objects/object_fd2/object_fd2Tex_0053A0"
-static const ALIGN_ASSET(2) char object_fd2Tex_0053A0[] = dobject_fd2Tex_0053A0;
-
-#define dobject_fd2Tex_0051A0 "__OTR__objects/object_fd2/object_fd2Tex_0051A0"
-static const ALIGN_ASSET(2) char object_fd2Tex_0051A0[] = dobject_fd2Tex_0051A0;
-
 #define dgHoleVolvagiaSkelLimbsLimb_011838DL_00FF70 "__OTR__objects/object_fd2/gHoleVolvagiaSkelLimbsLimb_011838DL_00FF70"
 static const ALIGN_ASSET(2) char gHoleVolvagiaSkelLimbsLimb_011838DL_00FF70[] = dgHoleVolvagiaSkelLimbsLimb_011838DL_00FF70;
 
@@ -180,25 +201,5 @@ static const ALIGN_ASSET(2) char gHoleVolvagiaSkelLimbsLimb_0119D0DL_001308[] =
 #define dgHoleVolvagiaSkelLimbsLimb_0119DCDL_001010 "__OTR__objects/object_fd2/gHoleVolvagiaSkelLimbsLimb_0119DCDL_001010"
 static const ALIGN_ASSET(2) char gHoleVolvagiaSkelLimbsLimb_0119DCDL_001010[] = dgHoleVolvagiaSkelLimbsLimb_0119DCDL_001010;
 
-#define dobject_fd2Tex_003308 "__OTR__objects/object_fd2/object_fd2Tex_003308"
-static const ALIGN_ASSET(2) char object_fd2Tex_003308[] = dobject_fd2Tex_003308;
-
-#define dobject_fd2Tex_003B08 "__OTR__objects/object_fd2/object_fd2Tex_003B08"
-static const ALIGN_ASSET(2) char object_fd2Tex_003B08[] = dobject_fd2Tex_003B08;
-
-#define dobject_fd2Tex_004308 "__OTR__objects/object_fd2/object_fd2Tex_004308"
-static const ALIGN_ASSET(2) char object_fd2Tex_004308[] = dobject_fd2Tex_004308;
-
-#define dobject_fd2Tex_004708 "__OTR__objects/object_fd2/object_fd2Tex_004708"
-static const ALIGN_ASSET(2) char object_fd2Tex_004708[] = dobject_fd2Tex_004708;
-
-#define dobject_fd2Tex_004508 "__OTR__objects/object_fd2/object_fd2Tex_004508"
-static const ALIGN_ASSET(2) char object_fd2Tex_004508[] = dobject_fd2Tex_004508;
-
-#define dobject_fd2Tex_004908 "__OTR__objects/object_fd2/object_fd2Tex_004908"
-static const ALIGN_ASSET(2) char object_fd2Tex_004908[] = dobject_fd2Tex_004908;
-
-#define dobject_fd2TLUT_002508 "__OTR__objects/object_fd2/object_fd2TLUT_002508"
-static const ALIGN_ASSET(2) char object_fd2TLUT_002508[] = dobject_fd2TLUT_002508;
 
 #endif // OBJECTS_OBJECT_FD2_H
diff --git a/soh/assets/objects/object_fhg/object_fhg.h b/soh/assets/objects/object_fhg/object_fhg.h
index fb398e416..ae1cbd1f0 100644
--- a/soh/assets/objects/object_fhg/object_fhg.h
+++ b/soh/assets/objects/object_fhg/object_fhg.h
@@ -3,6 +3,66 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_fhgTex_003320 "__OTR__objects/object_fhg/object_fhgTex_003320"
+static const ALIGN_ASSET(2) char object_fhgTex_003320[] = dobject_fhgTex_003320;
+
+#define dobject_fhgTex_003520 "__OTR__objects/object_fhg/object_fhgTex_003520"
+static const ALIGN_ASSET(2) char object_fhgTex_003520[] = dobject_fhgTex_003520;
+
+#define dobject_fhgTex_003720 "__OTR__objects/object_fhg/object_fhgTex_003720"
+static const ALIGN_ASSET(2) char object_fhgTex_003720[] = dobject_fhgTex_003720;
+
+#define dobject_fhgTex_003920 "__OTR__objects/object_fhg/object_fhgTex_003920"
+static const ALIGN_ASSET(2) char object_fhgTex_003920[] = dobject_fhgTex_003920;
+
+#define dobject_fhgTex_003B20 "__OTR__objects/object_fhg/object_fhgTex_003B20"
+static const ALIGN_ASSET(2) char object_fhgTex_003B20[] = dobject_fhgTex_003B20;
+
+#define dobject_fhgTex_003BA0 "__OTR__objects/object_fhg/object_fhgTex_003BA0"
+static const ALIGN_ASSET(2) char object_fhgTex_003BA0[] = dobject_fhgTex_003BA0;
+
+#define dobject_fhgTex_003DA0 "__OTR__objects/object_fhg/object_fhgTex_003DA0"
+static const ALIGN_ASSET(2) char object_fhgTex_003DA0[] = dobject_fhgTex_003DA0;
+
+#define dobject_fhgTex_003FA0 "__OTR__objects/object_fhg/object_fhgTex_003FA0"
+static const ALIGN_ASSET(2) char object_fhgTex_003FA0[] = dobject_fhgTex_003FA0;
+
+#define dobject_fhgTex_0043A0 "__OTR__objects/object_fhg/object_fhgTex_0043A0"
+static const ALIGN_ASSET(2) char object_fhgTex_0043A0[] = dobject_fhgTex_0043A0;
+
+#define dobject_fhgTex_0044A0 "__OTR__objects/object_fhg/object_fhgTex_0044A0"
+static const ALIGN_ASSET(2) char object_fhgTex_0044A0[] = dobject_fhgTex_0044A0;
+
+#define dobject_fhgTex_004CA0 "__OTR__objects/object_fhg/object_fhgTex_004CA0"
+static const ALIGN_ASSET(2) char object_fhgTex_004CA0[] = dobject_fhgTex_004CA0;
+
+#define dobject_fhgTex_004DA0 "__OTR__objects/object_fhg/object_fhgTex_004DA0"
+static const ALIGN_ASSET(2) char object_fhgTex_004DA0[] = dobject_fhgTex_004DA0;
+
+#define dobject_fhgTex_00D040 "__OTR__objects/object_fhg/object_fhgTex_00D040"
+static const ALIGN_ASSET(2) char object_fhgTex_00D040[] = dobject_fhgTex_00D040;
+
+#define dobject_fhgTex_00D060 "__OTR__objects/object_fhg/object_fhgTex_00D060"
+static const ALIGN_ASSET(2) char object_fhgTex_00D060[] = dobject_fhgTex_00D060;
+
+#define dobject_fhgTex_00E8B0 "__OTR__objects/object_fhg/object_fhgTex_00E8B0"
+static const ALIGN_ASSET(2) char object_fhgTex_00E8B0[] = dobject_fhgTex_00E8B0;
+
+#define dobject_fhgTex_00F0B0 "__OTR__objects/object_fhg/object_fhgTex_00F0B0"
+static const ALIGN_ASSET(2) char object_fhgTex_00F0B0[] = dobject_fhgTex_00F0B0;
+
+#define dobject_fhgTex_00FD98 "__OTR__objects/object_fhg/object_fhgTex_00FD98"
+static const ALIGN_ASSET(2) char object_fhgTex_00FD98[] = dobject_fhgTex_00FD98;
+
+#define dobject_fhgTex_010660 "__OTR__objects/object_fhg/object_fhgTex_010660"
+static const ALIGN_ASSET(2) char object_fhgTex_010660[] = dobject_fhgTex_010660;
+
+#define dobject_fhgTex_010D20 "__OTR__objects/object_fhg/object_fhgTex_010D20"
+static const ALIGN_ASSET(2) char object_fhgTex_010D20[] = dobject_fhgTex_010D20;
+
+#define dobject_fhgTex_011120 "__OTR__objects/object_fhg/object_fhgTex_011120"
+static const ALIGN_ASSET(2) char object_fhgTex_011120[] = dobject_fhgTex_011120;
+
 #define dgPhantomHorseSkel "__OTR__objects/object_fhg/gPhantomHorseSkel"
 static const ALIGN_ASSET(2) char gPhantomHorseSkel[] = dgPhantomHorseSkel;
 
@@ -54,45 +114,6 @@ static const ALIGN_ASSET(2) char gPhantomUnkDL_FCA0[] = dgPhantomUnkDL_FCA0;
 #define dgPhantomUnkDL_10CA0 "__OTR__objects/object_fhg/gPhantomUnkDL_10CA0"
 static const ALIGN_ASSET(2) char gPhantomUnkDL_10CA0[] = dgPhantomUnkDL_10CA0;
 
-#define dobject_fhgTex_00E8B0 "__OTR__objects/object_fhg/object_fhgTex_00E8B0"
-static const ALIGN_ASSET(2) char object_fhgTex_00E8B0[] = dobject_fhgTex_00E8B0;
-
-#define dobject_fhgTex_00F0B0 "__OTR__objects/object_fhg/object_fhgTex_00F0B0"
-static const ALIGN_ASSET(2) char object_fhgTex_00F0B0[] = dobject_fhgTex_00F0B0;
-
-#define dobject_fhgTex_00FD98 "__OTR__objects/object_fhg/object_fhgTex_00FD98"
-static const ALIGN_ASSET(2) char object_fhgTex_00FD98[] = dobject_fhgTex_00FD98;
-
-#define dobject_fhgTex_010660 "__OTR__objects/object_fhg/object_fhgTex_010660"
-static const ALIGN_ASSET(2) char object_fhgTex_010660[] = dobject_fhgTex_010660;
-
-#define dobject_fhgTex_011120 "__OTR__objects/object_fhg/object_fhgTex_011120"
-static const ALIGN_ASSET(2) char object_fhgTex_011120[] = dobject_fhgTex_011120;
-
-#define dobject_fhgTex_010D20 "__OTR__objects/object_fhg/object_fhgTex_010D20"
-static const ALIGN_ASSET(2) char object_fhgTex_010D20[] = dobject_fhgTex_010D20;
-
-#define dobject_fhgTex_00D060 "__OTR__objects/object_fhg/object_fhgTex_00D060"
-static const ALIGN_ASSET(2) char object_fhgTex_00D060[] = dobject_fhgTex_00D060;
-
-#define dobject_fhgTex_00D040 "__OTR__objects/object_fhg/object_fhgTex_00D040"
-static const ALIGN_ASSET(2) char object_fhgTex_00D040[] = dobject_fhgTex_00D040;
-
-#define dobject_fhgTex_004CA0 "__OTR__objects/object_fhg/object_fhgTex_004CA0"
-static const ALIGN_ASSET(2) char object_fhgTex_004CA0[] = dobject_fhgTex_004CA0;
-
-#define dobject_fhgTex_003DA0 "__OTR__objects/object_fhg/object_fhgTex_003DA0"
-static const ALIGN_ASSET(2) char object_fhgTex_003DA0[] = dobject_fhgTex_003DA0;
-
-#define dobject_fhgTex_003720 "__OTR__objects/object_fhg/object_fhgTex_003720"
-static const ALIGN_ASSET(2) char object_fhgTex_003720[] = dobject_fhgTex_003720;
-
-#define dobject_fhgTex_003520 "__OTR__objects/object_fhg/object_fhgTex_003520"
-static const ALIGN_ASSET(2) char object_fhgTex_003520[] = dobject_fhgTex_003520;
-
-#define dobject_fhgTex_003320 "__OTR__objects/object_fhg/object_fhgTex_003320"
-static const ALIGN_ASSET(2) char object_fhgTex_003320[] = dobject_fhgTex_003320;
-
 #define dgPhantomHorseSkelLimbsLimb_00ACC4SkinLimbDL_00CB30 "__OTR__objects/object_fhg/gPhantomHorseSkelLimbsLimb_00ACC4SkinLimbDL_00CB30"
 static const ALIGN_ASSET(2) char gPhantomHorseSkelLimbsLimb_00ACC4SkinLimbDL_00CB30[] = dgPhantomHorseSkelLimbsLimb_00ACC4SkinLimbDL_00CB30;
 
@@ -146,25 +167,4 @@ static const ALIGN_ASSET(2) char gPhantomHorseSkelLimbsLimb_00AFB4DL_003170[] =
 
 #define dgPhantomHorseSkelLimbsLimb_00ACC4SkinLimbDL_00CB30 "__OTR__objects/object_fhg/gPhantomHorseSkelLimbsLimb_00ACC4SkinLimbDL_00CB30"
 
-#define dobject_fhgTex_003BA0 "__OTR__objects/object_fhg/object_fhgTex_003BA0"
-static const ALIGN_ASSET(2) char object_fhgTex_003BA0[] = dobject_fhgTex_003BA0;
-
-#define dobject_fhgTex_0043A0 "__OTR__objects/object_fhg/object_fhgTex_0043A0"
-static const ALIGN_ASSET(2) char object_fhgTex_0043A0[] = dobject_fhgTex_0043A0;
-
-#define dobject_fhgTex_003FA0 "__OTR__objects/object_fhg/object_fhgTex_003FA0"
-static const ALIGN_ASSET(2) char object_fhgTex_003FA0[] = dobject_fhgTex_003FA0;
-
-#define dobject_fhgTex_004DA0 "__OTR__objects/object_fhg/object_fhgTex_004DA0"
-static const ALIGN_ASSET(2) char object_fhgTex_004DA0[] = dobject_fhgTex_004DA0;
-
-#define dobject_fhgTex_003920 "__OTR__objects/object_fhg/object_fhgTex_003920"
-static const ALIGN_ASSET(2) char object_fhgTex_003920[] = dobject_fhgTex_003920;
-
-#define dobject_fhgTex_0044A0 "__OTR__objects/object_fhg/object_fhgTex_0044A0"
-static const ALIGN_ASSET(2) char object_fhgTex_0044A0[] = dobject_fhgTex_0044A0;
-
-#define dobject_fhgTex_003B20 "__OTR__objects/object_fhg/object_fhgTex_003B20"
-static const ALIGN_ASSET(2) char object_fhgTex_003B20[] = dobject_fhgTex_003B20;
-
 #endif // OBJECTS_OBJECT_FHG_H
diff --git a/soh/assets/objects/object_fw/object_fw.h b/soh/assets/objects/object_fw/object_fw.h
index 5cf2925d2..105fa9f44 100644
--- a/soh/assets/objects/object_fw/object_fw.h
+++ b/soh/assets/objects/object_fw/object_fw.h
@@ -3,6 +3,9 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_fwTex_007A90 "__OTR__objects/object_fw/object_fwTex_007A90"
+static const ALIGN_ASSET(2) char object_fwTex_007A90[] = dobject_fwTex_007A90;
+
 #define dgFlareDancerSkel "__OTR__objects/object_fw/gFlareDancerSkel"
 static const ALIGN_ASSET(2) char gFlareDancerSkel[] = dgFlareDancerSkel;
 
@@ -150,7 +153,5 @@ static const ALIGN_ASSET(2) char gFlareDancerCoreRunCycleAnim[] = dgFlareDancerC
 #define dgFlareDancerCoreEndRunCycleAnim "__OTR__objects/object_fw/gFlareDancerCoreEndRunCycleAnim"
 static const ALIGN_ASSET(2) char gFlareDancerCoreEndRunCycleAnim[] = dgFlareDancerCoreEndRunCycleAnim;
 
-#define dobject_fwTex_007A90 "__OTR__objects/object_fw/object_fwTex_007A90"
-static const ALIGN_ASSET(2) char object_fwTex_007A90[] = dobject_fwTex_007A90;
 
 #endif // OBJECTS_OBJECT_FW_H
diff --git a/soh/assets/objects/object_geldb/object_geldb.h b/soh/assets/objects/object_geldb/object_geldb.h
index 169277a70..f8e771639 100644
--- a/soh/assets/objects/object_geldb/object_geldb.h
+++ b/soh/assets/objects/object_geldb/object_geldb.h
@@ -3,6 +3,54 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_geldbTex_002700 "__OTR__objects/object_geldb/object_geldbTex_002700"
+static const ALIGN_ASSET(2) char object_geldbTex_002700[] = dobject_geldbTex_002700;
+
+#define dobject_geldbTex_002740 "__OTR__objects/object_geldb/object_geldbTex_002740"
+static const ALIGN_ASSET(2) char object_geldbTex_002740[] = dobject_geldbTex_002740;
+
+#define dobject_geldbTex_002780 "__OTR__objects/object_geldb/object_geldbTex_002780"
+static const ALIGN_ASSET(2) char object_geldbTex_002780[] = dobject_geldbTex_002780;
+
+#define dobject_geldbTex_002880 "__OTR__objects/object_geldb/object_geldbTex_002880"
+static const ALIGN_ASSET(2) char object_geldbTex_002880[] = dobject_geldbTex_002880;
+
+#define dobject_geldbTex_002980 "__OTR__objects/object_geldb/object_geldbTex_002980"
+static const ALIGN_ASSET(2) char object_geldbTex_002980[] = dobject_geldbTex_002980;
+
+#define dobject_geldbTex_002A80 "__OTR__objects/object_geldb/object_geldbTex_002A80"
+static const ALIGN_ASSET(2) char object_geldbTex_002A80[] = dobject_geldbTex_002A80;
+
+#define dobject_geldbTex_002B80 "__OTR__objects/object_geldb/object_geldbTex_002B80"
+static const ALIGN_ASSET(2) char object_geldbTex_002B80[] = dobject_geldbTex_002B80;
+
+#define dobject_geldbTex_005F68 "__OTR__objects/object_geldb/object_geldbTex_005F68"
+static const ALIGN_ASSET(2) char object_geldbTex_005F68[] = dobject_geldbTex_005F68;
+
+#define dobject_geldbTex_0063E8 "__OTR__objects/object_geldb/object_geldbTex_0063E8"
+static const ALIGN_ASSET(2) char object_geldbTex_0063E8[] = dobject_geldbTex_0063E8;
+
+#define dobject_geldbTex_0064E8 "__OTR__objects/object_geldb/object_geldbTex_0064E8"
+static const ALIGN_ASSET(2) char object_geldbTex_0064E8[] = dobject_geldbTex_0064E8;
+
+#define dobject_geldbTex_006568 "__OTR__objects/object_geldb/object_geldbTex_006568"
+static const ALIGN_ASSET(2) char object_geldbTex_006568[] = dobject_geldbTex_006568;
+
+#define dobject_geldbTex_0069A8 "__OTR__objects/object_geldb/object_geldbTex_0069A8"
+static const ALIGN_ASSET(2) char object_geldbTex_0069A8[] = dobject_geldbTex_0069A8;
+
+#define dobject_geldbTex_006A28 "__OTR__objects/object_geldb/object_geldbTex_006A28"
+static const ALIGN_ASSET(2) char object_geldbTex_006A28[] = dobject_geldbTex_006A28;
+
+#define dobject_geldbTex_006B28 "__OTR__objects/object_geldb/object_geldbTex_006B28"
+static const ALIGN_ASSET(2) char object_geldbTex_006B28[] = dobject_geldbTex_006B28;
+
+#define dobject_geldbTex_006C28 "__OTR__objects/object_geldb/object_geldbTex_006C28"
+static const ALIGN_ASSET(2) char object_geldbTex_006C28[] = dobject_geldbTex_006C28;
+
+#define dobject_geldbTLUT_002500 "__OTR__objects/object_geldb/object_geldbTLUT_002500"
+static const ALIGN_ASSET(2) char object_geldbTLUT_002500[] = dobject_geldbTLUT_002500;
+
 #define dgGerudoRedSkel "__OTR__objects/object_geldb/gGerudoRedSkel"
 static const ALIGN_ASSET(2) char gGerudoRedSkel[] = dgGerudoRedSkel;
 
@@ -111,52 +159,5 @@ static const ALIGN_ASSET(2) char gGerudoRedSkelLimbsLimb_00A3E4DL_009108[] = dgG
 #define dgGerudoRedSkelLimbsLimb_00A3F0DL_005420 "__OTR__objects/object_geldb/gGerudoRedSkelLimbsLimb_00A3F0DL_005420"
 static const ALIGN_ASSET(2) char gGerudoRedSkelLimbsLimb_00A3F0DL_005420[] = dgGerudoRedSkelLimbsLimb_00A3F0DL_005420;
 
-#define dobject_geldbTLUT_002500 "__OTR__objects/object_geldb/object_geldbTLUT_002500"
-static const ALIGN_ASSET(2) char object_geldbTLUT_002500[] = dobject_geldbTLUT_002500;
-
-#define dobject_geldbTex_002700 "__OTR__objects/object_geldb/object_geldbTex_002700"
-static const ALIGN_ASSET(2) char object_geldbTex_002700[] = dobject_geldbTex_002700;
-
-#define dobject_geldbTex_002980 "__OTR__objects/object_geldb/object_geldbTex_002980"
-static const ALIGN_ASSET(2) char object_geldbTex_002980[] = dobject_geldbTex_002980;
-
-#define dobject_geldbTex_002880 "__OTR__objects/object_geldb/object_geldbTex_002880"
-static const ALIGN_ASSET(2) char object_geldbTex_002880[] = dobject_geldbTex_002880;
-
-#define dobject_geldbTex_002780 "__OTR__objects/object_geldb/object_geldbTex_002780"
-static const ALIGN_ASSET(2) char object_geldbTex_002780[] = dobject_geldbTex_002780;
-
-#define dobject_geldbTex_002740 "__OTR__objects/object_geldb/object_geldbTex_002740"
-static const ALIGN_ASSET(2) char object_geldbTex_002740[] = dobject_geldbTex_002740;
-
-#define dobject_geldbTex_006A28 "__OTR__objects/object_geldb/object_geldbTex_006A28"
-static const ALIGN_ASSET(2) char object_geldbTex_006A28[] = dobject_geldbTex_006A28;
-
-#define dobject_geldbTex_0063E8 "__OTR__objects/object_geldb/object_geldbTex_0063E8"
-static const ALIGN_ASSET(2) char object_geldbTex_0063E8[] = dobject_geldbTex_0063E8;
-
-#define dobject_geldbTex_005F68 "__OTR__objects/object_geldb/object_geldbTex_005F68"
-static const ALIGN_ASSET(2) char object_geldbTex_005F68[] = dobject_geldbTex_005F68;
-
-#define dobject_geldbTex_006C28 "__OTR__objects/object_geldb/object_geldbTex_006C28"
-static const ALIGN_ASSET(2) char object_geldbTex_006C28[] = dobject_geldbTex_006C28;
-
-#define dobject_geldbTex_0069A8 "__OTR__objects/object_geldb/object_geldbTex_0069A8"
-static const ALIGN_ASSET(2) char object_geldbTex_0069A8[] = dobject_geldbTex_0069A8;
-
-#define dobject_geldbTex_006B28 "__OTR__objects/object_geldb/object_geldbTex_006B28"
-static const ALIGN_ASSET(2) char object_geldbTex_006B28[] = dobject_geldbTex_006B28;
-
-#define dobject_geldbTex_002A80 "__OTR__objects/object_geldb/object_geldbTex_002A80"
-static const ALIGN_ASSET(2) char object_geldbTex_002A80[] = dobject_geldbTex_002A80;
-
-#define dobject_geldbTex_002B80 "__OTR__objects/object_geldb/object_geldbTex_002B80"
-static const ALIGN_ASSET(2) char object_geldbTex_002B80[] = dobject_geldbTex_002B80;
-
-#define dobject_geldbTex_0064E8 "__OTR__objects/object_geldb/object_geldbTex_0064E8"
-static const ALIGN_ASSET(2) char object_geldbTex_0064E8[] = dobject_geldbTex_0064E8;
-
-#define dobject_geldbTex_006568 "__OTR__objects/object_geldb/object_geldbTex_006568"
-static const ALIGN_ASSET(2) char object_geldbTex_006568[] = dobject_geldbTex_006568;
 
 #endif // OBJECTS_OBJECT_GELDB_H
diff --git a/soh/assets/objects/object_gi_boots_2/object_gi_boots_2.h b/soh/assets/objects/object_gi_boots_2/object_gi_boots_2.h
index c7cb14d3b..9b8247559 100644
--- a/soh/assets/objects/object_gi_boots_2/object_gi_boots_2.h
+++ b/soh/assets/objects/object_gi_boots_2/object_gi_boots_2.h
@@ -3,13 +3,13 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_gi_boots_2Tex_000000 "__OTR__objects/object_gi_boots_2/object_gi_boots_2Tex_000000"
+static const ALIGN_ASSET(2) char object_gi_boots_2Tex_000000[] = dobject_gi_boots_2Tex_000000;
+
 #define dgGiIronBootsDL "__OTR__objects/object_gi_boots_2/gGiIronBootsDL"
 static const ALIGN_ASSET(2) char gGiIronBootsDL[] = dgGiIronBootsDL;
 
 #define dgGiIronBootsRivetsDL "__OTR__objects/object_gi_boots_2/gGiIronBootsRivetsDL"
 static const ALIGN_ASSET(2) char gGiIronBootsRivetsDL[] = dgGiIronBootsRivetsDL;
 
-#define dobject_gi_boots_2Tex_000000 "__OTR__objects/object_gi_boots_2/object_gi_boots_2Tex_000000"
-static const ALIGN_ASSET(2) char object_gi_boots_2Tex_000000[] = dobject_gi_boots_2Tex_000000;
-
 #endif // OBJECTS_OBJECT_GI_BOOTS_2_H
diff --git a/soh/assets/objects/object_gi_butterfly/object_gi_butterfly.h b/soh/assets/objects/object_gi_butterfly/object_gi_butterfly.h
index f8936cfa7..8838bf2eb 100644
--- a/soh/assets/objects/object_gi_butterfly/object_gi_butterfly.h
+++ b/soh/assets/objects/object_gi_butterfly/object_gi_butterfly.h
@@ -3,13 +3,13 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_gi_butterflyTex_000000 "__OTR__objects/object_gi_butterfly/object_gi_butterflyTex_000000"
+static const ALIGN_ASSET(2) char object_gi_butterflyTex_000000[] = dobject_gi_butterflyTex_000000;
+
 #define dgGiButterflyContainerDL "__OTR__objects/object_gi_butterfly/gGiButterflyContainerDL"
 static const ALIGN_ASSET(2) char gGiButterflyContainerDL[] = dgGiButterflyContainerDL;
 
 #define dgGiButterflyGlassDL "__OTR__objects/object_gi_butterfly/gGiButterflyGlassDL"
 static const ALIGN_ASSET(2) char gGiButterflyGlassDL[] = dgGiButterflyGlassDL;
 
-#define dobject_gi_butterflyTex_000000 "__OTR__objects/object_gi_butterfly/object_gi_butterflyTex_000000"
-static const ALIGN_ASSET(2) char object_gi_butterflyTex_000000[] = dobject_gi_butterflyTex_000000;
-
 #endif // OBJECTS_OBJECT_GI_BUTTERFLY_H
diff --git a/soh/assets/objects/object_gi_clothes/object_gi_clothes.h b/soh/assets/objects/object_gi_clothes/object_gi_clothes.h
index f9546b31f..21989e15f 100644
--- a/soh/assets/objects/object_gi_clothes/object_gi_clothes.h
+++ b/soh/assets/objects/object_gi_clothes/object_gi_clothes.h
@@ -3,6 +3,9 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_gi_clothesTex_000000 "__OTR__objects/object_gi_clothes/object_gi_clothesTex_000000"
+static const ALIGN_ASSET(2) char object_gi_clothesTex_000000[] = dobject_gi_clothesTex_000000;
+
 #define dgGiGoronCollarColorDL "__OTR__objects/object_gi_clothes/gGiGoronCollarColorDL"
 static const ALIGN_ASSET(2) char gGiGoronCollarColorDL[] = dgGiGoronCollarColorDL;
 
@@ -21,7 +24,4 @@ static const ALIGN_ASSET(2) char gGiTunicCollarDL[] = dgGiTunicCollarDL;
 #define dgGiTunicDL "__OTR__objects/object_gi_clothes/gGiTunicDL"
 static const ALIGN_ASSET(2) char gGiTunicDL[] = dgGiTunicDL;
 
-#define dobject_gi_clothesTex_000000 "__OTR__objects/object_gi_clothes/object_gi_clothesTex_000000"
-static const ALIGN_ASSET(2) char object_gi_clothesTex_000000[] = dobject_gi_clothesTex_000000;
-
 #endif // OBJECTS_OBJECT_GI_CLOTHES_H
diff --git a/soh/assets/objects/object_gi_dekupouch/object_gi_dekupouch.h b/soh/assets/objects/object_gi_dekupouch/object_gi_dekupouch.h
index c80b269e0..cd92bf231 100644
--- a/soh/assets/objects/object_gi_dekupouch/object_gi_dekupouch.h
+++ b/soh/assets/objects/object_gi_dekupouch/object_gi_dekupouch.h
@@ -3,6 +3,12 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_gi_dekupouchTex_000000 "__OTR__objects/object_gi_dekupouch/object_gi_dekupouchTex_000000"
+static const ALIGN_ASSET(2) char object_gi_dekupouchTex_000000[] = dobject_gi_dekupouchTex_000000;
+
+#define dobject_gi_dekupouchTex_000100 "__OTR__objects/object_gi_dekupouch/object_gi_dekupouchTex_000100"
+static const ALIGN_ASSET(2) char object_gi_dekupouchTex_000100[] = dobject_gi_dekupouchTex_000100;
+
 #define dgGiBulletBagColorDL "__OTR__objects/object_gi_dekupouch/gGiBulletBagColorDL"
 static const ALIGN_ASSET(2) char gGiBulletBagColorDL[] = dgGiBulletBagColorDL;
 
@@ -24,10 +30,4 @@ static const ALIGN_ASSET(2) char gGiBulletBagStringDL[] = dgGiBulletBagStringDL;
 #define dgGiBulletBagWritingDL "__OTR__objects/object_gi_dekupouch/gGiBulletBagWritingDL"
 static const ALIGN_ASSET(2) char gGiBulletBagWritingDL[] = dgGiBulletBagWritingDL;
 
-#define dobject_gi_dekupouchTex_000000 "__OTR__objects/object_gi_dekupouch/object_gi_dekupouchTex_000000"
-static const ALIGN_ASSET(2) char object_gi_dekupouchTex_000000[] = dobject_gi_dekupouchTex_000000;
-
-#define dobject_gi_dekupouchTex_000100 "__OTR__objects/object_gi_dekupouch/object_gi_dekupouchTex_000100"
-static const ALIGN_ASSET(2) char object_gi_dekupouchTex_000100[] = dobject_gi_dekupouchTex_000100;
-
 #endif // OBJECTS_OBJECT_GI_DEKUPOUCH_H
diff --git a/soh/assets/objects/object_gi_fire/object_gi_fire.h b/soh/assets/objects/object_gi_fire/object_gi_fire.h
index f66f7a766..649eaed9e 100644
--- a/soh/assets/objects/object_gi_fire/object_gi_fire.h
+++ b/soh/assets/objects/object_gi_fire/object_gi_fire.h
@@ -3,16 +3,16 @@
 
 #include "align_asset_macro.h"
 
-#define dgGiBlueFireChamberstickDL "__OTR__objects/object_gi_fire/gGiBlueFireChamberstickDL"
-static const ALIGN_ASSET(2) char gGiBlueFireChamberstickDL[] = dgGiBlueFireChamberstickDL;
-
-#define dgGiBlueFireFlameDL "__OTR__objects/object_gi_fire/gGiBlueFireFlameDL"
-static const ALIGN_ASSET(2) char gGiBlueFireFlameDL[] = dgGiBlueFireFlameDL;
-
 #define dobject_gi_fireTex_000000 "__OTR__objects/object_gi_fire/object_gi_fireTex_000000"
 static const ALIGN_ASSET(2) char object_gi_fireTex_000000[] = dobject_gi_fireTex_000000;
 
 #define dobject_gi_fireTex_000200 "__OTR__objects/object_gi_fire/object_gi_fireTex_000200"
 static const ALIGN_ASSET(2) char object_gi_fireTex_000200[] = dobject_gi_fireTex_000200;
 
+#define dgGiBlueFireChamberstickDL "__OTR__objects/object_gi_fire/gGiBlueFireChamberstickDL"
+static const ALIGN_ASSET(2) char gGiBlueFireChamberstickDL[] = dgGiBlueFireChamberstickDL;
+
+#define dgGiBlueFireFlameDL "__OTR__objects/object_gi_fire/gGiBlueFireFlameDL"
+static const ALIGN_ASSET(2) char gGiBlueFireFlameDL[] = dgGiBlueFireFlameDL;
+
 #endif // OBJECTS_OBJECT_GI_FIRE_H
diff --git a/soh/assets/objects/object_gi_frog/object_gi_frog.h b/soh/assets/objects/object_gi_frog/object_gi_frog.h
index ba33d67b5..53a163926 100644
--- a/soh/assets/objects/object_gi_frog/object_gi_frog.h
+++ b/soh/assets/objects/object_gi_frog/object_gi_frog.h
@@ -3,13 +3,13 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_gi_frogTex_000000 "__OTR__objects/object_gi_frog/object_gi_frogTex_000000"
+static const ALIGN_ASSET(2) char object_gi_frogTex_000000[] = dobject_gi_frogTex_000000;
+
 #define dgGiFrogDL "__OTR__objects/object_gi_frog/gGiFrogDL"
 static const ALIGN_ASSET(2) char gGiFrogDL[] = dgGiFrogDL;
 
 #define dgGiFrogEyesDL "__OTR__objects/object_gi_frog/gGiFrogEyesDL"
 static const ALIGN_ASSET(2) char gGiFrogEyesDL[] = dgGiFrogEyesDL;
 
-#define dobject_gi_frogTex_000000 "__OTR__objects/object_gi_frog/object_gi_frogTex_000000"
-static const ALIGN_ASSET(2) char object_gi_frogTex_000000[] = dobject_gi_frogTex_000000;
-
 #endif // OBJECTS_OBJECT_GI_FROG_H
diff --git a/soh/assets/objects/object_gi_gerudo/object_gi_gerudo.h b/soh/assets/objects/object_gi_gerudo/object_gi_gerudo.h
index fd05e9ff0..35633e972 100644
--- a/soh/assets/objects/object_gi_gerudo/object_gi_gerudo.h
+++ b/soh/assets/objects/object_gi_gerudo/object_gi_gerudo.h
@@ -3,10 +3,10 @@
 
 #include "align_asset_macro.h"
 
-#define dgGiGerudoCardDL "__OTR__objects/object_gi_gerudo/gGiGerudoCardDL"
-static const ALIGN_ASSET(2) char gGiGerudoCardDL[] = dgGiGerudoCardDL;
-
 #define dobject_gi_gerudoTex_000000 "__OTR__objects/object_gi_gerudo/object_gi_gerudoTex_000000"
 static const ALIGN_ASSET(2) char object_gi_gerudoTex_000000[] = dobject_gi_gerudoTex_000000;
 
+#define dgGiGerudoCardDL "__OTR__objects/object_gi_gerudo/gGiGerudoCardDL"
+static const ALIGN_ASSET(2) char gGiGerudoCardDL[] = dgGiGerudoCardDL;
+
 #endif // OBJECTS_OBJECT_GI_GERUDO_H
diff --git a/soh/assets/objects/object_gi_gerudomask/object_gi_gerudomask.h b/soh/assets/objects/object_gi_gerudomask/object_gi_gerudomask.h
index 2eb6032b6..7983b3ef6 100644
--- a/soh/assets/objects/object_gi_gerudomask/object_gi_gerudomask.h
+++ b/soh/assets/objects/object_gi_gerudomask/object_gi_gerudomask.h
@@ -3,15 +3,9 @@
 
 #include "align_asset_macro.h"
 
-#define dgGiGerudoMaskDL "__OTR__objects/object_gi_gerudomask/gGiGerudoMaskDL"
-static const ALIGN_ASSET(2) char gGiGerudoMaskDL[] = dgGiGerudoMaskDL;
-
 #define dobject_gi_gerudomaskTex_000208 "__OTR__objects/object_gi_gerudomask/object_gi_gerudomaskTex_000208"
 static const ALIGN_ASSET(2) char object_gi_gerudomaskTex_000208[] = dobject_gi_gerudomaskTex_000208;
 
-#define dobject_gi_gerudomaskTLUT_000000 "__OTR__objects/object_gi_gerudomask/object_gi_gerudomaskTLUT_000000"
-static const ALIGN_ASSET(2) char object_gi_gerudomaskTLUT_000000[] = dobject_gi_gerudomaskTLUT_000000;
-
 #define dobject_gi_gerudomaskTex_000248 "__OTR__objects/object_gi_gerudomask/object_gi_gerudomaskTex_000248"
 static const ALIGN_ASSET(2) char object_gi_gerudomaskTex_000248[] = dobject_gi_gerudomaskTex_000248;
 
@@ -21,4 +15,10 @@ static const ALIGN_ASSET(2) char object_gi_gerudomaskTex_000348[] = dobject_gi_g
 #define dobject_gi_gerudomaskTex_000448 "__OTR__objects/object_gi_gerudomask/object_gi_gerudomaskTex_000448"
 static const ALIGN_ASSET(2) char object_gi_gerudomaskTex_000448[] = dobject_gi_gerudomaskTex_000448;
 
+#define dobject_gi_gerudomaskTLUT_000000 "__OTR__objects/object_gi_gerudomask/object_gi_gerudomaskTLUT_000000"
+static const ALIGN_ASSET(2) char object_gi_gerudomaskTLUT_000000[] = dobject_gi_gerudomaskTLUT_000000;
+
+#define dgGiGerudoMaskDL "__OTR__objects/object_gi_gerudomask/gGiGerudoMaskDL"
+static const ALIGN_ASSET(2) char gGiGerudoMaskDL[] = dgGiGerudoMaskDL;
+
 #endif // OBJECTS_OBJECT_GI_GERUDOMASK_H
diff --git a/soh/assets/objects/object_gi_ghost/object_gi_ghost.h b/soh/assets/objects/object_gi_ghost/object_gi_ghost.h
index e1cf7f924..47f49d427 100644
--- a/soh/assets/objects/object_gi_ghost/object_gi_ghost.h
+++ b/soh/assets/objects/object_gi_ghost/object_gi_ghost.h
@@ -3,6 +3,12 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_gi_ghostTex_000000 "__OTR__objects/object_gi_ghost/object_gi_ghostTex_000000"
+static const ALIGN_ASSET(2) char object_gi_ghostTex_000000[] = dobject_gi_ghostTex_000000;
+
+#define dobject_gi_ghostTex_000200 "__OTR__objects/object_gi_ghost/object_gi_ghostTex_000200"
+static const ALIGN_ASSET(2) char object_gi_ghostTex_000200[] = dobject_gi_ghostTex_000200;
+
 #define dgGiPoeColorDL "__OTR__objects/object_gi_ghost/gGiPoeColorDL"
 static const ALIGN_ASSET(2) char gGiPoeColorDL[] = dgGiPoeColorDL;
 
@@ -18,10 +24,4 @@ static const ALIGN_ASSET(2) char gGiGhostContainerGlassDL[] = dgGiGhostContainer
 #define dgGiGhostContainerContentsDL "__OTR__objects/object_gi_ghost/gGiGhostContainerContentsDL"
 static const ALIGN_ASSET(2) char gGiGhostContainerContentsDL[] = dgGiGhostContainerContentsDL;
 
-#define dobject_gi_ghostTex_000000 "__OTR__objects/object_gi_ghost/object_gi_ghostTex_000000"
-static const ALIGN_ASSET(2) char object_gi_ghostTex_000000[] = dobject_gi_ghostTex_000000;
-
-#define dobject_gi_ghostTex_000200 "__OTR__objects/object_gi_ghost/object_gi_ghostTex_000200"
-static const ALIGN_ASSET(2) char object_gi_ghostTex_000200[] = dobject_gi_ghostTex_000200;
-
 #endif // OBJECTS_OBJECT_GI_GHOST_H
diff --git a/soh/assets/objects/object_gi_gloves/object_gi_gloves.h b/soh/assets/objects/object_gi_gloves/object_gi_gloves.h
index f56225493..65a4d4dc8 100644
--- a/soh/assets/objects/object_gi_gloves/object_gi_gloves.h
+++ b/soh/assets/objects/object_gi_gloves/object_gi_gloves.h
@@ -3,6 +3,9 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_gi_glovesTex_000000 "__OTR__objects/object_gi_gloves/object_gi_glovesTex_000000"
+static const ALIGN_ASSET(2) char object_gi_glovesTex_000000[] = dobject_gi_glovesTex_000000;
+
 #define dgGiSilverGauntletsColorDL "__OTR__objects/object_gi_gloves/gGiSilverGauntletsColorDL"
 static const ALIGN_ASSET(2) char gGiSilverGauntletsColorDL[] = dgGiSilverGauntletsColorDL;
 
@@ -21,7 +24,4 @@ static const ALIGN_ASSET(2) char gGiGauntletsDL[] = dgGiGauntletsDL;
 #define dgGiGauntletsPlateDL "__OTR__objects/object_gi_gloves/gGiGauntletsPlateDL"
 static const ALIGN_ASSET(2) char gGiGauntletsPlateDL[] = dgGiGauntletsPlateDL;
 
-#define dobject_gi_glovesTex_000000 "__OTR__objects/object_gi_gloves/object_gi_glovesTex_000000"
-static const ALIGN_ASSET(2) char object_gi_glovesTex_000000[] = dobject_gi_glovesTex_000000;
-
 #endif // OBJECTS_OBJECT_GI_GLOVES_H
diff --git a/soh/assets/objects/object_gi_golonmask/object_gi_golonmask.h b/soh/assets/objects/object_gi_golonmask/object_gi_golonmask.h
index 3e6dc1bcf..03ee995e9 100644
--- a/soh/assets/objects/object_gi_golonmask/object_gi_golonmask.h
+++ b/soh/assets/objects/object_gi_golonmask/object_gi_golonmask.h
@@ -3,15 +3,9 @@
 
 #include "align_asset_macro.h"
 
-#define dgGiGoronMaskDL "__OTR__objects/object_gi_golonmask/gGiGoronMaskDL"
-static const ALIGN_ASSET(2) char gGiGoronMaskDL[] = dgGiGoronMaskDL;
-
 #define dobject_gi_golonmaskTex_000208 "__OTR__objects/object_gi_golonmask/object_gi_golonmaskTex_000208"
 static const ALIGN_ASSET(2) char object_gi_golonmaskTex_000208[] = dobject_gi_golonmaskTex_000208;
 
-#define dobject_gi_golonmaskTLUT_000000 "__OTR__objects/object_gi_golonmask/object_gi_golonmaskTLUT_000000"
-static const ALIGN_ASSET(2) char object_gi_golonmaskTLUT_000000[] = dobject_gi_golonmaskTLUT_000000;
-
 #define dobject_gi_golonmaskTex_000248 "__OTR__objects/object_gi_golonmask/object_gi_golonmaskTex_000248"
 static const ALIGN_ASSET(2) char object_gi_golonmaskTex_000248[] = dobject_gi_golonmaskTex_000248;
 
@@ -21,4 +15,10 @@ static const ALIGN_ASSET(2) char object_gi_golonmaskTex_000348[] = dobject_gi_go
 #define dobject_gi_golonmaskTex_000748 "__OTR__objects/object_gi_golonmask/object_gi_golonmaskTex_000748"
 static const ALIGN_ASSET(2) char object_gi_golonmaskTex_000748[] = dobject_gi_golonmaskTex_000748;
 
+#define dobject_gi_golonmaskTLUT_000000 "__OTR__objects/object_gi_golonmask/object_gi_golonmaskTLUT_000000"
+static const ALIGN_ASSET(2) char object_gi_golonmaskTLUT_000000[] = dobject_gi_golonmaskTLUT_000000;
+
+#define dgGiGoronMaskDL "__OTR__objects/object_gi_golonmask/gGiGoronMaskDL"
+static const ALIGN_ASSET(2) char gGiGoronMaskDL[] = dgGiGoronMaskDL;
+
 #endif // OBJECTS_OBJECT_GI_GOLONMASK_H
diff --git a/soh/assets/objects/object_gi_hoverboots/object_gi_hoverboots.h b/soh/assets/objects/object_gi_hoverboots/object_gi_hoverboots.h
index 9c1558700..d94b4fac6 100644
--- a/soh/assets/objects/object_gi_hoverboots/object_gi_hoverboots.h
+++ b/soh/assets/objects/object_gi_hoverboots/object_gi_hoverboots.h
@@ -3,13 +3,13 @@
 
 #include "align_asset_macro.h"
 
-#define dgGiHoverBootsDL "__OTR__objects/object_gi_hoverboots/gGiHoverBootsDL"
-static const ALIGN_ASSET(2) char gGiHoverBootsDL[] = dgGiHoverBootsDL;
+#define dobject_gi_hoverbootsTex_000000 "__OTR__objects/object_gi_hoverboots/object_gi_hoverbootsTex_000000"
+static const ALIGN_ASSET(2) char object_gi_hoverbootsTex_000000[] = dobject_gi_hoverbootsTex_000000;
 
 #define dobject_gi_hoverbootsTex_000300 "__OTR__objects/object_gi_hoverboots/object_gi_hoverbootsTex_000300"
 static const ALIGN_ASSET(2) char object_gi_hoverbootsTex_000300[] = dobject_gi_hoverbootsTex_000300;
 
-#define dobject_gi_hoverbootsTex_000000 "__OTR__objects/object_gi_hoverboots/object_gi_hoverbootsTex_000000"
-static const ALIGN_ASSET(2) char object_gi_hoverbootsTex_000000[] = dobject_gi_hoverbootsTex_000000;
+#define dgGiHoverBootsDL "__OTR__objects/object_gi_hoverboots/gGiHoverBootsDL"
+static const ALIGN_ASSET(2) char gGiHoverBootsDL[] = dgGiHoverBootsDL;
 
 #endif // OBJECTS_OBJECT_GI_HOVERBOOTS_H
diff --git a/soh/assets/objects/object_gi_ki_tan_mask/object_gi_ki_tan_mask.h b/soh/assets/objects/object_gi_ki_tan_mask/object_gi_ki_tan_mask.h
index 3a7e897ea..5e311e2b6 100644
--- a/soh/assets/objects/object_gi_ki_tan_mask/object_gi_ki_tan_mask.h
+++ b/soh/assets/objects/object_gi_ki_tan_mask/object_gi_ki_tan_mask.h
@@ -3,13 +3,13 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_gi_ki_tan_maskTex_000000 "__OTR__objects/object_gi_ki_tan_mask/object_gi_ki_tan_maskTex_000000"
+static const ALIGN_ASSET(2) char object_gi_ki_tan_maskTex_000000[] = dobject_gi_ki_tan_maskTex_000000;
+
 #define dgGiKeatonMaskDL "__OTR__objects/object_gi_ki_tan_mask/gGiKeatonMaskDL"
 static const ALIGN_ASSET(2) char gGiKeatonMaskDL[] = dgGiKeatonMaskDL;
 
 #define dgGiKeatonMaskEyesDL "__OTR__objects/object_gi_ki_tan_mask/gGiKeatonMaskEyesDL"
 static const ALIGN_ASSET(2) char gGiKeatonMaskEyesDL[] = dgGiKeatonMaskEyesDL;
 
-#define dobject_gi_ki_tan_maskTex_000000 "__OTR__objects/object_gi_ki_tan_mask/object_gi_ki_tan_maskTex_000000"
-static const ALIGN_ASSET(2) char object_gi_ki_tan_maskTex_000000[] = dobject_gi_ki_tan_maskTex_000000;
-
 #endif // OBJECTS_OBJECT_GI_KI_TAN_MASK_H
diff --git a/soh/assets/objects/object_gi_letter/object_gi_letter.h b/soh/assets/objects/object_gi_letter/object_gi_letter.h
index cc813ce0c..d3b2f4db5 100644
--- a/soh/assets/objects/object_gi_letter/object_gi_letter.h
+++ b/soh/assets/objects/object_gi_letter/object_gi_letter.h
@@ -3,16 +3,16 @@
 
 #include "align_asset_macro.h"
 
-#define dgGiLetterDL "__OTR__objects/object_gi_letter/gGiLetterDL"
-static const ALIGN_ASSET(2) char gGiLetterDL[] = dgGiLetterDL;
-
-#define dgGiLetterWritingDL "__OTR__objects/object_gi_letter/gGiLetterWritingDL"
-static const ALIGN_ASSET(2) char gGiLetterWritingDL[] = dgGiLetterWritingDL;
-
 #define dobject_gi_letterTex_000000 "__OTR__objects/object_gi_letter/object_gi_letterTex_000000"
 static const ALIGN_ASSET(2) char object_gi_letterTex_000000[] = dobject_gi_letterTex_000000;
 
 #define dobject_gi_letterTex_000600 "__OTR__objects/object_gi_letter/object_gi_letterTex_000600"
 static const ALIGN_ASSET(2) char object_gi_letterTex_000600[] = dobject_gi_letterTex_000600;
 
+#define dgGiLetterDL "__OTR__objects/object_gi_letter/gGiLetterDL"
+static const ALIGN_ASSET(2) char gGiLetterDL[] = dgGiLetterDL;
+
+#define dgGiLetterWritingDL "__OTR__objects/object_gi_letter/gGiLetterWritingDL"
+static const ALIGN_ASSET(2) char gGiLetterWritingDL[] = dgGiLetterWritingDL;
+
 #endif // OBJECTS_OBJECT_GI_LETTER_H
diff --git a/soh/assets/objects/object_gi_liquid/object_gi_liquid.h b/soh/assets/objects/object_gi_liquid/object_gi_liquid.h
index 533a96f84..bd804fb94 100644
--- a/soh/assets/objects/object_gi_liquid/object_gi_liquid.h
+++ b/soh/assets/objects/object_gi_liquid/object_gi_liquid.h
@@ -3,6 +3,15 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_gi_liquidTex_000000 "__OTR__objects/object_gi_liquid/object_gi_liquidTex_000000"
+static const ALIGN_ASSET(2) char object_gi_liquidTex_000000[] = dobject_gi_liquidTex_000000;
+
+#define dobject_gi_liquidTex_000200 "__OTR__objects/object_gi_liquid/object_gi_liquidTex_000200"
+static const ALIGN_ASSET(2) char object_gi_liquidTex_000200[] = dobject_gi_liquidTex_000200;
+
+#define dobject_gi_liquidTex_000400 "__OTR__objects/object_gi_liquid/object_gi_liquidTex_000400"
+static const ALIGN_ASSET(2) char object_gi_liquidTex_000400[] = dobject_gi_liquidTex_000400;
+
 #define dgGiGreenPotColorDL "__OTR__objects/object_gi_liquid/gGiGreenPotColorDL"
 static const ALIGN_ASSET(2) char gGiGreenPotColorDL[] = dgGiGreenPotColorDL;
 
@@ -39,13 +48,4 @@ static const ALIGN_ASSET(2) char gGiPotionLiquidDL[] = dgGiPotionLiquidDL;
 #define dgGiPotionPatternDL "__OTR__objects/object_gi_liquid/gGiPotionPatternDL"
 static const ALIGN_ASSET(2) char gGiPotionPatternDL[] = dgGiPotionPatternDL;
 
-#define dobject_gi_liquidTex_000000 "__OTR__objects/object_gi_liquid/object_gi_liquidTex_000000"
-static const ALIGN_ASSET(2) char object_gi_liquidTex_000000[] = dobject_gi_liquidTex_000000;
-
-#define dobject_gi_liquidTex_000200 "__OTR__objects/object_gi_liquid/object_gi_liquidTex_000200"
-static const ALIGN_ASSET(2) char object_gi_liquidTex_000200[] = dobject_gi_liquidTex_000200;
-
-#define dobject_gi_liquidTex_000400 "__OTR__objects/object_gi_liquid/object_gi_liquidTex_000400"
-static const ALIGN_ASSET(2) char object_gi_liquidTex_000400[] = dobject_gi_liquidTex_000400;
-
 #endif // OBJECTS_OBJECT_GI_LIQUID_H
diff --git a/soh/assets/objects/object_gi_map/object_gi_map.h b/soh/assets/objects/object_gi_map/object_gi_map.h
index c4ecee7e9..52c2075ab 100644
--- a/soh/assets/objects/object_gi_map/object_gi_map.h
+++ b/soh/assets/objects/object_gi_map/object_gi_map.h
@@ -3,13 +3,13 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_gi_mapTex_000D60 "__OTR__objects/object_gi_map/object_gi_mapTex_000D60"
+static const ALIGN_ASSET(2) char object_gi_mapTex_000D60[] = dobject_gi_mapTex_000D60;
+
 #define dgGiDungeonMapDL "__OTR__objects/object_gi_map/gGiDungeonMapDL"
 static const ALIGN_ASSET(2) char gGiDungeonMapDL[] = dgGiDungeonMapDL;
 
 #define dgGiStoneOfAgonyDL "__OTR__objects/object_gi_map/gGiStoneOfAgonyDL"
 static const ALIGN_ASSET(2) char gGiStoneOfAgonyDL[] = dgGiStoneOfAgonyDL;
 
-#define dobject_gi_mapTex_000D60 "__OTR__objects/object_gi_map/object_gi_mapTex_000D60"
-static const ALIGN_ASSET(2) char object_gi_mapTex_000D60[] = dobject_gi_mapTex_000D60;
-
 #endif // OBJECTS_OBJECT_GI_MAP_H
diff --git a/soh/assets/objects/object_gi_milk/object_gi_milk.h b/soh/assets/objects/object_gi_milk/object_gi_milk.h
index 3b6bb4d21..a0164ae8a 100644
--- a/soh/assets/objects/object_gi_milk/object_gi_milk.h
+++ b/soh/assets/objects/object_gi_milk/object_gi_milk.h
@@ -3,13 +3,13 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_gi_milkTex_000000 "__OTR__objects/object_gi_milk/object_gi_milkTex_000000"
+static const ALIGN_ASSET(2) char object_gi_milkTex_000000[] = dobject_gi_milkTex_000000;
+
 #define dgGiMilkBottleContentsDL "__OTR__objects/object_gi_milk/gGiMilkBottleContentsDL"
 static const ALIGN_ASSET(2) char gGiMilkBottleContentsDL[] = dgGiMilkBottleContentsDL;
 
 #define dgGiMilkBottleDL "__OTR__objects/object_gi_milk/gGiMilkBottleDL"
 static const ALIGN_ASSET(2) char gGiMilkBottleDL[] = dgGiMilkBottleDL;
 
-#define dobject_gi_milkTex_000000 "__OTR__objects/object_gi_milk/object_gi_milkTex_000000"
-static const ALIGN_ASSET(2) char object_gi_milkTex_000000[] = dobject_gi_milkTex_000000;
-
 #endif // OBJECTS_OBJECT_GI_MILK_H
diff --git a/soh/assets/objects/object_gi_niwatori/object_gi_niwatori.h b/soh/assets/objects/object_gi_niwatori/object_gi_niwatori.h
index 1a8a63a0e..bb94e8980 100644
--- a/soh/assets/objects/object_gi_niwatori/object_gi_niwatori.h
+++ b/soh/assets/objects/object_gi_niwatori/object_gi_niwatori.h
@@ -3,6 +3,12 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_gi_niwatoriTex_000000 "__OTR__objects/object_gi_niwatori/object_gi_niwatoriTex_000000"
+static const ALIGN_ASSET(2) char object_gi_niwatoriTex_000000[] = dobject_gi_niwatoriTex_000000;
+
+#define dobject_gi_niwatoriTex_000800 "__OTR__objects/object_gi_niwatori/object_gi_niwatoriTex_000800"
+static const ALIGN_ASSET(2) char object_gi_niwatoriTex_000800[] = dobject_gi_niwatoriTex_000800;
+
 #define dgGiChickenColorDL "__OTR__objects/object_gi_niwatori/gGiChickenColorDL"
 static const ALIGN_ASSET(2) char gGiChickenColorDL[] = dgGiChickenColorDL;
 
@@ -15,10 +21,4 @@ static const ALIGN_ASSET(2) char gGiChickenDL[] = dgGiChickenDL;
 #define dgGiChickenEyesDL "__OTR__objects/object_gi_niwatori/gGiChickenEyesDL"
 static const ALIGN_ASSET(2) char gGiChickenEyesDL[] = dgGiChickenEyesDL;
 
-#define dobject_gi_niwatoriTex_000000 "__OTR__objects/object_gi_niwatori/object_gi_niwatoriTex_000000"
-static const ALIGN_ASSET(2) char object_gi_niwatoriTex_000000[] = dobject_gi_niwatoriTex_000000;
-
-#define dobject_gi_niwatoriTex_000800 "__OTR__objects/object_gi_niwatori/object_gi_niwatoriTex_000800"
-static const ALIGN_ASSET(2) char object_gi_niwatoriTex_000800[] = dobject_gi_niwatoriTex_000800;
-
 #endif // OBJECTS_OBJECT_GI_NIWATORI_H
diff --git a/soh/assets/objects/object_gi_nuts/object_gi_nuts.h b/soh/assets/objects/object_gi_nuts/object_gi_nuts.h
index e758b46fb..434312aca 100644
--- a/soh/assets/objects/object_gi_nuts/object_gi_nuts.h
+++ b/soh/assets/objects/object_gi_nuts/object_gi_nuts.h
@@ -3,10 +3,10 @@
 
 #include "align_asset_macro.h"
 
-#define dgGiNutDL "__OTR__objects/object_gi_nuts/gGiNutDL"
-static const ALIGN_ASSET(2) char gGiNutDL[] = dgGiNutDL;
-
 #define dobject_gi_nutsTex_000000 "__OTR__objects/object_gi_nuts/object_gi_nutsTex_000000"
 static const ALIGN_ASSET(2) char object_gi_nutsTex_000000[] = dobject_gi_nutsTex_000000;
 
+#define dgGiNutDL "__OTR__objects/object_gi_nuts/gGiNutDL"
+static const ALIGN_ASSET(2) char gGiNutDL[] = dgGiNutDL;
+
 #endif // OBJECTS_OBJECT_GI_NUTS_H
diff --git a/soh/assets/objects/object_gi_ocarina/object_gi_ocarina.h b/soh/assets/objects/object_gi_ocarina/object_gi_ocarina.h
index 77efb0331..7eb5fd83b 100644
--- a/soh/assets/objects/object_gi_ocarina/object_gi_ocarina.h
+++ b/soh/assets/objects/object_gi_ocarina/object_gi_ocarina.h
@@ -3,13 +3,13 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_gi_ocarinaTex_000000 "__OTR__objects/object_gi_ocarina/object_gi_ocarinaTex_000000"
+static const ALIGN_ASSET(2) char object_gi_ocarinaTex_000000[] = dobject_gi_ocarinaTex_000000;
+
 #define dgGiOcarinaTimeDL "__OTR__objects/object_gi_ocarina/gGiOcarinaTimeDL"
 static const ALIGN_ASSET(2) char gGiOcarinaTimeDL[] = dgGiOcarinaTimeDL;
 
 #define dgGiOcarinaTimeHolesDL "__OTR__objects/object_gi_ocarina/gGiOcarinaTimeHolesDL"
 static const ALIGN_ASSET(2) char gGiOcarinaTimeHolesDL[] = dgGiOcarinaTimeHolesDL;
 
-#define dobject_gi_ocarinaTex_000000 "__OTR__objects/object_gi_ocarina/object_gi_ocarinaTex_000000"
-static const ALIGN_ASSET(2) char object_gi_ocarinaTex_000000[] = dobject_gi_ocarinaTex_000000;
-
 #endif // OBJECTS_OBJECT_GI_OCARINA_H
diff --git a/soh/assets/objects/object_gi_ocarina_0/object_gi_ocarina_0.h b/soh/assets/objects/object_gi_ocarina_0/object_gi_ocarina_0.h
index 747a5ad6a..6f67ce1f9 100644
--- a/soh/assets/objects/object_gi_ocarina_0/object_gi_ocarina_0.h
+++ b/soh/assets/objects/object_gi_ocarina_0/object_gi_ocarina_0.h
@@ -3,13 +3,13 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_gi_ocarina_0Tex_000000 "__OTR__objects/object_gi_ocarina_0/object_gi_ocarina_0Tex_000000"
+static const ALIGN_ASSET(2) char object_gi_ocarina_0Tex_000000[] = dobject_gi_ocarina_0Tex_000000;
+
 #define dgGiOcarinaFairyDL "__OTR__objects/object_gi_ocarina_0/gGiOcarinaFairyDL"
 static const ALIGN_ASSET(2) char gGiOcarinaFairyDL[] = dgGiOcarinaFairyDL;
 
 #define dgGiOcarinaFairyHolesDL "__OTR__objects/object_gi_ocarina_0/gGiOcarinaFairyHolesDL"
 static const ALIGN_ASSET(2) char gGiOcarinaFairyHolesDL[] = dgGiOcarinaFairyHolesDL;
 
-#define dobject_gi_ocarina_0Tex_000000 "__OTR__objects/object_gi_ocarina_0/object_gi_ocarina_0Tex_000000"
-static const ALIGN_ASSET(2) char object_gi_ocarina_0Tex_000000[] = dobject_gi_ocarina_0Tex_000000;
-
 #endif // OBJECTS_OBJECT_GI_OCARINA_0_H
diff --git a/soh/assets/objects/object_gi_prescription/object_gi_prescription.h b/soh/assets/objects/object_gi_prescription/object_gi_prescription.h
index 249b89bf0..7e0264aad 100644
--- a/soh/assets/objects/object_gi_prescription/object_gi_prescription.h
+++ b/soh/assets/objects/object_gi_prescription/object_gi_prescription.h
@@ -3,13 +3,13 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_gi_prescriptionTex_000000 "__OTR__objects/object_gi_prescription/object_gi_prescriptionTex_000000"
+static const ALIGN_ASSET(2) char object_gi_prescriptionTex_000000[] = dobject_gi_prescriptionTex_000000;
+
 #define dgGiPrescriptionDL "__OTR__objects/object_gi_prescription/gGiPrescriptionDL"
 static const ALIGN_ASSET(2) char gGiPrescriptionDL[] = dgGiPrescriptionDL;
 
 #define dgGiPrescriptionWritingDL "__OTR__objects/object_gi_prescription/gGiPrescriptionWritingDL"
 static const ALIGN_ASSET(2) char gGiPrescriptionWritingDL[] = dgGiPrescriptionWritingDL;
 
-#define dobject_gi_prescriptionTex_000000 "__OTR__objects/object_gi_prescription/object_gi_prescriptionTex_000000"
-static const ALIGN_ASSET(2) char object_gi_prescriptionTex_000000[] = dobject_gi_prescriptionTex_000000;
-
 #endif // OBJECTS_OBJECT_GI_PRESCRIPTION_H
diff --git a/soh/assets/objects/object_gi_purse/object_gi_purse.h b/soh/assets/objects/object_gi_purse/object_gi_purse.h
index 6949c7455..e524d00e4 100644
--- a/soh/assets/objects/object_gi_purse/object_gi_purse.h
+++ b/soh/assets/objects/object_gi_purse/object_gi_purse.h
@@ -3,6 +3,9 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_gi_purseTex_000000 "__OTR__objects/object_gi_purse/object_gi_purseTex_000000"
+static const ALIGN_ASSET(2) char object_gi_purseTex_000000[] = dobject_gi_purseTex_000000;
+
 #define dgGiAdultWalletColorDL "__OTR__objects/object_gi_purse/gGiAdultWalletColorDL"
 static const ALIGN_ASSET(2) char gGiAdultWalletColorDL[] = dgGiAdultWalletColorDL;
 
@@ -39,7 +42,4 @@ static const ALIGN_ASSET(2) char gGiWalletStringDL[] = dgGiWalletStringDL;
 #define dgGiWalletRupeeInnerDL "__OTR__objects/object_gi_purse/gGiWalletRupeeInnerDL"
 static const ALIGN_ASSET(2) char gGiWalletRupeeInnerDL[] = dgGiWalletRupeeInnerDL;
 
-#define dobject_gi_purseTex_000000 "__OTR__objects/object_gi_purse/object_gi_purseTex_000000"
-static const ALIGN_ASSET(2) char object_gi_purseTex_000000[] = dobject_gi_purseTex_000000;
-
 #endif // OBJECTS_OBJECT_GI_PURSE_H
diff --git a/soh/assets/objects/object_gi_rabit_mask/object_gi_rabit_mask.h b/soh/assets/objects/object_gi_rabit_mask/object_gi_rabit_mask.h
index 575ba6706..5291c1f7d 100644
--- a/soh/assets/objects/object_gi_rabit_mask/object_gi_rabit_mask.h
+++ b/soh/assets/objects/object_gi_rabit_mask/object_gi_rabit_mask.h
@@ -3,13 +3,13 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_gi_rabit_maskTex_000000 "__OTR__objects/object_gi_rabit_mask/object_gi_rabit_maskTex_000000"
+static const ALIGN_ASSET(2) char object_gi_rabit_maskTex_000000[] = dobject_gi_rabit_maskTex_000000;
+
 #define dgGiBunnyHoodDL "__OTR__objects/object_gi_rabit_mask/gGiBunnyHoodDL"
 static const ALIGN_ASSET(2) char gGiBunnyHoodDL[] = dgGiBunnyHoodDL;
 
 #define dgGiBunnyHoodEyesDL "__OTR__objects/object_gi_rabit_mask/gGiBunnyHoodEyesDL"
 static const ALIGN_ASSET(2) char gGiBunnyHoodEyesDL[] = dgGiBunnyHoodEyesDL;
 
-#define dobject_gi_rabit_maskTex_000000 "__OTR__objects/object_gi_rabit_mask/object_gi_rabit_maskTex_000000"
-static const ALIGN_ASSET(2) char object_gi_rabit_maskTex_000000[] = dobject_gi_rabit_maskTex_000000;
-
 #endif // OBJECTS_OBJECT_GI_RABIT_MASK_H
diff --git a/soh/assets/objects/object_gi_shield_1/object_gi_shield_1.h b/soh/assets/objects/object_gi_shield_1/object_gi_shield_1.h
index 6c7e2c907..4572ca78b 100644
--- a/soh/assets/objects/object_gi_shield_1/object_gi_shield_1.h
+++ b/soh/assets/objects/object_gi_shield_1/object_gi_shield_1.h
@@ -3,10 +3,10 @@
 
 #include "align_asset_macro.h"
 
-#define dgGiDekuShieldDL "__OTR__objects/object_gi_shield_1/gGiDekuShieldDL"
-static const ALIGN_ASSET(2) char gGiDekuShieldDL[] = dgGiDekuShieldDL;
-
 #define dobject_gi_shield_1Tex_000000 "__OTR__objects/object_gi_shield_1/object_gi_shield_1Tex_000000"
 static const ALIGN_ASSET(2) char object_gi_shield_1Tex_000000[] = dobject_gi_shield_1Tex_000000;
 
+#define dgGiDekuShieldDL "__OTR__objects/object_gi_shield_1/gGiDekuShieldDL"
+static const ALIGN_ASSET(2) char gGiDekuShieldDL[] = dgGiDekuShieldDL;
+
 #endif // OBJECTS_OBJECT_GI_SHIELD_1_H
diff --git a/soh/assets/objects/object_gi_shield_3/object_gi_shield_3.h b/soh/assets/objects/object_gi_shield_3/object_gi_shield_3.h
index 81f8013c8..c80dd6c55 100644
--- a/soh/assets/objects/object_gi_shield_3/object_gi_shield_3.h
+++ b/soh/assets/objects/object_gi_shield_3/object_gi_shield_3.h
@@ -3,16 +3,16 @@
 
 #include "align_asset_macro.h"
 
-#define dgGiMirrorShieldDL "__OTR__objects/object_gi_shield_3/gGiMirrorShieldDL"
-static const ALIGN_ASSET(2) char gGiMirrorShieldDL[] = dgGiMirrorShieldDL;
-
-#define dgGiMirrorShieldSymbolDL "__OTR__objects/object_gi_shield_3/gGiMirrorShieldSymbolDL"
-static const ALIGN_ASSET(2) char gGiMirrorShieldSymbolDL[] = dgGiMirrorShieldSymbolDL;
-
 #define dobject_gi_shield_3Tex_000000 "__OTR__objects/object_gi_shield_3/object_gi_shield_3Tex_000000"
 static const ALIGN_ASSET(2) char object_gi_shield_3Tex_000000[] = dobject_gi_shield_3Tex_000000;
 
 #define dobject_gi_shield_3Tex_000400 "__OTR__objects/object_gi_shield_3/object_gi_shield_3Tex_000400"
 static const ALIGN_ASSET(2) char object_gi_shield_3Tex_000400[] = dobject_gi_shield_3Tex_000400;
 
+#define dgGiMirrorShieldDL "__OTR__objects/object_gi_shield_3/gGiMirrorShieldDL"
+static const ALIGN_ASSET(2) char gGiMirrorShieldDL[] = dgGiMirrorShieldDL;
+
+#define dgGiMirrorShieldSymbolDL "__OTR__objects/object_gi_shield_3/gGiMirrorShieldSymbolDL"
+static const ALIGN_ASSET(2) char gGiMirrorShieldSymbolDL[] = dgGiMirrorShieldSymbolDL;
+
 #endif // OBJECTS_OBJECT_GI_SHIELD_3_H
diff --git a/soh/assets/objects/object_gi_soldout/object_gi_soldout.h b/soh/assets/objects/object_gi_soldout/object_gi_soldout.h
index 5aa035518..c9efc334b 100644
--- a/soh/assets/objects/object_gi_soldout/object_gi_soldout.h
+++ b/soh/assets/objects/object_gi_soldout/object_gi_soldout.h
@@ -3,10 +3,10 @@
 
 #include "align_asset_macro.h"
 
-#define dgGiSoldOutDL "__OTR__objects/object_gi_soldout/gGiSoldOutDL"
-static const ALIGN_ASSET(2) char gGiSoldOutDL[] = dgGiSoldOutDL;
-
 #define dobject_gi_soldoutTex_000000 "__OTR__objects/object_gi_soldout/object_gi_soldoutTex_000000"
 static const ALIGN_ASSET(2) char object_gi_soldoutTex_000000[] = dobject_gi_soldoutTex_000000;
 
+#define dgGiSoldOutDL "__OTR__objects/object_gi_soldout/gGiSoldOutDL"
+static const ALIGN_ASSET(2) char gGiSoldOutDL[] = dgGiSoldOutDL;
+
 #endif // OBJECTS_OBJECT_GI_SOLDOUT_H
diff --git a/soh/assets/objects/object_gi_soul/object_gi_soul.h b/soh/assets/objects/object_gi_soul/object_gi_soul.h
index da5fcb74c..c7b71db6f 100644
--- a/soh/assets/objects/object_gi_soul/object_gi_soul.h
+++ b/soh/assets/objects/object_gi_soul/object_gi_soul.h
@@ -3,6 +3,9 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_gi_soulTex_000000 "__OTR__objects/object_gi_soul/object_gi_soulTex_000000"
+static const ALIGN_ASSET(2) char object_gi_soulTex_000000[] = dobject_gi_soulTex_000000;
+
 #define dgGiFairyContainerBaseCapDL "__OTR__objects/object_gi_soul/gGiFairyContainerBaseCapDL"
 static const ALIGN_ASSET(2) char gGiFairyContainerBaseCapDL[] = dgGiFairyContainerBaseCapDL;
 
@@ -12,7 +15,4 @@ static const ALIGN_ASSET(2) char gGiFairyContainerGlassDL[] = dgGiFairyContainer
 #define dgGiFairyContainerContentsDL "__OTR__objects/object_gi_soul/gGiFairyContainerContentsDL"
 static const ALIGN_ASSET(2) char gGiFairyContainerContentsDL[] = dgGiFairyContainerContentsDL;
 
-#define dobject_gi_soulTex_000000 "__OTR__objects/object_gi_soul/object_gi_soulTex_000000"
-static const ALIGN_ASSET(2) char object_gi_soulTex_000000[] = dobject_gi_soulTex_000000;
-
 #endif // OBJECTS_OBJECT_GI_SOUL_H
diff --git a/soh/assets/objects/object_gi_ticketstone/object_gi_ticketstone.h b/soh/assets/objects/object_gi_ticketstone/object_gi_ticketstone.h
index ad02d89ce..cafa87458 100644
--- a/soh/assets/objects/object_gi_ticketstone/object_gi_ticketstone.h
+++ b/soh/assets/objects/object_gi_ticketstone/object_gi_ticketstone.h
@@ -3,16 +3,16 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_gi_ticketstoneTex_000000 "__OTR__objects/object_gi_ticketstone/object_gi_ticketstoneTex_000000"
+static const ALIGN_ASSET(2) char object_gi_ticketstoneTex_000000[] = dobject_gi_ticketstoneTex_000000;
+
+#define dobject_gi_ticketstoneTex_000240 "__OTR__objects/object_gi_ticketstone/object_gi_ticketstoneTex_000240"
+static const ALIGN_ASSET(2) char object_gi_ticketstoneTex_000240[] = dobject_gi_ticketstoneTex_000240;
+
 #define dgGiClaimCheckDL "__OTR__objects/object_gi_ticketstone/gGiClaimCheckDL"
 static const ALIGN_ASSET(2) char gGiClaimCheckDL[] = dgGiClaimCheckDL;
 
 #define dgGiClaimCheckWritingDL "__OTR__objects/object_gi_ticketstone/gGiClaimCheckWritingDL"
 static const ALIGN_ASSET(2) char gGiClaimCheckWritingDL[] = dgGiClaimCheckWritingDL;
 
-#define dobject_gi_ticketstoneTex_000240 "__OTR__objects/object_gi_ticketstone/object_gi_ticketstoneTex_000240"
-static const ALIGN_ASSET(2) char object_gi_ticketstoneTex_000240[] = dobject_gi_ticketstoneTex_000240;
-
-#define dobject_gi_ticketstoneTex_000000 "__OTR__objects/object_gi_ticketstone/object_gi_ticketstoneTex_000000"
-static const ALIGN_ASSET(2) char object_gi_ticketstoneTex_000000[] = dobject_gi_ticketstoneTex_000000;
-
 #endif // OBJECTS_OBJECT_GI_TICKETSTONE_H
diff --git a/soh/assets/objects/object_gi_truth_mask/object_gi_truth_mask.h b/soh/assets/objects/object_gi_truth_mask/object_gi_truth_mask.h
index bae7c2954..8952d6743 100644
--- a/soh/assets/objects/object_gi_truth_mask/object_gi_truth_mask.h
+++ b/soh/assets/objects/object_gi_truth_mask/object_gi_truth_mask.h
@@ -3,16 +3,16 @@
 
 #include "align_asset_macro.h"
 
-#define dgGiMaskOfTruthDL "__OTR__objects/object_gi_truth_mask/gGiMaskOfTruthDL"
-static const ALIGN_ASSET(2) char gGiMaskOfTruthDL[] = dgGiMaskOfTruthDL;
-
-#define dgGiMaskOfTruthAccentsDL "__OTR__objects/object_gi_truth_mask/gGiMaskOfTruthAccentsDL"
-static const ALIGN_ASSET(2) char gGiMaskOfTruthAccentsDL[] = dgGiMaskOfTruthAccentsDL;
-
 #define dobject_gi_truth_maskTex_000000 "__OTR__objects/object_gi_truth_mask/object_gi_truth_maskTex_000000"
 static const ALIGN_ASSET(2) char object_gi_truth_maskTex_000000[] = dobject_gi_truth_maskTex_000000;
 
 #define dobject_gi_truth_maskTex_000400 "__OTR__objects/object_gi_truth_mask/object_gi_truth_maskTex_000400"
 static const ALIGN_ASSET(2) char object_gi_truth_maskTex_000400[] = dobject_gi_truth_maskTex_000400;
 
+#define dgGiMaskOfTruthDL "__OTR__objects/object_gi_truth_mask/gGiMaskOfTruthDL"
+static const ALIGN_ASSET(2) char gGiMaskOfTruthDL[] = dgGiMaskOfTruthDL;
+
+#define dgGiMaskOfTruthAccentsDL "__OTR__objects/object_gi_truth_mask/gGiMaskOfTruthAccentsDL"
+static const ALIGN_ASSET(2) char gGiMaskOfTruthAccentsDL[] = dgGiMaskOfTruthAccentsDL;
+
 #endif // OBJECTS_OBJECT_GI_TRUTH_MASK_H
diff --git a/soh/assets/objects/object_gi_zoramask/object_gi_zoramask.h b/soh/assets/objects/object_gi_zoramask/object_gi_zoramask.h
index fa17359cb..e0f352392 100644
--- a/soh/assets/objects/object_gi_zoramask/object_gi_zoramask.h
+++ b/soh/assets/objects/object_gi_zoramask/object_gi_zoramask.h
@@ -3,15 +3,9 @@
 
 #include "align_asset_macro.h"
 
-#define dgGiZoraMaskDL "__OTR__objects/object_gi_zoramask/gGiZoraMaskDL"
-static const ALIGN_ASSET(2) char gGiZoraMaskDL[] = dgGiZoraMaskDL;
-
 #define dobject_gi_zoramaskTex_000208 "__OTR__objects/object_gi_zoramask/object_gi_zoramaskTex_000208"
 static const ALIGN_ASSET(2) char object_gi_zoramaskTex_000208[] = dobject_gi_zoramaskTex_000208;
 
-#define dobject_gi_zoramaskTLUT_000000 "__OTR__objects/object_gi_zoramask/object_gi_zoramaskTLUT_000000"
-static const ALIGN_ASSET(2) char object_gi_zoramaskTLUT_000000[] = dobject_gi_zoramaskTLUT_000000;
-
 #define dobject_gi_zoramaskTex_000248 "__OTR__objects/object_gi_zoramask/object_gi_zoramaskTex_000248"
 static const ALIGN_ASSET(2) char object_gi_zoramaskTex_000248[] = dobject_gi_zoramaskTex_000248;
 
@@ -21,4 +15,10 @@ static const ALIGN_ASSET(2) char object_gi_zoramaskTex_000648[] = dobject_gi_zor
 #define dobject_gi_zoramaskTex_000A48 "__OTR__objects/object_gi_zoramask/object_gi_zoramaskTex_000A48"
 static const ALIGN_ASSET(2) char object_gi_zoramaskTex_000A48[] = dobject_gi_zoramaskTex_000A48;
 
+#define dobject_gi_zoramaskTLUT_000000 "__OTR__objects/object_gi_zoramask/object_gi_zoramaskTLUT_000000"
+static const ALIGN_ASSET(2) char object_gi_zoramaskTLUT_000000[] = dobject_gi_zoramaskTLUT_000000;
+
+#define dgGiZoraMaskDL "__OTR__objects/object_gi_zoramask/gGiZoraMaskDL"
+static const ALIGN_ASSET(2) char gGiZoraMaskDL[] = dgGiZoraMaskDL;
+
 #endif // OBJECTS_OBJECT_GI_ZORAMASK_H
diff --git a/soh/assets/objects/object_gj/object_gj.h b/soh/assets/objects/object_gj/object_gj.h
index a05b7a084..c38e97660 100644
--- a/soh/assets/objects/object_gj/object_gj.h
+++ b/soh/assets/objects/object_gj/object_gj.h
@@ -3,6 +3,36 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_gjTex_003B20 "__OTR__objects/object_gj/object_gjTex_003B20"
+static const ALIGN_ASSET(2) char object_gjTex_003B20[] = dobject_gjTex_003B20;
+
+#define dobject_gjTex_003C20 "__OTR__objects/object_gj/object_gjTex_003C20"
+static const ALIGN_ASSET(2) char object_gjTex_003C20[] = dobject_gjTex_003C20;
+
+#define dobject_gjTex_003D20 "__OTR__objects/object_gj/object_gjTex_003D20"
+static const ALIGN_ASSET(2) char object_gjTex_003D20[] = dobject_gjTex_003D20;
+
+#define dobject_gjTex_003F20 "__OTR__objects/object_gj/object_gjTex_003F20"
+static const ALIGN_ASSET(2) char object_gjTex_003F20[] = dobject_gjTex_003F20;
+
+#define dobject_gjTex_004F20 "__OTR__objects/object_gj/object_gjTex_004F20"
+static const ALIGN_ASSET(2) char object_gjTex_004F20[] = dobject_gjTex_004F20;
+
+#define dobject_gjTex_005F20 "__OTR__objects/object_gj/object_gjTex_005F20"
+static const ALIGN_ASSET(2) char object_gjTex_005F20[] = dobject_gjTex_005F20;
+
+#define dobject_gjTex_006F20 "__OTR__objects/object_gj/object_gjTex_006F20"
+static const ALIGN_ASSET(2) char object_gjTex_006F20[] = dobject_gjTex_006F20;
+
+#define dobject_gjTex_007320 "__OTR__objects/object_gj/object_gjTex_007320"
+static const ALIGN_ASSET(2) char object_gjTex_007320[] = dobject_gjTex_007320;
+
+#define dobject_gjTex_007720 "__OTR__objects/object_gj/object_gjTex_007720"
+static const ALIGN_ASSET(2) char object_gjTex_007720[] = dobject_gjTex_007720;
+
+#define dobject_gjTex_007B20 "__OTR__objects/object_gj/object_gjTex_007B20"
+static const ALIGN_ASSET(2) char object_gjTex_007B20[] = dobject_gjTex_007B20;
+
 #define dgGanonsCastleRubbleAroundArenaDL "__OTR__objects/object_gj/gGanonsCastleRubbleAroundArenaDL"
 static const ALIGN_ASSET(2) char gGanonsCastleRubbleAroundArenaDL[] = dgGanonsCastleRubbleAroundArenaDL;
 
@@ -60,34 +90,4 @@ static const ALIGN_ASSET(2) char gGanonsCastleUnusedWallTex[] = dgGanonsCastleUn
 #define dgGanonsCastleUnusedTex_00A320 "__OTR__objects/object_gj/gGanonsCastleUnusedTex_00A320"
 static const ALIGN_ASSET(2) char gGanonsCastleUnusedTex_00A320[] = dgGanonsCastleUnusedTex_00A320;
 
-#define dobject_gjTex_003D20 "__OTR__objects/object_gj/object_gjTex_003D20"
-static const ALIGN_ASSET(2) char object_gjTex_003D20[] = dobject_gjTex_003D20;
-
-#define dobject_gjTex_003B20 "__OTR__objects/object_gj/object_gjTex_003B20"
-static const ALIGN_ASSET(2) char object_gjTex_003B20[] = dobject_gjTex_003B20;
-
-#define dobject_gjTex_004F20 "__OTR__objects/object_gj/object_gjTex_004F20"
-static const ALIGN_ASSET(2) char object_gjTex_004F20[] = dobject_gjTex_004F20;
-
-#define dobject_gjTex_003C20 "__OTR__objects/object_gj/object_gjTex_003C20"
-static const ALIGN_ASSET(2) char object_gjTex_003C20[] = dobject_gjTex_003C20;
-
-#define dobject_gjTex_003F20 "__OTR__objects/object_gj/object_gjTex_003F20"
-static const ALIGN_ASSET(2) char object_gjTex_003F20[] = dobject_gjTex_003F20;
-
-#define dobject_gjTex_005F20 "__OTR__objects/object_gj/object_gjTex_005F20"
-static const ALIGN_ASSET(2) char object_gjTex_005F20[] = dobject_gjTex_005F20;
-
-#define dobject_gjTex_007B20 "__OTR__objects/object_gj/object_gjTex_007B20"
-static const ALIGN_ASSET(2) char object_gjTex_007B20[] = dobject_gjTex_007B20;
-
-#define dobject_gjTex_007320 "__OTR__objects/object_gj/object_gjTex_007320"
-static const ALIGN_ASSET(2) char object_gjTex_007320[] = dobject_gjTex_007320;
-
-#define dobject_gjTex_007720 "__OTR__objects/object_gj/object_gjTex_007720"
-static const ALIGN_ASSET(2) char object_gjTex_007720[] = dobject_gjTex_007720;
-
-#define dobject_gjTex_006F20 "__OTR__objects/object_gj/object_gjTex_006F20"
-static const ALIGN_ASSET(2) char object_gjTex_006F20[] = dobject_gjTex_006F20;
-
 #endif // OBJECTS_OBJECT_GJ_H
diff --git a/soh/assets/objects/object_gnd/object_gnd.h b/soh/assets/objects/object_gnd/object_gnd.h
index ffad270fb..409e87f9b 100644
--- a/soh/assets/objects/object_gnd/object_gnd.h
+++ b/soh/assets/objects/object_gnd/object_gnd.h
@@ -3,6 +3,9 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_gndTex_012B50 "__OTR__objects/object_gnd/object_gndTex_012B50"
+static const ALIGN_ASSET(2) char object_gndTex_012B50[] = dobject_gndTex_012B50;
+
 #define dgPhantomGanonSkel "__OTR__objects/object_gnd/gPhantomGanonSkel"
 static const ALIGN_ASSET(2) char gPhantomGanonSkel[] = dgPhantomGanonSkel;
 
@@ -177,9 +180,6 @@ static const ALIGN_ASSET(2) char gPhantomGanonBarsDL[] = dgPhantomGanonBarsDL;
 #define dgPhantomGanonBarsCol "__OTR__objects/object_gnd/gPhantomGanonBarsCol"
 static const ALIGN_ASSET(2) char gPhantomGanonBarsCol[] = dgPhantomGanonBarsCol;
 
-#define dobject_gndTex_012B50 "__OTR__objects/object_gnd/object_gndTex_012B50"
-static const ALIGN_ASSET(2) char object_gndTex_012B50[] = dobject_gndTex_012B50;
-
 #define dgPhantomGanonSkelLimbsLimb_00C5B0DL_0086F0 "__OTR__objects/object_gnd/gPhantomGanonSkelLimbsLimb_00C5B0DL_0086F0"
 static const ALIGN_ASSET(2) char gPhantomGanonSkelLimbsLimb_00C5B0DL_0086F0[] = dgPhantomGanonSkelLimbsLimb_00C5B0DL_0086F0;
 
diff --git a/soh/assets/objects/object_gr/object_gr.h b/soh/assets/objects/object_gr/object_gr.h
index d2f09cef2..0a0ec3024 100644
--- a/soh/assets/objects/object_gr/object_gr.h
+++ b/soh/assets/objects/object_gr/object_gr.h
@@ -3,6 +3,39 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_grTex_005D78 "__OTR__objects/object_gr/object_grTex_005D78"
+static const ALIGN_ASSET(2) char object_grTex_005D78[] = dobject_grTex_005D78;
+
+#define dobject_grTex_005E78 "__OTR__objects/object_gr/object_grTex_005E78"
+static const ALIGN_ASSET(2) char object_grTex_005E78[] = dobject_grTex_005E78;
+
+#define dobject_grTex_005EB8 "__OTR__objects/object_gr/object_grTex_005EB8"
+static const ALIGN_ASSET(2) char object_grTex_005EB8[] = dobject_grTex_005EB8;
+
+#define dobject_grTex_005EF8 "__OTR__objects/object_gr/object_grTex_005EF8"
+static const ALIGN_ASSET(2) char object_grTex_005EF8[] = dobject_grTex_005EF8;
+
+#define dobject_grTex_0077F8 "__OTR__objects/object_gr/object_grTex_0077F8"
+static const ALIGN_ASSET(2) char object_grTex_0077F8[] = dobject_grTex_0077F8;
+
+#define dobject_grTex_007BF8 "__OTR__objects/object_gr/object_grTex_007BF8"
+static const ALIGN_ASSET(2) char object_grTex_007BF8[] = dobject_grTex_007BF8;
+
+#define dobject_grTex_007FF8 "__OTR__objects/object_gr/object_grTex_007FF8"
+static const ALIGN_ASSET(2) char object_grTex_007FF8[] = dobject_grTex_007FF8;
+
+#define dobject_grTex_0083F8 "__OTR__objects/object_gr/object_grTex_0083F8"
+static const ALIGN_ASSET(2) char object_grTex_0083F8[] = dobject_grTex_0083F8;
+
+#define dobject_grTex_0097F8 "__OTR__objects/object_gr/object_grTex_0097F8"
+static const ALIGN_ASSET(2) char object_grTex_0097F8[] = dobject_grTex_0097F8;
+
+#define dobject_grTex_009808 "__OTR__objects/object_gr/object_grTex_009808"
+static const ALIGN_ASSET(2) char object_grTex_009808[] = dobject_grTex_009808;
+
+#define dobject_grTLUT_003F78 "__OTR__objects/object_gr/object_grTLUT_003F78"
+static const ALIGN_ASSET(2) char object_grTLUT_003F78[] = dobject_grTLUT_003F78;
+
 #define dgNiwGirlSkel "__OTR__objects/object_gr/gNiwGirlSkel"
 static const ALIGN_ASSET(2) char gNiwGirlSkel[] = dgNiwGirlSkel;
 
@@ -84,37 +117,5 @@ static const ALIGN_ASSET(2) char gNiwGirlSkelLimbsLimb_0098F0DL_003D78[] = dgNiw
 #define dgNiwGirlSkelLimbsLimb_0098FCDL_003BA0 "__OTR__objects/object_gr/gNiwGirlSkelLimbsLimb_0098FCDL_003BA0"
 static const ALIGN_ASSET(2) char gNiwGirlSkelLimbsLimb_0098FCDL_003BA0[] = dgNiwGirlSkelLimbsLimb_0098FCDL_003BA0;
 
-#define dobject_grTLUT_003F78 "__OTR__objects/object_gr/object_grTLUT_003F78"
-static const ALIGN_ASSET(2) char object_grTLUT_003F78[] = dobject_grTLUT_003F78;
-
-#define dobject_grTex_005EB8 "__OTR__objects/object_gr/object_grTex_005EB8"
-static const ALIGN_ASSET(2) char object_grTex_005EB8[] = dobject_grTex_005EB8;
-
-#define dobject_grTex_005D78 "__OTR__objects/object_gr/object_grTex_005D78"
-static const ALIGN_ASSET(2) char object_grTex_005D78[] = dobject_grTex_005D78;
-
-#define dobject_grTex_005E78 "__OTR__objects/object_gr/object_grTex_005E78"
-static const ALIGN_ASSET(2) char object_grTex_005E78[] = dobject_grTex_005E78;
-
-#define dobject_grTex_0077F8 "__OTR__objects/object_gr/object_grTex_0077F8"
-static const ALIGN_ASSET(2) char object_grTex_0077F8[] = dobject_grTex_0077F8;
-
-#define dobject_grTex_007BF8 "__OTR__objects/object_gr/object_grTex_007BF8"
-static const ALIGN_ASSET(2) char object_grTex_007BF8[] = dobject_grTex_007BF8;
-
-#define dobject_grTex_007FF8 "__OTR__objects/object_gr/object_grTex_007FF8"
-static const ALIGN_ASSET(2) char object_grTex_007FF8[] = dobject_grTex_007FF8;
-
-#define dobject_grTex_0083F8 "__OTR__objects/object_gr/object_grTex_0083F8"
-static const ALIGN_ASSET(2) char object_grTex_0083F8[] = dobject_grTex_0083F8;
-
-#define dobject_grTex_005EF8 "__OTR__objects/object_gr/object_grTex_005EF8"
-static const ALIGN_ASSET(2) char object_grTex_005EF8[] = dobject_grTex_005EF8;
-
-#define dobject_grTex_0097F8 "__OTR__objects/object_gr/object_grTex_0097F8"
-static const ALIGN_ASSET(2) char object_grTex_0097F8[] = dobject_grTex_0097F8;
-
-#define dobject_grTex_009808 "__OTR__objects/object_gr/object_grTex_009808"
-static const ALIGN_ASSET(2) char object_grTex_009808[] = dobject_grTex_009808;
 
 #endif // OBJECTS_OBJECT_GR_H
diff --git a/soh/assets/objects/object_hakach_objects/object_hakach_objects.h b/soh/assets/objects/object_hakach_objects/object_hakach_objects.h
index caeaaf280..410f5cc06 100644
--- a/soh/assets/objects/object_hakach_objects/object_hakach_objects.h
+++ b/soh/assets/objects/object_hakach_objects/object_hakach_objects.h
@@ -3,6 +3,9 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_hakach_objectsTex_0062F0 "__OTR__objects/object_hakach_objects/object_hakach_objectsTex_0062F0"
+static const ALIGN_ASSET(2) char object_hakach_objectsTex_0062F0[] = dobject_hakach_objectsTex_0062F0;
+
 #define dgBotwHoleTrap1DL "__OTR__objects/object_hakach_objects/gBotwHoleTrap1DL"
 static const ALIGN_ASSET(2) char gBotwHoleTrap1DL[] = dgBotwHoleTrap1DL;
 
@@ -69,7 +72,4 @@ static const ALIGN_ASSET(2) char gBotwTex_0058F0[] = dgBotwTex_0058F0;
 #define dgBotwTex_0060F0 "__OTR__objects/object_hakach_objects/gBotwTex_0060F0"
 static const ALIGN_ASSET(2) char gBotwTex_0060F0[] = dgBotwTex_0060F0;
 
-#define dobject_hakach_objectsTex_0062F0 "__OTR__objects/object_hakach_objects/object_hakach_objectsTex_0062F0"
-static const ALIGN_ASSET(2) char object_hakach_objectsTex_0062F0[] = dobject_hakach_objectsTex_0062F0;
-
 #endif // OBJECTS_OBJECT_HAKACH_OBJECTS_H
diff --git a/soh/assets/objects/object_hidan_objects/object_hidan_objects.h b/soh/assets/objects/object_hidan_objects/object_hidan_objects.h
index 50bc08df1..dc676a2b3 100644
--- a/soh/assets/objects/object_hidan_objects/object_hidan_objects.h
+++ b/soh/assets/objects/object_hidan_objects/object_hidan_objects.h
@@ -3,6 +3,66 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_hidan_objectsTex_000040 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_000040"
+static const ALIGN_ASSET(2) char object_hidan_objectsTex_000040[] = dobject_hidan_objectsTex_000040;
+
+#define dobject_hidan_objectsTex_000240 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_000240"
+static const ALIGN_ASSET(2) char object_hidan_objectsTex_000240[] = dobject_hidan_objectsTex_000240;
+
+#define dobject_hidan_objectsTex_000A40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_000A40"
+static const ALIGN_ASSET(2) char object_hidan_objectsTex_000A40[] = dobject_hidan_objectsTex_000A40;
+
+#define dobject_hidan_objectsTex_001A40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_001A40"
+static const ALIGN_ASSET(2) char object_hidan_objectsTex_001A40[] = dobject_hidan_objectsTex_001A40;
+
+#define dobject_hidan_objectsTex_002A40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_002A40"
+static const ALIGN_ASSET(2) char object_hidan_objectsTex_002A40[] = dobject_hidan_objectsTex_002A40;
+
+#define dobject_hidan_objectsTex_003A40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_003A40"
+static const ALIGN_ASSET(2) char object_hidan_objectsTex_003A40[] = dobject_hidan_objectsTex_003A40;
+
+#define dobject_hidan_objectsTex_004240 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_004240"
+static const ALIGN_ASSET(2) char object_hidan_objectsTex_004240[] = dobject_hidan_objectsTex_004240;
+
+#define dobject_hidan_objectsTex_004A40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_004A40"
+static const ALIGN_ASSET(2) char object_hidan_objectsTex_004A40[] = dobject_hidan_objectsTex_004A40;
+
+#define dobject_hidan_objectsTex_005240 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_005240"
+static const ALIGN_ASSET(2) char object_hidan_objectsTex_005240[] = dobject_hidan_objectsTex_005240;
+
+#define dobject_hidan_objectsTex_005640 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_005640"
+static const ALIGN_ASSET(2) char object_hidan_objectsTex_005640[] = dobject_hidan_objectsTex_005640;
+
+#define dobject_hidan_objectsTex_005A40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_005A40"
+static const ALIGN_ASSET(2) char object_hidan_objectsTex_005A40[] = dobject_hidan_objectsTex_005A40;
+
+#define dobject_hidan_objectsTex_005E40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_005E40"
+static const ALIGN_ASSET(2) char object_hidan_objectsTex_005E40[] = dobject_hidan_objectsTex_005E40;
+
+#define dobject_hidan_objectsTex_006640 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_006640"
+static const ALIGN_ASSET(2) char object_hidan_objectsTex_006640[] = dobject_hidan_objectsTex_006640;
+
+#define dobject_hidan_objectsTex_006A40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_006A40"
+static const ALIGN_ASSET(2) char object_hidan_objectsTex_006A40[] = dobject_hidan_objectsTex_006A40;
+
+#define dobject_hidan_objectsTex_006C40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_006C40"
+static const ALIGN_ASSET(2) char object_hidan_objectsTex_006C40[] = dobject_hidan_objectsTex_006C40;
+
+#define dobject_hidan_objectsTex_006E40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_006E40"
+static const ALIGN_ASSET(2) char object_hidan_objectsTex_006E40[] = dobject_hidan_objectsTex_006E40;
+
+#define dobject_hidan_objectsTex_00FB20 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_00FB20"
+static const ALIGN_ASSET(2) char object_hidan_objectsTex_00FB20[] = dobject_hidan_objectsTex_00FB20;
+
+#define dobject_hidan_objectsTex_010D90 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_010D90"
+static const ALIGN_ASSET(2) char object_hidan_objectsTex_010D90[] = dobject_hidan_objectsTex_010D90;
+
+#define dobject_hidan_objectsTLUT_000000 "__OTR__objects/object_hidan_objects/object_hidan_objectsTLUT_000000"
+static const ALIGN_ASSET(2) char object_hidan_objectsTLUT_000000[] = dobject_hidan_objectsTLUT_000000;
+
+#define dobject_hidan_objectsTLUT_000020 "__OTR__objects/object_hidan_objects/object_hidan_objectsTLUT_000020"
+static const ALIGN_ASSET(2) char object_hidan_objectsTLUT_000020[] = dobject_hidan_objectsTLUT_000020;
+
 #define dgFireTempleHammerableTotemBodyDL "__OTR__objects/object_hidan_objects/gFireTempleHammerableTotemBodyDL"
 static const ALIGN_ASSET(2) char gFireTempleHammerableTotemBodyDL[] = dgFireTempleHammerableTotemBodyDL;
 
@@ -204,64 +264,4 @@ static const ALIGN_ASSET(2) char gFireTempleDoorBackDL[] = dgFireTempleDoorBackD
 #define dgFireTempleDoorKillerTex "__OTR__objects/object_hidan_objects/gFireTempleDoorKillerTex"
 static const ALIGN_ASSET(2) char gFireTempleDoorKillerTex[] = dgFireTempleDoorKillerTex;
 
-#define dobject_hidan_objectsTex_000A40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_000A40"
-static const ALIGN_ASSET(2) char object_hidan_objectsTex_000A40[] = dobject_hidan_objectsTex_000A40;
-
-#define dobject_hidan_objectsTex_002A40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_002A40"
-static const ALIGN_ASSET(2) char object_hidan_objectsTex_002A40[] = dobject_hidan_objectsTex_002A40;
-
-#define dobject_hidan_objectsTex_000040 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_000040"
-static const ALIGN_ASSET(2) char object_hidan_objectsTex_000040[] = dobject_hidan_objectsTex_000040;
-
-#define dobject_hidan_objectsTLUT_000000 "__OTR__objects/object_hidan_objects/object_hidan_objectsTLUT_000000"
-static const ALIGN_ASSET(2) char object_hidan_objectsTLUT_000000[] = dobject_hidan_objectsTLUT_000000;
-
-#define dobject_hidan_objectsTex_004A40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_004A40"
-static const ALIGN_ASSET(2) char object_hidan_objectsTex_004A40[] = dobject_hidan_objectsTex_004A40;
-
-#define dobject_hidan_objectsTex_005640 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_005640"
-static const ALIGN_ASSET(2) char object_hidan_objectsTex_005640[] = dobject_hidan_objectsTex_005640;
-
-#define dobject_hidan_objectsTex_006640 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_006640"
-static const ALIGN_ASSET(2) char object_hidan_objectsTex_006640[] = dobject_hidan_objectsTex_006640;
-
-#define dobject_hidan_objectsTex_006A40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_006A40"
-static const ALIGN_ASSET(2) char object_hidan_objectsTex_006A40[] = dobject_hidan_objectsTex_006A40;
-
-#define dobject_hidan_objectsTex_004240 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_004240"
-static const ALIGN_ASSET(2) char object_hidan_objectsTex_004240[] = dobject_hidan_objectsTex_004240;
-
-#define dobject_hidan_objectsTex_005E40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_005E40"
-static const ALIGN_ASSET(2) char object_hidan_objectsTex_005E40[] = dobject_hidan_objectsTex_005E40;
-
-#define dobject_hidan_objectsTex_006C40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_006C40"
-static const ALIGN_ASSET(2) char object_hidan_objectsTex_006C40[] = dobject_hidan_objectsTex_006C40;
-
-#define dobject_hidan_objectsTex_005240 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_005240"
-static const ALIGN_ASSET(2) char object_hidan_objectsTex_005240[] = dobject_hidan_objectsTex_005240;
-
-#define dobject_hidan_objectsTex_003A40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_003A40"
-static const ALIGN_ASSET(2) char object_hidan_objectsTex_003A40[] = dobject_hidan_objectsTex_003A40;
-
-#define dobject_hidan_objectsTex_005A40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_005A40"
-static const ALIGN_ASSET(2) char object_hidan_objectsTex_005A40[] = dobject_hidan_objectsTex_005A40;
-
-#define dobject_hidan_objectsTLUT_000020 "__OTR__objects/object_hidan_objects/object_hidan_objectsTLUT_000020"
-static const ALIGN_ASSET(2) char object_hidan_objectsTLUT_000020[] = dobject_hidan_objectsTLUT_000020;
-
-#define dobject_hidan_objectsTex_001A40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_001A40"
-static const ALIGN_ASSET(2) char object_hidan_objectsTex_001A40[] = dobject_hidan_objectsTex_001A40;
-
-#define dobject_hidan_objectsTex_000240 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_000240"
-static const ALIGN_ASSET(2) char object_hidan_objectsTex_000240[] = dobject_hidan_objectsTex_000240;
-
-#define dobject_hidan_objectsTex_006E40 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_006E40"
-static const ALIGN_ASSET(2) char object_hidan_objectsTex_006E40[] = dobject_hidan_objectsTex_006E40;
-
-#define dobject_hidan_objectsTex_00FB20 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_00FB20"
-static const ALIGN_ASSET(2) char object_hidan_objectsTex_00FB20[] = dobject_hidan_objectsTex_00FB20;
-
-#define dobject_hidan_objectsTex_010D90 "__OTR__objects/object_hidan_objects/object_hidan_objectsTex_010D90"
-static const ALIGN_ASSET(2) char object_hidan_objectsTex_010D90[] = dobject_hidan_objectsTex_010D90;
-
 #endif // OBJECTS_OBJECT_HIDAN_OBJECTS_H
diff --git a/soh/assets/objects/object_hintnuts/object_hintnuts.h b/soh/assets/objects/object_hintnuts/object_hintnuts.h
index 59ea49111..481ccc57b 100644
--- a/soh/assets/objects/object_hintnuts/object_hintnuts.h
+++ b/soh/assets/objects/object_hintnuts/object_hintnuts.h
@@ -3,6 +3,24 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_hintnutsTex_0015A8 "__OTR__objects/object_hintnuts/object_hintnutsTex_0015A8"
+static const ALIGN_ASSET(2) char object_hintnutsTex_0015A8[] = dobject_hintnutsTex_0015A8;
+
+#define dobject_hintnutsTex_001DA8 "__OTR__objects/object_hintnuts/object_hintnutsTex_001DA8"
+static const ALIGN_ASSET(2) char object_hintnutsTex_001DA8[] = dobject_hintnutsTex_001DA8;
+
+#define dobject_hintnutsTex_001FA8 "__OTR__objects/object_hintnuts/object_hintnutsTex_001FA8"
+static const ALIGN_ASSET(2) char object_hintnutsTex_001FA8[] = dobject_hintnutsTex_001FA8;
+
+#define dobject_hintnutsTex_002028 "__OTR__objects/object_hintnuts/object_hintnutsTex_002028"
+static const ALIGN_ASSET(2) char object_hintnutsTex_002028[] = dobject_hintnutsTex_002028;
+
+#define dobject_hintnutsTex_0020A8 "__OTR__objects/object_hintnuts/object_hintnutsTex_0020A8"
+static const ALIGN_ASSET(2) char object_hintnutsTex_0020A8[] = dobject_hintnutsTex_0020A8;
+
+#define dobject_hintnutsTex_002128 "__OTR__objects/object_hintnuts/object_hintnutsTex_002128"
+static const ALIGN_ASSET(2) char object_hintnutsTex_002128[] = dobject_hintnutsTex_002128;
+
 #define dgHintNutsSkel "__OTR__objects/object_hintnuts/gHintNutsSkel"
 static const ALIGN_ASSET(2) char gHintNutsSkel[] = dgHintNutsSkel;
 
@@ -39,12 +57,6 @@ static const ALIGN_ASSET(2) char gHintNutsFlowerDL[] = dgHintNutsFlowerDL;
 #define dgHintNutsNutDL "__OTR__objects/object_hintnuts/gHintNutsNutDL"
 static const ALIGN_ASSET(2) char gHintNutsNutDL[] = dgHintNutsNutDL;
 
-#define dobject_hintnutsTex_0015A8 "__OTR__objects/object_hintnuts/object_hintnutsTex_0015A8"
-static const ALIGN_ASSET(2) char object_hintnutsTex_0015A8[] = dobject_hintnutsTex_0015A8;
-
-#define dobject_hintnutsTex_002128 "__OTR__objects/object_hintnuts/object_hintnutsTex_002128"
-static const ALIGN_ASSET(2) char object_hintnutsTex_002128[] = dobject_hintnutsTex_002128;
-
 #define dgHintNutsSkelLimbsLimb_002328DL_000C68 "__OTR__objects/object_hintnuts/gHintNutsSkelLimbsLimb_002328DL_000C68"
 static const ALIGN_ASSET(2) char gHintNutsSkelLimbsLimb_002328DL_000C68[] = dgHintNutsSkelLimbsLimb_002328DL_000C68;
 
@@ -72,16 +84,5 @@ static const ALIGN_ASSET(2) char gHintNutsSkelLimbsLimb_00237CDL_000E28[] = dgHi
 #define dgHintNutsSkelLimbsLimb_002388DL_000EC8 "__OTR__objects/object_hintnuts/gHintNutsSkelLimbsLimb_002388DL_000EC8"
 static const ALIGN_ASSET(2) char gHintNutsSkelLimbsLimb_002388DL_000EC8[] = dgHintNutsSkelLimbsLimb_002388DL_000EC8;
 
-#define dobject_hintnutsTex_001DA8 "__OTR__objects/object_hintnuts/object_hintnutsTex_001DA8"
-static const ALIGN_ASSET(2) char object_hintnutsTex_001DA8[] = dobject_hintnutsTex_001DA8;
-
-#define dobject_hintnutsTex_001FA8 "__OTR__objects/object_hintnuts/object_hintnutsTex_001FA8"
-static const ALIGN_ASSET(2) char object_hintnutsTex_001FA8[] = dobject_hintnutsTex_001FA8;
-
-#define dobject_hintnutsTex_002028 "__OTR__objects/object_hintnuts/object_hintnutsTex_002028"
-static const ALIGN_ASSET(2) char object_hintnutsTex_002028[] = dobject_hintnutsTex_002028;
-
-#define dobject_hintnutsTex_0020A8 "__OTR__objects/object_hintnuts/object_hintnutsTex_0020A8"
-static const ALIGN_ASSET(2) char object_hintnutsTex_0020A8[] = dobject_hintnutsTex_0020A8;
 
 #endif // OBJECTS_OBJECT_HINTNUTS_H
diff --git a/soh/assets/objects/object_horse_ganon/object_horse_ganon.h b/soh/assets/objects/object_horse_ganon/object_horse_ganon.h
index 99ba41bd1..a08d41e45 100644
--- a/soh/assets/objects/object_horse_ganon/object_horse_ganon.h
+++ b/soh/assets/objects/object_horse_ganon/object_horse_ganon.h
@@ -3,6 +3,39 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_horse_ganonTex_00A570 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00A570"
+static const ALIGN_ASSET(2) char object_horse_ganonTex_00A570[] = dobject_horse_ganonTex_00A570;
+
+#define dobject_horse_ganonTex_00A5F0 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00A5F0"
+static const ALIGN_ASSET(2) char object_horse_ganonTex_00A5F0[] = dobject_horse_ganonTex_00A5F0;
+
+#define dobject_horse_ganonTex_00A7F0 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00A7F0"
+static const ALIGN_ASSET(2) char object_horse_ganonTex_00A7F0[] = dobject_horse_ganonTex_00A7F0;
+
+#define dobject_horse_ganonTex_00A810 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00A810"
+static const ALIGN_ASSET(2) char object_horse_ganonTex_00A810[] = dobject_horse_ganonTex_00A810;
+
+#define dobject_horse_ganonTex_00AA10 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00AA10"
+static const ALIGN_ASSET(2) char object_horse_ganonTex_00AA10[] = dobject_horse_ganonTex_00AA10;
+
+#define dobject_horse_ganonTex_00B010 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00B010"
+static const ALIGN_ASSET(2) char object_horse_ganonTex_00B010[] = dobject_horse_ganonTex_00B010;
+
+#define dobject_horse_ganonTex_00B110 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00B110"
+static const ALIGN_ASSET(2) char object_horse_ganonTex_00B110[] = dobject_horse_ganonTex_00B110;
+
+#define dobject_horse_ganonTex_00B510 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00B510"
+static const ALIGN_ASSET(2) char object_horse_ganonTex_00B510[] = dobject_horse_ganonTex_00B510;
+
+#define dobject_horse_ganonTex_00B610 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00B610"
+static const ALIGN_ASSET(2) char object_horse_ganonTex_00B610[] = dobject_horse_ganonTex_00B610;
+
+#define dobject_horse_ganonTex_00B690 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00B690"
+static const ALIGN_ASSET(2) char object_horse_ganonTex_00B690[] = dobject_horse_ganonTex_00B690;
+
+#define dobject_horse_ganonTex_00BE90 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00BE90"
+static const ALIGN_ASSET(2) char object_horse_ganonTex_00BE90[] = dobject_horse_ganonTex_00BE90;
+
 #define dgHorseGanonSkel "__OTR__objects/object_horse_ganon/gHorseGanonSkel"
 static const ALIGN_ASSET(2) char gHorseGanonSkel[] = dgHorseGanonSkel;
 
@@ -33,21 +66,6 @@ static const ALIGN_ASSET(2) char gHorseGanonHeadHairTex[] = dgHorseGanonHeadHair
 #define dgHorseGanonLegTex "__OTR__objects/object_horse_ganon/gHorseGanonLegTex"
 static const ALIGN_ASSET(2) char gHorseGanonLegTex[] = dgHorseGanonLegTex;
 
-#define dobject_horse_ganonTex_00BE90 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00BE90"
-static const ALIGN_ASSET(2) char object_horse_ganonTex_00BE90[] = dobject_horse_ganonTex_00BE90;
-
-#define dobject_horse_ganonTex_00A7F0 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00A7F0"
-static const ALIGN_ASSET(2) char object_horse_ganonTex_00A7F0[] = dobject_horse_ganonTex_00A7F0;
-
-#define dobject_horse_ganonTex_00B010 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00B010"
-static const ALIGN_ASSET(2) char object_horse_ganonTex_00B010[] = dobject_horse_ganonTex_00B010;
-
-#define dobject_horse_ganonTex_00A5F0 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00A5F0"
-static const ALIGN_ASSET(2) char object_horse_ganonTex_00A5F0[] = dobject_horse_ganonTex_00A5F0;
-
-#define dobject_horse_ganonTex_00AA10 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00AA10"
-static const ALIGN_ASSET(2) char object_horse_ganonTex_00AA10[] = dobject_horse_ganonTex_00AA10;
-
 #define dgHorseGanonSkelLimbsLimb_008294SkinLimbDL_009D20 "__OTR__objects/object_horse_ganon/gHorseGanonSkelLimbsLimb_008294SkinLimbDL_009D20"
 static const ALIGN_ASSET(2) char gHorseGanonSkelLimbsLimb_008294SkinLimbDL_009D20[] = dgHorseGanonSkelLimbsLimb_008294SkinLimbDL_009D20;
 
@@ -101,22 +119,4 @@ static const ALIGN_ASSET(2) char gHorseGanonSkelLimbsLimb_008584DL_001CE0[] = dg
 
 #define dgHorseGanonSkelLimbsLimb_008294SkinLimbDL_009D20 "__OTR__objects/object_horse_ganon/gHorseGanonSkelLimbsLimb_008294SkinLimbDL_009D20"
 
-#define dobject_horse_ganonTex_00B510 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00B510"
-static const ALIGN_ASSET(2) char object_horse_ganonTex_00B510[] = dobject_horse_ganonTex_00B510;
-
-#define dobject_horse_ganonTex_00B110 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00B110"
-static const ALIGN_ASSET(2) char object_horse_ganonTex_00B110[] = dobject_horse_ganonTex_00B110;
-
-#define dobject_horse_ganonTex_00A570 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00A570"
-static const ALIGN_ASSET(2) char object_horse_ganonTex_00A570[] = dobject_horse_ganonTex_00A570;
-
-#define dobject_horse_ganonTex_00A810 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00A810"
-static const ALIGN_ASSET(2) char object_horse_ganonTex_00A810[] = dobject_horse_ganonTex_00A810;
-
-#define dobject_horse_ganonTex_00B690 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00B690"
-static const ALIGN_ASSET(2) char object_horse_ganonTex_00B690[] = dobject_horse_ganonTex_00B690;
-
-#define dobject_horse_ganonTex_00B610 "__OTR__objects/object_horse_ganon/object_horse_ganonTex_00B610"
-static const ALIGN_ASSET(2) char object_horse_ganonTex_00B610[] = dobject_horse_ganonTex_00B610;
-
 #endif // OBJECTS_OBJECT_HORSE_GANON_H
diff --git a/soh/assets/objects/object_horse_link_child/object_horse_link_child.h b/soh/assets/objects/object_horse_link_child/object_horse_link_child.h
index c52e043e0..98cd558c6 100644
--- a/soh/assets/objects/object_horse_link_child/object_horse_link_child.h
+++ b/soh/assets/objects/object_horse_link_child/object_horse_link_child.h
@@ -3,6 +3,33 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_horse_link_childTex_001F28 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_001F28"
+static const ALIGN_ASSET(2) char object_horse_link_childTex_001F28[] = dobject_horse_link_childTex_001F28;
+
+#define dobject_horse_link_childTex_001F68 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_001F68"
+static const ALIGN_ASSET(2) char object_horse_link_childTex_001F68[] = dobject_horse_link_childTex_001F68;
+
+#define dobject_horse_link_childTex_002168 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_002168"
+static const ALIGN_ASSET(2) char object_horse_link_childTex_002168[] = dobject_horse_link_childTex_002168;
+
+#define dobject_horse_link_childTex_002368 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_002368"
+static const ALIGN_ASSET(2) char object_horse_link_childTex_002368[] = dobject_horse_link_childTex_002368;
+
+#define dobject_horse_link_childTex_002568 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_002568"
+static const ALIGN_ASSET(2) char object_horse_link_childTex_002568[] = dobject_horse_link_childTex_002568;
+
+#define dobject_horse_link_childTex_002588 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_002588"
+static const ALIGN_ASSET(2) char object_horse_link_childTex_002588[] = dobject_horse_link_childTex_002588;
+
+#define dobject_horse_link_childTex_002788 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_002788"
+static const ALIGN_ASSET(2) char object_horse_link_childTex_002788[] = dobject_horse_link_childTex_002788;
+
+#define dobject_horse_link_childTex_008120 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_008120"
+static const ALIGN_ASSET(2) char object_horse_link_childTex_008120[] = dobject_horse_link_childTex_008120;
+
+#define dobject_horse_link_childTex_008320 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_008320"
+static const ALIGN_ASSET(2) char object_horse_link_childTex_008320[] = dobject_horse_link_childTex_008320;
+
 #define dgChildEponaSkel "__OTR__objects/object_horse_link_child/gChildEponaSkel"
 static const ALIGN_ASSET(2) char gChildEponaSkel[] = dgChildEponaSkel;
 
@@ -33,21 +60,6 @@ static const ALIGN_ASSET(2) char gChildEponaEyeHalfTex[] = dgChildEponaEyeHalfTe
 #define dgChildEponaEyeCloseTex "__OTR__objects/object_horse_link_child/gChildEponaEyeCloseTex"
 static const ALIGN_ASSET(2) char gChildEponaEyeCloseTex[] = dgChildEponaEyeCloseTex;
 
-#define dobject_horse_link_childTex_002568 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_002568"
-static const ALIGN_ASSET(2) char object_horse_link_childTex_002568[] = dobject_horse_link_childTex_002568;
-
-#define dobject_horse_link_childTex_008320 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_008320"
-static const ALIGN_ASSET(2) char object_horse_link_childTex_008320[] = dobject_horse_link_childTex_008320;
-
-#define dobject_horse_link_childTex_002168 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_002168"
-static const ALIGN_ASSET(2) char object_horse_link_childTex_002168[] = dobject_horse_link_childTex_002168;
-
-#define dobject_horse_link_childTex_008120 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_008120"
-static const ALIGN_ASSET(2) char object_horse_link_childTex_008120[] = dobject_horse_link_childTex_008120;
-
-#define dobject_horse_link_childTex_001F68 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_001F68"
-static const ALIGN_ASSET(2) char object_horse_link_childTex_001F68[] = dobject_horse_link_childTex_001F68;
-
 #define dgChildEponaSkelLimbsLimb_0077D8SkinLimbDL_007B30 "__OTR__objects/object_horse_link_child/gChildEponaSkelLimbsLimb_0077D8SkinLimbDL_007B30"
 static const ALIGN_ASSET(2) char gChildEponaSkelLimbsLimb_0077D8SkinLimbDL_007B30[] = dgChildEponaSkelLimbsLimb_0077D8SkinLimbDL_007B30;
 
@@ -80,16 +92,4 @@ static const ALIGN_ASSET(2) char gChildEponaSkelLimbsLimb_007A58DL_001678[] = dg
 
 #define dgChildEponaSkelLimbsLimb_0077D8SkinLimbDL_007B30 "__OTR__objects/object_horse_link_child/gChildEponaSkelLimbsLimb_0077D8SkinLimbDL_007B30"
 
-#define dobject_horse_link_childTex_002788 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_002788"
-static const ALIGN_ASSET(2) char object_horse_link_childTex_002788[] = dobject_horse_link_childTex_002788;
-
-#define dobject_horse_link_childTex_002588 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_002588"
-static const ALIGN_ASSET(2) char object_horse_link_childTex_002588[] = dobject_horse_link_childTex_002588;
-
-#define dobject_horse_link_childTex_002368 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_002368"
-static const ALIGN_ASSET(2) char object_horse_link_childTex_002368[] = dobject_horse_link_childTex_002368;
-
-#define dobject_horse_link_childTex_001F28 "__OTR__objects/object_horse_link_child/object_horse_link_childTex_001F28"
-static const ALIGN_ASSET(2) char object_horse_link_childTex_001F28[] = dobject_horse_link_childTex_001F28;
-
 #endif // OBJECTS_OBJECT_HORSE_LINK_CHILD_H
diff --git a/soh/assets/objects/object_horse_normal/object_horse_normal.h b/soh/assets/objects/object_horse_normal/object_horse_normal.h
index 5fbb019ba..d3bd4efd7 100644
--- a/soh/assets/objects/object_horse_normal/object_horse_normal.h
+++ b/soh/assets/objects/object_horse_normal/object_horse_normal.h
@@ -3,6 +3,30 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_horse_normalTex_0058D8 "__OTR__objects/object_horse_normal/object_horse_normalTex_0058D8"
+static const ALIGN_ASSET(2) char object_horse_normalTex_0058D8[] = dobject_horse_normalTex_0058D8;
+
+#define dobject_horse_normalTex_005918 "__OTR__objects/object_horse_normal/object_horse_normalTex_005918"
+static const ALIGN_ASSET(2) char object_horse_normalTex_005918[] = dobject_horse_normalTex_005918;
+
+#define dobject_horse_normalTex_005B18 "__OTR__objects/object_horse_normal/object_horse_normalTex_005B18"
+static const ALIGN_ASSET(2) char object_horse_normalTex_005B18[] = dobject_horse_normalTex_005B18;
+
+#define dobject_horse_normalTex_005B98 "__OTR__objects/object_horse_normal/object_horse_normalTex_005B98"
+static const ALIGN_ASSET(2) char object_horse_normalTex_005B98[] = dobject_horse_normalTex_005B98;
+
+#define dobject_horse_normalTex_005C98 "__OTR__objects/object_horse_normal/object_horse_normalTex_005C98"
+static const ALIGN_ASSET(2) char object_horse_normalTex_005C98[] = dobject_horse_normalTex_005C98;
+
+#define dobject_horse_normalTex_006F28 "__OTR__objects/object_horse_normal/object_horse_normalTex_006F28"
+static const ALIGN_ASSET(2) char object_horse_normalTex_006F28[] = dobject_horse_normalTex_006F28;
+
+#define dobject_horse_normalTex_007028 "__OTR__objects/object_horse_normal/object_horse_normalTex_007028"
+static const ALIGN_ASSET(2) char object_horse_normalTex_007028[] = dobject_horse_normalTex_007028;
+
+#define dobject_horse_normalTex_007128 "__OTR__objects/object_horse_normal/object_horse_normalTex_007128"
+static const ALIGN_ASSET(2) char object_horse_normalTex_007128[] = dobject_horse_normalTex_007128;
+
 #define dgHorseNormalSkel "__OTR__objects/object_horse_normal/gHorseNormalSkel"
 static const ALIGN_ASSET(2) char gHorseNormalSkel[] = dgHorseNormalSkel;
 
@@ -36,21 +60,6 @@ static const ALIGN_ASSET(2) char gHorseNormalWalkingAnim[] = dgHorseNormalWalkin
 #define dgHorseNormalEyeTex "__OTR__objects/object_horse_normal/gHorseNormalEyeTex"
 static const ALIGN_ASSET(2) char gHorseNormalEyeTex[] = dgHorseNormalEyeTex;
 
-#define dobject_horse_normalTex_005B98 "__OTR__objects/object_horse_normal/object_horse_normalTex_005B98"
-static const ALIGN_ASSET(2) char object_horse_normalTex_005B98[] = dobject_horse_normalTex_005B98;
-
-#define dobject_horse_normalTex_007128 "__OTR__objects/object_horse_normal/object_horse_normalTex_007128"
-static const ALIGN_ASSET(2) char object_horse_normalTex_007128[] = dobject_horse_normalTex_007128;
-
-#define dobject_horse_normalTex_007028 "__OTR__objects/object_horse_normal/object_horse_normalTex_007028"
-static const ALIGN_ASSET(2) char object_horse_normalTex_007028[] = dobject_horse_normalTex_007028;
-
-#define dobject_horse_normalTex_006F28 "__OTR__objects/object_horse_normal/object_horse_normalTex_006F28"
-static const ALIGN_ASSET(2) char object_horse_normalTex_006F28[] = dobject_horse_normalTex_006F28;
-
-#define dobject_horse_normalTex_0058D8 "__OTR__objects/object_horse_normal/object_horse_normalTex_0058D8"
-static const ALIGN_ASSET(2) char object_horse_normalTex_0058D8[] = dobject_horse_normalTex_0058D8;
-
 #define dgHorseNormalSkelLimbsLimb_009C64SkinLimbDL_007528 "__OTR__objects/object_horse_normal/gHorseNormalSkelLimbsLimb_009C64SkinLimbDL_007528"
 static const ALIGN_ASSET(2) char gHorseNormalSkelLimbsLimb_009C64SkinLimbDL_007528[] = dgHorseNormalSkelLimbsLimb_009C64SkinLimbDL_007528;
 
@@ -83,13 +92,4 @@ static const ALIGN_ASSET(2) char gHorseNormalSkelLimbsLimb_009EE4DL_006878[] = d
 
 #define dgHorseNormalSkelLimbsLimb_009C64SkinLimbDL_007528 "__OTR__objects/object_horse_normal/gHorseNormalSkelLimbsLimb_009C64SkinLimbDL_007528"
 
-#define dobject_horse_normalTex_005918 "__OTR__objects/object_horse_normal/object_horse_normalTex_005918"
-static const ALIGN_ASSET(2) char object_horse_normalTex_005918[] = dobject_horse_normalTex_005918;
-
-#define dobject_horse_normalTex_005C98 "__OTR__objects/object_horse_normal/object_horse_normalTex_005C98"
-static const ALIGN_ASSET(2) char object_horse_normalTex_005C98[] = dobject_horse_normalTex_005C98;
-
-#define dobject_horse_normalTex_005B18 "__OTR__objects/object_horse_normal/object_horse_normalTex_005B18"
-static const ALIGN_ASSET(2) char object_horse_normalTex_005B18[] = dobject_horse_normalTex_005B18;
-
 #endif // OBJECTS_OBJECT_HORSE_NORMAL_H
diff --git a/soh/assets/objects/object_horse_zelda/object_horse_zelda.h b/soh/assets/objects/object_horse_zelda/object_horse_zelda.h
index 59647d4b0..8c95c4ca2 100644
--- a/soh/assets/objects/object_horse_zelda/object_horse_zelda.h
+++ b/soh/assets/objects/object_horse_zelda/object_horse_zelda.h
@@ -3,6 +3,42 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_horse_zeldaTex_000408 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_000408"
+static const ALIGN_ASSET(2) char object_horse_zeldaTex_000408[] = dobject_horse_zeldaTex_000408;
+
+#define dobject_horse_zeldaTex_000888 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_000888"
+static const ALIGN_ASSET(2) char object_horse_zeldaTex_000888[] = dobject_horse_zeldaTex_000888;
+
+#define dobject_horse_zeldaTex_000988 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_000988"
+static const ALIGN_ASSET(2) char object_horse_zeldaTex_000988[] = dobject_horse_zeldaTex_000988;
+
+#define dobject_horse_zeldaTex_002578 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_002578"
+static const ALIGN_ASSET(2) char object_horse_zeldaTex_002578[] = dobject_horse_zeldaTex_002578;
+
+#define dobject_horse_zeldaTex_002678 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_002678"
+static const ALIGN_ASSET(2) char object_horse_zeldaTex_002678[] = dobject_horse_zeldaTex_002678;
+
+#define dobject_horse_zeldaTex_002778 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_002778"
+static const ALIGN_ASSET(2) char object_horse_zeldaTex_002778[] = dobject_horse_zeldaTex_002778;
+
+#define dobject_horse_zeldaTex_002978 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_002978"
+static const ALIGN_ASSET(2) char object_horse_zeldaTex_002978[] = dobject_horse_zeldaTex_002978;
+
+#define dobject_horse_zeldaTex_003178 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_003178"
+static const ALIGN_ASSET(2) char object_horse_zeldaTex_003178[] = dobject_horse_zeldaTex_003178;
+
+#define dobject_horse_zeldaTex_003278 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_003278"
+static const ALIGN_ASSET(2) char object_horse_zeldaTex_003278[] = dobject_horse_zeldaTex_003278;
+
+#define dobject_horse_zeldaTex_003378 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_003378"
+static const ALIGN_ASSET(2) char object_horse_zeldaTex_003378[] = dobject_horse_zeldaTex_003378;
+
+#define dobject_horse_zeldaTex_0033F8 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_0033F8"
+static const ALIGN_ASSET(2) char object_horse_zeldaTex_0033F8[] = dobject_horse_zeldaTex_0033F8;
+
+#define dobject_horse_zeldaTex_0034F8 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_0034F8"
+static const ALIGN_ASSET(2) char object_horse_zeldaTex_0034F8[] = dobject_horse_zeldaTex_0034F8;
+
 #define dgHorseZeldaSkel "__OTR__objects/object_horse_zelda/gHorseZeldaSkel"
 static const ALIGN_ASSET(2) char gHorseZeldaSkel[] = dgHorseZeldaSkel;
 
@@ -21,33 +57,6 @@ static const ALIGN_ASSET(2) char gHorseZeldaNoseTex[] = dgHorseZeldaNoseTex;
 #define dgHorseZeldaLegTex "__OTR__objects/object_horse_zelda/gHorseZeldaLegTex"
 static const ALIGN_ASSET(2) char gHorseZeldaLegTex[] = dgHorseZeldaLegTex;
 
-#define dobject_horse_zeldaTex_0034F8 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_0034F8"
-static const ALIGN_ASSET(2) char object_horse_zeldaTex_0034F8[] = dobject_horse_zeldaTex_0034F8;
-
-#define dobject_horse_zeldaTex_0033F8 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_0033F8"
-static const ALIGN_ASSET(2) char object_horse_zeldaTex_0033F8[] = dobject_horse_zeldaTex_0033F8;
-
-#define dobject_horse_zeldaTex_003378 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_003378"
-static const ALIGN_ASSET(2) char object_horse_zeldaTex_003378[] = dobject_horse_zeldaTex_003378;
-
-#define dobject_horse_zeldaTex_003278 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_003278"
-static const ALIGN_ASSET(2) char object_horse_zeldaTex_003278[] = dobject_horse_zeldaTex_003278;
-
-#define dobject_horse_zeldaTex_003178 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_003178"
-static const ALIGN_ASSET(2) char object_horse_zeldaTex_003178[] = dobject_horse_zeldaTex_003178;
-
-#define dobject_horse_zeldaTex_002978 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_002978"
-static const ALIGN_ASSET(2) char object_horse_zeldaTex_002978[] = dobject_horse_zeldaTex_002978;
-
-#define dobject_horse_zeldaTex_002778 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_002778"
-static const ALIGN_ASSET(2) char object_horse_zeldaTex_002778[] = dobject_horse_zeldaTex_002778;
-
-#define dobject_horse_zeldaTex_002678 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_002678"
-static const ALIGN_ASSET(2) char object_horse_zeldaTex_002678[] = dobject_horse_zeldaTex_002678;
-
-#define dobject_horse_zeldaTex_002578 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_002578"
-static const ALIGN_ASSET(2) char object_horse_zeldaTex_002578[] = dobject_horse_zeldaTex_002578;
-
 #define dgHorseZeldaSkelLimbsLimb_0067E4SkinLimbDL_0036F8 "__OTR__objects/object_horse_zelda/gHorseZeldaSkelLimbsLimb_0067E4SkinLimbDL_0036F8"
 static const ALIGN_ASSET(2) char gHorseZeldaSkelLimbsLimb_0067E4SkinLimbDL_0036F8[] = dgHorseZeldaSkelLimbsLimb_0067E4SkinLimbDL_0036F8;
 
@@ -80,13 +89,4 @@ static const ALIGN_ASSET(2) char gHorseZeldaSkelLimbsLimb_006A64DL_002088[] = dg
 
 #define dgHorseZeldaSkelLimbsLimb_0067E4SkinLimbDL_0036F8 "__OTR__objects/object_horse_zelda/gHorseZeldaSkelLimbsLimb_0067E4SkinLimbDL_0036F8"
 
-#define dobject_horse_zeldaTex_000988 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_000988"
-static const ALIGN_ASSET(2) char object_horse_zeldaTex_000988[] = dobject_horse_zeldaTex_000988;
-
-#define dobject_horse_zeldaTex_000888 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_000888"
-static const ALIGN_ASSET(2) char object_horse_zeldaTex_000888[] = dobject_horse_zeldaTex_000888;
-
-#define dobject_horse_zeldaTex_000408 "__OTR__objects/object_horse_zelda/object_horse_zeldaTex_000408"
-static const ALIGN_ASSET(2) char object_horse_zeldaTex_000408[] = dobject_horse_zeldaTex_000408;
-
 #endif // OBJECTS_OBJECT_HORSE_ZELDA_H
diff --git a/soh/assets/objects/object_jya_obj/object_jya_obj.h b/soh/assets/objects/object_jya_obj/object_jya_obj.h
index e34686999..f5a7b839e 100644
--- a/soh/assets/objects/object_jya_obj/object_jya_obj.h
+++ b/soh/assets/objects/object_jya_obj/object_jya_obj.h
@@ -3,6 +3,27 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_jya_objTex_00B4B8 "__OTR__objects/object_jya_obj/object_jya_objTex_00B4B8"
+static const ALIGN_ASSET(2) char object_jya_objTex_00B4B8[] = dobject_jya_objTex_00B4B8;
+
+#define dobject_jya_objTex_011A80 "__OTR__objects/object_jya_obj/object_jya_objTex_011A80"
+static const ALIGN_ASSET(2) char object_jya_objTex_011A80[] = dobject_jya_objTex_011A80;
+
+#define dobject_jya_objTex_016140 "__OTR__objects/object_jya_obj/object_jya_objTex_016140"
+static const ALIGN_ASSET(2) char object_jya_objTex_016140[] = dobject_jya_objTex_016140;
+
+#define dobject_jya_objTex_017140 "__OTR__objects/object_jya_obj/object_jya_objTex_017140"
+static const ALIGN_ASSET(2) char object_jya_objTex_017140[] = dobject_jya_objTex_017140;
+
+#define dobject_jya_objTex_01B340 "__OTR__objects/object_jya_obj/object_jya_objTex_01B340"
+static const ALIGN_ASSET(2) char object_jya_objTex_01B340[] = dobject_jya_objTex_01B340;
+
+#define dobject_jya_objTex_01B740 "__OTR__objects/object_jya_obj/object_jya_objTex_01B740"
+static const ALIGN_ASSET(2) char object_jya_objTex_01B740[] = dobject_jya_objTex_01B740;
+
+#define dobject_jya_objTLUT_011A60 "__OTR__objects/object_jya_obj/object_jya_objTLUT_011A60"
+static const ALIGN_ASSET(2) char object_jya_objTLUT_011A60[] = dobject_jya_objTLUT_011A60;
+
 #define dg1fliftDL "__OTR__objects/object_jya_obj/g1fliftDL"
 static const ALIGN_ASSET(2) char g1fliftDL[] = dg1fliftDL;
 
@@ -231,25 +252,4 @@ static const ALIGN_ASSET(2) char gZurerukabeDL[] = dgZurerukabeDL;
 #define dgZurerukabeCol "__OTR__objects/object_jya_obj/gZurerukabeCol"
 static const ALIGN_ASSET(2) char gZurerukabeCol[] = dgZurerukabeCol;
 
-#define dobject_jya_objTex_017140 "__OTR__objects/object_jya_obj/object_jya_objTex_017140"
-static const ALIGN_ASSET(2) char object_jya_objTex_017140[] = dobject_jya_objTex_017140;
-
-#define dobject_jya_objTex_01B340 "__OTR__objects/object_jya_obj/object_jya_objTex_01B340"
-static const ALIGN_ASSET(2) char object_jya_objTex_01B340[] = dobject_jya_objTex_01B340;
-
-#define dobject_jya_objTex_01B740 "__OTR__objects/object_jya_obj/object_jya_objTex_01B740"
-static const ALIGN_ASSET(2) char object_jya_objTex_01B740[] = dobject_jya_objTex_01B740;
-
-#define dobject_jya_objTex_00B4B8 "__OTR__objects/object_jya_obj/object_jya_objTex_00B4B8"
-static const ALIGN_ASSET(2) char object_jya_objTex_00B4B8[] = dobject_jya_objTex_00B4B8;
-
-#define dobject_jya_objTex_016140 "__OTR__objects/object_jya_obj/object_jya_objTex_016140"
-static const ALIGN_ASSET(2) char object_jya_objTex_016140[] = dobject_jya_objTex_016140;
-
-#define dobject_jya_objTex_011A80 "__OTR__objects/object_jya_obj/object_jya_objTex_011A80"
-static const ALIGN_ASSET(2) char object_jya_objTex_011A80[] = dobject_jya_objTex_011A80;
-
-#define dobject_jya_objTLUT_011A60 "__OTR__objects/object_jya_obj/object_jya_objTLUT_011A60"
-static const ALIGN_ASSET(2) char object_jya_objTLUT_011A60[] = dobject_jya_objTLUT_011A60;
-
 #endif // OBJECTS_OBJECT_JYA_OBJ_H
diff --git a/soh/assets/objects/object_link_boy/object_link_boy.h b/soh/assets/objects/object_link_boy/object_link_boy.h
index 13ad2b3a1..a36662a80 100644
--- a/soh/assets/objects/object_link_boy/object_link_boy.h
+++ b/soh/assets/objects/object_link_boy/object_link_boy.h
@@ -3,6 +3,27 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_link_boyTLUT_005400 "__OTR__objects/object_link_boy/object_link_boyTLUT_005400"
+static const ALIGN_ASSET(2) char object_link_boyTLUT_005400[] = dobject_link_boyTLUT_005400;
+
+#define dobject_link_boyTLUT_005800 "__OTR__objects/object_link_boy/object_link_boyTLUT_005800"
+static const ALIGN_ASSET(2) char object_link_boyTLUT_005800[] = dobject_link_boyTLUT_005800;
+
+#define dobject_link_boyTLUT_005A00 "__OTR__objects/object_link_boy/object_link_boyTLUT_005A00"
+static const ALIGN_ASSET(2) char object_link_boyTLUT_005A00[] = dobject_link_boyTLUT_005A00;
+
+#define dobject_link_boyTLUT_00CB40 "__OTR__objects/object_link_boy/object_link_boyTLUT_00CB40"
+static const ALIGN_ASSET(2) char object_link_boyTLUT_00CB40[] = dobject_link_boyTLUT_00CB40;
+
+#define dobject_link_boyTLUT_00CD48 "__OTR__objects/object_link_boy/object_link_boyTLUT_00CD48"
+static const ALIGN_ASSET(2) char object_link_boyTLUT_00CD48[] = dobject_link_boyTLUT_00CD48;
+
+#define dobject_link_boyTLUT_00CF50 "__OTR__objects/object_link_boy/object_link_boyTLUT_00CF50"
+static const ALIGN_ASSET(2) char object_link_boyTLUT_00CF50[] = dobject_link_boyTLUT_00CF50;
+
+#define dobject_link_boyTLUT_00D078 "__OTR__objects/object_link_boy/object_link_boyTLUT_00D078"
+static const ALIGN_ASSET(2) char object_link_boyTLUT_00D078[] = dobject_link_boyTLUT_00D078;
+
 #define dgLinkAdultSkel "__OTR__objects/object_link_boy/gLinkAdultSkel"
 static const ALIGN_ASSET(2) char gLinkAdultSkel[] = dgLinkAdultSkel;
 
@@ -309,9 +330,6 @@ static const ALIGN_ASSET(2) char gLinkAdultHookshotDesignTex[] = dgLinkAdultHook
 #define dgLinkAdultHookshotChainTex "__OTR__objects/object_link_boy/gLinkAdultHookshotChainTex"
 static const ALIGN_ASSET(2) char gLinkAdultHookshotChainTex[] = dgLinkAdultHookshotChainTex;
 
-#define dgLinkAdultHookshotReticleVtx "__OTR__objects/object_link_boy/gLinkAdultHookshotReticleVtx"
-static const ALIGN_ASSET(2) char gLinkAdultHookshotReticleVtx[] = dgLinkAdultHookshotReticleVtx;
-
 #define dgLinkAdultHookshotReticleTex "__OTR__objects/object_link_boy/gLinkAdultHookshotReticleTex"
 static const ALIGN_ASSET(2) char gLinkAdultHookshotReticleTex[] = dgLinkAdultHookshotReticleTex;
 
@@ -369,6 +387,9 @@ static const ALIGN_ASSET(2) char gLinkAdultGauntletPlate1Tex[] = dgLinkAdultGaun
 #define dgLinkAdultGauntletPlate2Tex "__OTR__objects/object_link_boy/gLinkAdultGauntletPlate2Tex"
 static const ALIGN_ASSET(2) char gLinkAdultGauntletPlate2Tex[] = dgLinkAdultGauntletPlate2Tex;
 
+#define dgLinkAdultHookshotReticleVtx "__OTR__objects/object_link_boy/gLinkAdultHookshotReticleVtx"
+static const ALIGN_ASSET(2) char gLinkAdultHookshotReticleVtx[] = dgLinkAdultHookshotReticleVtx;
+
 #define dgLinkAdultHookshotReticleDL "__OTR__objects/object_link_boy/gLinkAdultHookshotReticleDL"
 static const ALIGN_ASSET(2) char gLinkAdultHookshotReticleDL[] = dgLinkAdultHookshotReticleDL;
 
@@ -489,25 +510,5 @@ static const ALIGN_ASSET(2) char gLinkAdultVtx_0340A0[] = dgLinkAdultVtx_0340A0;
 #define dgLinkAdultVtx_02E7E0 "__OTR__objects/object_link_boy/gLinkAdultVtx_02E7E0"
 static const ALIGN_ASSET(2) char gLinkAdultVtx_02E7E0[] = dgLinkAdultVtx_02E7E0;
 
-#define dobject_link_boyTLUT_005800 "__OTR__objects/object_link_boy/object_link_boyTLUT_005800"
-static const ALIGN_ASSET(2) char object_link_boyTLUT_005800[] = dobject_link_boyTLUT_005800;
-
-#define dobject_link_boyTLUT_005A00 "__OTR__objects/object_link_boy/object_link_boyTLUT_005A00"
-static const ALIGN_ASSET(2) char object_link_boyTLUT_005A00[] = dobject_link_boyTLUT_005A00;
-
-#define dobject_link_boyTLUT_005400 "__OTR__objects/object_link_boy/object_link_boyTLUT_005400"
-static const ALIGN_ASSET(2) char object_link_boyTLUT_005400[] = dobject_link_boyTLUT_005400;
-
-#define dobject_link_boyTLUT_00CD48 "__OTR__objects/object_link_boy/object_link_boyTLUT_00CD48"
-static const ALIGN_ASSET(2) char object_link_boyTLUT_00CD48[] = dobject_link_boyTLUT_00CD48;
-
-#define dobject_link_boyTLUT_00CF50 "__OTR__objects/object_link_boy/object_link_boyTLUT_00CF50"
-static const ALIGN_ASSET(2) char object_link_boyTLUT_00CF50[] = dobject_link_boyTLUT_00CF50;
-
-#define dobject_link_boyTLUT_00CB40 "__OTR__objects/object_link_boy/object_link_boyTLUT_00CB40"
-static const ALIGN_ASSET(2) char object_link_boyTLUT_00CB40[] = dobject_link_boyTLUT_00CB40;
-
-#define dobject_link_boyTLUT_00D078 "__OTR__objects/object_link_boy/object_link_boyTLUT_00D078"
-static const ALIGN_ASSET(2) char object_link_boyTLUT_00D078[] = dobject_link_boyTLUT_00D078;
 
 #endif // OBJECTS_OBJECT_LINK_BOY_H
diff --git a/soh/assets/objects/object_masterkokirihead/object_masterkokirihead.h b/soh/assets/objects/object_masterkokirihead/object_masterkokirihead.h
index eb93d9bc6..a097752ba 100644
--- a/soh/assets/objects/object_masterkokirihead/object_masterkokirihead.h
+++ b/soh/assets/objects/object_masterkokirihead/object_masterkokirihead.h
@@ -3,6 +3,12 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_masterkokiriheadTex_0009F0 "__OTR__objects/object_masterkokirihead/object_masterkokiriheadTex_0009F0"
+static const ALIGN_ASSET(2) char object_masterkokiriheadTex_0009F0[] = dobject_masterkokiriheadTex_0009F0;
+
+#define dobject_masterkokiriheadTex_000A30 "__OTR__objects/object_masterkokirihead/object_masterkokiriheadTex_000A30"
+static const ALIGN_ASSET(2) char object_masterkokiriheadTex_000A30[] = dobject_masterkokiriheadTex_000A30;
+
 #define dgKokiriShopkeeperHeadDL "__OTR__objects/object_masterkokirihead/gKokiriShopkeeperHeadDL"
 static const ALIGN_ASSET(2) char gKokiriShopkeeperHeadDL[] = dgKokiriShopkeeperHeadDL;
 
@@ -33,10 +39,4 @@ static const ALIGN_ASSET(2) char gKokiriShopkeeperHatTex[] = dgKokiriShopkeeperH
 #define dgKokiriShopkeeperMouthAndNoseTex "__OTR__objects/object_masterkokirihead/gKokiriShopkeeperMouthAndNoseTex"
 static const ALIGN_ASSET(2) char gKokiriShopkeeperMouthAndNoseTex[] = dgKokiriShopkeeperMouthAndNoseTex;
 
-#define dobject_masterkokiriheadTex_0009F0 "__OTR__objects/object_masterkokirihead/object_masterkokiriheadTex_0009F0"
-static const ALIGN_ASSET(2) char object_masterkokiriheadTex_0009F0[] = dobject_masterkokiriheadTex_0009F0;
-
-#define dobject_masterkokiriheadTex_000A30 "__OTR__objects/object_masterkokirihead/object_masterkokiriheadTex_000A30"
-static const ALIGN_ASSET(2) char object_masterkokiriheadTex_000A30[] = dobject_masterkokiriheadTex_000A30;
-
 #endif // OBJECTS_OBJECT_MASTERKOKIRIHEAD_H
diff --git a/soh/assets/objects/object_mb/object_mb.h b/soh/assets/objects/object_mb/object_mb.h
index 3079270a0..38e0a0d78 100644
--- a/soh/assets/objects/object_mb/object_mb.h
+++ b/soh/assets/objects/object_mb/object_mb.h
@@ -3,6 +3,48 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_mbTex_008128 "__OTR__objects/object_mb/object_mbTex_008128"
+static const ALIGN_ASSET(2) char object_mbTex_008128[] = dobject_mbTex_008128;
+
+#define dobject_mbTex_008328 "__OTR__objects/object_mb/object_mbTex_008328"
+static const ALIGN_ASSET(2) char object_mbTex_008328[] = dobject_mbTex_008328;
+
+#define dobject_mbTex_008928 "__OTR__objects/object_mb/object_mbTex_008928"
+static const ALIGN_ASSET(2) char object_mbTex_008928[] = dobject_mbTex_008928;
+
+#define dobject_mbTex_008A28 "__OTR__objects/object_mb/object_mbTex_008A28"
+static const ALIGN_ASSET(2) char object_mbTex_008A28[] = dobject_mbTex_008A28;
+
+#define dobject_mbTex_008A48 "__OTR__objects/object_mb/object_mbTex_008A48"
+static const ALIGN_ASSET(2) char object_mbTex_008A48[] = dobject_mbTex_008A48;
+
+#define dobject_mbTex_008BC8 "__OTR__objects/object_mb/object_mbTex_008BC8"
+static const ALIGN_ASSET(2) char object_mbTex_008BC8[] = dobject_mbTex_008BC8;
+
+#define dobject_mbTex_008C48 "__OTR__objects/object_mb/object_mbTex_008C48"
+static const ALIGN_ASSET(2) char object_mbTex_008C48[] = dobject_mbTex_008C48;
+
+#define dobject_mbTex_008C88 "__OTR__objects/object_mb/object_mbTex_008C88"
+static const ALIGN_ASSET(2) char object_mbTex_008C88[] = dobject_mbTex_008C88;
+
+#define dobject_mbTex_00EC00 "__OTR__objects/object_mb/object_mbTex_00EC00"
+static const ALIGN_ASSET(2) char object_mbTex_00EC00[] = dobject_mbTex_00EC00;
+
+#define dobject_mbTex_00EE00 "__OTR__objects/object_mb/object_mbTex_00EE00"
+static const ALIGN_ASSET(2) char object_mbTex_00EE00[] = dobject_mbTex_00EE00;
+
+#define dobject_mbTex_00EF00 "__OTR__objects/object_mb/object_mbTex_00EF00"
+static const ALIGN_ASSET(2) char object_mbTex_00EF00[] = dobject_mbTex_00EF00;
+
+#define dobject_mbTex_00F000 "__OTR__objects/object_mb/object_mbTex_00F000"
+static const ALIGN_ASSET(2) char object_mbTex_00F000[] = dobject_mbTex_00F000;
+
+#define dobject_mbTex_00F200 "__OTR__objects/object_mb/object_mbTex_00F200"
+static const ALIGN_ASSET(2) char object_mbTex_00F200[] = dobject_mbTex_00F200;
+
+#define dobject_mbTex_00F280 "__OTR__objects/object_mb/object_mbTex_00F280"
+static const ALIGN_ASSET(2) char object_mbTex_00F280[] = dobject_mbTex_00F280;
+
 #define dgEnMbSpearSkel "__OTR__objects/object_mb/gEnMbSpearSkel"
 static const ALIGN_ASSET(2) char gEnMbSpearSkel[] = dgEnMbSpearSkel;
 
@@ -168,48 +210,6 @@ static const ALIGN_ASSET(2) char gEnMbDL_013A30[] = dgEnMbDL_013A30;
 #define dgEnMbDL_013DF0 "__OTR__objects/object_mb/gEnMbDL_013DF0"
 static const ALIGN_ASSET(2) char gEnMbDL_013DF0[] = dgEnMbDL_013DF0;
 
-#define dobject_mbTex_008328 "__OTR__objects/object_mb/object_mbTex_008328"
-static const ALIGN_ASSET(2) char object_mbTex_008328[] = dobject_mbTex_008328;
-
-#define dobject_mbTex_008128 "__OTR__objects/object_mb/object_mbTex_008128"
-static const ALIGN_ASSET(2) char object_mbTex_008128[] = dobject_mbTex_008128;
-
-#define dobject_mbTex_008BC8 "__OTR__objects/object_mb/object_mbTex_008BC8"
-static const ALIGN_ASSET(2) char object_mbTex_008BC8[] = dobject_mbTex_008BC8;
-
-#define dobject_mbTex_008C48 "__OTR__objects/object_mb/object_mbTex_008C48"
-static const ALIGN_ASSET(2) char object_mbTex_008C48[] = dobject_mbTex_008C48;
-
-#define dobject_mbTex_008C88 "__OTR__objects/object_mb/object_mbTex_008C88"
-static const ALIGN_ASSET(2) char object_mbTex_008C88[] = dobject_mbTex_008C88;
-
-#define dobject_mbTex_008A48 "__OTR__objects/object_mb/object_mbTex_008A48"
-static const ALIGN_ASSET(2) char object_mbTex_008A48[] = dobject_mbTex_008A48;
-
-#define dobject_mbTex_008928 "__OTR__objects/object_mb/object_mbTex_008928"
-static const ALIGN_ASSET(2) char object_mbTex_008928[] = dobject_mbTex_008928;
-
-#define dobject_mbTex_008A28 "__OTR__objects/object_mb/object_mbTex_008A28"
-static const ALIGN_ASSET(2) char object_mbTex_008A28[] = dobject_mbTex_008A28;
-
-#define dobject_mbTex_00F280 "__OTR__objects/object_mb/object_mbTex_00F280"
-static const ALIGN_ASSET(2) char object_mbTex_00F280[] = dobject_mbTex_00F280;
-
-#define dobject_mbTex_00EE00 "__OTR__objects/object_mb/object_mbTex_00EE00"
-static const ALIGN_ASSET(2) char object_mbTex_00EE00[] = dobject_mbTex_00EE00;
-
-#define dobject_mbTex_00EC00 "__OTR__objects/object_mb/object_mbTex_00EC00"
-static const ALIGN_ASSET(2) char object_mbTex_00EC00[] = dobject_mbTex_00EC00;
-
-#define dobject_mbTex_00EF00 "__OTR__objects/object_mb/object_mbTex_00EF00"
-static const ALIGN_ASSET(2) char object_mbTex_00EF00[] = dobject_mbTex_00EF00;
-
-#define dobject_mbTex_00F000 "__OTR__objects/object_mb/object_mbTex_00F000"
-static const ALIGN_ASSET(2) char object_mbTex_00F000[] = dobject_mbTex_00F000;
-
-#define dobject_mbTex_00F200 "__OTR__objects/object_mb/object_mbTex_00F200"
-static const ALIGN_ASSET(2) char object_mbTex_00F200[] = dobject_mbTex_00F200;
-
 #define dgEnMbSpearSkelLimbsLimb_008DE8DL_007908 "__OTR__objects/object_mb/gEnMbSpearSkelLimbsLimb_008DE8DL_007908"
 static const ALIGN_ASSET(2) char gEnMbSpearSkelLimbsLimb_008DE8DL_007908[] = dgEnMbSpearSkelLimbsLimb_008DE8DL_007908;
 
diff --git a/soh/assets/objects/object_mizu_objects/object_mizu_objects.h b/soh/assets/objects/object_mizu_objects/object_mizu_objects.h
index c135c8db2..c447bc54a 100644
--- a/soh/assets/objects/object_mizu_objects/object_mizu_objects.h
+++ b/soh/assets/objects/object_mizu_objects/object_mizu_objects.h
@@ -3,6 +3,48 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_mizu_objectsTex_004C00 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_004C00"
+static const ALIGN_ASSET(2) char object_mizu_objectsTex_004C00[] = dobject_mizu_objectsTex_004C00;
+
+#define dobject_mizu_objectsTex_005E70 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_005E70"
+static const ALIGN_ASSET(2) char object_mizu_objectsTex_005E70[] = dobject_mizu_objectsTex_005E70;
+
+#define dobject_mizu_objectsTex_007520 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_007520"
+static const ALIGN_ASSET(2) char object_mizu_objectsTex_007520[] = dobject_mizu_objectsTex_007520;
+
+#define dobject_mizu_objectsTex_007D20 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_007D20"
+static const ALIGN_ASSET(2) char object_mizu_objectsTex_007D20[] = dobject_mizu_objectsTex_007D20;
+
+#define dobject_mizu_objectsTex_008520 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_008520"
+static const ALIGN_ASSET(2) char object_mizu_objectsTex_008520[] = dobject_mizu_objectsTex_008520;
+
+#define dobject_mizu_objectsTex_008D20 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_008D20"
+static const ALIGN_ASSET(2) char object_mizu_objectsTex_008D20[] = dobject_mizu_objectsTex_008D20;
+
+#define dobject_mizu_objectsTex_009520 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_009520"
+static const ALIGN_ASSET(2) char object_mizu_objectsTex_009520[] = dobject_mizu_objectsTex_009520;
+
+#define dobject_mizu_objectsTex_009720 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_009720"
+static const ALIGN_ASSET(2) char object_mizu_objectsTex_009720[] = dobject_mizu_objectsTex_009720;
+
+#define dobject_mizu_objectsTex_009920 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_009920"
+static const ALIGN_ASSET(2) char object_mizu_objectsTex_009920[] = dobject_mizu_objectsTex_009920;
+
+#define dobject_mizu_objectsTex_009B20 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_009B20"
+static const ALIGN_ASSET(2) char object_mizu_objectsTex_009B20[] = dobject_mizu_objectsTex_009B20;
+
+#define dobject_mizu_objectsTex_009D20 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_009D20"
+static const ALIGN_ASSET(2) char object_mizu_objectsTex_009D20[] = dobject_mizu_objectsTex_009D20;
+
+#define dobject_mizu_objectsTex_009F20 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_009F20"
+static const ALIGN_ASSET(2) char object_mizu_objectsTex_009F20[] = dobject_mizu_objectsTex_009F20;
+
+#define dobject_mizu_objectsTex_00A720 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_00A720"
+static const ALIGN_ASSET(2) char object_mizu_objectsTex_00A720[] = dobject_mizu_objectsTex_00A720;
+
+#define dobject_mizu_objectsTex_00AB20 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_00AB20"
+static const ALIGN_ASSET(2) char object_mizu_objectsTex_00AB20[] = dobject_mizu_objectsTex_00AB20;
+
 #define dgObjectMizuObjectsMovebgDL_000190 "__OTR__objects/object_mizu_objects/gObjectMizuObjectsMovebgDL_000190"
 static const ALIGN_ASSET(2) char gObjectMizuObjectsMovebgDL_000190[] = dgObjectMizuObjectsMovebgDL_000190;
 
@@ -93,46 +135,4 @@ static const ALIGN_ASSET(2) char gObjectMizuObjectsShutterCol_0073F0[] = dgObjec
 #define dgObjectMizuObjectsUzuCol_0074EC "__OTR__objects/object_mizu_objects/gObjectMizuObjectsUzuCol_0074EC"
 static const ALIGN_ASSET(2) char gObjectMizuObjectsUzuCol_0074EC[] = dgObjectMizuObjectsUzuCol_0074EC;
 
-#define dobject_mizu_objectsTex_007D20 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_007D20"
-static const ALIGN_ASSET(2) char object_mizu_objectsTex_007D20[] = dobject_mizu_objectsTex_007D20;
-
-#define dobject_mizu_objectsTex_008520 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_008520"
-static const ALIGN_ASSET(2) char object_mizu_objectsTex_008520[] = dobject_mizu_objectsTex_008520;
-
-#define dobject_mizu_objectsTex_008D20 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_008D20"
-static const ALIGN_ASSET(2) char object_mizu_objectsTex_008D20[] = dobject_mizu_objectsTex_008D20;
-
-#define dobject_mizu_objectsTex_00AB20 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_00AB20"
-static const ALIGN_ASSET(2) char object_mizu_objectsTex_00AB20[] = dobject_mizu_objectsTex_00AB20;
-
-#define dobject_mizu_objectsTex_009B20 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_009B20"
-static const ALIGN_ASSET(2) char object_mizu_objectsTex_009B20[] = dobject_mizu_objectsTex_009B20;
-
-#define dobject_mizu_objectsTex_009D20 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_009D20"
-static const ALIGN_ASSET(2) char object_mizu_objectsTex_009D20[] = dobject_mizu_objectsTex_009D20;
-
-#define dobject_mizu_objectsTex_009920 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_009920"
-static const ALIGN_ASSET(2) char object_mizu_objectsTex_009920[] = dobject_mizu_objectsTex_009920;
-
-#define dobject_mizu_objectsTex_009720 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_009720"
-static const ALIGN_ASSET(2) char object_mizu_objectsTex_009720[] = dobject_mizu_objectsTex_009720;
-
-#define dobject_mizu_objectsTex_009520 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_009520"
-static const ALIGN_ASSET(2) char object_mizu_objectsTex_009520[] = dobject_mizu_objectsTex_009520;
-
-#define dobject_mizu_objectsTex_009F20 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_009F20"
-static const ALIGN_ASSET(2) char object_mizu_objectsTex_009F20[] = dobject_mizu_objectsTex_009F20;
-
-#define dobject_mizu_objectsTex_007520 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_007520"
-static const ALIGN_ASSET(2) char object_mizu_objectsTex_007520[] = dobject_mizu_objectsTex_007520;
-
-#define dobject_mizu_objectsTex_004C00 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_004C00"
-static const ALIGN_ASSET(2) char object_mizu_objectsTex_004C00[] = dobject_mizu_objectsTex_004C00;
-
-#define dobject_mizu_objectsTex_005E70 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_005E70"
-static const ALIGN_ASSET(2) char object_mizu_objectsTex_005E70[] = dobject_mizu_objectsTex_005E70;
-
-#define dobject_mizu_objectsTex_00A720 "__OTR__objects/object_mizu_objects/object_mizu_objectsTex_00A720"
-static const ALIGN_ASSET(2) char object_mizu_objectsTex_00A720[] = dobject_mizu_objectsTex_00A720;
-
 #endif // OBJECTS_OBJECT_MIZU_OBJECTS_H
diff --git a/soh/assets/objects/object_mm/object_mm.h b/soh/assets/objects/object_mm/object_mm.h
index 00170fa3b..cefc05044 100644
--- a/soh/assets/objects/object_mm/object_mm.h
+++ b/soh/assets/objects/object_mm/object_mm.h
@@ -3,6 +3,33 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_mmTex_000930 "__OTR__objects/object_mm/object_mmTex_000930"
+static const ALIGN_ASSET(2) char object_mmTex_000930[] = dobject_mmTex_000930;
+
+#define dobject_mmTex_000970 "__OTR__objects/object_mm/object_mmTex_000970"
+static const ALIGN_ASSET(2) char object_mmTex_000970[] = dobject_mmTex_000970;
+
+#define dobject_mmTex_0009B0 "__OTR__objects/object_mm/object_mmTex_0009B0"
+static const ALIGN_ASSET(2) char object_mmTex_0009B0[] = dobject_mmTex_0009B0;
+
+#define dobject_mmTex_0009F0 "__OTR__objects/object_mm/object_mmTex_0009F0"
+static const ALIGN_ASSET(2) char object_mmTex_0009F0[] = dobject_mmTex_0009F0;
+
+#define dobject_mmTex_000A30 "__OTR__objects/object_mm/object_mmTex_000A30"
+static const ALIGN_ASSET(2) char object_mmTex_000A30[] = dobject_mmTex_000A30;
+
+#define dobject_mmTex_000B30 "__OTR__objects/object_mm/object_mmTex_000B30"
+static const ALIGN_ASSET(2) char object_mmTex_000B30[] = dobject_mmTex_000B30;
+
+#define dobject_mmTex_001030 "__OTR__objects/object_mm/object_mmTex_001030"
+static const ALIGN_ASSET(2) char object_mmTex_001030[] = dobject_mmTex_001030;
+
+#define dobject_mmTex_001130 "__OTR__objects/object_mm/object_mmTex_001130"
+static const ALIGN_ASSET(2) char object_mmTex_001130[] = dobject_mmTex_001130;
+
+#define dobject_mmTex_001330 "__OTR__objects/object_mm/object_mmTex_001330"
+static const ALIGN_ASSET(2) char object_mmTex_001330[] = dobject_mmTex_001330;
+
 #define dgRunningManSkel "__OTR__objects/object_mm/gRunningManSkel"
 static const ALIGN_ASSET(2) char gRunningManSkel[] = dgRunningManSkel;
 
@@ -78,31 +105,5 @@ static const ALIGN_ASSET(2) char gRunningManSkelLimbsLimb_005DC4DL_004CC8[] = dg
 #define dgRunningManSkelLimbsLimb_005DD0DL_004348 "__OTR__objects/object_mm/gRunningManSkelLimbsLimb_005DD0DL_004348"
 static const ALIGN_ASSET(2) char gRunningManSkelLimbsLimb_005DD0DL_004348[] = dgRunningManSkelLimbsLimb_005DD0DL_004348;
 
-#define dobject_mmTex_001330 "__OTR__objects/object_mm/object_mmTex_001330"
-static const ALIGN_ASSET(2) char object_mmTex_001330[] = dobject_mmTex_001330;
-
-#define dobject_mmTex_001130 "__OTR__objects/object_mm/object_mmTex_001130"
-static const ALIGN_ASSET(2) char object_mmTex_001130[] = dobject_mmTex_001130;
-
-#define dobject_mmTex_000930 "__OTR__objects/object_mm/object_mmTex_000930"
-static const ALIGN_ASSET(2) char object_mmTex_000930[] = dobject_mmTex_000930;
-
-#define dobject_mmTex_000970 "__OTR__objects/object_mm/object_mmTex_000970"
-static const ALIGN_ASSET(2) char object_mmTex_000970[] = dobject_mmTex_000970;
-
-#define dobject_mmTex_001030 "__OTR__objects/object_mm/object_mmTex_001030"
-static const ALIGN_ASSET(2) char object_mmTex_001030[] = dobject_mmTex_001030;
-
-#define dobject_mmTex_0009B0 "__OTR__objects/object_mm/object_mmTex_0009B0"
-static const ALIGN_ASSET(2) char object_mmTex_0009B0[] = dobject_mmTex_0009B0;
-
-#define dobject_mmTex_0009F0 "__OTR__objects/object_mm/object_mmTex_0009F0"
-static const ALIGN_ASSET(2) char object_mmTex_0009F0[] = dobject_mmTex_0009F0;
-
-#define dobject_mmTex_000A30 "__OTR__objects/object_mm/object_mmTex_000A30"
-static const ALIGN_ASSET(2) char object_mmTex_000A30[] = dobject_mmTex_000A30;
-
-#define dobject_mmTex_000B30 "__OTR__objects/object_mm/object_mmTex_000B30"
-static const ALIGN_ASSET(2) char object_mmTex_000B30[] = dobject_mmTex_000B30;
 
 #endif // OBJECTS_OBJECT_MM_H
diff --git a/soh/assets/objects/object_mo/object_mo.h b/soh/assets/objects/object_mo/object_mo.h
index 61983a400..fc48efd02 100644
--- a/soh/assets/objects/object_mo/object_mo.h
+++ b/soh/assets/objects/object_mo/object_mo.h
@@ -3,6 +3,21 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_moTex_000000 "__OTR__objects/object_mo/object_moTex_000000"
+static const ALIGN_ASSET(2) char object_moTex_000000[] = dobject_moTex_000000;
+
+#define dobject_moTex_000680 "__OTR__objects/object_mo/object_moTex_000680"
+static const ALIGN_ASSET(2) char object_moTex_000680[] = dobject_moTex_000680;
+
+#define dobject_moTex_004D20 "__OTR__objects/object_mo/object_moTex_004D20"
+static const ALIGN_ASSET(2) char object_moTex_004D20[] = dobject_moTex_004D20;
+
+#define dobject_moTex_005520 "__OTR__objects/object_mo/object_moTex_005520"
+static const ALIGN_ASSET(2) char object_moTex_005520[] = dobject_moTex_005520;
+
+#define dobject_moTex_005D20 "__OTR__objects/object_mo/object_moTex_005D20"
+static const ALIGN_ASSET(2) char object_moTex_005D20[] = dobject_moTex_005D20;
+
 #define dgMorphaTitleCardTex "__OTR__objects/object_mo/gMorphaTitleCardTex"
 static const ALIGN_ASSET(2) char gMorphaTitleCardTex[] = dgMorphaTitleCardTex;
 
@@ -174,19 +189,4 @@ static const ALIGN_ASSET(2) char gMorphaVtx_006938[] = dgMorphaVtx_006938;
 #define dgMorphaVtx_007BB8 "__OTR__objects/object_mo/gMorphaVtx_007BB8"
 static const ALIGN_ASSET(2) char gMorphaVtx_007BB8[] = dgMorphaVtx_007BB8;
 
-#define dobject_moTex_004D20 "__OTR__objects/object_mo/object_moTex_004D20"
-static const ALIGN_ASSET(2) char object_moTex_004D20[] = dobject_moTex_004D20;
-
-#define dobject_moTex_005D20 "__OTR__objects/object_mo/object_moTex_005D20"
-static const ALIGN_ASSET(2) char object_moTex_005D20[] = dobject_moTex_005D20;
-
-#define dobject_moTex_005520 "__OTR__objects/object_mo/object_moTex_005520"
-static const ALIGN_ASSET(2) char object_moTex_005520[] = dobject_moTex_005520;
-
-#define dobject_moTex_000000 "__OTR__objects/object_mo/object_moTex_000000"
-static const ALIGN_ASSET(2) char object_moTex_000000[] = dobject_moTex_000000;
-
-#define dobject_moTex_000680 "__OTR__objects/object_mo/object_moTex_000680"
-static const ALIGN_ASSET(2) char object_moTex_000680[] = dobject_moTex_000680;
-
 #endif // OBJECTS_OBJECT_MO_H
diff --git a/soh/assets/objects/object_oE1s/object_oE1s.h b/soh/assets/objects/object_oE1s/object_oE1s.h
index 4e1911ac9..6a7974c43 100644
--- a/soh/assets/objects/object_oE1s/object_oE1s.h
+++ b/soh/assets/objects/object_oE1s/object_oE1s.h
@@ -3,6 +3,12 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_oE1sTex_000478 "__OTR__objects/object_oE1s/object_oE1sTex_000478"
+static const ALIGN_ASSET(2) char object_oE1sTex_000478[] = dobject_oE1sTex_000478;
+
+#define dobject_oE1sTLUT_0001A8 "__OTR__objects/object_oE1s/object_oE1sTLUT_0001A8"
+static const ALIGN_ASSET(2) char object_oE1sTLUT_0001A8[] = dobject_oE1sTLUT_0001A8;
+
 #define dobject_oE1s_Anim_00007C "__OTR__objects/object_oE1s/object_oE1s_Anim_00007C"
 static const ALIGN_ASSET(2) char object_oE1s_Anim_00007C[] = dobject_oE1s_Anim_00007C;
 
@@ -87,10 +93,5 @@ static const ALIGN_ASSET(2) char object_oE1s_DL_006340[] = dobject_oE1s_DL_00634
 #define dobject_oE1s_DL_006490 "__OTR__objects/object_oE1s/object_oE1s_DL_006490"
 static const ALIGN_ASSET(2) char object_oE1s_DL_006490[] = dobject_oE1s_DL_006490;
 
-#define dobject_oE1sTex_000478 "__OTR__objects/object_oE1s/object_oE1sTex_000478"
-static const ALIGN_ASSET(2) char object_oE1sTex_000478[] = dobject_oE1sTex_000478;
-
-#define dobject_oE1sTLUT_0001A8 "__OTR__objects/object_oE1s/object_oE1sTLUT_0001A8"
-static const ALIGN_ASSET(2) char object_oE1sTLUT_0001A8[] = dobject_oE1sTLUT_0001A8;
 
 #endif // OBJECTS_OBJECT_OE1S_H
diff --git a/soh/assets/objects/object_oE4s/object_oE4s.h b/soh/assets/objects/object_oE4s/object_oE4s.h
index 28d7182a7..fe5eb473b 100644
--- a/soh/assets/objects/object_oE4s/object_oE4s.h
+++ b/soh/assets/objects/object_oE4s/object_oE4s.h
@@ -3,6 +3,12 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_oE4sTex_0002A0 "__OTR__objects/object_oE4s/object_oE4sTex_0002A0"
+static const ALIGN_ASSET(2) char object_oE4sTex_0002A0[] = dobject_oE4sTex_0002A0;
+
+#define dobject_oE4sTex_0003A0 "__OTR__objects/object_oE4s/object_oE4sTex_0003A0"
+static const ALIGN_ASSET(2) char object_oE4sTex_0003A0[] = dobject_oE4sTex_0003A0;
+
 #define dobject_oE4s_Anim_00007C "__OTR__objects/object_oE4s/object_oE4s_Anim_00007C"
 static const ALIGN_ASSET(2) char object_oE4s_Anim_00007C[] = dobject_oE4s_Anim_00007C;
 
@@ -81,10 +87,5 @@ static const ALIGN_ASSET(2) char object_oE4s_DL_004C48[] = dobject_oE4s_DL_004C4
 #define dobject_oE4s_DL_004D00 "__OTR__objects/object_oE4s/object_oE4s_DL_004D00"
 static const ALIGN_ASSET(2) char object_oE4s_DL_004D00[] = dobject_oE4s_DL_004D00;
 
-#define dobject_oE4sTex_0002A0 "__OTR__objects/object_oE4s/object_oE4sTex_0002A0"
-static const ALIGN_ASSET(2) char object_oE4sTex_0002A0[] = dobject_oE4sTex_0002A0;
-
-#define dobject_oE4sTex_0003A0 "__OTR__objects/object_oE4s/object_oE4sTex_0003A0"
-static const ALIGN_ASSET(2) char object_oE4sTex_0003A0[] = dobject_oE4sTex_0003A0;
 
 #endif // OBJECTS_OBJECT_OE4S_H
diff --git a/soh/assets/objects/object_oF1d_map/object_oF1d_map.h b/soh/assets/objects/object_oF1d_map/object_oF1d_map.h
index 7d232190c..9d9f3093c 100644
--- a/soh/assets/objects/object_oF1d_map/object_oF1d_map.h
+++ b/soh/assets/objects/object_oF1d_map/object_oF1d_map.h
@@ -3,6 +3,57 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_oF1d_mapTex_009270 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_009270"
+static const ALIGN_ASSET(2) char object_oF1d_mapTex_009270[] = dobject_oF1d_mapTex_009270;
+
+#define dobject_oF1d_mapTex_0092B0 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_0092B0"
+static const ALIGN_ASSET(2) char object_oF1d_mapTex_0092B0[] = dobject_oF1d_mapTex_0092B0;
+
+#define dobject_oF1d_mapTex_0092F0 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_0092F0"
+static const ALIGN_ASSET(2) char object_oF1d_mapTex_0092F0[] = dobject_oF1d_mapTex_0092F0;
+
+#define dobject_oF1d_mapTex_009370 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_009370"
+static const ALIGN_ASSET(2) char object_oF1d_mapTex_009370[] = dobject_oF1d_mapTex_009370;
+
+#define dobject_oF1d_mapTex_009B70 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_009B70"
+static const ALIGN_ASSET(2) char object_oF1d_mapTex_009B70[] = dobject_oF1d_mapTex_009B70;
+
+#define dobject_oF1d_mapTex_009C70 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_009C70"
+static const ALIGN_ASSET(2) char object_oF1d_mapTex_009C70[] = dobject_oF1d_mapTex_009C70;
+
+#define dobject_oF1d_mapTex_00C840 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00C840"
+static const ALIGN_ASSET(2) char object_oF1d_mapTex_00C840[] = dobject_oF1d_mapTex_00C840;
+
+#define dobject_oF1d_mapTex_00C880 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00C880"
+static const ALIGN_ASSET(2) char object_oF1d_mapTex_00C880[] = dobject_oF1d_mapTex_00C880;
+
+#define dobject_oF1d_mapTex_00CA80 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00CA80"
+static const ALIGN_ASSET(2) char object_oF1d_mapTex_00CA80[] = dobject_oF1d_mapTex_00CA80;
+
+#define dobject_oF1d_mapTex_00EE80 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00EE80"
+static const ALIGN_ASSET(2) char object_oF1d_mapTex_00EE80[] = dobject_oF1d_mapTex_00EE80;
+
+#define dobject_oF1d_mapTex_00F680 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00F680"
+static const ALIGN_ASSET(2) char object_oF1d_mapTex_00F680[] = dobject_oF1d_mapTex_00F680;
+
+#define dobject_oF1d_mapTex_00F6C0 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00F6C0"
+static const ALIGN_ASSET(2) char object_oF1d_mapTex_00F6C0[] = dobject_oF1d_mapTex_00F6C0;
+
+#define dobject_oF1d_mapTex_00F7C0 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00F7C0"
+static const ALIGN_ASSET(2) char object_oF1d_mapTex_00F7C0[] = dobject_oF1d_mapTex_00F7C0;
+
+#define dobject_oF1d_mapTex_00F8C0 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00F8C0"
+static const ALIGN_ASSET(2) char object_oF1d_mapTex_00F8C0[] = dobject_oF1d_mapTex_00F8C0;
+
+#define dobject_oF1d_mapTex_00FCC0 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00FCC0"
+static const ALIGN_ASSET(2) char object_oF1d_mapTex_00FCC0[] = dobject_oF1d_mapTex_00FCC0;
+
+#define dobject_oF1d_mapTLUT_009130 "__OTR__objects/object_oF1d_map/object_oF1d_mapTLUT_009130"
+static const ALIGN_ASSET(2) char object_oF1d_mapTLUT_009130[] = dobject_oF1d_mapTLUT_009130;
+
+#define dobject_oF1d_mapTLUT_00C440 "__OTR__objects/object_oF1d_map/object_oF1d_mapTLUT_00C440"
+static const ALIGN_ASSET(2) char object_oF1d_mapTLUT_00C440[] = dobject_oF1d_mapTLUT_00C440;
+
 #define dgGoronAnim_000750 "__OTR__objects/object_oF1d_map/gGoronAnim_000750"
 static const ALIGN_ASSET(2) char gGoronAnim_000750[] = dgGoronAnim_000750;
 
@@ -72,27 +123,6 @@ static const ALIGN_ASSET(2) char gGoronCsMouthNeutralTex[] = dgGoronCsMouthNeutr
 #define dgGoronCsMouthSmileTex "__OTR__objects/object_oF1d_map/gGoronCsMouthSmileTex"
 static const ALIGN_ASSET(2) char gGoronCsMouthSmileTex[] = dgGoronCsMouthSmileTex;
 
-#define dobject_oF1d_mapTex_009C70 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_009C70"
-static const ALIGN_ASSET(2) char object_oF1d_mapTex_009C70[] = dobject_oF1d_mapTex_009C70;
-
-#define dobject_oF1d_mapTex_009270 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_009270"
-static const ALIGN_ASSET(2) char object_oF1d_mapTex_009270[] = dobject_oF1d_mapTex_009270;
-
-#define dobject_oF1d_mapTLUT_009130 "__OTR__objects/object_oF1d_map/object_oF1d_mapTLUT_009130"
-static const ALIGN_ASSET(2) char object_oF1d_mapTLUT_009130[] = dobject_oF1d_mapTLUT_009130;
-
-#define dobject_oF1d_mapTex_0092B0 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_0092B0"
-static const ALIGN_ASSET(2) char object_oF1d_mapTex_0092B0[] = dobject_oF1d_mapTex_0092B0;
-
-#define dobject_oF1d_mapTex_0092F0 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_0092F0"
-static const ALIGN_ASSET(2) char object_oF1d_mapTex_0092F0[] = dobject_oF1d_mapTex_0092F0;
-
-#define dobject_oF1d_mapTex_009370 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_009370"
-static const ALIGN_ASSET(2) char object_oF1d_mapTex_009370[] = dobject_oF1d_mapTex_009370;
-
-#define dobject_oF1d_mapTex_009B70 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_009B70"
-static const ALIGN_ASSET(2) char object_oF1d_mapTex_009B70[] = dobject_oF1d_mapTex_009B70;
-
 #define dgGoronSkelLimbsLimb_00FDECDL_008708 "__OTR__objects/object_oF1d_map/gGoronSkelLimbsLimb_00FDECDL_008708"
 static const ALIGN_ASSET(2) char gGoronSkelLimbsLimb_00FDECDL_008708[] = dgGoronSkelLimbsLimb_00FDECDL_008708;
 
@@ -138,34 +168,5 @@ static const ALIGN_ASSET(2) char gGoronSkelLimbsLimb_00FE94DL_007FF0[] = dgGoron
 #define dgGoronSkelLimbsLimb_00FEA0DL_007458 "__OTR__objects/object_oF1d_map/gGoronSkelLimbsLimb_00FEA0DL_007458"
 static const ALIGN_ASSET(2) char gGoronSkelLimbsLimb_00FEA0DL_007458[] = dgGoronSkelLimbsLimb_00FEA0DL_007458;
 
-#define dobject_oF1d_mapTLUT_00C440 "__OTR__objects/object_oF1d_map/object_oF1d_mapTLUT_00C440"
-static const ALIGN_ASSET(2) char object_oF1d_mapTLUT_00C440[] = dobject_oF1d_mapTLUT_00C440;
-
-#define dobject_oF1d_mapTex_00C840 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00C840"
-static const ALIGN_ASSET(2) char object_oF1d_mapTex_00C840[] = dobject_oF1d_mapTex_00C840;
-
-#define dobject_oF1d_mapTex_00C880 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00C880"
-static const ALIGN_ASSET(2) char object_oF1d_mapTex_00C880[] = dobject_oF1d_mapTex_00C880;
-
-#define dobject_oF1d_mapTex_00CA80 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00CA80"
-static const ALIGN_ASSET(2) char object_oF1d_mapTex_00CA80[] = dobject_oF1d_mapTex_00CA80;
-
-#define dobject_oF1d_mapTex_00F680 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00F680"
-static const ALIGN_ASSET(2) char object_oF1d_mapTex_00F680[] = dobject_oF1d_mapTex_00F680;
-
-#define dobject_oF1d_mapTex_00EE80 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00EE80"
-static const ALIGN_ASSET(2) char object_oF1d_mapTex_00EE80[] = dobject_oF1d_mapTex_00EE80;
-
-#define dobject_oF1d_mapTex_00FCC0 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00FCC0"
-static const ALIGN_ASSET(2) char object_oF1d_mapTex_00FCC0[] = dobject_oF1d_mapTex_00FCC0;
-
-#define dobject_oF1d_mapTex_00F8C0 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00F8C0"
-static const ALIGN_ASSET(2) char object_oF1d_mapTex_00F8C0[] = dobject_oF1d_mapTex_00F8C0;
-
-#define dobject_oF1d_mapTex_00F7C0 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00F7C0"
-static const ALIGN_ASSET(2) char object_oF1d_mapTex_00F7C0[] = dobject_oF1d_mapTex_00F7C0;
-
-#define dobject_oF1d_mapTex_00F6C0 "__OTR__objects/object_oF1d_map/object_oF1d_mapTex_00F6C0"
-static const ALIGN_ASSET(2) char object_oF1d_mapTex_00F6C0[] = dobject_oF1d_mapTex_00F6C0;
 
 #endif // OBJECTS_OBJECT_OF1D_MAP_H
diff --git a/soh/assets/objects/object_ossan/object_ossan.h b/soh/assets/objects/object_ossan/object_ossan.h
index c19bb0095..5a9d1a4a4 100644
--- a/soh/assets/objects/object_ossan/object_ossan.h
+++ b/soh/assets/objects/object_ossan/object_ossan.h
@@ -3,6 +3,36 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_ossanTex_005078 "__OTR__objects/object_ossan/object_ossanTex_005078"
+static const ALIGN_ASSET(2) char object_ossanTex_005078[] = dobject_ossanTex_005078;
+
+#define dobject_ossanTex_005178 "__OTR__objects/object_ossan/object_ossanTex_005178"
+static const ALIGN_ASSET(2) char object_ossanTex_005178[] = dobject_ossanTex_005178;
+
+#define dobject_ossanTex_005278 "__OTR__objects/object_ossan/object_ossanTex_005278"
+static const ALIGN_ASSET(2) char object_ossanTex_005278[] = dobject_ossanTex_005278;
+
+#define dobject_ossanTex_005AB8 "__OTR__objects/object_ossan/object_ossanTex_005AB8"
+static const ALIGN_ASSET(2) char object_ossanTex_005AB8[] = dobject_ossanTex_005AB8;
+
+#define dobject_ossanTex_008A38 "__OTR__objects/object_ossan/object_ossanTex_008A38"
+static const ALIGN_ASSET(2) char object_ossanTex_008A38[] = dobject_ossanTex_008A38;
+
+#define dobject_ossanTex_008AB8 "__OTR__objects/object_ossan/object_ossanTex_008AB8"
+static const ALIGN_ASSET(2) char object_ossanTex_008AB8[] = dobject_ossanTex_008AB8;
+
+#define dobject_ossanTex_008CB8 "__OTR__objects/object_ossan/object_ossanTex_008CB8"
+static const ALIGN_ASSET(2) char object_ossanTex_008CB8[] = dobject_ossanTex_008CB8;
+
+#define dobject_ossanTex_008EB8 "__OTR__objects/object_ossan/object_ossanTex_008EB8"
+static const ALIGN_ASSET(2) char object_ossanTex_008EB8[] = dobject_ossanTex_008EB8;
+
+#define dobject_ossanTex_0096B8 "__OTR__objects/object_ossan/object_ossanTex_0096B8"
+static const ALIGN_ASSET(2) char object_ossanTex_0096B8[] = dobject_ossanTex_0096B8;
+
+#define dobject_ossanTex_0098B8 "__OTR__objects/object_ossan/object_ossanTex_0098B8"
+static const ALIGN_ASSET(2) char object_ossanTex_0098B8[] = dobject_ossanTex_0098B8;
+
 #define dgObjectOssanAnim_000338 "__OTR__objects/object_ossan/gObjectOssanAnim_000338"
 static const ALIGN_ASSET(2) char gObjectOssanAnim_000338[] = dgObjectOssanAnim_000338;
 
@@ -30,18 +60,6 @@ static const ALIGN_ASSET(2) char gObjectOssanEnSyatekiManDL_007E28[] = dgObjectO
 #define dgObjectOssanSkel "__OTR__objects/object_ossan/gObjectOssanSkel"
 static const ALIGN_ASSET(2) char gObjectOssanSkel[] = dgObjectOssanSkel;
 
-#define dobject_ossanTex_005078 "__OTR__objects/object_ossan/object_ossanTex_005078"
-static const ALIGN_ASSET(2) char object_ossanTex_005078[] = dobject_ossanTex_005078;
-
-#define dobject_ossanTex_005AB8 "__OTR__objects/object_ossan/object_ossanTex_005AB8"
-static const ALIGN_ASSET(2) char object_ossanTex_005AB8[] = dobject_ossanTex_005AB8;
-
-#define dobject_ossanTex_005178 "__OTR__objects/object_ossan/object_ossanTex_005178"
-static const ALIGN_ASSET(2) char object_ossanTex_005178[] = dobject_ossanTex_005178;
-
-#define dobject_ossanTex_005278 "__OTR__objects/object_ossan/object_ossanTex_005278"
-static const ALIGN_ASSET(2) char object_ossanTex_005278[] = dobject_ossanTex_005278;
-
 #define dgObjectOssanSkelLimbsLimb_009AB8DL_002E30 "__OTR__objects/object_ossan/gObjectOssanSkelLimbsLimb_009AB8DL_002E30"
 static const ALIGN_ASSET(2) char gObjectOssanSkelLimbsLimb_009AB8DL_002E30[] = dgObjectOssanSkelLimbsLimb_009AB8DL_002E30;
 
@@ -66,22 +84,5 @@ static const ALIGN_ASSET(2) char gObjectOssanSkelLimbsLimb_009B00DL_003708[] = d
 #define dgObjectOssanSkelLimbsLimb_009B0CDL_007428 "__OTR__objects/object_ossan/gObjectOssanSkelLimbsLimb_009B0CDL_007428"
 static const ALIGN_ASSET(2) char gObjectOssanSkelLimbsLimb_009B0CDL_007428[] = dgObjectOssanSkelLimbsLimb_009B0CDL_007428;
 
-#define dobject_ossanTex_008EB8 "__OTR__objects/object_ossan/object_ossanTex_008EB8"
-static const ALIGN_ASSET(2) char object_ossanTex_008EB8[] = dobject_ossanTex_008EB8;
-
-#define dobject_ossanTex_008A38 "__OTR__objects/object_ossan/object_ossanTex_008A38"
-static const ALIGN_ASSET(2) char object_ossanTex_008A38[] = dobject_ossanTex_008A38;
-
-#define dobject_ossanTex_0096B8 "__OTR__objects/object_ossan/object_ossanTex_0096B8"
-static const ALIGN_ASSET(2) char object_ossanTex_0096B8[] = dobject_ossanTex_0096B8;
-
-#define dobject_ossanTex_0098B8 "__OTR__objects/object_ossan/object_ossanTex_0098B8"
-static const ALIGN_ASSET(2) char object_ossanTex_0098B8[] = dobject_ossanTex_0098B8;
-
-#define dobject_ossanTex_008AB8 "__OTR__objects/object_ossan/object_ossanTex_008AB8"
-static const ALIGN_ASSET(2) char object_ossanTex_008AB8[] = dobject_ossanTex_008AB8;
-
-#define dobject_ossanTex_008CB8 "__OTR__objects/object_ossan/object_ossanTex_008CB8"
-static const ALIGN_ASSET(2) char object_ossanTex_008CB8[] = dobject_ossanTex_008CB8;
 
 #endif // OBJECTS_OBJECT_OSSAN_H
diff --git a/soh/assets/objects/object_owl/object_owl.h b/soh/assets/objects/object_owl/object_owl.h
index 3e4bc7fc3..ed3d494d6 100644
--- a/soh/assets/objects/object_owl/object_owl.h
+++ b/soh/assets/objects/object_owl/object_owl.h
@@ -3,6 +3,30 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_owlTex_0071A8 "__OTR__objects/object_owl/object_owlTex_0071A8"
+static const ALIGN_ASSET(2) char object_owlTex_0071A8[] = dobject_owlTex_0071A8;
+
+#define dobject_owlTex_0079A8 "__OTR__objects/object_owl/object_owlTex_0079A8"
+static const ALIGN_ASSET(2) char object_owlTex_0079A8[] = dobject_owlTex_0079A8;
+
+#define dobject_owlTex_0081A8 "__OTR__objects/object_owl/object_owlTex_0081A8"
+static const ALIGN_ASSET(2) char object_owlTex_0081A8[] = dobject_owlTex_0081A8;
+
+#define dobject_owlTex_0095A8 "__OTR__objects/object_owl/object_owlTex_0095A8"
+static const ALIGN_ASSET(2) char object_owlTex_0095A8[] = dobject_owlTex_0095A8;
+
+#define dobject_owlTex_009DA8 "__OTR__objects/object_owl/object_owlTex_009DA8"
+static const ALIGN_ASSET(2) char object_owlTex_009DA8[] = dobject_owlTex_009DA8;
+
+#define dobject_owlTex_009FA8 "__OTR__objects/object_owl/object_owlTex_009FA8"
+static const ALIGN_ASSET(2) char object_owlTex_009FA8[] = dobject_owlTex_009FA8;
+
+#define dobject_owlTex_00AFA8 "__OTR__objects/object_owl/object_owlTex_00AFA8"
+static const ALIGN_ASSET(2) char object_owlTex_00AFA8[] = dobject_owlTex_00AFA8;
+
+#define dobject_owlTex_00B7A8 "__OTR__objects/object_owl/object_owlTex_00B7A8"
+static const ALIGN_ASSET(2) char object_owlTex_00B7A8[] = dobject_owlTex_00B7A8;
+
 #define dgOwlFlyingSkel "__OTR__objects/object_owl/gOwlFlyingSkel"
 static const ALIGN_ASSET(2) char gOwlFlyingSkel[] = dgOwlFlyingSkel;
 
@@ -99,30 +123,6 @@ static const ALIGN_ASSET(2) char gObjOwlEyeHalfTex[] = dgObjOwlEyeHalfTex;
 #define dgObjOwlEyeClosedTex "__OTR__objects/object_owl/gObjOwlEyeClosedTex"
 static const ALIGN_ASSET(2) char gObjOwlEyeClosedTex[] = dgObjOwlEyeClosedTex;
 
-#define dobject_owlTex_009DA8 "__OTR__objects/object_owl/object_owlTex_009DA8"
-static const ALIGN_ASSET(2) char object_owlTex_009DA8[] = dobject_owlTex_009DA8;
-
-#define dobject_owlTex_0071A8 "__OTR__objects/object_owl/object_owlTex_0071A8"
-static const ALIGN_ASSET(2) char object_owlTex_0071A8[] = dobject_owlTex_0071A8;
-
-#define dobject_owlTex_0079A8 "__OTR__objects/object_owl/object_owlTex_0079A8"
-static const ALIGN_ASSET(2) char object_owlTex_0079A8[] = dobject_owlTex_0079A8;
-
-#define dobject_owlTex_0081A8 "__OTR__objects/object_owl/object_owlTex_0081A8"
-static const ALIGN_ASSET(2) char object_owlTex_0081A8[] = dobject_owlTex_0081A8;
-
-#define dobject_owlTex_0095A8 "__OTR__objects/object_owl/object_owlTex_0095A8"
-static const ALIGN_ASSET(2) char object_owlTex_0095A8[] = dobject_owlTex_0095A8;
-
-#define dobject_owlTex_009FA8 "__OTR__objects/object_owl/object_owlTex_009FA8"
-static const ALIGN_ASSET(2) char object_owlTex_009FA8[] = dobject_owlTex_009FA8;
-
-#define dobject_owlTex_00AFA8 "__OTR__objects/object_owl/object_owlTex_00AFA8"
-static const ALIGN_ASSET(2) char object_owlTex_00AFA8[] = dobject_owlTex_00AFA8;
-
-#define dobject_owlTex_00B7A8 "__OTR__objects/object_owl/object_owlTex_00B7A8"
-static const ALIGN_ASSET(2) char object_owlTex_00B7A8[] = dobject_owlTex_00B7A8;
-
 #define dgOwlPerchingSkelLimbsLimb_00FFCCDL_00F1C0 "__OTR__objects/object_owl/gOwlPerchingSkelLimbsLimb_00FFCCDL_00F1C0"
 static const ALIGN_ASSET(2) char gOwlPerchingSkelLimbsLimb_00FFCCDL_00F1C0[] = dgOwlPerchingSkelLimbsLimb_00FFCCDL_00F1C0;
 
diff --git a/soh/assets/objects/object_po_composer/object_po_composer.h b/soh/assets/objects/object_po_composer/object_po_composer.h
index 9db85ca52..efba77124 100644
--- a/soh/assets/objects/object_po_composer/object_po_composer.h
+++ b/soh/assets/objects/object_po_composer/object_po_composer.h
@@ -3,6 +3,45 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_po_composerTex_001450 "__OTR__objects/object_po_composer/object_po_composerTex_001450"
+static const ALIGN_ASSET(2) char object_po_composerTex_001450[] = dobject_po_composerTex_001450;
+
+#define dobject_po_composerTex_0054E0 "__OTR__objects/object_po_composer/object_po_composerTex_0054E0"
+static const ALIGN_ASSET(2) char object_po_composerTex_0054E0[] = dobject_po_composerTex_0054E0;
+
+#define dobject_po_composerTex_0056E0 "__OTR__objects/object_po_composer/object_po_composerTex_0056E0"
+static const ALIGN_ASSET(2) char object_po_composerTex_0056E0[] = dobject_po_composerTex_0056E0;
+
+#define dobject_po_composerTex_0058E0 "__OTR__objects/object_po_composer/object_po_composerTex_0058E0"
+static const ALIGN_ASSET(2) char object_po_composerTex_0058E0[] = dobject_po_composerTex_0058E0;
+
+#define dobject_po_composerTex_005AE0 "__OTR__objects/object_po_composer/object_po_composerTex_005AE0"
+static const ALIGN_ASSET(2) char object_po_composerTex_005AE0[] = dobject_po_composerTex_005AE0;
+
+#define dobject_po_composerTex_005CE0 "__OTR__objects/object_po_composer/object_po_composerTex_005CE0"
+static const ALIGN_ASSET(2) char object_po_composerTex_005CE0[] = dobject_po_composerTex_005CE0;
+
+#define dobject_po_composerTex_0060E0 "__OTR__objects/object_po_composer/object_po_composerTex_0060E0"
+static const ALIGN_ASSET(2) char object_po_composerTex_0060E0[] = dobject_po_composerTex_0060E0;
+
+#define dobject_po_composerTex_0062E0 "__OTR__objects/object_po_composer/object_po_composerTex_0062E0"
+static const ALIGN_ASSET(2) char object_po_composerTex_0062E0[] = dobject_po_composerTex_0062E0;
+
+#define dobject_po_composerTex_0064E0 "__OTR__objects/object_po_composer/object_po_composerTex_0064E0"
+static const ALIGN_ASSET(2) char object_po_composerTex_0064E0[] = dobject_po_composerTex_0064E0;
+
+#define dobject_po_composerTex_0066E0 "__OTR__objects/object_po_composer/object_po_composerTex_0066E0"
+static const ALIGN_ASSET(2) char object_po_composerTex_0066E0[] = dobject_po_composerTex_0066E0;
+
+#define dobject_po_composerTex_0068E0 "__OTR__objects/object_po_composer/object_po_composerTex_0068E0"
+static const ALIGN_ASSET(2) char object_po_composerTex_0068E0[] = dobject_po_composerTex_0068E0;
+
+#define dobject_po_composerTex_006AE0 "__OTR__objects/object_po_composer/object_po_composerTex_006AE0"
+static const ALIGN_ASSET(2) char object_po_composerTex_006AE0[] = dobject_po_composerTex_006AE0;
+
+#define dobject_po_composerTex_006CE0 "__OTR__objects/object_po_composer/object_po_composerTex_006CE0"
+static const ALIGN_ASSET(2) char object_po_composerTex_006CE0[] = dobject_po_composerTex_006CE0;
+
 #define dgPoeComposerAttackAnim "__OTR__objects/object_po_composer/gPoeComposerAttackAnim"
 static const ALIGN_ASSET(2) char gPoeComposerAttackAnim[] = dgPoeComposerAttackAnim;
 
@@ -42,39 +81,6 @@ static const ALIGN_ASSET(2) char gPoeComposerBurnDL[] = dgPoeComposerBurnDL;
 #define dgPoeComposerSkel "__OTR__objects/object_po_composer/gPoeComposerSkel"
 static const ALIGN_ASSET(2) char gPoeComposerSkel[] = dgPoeComposerSkel;
 
-#define dobject_po_composerTex_001450 "__OTR__objects/object_po_composer/object_po_composerTex_001450"
-static const ALIGN_ASSET(2) char object_po_composerTex_001450[] = dobject_po_composerTex_001450;
-
-#define dobject_po_composerTex_0056E0 "__OTR__objects/object_po_composer/object_po_composerTex_0056E0"
-static const ALIGN_ASSET(2) char object_po_composerTex_0056E0[] = dobject_po_composerTex_0056E0;
-
-#define dobject_po_composerTex_0058E0 "__OTR__objects/object_po_composer/object_po_composerTex_0058E0"
-static const ALIGN_ASSET(2) char object_po_composerTex_0058E0[] = dobject_po_composerTex_0058E0;
-
-#define dobject_po_composerTex_005AE0 "__OTR__objects/object_po_composer/object_po_composerTex_005AE0"
-static const ALIGN_ASSET(2) char object_po_composerTex_005AE0[] = dobject_po_composerTex_005AE0;
-
-#define dobject_po_composerTex_0068E0 "__OTR__objects/object_po_composer/object_po_composerTex_0068E0"
-static const ALIGN_ASSET(2) char object_po_composerTex_0068E0[] = dobject_po_composerTex_0068E0;
-
-#define dobject_po_composerTex_0062E0 "__OTR__objects/object_po_composer/object_po_composerTex_0062E0"
-static const ALIGN_ASSET(2) char object_po_composerTex_0062E0[] = dobject_po_composerTex_0062E0;
-
-#define dobject_po_composerTex_0064E0 "__OTR__objects/object_po_composer/object_po_composerTex_0064E0"
-static const ALIGN_ASSET(2) char object_po_composerTex_0064E0[] = dobject_po_composerTex_0064E0;
-
-#define dobject_po_composerTex_0060E0 "__OTR__objects/object_po_composer/object_po_composerTex_0060E0"
-static const ALIGN_ASSET(2) char object_po_composerTex_0060E0[] = dobject_po_composerTex_0060E0;
-
-#define dobject_po_composerTex_005CE0 "__OTR__objects/object_po_composer/object_po_composerTex_005CE0"
-static const ALIGN_ASSET(2) char object_po_composerTex_005CE0[] = dobject_po_composerTex_005CE0;
-
-#define dobject_po_composerTex_006CE0 "__OTR__objects/object_po_composer/object_po_composerTex_006CE0"
-static const ALIGN_ASSET(2) char object_po_composerTex_006CE0[] = dobject_po_composerTex_006CE0;
-
-#define dobject_po_composerTex_006AE0 "__OTR__objects/object_po_composer/object_po_composerTex_006AE0"
-static const ALIGN_ASSET(2) char object_po_composerTex_006AE0[] = dobject_po_composerTex_006AE0;
-
 #define dgPoeComposerSkelLimbsLimb_006EE0DL_002970 "__OTR__objects/object_po_composer/gPoeComposerSkelLimbsLimb_006EE0DL_002970"
 static const ALIGN_ASSET(2) char gPoeComposerSkelLimbsLimb_006EE0DL_002970[] = dgPoeComposerSkelLimbsLimb_006EE0DL_002970;
 
@@ -105,10 +111,5 @@ static const ALIGN_ASSET(2) char gPoeComposerSkelLimbsLimb_006F4CDL_004100[] = d
 #define dgPoeComposerSkelLimbsLimb_006F58DL_002B70 "__OTR__objects/object_po_composer/gPoeComposerSkelLimbsLimb_006F58DL_002B70"
 static const ALIGN_ASSET(2) char gPoeComposerSkelLimbsLimb_006F58DL_002B70[] = dgPoeComposerSkelLimbsLimb_006F58DL_002B70;
 
-#define dobject_po_composerTex_0054E0 "__OTR__objects/object_po_composer/object_po_composerTex_0054E0"
-static const ALIGN_ASSET(2) char object_po_composerTex_0054E0[] = dobject_po_composerTex_0054E0;
-
-#define dobject_po_composerTex_0066E0 "__OTR__objects/object_po_composer/object_po_composerTex_0066E0"
-static const ALIGN_ASSET(2) char object_po_composerTex_0066E0[] = dobject_po_composerTex_0066E0;
 
 #endif // OBJECTS_OBJECT_PO_COMPOSER_H
diff --git a/soh/assets/objects/object_po_field/object_po_field.h b/soh/assets/objects/object_po_field/object_po_field.h
index c6c2f1f5a..813b3e86d 100644
--- a/soh/assets/objects/object_po_field/object_po_field.h
+++ b/soh/assets/objects/object_po_field/object_po_field.h
@@ -3,6 +3,39 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_po_fieldTex_002470 "__OTR__objects/object_po_field/object_po_fieldTex_002470"
+static const ALIGN_ASSET(2) char object_po_fieldTex_002470[] = dobject_po_fieldTex_002470;
+
+#define dobject_po_fieldTex_002670 "__OTR__objects/object_po_field/object_po_fieldTex_002670"
+static const ALIGN_ASSET(2) char object_po_fieldTex_002670[] = dobject_po_fieldTex_002670;
+
+#define dobject_po_fieldTex_002870 "__OTR__objects/object_po_field/object_po_fieldTex_002870"
+static const ALIGN_ASSET(2) char object_po_fieldTex_002870[] = dobject_po_fieldTex_002870;
+
+#define dobject_po_fieldTex_003070 "__OTR__objects/object_po_field/object_po_fieldTex_003070"
+static const ALIGN_ASSET(2) char object_po_fieldTex_003070[] = dobject_po_fieldTex_003070;
+
+#define dobject_po_fieldTex_003270 "__OTR__objects/object_po_field/object_po_fieldTex_003270"
+static const ALIGN_ASSET(2) char object_po_fieldTex_003270[] = dobject_po_fieldTex_003270;
+
+#define dobject_po_fieldTex_0032F0 "__OTR__objects/object_po_field/object_po_fieldTex_0032F0"
+static const ALIGN_ASSET(2) char object_po_fieldTex_0032F0[] = dobject_po_fieldTex_0032F0;
+
+#define dobject_po_fieldTex_0033F0 "__OTR__objects/object_po_field/object_po_fieldTex_0033F0"
+static const ALIGN_ASSET(2) char object_po_fieldTex_0033F0[] = dobject_po_fieldTex_0033F0;
+
+#define dobject_po_fieldTex_0035F0 "__OTR__objects/object_po_field/object_po_fieldTex_0035F0"
+static const ALIGN_ASSET(2) char object_po_fieldTex_0035F0[] = dobject_po_fieldTex_0035F0;
+
+#define dobject_po_fieldTex_0037F0 "__OTR__objects/object_po_field/object_po_fieldTex_0037F0"
+static const ALIGN_ASSET(2) char object_po_fieldTex_0037F0[] = dobject_po_fieldTex_0037F0;
+
+#define dobject_po_fieldTex_005AB0 "__OTR__objects/object_po_field/object_po_fieldTex_005AB0"
+static const ALIGN_ASSET(2) char object_po_fieldTex_005AB0[] = dobject_po_fieldTex_005AB0;
+
+#define dobject_po_fieldTex_005CB0 "__OTR__objects/object_po_field/object_po_fieldTex_005CB0"
+static const ALIGN_ASSET(2) char object_po_fieldTex_005CB0[] = dobject_po_fieldTex_005CB0;
+
 #define dgPoeFieldAttackAnim "__OTR__objects/object_po_field/gPoeFieldAttackAnim"
 static const ALIGN_ASSET(2) char gPoeFieldAttackAnim[] = dgPoeFieldAttackAnim;
 
@@ -51,33 +84,6 @@ static const ALIGN_ASSET(2) char gPoeFieldBurnDL[] = dgPoeFieldBurnDL;
 #define dgPoeFieldSkel "__OTR__objects/object_po_field/gPoeFieldSkel"
 static const ALIGN_ASSET(2) char gPoeFieldSkel[] = dgPoeFieldSkel;
 
-#define dobject_po_fieldTex_002670 "__OTR__objects/object_po_field/object_po_fieldTex_002670"
-static const ALIGN_ASSET(2) char object_po_fieldTex_002670[] = dobject_po_fieldTex_002670;
-
-#define dobject_po_fieldTex_002470 "__OTR__objects/object_po_field/object_po_fieldTex_002470"
-static const ALIGN_ASSET(2) char object_po_fieldTex_002470[] = dobject_po_fieldTex_002470;
-
-#define dobject_po_fieldTex_0033F0 "__OTR__objects/object_po_field/object_po_fieldTex_0033F0"
-static const ALIGN_ASSET(2) char object_po_fieldTex_0033F0[] = dobject_po_fieldTex_0033F0;
-
-#define dobject_po_fieldTex_0032F0 "__OTR__objects/object_po_field/object_po_fieldTex_0032F0"
-static const ALIGN_ASSET(2) char object_po_fieldTex_0032F0[] = dobject_po_fieldTex_0032F0;
-
-#define dobject_po_fieldTex_003270 "__OTR__objects/object_po_field/object_po_fieldTex_003270"
-static const ALIGN_ASSET(2) char object_po_fieldTex_003270[] = dobject_po_fieldTex_003270;
-
-#define dobject_po_fieldTex_002870 "__OTR__objects/object_po_field/object_po_fieldTex_002870"
-static const ALIGN_ASSET(2) char object_po_fieldTex_002870[] = dobject_po_fieldTex_002870;
-
-#define dobject_po_fieldTex_0037F0 "__OTR__objects/object_po_field/object_po_fieldTex_0037F0"
-static const ALIGN_ASSET(2) char object_po_fieldTex_0037F0[] = dobject_po_fieldTex_0037F0;
-
-#define dobject_po_fieldTex_005AB0 "__OTR__objects/object_po_field/object_po_fieldTex_005AB0"
-static const ALIGN_ASSET(2) char object_po_fieldTex_005AB0[] = dobject_po_fieldTex_005AB0;
-
-#define dobject_po_fieldTex_005CB0 "__OTR__objects/object_po_field/object_po_fieldTex_005CB0"
-static const ALIGN_ASSET(2) char object_po_fieldTex_005CB0[] = dobject_po_fieldTex_005CB0;
-
 #define dgPoeFieldSkelLimbsLimb_0069A0DL_004F60 "__OTR__objects/object_po_field/gPoeFieldSkelLimbsLimb_0069A0DL_004F60"
 static const ALIGN_ASSET(2) char gPoeFieldSkelLimbsLimb_0069A0DL_004F60[] = dgPoeFieldSkelLimbsLimb_0069A0DL_004F60;
 
@@ -102,10 +108,5 @@ static const ALIGN_ASSET(2) char gPoeFieldSkelLimbsLimb_0069F4DL_005328[] = dgPo
 #define dgPoeFieldSkelLimbsLimb_006A00DL_004DF8 "__OTR__objects/object_po_field/gPoeFieldSkelLimbsLimb_006A00DL_004DF8"
 static const ALIGN_ASSET(2) char gPoeFieldSkelLimbsLimb_006A00DL_004DF8[] = dgPoeFieldSkelLimbsLimb_006A00DL_004DF8;
 
-#define dobject_po_fieldTex_0035F0 "__OTR__objects/object_po_field/object_po_fieldTex_0035F0"
-static const ALIGN_ASSET(2) char object_po_fieldTex_0035F0[] = dobject_po_fieldTex_0035F0;
-
-#define dobject_po_fieldTex_003070 "__OTR__objects/object_po_field/object_po_fieldTex_003070"
-static const ALIGN_ASSET(2) char object_po_fieldTex_003070[] = dobject_po_fieldTex_003070;
 
 #endif // OBJECTS_OBJECT_PO_FIELD_H
diff --git a/soh/assets/objects/object_po_sisters/object_po_sisters.h b/soh/assets/objects/object_po_sisters/object_po_sisters.h
index f958aa3bb..91af03194 100644
--- a/soh/assets/objects/object_po_sisters/object_po_sisters.h
+++ b/soh/assets/objects/object_po_sisters/object_po_sisters.h
@@ -3,6 +3,90 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_po_sistersTex_0048D8 "__OTR__objects/object_po_sisters/object_po_sistersTex_0048D8"
+static const ALIGN_ASSET(2) char object_po_sistersTex_0048D8[] = dobject_po_sistersTex_0048D8;
+
+#define dobject_po_sistersTex_004AD8 "__OTR__objects/object_po_sisters/object_po_sistersTex_004AD8"
+static const ALIGN_ASSET(2) char object_po_sistersTex_004AD8[] = dobject_po_sistersTex_004AD8;
+
+#define dobject_po_sistersTex_0052D8 "__OTR__objects/object_po_sisters/object_po_sistersTex_0052D8"
+static const ALIGN_ASSET(2) char object_po_sistersTex_0052D8[] = dobject_po_sistersTex_0052D8;
+
+#define dobject_po_sistersTex_0056D8 "__OTR__objects/object_po_sisters/object_po_sistersTex_0056D8"
+static const ALIGN_ASSET(2) char object_po_sistersTex_0056D8[] = dobject_po_sistersTex_0056D8;
+
+#define dobject_po_sistersTex_0058D8 "__OTR__objects/object_po_sisters/object_po_sistersTex_0058D8"
+static const ALIGN_ASSET(2) char object_po_sistersTex_0058D8[] = dobject_po_sistersTex_0058D8;
+
+#define dobject_po_sistersTex_0058F8 "__OTR__objects/object_po_sisters/object_po_sistersTex_0058F8"
+static const ALIGN_ASSET(2) char object_po_sistersTex_0058F8[] = dobject_po_sistersTex_0058F8;
+
+#define dobject_po_sistersTex_005AF8 "__OTR__objects/object_po_sisters/object_po_sistersTex_005AF8"
+static const ALIGN_ASSET(2) char object_po_sistersTex_005AF8[] = dobject_po_sistersTex_005AF8;
+
+#define dobject_po_sistersTex_005CF8 "__OTR__objects/object_po_sisters/object_po_sistersTex_005CF8"
+static const ALIGN_ASSET(2) char object_po_sistersTex_005CF8[] = dobject_po_sistersTex_005CF8;
+
+#define dobject_po_sistersTex_005D78 "__OTR__objects/object_po_sisters/object_po_sistersTex_005D78"
+static const ALIGN_ASSET(2) char object_po_sistersTex_005D78[] = dobject_po_sistersTex_005D78;
+
+#define dobject_po_sistersTex_005F78 "__OTR__objects/object_po_sisters/object_po_sistersTex_005F78"
+static const ALIGN_ASSET(2) char object_po_sistersTex_005F78[] = dobject_po_sistersTex_005F78;
+
+#define dobject_po_sistersTex_006078 "__OTR__objects/object_po_sisters/object_po_sistersTex_006078"
+static const ALIGN_ASSET(2) char object_po_sistersTex_006078[] = dobject_po_sistersTex_006078;
+
+#define dobject_po_sistersTex_006278 "__OTR__objects/object_po_sisters/object_po_sistersTex_006278"
+static const ALIGN_ASSET(2) char object_po_sistersTex_006278[] = dobject_po_sistersTex_006278;
+
+#define dobject_po_sistersTex_0062F8 "__OTR__objects/object_po_sisters/object_po_sistersTex_0062F8"
+static const ALIGN_ASSET(2) char object_po_sistersTex_0062F8[] = dobject_po_sistersTex_0062F8;
+
+#define dobject_po_sistersTex_006318 "__OTR__objects/object_po_sisters/object_po_sistersTex_006318"
+static const ALIGN_ASSET(2) char object_po_sistersTex_006318[] = dobject_po_sistersTex_006318;
+
+#define dobject_po_sistersTex_007AC0 "__OTR__objects/object_po_sisters/object_po_sistersTex_007AC0"
+static const ALIGN_ASSET(2) char object_po_sistersTex_007AC0[] = dobject_po_sistersTex_007AC0;
+
+#define dobject_po_sistersTex_0082C0 "__OTR__objects/object_po_sisters/object_po_sistersTex_0082C0"
+static const ALIGN_ASSET(2) char object_po_sistersTex_0082C0[] = dobject_po_sistersTex_0082C0;
+
+#define dobject_po_sistersTex_0083C0 "__OTR__objects/object_po_sisters/object_po_sistersTex_0083C0"
+static const ALIGN_ASSET(2) char object_po_sistersTex_0083C0[] = dobject_po_sistersTex_0083C0;
+
+#define dobject_po_sistersTex_008BC0 "__OTR__objects/object_po_sisters/object_po_sistersTex_008BC0"
+static const ALIGN_ASSET(2) char object_po_sistersTex_008BC0[] = dobject_po_sistersTex_008BC0;
+
+#define dobject_po_sistersTex_0093C0 "__OTR__objects/object_po_sisters/object_po_sistersTex_0093C0"
+static const ALIGN_ASSET(2) char object_po_sistersTex_0093C0[] = dobject_po_sistersTex_0093C0;
+
+#define dobject_po_sistersTex_009BC0 "__OTR__objects/object_po_sisters/object_po_sistersTex_009BC0"
+static const ALIGN_ASSET(2) char object_po_sistersTex_009BC0[] = dobject_po_sistersTex_009BC0;
+
+#define dobject_po_sistersTex_00A3C0 "__OTR__objects/object_po_sisters/object_po_sistersTex_00A3C0"
+static const ALIGN_ASSET(2) char object_po_sistersTex_00A3C0[] = dobject_po_sistersTex_00A3C0;
+
+#define dobject_po_sistersTex_00ABC0 "__OTR__objects/object_po_sisters/object_po_sistersTex_00ABC0"
+static const ALIGN_ASSET(2) char object_po_sistersTex_00ABC0[] = dobject_po_sistersTex_00ABC0;
+
+#define dobject_po_sistersTex_00B3C0 "__OTR__objects/object_po_sisters/object_po_sistersTex_00B3C0"
+static const ALIGN_ASSET(2) char object_po_sistersTex_00B3C0[] = dobject_po_sistersTex_00B3C0;
+
+#define dobject_po_sistersTex_00BBC0 "__OTR__objects/object_po_sisters/object_po_sistersTex_00BBC0"
+static const ALIGN_ASSET(2) char object_po_sistersTex_00BBC0[] = dobject_po_sistersTex_00BBC0;
+
+#define dobject_po_sistersTex_00C3C0 "__OTR__objects/object_po_sisters/object_po_sistersTex_00C3C0"
+static const ALIGN_ASSET(2) char object_po_sistersTex_00C3C0[] = dobject_po_sistersTex_00C3C0;
+
+#define dobject_po_sistersTex_00CBC0 "__OTR__objects/object_po_sisters/object_po_sistersTex_00CBC0"
+static const ALIGN_ASSET(2) char object_po_sistersTex_00CBC0[] = dobject_po_sistersTex_00CBC0;
+
+#define dobject_po_sistersTex_00D3C0 "__OTR__objects/object_po_sisters/object_po_sistersTex_00D3C0"
+static const ALIGN_ASSET(2) char object_po_sistersTex_00D3C0[] = dobject_po_sistersTex_00D3C0;
+
+#define dobject_po_sistersTex_00DBC0 "__OTR__objects/object_po_sisters/object_po_sistersTex_00DBC0"
+static const ALIGN_ASSET(2) char object_po_sistersTex_00DBC0[] = dobject_po_sistersTex_00DBC0;
+
 #define dgPoeSistersAttackAnim "__OTR__objects/object_po_sisters/gPoeSistersAttackAnim"
 static const ALIGN_ASSET(2) char gPoeSistersAttackAnim[] = dgPoeSistersAttackAnim;
 
@@ -75,87 +159,6 @@ static const ALIGN_ASSET(2) char gPoSistersAmyBlockCol[] = dgPoSistersAmyBlockCo
 #define dgPoSistersAmyBethBlockDL "__OTR__objects/object_po_sisters/gPoSistersAmyBethBlockDL"
 static const ALIGN_ASSET(2) char gPoSistersAmyBethBlockDL[] = dgPoSistersAmyBethBlockDL;
 
-#define dobject_po_sistersTex_0056D8 "__OTR__objects/object_po_sisters/object_po_sistersTex_0056D8"
-static const ALIGN_ASSET(2) char object_po_sistersTex_0056D8[] = dobject_po_sistersTex_0056D8;
-
-#define dobject_po_sistersTex_005AF8 "__OTR__objects/object_po_sisters/object_po_sistersTex_005AF8"
-static const ALIGN_ASSET(2) char object_po_sistersTex_005AF8[] = dobject_po_sistersTex_005AF8;
-
-#define dobject_po_sistersTex_0058D8 "__OTR__objects/object_po_sisters/object_po_sistersTex_0058D8"
-static const ALIGN_ASSET(2) char object_po_sistersTex_0058D8[] = dobject_po_sistersTex_0058D8;
-
-#define dobject_po_sistersTex_0058F8 "__OTR__objects/object_po_sisters/object_po_sistersTex_0058F8"
-static const ALIGN_ASSET(2) char object_po_sistersTex_0058F8[] = dobject_po_sistersTex_0058F8;
-
-#define dobject_po_sistersTex_004AD8 "__OTR__objects/object_po_sisters/object_po_sistersTex_004AD8"
-static const ALIGN_ASSET(2) char object_po_sistersTex_004AD8[] = dobject_po_sistersTex_004AD8;
-
-#define dobject_po_sistersTex_0048D8 "__OTR__objects/object_po_sisters/object_po_sistersTex_0048D8"
-static const ALIGN_ASSET(2) char object_po_sistersTex_0048D8[] = dobject_po_sistersTex_0048D8;
-
-#define dobject_po_sistersTex_005CF8 "__OTR__objects/object_po_sisters/object_po_sistersTex_005CF8"
-static const ALIGN_ASSET(2) char object_po_sistersTex_005CF8[] = dobject_po_sistersTex_005CF8;
-
-#define dobject_po_sistersTex_005D78 "__OTR__objects/object_po_sisters/object_po_sistersTex_005D78"
-static const ALIGN_ASSET(2) char object_po_sistersTex_005D78[] = dobject_po_sistersTex_005D78;
-
-#define dobject_po_sistersTex_006078 "__OTR__objects/object_po_sisters/object_po_sistersTex_006078"
-static const ALIGN_ASSET(2) char object_po_sistersTex_006078[] = dobject_po_sistersTex_006078;
-
-#define dobject_po_sistersTex_006278 "__OTR__objects/object_po_sisters/object_po_sistersTex_006278"
-static const ALIGN_ASSET(2) char object_po_sistersTex_006278[] = dobject_po_sistersTex_006278;
-
-#define dobject_po_sistersTex_005F78 "__OTR__objects/object_po_sisters/object_po_sistersTex_005F78"
-static const ALIGN_ASSET(2) char object_po_sistersTex_005F78[] = dobject_po_sistersTex_005F78;
-
-#define dobject_po_sistersTex_0062F8 "__OTR__objects/object_po_sisters/object_po_sistersTex_0062F8"
-static const ALIGN_ASSET(2) char object_po_sistersTex_0062F8[] = dobject_po_sistersTex_0062F8;
-
-#define dobject_po_sistersTex_006318 "__OTR__objects/object_po_sisters/object_po_sistersTex_006318"
-static const ALIGN_ASSET(2) char object_po_sistersTex_006318[] = dobject_po_sistersTex_006318;
-
-#define dobject_po_sistersTex_0082C0 "__OTR__objects/object_po_sisters/object_po_sistersTex_0082C0"
-static const ALIGN_ASSET(2) char object_po_sistersTex_0082C0[] = dobject_po_sistersTex_0082C0;
-
-#define dobject_po_sistersTex_008BC0 "__OTR__objects/object_po_sisters/object_po_sistersTex_008BC0"
-static const ALIGN_ASSET(2) char object_po_sistersTex_008BC0[] = dobject_po_sistersTex_008BC0;
-
-#define dobject_po_sistersTex_007AC0 "__OTR__objects/object_po_sisters/object_po_sistersTex_007AC0"
-static const ALIGN_ASSET(2) char object_po_sistersTex_007AC0[] = dobject_po_sistersTex_007AC0;
-
-#define dobject_po_sistersTex_009BC0 "__OTR__objects/object_po_sisters/object_po_sistersTex_009BC0"
-static const ALIGN_ASSET(2) char object_po_sistersTex_009BC0[] = dobject_po_sistersTex_009BC0;
-
-#define dobject_po_sistersTex_0083C0 "__OTR__objects/object_po_sisters/object_po_sistersTex_0083C0"
-static const ALIGN_ASSET(2) char object_po_sistersTex_0083C0[] = dobject_po_sistersTex_0083C0;
-
-#define dobject_po_sistersTex_0093C0 "__OTR__objects/object_po_sisters/object_po_sistersTex_0093C0"
-static const ALIGN_ASSET(2) char object_po_sistersTex_0093C0[] = dobject_po_sistersTex_0093C0;
-
-#define dobject_po_sistersTex_00ABC0 "__OTR__objects/object_po_sisters/object_po_sistersTex_00ABC0"
-static const ALIGN_ASSET(2) char object_po_sistersTex_00ABC0[] = dobject_po_sistersTex_00ABC0;
-
-#define dobject_po_sistersTex_00BBC0 "__OTR__objects/object_po_sisters/object_po_sistersTex_00BBC0"
-static const ALIGN_ASSET(2) char object_po_sistersTex_00BBC0[] = dobject_po_sistersTex_00BBC0;
-
-#define dobject_po_sistersTex_00A3C0 "__OTR__objects/object_po_sisters/object_po_sistersTex_00A3C0"
-static const ALIGN_ASSET(2) char object_po_sistersTex_00A3C0[] = dobject_po_sistersTex_00A3C0;
-
-#define dobject_po_sistersTex_00B3C0 "__OTR__objects/object_po_sisters/object_po_sistersTex_00B3C0"
-static const ALIGN_ASSET(2) char object_po_sistersTex_00B3C0[] = dobject_po_sistersTex_00B3C0;
-
-#define dobject_po_sistersTex_00DBC0 "__OTR__objects/object_po_sisters/object_po_sistersTex_00DBC0"
-static const ALIGN_ASSET(2) char object_po_sistersTex_00DBC0[] = dobject_po_sistersTex_00DBC0;
-
-#define dobject_po_sistersTex_00D3C0 "__OTR__objects/object_po_sisters/object_po_sistersTex_00D3C0"
-static const ALIGN_ASSET(2) char object_po_sistersTex_00D3C0[] = dobject_po_sistersTex_00D3C0;
-
-#define dobject_po_sistersTex_00CBC0 "__OTR__objects/object_po_sisters/object_po_sistersTex_00CBC0"
-static const ALIGN_ASSET(2) char object_po_sistersTex_00CBC0[] = dobject_po_sistersTex_00CBC0;
-
-#define dobject_po_sistersTex_00C3C0 "__OTR__objects/object_po_sisters/object_po_sistersTex_00C3C0"
-static const ALIGN_ASSET(2) char object_po_sistersTex_00C3C0[] = dobject_po_sistersTex_00C3C0;
-
 #define dgPoeSistersSkelLimbsLimb_006524DL_002718 "__OTR__objects/object_po_sisters/gPoeSistersSkelLimbsLimb_006524DL_002718"
 static const ALIGN_ASSET(2) char gPoeSistersSkelLimbsLimb_006524DL_002718[] = dgPoeSistersSkelLimbsLimb_006524DL_002718;
 
@@ -174,7 +177,5 @@ static const ALIGN_ASSET(2) char gPoeSistersSkelLimbsLimb_006560DL_002570[] = dg
 #define dgPoeSistersSkelLimbsLimb_006590DL_0024A8 "__OTR__objects/object_po_sisters/gPoeSistersSkelLimbsLimb_006590DL_0024A8"
 static const ALIGN_ASSET(2) char gPoeSistersSkelLimbsLimb_006590DL_0024A8[] = dgPoeSistersSkelLimbsLimb_006590DL_0024A8;
 
-#define dobject_po_sistersTex_0052D8 "__OTR__objects/object_po_sisters/object_po_sistersTex_0052D8"
-static const ALIGN_ASSET(2) char object_po_sistersTex_0052D8[] = dobject_po_sistersTex_0052D8;
 
 #endif // OBJECTS_OBJECT_PO_SISTERS_H
diff --git a/soh/assets/objects/object_poh/object_poh.h b/soh/assets/objects/object_poh/object_poh.h
index da3693b45..fa6c1e96e 100644
--- a/soh/assets/objects/object_poh/object_poh.h
+++ b/soh/assets/objects/object_poh/object_poh.h
@@ -3,6 +3,39 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_pohTex_003010 "__OTR__objects/object_poh/object_pohTex_003010"
+static const ALIGN_ASSET(2) char object_pohTex_003010[] = dobject_pohTex_003010;
+
+#define dobject_pohTex_003910 "__OTR__objects/object_poh/object_pohTex_003910"
+static const ALIGN_ASSET(2) char object_pohTex_003910[] = dobject_pohTex_003910;
+
+#define dobject_pohTex_003D10 "__OTR__objects/object_poh/object_pohTex_003D10"
+static const ALIGN_ASSET(2) char object_pohTex_003D10[] = dobject_pohTex_003D10;
+
+#define dobject_pohTex_004510 "__OTR__objects/object_poh/object_pohTex_004510"
+static const ALIGN_ASSET(2) char object_pohTex_004510[] = dobject_pohTex_004510;
+
+#define dobject_pohTex_004710 "__OTR__objects/object_poh/object_pohTex_004710"
+static const ALIGN_ASSET(2) char object_pohTex_004710[] = dobject_pohTex_004710;
+
+#define dobject_pohTex_004790 "__OTR__objects/object_poh/object_pohTex_004790"
+static const ALIGN_ASSET(2) char object_pohTex_004790[] = dobject_pohTex_004790;
+
+#define dobject_pohTex_004990 "__OTR__objects/object_poh/object_pohTex_004990"
+static const ALIGN_ASSET(2) char object_pohTex_004990[] = dobject_pohTex_004990;
+
+#define dobject_pohTex_004A10 "__OTR__objects/object_poh/object_pohTex_004A10"
+static const ALIGN_ASSET(2) char object_pohTex_004A10[] = dobject_pohTex_004A10;
+
+#define dobject_pohTex_004B10 "__OTR__objects/object_poh/object_pohTex_004B10"
+static const ALIGN_ASSET(2) char object_pohTex_004B10[] = dobject_pohTex_004B10;
+
+#define dobject_pohTex_004D10 "__OTR__objects/object_poh/object_pohTex_004D10"
+static const ALIGN_ASSET(2) char object_pohTex_004D10[] = dobject_pohTex_004D10;
+
+#define dobject_pohTex_004F10 "__OTR__objects/object_poh/object_pohTex_004F10"
+static const ALIGN_ASSET(2) char object_pohTex_004F10[] = dobject_pohTex_004F10;
+
 #define dgPoeAttackAnim "__OTR__objects/object_poh/gPoeAttackAnim"
 static const ALIGN_ASSET(2) char gPoeAttackAnim[] = dgPoeAttackAnim;
 
@@ -33,24 +66,6 @@ static const ALIGN_ASSET(2) char gPoeSoulDL[] = dgPoeSoulDL;
 #define dgPoeSkel "__OTR__objects/object_poh/gPoeSkel"
 static const ALIGN_ASSET(2) char gPoeSkel[] = dgPoeSkel;
 
-#define dobject_pohTex_004D10 "__OTR__objects/object_poh/object_pohTex_004D10"
-static const ALIGN_ASSET(2) char object_pohTex_004D10[] = dobject_pohTex_004D10;
-
-#define dobject_pohTex_004F10 "__OTR__objects/object_poh/object_pohTex_004F10"
-static const ALIGN_ASSET(2) char object_pohTex_004F10[] = dobject_pohTex_004F10;
-
-#define dobject_pohTex_004A10 "__OTR__objects/object_poh/object_pohTex_004A10"
-static const ALIGN_ASSET(2) char object_pohTex_004A10[] = dobject_pohTex_004A10;
-
-#define dobject_pohTex_004990 "__OTR__objects/object_poh/object_pohTex_004990"
-static const ALIGN_ASSET(2) char object_pohTex_004990[] = dobject_pohTex_004990;
-
-#define dobject_pohTex_004B10 "__OTR__objects/object_poh/object_pohTex_004B10"
-static const ALIGN_ASSET(2) char object_pohTex_004B10[] = dobject_pohTex_004B10;
-
-#define dobject_pohTex_003010 "__OTR__objects/object_poh/object_pohTex_003010"
-static const ALIGN_ASSET(2) char object_pohTex_003010[] = dobject_pohTex_003010;
-
 #define dgPoeSkelLimbsLimb_004FB4DL_002F58 "__OTR__objects/object_poh/gPoeSkelLimbsLimb_004FB4DL_002F58"
 static const ALIGN_ASSET(2) char gPoeSkelLimbsLimb_004FB4DL_002F58[] = dgPoeSkelLimbsLimb_004FB4DL_002F58;
 
@@ -75,19 +90,5 @@ static const ALIGN_ASSET(2) char gPoeSkelLimbsLimb_005068DL_001B70[] = dgPoeSkel
 #define dgPoeSkelLimbsLimb_005074DL_001A78 "__OTR__objects/object_poh/gPoeSkelLimbsLimb_005074DL_001A78"
 static const ALIGN_ASSET(2) char gPoeSkelLimbsLimb_005074DL_001A78[] = dgPoeSkelLimbsLimb_005074DL_001A78;
 
-#define dobject_pohTex_003D10 "__OTR__objects/object_poh/object_pohTex_003D10"
-static const ALIGN_ASSET(2) char object_pohTex_003D10[] = dobject_pohTex_003D10;
-
-#define dobject_pohTex_004710 "__OTR__objects/object_poh/object_pohTex_004710"
-static const ALIGN_ASSET(2) char object_pohTex_004710[] = dobject_pohTex_004710;
-
-#define dobject_pohTex_004510 "__OTR__objects/object_poh/object_pohTex_004510"
-static const ALIGN_ASSET(2) char object_pohTex_004510[] = dobject_pohTex_004510;
-
-#define dobject_pohTex_003910 "__OTR__objects/object_poh/object_pohTex_003910"
-static const ALIGN_ASSET(2) char object_pohTex_003910[] = dobject_pohTex_003910;
-
-#define dobject_pohTex_004790 "__OTR__objects/object_poh/object_pohTex_004790"
-static const ALIGN_ASSET(2) char object_pohTex_004790[] = dobject_pohTex_004790;
 
 #endif // OBJECTS_OBJECT_POH_H
diff --git a/soh/assets/objects/object_ps/object_ps.h b/soh/assets/objects/object_ps/object_ps.h
index bba360f73..5a1cd90f9 100644
--- a/soh/assets/objects/object_ps/object_ps.h
+++ b/soh/assets/objects/object_ps/object_ps.h
@@ -3,6 +3,75 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_psTex_0005B8 "__OTR__objects/object_ps/object_psTex_0005B8"
+static const ALIGN_ASSET(2) char object_psTex_0005B8[] = dobject_psTex_0005B8;
+
+#define dobject_psTex_0015B8 "__OTR__objects/object_ps/object_psTex_0015B8"
+static const ALIGN_ASSET(2) char object_psTex_0015B8[] = dobject_psTex_0015B8;
+
+#define dobject_psTex_0015F8 "__OTR__objects/object_ps/object_psTex_0015F8"
+static const ALIGN_ASSET(2) char object_psTex_0015F8[] = dobject_psTex_0015F8;
+
+#define dobject_psTex_0017F8 "__OTR__objects/object_ps/object_psTex_0017F8"
+static const ALIGN_ASSET(2) char object_psTex_0017F8[] = dobject_psTex_0017F8;
+
+#define dobject_psTex_001838 "__OTR__objects/object_ps/object_psTex_001838"
+static const ALIGN_ASSET(2) char object_psTex_001838[] = dobject_psTex_001838;
+
+#define dobject_psTex_001C38 "__OTR__objects/object_ps/object_psTex_001C38"
+static const ALIGN_ASSET(2) char object_psTex_001C38[] = dobject_psTex_001C38;
+
+#define dobject_psTex_001D38 "__OTR__objects/object_ps/object_psTex_001D38"
+static const ALIGN_ASSET(2) char object_psTex_001D38[] = dobject_psTex_001D38;
+
+#define dobject_psTex_001D78 "__OTR__objects/object_ps/object_psTex_001D78"
+static const ALIGN_ASSET(2) char object_psTex_001D78[] = dobject_psTex_001D78;
+
+#define dobject_psTex_001E78 "__OTR__objects/object_ps/object_psTex_001E78"
+static const ALIGN_ASSET(2) char object_psTex_001E78[] = dobject_psTex_001E78;
+
+#define dobject_psTex_001F78 "__OTR__objects/object_ps/object_psTex_001F78"
+static const ALIGN_ASSET(2) char object_psTex_001F78[] = dobject_psTex_001F78;
+
+#define dobject_psTex_002178 "__OTR__objects/object_ps/object_psTex_002178"
+static const ALIGN_ASSET(2) char object_psTex_002178[] = dobject_psTex_002178;
+
+#define dobject_psTex_002378 "__OTR__objects/object_ps/object_psTex_002378"
+static const ALIGN_ASSET(2) char object_psTex_002378[] = dobject_psTex_002378;
+
+#define dobject_psTex_002578 "__OTR__objects/object_ps/object_psTex_002578"
+static const ALIGN_ASSET(2) char object_psTex_002578[] = dobject_psTex_002578;
+
+#define dobject_psTex_002978 "__OTR__objects/object_ps/object_psTex_002978"
+static const ALIGN_ASSET(2) char object_psTex_002978[] = dobject_psTex_002978;
+
+#define dobject_psTex_007180 "__OTR__objects/object_ps/object_psTex_007180"
+static const ALIGN_ASSET(2) char object_psTex_007180[] = dobject_psTex_007180;
+
+#define dobject_psTex_0071C0 "__OTR__objects/object_ps/object_psTex_0071C0"
+static const ALIGN_ASSET(2) char object_psTex_0071C0[] = dobject_psTex_0071C0;
+
+#define dobject_psTex_0075C0 "__OTR__objects/object_ps/object_psTex_0075C0"
+static const ALIGN_ASSET(2) char object_psTex_0075C0[] = dobject_psTex_0075C0;
+
+#define dobject_psTex_007600 "__OTR__objects/object_ps/object_psTex_007600"
+static const ALIGN_ASSET(2) char object_psTex_007600[] = dobject_psTex_007600;
+
+#define dobject_psTex_007640 "__OTR__objects/object_ps/object_psTex_007640"
+static const ALIGN_ASSET(2) char object_psTex_007640[] = dobject_psTex_007640;
+
+#define dobject_psTex_007A40 "__OTR__objects/object_ps/object_psTex_007A40"
+static const ALIGN_ASSET(2) char object_psTex_007A40[] = dobject_psTex_007A40;
+
+#define dobject_psTex_007C40 "__OTR__objects/object_ps/object_psTex_007C40"
+static const ALIGN_ASSET(2) char object_psTex_007C40[] = dobject_psTex_007C40;
+
+#define dobject_psTLUT_0004B0 "__OTR__objects/object_ps/object_psTLUT_0004B0"
+static const ALIGN_ASSET(2) char object_psTLUT_0004B0[] = dobject_psTLUT_0004B0;
+
+#define dobject_psTLUT_005880 "__OTR__objects/object_ps/object_psTLUT_005880"
+static const ALIGN_ASSET(2) char object_psTLUT_005880[] = dobject_psTLUT_005880;
+
 #define dgPoeSellerIdleAnim "__OTR__objects/object_ps/gPoeSellerIdleAnim"
 static const ALIGN_ASSET(2) char gPoeSellerIdleAnim[] = dgPoeSellerIdleAnim;
 
@@ -78,73 +147,5 @@ static const ALIGN_ASSET(2) char gPoeSellerSkelLimbsLimb_00C1DCDL_00A1D8[] = dgP
 #define dgPoeSellerSkelLimbsLimb_00C1E8DL_0096C0 "__OTR__objects/object_ps/gPoeSellerSkelLimbsLimb_00C1E8DL_0096C0"
 static const ALIGN_ASSET(2) char gPoeSellerSkelLimbsLimb_00C1E8DL_0096C0[] = dgPoeSellerSkelLimbsLimb_00C1E8DL_0096C0;
 
-#define dobject_psTex_0015B8 "__OTR__objects/object_ps/object_psTex_0015B8"
-static const ALIGN_ASSET(2) char object_psTex_0015B8[] = dobject_psTex_0015B8;
-
-#define dobject_psTLUT_0004B0 "__OTR__objects/object_ps/object_psTLUT_0004B0"
-static const ALIGN_ASSET(2) char object_psTLUT_0004B0[] = dobject_psTLUT_0004B0;
-
-#define dobject_psTex_0005B8 "__OTR__objects/object_ps/object_psTex_0005B8"
-static const ALIGN_ASSET(2) char object_psTex_0005B8[] = dobject_psTex_0005B8;
-
-#define dobject_psTex_0015F8 "__OTR__objects/object_ps/object_psTex_0015F8"
-static const ALIGN_ASSET(2) char object_psTex_0015F8[] = dobject_psTex_0015F8;
-
-#define dobject_psTex_0017F8 "__OTR__objects/object_ps/object_psTex_0017F8"
-static const ALIGN_ASSET(2) char object_psTex_0017F8[] = dobject_psTex_0017F8;
-
-#define dobject_psTex_001838 "__OTR__objects/object_ps/object_psTex_001838"
-static const ALIGN_ASSET(2) char object_psTex_001838[] = dobject_psTex_001838;
-
-#define dobject_psTex_002578 "__OTR__objects/object_ps/object_psTex_002578"
-static const ALIGN_ASSET(2) char object_psTex_002578[] = dobject_psTex_002578;
-
-#define dobject_psTex_001D78 "__OTR__objects/object_ps/object_psTex_001D78"
-static const ALIGN_ASSET(2) char object_psTex_001D78[] = dobject_psTex_001D78;
-
-#define dobject_psTex_001C38 "__OTR__objects/object_ps/object_psTex_001C38"
-static const ALIGN_ASSET(2) char object_psTex_001C38[] = dobject_psTex_001C38;
-
-#define dobject_psTex_002978 "__OTR__objects/object_ps/object_psTex_002978"
-static const ALIGN_ASSET(2) char object_psTex_002978[] = dobject_psTex_002978;
-
-#define dobject_psTex_001F78 "__OTR__objects/object_ps/object_psTex_001F78"
-static const ALIGN_ASSET(2) char object_psTex_001F78[] = dobject_psTex_001F78;
-
-#define dobject_psTex_002178 "__OTR__objects/object_ps/object_psTex_002178"
-static const ALIGN_ASSET(2) char object_psTex_002178[] = dobject_psTex_002178;
-
-#define dobject_psTex_002378 "__OTR__objects/object_ps/object_psTex_002378"
-static const ALIGN_ASSET(2) char object_psTex_002378[] = dobject_psTex_002378;
-
-#define dobject_psTex_001D38 "__OTR__objects/object_ps/object_psTex_001D38"
-static const ALIGN_ASSET(2) char object_psTex_001D38[] = dobject_psTex_001D38;
-
-#define dobject_psTex_001E78 "__OTR__objects/object_ps/object_psTex_001E78"
-static const ALIGN_ASSET(2) char object_psTex_001E78[] = dobject_psTex_001E78;
-
-#define dobject_psTLUT_005880 "__OTR__objects/object_ps/object_psTLUT_005880"
-static const ALIGN_ASSET(2) char object_psTLUT_005880[] = dobject_psTLUT_005880;
-
-#define dobject_psTex_0075C0 "__OTR__objects/object_ps/object_psTex_0075C0"
-static const ALIGN_ASSET(2) char object_psTex_0075C0[] = dobject_psTex_0075C0;
-
-#define dobject_psTex_007180 "__OTR__objects/object_ps/object_psTex_007180"
-static const ALIGN_ASSET(2) char object_psTex_007180[] = dobject_psTex_007180;
-
-#define dobject_psTex_007600 "__OTR__objects/object_ps/object_psTex_007600"
-static const ALIGN_ASSET(2) char object_psTex_007600[] = dobject_psTex_007600;
-
-#define dobject_psTex_007640 "__OTR__objects/object_ps/object_psTex_007640"
-static const ALIGN_ASSET(2) char object_psTex_007640[] = dobject_psTex_007640;
-
-#define dobject_psTex_007A40 "__OTR__objects/object_ps/object_psTex_007A40"
-static const ALIGN_ASSET(2) char object_psTex_007A40[] = dobject_psTex_007A40;
-
-#define dobject_psTex_007C40 "__OTR__objects/object_ps/object_psTex_007C40"
-static const ALIGN_ASSET(2) char object_psTex_007C40[] = dobject_psTex_007C40;
-
-#define dobject_psTex_0071C0 "__OTR__objects/object_ps/object_psTex_0071C0"
-static const ALIGN_ASSET(2) char object_psTex_0071C0[] = dobject_psTex_0071C0;
 
 #endif // OBJECTS_OBJECT_PS_H
diff --git a/soh/assets/objects/object_rl/object_rl.h b/soh/assets/objects/object_rl/object_rl.h
index f0137db11..e10127c58 100644
--- a/soh/assets/objects/object_rl/object_rl.h
+++ b/soh/assets/objects/object_rl/object_rl.h
@@ -3,6 +3,12 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_rlTex_0033E0 "__OTR__objects/object_rl/object_rlTex_0033E0"
+static const ALIGN_ASSET(2) char object_rlTex_0033E0[] = dobject_rlTex_0033E0;
+
+#define dobject_rlTex_003420 "__OTR__objects/object_rl/object_rlTex_003420"
+static const ALIGN_ASSET(2) char object_rlTex_003420[] = dobject_rlTex_003420;
+
 #define dobject_rl_Anim_00040C "__OTR__objects/object_rl/object_rl_Anim_00040C"
 static const ALIGN_ASSET(2) char object_rl_Anim_00040C[] = dobject_rl_Anim_00040C;
 
@@ -102,11 +108,5 @@ static const ALIGN_ASSET(2) char object_rl_Tex_007998[] = dobject_rl_Tex_007998;
 #define dobject_rl_Skel_007B38 "__OTR__objects/object_rl/object_rl_Skel_007B38"
 static const ALIGN_ASSET(2) char object_rl_Skel_007B38[] = dobject_rl_Skel_007B38;
 
-#define dobject_rlTex_0033E0 "__OTR__objects/object_rl/object_rlTex_0033E0"
-static const ALIGN_ASSET(2) char object_rlTex_0033E0[] = dobject_rlTex_0033E0;
-
-#define dobject_rlTex_003420 "__OTR__objects/object_rl/object_rlTex_003420"
-static const ALIGN_ASSET(2) char object_rlTex_003420[] = dobject_rlTex_003420;
-
 
 #endif // OBJECTS_OBJECT_RL_H
diff --git a/soh/assets/objects/object_ru2/object_ru2.h b/soh/assets/objects/object_ru2/object_ru2.h
index 237be4fe7..68152618d 100644
--- a/soh/assets/objects/object_ru2/object_ru2.h
+++ b/soh/assets/objects/object_ru2/object_ru2.h
@@ -3,6 +3,12 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_ru2Tex_0055C0 "__OTR__objects/object_ru2/object_ru2Tex_0055C0"
+static const ALIGN_ASSET(2) char object_ru2Tex_0055C0[] = dobject_ru2Tex_0055C0;
+
+#define dobject_ru2Tex_0056C0 "__OTR__objects/object_ru2/object_ru2Tex_0056C0"
+static const ALIGN_ASSET(2) char object_ru2Tex_0056C0[] = dobject_ru2Tex_0056C0;
+
 #define dgAdultRutoSkel "__OTR__objects/object_ru2/gAdultRutoSkel"
 static const ALIGN_ASSET(2) char gAdultRutoSkel[] = dgAdultRutoSkel;
 
@@ -156,10 +162,5 @@ static const ALIGN_ASSET(2) char gAdultRutoLookingDownLeftAnim[] = dgAdultRutoLo
 #define dgAdultRutoSwimmingUpAnim "__OTR__objects/object_ru2/gAdultRutoSwimmingUpAnim"
 static const ALIGN_ASSET(2) char gAdultRutoSwimmingUpAnim[] = dgAdultRutoSwimmingUpAnim;
 
-#define dobject_ru2Tex_0055C0 "__OTR__objects/object_ru2/object_ru2Tex_0055C0"
-static const ALIGN_ASSET(2) char object_ru2Tex_0055C0[] = dobject_ru2Tex_0055C0;
-
-#define dobject_ru2Tex_0056C0 "__OTR__objects/object_ru2/object_ru2Tex_0056C0"
-static const ALIGN_ASSET(2) char object_ru2Tex_0056C0[] = dobject_ru2Tex_0056C0;
 
 #endif // OBJECTS_OBJECT_RU2_H
diff --git a/soh/assets/objects/object_sa/object_sa.h b/soh/assets/objects/object_sa/object_sa.h
index bed18b041..c1d121fe6 100644
--- a/soh/assets/objects/object_sa/object_sa.h
+++ b/soh/assets/objects/object_sa/object_sa.h
@@ -3,6 +3,9 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_saTex_002530 "__OTR__objects/object_sa/object_saTex_002530"
+static const ALIGN_ASSET(2) char object_saTex_002530[] = dobject_saTex_002530;
+
 #define dgSariaSkel "__OTR__objects/object_sa/gSariaSkel"
 static const ALIGN_ASSET(2) char gSariaSkel[] = dgSariaSkel;
 
@@ -225,7 +228,5 @@ static const ALIGN_ASSET(2) char gSariaMouthSuprisedTex[] = dgSariaMouthSuprised
 #define dgSariaEyeSadTex "__OTR__objects/object_sa/gSariaEyeSadTex"
 static const ALIGN_ASSET(2) char gSariaEyeSadTex[] = dgSariaEyeSadTex;
 
-#define dobject_saTex_002530 "__OTR__objects/object_sa/object_saTex_002530"
-static const ALIGN_ASSET(2) char object_saTex_002530[] = dobject_saTex_002530;
 
 #endif // OBJECTS_OBJECT_SA_H
diff --git a/soh/assets/objects/object_skj/object_skj.h b/soh/assets/objects/object_skj/object_skj.h
index bc1ec3dd5..d8cd93538 100644
--- a/soh/assets/objects/object_skj/object_skj.h
+++ b/soh/assets/objects/object_skj/object_skj.h
@@ -3,6 +3,30 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_skjTex_005300 "__OTR__objects/object_skj/object_skjTex_005300"
+static const ALIGN_ASSET(2) char object_skjTex_005300[] = dobject_skjTex_005300;
+
+#define dobject_skjTex_005500 "__OTR__objects/object_skj/object_skjTex_005500"
+static const ALIGN_ASSET(2) char object_skjTex_005500[] = dobject_skjTex_005500;
+
+#define dobject_skjTex_005700 "__OTR__objects/object_skj/object_skjTex_005700"
+static const ALIGN_ASSET(2) char object_skjTex_005700[] = dobject_skjTex_005700;
+
+#define dobject_skjTex_005900 "__OTR__objects/object_skj/object_skjTex_005900"
+static const ALIGN_ASSET(2) char object_skjTex_005900[] = dobject_skjTex_005900;
+
+#define dobject_skjTex_005B00 "__OTR__objects/object_skj/object_skjTex_005B00"
+static const ALIGN_ASSET(2) char object_skjTex_005B00[] = dobject_skjTex_005B00;
+
+#define dobject_skjTex_005B80 "__OTR__objects/object_skj/object_skjTex_005B80"
+static const ALIGN_ASSET(2) char object_skjTex_005B80[] = dobject_skjTex_005B80;
+
+#define dobject_skjTex_005D80 "__OTR__objects/object_skj/object_skjTex_005D80"
+static const ALIGN_ASSET(2) char object_skjTex_005D80[] = dobject_skjTex_005D80;
+
+#define dobject_skjTex_005DA0 "__OTR__objects/object_skj/object_skjTex_005DA0"
+static const ALIGN_ASSET(2) char object_skjTex_005DA0[] = dobject_skjTex_005DA0;
+
 #define dgSkullKidNeedleDL "__OTR__objects/object_skj/gSkullKidNeedleDL"
 static const ALIGN_ASSET(2) char gSkullKidNeedleDL[] = dgSkullKidNeedleDL;
 
@@ -123,28 +147,5 @@ static const ALIGN_ASSET(2) char gSkullKidUnkLimb_5E2CDL_0036A0[] = dgSkullKidUn
 #define dgSkullKidUnkLimb_5E38DL_003E48 "__OTR__objects/object_skj/gSkullKidUnkLimb_5E38DL_003E48"
 static const ALIGN_ASSET(2) char gSkullKidUnkLimb_5E38DL_003E48[] = dgSkullKidUnkLimb_5E38DL_003E48;
 
-#define dobject_skjTex_005700 "__OTR__objects/object_skj/object_skjTex_005700"
-static const ALIGN_ASSET(2) char object_skjTex_005700[] = dobject_skjTex_005700;
-
-#define dobject_skjTex_005300 "__OTR__objects/object_skj/object_skjTex_005300"
-static const ALIGN_ASSET(2) char object_skjTex_005300[] = dobject_skjTex_005300;
-
-#define dobject_skjTex_005500 "__OTR__objects/object_skj/object_skjTex_005500"
-static const ALIGN_ASSET(2) char object_skjTex_005500[] = dobject_skjTex_005500;
-
-#define dobject_skjTex_005900 "__OTR__objects/object_skj/object_skjTex_005900"
-static const ALIGN_ASSET(2) char object_skjTex_005900[] = dobject_skjTex_005900;
-
-#define dobject_skjTex_005B00 "__OTR__objects/object_skj/object_skjTex_005B00"
-static const ALIGN_ASSET(2) char object_skjTex_005B00[] = dobject_skjTex_005B00;
-
-#define dobject_skjTex_005B80 "__OTR__objects/object_skj/object_skjTex_005B80"
-static const ALIGN_ASSET(2) char object_skjTex_005B80[] = dobject_skjTex_005B80;
-
-#define dobject_skjTex_005D80 "__OTR__objects/object_skj/object_skjTex_005D80"
-static const ALIGN_ASSET(2) char object_skjTex_005D80[] = dobject_skjTex_005D80;
-
-#define dobject_skjTex_005DA0 "__OTR__objects/object_skj/object_skjTex_005DA0"
-static const ALIGN_ASSET(2) char object_skjTex_005DA0[] = dobject_skjTex_005DA0;
 
 #endif // OBJECTS_OBJECT_SKJ_H
diff --git a/soh/assets/objects/object_spot09_obj/object_spot09_obj.h b/soh/assets/objects/object_spot09_obj/object_spot09_obj.h
index 12cc0df15..9a016aabf 100644
--- a/soh/assets/objects/object_spot09_obj/object_spot09_obj.h
+++ b/soh/assets/objects/object_spot09_obj/object_spot09_obj.h
@@ -3,6 +3,69 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_spot09_objTex_008490 "__OTR__objects/object_spot09_obj/object_spot09_objTex_008490"
+static const ALIGN_ASSET(2) char object_spot09_objTex_008490[] = dobject_spot09_objTex_008490;
+
+#define dobject_spot09_objTex_008C90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_008C90"
+static const ALIGN_ASSET(2) char object_spot09_objTex_008C90[] = dobject_spot09_objTex_008C90;
+
+#define dobject_spot09_objTex_009490 "__OTR__objects/object_spot09_obj/object_spot09_objTex_009490"
+static const ALIGN_ASSET(2) char object_spot09_objTex_009490[] = dobject_spot09_objTex_009490;
+
+#define dobject_spot09_objTex_00A490 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00A490"
+static const ALIGN_ASSET(2) char object_spot09_objTex_00A490[] = dobject_spot09_objTex_00A490;
+
+#define dobject_spot09_objTex_00AC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00AC90"
+static const ALIGN_ASSET(2) char object_spot09_objTex_00AC90[] = dobject_spot09_objTex_00AC90;
+
+#define dobject_spot09_objTex_00B490 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00B490"
+static const ALIGN_ASSET(2) char object_spot09_objTex_00B490[] = dobject_spot09_objTex_00B490;
+
+#define dobject_spot09_objTex_00BC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00BC90"
+static const ALIGN_ASSET(2) char object_spot09_objTex_00BC90[] = dobject_spot09_objTex_00BC90;
+
+#define dobject_spot09_objTex_00CC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00CC90"
+static const ALIGN_ASSET(2) char object_spot09_objTex_00CC90[] = dobject_spot09_objTex_00CC90;
+
+#define dobject_spot09_objTex_00DC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00DC90"
+static const ALIGN_ASSET(2) char object_spot09_objTex_00DC90[] = dobject_spot09_objTex_00DC90;
+
+#define dobject_spot09_objTex_00EC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00EC90"
+static const ALIGN_ASSET(2) char object_spot09_objTex_00EC90[] = dobject_spot09_objTex_00EC90;
+
+#define dobject_spot09_objTex_00FC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00FC90"
+static const ALIGN_ASSET(2) char object_spot09_objTex_00FC90[] = dobject_spot09_objTex_00FC90;
+
+#define dobject_spot09_objTex_010090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_010090"
+static const ALIGN_ASSET(2) char object_spot09_objTex_010090[] = dobject_spot09_objTex_010090;
+
+#define dobject_spot09_objTex_011090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_011090"
+static const ALIGN_ASSET(2) char object_spot09_objTex_011090[] = dobject_spot09_objTex_011090;
+
+#define dobject_spot09_objTex_012090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_012090"
+static const ALIGN_ASSET(2) char object_spot09_objTex_012090[] = dobject_spot09_objTex_012090;
+
+#define dobject_spot09_objTex_013090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_013090"
+static const ALIGN_ASSET(2) char object_spot09_objTex_013090[] = dobject_spot09_objTex_013090;
+
+#define dobject_spot09_objTex_014090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_014090"
+static const ALIGN_ASSET(2) char object_spot09_objTex_014090[] = dobject_spot09_objTex_014090;
+
+#define dobject_spot09_objTex_015090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_015090"
+static const ALIGN_ASSET(2) char object_spot09_objTex_015090[] = dobject_spot09_objTex_015090;
+
+#define dobject_spot09_objTex_016090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_016090"
+static const ALIGN_ASSET(2) char object_spot09_objTex_016090[] = dobject_spot09_objTex_016090;
+
+#define dobject_spot09_objTex_017090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_017090"
+static const ALIGN_ASSET(2) char object_spot09_objTex_017090[] = dobject_spot09_objTex_017090;
+
+#define dobject_spot09_objTex_017490 "__OTR__objects/object_spot09_obj/object_spot09_objTex_017490"
+static const ALIGN_ASSET(2) char object_spot09_objTex_017490[] = dobject_spot09_objTex_017490;
+
+#define dobject_spot09_objTex_017890 "__OTR__objects/object_spot09_obj/object_spot09_objTex_017890"
+static const ALIGN_ASSET(2) char object_spot09_objTex_017890[] = dobject_spot09_objTex_017890;
+
 #define dgValleyBridgeSidesDL "__OTR__objects/object_spot09_obj/gValleyBridgeSidesDL"
 static const ALIGN_ASSET(2) char gValleyBridgeSidesDL[] = dgValleyBridgeSidesDL;
 
@@ -33,67 +96,4 @@ static const ALIGN_ASSET(2) char gValleyObjects3Col[] = dgValleyObjects3Col;
 #define dgValleyObjects4Col "__OTR__objects/object_spot09_obj/gValleyObjects4Col"
 static const ALIGN_ASSET(2) char gValleyObjects4Col[] = dgValleyObjects4Col;
 
-#define dobject_spot09_objTex_013090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_013090"
-static const ALIGN_ASSET(2) char object_spot09_objTex_013090[] = dobject_spot09_objTex_013090;
-
-#define dobject_spot09_objTex_014090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_014090"
-static const ALIGN_ASSET(2) char object_spot09_objTex_014090[] = dobject_spot09_objTex_014090;
-
-#define dobject_spot09_objTex_00AC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00AC90"
-static const ALIGN_ASSET(2) char object_spot09_objTex_00AC90[] = dobject_spot09_objTex_00AC90;
-
-#define dobject_spot09_objTex_00BC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00BC90"
-static const ALIGN_ASSET(2) char object_spot09_objTex_00BC90[] = dobject_spot09_objTex_00BC90;
-
-#define dobject_spot09_objTex_00B490 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00B490"
-static const ALIGN_ASSET(2) char object_spot09_objTex_00B490[] = dobject_spot09_objTex_00B490;
-
-#define dobject_spot09_objTex_00A490 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00A490"
-static const ALIGN_ASSET(2) char object_spot09_objTex_00A490[] = dobject_spot09_objTex_00A490;
-
-#define dobject_spot09_objTex_00CC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00CC90"
-static const ALIGN_ASSET(2) char object_spot09_objTex_00CC90[] = dobject_spot09_objTex_00CC90;
-
-#define dobject_spot09_objTex_00DC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00DC90"
-static const ALIGN_ASSET(2) char object_spot09_objTex_00DC90[] = dobject_spot09_objTex_00DC90;
-
-#define dobject_spot09_objTex_00EC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00EC90"
-static const ALIGN_ASSET(2) char object_spot09_objTex_00EC90[] = dobject_spot09_objTex_00EC90;
-
-#define dobject_spot09_objTex_008C90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_008C90"
-static const ALIGN_ASSET(2) char object_spot09_objTex_008C90[] = dobject_spot09_objTex_008C90;
-
-#define dobject_spot09_objTex_00FC90 "__OTR__objects/object_spot09_obj/object_spot09_objTex_00FC90"
-static const ALIGN_ASSET(2) char object_spot09_objTex_00FC90[] = dobject_spot09_objTex_00FC90;
-
-#define dobject_spot09_objTex_012090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_012090"
-static const ALIGN_ASSET(2) char object_spot09_objTex_012090[] = dobject_spot09_objTex_012090;
-
-#define dobject_spot09_objTex_011090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_011090"
-static const ALIGN_ASSET(2) char object_spot09_objTex_011090[] = dobject_spot09_objTex_011090;
-
-#define dobject_spot09_objTex_010090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_010090"
-static const ALIGN_ASSET(2) char object_spot09_objTex_010090[] = dobject_spot09_objTex_010090;
-
-#define dobject_spot09_objTex_017890 "__OTR__objects/object_spot09_obj/object_spot09_objTex_017890"
-static const ALIGN_ASSET(2) char object_spot09_objTex_017890[] = dobject_spot09_objTex_017890;
-
-#define dobject_spot09_objTex_015090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_015090"
-static const ALIGN_ASSET(2) char object_spot09_objTex_015090[] = dobject_spot09_objTex_015090;
-
-#define dobject_spot09_objTex_008490 "__OTR__objects/object_spot09_obj/object_spot09_objTex_008490"
-static const ALIGN_ASSET(2) char object_spot09_objTex_008490[] = dobject_spot09_objTex_008490;
-
-#define dobject_spot09_objTex_016090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_016090"
-static const ALIGN_ASSET(2) char object_spot09_objTex_016090[] = dobject_spot09_objTex_016090;
-
-#define dobject_spot09_objTex_009490 "__OTR__objects/object_spot09_obj/object_spot09_objTex_009490"
-static const ALIGN_ASSET(2) char object_spot09_objTex_009490[] = dobject_spot09_objTex_009490;
-
-#define dobject_spot09_objTex_017490 "__OTR__objects/object_spot09_obj/object_spot09_objTex_017490"
-static const ALIGN_ASSET(2) char object_spot09_objTex_017490[] = dobject_spot09_objTex_017490;
-
-#define dobject_spot09_objTex_017090 "__OTR__objects/object_spot09_obj/object_spot09_objTex_017090"
-static const ALIGN_ASSET(2) char object_spot09_objTex_017090[] = dobject_spot09_objTex_017090;
-
 #endif // OBJECTS_OBJECT_SPOT09_OBJ_H
diff --git a/soh/assets/objects/object_sst/object_sst.h b/soh/assets/objects/object_sst/object_sst.h
index a3b60a8be..b2c66ccb9 100644
--- a/soh/assets/objects/object_sst/object_sst.h
+++ b/soh/assets/objects/object_sst/object_sst.h
@@ -3,6 +3,54 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_sstTex_017FE0 "__OTR__objects/object_sst/object_sstTex_017FE0"
+static const ALIGN_ASSET(2) char object_sstTex_017FE0[] = dobject_sstTex_017FE0;
+
+#define dobject_sstTex_019530 "__OTR__objects/object_sst/object_sstTex_019530"
+static const ALIGN_ASSET(2) char object_sstTex_019530[] = dobject_sstTex_019530;
+
+#define dobject_sstTex_019570 "__OTR__objects/object_sst/object_sstTex_019570"
+static const ALIGN_ASSET(2) char object_sstTex_019570[] = dobject_sstTex_019570;
+
+#define dobject_sstTex_019670 "__OTR__objects/object_sst/object_sstTex_019670"
+static const ALIGN_ASSET(2) char object_sstTex_019670[] = dobject_sstTex_019670;
+
+#define dobject_sstTex_019770 "__OTR__objects/object_sst/object_sstTex_019770"
+static const ALIGN_ASSET(2) char object_sstTex_019770[] = dobject_sstTex_019770;
+
+#define dobject_sstTex_0197B0 "__OTR__objects/object_sst/object_sstTex_0197B0"
+static const ALIGN_ASSET(2) char object_sstTex_0197B0[] = dobject_sstTex_0197B0;
+
+#define dobject_sstTex_0199B0 "__OTR__objects/object_sst/object_sstTex_0199B0"
+static const ALIGN_ASSET(2) char object_sstTex_0199B0[] = dobject_sstTex_0199B0;
+
+#define dobject_sstTex_019AB0 "__OTR__objects/object_sst/object_sstTex_019AB0"
+static const ALIGN_ASSET(2) char object_sstTex_019AB0[] = dobject_sstTex_019AB0;
+
+#define dobject_sstTex_019BB0 "__OTR__objects/object_sst/object_sstTex_019BB0"
+static const ALIGN_ASSET(2) char object_sstTex_019BB0[] = dobject_sstTex_019BB0;
+
+#define dobject_sstTex_019FB0 "__OTR__objects/object_sst/object_sstTex_019FB0"
+static const ALIGN_ASSET(2) char object_sstTex_019FB0[] = dobject_sstTex_019FB0;
+
+#define dobject_sstTex_01A0B0 "__OTR__objects/object_sst/object_sstTex_01A0B0"
+static const ALIGN_ASSET(2) char object_sstTex_01A0B0[] = dobject_sstTex_01A0B0;
+
+#define dobject_sstTex_01A1B0 "__OTR__objects/object_sst/object_sstTex_01A1B0"
+static const ALIGN_ASSET(2) char object_sstTex_01A1B0[] = dobject_sstTex_01A1B0;
+
+#define dobject_sstTex_01A3B0 "__OTR__objects/object_sst/object_sstTex_01A3B0"
+static const ALIGN_ASSET(2) char object_sstTex_01A3B0[] = dobject_sstTex_01A3B0;
+
+#define dobject_sstTex_01A5B0 "__OTR__objects/object_sst/object_sstTex_01A5B0"
+static const ALIGN_ASSET(2) char object_sstTex_01A5B0[] = dobject_sstTex_01A5B0;
+
+#define dobject_sstTex_01A730 "__OTR__objects/object_sst/object_sstTex_01A730"
+static const ALIGN_ASSET(2) char object_sstTex_01A730[] = dobject_sstTex_01A730;
+
+#define dobject_sstTex_01A7B0 "__OTR__objects/object_sst/object_sstTex_01A7B0"
+static const ALIGN_ASSET(2) char object_sstTex_01A7B0[] = dobject_sstTex_01A7B0;
+
 #define dgBongoTitleCardTex "__OTR__objects/object_sst/gBongoTitleCardTex"
 static const ALIGN_ASSET(2) char gBongoTitleCardTex[] = dgBongoTitleCardTex;
 
@@ -111,9 +159,6 @@ static const ALIGN_ASSET(2) char gBongoUnused1Tex[] = dgBongoUnused1Tex;
 #define dgBongoUnused2Tex "__OTR__objects/object_sst/gBongoUnused2Tex"
 static const ALIGN_ASSET(2) char gBongoUnused2Tex[] = dgBongoUnused2Tex;
 
-#define dobject_sstTex_017FE0 "__OTR__objects/object_sst/object_sstTex_017FE0"
-static const ALIGN_ASSET(2) char object_sstTex_017FE0[] = dobject_sstTex_017FE0;
-
 #define dgBongoLeftHandSkelLimbsLimb_004C4CDL_0044C8 "__OTR__objects/object_sst/gBongoLeftHandSkelLimbsLimb_004C4CDL_0044C8"
 static const ALIGN_ASSET(2) char gBongoLeftHandSkelLimbsLimb_004C4CDL_0044C8[] = dgBongoLeftHandSkelLimbsLimb_004C4CDL_0044C8;
 
@@ -294,49 +339,5 @@ static const ALIGN_ASSET(2) char gBongoHeadSkelLimbsLimb_017B78DL_011658[] = dgB
 #define dgBongoHeadSkelLimbsLimb_017B84DL_0119B0 "__OTR__objects/object_sst/gBongoHeadSkelLimbsLimb_017B84DL_0119B0"
 static const ALIGN_ASSET(2) char gBongoHeadSkelLimbsLimb_017B84DL_0119B0[] = dgBongoHeadSkelLimbsLimb_017B84DL_0119B0;
 
-#define dobject_sstTex_01A730 "__OTR__objects/object_sst/object_sstTex_01A730"
-static const ALIGN_ASSET(2) char object_sstTex_01A730[] = dobject_sstTex_01A730;
-
-#define dobject_sstTex_0199B0 "__OTR__objects/object_sst/object_sstTex_0199B0"
-static const ALIGN_ASSET(2) char object_sstTex_0199B0[] = dobject_sstTex_0199B0;
-
-#define dobject_sstTex_019BB0 "__OTR__objects/object_sst/object_sstTex_019BB0"
-static const ALIGN_ASSET(2) char object_sstTex_019BB0[] = dobject_sstTex_019BB0;
-
-#define dobject_sstTex_01A3B0 "__OTR__objects/object_sst/object_sstTex_01A3B0"
-static const ALIGN_ASSET(2) char object_sstTex_01A3B0[] = dobject_sstTex_01A3B0;
-
-#define dobject_sstTex_01A7B0 "__OTR__objects/object_sst/object_sstTex_01A7B0"
-static const ALIGN_ASSET(2) char object_sstTex_01A7B0[] = dobject_sstTex_01A7B0;
-
-#define dobject_sstTex_019AB0 "__OTR__objects/object_sst/object_sstTex_019AB0"
-static const ALIGN_ASSET(2) char object_sstTex_019AB0[] = dobject_sstTex_019AB0;
-
-#define dobject_sstTex_019FB0 "__OTR__objects/object_sst/object_sstTex_019FB0"
-static const ALIGN_ASSET(2) char object_sstTex_019FB0[] = dobject_sstTex_019FB0;
-
-#define dobject_sstTex_01A5B0 "__OTR__objects/object_sst/object_sstTex_01A5B0"
-static const ALIGN_ASSET(2) char object_sstTex_01A5B0[] = dobject_sstTex_01A5B0;
-
-#define dobject_sstTex_01A1B0 "__OTR__objects/object_sst/object_sstTex_01A1B0"
-static const ALIGN_ASSET(2) char object_sstTex_01A1B0[] = dobject_sstTex_01A1B0;
-
-#define dobject_sstTex_0197B0 "__OTR__objects/object_sst/object_sstTex_0197B0"
-static const ALIGN_ASSET(2) char object_sstTex_0197B0[] = dobject_sstTex_0197B0;
-
-#define dobject_sstTex_019570 "__OTR__objects/object_sst/object_sstTex_019570"
-static const ALIGN_ASSET(2) char object_sstTex_019570[] = dobject_sstTex_019570;
-
-#define dobject_sstTex_019530 "__OTR__objects/object_sst/object_sstTex_019530"
-static const ALIGN_ASSET(2) char object_sstTex_019530[] = dobject_sstTex_019530;
-
-#define dobject_sstTex_019670 "__OTR__objects/object_sst/object_sstTex_019670"
-static const ALIGN_ASSET(2) char object_sstTex_019670[] = dobject_sstTex_019670;
-
-#define dobject_sstTex_019770 "__OTR__objects/object_sst/object_sstTex_019770"
-static const ALIGN_ASSET(2) char object_sstTex_019770[] = dobject_sstTex_019770;
-
-#define dobject_sstTex_01A0B0 "__OTR__objects/object_sst/object_sstTex_01A0B0"
-static const ALIGN_ASSET(2) char object_sstTex_01A0B0[] = dobject_sstTex_01A0B0;
 
 #endif // OBJECTS_OBJECT_SST_H
diff --git a/soh/assets/objects/object_tk/object_tk.h b/soh/assets/objects/object_tk/object_tk.h
index a5ad11494..08118a2df 100644
--- a/soh/assets/objects/object_tk/object_tk.h
+++ b/soh/assets/objects/object_tk/object_tk.h
@@ -3,6 +3,57 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_tkTex_003980 "__OTR__objects/object_tk/object_tkTex_003980"
+static const ALIGN_ASSET(2) char object_tkTex_003980[] = dobject_tkTex_003980;
+
+#define dobject_tkTex_0039C0 "__OTR__objects/object_tk/object_tkTex_0039C0"
+static const ALIGN_ASSET(2) char object_tkTex_0039C0[] = dobject_tkTex_0039C0;
+
+#define dobject_tkTex_003A00 "__OTR__objects/object_tk/object_tkTex_003A00"
+static const ALIGN_ASSET(2) char object_tkTex_003A00[] = dobject_tkTex_003A00;
+
+#define dobject_tkTex_003A40 "__OTR__objects/object_tk/object_tkTex_003A40"
+static const ALIGN_ASSET(2) char object_tkTex_003A40[] = dobject_tkTex_003A40;
+
+#define dobject_tkTex_005340 "__OTR__objects/object_tk/object_tkTex_005340"
+static const ALIGN_ASSET(2) char object_tkTex_005340[] = dobject_tkTex_005340;
+
+#define dobject_tkTex_005440 "__OTR__objects/object_tk/object_tkTex_005440"
+static const ALIGN_ASSET(2) char object_tkTex_005440[] = dobject_tkTex_005440;
+
+#define dobject_tkTex_0056C0 "__OTR__objects/object_tk/object_tkTex_0056C0"
+static const ALIGN_ASSET(2) char object_tkTex_0056C0[] = dobject_tkTex_0056C0;
+
+#define dobject_tkTex_009B00 "__OTR__objects/object_tk/object_tkTex_009B00"
+static const ALIGN_ASSET(2) char object_tkTex_009B00[] = dobject_tkTex_009B00;
+
+#define dobject_tkTex_009C00 "__OTR__objects/object_tk/object_tkTex_009C00"
+static const ALIGN_ASSET(2) char object_tkTex_009C00[] = dobject_tkTex_009C00;
+
+#define dobject_tkTex_009C80 "__OTR__objects/object_tk/object_tkTex_009C80"
+static const ALIGN_ASSET(2) char object_tkTex_009C80[] = dobject_tkTex_009C80;
+
+#define dobject_tkTex_009CC0 "__OTR__objects/object_tk/object_tkTex_009CC0"
+static const ALIGN_ASSET(2) char object_tkTex_009CC0[] = dobject_tkTex_009CC0;
+
+#define dobject_tkTex_009D40 "__OTR__objects/object_tk/object_tkTex_009D40"
+static const ALIGN_ASSET(2) char object_tkTex_009D40[] = dobject_tkTex_009D40;
+
+#define dobject_tkTex_00B088 "__OTR__objects/object_tk/object_tkTex_00B088"
+static const ALIGN_ASSET(2) char object_tkTex_00B088[] = dobject_tkTex_00B088;
+
+#define dobject_tkTex_00B288 "__OTR__objects/object_tk/object_tkTex_00B288"
+static const ALIGN_ASSET(2) char object_tkTex_00B288[] = dobject_tkTex_00B288;
+
+#define dobject_tkTex_00B488 "__OTR__objects/object_tk/object_tkTex_00B488"
+static const ALIGN_ASSET(2) char object_tkTex_00B488[] = dobject_tkTex_00B488;
+
+#define dobject_tkTLUT_003780 "__OTR__objects/object_tk/object_tkTLUT_003780"
+static const ALIGN_ASSET(2) char object_tkTLUT_003780[] = dobject_tkTLUT_003780;
+
+#define dobject_tkTLUT_009AB0 "__OTR__objects/object_tk/object_tkTLUT_009AB0"
+static const ALIGN_ASSET(2) char object_tkTLUT_009AB0[] = dobject_tkTLUT_009AB0;
+
 #define dgDampeDigAnim "__OTR__objects/object_tk/gDampeDigAnim"
 static const ALIGN_ASSET(2) char gDampeDigAnim[] = dgDampeDigAnim;
 
@@ -45,27 +96,6 @@ static const ALIGN_ASSET(2) char gDampeEff2DL[] = dgDampeEff2DL;
 #define dgDampeSkel "__OTR__objects/object_tk/gDampeSkel"
 static const ALIGN_ASSET(2) char gDampeSkel[] = dgDampeSkel;
 
-#define dobject_tkTLUT_003780 "__OTR__objects/object_tk/object_tkTLUT_003780"
-static const ALIGN_ASSET(2) char object_tkTLUT_003780[] = dobject_tkTLUT_003780;
-
-#define dobject_tkTex_009CC0 "__OTR__objects/object_tk/object_tkTex_009CC0"
-static const ALIGN_ASSET(2) char object_tkTex_009CC0[] = dobject_tkTex_009CC0;
-
-#define dobject_tkTex_009D40 "__OTR__objects/object_tk/object_tkTex_009D40"
-static const ALIGN_ASSET(2) char object_tkTex_009D40[] = dobject_tkTex_009D40;
-
-#define dobject_tkTex_009C80 "__OTR__objects/object_tk/object_tkTex_009C80"
-static const ALIGN_ASSET(2) char object_tkTex_009C80[] = dobject_tkTex_009C80;
-
-#define dobject_tkTex_00B288 "__OTR__objects/object_tk/object_tkTex_00B288"
-static const ALIGN_ASSET(2) char object_tkTex_00B288[] = dobject_tkTex_00B288;
-
-#define dobject_tkTex_00B088 "__OTR__objects/object_tk/object_tkTex_00B088"
-static const ALIGN_ASSET(2) char object_tkTex_00B088[] = dobject_tkTex_00B088;
-
-#define dobject_tkTex_00B488 "__OTR__objects/object_tk/object_tkTex_00B488"
-static const ALIGN_ASSET(2) char object_tkTex_00B488[] = dobject_tkTex_00B488;
-
 #define dgDampeSkelLimbsLimb_00BD30DL_008020 "__OTR__objects/object_tk/gDampeSkelLimbsLimb_00BD30DL_008020"
 static const ALIGN_ASSET(2) char gDampeSkelLimbsLimb_00BD30DL_008020[] = dgDampeSkelLimbsLimb_00BD30DL_008020;
 
@@ -117,34 +147,5 @@ static const ALIGN_ASSET(2) char gDampeSkelLimbsLimb_00BDE4DL_008410[] = dgDampe
 #define dgDampeSkelLimbsLimb_00BDF0DL_008958 "__OTR__objects/object_tk/gDampeSkelLimbsLimb_00BDF0DL_008958"
 static const ALIGN_ASSET(2) char gDampeSkelLimbsLimb_00BDF0DL_008958[] = dgDampeSkelLimbsLimb_00BDF0DL_008958;
 
-#define dobject_tkTex_005440 "__OTR__objects/object_tk/object_tkTex_005440"
-static const ALIGN_ASSET(2) char object_tkTex_005440[] = dobject_tkTex_005440;
-
-#define dobject_tkTex_0056C0 "__OTR__objects/object_tk/object_tkTex_0056C0"
-static const ALIGN_ASSET(2) char object_tkTex_0056C0[] = dobject_tkTex_0056C0;
-
-#define dobject_tkTex_003980 "__OTR__objects/object_tk/object_tkTex_003980"
-static const ALIGN_ASSET(2) char object_tkTex_003980[] = dobject_tkTex_003980;
-
-#define dobject_tkTex_009B00 "__OTR__objects/object_tk/object_tkTex_009B00"
-static const ALIGN_ASSET(2) char object_tkTex_009B00[] = dobject_tkTex_009B00;
-
-#define dobject_tkTLUT_009AB0 "__OTR__objects/object_tk/object_tkTLUT_009AB0"
-static const ALIGN_ASSET(2) char object_tkTLUT_009AB0[] = dobject_tkTLUT_009AB0;
-
-#define dobject_tkTex_009C00 "__OTR__objects/object_tk/object_tkTex_009C00"
-static const ALIGN_ASSET(2) char object_tkTex_009C00[] = dobject_tkTex_009C00;
-
-#define dobject_tkTex_005340 "__OTR__objects/object_tk/object_tkTex_005340"
-static const ALIGN_ASSET(2) char object_tkTex_005340[] = dobject_tkTex_005340;
-
-#define dobject_tkTex_003A40 "__OTR__objects/object_tk/object_tkTex_003A40"
-static const ALIGN_ASSET(2) char object_tkTex_003A40[] = dobject_tkTex_003A40;
-
-#define dobject_tkTex_0039C0 "__OTR__objects/object_tk/object_tkTex_0039C0"
-static const ALIGN_ASSET(2) char object_tkTex_0039C0[] = dobject_tkTex_0039C0;
-
-#define dobject_tkTex_003A00 "__OTR__objects/object_tk/object_tkTex_003A00"
-static const ALIGN_ASSET(2) char object_tkTex_003A00[] = dobject_tkTex_003A00;
 
 #endif // OBJECTS_OBJECT_TK_H
diff --git a/soh/assets/objects/object_torch2/object_torch2.h b/soh/assets/objects/object_torch2/object_torch2.h
index 7c79eb4b4..de35cf3e9 100644
--- a/soh/assets/objects/object_torch2/object_torch2.h
+++ b/soh/assets/objects/object_torch2/object_torch2.h
@@ -3,15 +3,18 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_torch2Tex_0041C0 "__OTR__objects/object_torch2/object_torch2Tex_0041C0"
+static const ALIGN_ASSET(2) char object_torch2Tex_0041C0[] = dobject_torch2Tex_0041C0;
+
+#define dobject_torch2Tex_0043C0 "__OTR__objects/object_torch2/object_torch2Tex_0043C0"
+static const ALIGN_ASSET(2) char object_torch2Tex_0043C0[] = dobject_torch2Tex_0043C0;
+
 #define dgDarkLinkSkel "__OTR__objects/object_torch2/gDarkLinkSkel"
 static const ALIGN_ASSET(2) char gDarkLinkSkel[] = dgDarkLinkSkel;
 
 #define dsDarkLinkSheathDL "__OTR__objects/object_torch2/sDarkLinkSheathDL"
 static const ALIGN_ASSET(2) char sDarkLinkSheathDL[] = dsDarkLinkSheathDL;
 
-#define dobject_torch2Tex_0041C0 "__OTR__objects/object_torch2/object_torch2Tex_0041C0"
-static const ALIGN_ASSET(2) char object_torch2Tex_0041C0[] = dobject_torch2Tex_0041C0;
-
 #define dgDarkLinkSkelLimbsLimb_0045D0FarDL_002BD0 "__OTR__objects/object_torch2/gDarkLinkSkelLimbsLimb_0045D0FarDL_002BD0"
 static const ALIGN_ASSET(2) char gDarkLinkSkelLimbsLimb_0045D0FarDL_002BD0[] = dgDarkLinkSkelLimbsLimb_0045D0FarDL_002BD0;
 
@@ -63,7 +66,5 @@ static const ALIGN_ASSET(2) char gDarkLinkSkelLimbsLimb_0046E0FarDL_003C10[] = d
 #define dgDarkLinkSkelLimbsLimb_004700FarDL_0038D0 "__OTR__objects/object_torch2/gDarkLinkSkelLimbsLimb_004700FarDL_0038D0"
 static const ALIGN_ASSET(2) char gDarkLinkSkelLimbsLimb_004700FarDL_0038D0[] = dgDarkLinkSkelLimbsLimb_004700FarDL_0038D0;
 
-#define dobject_torch2Tex_0043C0 "__OTR__objects/object_torch2/object_torch2Tex_0043C0"
-static const ALIGN_ASSET(2) char object_torch2Tex_0043C0[] = dobject_torch2Tex_0043C0;
 
 #endif // OBJECTS_OBJECT_TORCH2_H
diff --git a/soh/assets/objects/object_xc/object_xc.h b/soh/assets/objects/object_xc/object_xc.h
index 2a2bb4d19..9a9b03bb2 100644
--- a/soh/assets/objects/object_xc/object_xc.h
+++ b/soh/assets/objects/object_xc/object_xc.h
@@ -3,6 +3,87 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_xcTex_004C40 "__OTR__objects/object_xc/object_xcTex_004C40"
+static const ALIGN_ASSET(2) char object_xcTex_004C40[] = dobject_xcTex_004C40;
+
+#define dobject_xcTex_004C80 "__OTR__objects/object_xc/object_xcTex_004C80"
+static const ALIGN_ASSET(2) char object_xcTex_004C80[] = dobject_xcTex_004C80;
+
+#define dobject_xcTex_005CC0 "__OTR__objects/object_xc/object_xcTex_005CC0"
+static const ALIGN_ASSET(2) char object_xcTex_005CC0[] = dobject_xcTex_005CC0;
+
+#define dobject_xcTex_0060C0 "__OTR__objects/object_xc/object_xcTex_0060C0"
+static const ALIGN_ASSET(2) char object_xcTex_0060C0[] = dobject_xcTex_0060C0;
+
+#define dobject_xcTex_0064C0 "__OTR__objects/object_xc/object_xcTex_0064C0"
+static const ALIGN_ASSET(2) char object_xcTex_0064C0[] = dobject_xcTex_0064C0;
+
+#define dobject_xcTex_006CC0 "__OTR__objects/object_xc/object_xcTex_006CC0"
+static const ALIGN_ASSET(2) char object_xcTex_006CC0[] = dobject_xcTex_006CC0;
+
+#define dobject_xcTex_006D40 "__OTR__objects/object_xc/object_xcTex_006D40"
+static const ALIGN_ASSET(2) char object_xcTex_006D40[] = dobject_xcTex_006D40;
+
+#define dobject_xcTex_006D80 "__OTR__objects/object_xc/object_xcTex_006D80"
+static const ALIGN_ASSET(2) char object_xcTex_006D80[] = dobject_xcTex_006D80;
+
+#define dobject_xcTex_006E80 "__OTR__objects/object_xc/object_xcTex_006E80"
+static const ALIGN_ASSET(2) char object_xcTex_006E80[] = dobject_xcTex_006E80;
+
+#define dobject_xcTex_007280 "__OTR__objects/object_xc/object_xcTex_007280"
+static const ALIGN_ASSET(2) char object_xcTex_007280[] = dobject_xcTex_007280;
+
+#define dobject_xcTex_007380 "__OTR__objects/object_xc/object_xcTex_007380"
+static const ALIGN_ASSET(2) char object_xcTex_007380[] = dobject_xcTex_007380;
+
+#define dobject_xcTex_007B80 "__OTR__objects/object_xc/object_xcTex_007B80"
+static const ALIGN_ASSET(2) char object_xcTex_007B80[] = dobject_xcTex_007B80;
+
+#define dobject_xcTex_008380 "__OTR__objects/object_xc/object_xcTex_008380"
+static const ALIGN_ASSET(2) char object_xcTex_008380[] = dobject_xcTex_008380;
+
+#define dobject_xcTex_008B80 "__OTR__objects/object_xc/object_xcTex_008B80"
+static const ALIGN_ASSET(2) char object_xcTex_008B80[] = dobject_xcTex_008B80;
+
+#define dobject_xcTex_008C00 "__OTR__objects/object_xc/object_xcTex_008C00"
+static const ALIGN_ASSET(2) char object_xcTex_008C00[] = dobject_xcTex_008C00;
+
+#define dobject_xcTex_00F790 "__OTR__objects/object_xc/object_xcTex_00F790"
+static const ALIGN_ASSET(2) char object_xcTex_00F790[] = dobject_xcTex_00F790;
+
+#define dobject_xcTex_00F7D0 "__OTR__objects/object_xc/object_xcTex_00F7D0"
+static const ALIGN_ASSET(2) char object_xcTex_00F7D0[] = dobject_xcTex_00F7D0;
+
+#define dobject_xcTex_00FBD0 "__OTR__objects/object_xc/object_xcTex_00FBD0"
+static const ALIGN_ASSET(2) char object_xcTex_00FBD0[] = dobject_xcTex_00FBD0;
+
+#define dobject_xcTex_00FCD0 "__OTR__objects/object_xc/object_xcTex_00FCD0"
+static const ALIGN_ASSET(2) char object_xcTex_00FCD0[] = dobject_xcTex_00FCD0;
+
+#define dobject_xcTex_00FD10 "__OTR__objects/object_xc/object_xcTex_00FD10"
+static const ALIGN_ASSET(2) char object_xcTex_00FD10[] = dobject_xcTex_00FD10;
+
+#define dobject_xcTex_00FD90 "__OTR__objects/object_xc/object_xcTex_00FD90"
+static const ALIGN_ASSET(2) char object_xcTex_00FD90[] = dobject_xcTex_00FD90;
+
+#define dobject_xcTex_00FDD0 "__OTR__objects/object_xc/object_xcTex_00FDD0"
+static const ALIGN_ASSET(2) char object_xcTex_00FDD0[] = dobject_xcTex_00FDD0;
+
+#define dobject_xcTex_0101D0 "__OTR__objects/object_xc/object_xcTex_0101D0"
+static const ALIGN_ASSET(2) char object_xcTex_0101D0[] = dobject_xcTex_0101D0;
+
+#define dobject_xcTex_011930 "__OTR__objects/object_xc/object_xcTex_011930"
+static const ALIGN_ASSET(2) char object_xcTex_011930[] = dobject_xcTex_011930;
+
+#define dobject_xcTLUT_004840 "__OTR__objects/object_xc/object_xcTLUT_004840"
+static const ALIGN_ASSET(2) char object_xcTLUT_004840[] = dobject_xcTLUT_004840;
+
+#define dobject_xcTLUT_00F6C0 "__OTR__objects/object_xc/object_xcTLUT_00F6C0"
+static const ALIGN_ASSET(2) char object_xcTLUT_00F6C0[] = dobject_xcTLUT_00F6C0;
+
+#define dobject_xcTLUT_00F720 "__OTR__objects/object_xc/object_xcTLUT_00F720"
+static const ALIGN_ASSET(2) char object_xcTLUT_00F720[] = dobject_xcTLUT_00F720;
+
 #define dgSheikSkel "__OTR__objects/object_xc/gSheikSkel"
 static const ALIGN_ASSET(2) char gSheikSkel[] = dgSheikSkel;
 
@@ -90,39 +171,6 @@ static const ALIGN_ASSET(2) char gSheikDL_011620[] = dgSheikDL_011620;
 #define dgSheikDL_012970 "__OTR__objects/object_xc/gSheikDL_012970"
 static const ALIGN_ASSET(2) char gSheikDL_012970[] = dgSheikDL_012970;
 
-#define dobject_xcTex_00F790 "__OTR__objects/object_xc/object_xcTex_00F790"
-static const ALIGN_ASSET(2) char object_xcTex_00F790[] = dobject_xcTex_00F790;
-
-#define dobject_xcTLUT_00F6C0 "__OTR__objects/object_xc/object_xcTLUT_00F6C0"
-static const ALIGN_ASSET(2) char object_xcTLUT_00F6C0[] = dobject_xcTLUT_00F6C0;
-
-#define dobject_xcTex_00F7D0 "__OTR__objects/object_xc/object_xcTex_00F7D0"
-static const ALIGN_ASSET(2) char object_xcTex_00F7D0[] = dobject_xcTex_00F7D0;
-
-#define dobject_xcTLUT_00F720 "__OTR__objects/object_xc/object_xcTLUT_00F720"
-static const ALIGN_ASSET(2) char object_xcTLUT_00F720[] = dobject_xcTLUT_00F720;
-
-#define dobject_xcTex_00FBD0 "__OTR__objects/object_xc/object_xcTex_00FBD0"
-static const ALIGN_ASSET(2) char object_xcTex_00FBD0[] = dobject_xcTex_00FBD0;
-
-#define dobject_xcTex_00FD10 "__OTR__objects/object_xc/object_xcTex_00FD10"
-static const ALIGN_ASSET(2) char object_xcTex_00FD10[] = dobject_xcTex_00FD10;
-
-#define dobject_xcTex_00FD90 "__OTR__objects/object_xc/object_xcTex_00FD90"
-static const ALIGN_ASSET(2) char object_xcTex_00FD90[] = dobject_xcTex_00FD90;
-
-#define dobject_xcTex_00FDD0 "__OTR__objects/object_xc/object_xcTex_00FDD0"
-static const ALIGN_ASSET(2) char object_xcTex_00FDD0[] = dobject_xcTex_00FDD0;
-
-#define dobject_xcTex_0101D0 "__OTR__objects/object_xc/object_xcTex_0101D0"
-static const ALIGN_ASSET(2) char object_xcTex_0101D0[] = dobject_xcTex_0101D0;
-
-#define dobject_xcTex_00FCD0 "__OTR__objects/object_xc/object_xcTex_00FCD0"
-static const ALIGN_ASSET(2) char object_xcTex_00FCD0[] = dobject_xcTex_00FCD0;
-
-#define dobject_xcTex_011930 "__OTR__objects/object_xc/object_xcTex_011930"
-static const ALIGN_ASSET(2) char object_xcTex_011930[] = dobject_xcTex_011930;
-
 #define dgSheikSkelLimbsLimb_0129FCDL_00EA98 "__OTR__objects/object_xc/gSheikSkelLimbsLimb_0129FCDL_00EA98"
 static const ALIGN_ASSET(2) char gSheikSkelLimbsLimb_0129FCDL_00EA98[] = dgSheikSkelLimbsLimb_0129FCDL_00EA98;
 
@@ -168,52 +216,5 @@ static const ALIGN_ASSET(2) char gSheikSkelLimbsLimb_012A98DL_00E220[] = dgSheik
 #define dgSheikSkelLimbsLimb_012AA4DL_00D710 "__OTR__objects/object_xc/gSheikSkelLimbsLimb_012AA4DL_00D710"
 static const ALIGN_ASSET(2) char gSheikSkelLimbsLimb_012AA4DL_00D710[] = dgSheikSkelLimbsLimb_012AA4DL_00D710;
 
-#define dobject_xcTLUT_004840 "__OTR__objects/object_xc/object_xcTLUT_004840"
-static const ALIGN_ASSET(2) char object_xcTLUT_004840[] = dobject_xcTLUT_004840;
-
-#define dobject_xcTex_006D80 "__OTR__objects/object_xc/object_xcTex_006D80"
-static const ALIGN_ASSET(2) char object_xcTex_006D80[] = dobject_xcTex_006D80;
-
-#define dobject_xcTex_007280 "__OTR__objects/object_xc/object_xcTex_007280"
-static const ALIGN_ASSET(2) char object_xcTex_007280[] = dobject_xcTex_007280;
-
-#define dobject_xcTex_007380 "__OTR__objects/object_xc/object_xcTex_007380"
-static const ALIGN_ASSET(2) char object_xcTex_007380[] = dobject_xcTex_007380;
-
-#define dobject_xcTex_007B80 "__OTR__objects/object_xc/object_xcTex_007B80"
-static const ALIGN_ASSET(2) char object_xcTex_007B80[] = dobject_xcTex_007B80;
-
-#define dobject_xcTex_008380 "__OTR__objects/object_xc/object_xcTex_008380"
-static const ALIGN_ASSET(2) char object_xcTex_008380[] = dobject_xcTex_008380;
-
-#define dobject_xcTex_008B80 "__OTR__objects/object_xc/object_xcTex_008B80"
-static const ALIGN_ASSET(2) char object_xcTex_008B80[] = dobject_xcTex_008B80;
-
-#define dobject_xcTex_008C00 "__OTR__objects/object_xc/object_xcTex_008C00"
-static const ALIGN_ASSET(2) char object_xcTex_008C00[] = dobject_xcTex_008C00;
-
-#define dobject_xcTex_004C40 "__OTR__objects/object_xc/object_xcTex_004C40"
-static const ALIGN_ASSET(2) char object_xcTex_004C40[] = dobject_xcTex_004C40;
-
-#define dobject_xcTex_0060C0 "__OTR__objects/object_xc/object_xcTex_0060C0"
-static const ALIGN_ASSET(2) char object_xcTex_0060C0[] = dobject_xcTex_0060C0;
-
-#define dobject_xcTex_0064C0 "__OTR__objects/object_xc/object_xcTex_0064C0"
-static const ALIGN_ASSET(2) char object_xcTex_0064C0[] = dobject_xcTex_0064C0;
-
-#define dobject_xcTex_006E80 "__OTR__objects/object_xc/object_xcTex_006E80"
-static const ALIGN_ASSET(2) char object_xcTex_006E80[] = dobject_xcTex_006E80;
-
-#define dobject_xcTex_004C80 "__OTR__objects/object_xc/object_xcTex_004C80"
-static const ALIGN_ASSET(2) char object_xcTex_004C80[] = dobject_xcTex_004C80;
-
-#define dobject_xcTex_005CC0 "__OTR__objects/object_xc/object_xcTex_005CC0"
-static const ALIGN_ASSET(2) char object_xcTex_005CC0[] = dobject_xcTex_005CC0;
-
-#define dobject_xcTex_006CC0 "__OTR__objects/object_xc/object_xcTex_006CC0"
-static const ALIGN_ASSET(2) char object_xcTex_006CC0[] = dobject_xcTex_006CC0;
-
-#define dobject_xcTex_006D40 "__OTR__objects/object_xc/object_xcTex_006D40"
-static const ALIGN_ASSET(2) char object_xcTex_006D40[] = dobject_xcTex_006D40;
 
 #endif // OBJECTS_OBJECT_XC_H
diff --git a/soh/assets/objects/object_zl1/object_zl1.h b/soh/assets/objects/object_zl1/object_zl1.h
index cd2326051..b6e7658a1 100644
--- a/soh/assets/objects/object_zl1/object_zl1.h
+++ b/soh/assets/objects/object_zl1/object_zl1.h
@@ -3,6 +3,9 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_zl1Tex_00EE58 "__OTR__objects/object_zl1/object_zl1Tex_00EE58"
+static const ALIGN_ASSET(2) char object_zl1Tex_00EE58[] = dobject_zl1Tex_00EE58;
+
 #define dgChildZelda1Skel "__OTR__objects/object_zl1/gChildZelda1Skel"
 static const ALIGN_ASSET(2) char gChildZelda1Skel[] = dgChildZelda1Skel;
 
@@ -231,7 +234,5 @@ static const ALIGN_ASSET(2) char gChildZelda1Anim_13F10[] = dgChildZelda1Anim_13
 #define dgChildZelda1Anim_143A8 "__OTR__objects/object_zl1/gChildZelda1Anim_143A8"
 static const ALIGN_ASSET(2) char gChildZelda1Anim_143A8[] = dgChildZelda1Anim_143A8;
 
-#define dobject_zl1Tex_00EE58 "__OTR__objects/object_zl1/object_zl1Tex_00EE58"
-static const ALIGN_ASSET(2) char object_zl1Tex_00EE58[] = dobject_zl1Tex_00EE58;
 
 #endif // OBJECTS_OBJECT_ZL1_H
diff --git a/soh/assets/objects/object_zl2/object_zl2.h b/soh/assets/objects/object_zl2/object_zl2.h
index fe038ad18..647db8673 100644
--- a/soh/assets/objects/object_zl2/object_zl2.h
+++ b/soh/assets/objects/object_zl2/object_zl2.h
@@ -3,6 +3,105 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_zl2Tex_000E00 "__OTR__objects/object_zl2/object_zl2Tex_000E00"
+static const ALIGN_ASSET(2) char object_zl2Tex_000E00[] = dobject_zl2Tex_000E00;
+
+#define dobject_zl2Tex_000F00 "__OTR__objects/object_zl2/object_zl2Tex_000F00"
+static const ALIGN_ASSET(2) char object_zl2Tex_000F00[] = dobject_zl2Tex_000F00;
+
+#define dobject_zl2Tex_000F40 "__OTR__objects/object_zl2/object_zl2Tex_000F40"
+static const ALIGN_ASSET(2) char object_zl2Tex_000F40[] = dobject_zl2Tex_000F40;
+
+#define dobject_zl2Tex_001140 "__OTR__objects/object_zl2/object_zl2Tex_001140"
+static const ALIGN_ASSET(2) char object_zl2Tex_001140[] = dobject_zl2Tex_001140;
+
+#define dobject_zl2Tex_001180 "__OTR__objects/object_zl2/object_zl2Tex_001180"
+static const ALIGN_ASSET(2) char object_zl2Tex_001180[] = dobject_zl2Tex_001180;
+
+#define dobject_zl2Tex_001280 "__OTR__objects/object_zl2/object_zl2Tex_001280"
+static const ALIGN_ASSET(2) char object_zl2Tex_001280[] = dobject_zl2Tex_001280;
+
+#define dobject_zl2Tex_0012C0 "__OTR__objects/object_zl2/object_zl2Tex_0012C0"
+static const ALIGN_ASSET(2) char object_zl2Tex_0012C0[] = dobject_zl2Tex_0012C0;
+
+#define dobject_zl2Tex_0016C0 "__OTR__objects/object_zl2/object_zl2Tex_0016C0"
+static const ALIGN_ASSET(2) char object_zl2Tex_0016C0[] = dobject_zl2Tex_0016C0;
+
+#define dobject_zl2Tex_001AC0 "__OTR__objects/object_zl2/object_zl2Tex_001AC0"
+static const ALIGN_ASSET(2) char object_zl2Tex_001AC0[] = dobject_zl2Tex_001AC0;
+
+#define dobject_zl2Tex_001CC0 "__OTR__objects/object_zl2/object_zl2Tex_001CC0"
+static const ALIGN_ASSET(2) char object_zl2Tex_001CC0[] = dobject_zl2Tex_001CC0;
+
+#define dobject_zl2Tex_0024C0 "__OTR__objects/object_zl2/object_zl2Tex_0024C0"
+static const ALIGN_ASSET(2) char object_zl2Tex_0024C0[] = dobject_zl2Tex_0024C0;
+
+#define dobject_zl2Tex_002500 "__OTR__objects/object_zl2/object_zl2Tex_002500"
+static const ALIGN_ASSET(2) char object_zl2Tex_002500[] = dobject_zl2Tex_002500;
+
+#define dobject_zl2Tex_002600 "__OTR__objects/object_zl2/object_zl2Tex_002600"
+static const ALIGN_ASSET(2) char object_zl2Tex_002600[] = dobject_zl2Tex_002600;
+
+#define dobject_zl2Tex_002700 "__OTR__objects/object_zl2/object_zl2Tex_002700"
+static const ALIGN_ASSET(2) char object_zl2Tex_002700[] = dobject_zl2Tex_002700;
+
+#define dobject_zl2Tex_002740 "__OTR__objects/object_zl2/object_zl2Tex_002740"
+static const ALIGN_ASSET(2) char object_zl2Tex_002740[] = dobject_zl2Tex_002740;
+
+#define dobject_zl2Tex_002780 "__OTR__objects/object_zl2/object_zl2Tex_002780"
+static const ALIGN_ASSET(2) char object_zl2Tex_002780[] = dobject_zl2Tex_002780;
+
+#define dobject_zl2Tex_002880 "__OTR__objects/object_zl2/object_zl2Tex_002880"
+static const ALIGN_ASSET(2) char object_zl2Tex_002880[] = dobject_zl2Tex_002880;
+
+#define dobject_zl2Tex_0034C8 "__OTR__objects/object_zl2/object_zl2Tex_0034C8"
+static const ALIGN_ASSET(2) char object_zl2Tex_0034C8[] = dobject_zl2Tex_0034C8;
+
+#define dobject_zl2Tex_003908 "__OTR__objects/object_zl2/object_zl2Tex_003908"
+static const ALIGN_ASSET(2) char object_zl2Tex_003908[] = dobject_zl2Tex_003908;
+
+#define dobject_zl2Tex_003A08 "__OTR__objects/object_zl2/object_zl2Tex_003A08"
+static const ALIGN_ASSET(2) char object_zl2Tex_003A08[] = dobject_zl2Tex_003A08;
+
+#define dobject_zl2Tex_003A48 "__OTR__objects/object_zl2/object_zl2Tex_003A48"
+static const ALIGN_ASSET(2) char object_zl2Tex_003A48[] = dobject_zl2Tex_003A48;
+
+#define dobject_zl2Tex_003AC8 "__OTR__objects/object_zl2/object_zl2Tex_003AC8"
+static const ALIGN_ASSET(2) char object_zl2Tex_003AC8[] = dobject_zl2Tex_003AC8;
+
+#define dobject_zl2Tex_003B48 "__OTR__objects/object_zl2/object_zl2Tex_003B48"
+static const ALIGN_ASSET(2) char object_zl2Tex_003B48[] = dobject_zl2Tex_003B48;
+
+#define dobject_zl2Tex_004448 "__OTR__objects/object_zl2/object_zl2Tex_004448"
+static const ALIGN_ASSET(2) char object_zl2Tex_004448[] = dobject_zl2Tex_004448;
+
+#define dobject_zl2Tex_006548 "__OTR__objects/object_zl2/object_zl2Tex_006548"
+static const ALIGN_ASSET(2) char object_zl2Tex_006548[] = dobject_zl2Tex_006548;
+
+#define dobject_zl2Tex_009738 "__OTR__objects/object_zl2/object_zl2Tex_009738"
+static const ALIGN_ASSET(2) char object_zl2Tex_009738[] = dobject_zl2Tex_009738;
+
+#define dobject_zl2Tex_009938 "__OTR__objects/object_zl2/object_zl2Tex_009938"
+static const ALIGN_ASSET(2) char object_zl2Tex_009938[] = dobject_zl2Tex_009938;
+
+#define dobject_zl2Tex_009A38 "__OTR__objects/object_zl2/object_zl2Tex_009A38"
+static const ALIGN_ASSET(2) char object_zl2Tex_009A38[] = dobject_zl2Tex_009A38;
+
+#define dobject_zl2Tex_009A78 "__OTR__objects/object_zl2/object_zl2Tex_009A78"
+static const ALIGN_ASSET(2) char object_zl2Tex_009A78[] = dobject_zl2Tex_009A78;
+
+#define dobject_zl2Tex_009E78 "__OTR__objects/object_zl2/object_zl2Tex_009E78"
+static const ALIGN_ASSET(2) char object_zl2Tex_009E78[] = dobject_zl2Tex_009E78;
+
+#define dobject_zl2Tex_009F78 "__OTR__objects/object_zl2/object_zl2Tex_009F78"
+static const ALIGN_ASSET(2) char object_zl2Tex_009F78[] = dobject_zl2Tex_009F78;
+
+#define dobject_zl2Tex_009FF8 "__OTR__objects/object_zl2/object_zl2Tex_009FF8"
+static const ALIGN_ASSET(2) char object_zl2Tex_009FF8[] = dobject_zl2Tex_009FF8;
+
+#define dobject_zl2Tex_00A0F8 "__OTR__objects/object_zl2/object_zl2Tex_00A0F8"
+static const ALIGN_ASSET(2) char object_zl2Tex_00A0F8[] = dobject_zl2Tex_00A0F8;
+
 #define dgZelda2Skel "__OTR__objects/object_zl2/gZelda2Skel"
 static const ALIGN_ASSET(2) char gZelda2Skel[] = dgZelda2Skel;
 
@@ -123,103 +222,5 @@ static const ALIGN_ASSET(2) char gZelda2SkelLimbsLimb_010D20DL_00EA58[] = dgZeld
 #define dgZelda2SkelLimbsLimb_010D2CDL_007DC8 "__OTR__objects/object_zl2/gZelda2SkelLimbsLimb_010D2CDL_007DC8"
 static const ALIGN_ASSET(2) char gZelda2SkelLimbsLimb_010D2CDL_007DC8[] = dgZelda2SkelLimbsLimb_010D2CDL_007DC8;
 
-#define dobject_zl2Tex_0024C0 "__OTR__objects/object_zl2/object_zl2Tex_0024C0"
-static const ALIGN_ASSET(2) char object_zl2Tex_0024C0[] = dobject_zl2Tex_0024C0;
-
-#define dobject_zl2Tex_000E00 "__OTR__objects/object_zl2/object_zl2Tex_000E00"
-static const ALIGN_ASSET(2) char object_zl2Tex_000E00[] = dobject_zl2Tex_000E00;
-
-#define dobject_zl2Tex_002500 "__OTR__objects/object_zl2/object_zl2Tex_002500"
-static const ALIGN_ASSET(2) char object_zl2Tex_002500[] = dobject_zl2Tex_002500;
-
-#define dobject_zl2Tex_002600 "__OTR__objects/object_zl2/object_zl2Tex_002600"
-static const ALIGN_ASSET(2) char object_zl2Tex_002600[] = dobject_zl2Tex_002600;
-
-#define dobject_zl2Tex_002700 "__OTR__objects/object_zl2/object_zl2Tex_002700"
-static const ALIGN_ASSET(2) char object_zl2Tex_002700[] = dobject_zl2Tex_002700;
-
-#define dobject_zl2Tex_002740 "__OTR__objects/object_zl2/object_zl2Tex_002740"
-static const ALIGN_ASSET(2) char object_zl2Tex_002740[] = dobject_zl2Tex_002740;
-
-#define dobject_zl2Tex_002780 "__OTR__objects/object_zl2/object_zl2Tex_002780"
-static const ALIGN_ASSET(2) char object_zl2Tex_002780[] = dobject_zl2Tex_002780;
-
-#define dobject_zl2Tex_002880 "__OTR__objects/object_zl2/object_zl2Tex_002880"
-static const ALIGN_ASSET(2) char object_zl2Tex_002880[] = dobject_zl2Tex_002880;
-
-#define dobject_zl2Tex_0012C0 "__OTR__objects/object_zl2/object_zl2Tex_0012C0"
-static const ALIGN_ASSET(2) char object_zl2Tex_0012C0[] = dobject_zl2Tex_0012C0;
-
-#define dobject_zl2Tex_001CC0 "__OTR__objects/object_zl2/object_zl2Tex_001CC0"
-static const ALIGN_ASSET(2) char object_zl2Tex_001CC0[] = dobject_zl2Tex_001CC0;
-
-#define dobject_zl2Tex_0016C0 "__OTR__objects/object_zl2/object_zl2Tex_0016C0"
-static const ALIGN_ASSET(2) char object_zl2Tex_0016C0[] = dobject_zl2Tex_0016C0;
-
-#define dobject_zl2Tex_001AC0 "__OTR__objects/object_zl2/object_zl2Tex_001AC0"
-static const ALIGN_ASSET(2) char object_zl2Tex_001AC0[] = dobject_zl2Tex_001AC0;
-
-#define dobject_zl2Tex_009A38 "__OTR__objects/object_zl2/object_zl2Tex_009A38"
-static const ALIGN_ASSET(2) char object_zl2Tex_009A38[] = dobject_zl2Tex_009A38;
-
-#define dobject_zl2Tex_003A08 "__OTR__objects/object_zl2/object_zl2Tex_003A08"
-static const ALIGN_ASSET(2) char object_zl2Tex_003A08[] = dobject_zl2Tex_003A08;
-
-#define dobject_zl2Tex_009738 "__OTR__objects/object_zl2/object_zl2Tex_009738"
-static const ALIGN_ASSET(2) char object_zl2Tex_009738[] = dobject_zl2Tex_009738;
-
-#define dobject_zl2Tex_009938 "__OTR__objects/object_zl2/object_zl2Tex_009938"
-static const ALIGN_ASSET(2) char object_zl2Tex_009938[] = dobject_zl2Tex_009938;
-
-#define dobject_zl2Tex_009A78 "__OTR__objects/object_zl2/object_zl2Tex_009A78"
-static const ALIGN_ASSET(2) char object_zl2Tex_009A78[] = dobject_zl2Tex_009A78;
-
-#define dobject_zl2Tex_009E78 "__OTR__objects/object_zl2/object_zl2Tex_009E78"
-static const ALIGN_ASSET(2) char object_zl2Tex_009E78[] = dobject_zl2Tex_009E78;
-
-#define dobject_zl2Tex_009F78 "__OTR__objects/object_zl2/object_zl2Tex_009F78"
-static const ALIGN_ASSET(2) char object_zl2Tex_009F78[] = dobject_zl2Tex_009F78;
-
-#define dobject_zl2Tex_009FF8 "__OTR__objects/object_zl2/object_zl2Tex_009FF8"
-static const ALIGN_ASSET(2) char object_zl2Tex_009FF8[] = dobject_zl2Tex_009FF8;
-
-#define dobject_zl2Tex_00A0F8 "__OTR__objects/object_zl2/object_zl2Tex_00A0F8"
-static const ALIGN_ASSET(2) char object_zl2Tex_00A0F8[] = dobject_zl2Tex_00A0F8;
-
-#define dobject_zl2Tex_001140 "__OTR__objects/object_zl2/object_zl2Tex_001140"
-static const ALIGN_ASSET(2) char object_zl2Tex_001140[] = dobject_zl2Tex_001140;
-
-#define dobject_zl2Tex_001180 "__OTR__objects/object_zl2/object_zl2Tex_001180"
-static const ALIGN_ASSET(2) char object_zl2Tex_001180[] = dobject_zl2Tex_001180;
-
-#define dobject_zl2Tex_001280 "__OTR__objects/object_zl2/object_zl2Tex_001280"
-static const ALIGN_ASSET(2) char object_zl2Tex_001280[] = dobject_zl2Tex_001280;
-
-#define dobject_zl2Tex_000F40 "__OTR__objects/object_zl2/object_zl2Tex_000F40"
-static const ALIGN_ASSET(2) char object_zl2Tex_000F40[] = dobject_zl2Tex_000F40;
-
-#define dobject_zl2Tex_000F00 "__OTR__objects/object_zl2/object_zl2Tex_000F00"
-static const ALIGN_ASSET(2) char object_zl2Tex_000F00[] = dobject_zl2Tex_000F00;
-
-#define dobject_zl2Tex_003AC8 "__OTR__objects/object_zl2/object_zl2Tex_003AC8"
-static const ALIGN_ASSET(2) char object_zl2Tex_003AC8[] = dobject_zl2Tex_003AC8;
-
-#define dobject_zl2Tex_0034C8 "__OTR__objects/object_zl2/object_zl2Tex_0034C8"
-static const ALIGN_ASSET(2) char object_zl2Tex_0034C8[] = dobject_zl2Tex_0034C8;
-
-#define dobject_zl2Tex_004448 "__OTR__objects/object_zl2/object_zl2Tex_004448"
-static const ALIGN_ASSET(2) char object_zl2Tex_004448[] = dobject_zl2Tex_004448;
-
-#define dobject_zl2Tex_003A48 "__OTR__objects/object_zl2/object_zl2Tex_003A48"
-static const ALIGN_ASSET(2) char object_zl2Tex_003A48[] = dobject_zl2Tex_003A48;
-
-#define dobject_zl2Tex_006548 "__OTR__objects/object_zl2/object_zl2Tex_006548"
-static const ALIGN_ASSET(2) char object_zl2Tex_006548[] = dobject_zl2Tex_006548;
-
-#define dobject_zl2Tex_003B48 "__OTR__objects/object_zl2/object_zl2Tex_003B48"
-static const ALIGN_ASSET(2) char object_zl2Tex_003B48[] = dobject_zl2Tex_003B48;
-
-#define dobject_zl2Tex_003908 "__OTR__objects/object_zl2/object_zl2Tex_003908"
-static const ALIGN_ASSET(2) char object_zl2Tex_003908[] = dobject_zl2Tex_003908;
 
 #endif // OBJECTS_OBJECT_ZL2_H
diff --git a/soh/assets/objects/object_zl4/object_zl4.h b/soh/assets/objects/object_zl4/object_zl4.h
index 45c887b54..59c480917 100644
--- a/soh/assets/objects/object_zl4/object_zl4.h
+++ b/soh/assets/objects/object_zl4/object_zl4.h
@@ -3,6 +3,99 @@
 
 #include "align_asset_macro.h"
 
+#define dobject_zl4Tex_000C70 "__OTR__objects/object_zl4/object_zl4Tex_000C70"
+static const ALIGN_ASSET(2) char object_zl4Tex_000C70[] = dobject_zl4Tex_000C70;
+
+#define dobject_zl4Tex_000CB0 "__OTR__objects/object_zl4/object_zl4Tex_000CB0"
+static const ALIGN_ASSET(2) char object_zl4Tex_000CB0[] = dobject_zl4Tex_000CB0;
+
+#define dobject_zl4Tex_000DB0 "__OTR__objects/object_zl4/object_zl4Tex_000DB0"
+static const ALIGN_ASSET(2) char object_zl4Tex_000DB0[] = dobject_zl4Tex_000DB0;
+
+#define dobject_zl4Tex_0015B0 "__OTR__objects/object_zl4/object_zl4Tex_0015B0"
+static const ALIGN_ASSET(2) char object_zl4Tex_0015B0[] = dobject_zl4Tex_0015B0;
+
+#define dobject_zl4Tex_001630 "__OTR__objects/object_zl4/object_zl4Tex_001630"
+static const ALIGN_ASSET(2) char object_zl4Tex_001630[] = dobject_zl4Tex_001630;
+
+#define dobject_zl4Tex_0016B0 "__OTR__objects/object_zl4/object_zl4Tex_0016B0"
+static const ALIGN_ASSET(2) char object_zl4Tex_0016B0[] = dobject_zl4Tex_0016B0;
+
+#define dobject_zl4Tex_0017B0 "__OTR__objects/object_zl4/object_zl4Tex_0017B0"
+static const ALIGN_ASSET(2) char object_zl4Tex_0017B0[] = dobject_zl4Tex_0017B0;
+
+#define dobject_zl4Tex_0017F0 "__OTR__objects/object_zl4/object_zl4Tex_0017F0"
+static const ALIGN_ASSET(2) char object_zl4Tex_0017F0[] = dobject_zl4Tex_0017F0;
+
+#define dobject_zl4Tex_001BF0 "__OTR__objects/object_zl4/object_zl4Tex_001BF0"
+static const ALIGN_ASSET(2) char object_zl4Tex_001BF0[] = dobject_zl4Tex_001BF0;
+
+#define dobject_zl4Tex_001CF0 "__OTR__objects/object_zl4/object_zl4Tex_001CF0"
+static const ALIGN_ASSET(2) char object_zl4Tex_001CF0[] = dobject_zl4Tex_001CF0;
+
+#define dobject_zl4Tex_001DF0 "__OTR__objects/object_zl4/object_zl4Tex_001DF0"
+static const ALIGN_ASSET(2) char object_zl4Tex_001DF0[] = dobject_zl4Tex_001DF0;
+
+#define dobject_zl4Tex_001E30 "__OTR__objects/object_zl4/object_zl4Tex_001E30"
+static const ALIGN_ASSET(2) char object_zl4Tex_001E30[] = dobject_zl4Tex_001E30;
+
+#define dobject_zl4Tex_002230 "__OTR__objects/object_zl4/object_zl4Tex_002230"
+static const ALIGN_ASSET(2) char object_zl4Tex_002230[] = dobject_zl4Tex_002230;
+
+#define dobject_zl4Tex_002270 "__OTR__objects/object_zl4/object_zl4Tex_002270"
+static const ALIGN_ASSET(2) char object_zl4Tex_002270[] = dobject_zl4Tex_002270;
+
+#define dobject_zl4Tex_0022F0 "__OTR__objects/object_zl4/object_zl4Tex_0022F0"
+static const ALIGN_ASSET(2) char object_zl4Tex_0022F0[] = dobject_zl4Tex_0022F0;
+
+#define dobject_zl4Tex_0024F0 "__OTR__objects/object_zl4/object_zl4Tex_0024F0"
+static const ALIGN_ASSET(2) char object_zl4Tex_0024F0[] = dobject_zl4Tex_0024F0;
+
+#define dobject_zl4Tex_0026F0 "__OTR__objects/object_zl4/object_zl4Tex_0026F0"
+static const ALIGN_ASSET(2) char object_zl4Tex_0026F0[] = dobject_zl4Tex_0026F0;
+
+#define dobject_zl4Tex_0028F0 "__OTR__objects/object_zl4/object_zl4Tex_0028F0"
+static const ALIGN_ASSET(2) char object_zl4Tex_0028F0[] = dobject_zl4Tex_0028F0;
+
+#define dobject_zl4Tex_002970 "__OTR__objects/object_zl4/object_zl4Tex_002970"
+static const ALIGN_ASSET(2) char object_zl4Tex_002970[] = dobject_zl4Tex_002970;
+
+#define dobject_zl4Tex_0029F0 "__OTR__objects/object_zl4/object_zl4Tex_0029F0"
+static const ALIGN_ASSET(2) char object_zl4Tex_0029F0[] = dobject_zl4Tex_0029F0;
+
+#define dobject_zl4Tex_0056F0 "__OTR__objects/object_zl4/object_zl4Tex_0056F0"
+static const ALIGN_ASSET(2) char object_zl4Tex_0056F0[] = dobject_zl4Tex_0056F0;
+
+#define dobject_zl4Tex_0058F0 "__OTR__objects/object_zl4/object_zl4Tex_0058F0"
+static const ALIGN_ASSET(2) char object_zl4Tex_0058F0[] = dobject_zl4Tex_0058F0;
+
+#define dobject_zl4Tex_0059F0 "__OTR__objects/object_zl4/object_zl4Tex_0059F0"
+static const ALIGN_ASSET(2) char object_zl4Tex_0059F0[] = dobject_zl4Tex_0059F0;
+
+#define dobject_zl4Tex_005A70 "__OTR__objects/object_zl4/object_zl4Tex_005A70"
+static const ALIGN_ASSET(2) char object_zl4Tex_005A70[] = dobject_zl4Tex_005A70;
+
+#define dobject_zl4Tex_005C70 "__OTR__objects/object_zl4/object_zl4Tex_005C70"
+static const ALIGN_ASSET(2) char object_zl4Tex_005C70[] = dobject_zl4Tex_005C70;
+
+#define dobject_zl4Tex_005CB0 "__OTR__objects/object_zl4/object_zl4Tex_005CB0"
+static const ALIGN_ASSET(2) char object_zl4Tex_005CB0[] = dobject_zl4Tex_005CB0;
+
+#define dobject_zl4Tex_005DB0 "__OTR__objects/object_zl4/object_zl4Tex_005DB0"
+static const ALIGN_ASSET(2) char object_zl4Tex_005DB0[] = dobject_zl4Tex_005DB0;
+
+#define dobject_zl4Tex_00D8B8 "__OTR__objects/object_zl4/object_zl4Tex_00D8B8"
+static const ALIGN_ASSET(2) char object_zl4Tex_00D8B8[] = dobject_zl4Tex_00D8B8;
+
+#define dobject_zl4TLUT_000670 "__OTR__objects/object_zl4/object_zl4TLUT_000670"
+static const ALIGN_ASSET(2) char object_zl4TLUT_000670[] = dobject_zl4TLUT_000670;
+
+#define dobject_zl4TLUT_000870 "__OTR__objects/object_zl4/object_zl4TLUT_000870"
+static const ALIGN_ASSET(2) char object_zl4TLUT_000870[] = dobject_zl4TLUT_000870;
+
+#define dobject_zl4TLUT_000A70 "__OTR__objects/object_zl4/object_zl4TLUT_000A70"
+static const ALIGN_ASSET(2) char object_zl4TLUT_000A70[] = dobject_zl4TLUT_000A70;
+
 #define dgChildZeldaSkel "__OTR__objects/object_zl4/gChildZeldaSkel"
 static const ALIGN_ASSET(2) char gChildZeldaSkel[] = dgChildZeldaSkel;
 
@@ -144,27 +237,6 @@ static const ALIGN_ASSET(2) char gChildZeldaCutsceneDressDL[] = dgChildZeldaCuts
 #define dgChildZeldaOcarinaOfTimeDL "__OTR__objects/object_zl4/gChildZeldaOcarinaOfTimeDL"
 static const ALIGN_ASSET(2) char gChildZeldaOcarinaOfTimeDL[] = dgChildZeldaOcarinaOfTimeDL;
 
-#define dobject_zl4TLUT_000670 "__OTR__objects/object_zl4/object_zl4TLUT_000670"
-static const ALIGN_ASSET(2) char object_zl4TLUT_000670[] = dobject_zl4TLUT_000670;
-
-#define dobject_zl4Tex_0017B0 "__OTR__objects/object_zl4/object_zl4Tex_0017B0"
-static const ALIGN_ASSET(2) char object_zl4Tex_0017B0[] = dobject_zl4Tex_0017B0;
-
-#define dobject_zl4Tex_0016B0 "__OTR__objects/object_zl4/object_zl4Tex_0016B0"
-static const ALIGN_ASSET(2) char object_zl4Tex_0016B0[] = dobject_zl4Tex_0016B0;
-
-#define dobject_zl4Tex_001BF0 "__OTR__objects/object_zl4/object_zl4Tex_001BF0"
-static const ALIGN_ASSET(2) char object_zl4Tex_001BF0[] = dobject_zl4Tex_001BF0;
-
-#define dobject_zl4Tex_001CF0 "__OTR__objects/object_zl4/object_zl4Tex_001CF0"
-static const ALIGN_ASSET(2) char object_zl4Tex_001CF0[] = dobject_zl4Tex_001CF0;
-
-#define dobject_zl4Tex_001DF0 "__OTR__objects/object_zl4/object_zl4Tex_001DF0"
-static const ALIGN_ASSET(2) char object_zl4Tex_001DF0[] = dobject_zl4Tex_001DF0;
-
-#define dobject_zl4Tex_00D8B8 "__OTR__objects/object_zl4/object_zl4Tex_00D8B8"
-static const ALIGN_ASSET(2) char object_zl4Tex_00D8B8[] = dobject_zl4Tex_00D8B8;
-
 #define dgChildZeldaSkelLimbsLimb_00DF34DL_00C8D0 "__OTR__objects/object_zl4/gChildZeldaSkelLimbsLimb_00DF34DL_00C8D0"
 static const ALIGN_ASSET(2) char gChildZeldaSkelLimbsLimb_00DF34DL_00C8D0[] = dgChildZeldaSkelLimbsLimb_00DF34DL_00C8D0;
 
@@ -213,76 +285,5 @@ static const ALIGN_ASSET(2) char gChildZeldaSkelLimbsLimb_00DFDCDL_00BC90[] = dg
 #define dgChildZeldaSkelLimbsLimb_00DFE8DL_00AFC8 "__OTR__objects/object_zl4/gChildZeldaSkelLimbsLimb_00DFE8DL_00AFC8"
 static const ALIGN_ASSET(2) char gChildZeldaSkelLimbsLimb_00DFE8DL_00AFC8[] = dgChildZeldaSkelLimbsLimb_00DFE8DL_00AFC8;
 
-#define dobject_zl4Tex_000C70 "__OTR__objects/object_zl4/object_zl4Tex_000C70"
-static const ALIGN_ASSET(2) char object_zl4Tex_000C70[] = dobject_zl4Tex_000C70;
-
-#define dobject_zl4Tex_000CB0 "__OTR__objects/object_zl4/object_zl4Tex_000CB0"
-static const ALIGN_ASSET(2) char object_zl4Tex_000CB0[] = dobject_zl4Tex_000CB0;
-
-#define dobject_zl4Tex_000DB0 "__OTR__objects/object_zl4/object_zl4Tex_000DB0"
-static const ALIGN_ASSET(2) char object_zl4Tex_000DB0[] = dobject_zl4Tex_000DB0;
-
-#define dobject_zl4Tex_0017F0 "__OTR__objects/object_zl4/object_zl4Tex_0017F0"
-static const ALIGN_ASSET(2) char object_zl4Tex_0017F0[] = dobject_zl4Tex_0017F0;
-
-#define dobject_zl4Tex_0015B0 "__OTR__objects/object_zl4/object_zl4Tex_0015B0"
-static const ALIGN_ASSET(2) char object_zl4Tex_0015B0[] = dobject_zl4Tex_0015B0;
-
-#define dobject_zl4Tex_001630 "__OTR__objects/object_zl4/object_zl4Tex_001630"
-static const ALIGN_ASSET(2) char object_zl4Tex_001630[] = dobject_zl4Tex_001630;
-
-#define dobject_zl4Tex_0028F0 "__OTR__objects/object_zl4/object_zl4Tex_0028F0"
-static const ALIGN_ASSET(2) char object_zl4Tex_0028F0[] = dobject_zl4Tex_0028F0;
-
-#define dobject_zl4Tex_0059F0 "__OTR__objects/object_zl4/object_zl4Tex_0059F0"
-static const ALIGN_ASSET(2) char object_zl4Tex_0059F0[] = dobject_zl4Tex_0059F0;
-
-#define dobject_zl4Tex_005CB0 "__OTR__objects/object_zl4/object_zl4Tex_005CB0"
-static const ALIGN_ASSET(2) char object_zl4Tex_005CB0[] = dobject_zl4Tex_005CB0;
-
-#define dobject_zl4Tex_005DB0 "__OTR__objects/object_zl4/object_zl4Tex_005DB0"
-static const ALIGN_ASSET(2) char object_zl4Tex_005DB0[] = dobject_zl4Tex_005DB0;
-
-#define dobject_zl4Tex_005A70 "__OTR__objects/object_zl4/object_zl4Tex_005A70"
-static const ALIGN_ASSET(2) char object_zl4Tex_005A70[] = dobject_zl4Tex_005A70;
-
-#define dobject_zl4Tex_005C70 "__OTR__objects/object_zl4/object_zl4Tex_005C70"
-static const ALIGN_ASSET(2) char object_zl4Tex_005C70[] = dobject_zl4Tex_005C70;
-
-#define dobject_zl4Tex_0058F0 "__OTR__objects/object_zl4/object_zl4Tex_0058F0"
-static const ALIGN_ASSET(2) char object_zl4Tex_0058F0[] = dobject_zl4Tex_0058F0;
-
-#define dobject_zl4Tex_0056F0 "__OTR__objects/object_zl4/object_zl4Tex_0056F0"
-static const ALIGN_ASSET(2) char object_zl4Tex_0056F0[] = dobject_zl4Tex_0056F0;
-
-#define dobject_zl4Tex_001E30 "__OTR__objects/object_zl4/object_zl4Tex_001E30"
-static const ALIGN_ASSET(2) char object_zl4Tex_001E30[] = dobject_zl4Tex_001E30;
-
-#define dobject_zl4Tex_002230 "__OTR__objects/object_zl4/object_zl4Tex_002230"
-static const ALIGN_ASSET(2) char object_zl4Tex_002230[] = dobject_zl4Tex_002230;
-
-#define dobject_zl4Tex_002270 "__OTR__objects/object_zl4/object_zl4Tex_002270"
-static const ALIGN_ASSET(2) char object_zl4Tex_002270[] = dobject_zl4Tex_002270;
-
-#define dobject_zl4Tex_0022F0 "__OTR__objects/object_zl4/object_zl4Tex_0022F0"
-static const ALIGN_ASSET(2) char object_zl4Tex_0022F0[] = dobject_zl4Tex_0022F0;
-
-#define dobject_zl4Tex_0024F0 "__OTR__objects/object_zl4/object_zl4Tex_0024F0"
-static const ALIGN_ASSET(2) char object_zl4Tex_0024F0[] = dobject_zl4Tex_0024F0;
-
-#define dobject_zl4Tex_0026F0 "__OTR__objects/object_zl4/object_zl4Tex_0026F0"
-static const ALIGN_ASSET(2) char object_zl4Tex_0026F0[] = dobject_zl4Tex_0026F0;
-
-#define dobject_zl4Tex_002970 "__OTR__objects/object_zl4/object_zl4Tex_002970"
-static const ALIGN_ASSET(2) char object_zl4Tex_002970[] = dobject_zl4Tex_002970;
-
-#define dobject_zl4Tex_0029F0 "__OTR__objects/object_zl4/object_zl4Tex_0029F0"
-static const ALIGN_ASSET(2) char object_zl4Tex_0029F0[] = dobject_zl4Tex_0029F0;
-
-#define dobject_zl4TLUT_000870 "__OTR__objects/object_zl4/object_zl4TLUT_000870"
-static const ALIGN_ASSET(2) char object_zl4TLUT_000870[] = dobject_zl4TLUT_000870;
-
-#define dobject_zl4TLUT_000A70 "__OTR__objects/object_zl4/object_zl4TLUT_000A70"
-static const ALIGN_ASSET(2) char object_zl4TLUT_000A70[] = dobject_zl4TLUT_000A70;
 
 #endif // OBJECTS_OBJECT_ZL4_H
diff --git a/soh/assets/overlays/ovl_Boss_Ganon/ovl_Boss_Ganon.h b/soh/assets/overlays/ovl_Boss_Ganon/ovl_Boss_Ganon.h
index fcca66ac5..39f06f431 100644
--- a/soh/assets/overlays/ovl_Boss_Ganon/ovl_Boss_Ganon.h
+++ b/soh/assets/overlays/ovl_Boss_Ganon/ovl_Boss_Ganon.h
@@ -3,6 +3,54 @@
 
 #include "align_asset_macro.h"
 
+#define dovl_Boss_GanonTex_00E748 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_00E748"
+static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_00E748[] = dovl_Boss_GanonTex_00E748;
+
+#define dovl_Boss_GanonTex_00F848 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_00F848"
+static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_00F848[] = dovl_Boss_GanonTex_00F848;
+
+#define dovl_Boss_GanonTex_010538 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_010538"
+static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_010538[] = dovl_Boss_GanonTex_010538;
+
+#define dovl_Boss_GanonTex_01A7B0 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01A7B0"
+static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01A7B0[] = dovl_Boss_GanonTex_01A7B0;
+
+#define dovl_Boss_GanonTex_01AFB0 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01AFB0"
+static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01AFB0[] = dovl_Boss_GanonTex_01AFB0;
+
+#define dovl_Boss_GanonTex_01B7B0 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01B7B0"
+static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01B7B0[] = dovl_Boss_GanonTex_01B7B0;
+
+#define dovl_Boss_GanonTex_01C420 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01C420"
+static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01C420[] = dovl_Boss_GanonTex_01C420;
+
+#define dovl_Boss_GanonTex_01CEB8 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01CEB8"
+static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01CEB8[] = dovl_Boss_GanonTex_01CEB8;
+
+#define dovl_Boss_GanonTex_01D6B8 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01D6B8"
+static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01D6B8[] = dovl_Boss_GanonTex_01D6B8;
+
+#define dovl_Boss_GanonTex_01DE88 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01DE88"
+static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01DE88[] = dovl_Boss_GanonTex_01DE88;
+
+#define dovl_Boss_GanonTex_01E688 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01E688"
+static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01E688[] = dovl_Boss_GanonTex_01E688;
+
+#define dovl_Boss_GanonTex_01EF90 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01EF90"
+static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01EF90[] = dovl_Boss_GanonTex_01EF90;
+
+#define dovl_Boss_GanonTex_01FFF8 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01FFF8"
+static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01FFF8[] = dovl_Boss_GanonTex_01FFF8;
+
+#define dovl_Boss_GanonTex_020370 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_020370"
+static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_020370[] = dovl_Boss_GanonTex_020370;
+
+#define dovl_Boss_GanonTex_020770 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_020770"
+static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_020770[] = dovl_Boss_GanonTex_020770;
+
+#define dovl_Boss_GanonTLUT_00F808 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTLUT_00F808"
+static const ALIGN_ASSET(2) char ovl_Boss_GanonTLUT_00F808[] = dovl_Boss_GanonTLUT_00F808;
+
 #define dgGanondorfLightning1Tex "__OTR__overlays/ovl_Boss_Ganon/gGanondorfLightning1Tex"
 static const ALIGN_ASSET(2) char gGanondorfLightning1Tex[] = dgGanondorfLightning1Tex;
 
@@ -138,52 +186,4 @@ static const ALIGN_ASSET(2) char gGanondorfShockDL[] = dgGanondorfShockDL;
 #define dgGanondorfVortexDL "__OTR__overlays/ovl_Boss_Ganon/gGanondorfVortexDL"
 static const ALIGN_ASSET(2) char gGanondorfVortexDL[] = dgGanondorfVortexDL;
 
-#define dovl_Boss_GanonTex_01EF90 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01EF90"
-static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01EF90[] = dovl_Boss_GanonTex_01EF90;
-
-#define dovl_Boss_GanonTex_00E748 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_00E748"
-static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_00E748[] = dovl_Boss_GanonTex_00E748;
-
-#define dovl_Boss_GanonTex_00F848 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_00F848"
-static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_00F848[] = dovl_Boss_GanonTex_00F848;
-
-#define dovl_Boss_GanonTLUT_00F808 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTLUT_00F808"
-static const ALIGN_ASSET(2) char ovl_Boss_GanonTLUT_00F808[] = dovl_Boss_GanonTLUT_00F808;
-
-#define dovl_Boss_GanonTex_010538 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_010538"
-static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_010538[] = dovl_Boss_GanonTex_010538;
-
-#define dovl_Boss_GanonTex_01B7B0 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01B7B0"
-static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01B7B0[] = dovl_Boss_GanonTex_01B7B0;
-
-#define dovl_Boss_GanonTex_01A7B0 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01A7B0"
-static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01A7B0[] = dovl_Boss_GanonTex_01A7B0;
-
-#define dovl_Boss_GanonTex_01AFB0 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01AFB0"
-static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01AFB0[] = dovl_Boss_GanonTex_01AFB0;
-
-#define dovl_Boss_GanonTex_01C420 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01C420"
-static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01C420[] = dovl_Boss_GanonTex_01C420;
-
-#define dovl_Boss_GanonTex_01CEB8 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01CEB8"
-static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01CEB8[] = dovl_Boss_GanonTex_01CEB8;
-
-#define dovl_Boss_GanonTex_01D6B8 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01D6B8"
-static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01D6B8[] = dovl_Boss_GanonTex_01D6B8;
-
-#define dovl_Boss_GanonTex_01DE88 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01DE88"
-static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01DE88[] = dovl_Boss_GanonTex_01DE88;
-
-#define dovl_Boss_GanonTex_01E688 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01E688"
-static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01E688[] = dovl_Boss_GanonTex_01E688;
-
-#define dovl_Boss_GanonTex_01FFF8 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_01FFF8"
-static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_01FFF8[] = dovl_Boss_GanonTex_01FFF8;
-
-#define dovl_Boss_GanonTex_020370 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_020370"
-static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_020370[] = dovl_Boss_GanonTex_020370;
-
-#define dovl_Boss_GanonTex_020770 "__OTR__overlays/ovl_Boss_Ganon/ovl_Boss_GanonTex_020770"
-static const ALIGN_ASSET(2) char ovl_Boss_GanonTex_020770[] = dovl_Boss_GanonTex_020770;
-
 #endif // OVERLAYS_OVL_BOSS_GANON_H
diff --git a/soh/assets/overlays/ovl_Boss_Sst/ovl_Boss_Sst.h b/soh/assets/overlays/ovl_Boss_Sst/ovl_Boss_Sst.h
index cda7d6c88..47667cd51 100644
--- a/soh/assets/overlays/ovl_Boss_Sst/ovl_Boss_Sst.h
+++ b/soh/assets/overlays/ovl_Boss_Sst/ovl_Boss_Sst.h
@@ -3,6 +3,12 @@
 
 #include "align_asset_macro.h"
 
+#define dovl_Boss_SstTex_00A438 "__OTR__overlays/ovl_Boss_Sst/ovl_Boss_SstTex_00A438"
+static const ALIGN_ASSET(2) char ovl_Boss_SstTex_00A438[] = dovl_Boss_SstTex_00A438;
+
+#define dovl_Boss_SstTex_00A8F0 "__OTR__overlays/ovl_Boss_Sst/ovl_Boss_SstTex_00A8F0"
+static const ALIGN_ASSET(2) char ovl_Boss_SstTex_00A8F0[] = dovl_Boss_SstTex_00A8F0;
+
 #define dsBodyStaticDList "__OTR__overlays/ovl_Boss_Sst/sBodyStaticDList"
 static const ALIGN_ASSET(2) char sBodyStaticDList[] = dsBodyStaticDList;
 
@@ -15,10 +21,4 @@ static const ALIGN_ASSET(2) char sIntroVanishDList[] = dsIntroVanishDList;
 #define dsShadowDList "__OTR__overlays/ovl_Boss_Sst/sShadowDList"
 static const ALIGN_ASSET(2) char sShadowDList[] = dsShadowDList;
 
-#define dovl_Boss_SstTex_00A438 "__OTR__overlays/ovl_Boss_Sst/ovl_Boss_SstTex_00A438"
-static const ALIGN_ASSET(2) char ovl_Boss_SstTex_00A438[] = dovl_Boss_SstTex_00A438;
-
-#define dovl_Boss_SstTex_00A8F0 "__OTR__overlays/ovl_Boss_Sst/ovl_Boss_SstTex_00A8F0"
-static const ALIGN_ASSET(2) char ovl_Boss_SstTex_00A8F0[] = dovl_Boss_SstTex_00A8F0;
-
 #endif // OVERLAYS_OVL_BOSS_SST_H
diff --git a/soh/assets/overlays/ovl_Demo_Shd/ovl_Demo_Shd.h b/soh/assets/overlays/ovl_Demo_Shd/ovl_Demo_Shd.h
index 1c0057530..e23433e72 100644
--- a/soh/assets/overlays/ovl_Demo_Shd/ovl_Demo_Shd.h
+++ b/soh/assets/overlays/ovl_Demo_Shd/ovl_Demo_Shd.h
@@ -3,6 +3,12 @@
 
 #include "align_asset_macro.h"
 
+#define dovl_Demo_ShdTex_000450 "__OTR__overlays/ovl_Demo_Shd/ovl_Demo_ShdTex_000450"
+static const ALIGN_ASSET(2) char ovl_Demo_ShdTex_000450[] = dovl_Demo_ShdTex_000450;
+
+#define dovl_Demo_ShdTex_000C50 "__OTR__overlays/ovl_Demo_Shd/ovl_Demo_ShdTex_000C50"
+static const ALIGN_ASSET(2) char ovl_Demo_ShdTex_000C50[] = dovl_Demo_ShdTex_000C50;
+
 #define dD_809932D0 "__OTR__overlays/ovl_Demo_Shd/D_809932D0"
 static const ALIGN_ASSET(2) char D_809932D0[] = dD_809932D0;
 
@@ -12,10 +18,4 @@ static const ALIGN_ASSET(2) char D_80993390[] = dD_80993390;
 #define dD_809934B8 "__OTR__overlays/ovl_Demo_Shd/D_809934B8"
 static const ALIGN_ASSET(2) char D_809934B8[] = dD_809934B8;
 
-#define dovl_Demo_ShdTex_000450 "__OTR__overlays/ovl_Demo_Shd/ovl_Demo_ShdTex_000450"
-static const ALIGN_ASSET(2) char ovl_Demo_ShdTex_000450[] = dovl_Demo_ShdTex_000450;
-
-#define dovl_Demo_ShdTex_000C50 "__OTR__overlays/ovl_Demo_Shd/ovl_Demo_ShdTex_000C50"
-static const ALIGN_ASSET(2) char ovl_Demo_ShdTex_000C50[] = dovl_Demo_ShdTex_000C50;
-
 #endif // OVERLAYS_OVL_DEMO_SHD_H
diff --git a/soh/assets/overlays/ovl_En_Clear_Tag/ovl_En_Clear_Tag.h b/soh/assets/overlays/ovl_En_Clear_Tag/ovl_En_Clear_Tag.h
index f45fb8da3..d34eb8634 100644
--- a/soh/assets/overlays/ovl_En_Clear_Tag/ovl_En_Clear_Tag.h
+++ b/soh/assets/overlays/ovl_En_Clear_Tag/ovl_En_Clear_Tag.h
@@ -3,6 +3,48 @@
 
 #include "align_asset_macro.h"
 
+#define dovl_En_Clear_TagTex_003308 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_003308"
+static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_003308[] = dovl_En_Clear_TagTex_003308;
+
+#define dovl_En_Clear_TagTex_003388 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_003388"
+static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_003388[] = dovl_En_Clear_TagTex_003388;
+
+#define dovl_En_Clear_TagTex_003B88 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_003B88"
+static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_003B88[] = dovl_En_Clear_TagTex_003B88;
+
+#define dovl_En_Clear_TagTex_004B88 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_004B88"
+static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_004B88[] = dovl_En_Clear_TagTex_004B88;
+
+#define dovl_En_Clear_TagTex_005388 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_005388"
+static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_005388[] = dovl_En_Clear_TagTex_005388;
+
+#define dovl_En_Clear_TagTex_005B88 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_005B88"
+static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_005B88[] = dovl_En_Clear_TagTex_005B88;
+
+#define dovl_En_Clear_TagTex_006458 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_006458"
+static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_006458[] = dovl_En_Clear_TagTex_006458;
+
+#define dovl_En_Clear_TagTex_006708 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_006708"
+static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_006708[] = dovl_En_Clear_TagTex_006708;
+
+#define dovl_En_Clear_TagTex_006808 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_006808"
+static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_006808[] = dovl_En_Clear_TagTex_006808;
+
+#define dovl_En_Clear_TagTex_006AD0 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_006AD0"
+static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_006AD0[] = dovl_En_Clear_TagTex_006AD0;
+
+#define dovl_En_Clear_TagTex_006ED0 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_006ED0"
+static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_006ED0[] = dovl_En_Clear_TagTex_006ED0;
+
+#define dovl_En_Clear_TagTex_0071C8 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_0071C8"
+static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_0071C8[] = dovl_En_Clear_TagTex_0071C8;
+
+#define dovl_En_Clear_TagTex_008288 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_008288"
+static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_008288[] = dovl_En_Clear_TagTex_008288;
+
+#define dovl_En_Clear_TagTex_008540 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_008540"
+static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_008540[] = dovl_En_Clear_TagTex_008540;
+
 #define dgArwingDL "__OTR__overlays/ovl_En_Clear_Tag/gArwingDL"
 static const ALIGN_ASSET(2) char gArwingDL[] = dgArwingDL;
 
@@ -33,46 +75,4 @@ static const ALIGN_ASSET(2) char gArwingFlashEffectGroundDL[] = dgArwingFlashEff
 #define dgArwingShadowDL "__OTR__overlays/ovl_En_Clear_Tag/gArwingShadowDL"
 static const ALIGN_ASSET(2) char gArwingShadowDL[] = dgArwingShadowDL;
 
-#define dovl_En_Clear_TagTex_003B88 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_003B88"
-static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_003B88[] = dovl_En_Clear_TagTex_003B88;
-
-#define dovl_En_Clear_TagTex_004B88 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_004B88"
-static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_004B88[] = dovl_En_Clear_TagTex_004B88;
-
-#define dovl_En_Clear_TagTex_003388 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_003388"
-static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_003388[] = dovl_En_Clear_TagTex_003388;
-
-#define dovl_En_Clear_TagTex_005388 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_005388"
-static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_005388[] = dovl_En_Clear_TagTex_005388;
-
-#define dovl_En_Clear_TagTex_005B88 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_005B88"
-static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_005B88[] = dovl_En_Clear_TagTex_005B88;
-
-#define dovl_En_Clear_TagTex_003308 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_003308"
-static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_003308[] = dovl_En_Clear_TagTex_003308;
-
-#define dovl_En_Clear_TagTex_006458 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_006458"
-static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_006458[] = dovl_En_Clear_TagTex_006458;
-
-#define dovl_En_Clear_TagTex_006708 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_006708"
-static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_006708[] = dovl_En_Clear_TagTex_006708;
-
-#define dovl_En_Clear_TagTex_006808 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_006808"
-static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_006808[] = dovl_En_Clear_TagTex_006808;
-
-#define dovl_En_Clear_TagTex_006AD0 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_006AD0"
-static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_006AD0[] = dovl_En_Clear_TagTex_006AD0;
-
-#define dovl_En_Clear_TagTex_006ED0 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_006ED0"
-static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_006ED0[] = dovl_En_Clear_TagTex_006ED0;
-
-#define dovl_En_Clear_TagTex_0071C8 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_0071C8"
-static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_0071C8[] = dovl_En_Clear_TagTex_0071C8;
-
-#define dovl_En_Clear_TagTex_008288 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_008288"
-static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_008288[] = dovl_En_Clear_TagTex_008288;
-
-#define dovl_En_Clear_TagTex_008540 "__OTR__overlays/ovl_En_Clear_Tag/ovl_En_Clear_TagTex_008540"
-static const ALIGN_ASSET(2) char ovl_En_Clear_TagTex_008540[] = dovl_En_Clear_TagTex_008540;
-
 #endif // OVERLAYS_OVL_EN_CLEAR_TAG_H
diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_0.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_0.h
index 11c516005..3bc61bac8 100644
--- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_0.h
+++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_0.h
@@ -3,29 +3,20 @@
 
 #include "align_asset_macro.h"
 
-#define dBmori1_room_0DL_005CC8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0DL_005CC8"
-static const ALIGN_ASSET(2) char Bmori1_room_0DL_005CC8[] = dBmori1_room_0DL_005CC8;
-
-#define dBmori1_room_0Tex_00B0F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_00B0F8"
-static const ALIGN_ASSET(2) char Bmori1_room_0Tex_00B0F8[] = dBmori1_room_0Tex_00B0F8;
-
-#define dBmori1_room_0Tex_00C2F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_00C2F8"
-static const ALIGN_ASSET(2) char Bmori1_room_0Tex_00C2F8[] = dBmori1_room_0Tex_00C2F8;
-
-#define dBmori1_room_0Tex_00C0F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_00C0F8"
-static const ALIGN_ASSET(2) char Bmori1_room_0Tex_00C0F8[] = dBmori1_room_0Tex_00C0F8;
-
-#define dBmori1_room_0Tex_00B8F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_00B8F8"
-static const ALIGN_ASSET(2) char Bmori1_room_0Tex_00B8F8[] = dBmori1_room_0Tex_00B8F8;
-
-#define dBmori1_room_0Tex_0084F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_0084F8"
-static const ALIGN_ASSET(2) char Bmori1_room_0Tex_0084F8[] = dBmori1_room_0Tex_0084F8;
-
 #define dBmori1_room_0Tex_005CF8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_005CF8"
 static const ALIGN_ASSET(2) char Bmori1_room_0Tex_005CF8[] = dBmori1_room_0Tex_005CF8;
 
-#define dBmori1_room_0Tex_00A0F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_00A0F8"
-static const ALIGN_ASSET(2) char Bmori1_room_0Tex_00A0F8[] = dBmori1_room_0Tex_00A0F8;
+#define dBmori1_room_0Tex_0064F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_0064F8"
+static const ALIGN_ASSET(2) char Bmori1_room_0Tex_0064F8[] = dBmori1_room_0Tex_0064F8;
+
+#define dBmori1_room_0Tex_0074F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_0074F8"
+static const ALIGN_ASSET(2) char Bmori1_room_0Tex_0074F8[] = dBmori1_room_0Tex_0074F8;
+
+#define dBmori1_room_0Tex_007CF8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_007CF8"
+static const ALIGN_ASSET(2) char Bmori1_room_0Tex_007CF8[] = dBmori1_room_0Tex_007CF8;
+
+#define dBmori1_room_0Tex_0084F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_0084F8"
+static const ALIGN_ASSET(2) char Bmori1_room_0Tex_0084F8[] = dBmori1_room_0Tex_0084F8;
 
 #define dBmori1_room_0Tex_0088F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_0088F8"
 static const ALIGN_ASSET(2) char Bmori1_room_0Tex_0088F8[] = dBmori1_room_0Tex_0088F8;
@@ -33,23 +24,32 @@ static const ALIGN_ASSET(2) char Bmori1_room_0Tex_0088F8[] = dBmori1_room_0Tex_0
 #define dBmori1_room_0Tex_0098F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_0098F8"
 static const ALIGN_ASSET(2) char Bmori1_room_0Tex_0098F8[] = dBmori1_room_0Tex_0098F8;
 
+#define dBmori1_room_0Tex_00A0F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_00A0F8"
+static const ALIGN_ASSET(2) char Bmori1_room_0Tex_00A0F8[] = dBmori1_room_0Tex_00A0F8;
+
+#define dBmori1_room_0Tex_00B0F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_00B0F8"
+static const ALIGN_ASSET(2) char Bmori1_room_0Tex_00B0F8[] = dBmori1_room_0Tex_00B0F8;
+
 #define dBmori1_room_0Tex_00B4F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_00B4F8"
 static const ALIGN_ASSET(2) char Bmori1_room_0Tex_00B4F8[] = dBmori1_room_0Tex_00B4F8;
 
-#define dBmori1_room_0Tex_007CF8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_007CF8"
-static const ALIGN_ASSET(2) char Bmori1_room_0Tex_007CF8[] = dBmori1_room_0Tex_007CF8;
+#define dBmori1_room_0Tex_00B8F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_00B8F8"
+static const ALIGN_ASSET(2) char Bmori1_room_0Tex_00B8F8[] = dBmori1_room_0Tex_00B8F8;
 
-#define dBmori1_room_0Tex_0074F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_0074F8"
-static const ALIGN_ASSET(2) char Bmori1_room_0Tex_0074F8[] = dBmori1_room_0Tex_0074F8;
+#define dBmori1_room_0Tex_00C0F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_00C0F8"
+static const ALIGN_ASSET(2) char Bmori1_room_0Tex_00C0F8[] = dBmori1_room_0Tex_00C0F8;
 
-#define dBmori1_room_0Tex_0064F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_0064F8"
-static const ALIGN_ASSET(2) char Bmori1_room_0Tex_0064F8[] = dBmori1_room_0Tex_0064F8;
-
-#define dBmori1_room_0DL_00CB70 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0DL_00CB70"
-static const ALIGN_ASSET(2) char Bmori1_room_0DL_00CB70[] = dBmori1_room_0DL_00CB70;
+#define dBmori1_room_0Tex_00C2F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_00C2F8"
+static const ALIGN_ASSET(2) char Bmori1_room_0Tex_00C2F8[] = dBmori1_room_0Tex_00C2F8;
 
 #define dBmori1_room_0Tex_00CB88 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0Tex_00CB88"
 static const ALIGN_ASSET(2) char Bmori1_room_0Tex_00CB88[] = dBmori1_room_0Tex_00CB88;
 
+#define dBmori1_room_0DL_005CC8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0DL_005CC8"
+static const ALIGN_ASSET(2) char Bmori1_room_0DL_005CC8[] = dBmori1_room_0DL_005CC8;
+
+#define dBmori1_room_0DL_00CB70 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_0DL_00CB70"
+static const ALIGN_ASSET(2) char Bmori1_room_0DL_00CB70[] = dBmori1_room_0DL_00CB70;
+
 
 #endif // DUNGEONS_BMORI1_ROOM_0_H
diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_1.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_1.h
index 171ddf755..1afb24f95 100644
--- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_1.h
+++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_1.h
@@ -3,20 +3,20 @@
 
 #include "align_asset_macro.h"
 
-#define dBmori1_room_1DL_003350 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_1DL_003350"
-static const ALIGN_ASSET(2) char Bmori1_room_1DL_003350[] = dBmori1_room_1DL_003350;
+#define dBmori1_room_1Tex_003368 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_1Tex_003368"
+static const ALIGN_ASSET(2) char Bmori1_room_1Tex_003368[] = dBmori1_room_1Tex_003368;
 
 #define dBmori1_room_1Tex_003B68 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_1Tex_003B68"
 static const ALIGN_ASSET(2) char Bmori1_room_1Tex_003B68[] = dBmori1_room_1Tex_003B68;
 
-#define dBmori1_room_1Tex_003368 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_1Tex_003368"
-static const ALIGN_ASSET(2) char Bmori1_room_1Tex_003368[] = dBmori1_room_1Tex_003368;
+#define dBmori1_room_1Tex_004368 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_1Tex_004368"
+static const ALIGN_ASSET(2) char Bmori1_room_1Tex_004368[] = dBmori1_room_1Tex_004368;
 
 #define dBmori1_room_1Tex_005368 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_1Tex_005368"
 static const ALIGN_ASSET(2) char Bmori1_room_1Tex_005368[] = dBmori1_room_1Tex_005368;
 
-#define dBmori1_room_1Tex_004368 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_1Tex_004368"
-static const ALIGN_ASSET(2) char Bmori1_room_1Tex_004368[] = dBmori1_room_1Tex_004368;
+#define dBmori1_room_1DL_003350 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_1DL_003350"
+static const ALIGN_ASSET(2) char Bmori1_room_1DL_003350[] = dBmori1_room_1DL_003350;
 
 
 #endif // DUNGEONS_BMORI1_ROOM_1_H
diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_10.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_10.h
index 03c8a5410..c35a128ae 100644
--- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_10.h
+++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_10.h
@@ -3,17 +3,14 @@
 
 #include "align_asset_macro.h"
 
-#define dBmori1_room_10DL_001248 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_10DL_001248"
-static const ALIGN_ASSET(2) char Bmori1_room_10DL_001248[] = dBmori1_room_10DL_001248;
-
-#define dBmori1_room_10Tex_002260 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_10Tex_002260"
-static const ALIGN_ASSET(2) char Bmori1_room_10Tex_002260[] = dBmori1_room_10Tex_002260;
+#define dBmori1_room_10Tex_001260 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_10Tex_001260"
+static const ALIGN_ASSET(2) char Bmori1_room_10Tex_001260[] = dBmori1_room_10Tex_001260;
 
 #define dBmori1_room_10Tex_001A60 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_10Tex_001A60"
 static const ALIGN_ASSET(2) char Bmori1_room_10Tex_001A60[] = dBmori1_room_10Tex_001A60;
 
-#define dBmori1_room_10Tex_001260 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_10Tex_001260"
-static const ALIGN_ASSET(2) char Bmori1_room_10Tex_001260[] = dBmori1_room_10Tex_001260;
+#define dBmori1_room_10Tex_002260 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_10Tex_002260"
+static const ALIGN_ASSET(2) char Bmori1_room_10Tex_002260[] = dBmori1_room_10Tex_002260;
 
 #define dBmori1_room_10Tex_002A60 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_10Tex_002A60"
 static const ALIGN_ASSET(2) char Bmori1_room_10Tex_002A60[] = dBmori1_room_10Tex_002A60;
@@ -21,11 +18,14 @@ static const ALIGN_ASSET(2) char Bmori1_room_10Tex_002A60[] = dBmori1_room_10Tex
 #define dBmori1_room_10Tex_003A60 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_10Tex_003A60"
 static const ALIGN_ASSET(2) char Bmori1_room_10Tex_003A60[] = dBmori1_room_10Tex_003A60;
 
-#define dBmori1_room_10DL_004BC8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_10DL_004BC8"
-static const ALIGN_ASSET(2) char Bmori1_room_10DL_004BC8[] = dBmori1_room_10DL_004BC8;
-
 #define dBmori1_room_10Tex_004BD8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_10Tex_004BD8"
 static const ALIGN_ASSET(2) char Bmori1_room_10Tex_004BD8[] = dBmori1_room_10Tex_004BD8;
 
+#define dBmori1_room_10DL_001248 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_10DL_001248"
+static const ALIGN_ASSET(2) char Bmori1_room_10DL_001248[] = dBmori1_room_10DL_001248;
+
+#define dBmori1_room_10DL_004BC8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_10DL_004BC8"
+static const ALIGN_ASSET(2) char Bmori1_room_10DL_004BC8[] = dBmori1_room_10DL_004BC8;
+
 
 #endif // DUNGEONS_BMORI1_ROOM_10_H
diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_11.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_11.h
index ba6073a21..ed832b5b5 100644
--- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_11.h
+++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_11.h
@@ -3,11 +3,11 @@
 
 #include "align_asset_macro.h"
 
-#define dBmori1_room_11DL_008158 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_11DL_008158"
-static const ALIGN_ASSET(2) char Bmori1_room_11DL_008158[] = dBmori1_room_11DL_008158;
+#define dBmori1_room_11Tex_008198 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_11Tex_008198"
+static const ALIGN_ASSET(2) char Bmori1_room_11Tex_008198[] = dBmori1_room_11Tex_008198;
 
-#define dBmori1_room_11Tex_00A598 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_11Tex_00A598"
-static const ALIGN_ASSET(2) char Bmori1_room_11Tex_00A598[] = dBmori1_room_11Tex_00A598;
+#define dBmori1_room_11Tex_009198 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_11Tex_009198"
+static const ALIGN_ASSET(2) char Bmori1_room_11Tex_009198[] = dBmori1_room_11Tex_009198;
 
 #define dBmori1_room_11Tex_009598 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_11Tex_009598"
 static const ALIGN_ASSET(2) char Bmori1_room_11Tex_009598[] = dBmori1_room_11Tex_009598;
@@ -15,11 +15,11 @@ static const ALIGN_ASSET(2) char Bmori1_room_11Tex_009598[] = dBmori1_room_11Tex
 #define dBmori1_room_11Tex_009D98 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_11Tex_009D98"
 static const ALIGN_ASSET(2) char Bmori1_room_11Tex_009D98[] = dBmori1_room_11Tex_009D98;
 
-#define dBmori1_room_11Tex_009198 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_11Tex_009198"
-static const ALIGN_ASSET(2) char Bmori1_room_11Tex_009198[] = dBmori1_room_11Tex_009198;
+#define dBmori1_room_11Tex_00A598 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_11Tex_00A598"
+static const ALIGN_ASSET(2) char Bmori1_room_11Tex_00A598[] = dBmori1_room_11Tex_00A598;
 
-#define dBmori1_room_11Tex_008198 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_11Tex_008198"
-static const ALIGN_ASSET(2) char Bmori1_room_11Tex_008198[] = dBmori1_room_11Tex_008198;
+#define dBmori1_room_11DL_008158 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_11DL_008158"
+static const ALIGN_ASSET(2) char Bmori1_room_11DL_008158[] = dBmori1_room_11DL_008158;
 
 #define dBmori1_room_11DL_00ABD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_11DL_00ABD0"
 static const ALIGN_ASSET(2) char Bmori1_room_11DL_00ABD0[] = dBmori1_room_11DL_00ABD0;
diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_12.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_12.h
index 79e268611..b174b2eca 100644
--- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_12.h
+++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_12.h
@@ -3,35 +3,35 @@
 
 #include "align_asset_macro.h"
 
-#define dBmori1_room_12DL_0049E8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12DL_0049E8"
-static const ALIGN_ASSET(2) char Bmori1_room_12DL_0049E8[] = dBmori1_room_12DL_0049E8;
-
-#define dBmori1_room_12Tex_006600 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12Tex_006600"
-static const ALIGN_ASSET(2) char Bmori1_room_12Tex_006600[] = dBmori1_room_12Tex_006600;
-
-#define dBmori1_room_12Tex_005E00 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12Tex_005E00"
-static const ALIGN_ASSET(2) char Bmori1_room_12Tex_005E00[] = dBmori1_room_12Tex_005E00;
-
-#define dBmori1_room_12Tex_005600 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12Tex_005600"
-static const ALIGN_ASSET(2) char Bmori1_room_12Tex_005600[] = dBmori1_room_12Tex_005600;
-
-#define dBmori1_room_12Tex_006E00 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12Tex_006E00"
-static const ALIGN_ASSET(2) char Bmori1_room_12Tex_006E00[] = dBmori1_room_12Tex_006E00;
+#define dBmori1_room_12Tex_004A00 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12Tex_004A00"
+static const ALIGN_ASSET(2) char Bmori1_room_12Tex_004A00[] = dBmori1_room_12Tex_004A00;
 
 #define dBmori1_room_12Tex_004E00 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12Tex_004E00"
 static const ALIGN_ASSET(2) char Bmori1_room_12Tex_004E00[] = dBmori1_room_12Tex_004E00;
 
-#define dBmori1_room_12Tex_004A00 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12Tex_004A00"
-static const ALIGN_ASSET(2) char Bmori1_room_12Tex_004A00[] = dBmori1_room_12Tex_004A00;
+#define dBmori1_room_12Tex_005600 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12Tex_005600"
+static const ALIGN_ASSET(2) char Bmori1_room_12Tex_005600[] = dBmori1_room_12Tex_005600;
+
+#define dBmori1_room_12Tex_005E00 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12Tex_005E00"
+static const ALIGN_ASSET(2) char Bmori1_room_12Tex_005E00[] = dBmori1_room_12Tex_005E00;
+
+#define dBmori1_room_12Tex_006600 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12Tex_006600"
+static const ALIGN_ASSET(2) char Bmori1_room_12Tex_006600[] = dBmori1_room_12Tex_006600;
+
+#define dBmori1_room_12Tex_006E00 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12Tex_006E00"
+static const ALIGN_ASSET(2) char Bmori1_room_12Tex_006E00[] = dBmori1_room_12Tex_006E00;
 
 #define dBmori1_room_12Tex_007200 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12Tex_007200"
 static const ALIGN_ASSET(2) char Bmori1_room_12Tex_007200[] = dBmori1_room_12Tex_007200;
 
-#define dBmori1_room_12DL_007BC8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12DL_007BC8"
-static const ALIGN_ASSET(2) char Bmori1_room_12DL_007BC8[] = dBmori1_room_12DL_007BC8;
-
 #define dBmori1_room_12Tex_007BD8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12Tex_007BD8"
 static const ALIGN_ASSET(2) char Bmori1_room_12Tex_007BD8[] = dBmori1_room_12Tex_007BD8;
 
+#define dBmori1_room_12DL_0049E8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12DL_0049E8"
+static const ALIGN_ASSET(2) char Bmori1_room_12DL_0049E8[] = dBmori1_room_12DL_0049E8;
+
+#define dBmori1_room_12DL_007BC8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_12DL_007BC8"
+static const ALIGN_ASSET(2) char Bmori1_room_12DL_007BC8[] = dBmori1_room_12DL_007BC8;
+
 
 #endif // DUNGEONS_BMORI1_ROOM_12_H
diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_13.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_13.h
index eab7767d3..cf8314bcf 100644
--- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_13.h
+++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_13.h
@@ -3,35 +3,35 @@
 
 #include "align_asset_macro.h"
 
-#define dBmori1_room_13DL_004CB8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_13DL_004CB8"
-static const ALIGN_ASSET(2) char Bmori1_room_13DL_004CB8[] = dBmori1_room_13DL_004CB8;
-
-#define dBmori1_room_13Tex_006CD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_13Tex_006CD0"
-static const ALIGN_ASSET(2) char Bmori1_room_13Tex_006CD0[] = dBmori1_room_13Tex_006CD0;
-
-#define dBmori1_room_13Tex_0064D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_13Tex_0064D0"
-static const ALIGN_ASSET(2) char Bmori1_room_13Tex_0064D0[] = dBmori1_room_13Tex_0064D0;
-
-#define dBmori1_room_13Tex_005CD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_13Tex_005CD0"
-static const ALIGN_ASSET(2) char Bmori1_room_13Tex_005CD0[] = dBmori1_room_13Tex_005CD0;
+#define dBmori1_room_13Tex_004CD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_13Tex_004CD0"
+static const ALIGN_ASSET(2) char Bmori1_room_13Tex_004CD0[] = dBmori1_room_13Tex_004CD0;
 
 #define dBmori1_room_13Tex_0054D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_13Tex_0054D0"
 static const ALIGN_ASSET(2) char Bmori1_room_13Tex_0054D0[] = dBmori1_room_13Tex_0054D0;
 
+#define dBmori1_room_13Tex_005CD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_13Tex_005CD0"
+static const ALIGN_ASSET(2) char Bmori1_room_13Tex_005CD0[] = dBmori1_room_13Tex_005CD0;
+
+#define dBmori1_room_13Tex_0064D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_13Tex_0064D0"
+static const ALIGN_ASSET(2) char Bmori1_room_13Tex_0064D0[] = dBmori1_room_13Tex_0064D0;
+
+#define dBmori1_room_13Tex_006CD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_13Tex_006CD0"
+static const ALIGN_ASSET(2) char Bmori1_room_13Tex_006CD0[] = dBmori1_room_13Tex_006CD0;
+
 #define dBmori1_room_13Tex_0074D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_13Tex_0074D0"
 static const ALIGN_ASSET(2) char Bmori1_room_13Tex_0074D0[] = dBmori1_room_13Tex_0074D0;
 
-#define dBmori1_room_13Tex_004CD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_13Tex_004CD0"
-static const ALIGN_ASSET(2) char Bmori1_room_13Tex_004CD0[] = dBmori1_room_13Tex_004CD0;
-
 #define dBmori1_room_13Tex_0078D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_13Tex_0078D0"
 static const ALIGN_ASSET(2) char Bmori1_room_13Tex_0078D0[] = dBmori1_room_13Tex_0078D0;
 
-#define dBmori1_room_13DL_008298 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_13DL_008298"
-static const ALIGN_ASSET(2) char Bmori1_room_13DL_008298[] = dBmori1_room_13DL_008298;
-
 #define dBmori1_room_13Tex_0082A8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_13Tex_0082A8"
 static const ALIGN_ASSET(2) char Bmori1_room_13Tex_0082A8[] = dBmori1_room_13Tex_0082A8;
 
+#define dBmori1_room_13DL_004CB8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_13DL_004CB8"
+static const ALIGN_ASSET(2) char Bmori1_room_13DL_004CB8[] = dBmori1_room_13DL_004CB8;
+
+#define dBmori1_room_13DL_008298 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_13DL_008298"
+static const ALIGN_ASSET(2) char Bmori1_room_13DL_008298[] = dBmori1_room_13DL_008298;
+
 
 #endif // DUNGEONS_BMORI1_ROOM_13_H
diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_14.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_14.h
index 5e8abdcd7..5953a9113 100644
--- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_14.h
+++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_14.h
@@ -3,29 +3,29 @@
 
 #include "align_asset_macro.h"
 
-#define dBmori1_room_14DL_003520 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_14DL_003520"
-static const ALIGN_ASSET(2) char Bmori1_room_14DL_003520[] = dBmori1_room_14DL_003520;
-
 #define dBmori1_room_14Tex_003560 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_14Tex_003560"
 static const ALIGN_ASSET(2) char Bmori1_room_14Tex_003560[] = dBmori1_room_14Tex_003560;
 
-#define dBmori1_room_14Tex_004D60 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_14Tex_004D60"
-static const ALIGN_ASSET(2) char Bmori1_room_14Tex_004D60[] = dBmori1_room_14Tex_004D60;
-
-#define dBmori1_room_14Tex_004960 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_14Tex_004960"
-static const ALIGN_ASSET(2) char Bmori1_room_14Tex_004960[] = dBmori1_room_14Tex_004960;
-
-#define dBmori1_room_14Tex_004160 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_14Tex_004160"
-static const ALIGN_ASSET(2) char Bmori1_room_14Tex_004160[] = dBmori1_room_14Tex_004160;
-
 #define dBmori1_room_14Tex_003960 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_14Tex_003960"
 static const ALIGN_ASSET(2) char Bmori1_room_14Tex_003960[] = dBmori1_room_14Tex_003960;
 
-#define dBmori1_room_14DL_005760 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_14DL_005760"
-static const ALIGN_ASSET(2) char Bmori1_room_14DL_005760[] = dBmori1_room_14DL_005760;
+#define dBmori1_room_14Tex_004160 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_14Tex_004160"
+static const ALIGN_ASSET(2) char Bmori1_room_14Tex_004160[] = dBmori1_room_14Tex_004160;
+
+#define dBmori1_room_14Tex_004960 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_14Tex_004960"
+static const ALIGN_ASSET(2) char Bmori1_room_14Tex_004960[] = dBmori1_room_14Tex_004960;
+
+#define dBmori1_room_14Tex_004D60 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_14Tex_004D60"
+static const ALIGN_ASSET(2) char Bmori1_room_14Tex_004D60[] = dBmori1_room_14Tex_004D60;
 
 #define dBmori1_room_14Tex_005770 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_14Tex_005770"
 static const ALIGN_ASSET(2) char Bmori1_room_14Tex_005770[] = dBmori1_room_14Tex_005770;
 
+#define dBmori1_room_14DL_003520 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_14DL_003520"
+static const ALIGN_ASSET(2) char Bmori1_room_14DL_003520[] = dBmori1_room_14DL_003520;
+
+#define dBmori1_room_14DL_005760 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_14DL_005760"
+static const ALIGN_ASSET(2) char Bmori1_room_14DL_005760[] = dBmori1_room_14DL_005760;
+
 
 #endif // DUNGEONS_BMORI1_ROOM_14_H
diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_15.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_15.h
index 3937419fb..af57d0da5 100644
--- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_15.h
+++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_15.h
@@ -3,9 +3,6 @@
 
 #include "align_asset_macro.h"
 
-#define dBmori1_room_15DL_0012D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_15DL_0012D0"
-static const ALIGN_ASSET(2) char Bmori1_room_15DL_0012D0[] = dBmori1_room_15DL_0012D0;
-
 #define dBmori1_room_15Tex_0012E0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_15Tex_0012E0"
 static const ALIGN_ASSET(2) char Bmori1_room_15Tex_0012E0[] = dBmori1_room_15Tex_0012E0;
 
@@ -15,5 +12,8 @@ static const ALIGN_ASSET(2) char Bmori1_room_15Tex_001AE0[] = dBmori1_room_15Tex
 #define dBmori1_room_15Tex_001EE0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_15Tex_001EE0"
 static const ALIGN_ASSET(2) char Bmori1_room_15Tex_001EE0[] = dBmori1_room_15Tex_001EE0;
 
+#define dBmori1_room_15DL_0012D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_15DL_0012D0"
+static const ALIGN_ASSET(2) char Bmori1_room_15DL_0012D0[] = dBmori1_room_15DL_0012D0;
+
 
 #endif // DUNGEONS_BMORI1_ROOM_15_H
diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_16.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_16.h
index 183a557b9..1f0a91e10 100644
--- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_16.h
+++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_16.h
@@ -3,8 +3,11 @@
 
 #include "align_asset_macro.h"
 
-#define dBmori1_room_16DL_002F88 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_16DL_002F88"
-static const ALIGN_ASSET(2) char Bmori1_room_16DL_002F88[] = dBmori1_room_16DL_002F88;
+#define dBmori1_room_16Tex_002F98 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_16Tex_002F98"
+static const ALIGN_ASSET(2) char Bmori1_room_16Tex_002F98[] = dBmori1_room_16Tex_002F98;
+
+#define dBmori1_room_16Tex_003798 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_16Tex_003798"
+static const ALIGN_ASSET(2) char Bmori1_room_16Tex_003798[] = dBmori1_room_16Tex_003798;
 
 #define dBmori1_room_16Tex_003F98 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_16Tex_003F98"
 static const ALIGN_ASSET(2) char Bmori1_room_16Tex_003F98[] = dBmori1_room_16Tex_003F98;
@@ -15,11 +18,8 @@ static const ALIGN_ASSET(2) char Bmori1_room_16Tex_004398[] = dBmori1_room_16Tex
 #define dBmori1_room_16Tex_004798 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_16Tex_004798"
 static const ALIGN_ASSET(2) char Bmori1_room_16Tex_004798[] = dBmori1_room_16Tex_004798;
 
-#define dBmori1_room_16Tex_002F98 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_16Tex_002F98"
-static const ALIGN_ASSET(2) char Bmori1_room_16Tex_002F98[] = dBmori1_room_16Tex_002F98;
-
-#define dBmori1_room_16Tex_003798 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_16Tex_003798"
-static const ALIGN_ASSET(2) char Bmori1_room_16Tex_003798[] = dBmori1_room_16Tex_003798;
+#define dBmori1_room_16DL_002F88 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_16DL_002F88"
+static const ALIGN_ASSET(2) char Bmori1_room_16DL_002F88[] = dBmori1_room_16DL_002F88;
 
 
 #endif // DUNGEONS_BMORI1_ROOM_16_H
diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_17.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_17.h
index 76784d887..ffb1c47d0 100644
--- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_17.h
+++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_17.h
@@ -3,18 +3,6 @@
 
 #include "align_asset_macro.h"
 
-#define dBmori1_room_17DL_006490 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_17DL_006490"
-static const ALIGN_ASSET(2) char Bmori1_room_17DL_006490[] = dBmori1_room_17DL_006490;
-
-#define dBmori1_room_17Tex_007CE8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_17Tex_007CE8"
-static const ALIGN_ASSET(2) char Bmori1_room_17Tex_007CE8[] = dBmori1_room_17Tex_007CE8;
-
-#define dBmori1_room_17Tex_0080E8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_17Tex_0080E8"
-static const ALIGN_ASSET(2) char Bmori1_room_17Tex_0080E8[] = dBmori1_room_17Tex_0080E8;
-
-#define dBmori1_room_17Tex_0088E8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_17Tex_0088E8"
-static const ALIGN_ASSET(2) char Bmori1_room_17Tex_0088E8[] = dBmori1_room_17Tex_0088E8;
-
 #define dBmori1_room_17Tex_0064E8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_17Tex_0064E8"
 static const ALIGN_ASSET(2) char Bmori1_room_17Tex_0064E8[] = dBmori1_room_17Tex_0064E8;
 
@@ -27,5 +15,17 @@ static const ALIGN_ASSET(2) char Bmori1_room_17Tex_0074E8[] = dBmori1_room_17Tex
 #define dBmori1_room_17Tex_0078E8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_17Tex_0078E8"
 static const ALIGN_ASSET(2) char Bmori1_room_17Tex_0078E8[] = dBmori1_room_17Tex_0078E8;
 
+#define dBmori1_room_17Tex_007CE8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_17Tex_007CE8"
+static const ALIGN_ASSET(2) char Bmori1_room_17Tex_007CE8[] = dBmori1_room_17Tex_007CE8;
+
+#define dBmori1_room_17Tex_0080E8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_17Tex_0080E8"
+static const ALIGN_ASSET(2) char Bmori1_room_17Tex_0080E8[] = dBmori1_room_17Tex_0080E8;
+
+#define dBmori1_room_17Tex_0088E8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_17Tex_0088E8"
+static const ALIGN_ASSET(2) char Bmori1_room_17Tex_0088E8[] = dBmori1_room_17Tex_0088E8;
+
+#define dBmori1_room_17DL_006490 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_17DL_006490"
+static const ALIGN_ASSET(2) char Bmori1_room_17DL_006490[] = dBmori1_room_17DL_006490;
+
 
 #endif // DUNGEONS_BMORI1_ROOM_17_H
diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_18.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_18.h
index fbe628da8..14f26f539 100644
--- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_18.h
+++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_18.h
@@ -3,11 +3,11 @@
 
 #include "align_asset_macro.h"
 
-#define dBmori1_room_18DL_000B20 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_18DL_000B20"
-static const ALIGN_ASSET(2) char Bmori1_room_18DL_000B20[] = dBmori1_room_18DL_000B20;
-
 #define dBmori1_room_18Tex_000B30 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_18Tex_000B30"
 static const ALIGN_ASSET(2) char Bmori1_room_18Tex_000B30[] = dBmori1_room_18Tex_000B30;
 
+#define dBmori1_room_18DL_000B20 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_18DL_000B20"
+static const ALIGN_ASSET(2) char Bmori1_room_18DL_000B20[] = dBmori1_room_18DL_000B20;
+
 
 #endif // DUNGEONS_BMORI1_ROOM_18_H
diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_2.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_2.h
index 120300dec..0de35f717 100644
--- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_2.h
+++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_2.h
@@ -3,41 +3,41 @@
 
 #include "align_asset_macro.h"
 
-#define dBmori1_room_2DL_00A328 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2DL_00A328"
-static const ALIGN_ASSET(2) char Bmori1_room_2DL_00A328[] = dBmori1_room_2DL_00A328;
-
 #define dBmori1_room_2Tex_00A380 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00A380"
 static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00A380[] = dBmori1_room_2Tex_00A380;
 
-#define dBmori1_room_2Tex_00F180 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00F180"
-static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00F180[] = dBmori1_room_2Tex_00F180;
-
-#define dBmori1_room_2Tex_00DD80 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00DD80"
-static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00DD80[] = dBmori1_room_2Tex_00DD80;
-
 #define dBmori1_room_2Tex_00AB80 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00AB80"
 static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00AB80[] = dBmori1_room_2Tex_00AB80;
 
-#define dBmori1_room_2Tex_00DB80 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00DB80"
-static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00DB80[] = dBmori1_room_2Tex_00DB80;
-
-#define dBmori1_room_2Tex_00E580 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00E580"
-static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00E580[] = dBmori1_room_2Tex_00E580;
-
-#define dBmori1_room_2Tex_00D380 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00D380"
-static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00D380[] = dBmori1_room_2Tex_00D380;
-
-#define dBmori1_room_2Tex_00CF80 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00CF80"
-static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00CF80[] = dBmori1_room_2Tex_00CF80;
+#define dBmori1_room_2Tex_00AF80 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00AF80"
+static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00AF80[] = dBmori1_room_2Tex_00AF80;
 
 #define dBmori1_room_2Tex_00BF80 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00BF80"
 static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00BF80[] = dBmori1_room_2Tex_00BF80;
 
-#define dBmori1_room_2Tex_00AF80 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00AF80"
-static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00AF80[] = dBmori1_room_2Tex_00AF80;
+#define dBmori1_room_2Tex_00CF80 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00CF80"
+static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00CF80[] = dBmori1_room_2Tex_00CF80;
+
+#define dBmori1_room_2Tex_00D380 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00D380"
+static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00D380[] = dBmori1_room_2Tex_00D380;
+
+#define dBmori1_room_2Tex_00DB80 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00DB80"
+static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00DB80[] = dBmori1_room_2Tex_00DB80;
+
+#define dBmori1_room_2Tex_00DD80 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00DD80"
+static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00DD80[] = dBmori1_room_2Tex_00DD80;
+
+#define dBmori1_room_2Tex_00E580 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00E580"
+static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00E580[] = dBmori1_room_2Tex_00E580;
 
 #define dBmori1_room_2Tex_00E980 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00E980"
 static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00E980[] = dBmori1_room_2Tex_00E980;
 
+#define dBmori1_room_2Tex_00F180 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2Tex_00F180"
+static const ALIGN_ASSET(2) char Bmori1_room_2Tex_00F180[] = dBmori1_room_2Tex_00F180;
+
+#define dBmori1_room_2DL_00A328 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_2DL_00A328"
+static const ALIGN_ASSET(2) char Bmori1_room_2DL_00A328[] = dBmori1_room_2DL_00A328;
+
 
 #endif // DUNGEONS_BMORI1_ROOM_2_H
diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_20.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_20.h
index 5562713f7..e5889975c 100644
--- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_20.h
+++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_20.h
@@ -3,14 +3,14 @@
 
 #include "align_asset_macro.h"
 
-#define dBmori1_room_20DL_0006E8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_20DL_0006E8"
-static const ALIGN_ASSET(2) char Bmori1_room_20DL_0006E8[] = dBmori1_room_20DL_0006E8;
-
 #define dBmori1_room_20Tex_0006F8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_20Tex_0006F8"
 static const ALIGN_ASSET(2) char Bmori1_room_20Tex_0006F8[] = dBmori1_room_20Tex_0006F8;
 
 #define dBmori1_room_20Tex_000EF8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_20Tex_000EF8"
 static const ALIGN_ASSET(2) char Bmori1_room_20Tex_000EF8[] = dBmori1_room_20Tex_000EF8;
 
+#define dBmori1_room_20DL_0006E8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_20DL_0006E8"
+static const ALIGN_ASSET(2) char Bmori1_room_20DL_0006E8[] = dBmori1_room_20DL_0006E8;
+
 
 #endif // DUNGEONS_BMORI1_ROOM_20_H
diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_21.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_21.h
index 6ea485025..15800c8ed 100644
--- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_21.h
+++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_21.h
@@ -3,11 +3,11 @@
 
 #include "align_asset_macro.h"
 
-#define dBmori1_room_21DL_000F60 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_21DL_000F60"
-static const ALIGN_ASSET(2) char Bmori1_room_21DL_000F60[] = dBmori1_room_21DL_000F60;
-
 #define dBmori1_room_21Tex_000F70 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_21Tex_000F70"
 static const ALIGN_ASSET(2) char Bmori1_room_21Tex_000F70[] = dBmori1_room_21Tex_000F70;
 
+#define dBmori1_room_21DL_000F60 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_21DL_000F60"
+static const ALIGN_ASSET(2) char Bmori1_room_21DL_000F60[] = dBmori1_room_21DL_000F60;
+
 
 #endif // DUNGEONS_BMORI1_ROOM_21_H
diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_22.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_22.h
index 0561ec526..e10c5cb27 100644
--- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_22.h
+++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_22.h
@@ -3,14 +3,14 @@
 
 #include "align_asset_macro.h"
 
-#define dBmori1_room_22DL_0005D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_22DL_0005D0"
-static const ALIGN_ASSET(2) char Bmori1_room_22DL_0005D0[] = dBmori1_room_22DL_0005D0;
-
 #define dBmori1_room_22Tex_0005E0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_22Tex_0005E0"
 static const ALIGN_ASSET(2) char Bmori1_room_22Tex_0005E0[] = dBmori1_room_22Tex_0005E0;
 
 #define dBmori1_room_22Tex_0015E0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_22Tex_0015E0"
 static const ALIGN_ASSET(2) char Bmori1_room_22Tex_0015E0[] = dBmori1_room_22Tex_0015E0;
 
+#define dBmori1_room_22DL_0005D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_22DL_0005D0"
+static const ALIGN_ASSET(2) char Bmori1_room_22DL_0005D0[] = dBmori1_room_22DL_0005D0;
+
 
 #endif // DUNGEONS_BMORI1_ROOM_22_H
diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_3.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_3.h
index 94c9a2d4a..d2173d3d5 100644
--- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_3.h
+++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_3.h
@@ -3,23 +3,23 @@
 
 #include "align_asset_macro.h"
 
-#define dBmori1_room_3DL_0023B8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_3DL_0023B8"
-static const ALIGN_ASSET(2) char Bmori1_room_3DL_0023B8[] = dBmori1_room_3DL_0023B8;
-
-#define dBmori1_room_3Tex_0033D8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_3Tex_0033D8"
-static const ALIGN_ASSET(2) char Bmori1_room_3Tex_0033D8[] = dBmori1_room_3Tex_0033D8;
-
 #define dBmori1_room_3Tex_0023D8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_3Tex_0023D8"
 static const ALIGN_ASSET(2) char Bmori1_room_3Tex_0023D8[] = dBmori1_room_3Tex_0023D8;
 
 #define dBmori1_room_3Tex_002BD8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_3Tex_002BD8"
 static const ALIGN_ASSET(2) char Bmori1_room_3Tex_002BD8[] = dBmori1_room_3Tex_002BD8;
 
+#define dBmori1_room_3Tex_0033D8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_3Tex_0033D8"
+static const ALIGN_ASSET(2) char Bmori1_room_3Tex_0033D8[] = dBmori1_room_3Tex_0033D8;
+
 #define dBmori1_room_3Tex_0037D8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_3Tex_0037D8"
 static const ALIGN_ASSET(2) char Bmori1_room_3Tex_0037D8[] = dBmori1_room_3Tex_0037D8;
 
 #define dBmori1_room_3Tex_0038D8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_3Tex_0038D8"
 static const ALIGN_ASSET(2) char Bmori1_room_3Tex_0038D8[] = dBmori1_room_3Tex_0038D8;
 
+#define dBmori1_room_3DL_0023B8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_3DL_0023B8"
+static const ALIGN_ASSET(2) char Bmori1_room_3DL_0023B8[] = dBmori1_room_3DL_0023B8;
+
 
 #endif // DUNGEONS_BMORI1_ROOM_3_H
diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_4.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_4.h
index d061768f9..859fd0a59 100644
--- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_4.h
+++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_4.h
@@ -3,14 +3,14 @@
 
 #include "align_asset_macro.h"
 
-#define dBmori1_room_4DL_0022A8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_4DL_0022A8"
-static const ALIGN_ASSET(2) char Bmori1_room_4DL_0022A8[] = dBmori1_room_4DL_0022A8;
+#define dBmori1_room_4Tex_0022B8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_4Tex_0022B8"
+static const ALIGN_ASSET(2) char Bmori1_room_4Tex_0022B8[] = dBmori1_room_4Tex_0022B8;
 
 #define dBmori1_room_4Tex_002AB8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_4Tex_002AB8"
 static const ALIGN_ASSET(2) char Bmori1_room_4Tex_002AB8[] = dBmori1_room_4Tex_002AB8;
 
-#define dBmori1_room_4Tex_0022B8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_4Tex_0022B8"
-static const ALIGN_ASSET(2) char Bmori1_room_4Tex_0022B8[] = dBmori1_room_4Tex_0022B8;
+#define dBmori1_room_4DL_0022A8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_4DL_0022A8"
+static const ALIGN_ASSET(2) char Bmori1_room_4DL_0022A8[] = dBmori1_room_4DL_0022A8;
 
 
 #endif // DUNGEONS_BMORI1_ROOM_4_H
diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_5.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_5.h
index 383d0d20b..10f5e6225 100644
--- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_5.h
+++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_5.h
@@ -3,23 +3,23 @@
 
 #include "align_asset_macro.h"
 
-#define dBmori1_room_5DL_0023B0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_5DL_0023B0"
-static const ALIGN_ASSET(2) char Bmori1_room_5DL_0023B0[] = dBmori1_room_5DL_0023B0;
-
-#define dBmori1_room_5Tex_002FD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_5Tex_002FD0"
-static const ALIGN_ASSET(2) char Bmori1_room_5Tex_002FD0[] = dBmori1_room_5Tex_002FD0;
-
 #define dBmori1_room_5Tex_0023D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_5Tex_0023D0"
 static const ALIGN_ASSET(2) char Bmori1_room_5Tex_0023D0[] = dBmori1_room_5Tex_0023D0;
 
 #define dBmori1_room_5Tex_0027D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_5Tex_0027D0"
 static const ALIGN_ASSET(2) char Bmori1_room_5Tex_0027D0[] = dBmori1_room_5Tex_0027D0;
 
-#define dBmori1_room_5Tex_0034D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_5Tex_0034D0"
-static const ALIGN_ASSET(2) char Bmori1_room_5Tex_0034D0[] = dBmori1_room_5Tex_0034D0;
+#define dBmori1_room_5Tex_002FD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_5Tex_002FD0"
+static const ALIGN_ASSET(2) char Bmori1_room_5Tex_002FD0[] = dBmori1_room_5Tex_002FD0;
 
 #define dBmori1_room_5Tex_0033D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_5Tex_0033D0"
 static const ALIGN_ASSET(2) char Bmori1_room_5Tex_0033D0[] = dBmori1_room_5Tex_0033D0;
 
+#define dBmori1_room_5Tex_0034D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_5Tex_0034D0"
+static const ALIGN_ASSET(2) char Bmori1_room_5Tex_0034D0[] = dBmori1_room_5Tex_0034D0;
+
+#define dBmori1_room_5DL_0023B0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_5DL_0023B0"
+static const ALIGN_ASSET(2) char Bmori1_room_5DL_0023B0[] = dBmori1_room_5DL_0023B0;
+
 
 #endif // DUNGEONS_BMORI1_ROOM_5_H
diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_6.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_6.h
index 069b8a998..6a1d9132a 100644
--- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_6.h
+++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_6.h
@@ -3,29 +3,29 @@
 
 #include "align_asset_macro.h"
 
-#define dBmori1_room_6DL_0065D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_6DL_0065D0"
-static const ALIGN_ASSET(2) char Bmori1_room_6DL_0065D0[] = dBmori1_room_6DL_0065D0;
+#define dBmori1_room_6Tex_006630 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_6Tex_006630"
+static const ALIGN_ASSET(2) char Bmori1_room_6Tex_006630[] = dBmori1_room_6Tex_006630;
 
 #define dBmori1_room_6Tex_006E30 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_6Tex_006E30"
 static const ALIGN_ASSET(2) char Bmori1_room_6Tex_006E30[] = dBmori1_room_6Tex_006E30;
 
+#define dBmori1_room_6Tex_007630 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_6Tex_007630"
+static const ALIGN_ASSET(2) char Bmori1_room_6Tex_007630[] = dBmori1_room_6Tex_007630;
+
+#define dBmori1_room_6Tex_007A30 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_6Tex_007A30"
+static const ALIGN_ASSET(2) char Bmori1_room_6Tex_007A30[] = dBmori1_room_6Tex_007A30;
+
 #define dBmori1_room_6Tex_008230 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_6Tex_008230"
 static const ALIGN_ASSET(2) char Bmori1_room_6Tex_008230[] = dBmori1_room_6Tex_008230;
 
 #define dBmori1_room_6Tex_008A30 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_6Tex_008A30"
 static const ALIGN_ASSET(2) char Bmori1_room_6Tex_008A30[] = dBmori1_room_6Tex_008A30;
 
-#define dBmori1_room_6Tex_007A30 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_6Tex_007A30"
-static const ALIGN_ASSET(2) char Bmori1_room_6Tex_007A30[] = dBmori1_room_6Tex_007A30;
-
 #define dBmori1_room_6Tex_008C30 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_6Tex_008C30"
 static const ALIGN_ASSET(2) char Bmori1_room_6Tex_008C30[] = dBmori1_room_6Tex_008C30;
 
-#define dBmori1_room_6Tex_006630 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_6Tex_006630"
-static const ALIGN_ASSET(2) char Bmori1_room_6Tex_006630[] = dBmori1_room_6Tex_006630;
-
-#define dBmori1_room_6Tex_007630 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_6Tex_007630"
-static const ALIGN_ASSET(2) char Bmori1_room_6Tex_007630[] = dBmori1_room_6Tex_007630;
+#define dBmori1_room_6DL_0065D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_6DL_0065D0"
+static const ALIGN_ASSET(2) char Bmori1_room_6DL_0065D0[] = dBmori1_room_6DL_0065D0;
 
 
 #endif // DUNGEONS_BMORI1_ROOM_6_H
diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_7.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_7.h
index f792aac57..1843e4e0c 100644
--- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_7.h
+++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_7.h
@@ -3,23 +3,11 @@
 
 #include "align_asset_macro.h"
 
-#define dBmori1_room_7DL_007D88 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7DL_007D88"
-static const ALIGN_ASSET(2) char Bmori1_room_7DL_007D88[] = dBmori1_room_7DL_007D88;
+#define dBmori1_room_7Tex_007DD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_007DD0"
+static const ALIGN_ASSET(2) char Bmori1_room_7Tex_007DD0[] = dBmori1_room_7Tex_007DD0;
 
-#define dBmori1_room_7Tex_009DD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_009DD0"
-static const ALIGN_ASSET(2) char Bmori1_room_7Tex_009DD0[] = dBmori1_room_7Tex_009DD0;
-
-#define dBmori1_room_7Tex_00CDD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_00CDD0"
-static const ALIGN_ASSET(2) char Bmori1_room_7Tex_00CDD0[] = dBmori1_room_7Tex_00CDD0;
-
-#define dBmori1_room_7Tex_00ADD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_00ADD0"
-static const ALIGN_ASSET(2) char Bmori1_room_7Tex_00ADD0[] = dBmori1_room_7Tex_00ADD0;
-
-#define dBmori1_room_7Tex_00A5D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_00A5D0"
-static const ALIGN_ASSET(2) char Bmori1_room_7Tex_00A5D0[] = dBmori1_room_7Tex_00A5D0;
-
-#define dBmori1_room_7Tex_00B5D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_00B5D0"
-static const ALIGN_ASSET(2) char Bmori1_room_7Tex_00B5D0[] = dBmori1_room_7Tex_00B5D0;
+#define dBmori1_room_7Tex_0085D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_0085D0"
+static const ALIGN_ASSET(2) char Bmori1_room_7Tex_0085D0[] = dBmori1_room_7Tex_0085D0;
 
 #define dBmori1_room_7Tex_008DD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_008DD0"
 static const ALIGN_ASSET(2) char Bmori1_room_7Tex_008DD0[] = dBmori1_room_7Tex_008DD0;
@@ -30,35 +18,47 @@ static const ALIGN_ASSET(2) char Bmori1_room_7Tex_0091D0[] = dBmori1_room_7Tex_0
 #define dBmori1_room_7Tex_0095D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_0095D0"
 static const ALIGN_ASSET(2) char Bmori1_room_7Tex_0095D0[] = dBmori1_room_7Tex_0095D0;
 
-#define dBmori1_room_7Tex_0085D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_0085D0"
-static const ALIGN_ASSET(2) char Bmori1_room_7Tex_0085D0[] = dBmori1_room_7Tex_0085D0;
+#define dBmori1_room_7Tex_009DD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_009DD0"
+static const ALIGN_ASSET(2) char Bmori1_room_7Tex_009DD0[] = dBmori1_room_7Tex_009DD0;
+
+#define dBmori1_room_7Tex_00A5D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_00A5D0"
+static const ALIGN_ASSET(2) char Bmori1_room_7Tex_00A5D0[] = dBmori1_room_7Tex_00A5D0;
+
+#define dBmori1_room_7Tex_00ADD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_00ADD0"
+static const ALIGN_ASSET(2) char Bmori1_room_7Tex_00ADD0[] = dBmori1_room_7Tex_00ADD0;
+
+#define dBmori1_room_7Tex_00B5D0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_00B5D0"
+static const ALIGN_ASSET(2) char Bmori1_room_7Tex_00B5D0[] = dBmori1_room_7Tex_00B5D0;
 
 #define dBmori1_room_7Tex_00BDD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_00BDD0"
 static const ALIGN_ASSET(2) char Bmori1_room_7Tex_00BDD0[] = dBmori1_room_7Tex_00BDD0;
 
-#define dBmori1_room_7Tex_007DD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_007DD0"
-static const ALIGN_ASSET(2) char Bmori1_room_7Tex_007DD0[] = dBmori1_room_7Tex_007DD0;
+#define dBmori1_room_7Tex_00CDD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_00CDD0"
+static const ALIGN_ASSET(2) char Bmori1_room_7Tex_00CDD0[] = dBmori1_room_7Tex_00CDD0;
 
 #define dBmori1_room_7Tex_00DDD0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_00DDD0"
 static const ALIGN_ASSET(2) char Bmori1_room_7Tex_00DDD0[] = dBmori1_room_7Tex_00DDD0;
 
-#define dBmori1_room_7DL_00EFA8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7DL_00EFA8"
-static const ALIGN_ASSET(2) char Bmori1_room_7DL_00EFA8[] = dBmori1_room_7DL_00EFA8;
-
-#define dBmori1_room_7Tex_0117D8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_0117D8"
-static const ALIGN_ASSET(2) char Bmori1_room_7Tex_0117D8[] = dBmori1_room_7Tex_0117D8;
+#define dBmori1_room_7Tex_00EFD8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_00EFD8"
+static const ALIGN_ASSET(2) char Bmori1_room_7Tex_00EFD8[] = dBmori1_room_7Tex_00EFD8;
 
 #define dBmori1_room_7Tex_00FFD8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_00FFD8"
 static const ALIGN_ASSET(2) char Bmori1_room_7Tex_00FFD8[] = dBmori1_room_7Tex_00FFD8;
 
-#define dBmori1_room_7Tex_011FD8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_011FD8"
-static const ALIGN_ASSET(2) char Bmori1_room_7Tex_011FD8[] = dBmori1_room_7Tex_011FD8;
-
-#define dBmori1_room_7Tex_00EFD8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_00EFD8"
-static const ALIGN_ASSET(2) char Bmori1_room_7Tex_00EFD8[] = dBmori1_room_7Tex_00EFD8;
-
 #define dBmori1_room_7Tex_010FD8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_010FD8"
 static const ALIGN_ASSET(2) char Bmori1_room_7Tex_010FD8[] = dBmori1_room_7Tex_010FD8;
 
+#define dBmori1_room_7Tex_0117D8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_0117D8"
+static const ALIGN_ASSET(2) char Bmori1_room_7Tex_0117D8[] = dBmori1_room_7Tex_0117D8;
+
+#define dBmori1_room_7Tex_011FD8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7Tex_011FD8"
+static const ALIGN_ASSET(2) char Bmori1_room_7Tex_011FD8[] = dBmori1_room_7Tex_011FD8;
+
+#define dBmori1_room_7DL_007D88 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7DL_007D88"
+static const ALIGN_ASSET(2) char Bmori1_room_7DL_007D88[] = dBmori1_room_7DL_007D88;
+
+#define dBmori1_room_7DL_00EFA8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_7DL_00EFA8"
+static const ALIGN_ASSET(2) char Bmori1_room_7DL_00EFA8[] = dBmori1_room_7DL_00EFA8;
+
 
 #endif // DUNGEONS_BMORI1_ROOM_7_H
diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_8.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_8.h
index 41411aa8c..d3cb39b8d 100644
--- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_8.h
+++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_8.h
@@ -3,59 +3,50 @@
 
 #include "align_asset_macro.h"
 
-#define dBmori1_room_8DL_00ABB0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8DL_00ABB0"
-static const ALIGN_ASSET(2) char Bmori1_room_8DL_00ABB0[] = dBmori1_room_8DL_00ABB0;
-
 #define dBmori1_room_8Tex_00AC10 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00AC10"
 static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00AC10[] = dBmori1_room_8Tex_00AC10;
 
-#define dBmori1_room_8Tex_010810 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_010810"
-static const ALIGN_ASSET(2) char Bmori1_room_8Tex_010810[] = dBmori1_room_8Tex_010810;
-
-#define dBmori1_room_8Tex_00E010 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00E010"
-static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00E010[] = dBmori1_room_8Tex_00E010;
-
-#define dBmori1_room_8Tex_00F010 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00F010"
-static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00F010[] = dBmori1_room_8Tex_00F010;
-
-#define dBmori1_room_8Tex_00CC10 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00CC10"
-static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00CC10[] = dBmori1_room_8Tex_00CC10;
-
-#define dBmori1_room_8Tex_00E810 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00E810"
-static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00E810[] = dBmori1_room_8Tex_00E810;
-
-#define dBmori1_room_8Tex_00D410 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00D410"
-static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00D410[] = dBmori1_room_8Tex_00D410;
-
-#define dBmori1_room_8Tex_00D810 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00D810"
-static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00D810[] = dBmori1_room_8Tex_00D810;
-
-#define dBmori1_room_8Tex_00F810 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00F810"
-static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00F810[] = dBmori1_room_8Tex_00F810;
-
 #define dBmori1_room_8Tex_00B410 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00B410"
 static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00B410[] = dBmori1_room_8Tex_00B410;
 
 #define dBmori1_room_8Tex_00C410 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00C410"
 static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00C410[] = dBmori1_room_8Tex_00C410;
 
-#define dBmori1_room_8Tex_012410 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_012410"
-static const ALIGN_ASSET(2) char Bmori1_room_8Tex_012410[] = dBmori1_room_8Tex_012410;
-
-#define dBmori1_room_8Tex_011C10 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_011C10"
-static const ALIGN_ASSET(2) char Bmori1_room_8Tex_011C10[] = dBmori1_room_8Tex_011C10;
+#define dBmori1_room_8Tex_00CC10 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00CC10"
+static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00CC10[] = dBmori1_room_8Tex_00CC10;
 
 #define dBmori1_room_8Tex_00D010 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00D010"
 static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00D010[] = dBmori1_room_8Tex_00D010;
 
+#define dBmori1_room_8Tex_00D410 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00D410"
+static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00D410[] = dBmori1_room_8Tex_00D410;
+
+#define dBmori1_room_8Tex_00D810 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00D810"
+static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00D810[] = dBmori1_room_8Tex_00D810;
+
+#define dBmori1_room_8Tex_00E010 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00E010"
+static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00E010[] = dBmori1_room_8Tex_00E010;
+
+#define dBmori1_room_8Tex_00E810 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00E810"
+static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00E810[] = dBmori1_room_8Tex_00E810;
+
+#define dBmori1_room_8Tex_00F010 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00F010"
+static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00F010[] = dBmori1_room_8Tex_00F010;
+
+#define dBmori1_room_8Tex_00F810 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_00F810"
+static const ALIGN_ASSET(2) char Bmori1_room_8Tex_00F810[] = dBmori1_room_8Tex_00F810;
+
+#define dBmori1_room_8Tex_010810 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_010810"
+static const ALIGN_ASSET(2) char Bmori1_room_8Tex_010810[] = dBmori1_room_8Tex_010810;
+
 #define dBmori1_room_8Tex_011810 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_011810"
 static const ALIGN_ASSET(2) char Bmori1_room_8Tex_011810[] = dBmori1_room_8Tex_011810;
 
-#define dBmori1_room_8DL_013A68 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8DL_013A68"
-static const ALIGN_ASSET(2) char Bmori1_room_8DL_013A68[] = dBmori1_room_8DL_013A68;
+#define dBmori1_room_8Tex_011C10 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_011C10"
+static const ALIGN_ASSET(2) char Bmori1_room_8Tex_011C10[] = dBmori1_room_8Tex_011C10;
 
-#define dBmori1_room_8Tex_016AB0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_016AB0"
-static const ALIGN_ASSET(2) char Bmori1_room_8Tex_016AB0[] = dBmori1_room_8Tex_016AB0;
+#define dBmori1_room_8Tex_012410 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_012410"
+static const ALIGN_ASSET(2) char Bmori1_room_8Tex_012410[] = dBmori1_room_8Tex_012410;
 
 #define dBmori1_room_8Tex_013AB0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_013AB0"
 static const ALIGN_ASSET(2) char Bmori1_room_8Tex_013AB0[] = dBmori1_room_8Tex_013AB0;
@@ -69,5 +60,14 @@ static const ALIGN_ASSET(2) char Bmori1_room_8Tex_0152B0[] = dBmori1_room_8Tex_0
 #define dBmori1_room_8Tex_015AB0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_015AB0"
 static const ALIGN_ASSET(2) char Bmori1_room_8Tex_015AB0[] = dBmori1_room_8Tex_015AB0;
 
+#define dBmori1_room_8Tex_016AB0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8Tex_016AB0"
+static const ALIGN_ASSET(2) char Bmori1_room_8Tex_016AB0[] = dBmori1_room_8Tex_016AB0;
+
+#define dBmori1_room_8DL_00ABB0 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8DL_00ABB0"
+static const ALIGN_ASSET(2) char Bmori1_room_8DL_00ABB0[] = dBmori1_room_8DL_00ABB0;
+
+#define dBmori1_room_8DL_013A68 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_8DL_013A68"
+static const ALIGN_ASSET(2) char Bmori1_room_8DL_013A68[] = dBmori1_room_8DL_013A68;
+
 
 #endif // DUNGEONS_BMORI1_ROOM_8_H
diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_9.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_9.h
index a989f1119..37c771db5 100644
--- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_9.h
+++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_room_9.h
@@ -3,32 +3,26 @@
 
 #include "align_asset_macro.h"
 
-#define dBmori1_room_9DL_004880 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9DL_004880"
-static const ALIGN_ASSET(2) char Bmori1_room_9DL_004880[] = dBmori1_room_9DL_004880;
-
-#define dBmori1_room_9Tex_0074B8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9Tex_0074B8"
-static const ALIGN_ASSET(2) char Bmori1_room_9Tex_0074B8[] = dBmori1_room_9Tex_0074B8;
-
-#define dBmori1_room_9Tex_0054B8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9Tex_0054B8"
-static const ALIGN_ASSET(2) char Bmori1_room_9Tex_0054B8[] = dBmori1_room_9Tex_0054B8;
-
-#define dBmori1_room_9Tex_0064B8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9Tex_0064B8"
-static const ALIGN_ASSET(2) char Bmori1_room_9Tex_0064B8[] = dBmori1_room_9Tex_0064B8;
-
-#define dBmori1_room_9Tex_005CB8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9Tex_005CB8"
-static const ALIGN_ASSET(2) char Bmori1_room_9Tex_005CB8[] = dBmori1_room_9Tex_005CB8;
-
-#define dBmori1_room_9Tex_006CB8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9Tex_006CB8"
-static const ALIGN_ASSET(2) char Bmori1_room_9Tex_006CB8[] = dBmori1_room_9Tex_006CB8;
-
 #define dBmori1_room_9Tex_0048B8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9Tex_0048B8"
 static const ALIGN_ASSET(2) char Bmori1_room_9Tex_0048B8[] = dBmori1_room_9Tex_0048B8;
 
 #define dBmori1_room_9Tex_0050B8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9Tex_0050B8"
 static const ALIGN_ASSET(2) char Bmori1_room_9Tex_0050B8[] = dBmori1_room_9Tex_0050B8;
 
-#define dBmori1_room_9DL_008940 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9DL_008940"
-static const ALIGN_ASSET(2) char Bmori1_room_9DL_008940[] = dBmori1_room_9DL_008940;
+#define dBmori1_room_9Tex_0054B8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9Tex_0054B8"
+static const ALIGN_ASSET(2) char Bmori1_room_9Tex_0054B8[] = dBmori1_room_9Tex_0054B8;
+
+#define dBmori1_room_9Tex_005CB8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9Tex_005CB8"
+static const ALIGN_ASSET(2) char Bmori1_room_9Tex_005CB8[] = dBmori1_room_9Tex_005CB8;
+
+#define dBmori1_room_9Tex_0064B8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9Tex_0064B8"
+static const ALIGN_ASSET(2) char Bmori1_room_9Tex_0064B8[] = dBmori1_room_9Tex_0064B8;
+
+#define dBmori1_room_9Tex_006CB8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9Tex_006CB8"
+static const ALIGN_ASSET(2) char Bmori1_room_9Tex_006CB8[] = dBmori1_room_9Tex_006CB8;
+
+#define dBmori1_room_9Tex_0074B8 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9Tex_0074B8"
+static const ALIGN_ASSET(2) char Bmori1_room_9Tex_0074B8[] = dBmori1_room_9Tex_0074B8;
 
 #define dBmori1_room_9Tex_008958 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9Tex_008958"
 static const ALIGN_ASSET(2) char Bmori1_room_9Tex_008958[] = dBmori1_room_9Tex_008958;
@@ -36,5 +30,11 @@ static const ALIGN_ASSET(2) char Bmori1_room_9Tex_008958[] = dBmori1_room_9Tex_0
 #define dBmori1_room_9Tex_009158 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9Tex_009158"
 static const ALIGN_ASSET(2) char Bmori1_room_9Tex_009158[] = dBmori1_room_9Tex_009158;
 
+#define dBmori1_room_9DL_004880 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9DL_004880"
+static const ALIGN_ASSET(2) char Bmori1_room_9DL_004880[] = dBmori1_room_9DL_004880;
+
+#define dBmori1_room_9DL_008940 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_room_9DL_008940"
+static const ALIGN_ASSET(2) char Bmori1_room_9DL_008940[] = dBmori1_room_9DL_008940;
+
 
 #endif // DUNGEONS_BMORI1_ROOM_9_H
diff --git a/soh/assets/scenes/dungeons/Bmori1/Bmori1_scene.h b/soh/assets/scenes/dungeons/Bmori1/Bmori1_scene.h
index 5c3e0492e..48f518b52 100644
--- a/soh/assets/scenes/dungeons/Bmori1/Bmori1_scene.h
+++ b/soh/assets/scenes/dungeons/Bmori1/Bmori1_scene.h
@@ -3,6 +3,27 @@
 
 #include "align_asset_macro.h"
 
+#define dBmori1_sceneTex_014490 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_sceneTex_014490"
+static const ALIGN_ASSET(2) char Bmori1_sceneTex_014490[] = dBmori1_sceneTex_014490;
+
+#define dBmori1_sceneTex_015590 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_sceneTex_015590"
+static const ALIGN_ASSET(2) char Bmori1_sceneTex_015590[] = dBmori1_sceneTex_015590;
+
+#define dBmori1_sceneTex_015690 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_sceneTex_015690"
+static const ALIGN_ASSET(2) char Bmori1_sceneTex_015690[] = dBmori1_sceneTex_015690;
+
+#define dBmori1_sceneTex_015A90 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_sceneTex_015A90"
+static const ALIGN_ASSET(2) char Bmori1_sceneTex_015A90[] = dBmori1_sceneTex_015A90;
+
+#define dBmori1_sceneTex_015B90 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_sceneTex_015B90"
+static const ALIGN_ASSET(2) char Bmori1_sceneTex_015B90[] = dBmori1_sceneTex_015B90;
+
+#define dBmori1_sceneTLUT_014080 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_sceneTLUT_014080"
+static const ALIGN_ASSET(2) char Bmori1_sceneTLUT_014080[] = dBmori1_sceneTLUT_014080;
+
+#define dBmori1_sceneTLUT_014288 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_sceneTLUT_014288"
+static const ALIGN_ASSET(2) char Bmori1_sceneTLUT_014288[] = dBmori1_sceneTLUT_014288;
+
 #define dgForestTempleDayEntranceTex "__OTR__scenes/nonmq/Bmori1_scene/gForestTempleDayEntranceTex"
 static const ALIGN_ASSET(2) char gForestTempleDayEntranceTex[] = dgForestTempleDayEntranceTex;
 
@@ -12,25 +33,5 @@ static const ALIGN_ASSET(2) char gForestTempleNightEntranceTex[] = dgForestTempl
 #define dBmori1_sceneCollisionHeader_014054 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_sceneCollisionHeader_014054"
 static const ALIGN_ASSET(2) char Bmori1_sceneCollisionHeader_014054[] = dBmori1_sceneCollisionHeader_014054;
 
-#define dBmori1_sceneTLUT_014288 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_sceneTLUT_014288"
-static const ALIGN_ASSET(2) char Bmori1_sceneTLUT_014288[] = dBmori1_sceneTLUT_014288;
-
-#define dBmori1_sceneTex_015B90 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_sceneTex_015B90"
-static const ALIGN_ASSET(2) char Bmori1_sceneTex_015B90[] = dBmori1_sceneTex_015B90;
-
-#define dBmori1_sceneTLUT_014080 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_sceneTLUT_014080"
-static const ALIGN_ASSET(2) char Bmori1_sceneTLUT_014080[] = dBmori1_sceneTLUT_014080;
-
-#define dBmori1_sceneTex_014490 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_sceneTex_014490"
-static const ALIGN_ASSET(2) char Bmori1_sceneTex_014490[] = dBmori1_sceneTex_014490;
-
-#define dBmori1_sceneTex_015A90 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_sceneTex_015A90"
-static const ALIGN_ASSET(2) char Bmori1_sceneTex_015A90[] = dBmori1_sceneTex_015A90;
-
-#define dBmori1_sceneTex_015690 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_sceneTex_015690"
-static const ALIGN_ASSET(2) char Bmori1_sceneTex_015690[] = dBmori1_sceneTex_015690;
-
-#define dBmori1_sceneTex_015590 "__OTR__scenes/nonmq/Bmori1_scene/Bmori1_sceneTex_015590"
-static const ALIGN_ASSET(2) char Bmori1_sceneTex_015590[] = dBmori1_sceneTex_015590;
 
 #endif // DUNGEONS_BMORI1_SCENE_H
diff --git a/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_room_0.h b/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_room_0.h
index 79bf76e74..51ca2214a 100644
--- a/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_room_0.h
+++ b/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_room_0.h
@@ -3,35 +3,35 @@
 
 #include "align_asset_macro.h"
 
-#define dFIRE_bs_room_0DL_002E08 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_0DL_002E08"
-static const ALIGN_ASSET(2) char FIRE_bs_room_0DL_002E08[] = dFIRE_bs_room_0DL_002E08;
-
-#define dFIRE_bs_room_0Tex_004068 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_0Tex_004068"
-static const ALIGN_ASSET(2) char FIRE_bs_room_0Tex_004068[] = dFIRE_bs_room_0Tex_004068;
-
-#define dFIRE_bs_room_0TLUT_002E48 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_0TLUT_002E48"
-static const ALIGN_ASSET(2) char FIRE_bs_room_0TLUT_002E48[] = dFIRE_bs_room_0TLUT_002E48;
-
-#define dFIRE_bs_room_0Tex_003C68 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_0Tex_003C68"
-static const ALIGN_ASSET(2) char FIRE_bs_room_0Tex_003C68[] = dFIRE_bs_room_0Tex_003C68;
-
-#define dFIRE_bs_room_0Tex_003A68 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_0Tex_003A68"
-static const ALIGN_ASSET(2) char FIRE_bs_room_0Tex_003A68[] = dFIRE_bs_room_0Tex_003A68;
-
-#define dFIRE_bs_room_0TLUT_002E28 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_0TLUT_002E28"
-static const ALIGN_ASSET(2) char FIRE_bs_room_0TLUT_002E28[] = dFIRE_bs_room_0TLUT_002E28;
-
-#define dFIRE_bs_room_0Tex_003868 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_0Tex_003868"
-static const ALIGN_ASSET(2) char FIRE_bs_room_0Tex_003868[] = dFIRE_bs_room_0Tex_003868;
-
-#define dFIRE_bs_room_0Tex_003468 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_0Tex_003468"
-static const ALIGN_ASSET(2) char FIRE_bs_room_0Tex_003468[] = dFIRE_bs_room_0Tex_003468;
-
-#define dFIRE_bs_room_0Tex_002E68 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_0Tex_002E68"
+#define dFIRE_bs_room_0Tex_002E68 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_0Tex_002E68"
 static const ALIGN_ASSET(2) char FIRE_bs_room_0Tex_002E68[] = dFIRE_bs_room_0Tex_002E68;
 
-#define dFIRE_bs_room_0Tex_003068 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_0Tex_003068"
+#define dFIRE_bs_room_0Tex_003068 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_0Tex_003068"
 static const ALIGN_ASSET(2) char FIRE_bs_room_0Tex_003068[] = dFIRE_bs_room_0Tex_003068;
 
+#define dFIRE_bs_room_0Tex_003468 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_0Tex_003468"
+static const ALIGN_ASSET(2) char FIRE_bs_room_0Tex_003468[] = dFIRE_bs_room_0Tex_003468;
+
+#define dFIRE_bs_room_0Tex_003868 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_0Tex_003868"
+static const ALIGN_ASSET(2) char FIRE_bs_room_0Tex_003868[] = dFIRE_bs_room_0Tex_003868;
+
+#define dFIRE_bs_room_0Tex_003A68 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_0Tex_003A68"
+static const ALIGN_ASSET(2) char FIRE_bs_room_0Tex_003A68[] = dFIRE_bs_room_0Tex_003A68;
+
+#define dFIRE_bs_room_0Tex_003C68 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_0Tex_003C68"
+static const ALIGN_ASSET(2) char FIRE_bs_room_0Tex_003C68[] = dFIRE_bs_room_0Tex_003C68;
+
+#define dFIRE_bs_room_0Tex_004068 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_0Tex_004068"
+static const ALIGN_ASSET(2) char FIRE_bs_room_0Tex_004068[] = dFIRE_bs_room_0Tex_004068;
+
+#define dFIRE_bs_room_0TLUT_002E28 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_0TLUT_002E28"
+static const ALIGN_ASSET(2) char FIRE_bs_room_0TLUT_002E28[] = dFIRE_bs_room_0TLUT_002E28;
+
+#define dFIRE_bs_room_0TLUT_002E48 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_0TLUT_002E48"
+static const ALIGN_ASSET(2) char FIRE_bs_room_0TLUT_002E48[] = dFIRE_bs_room_0TLUT_002E48;
+
+#define dFIRE_bs_room_0DL_002E08 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_0DL_002E08"
+static const ALIGN_ASSET(2) char FIRE_bs_room_0DL_002E08[] = dFIRE_bs_room_0DL_002E08;
+
 
 #endif // DUNGEONS_FIRE_BS_ROOM_0_H
diff --git a/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_room_1.h b/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_room_1.h
index a223e899b..a902e2ca4 100644
--- a/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_room_1.h
+++ b/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_room_1.h
@@ -3,38 +3,38 @@
 
 #include "align_asset_macro.h"
 
-#define dFIRE_bs_room_1DL_004940 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_1DL_004940"
-static const ALIGN_ASSET(2) char FIRE_bs_room_1DL_004940[] = dFIRE_bs_room_1DL_004940;
-
-#define dFIRE_bs_room_1Tex_004BD8 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_1Tex_004BD8"
-static const ALIGN_ASSET(2) char FIRE_bs_room_1Tex_004BD8[] = dFIRE_bs_room_1Tex_004BD8;
-
-#define dFIRE_bs_room_1Tex_006DD8 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_1Tex_006DD8"
-static const ALIGN_ASSET(2) char FIRE_bs_room_1Tex_006DD8[] = dFIRE_bs_room_1Tex_006DD8;
-
-#define dFIRE_bs_room_1TLUT_0049B8 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_1TLUT_0049B8"
-static const ALIGN_ASSET(2) char FIRE_bs_room_1TLUT_0049B8[] = dFIRE_bs_room_1TLUT_0049B8;
-
-#define dFIRE_bs_room_1Tex_0061D8 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_1Tex_0061D8"
-static const ALIGN_ASSET(2) char FIRE_bs_room_1Tex_0061D8[] = dFIRE_bs_room_1Tex_0061D8;
-
-#define dFIRE_bs_room_1Tex_005FD8 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_1Tex_005FD8"
-static const ALIGN_ASSET(2) char FIRE_bs_room_1Tex_005FD8[] = dFIRE_bs_room_1Tex_005FD8;
-
-#define dFIRE_bs_room_1TLUT_004998 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_1TLUT_004998"
-static const ALIGN_ASSET(2) char FIRE_bs_room_1TLUT_004998[] = dFIRE_bs_room_1TLUT_004998;
-
-#define dFIRE_bs_room_1Tex_005BD8 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_1Tex_005BD8"
-static const ALIGN_ASSET(2) char FIRE_bs_room_1Tex_005BD8[] = dFIRE_bs_room_1Tex_005BD8;
-
-#define dFIRE_bs_room_1Tex_0049D8 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_1Tex_0049D8"
+#define dFIRE_bs_room_1Tex_0049D8 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_1Tex_0049D8"
 static const ALIGN_ASSET(2) char FIRE_bs_room_1Tex_0049D8[] = dFIRE_bs_room_1Tex_0049D8;
 
-#define dFIRE_bs_room_1Tex_0065D8 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_1Tex_0065D8"
+#define dFIRE_bs_room_1Tex_004BD8 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_1Tex_004BD8"
+static const ALIGN_ASSET(2) char FIRE_bs_room_1Tex_004BD8[] = dFIRE_bs_room_1Tex_004BD8;
+
+#define dFIRE_bs_room_1Tex_0053D8 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_1Tex_0053D8"
+static const ALIGN_ASSET(2) char FIRE_bs_room_1Tex_0053D8[] = dFIRE_bs_room_1Tex_0053D8;
+
+#define dFIRE_bs_room_1Tex_005BD8 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_1Tex_005BD8"
+static const ALIGN_ASSET(2) char FIRE_bs_room_1Tex_005BD8[] = dFIRE_bs_room_1Tex_005BD8;
+
+#define dFIRE_bs_room_1Tex_005FD8 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_1Tex_005FD8"
+static const ALIGN_ASSET(2) char FIRE_bs_room_1Tex_005FD8[] = dFIRE_bs_room_1Tex_005FD8;
+
+#define dFIRE_bs_room_1Tex_0061D8 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_1Tex_0061D8"
+static const ALIGN_ASSET(2) char FIRE_bs_room_1Tex_0061D8[] = dFIRE_bs_room_1Tex_0061D8;
+
+#define dFIRE_bs_room_1Tex_0065D8 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_1Tex_0065D8"
 static const ALIGN_ASSET(2) char FIRE_bs_room_1Tex_0065D8[] = dFIRE_bs_room_1Tex_0065D8;
 
-#define dFIRE_bs_room_1Tex_0053D8 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_room_1Tex_0053D8"
-static const ALIGN_ASSET(2) char FIRE_bs_room_1Tex_0053D8[] = dFIRE_bs_room_1Tex_0053D8;
+#define dFIRE_bs_room_1Tex_006DD8 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_1Tex_006DD8"
+static const ALIGN_ASSET(2) char FIRE_bs_room_1Tex_006DD8[] = dFIRE_bs_room_1Tex_006DD8;
+
+#define dFIRE_bs_room_1TLUT_004998 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_1TLUT_004998"
+static const ALIGN_ASSET(2) char FIRE_bs_room_1TLUT_004998[] = dFIRE_bs_room_1TLUT_004998;
+
+#define dFIRE_bs_room_1TLUT_0049B8 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_1TLUT_0049B8"
+static const ALIGN_ASSET(2) char FIRE_bs_room_1TLUT_0049B8[] = dFIRE_bs_room_1TLUT_0049B8;
+
+#define dFIRE_bs_room_1DL_004940 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_room_1DL_004940"
+static const ALIGN_ASSET(2) char FIRE_bs_room_1DL_004940[] = dFIRE_bs_room_1DL_004940;
 
 
 #endif // DUNGEONS_FIRE_BS_ROOM_1_H
diff --git a/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_scene.h b/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_scene.h
index 2f96ec96b..68035e4bb 100644
--- a/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_scene.h
+++ b/soh/assets/scenes/dungeons/FIRE_bs/FIRE_bs_scene.h
@@ -3,19 +3,20 @@
 
 #include "align_asset_macro.h"
 
-#define dFIRE_bs_sceneCollisionHeader_002BCC "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_sceneCollisionHeader_002BCC"
-static const ALIGN_ASSET(2) char FIRE_bs_sceneCollisionHeader_002BCC[] = dFIRE_bs_sceneCollisionHeader_002BCC;
-
-#define dFIRE_bs_sceneTex_003400 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_sceneTex_003400"
-static const ALIGN_ASSET(2) char FIRE_bs_sceneTex_003400[] = dFIRE_bs_sceneTex_003400;
-
-#define dFIRE_bs_sceneTex_002C00 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_sceneTex_002C00"
+#define dFIRE_bs_sceneTex_002C00 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_sceneTex_002C00"
 static const ALIGN_ASSET(2) char FIRE_bs_sceneTex_002C00[] = dFIRE_bs_sceneTex_002C00;
 
-#define dFIRE_bs_sceneTex_003C00 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_sceneTex_003C00"
+#define dFIRE_bs_sceneTex_003400 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_sceneTex_003400"
+static const ALIGN_ASSET(2) char FIRE_bs_sceneTex_003400[] = dFIRE_bs_sceneTex_003400;
+
+#define dFIRE_bs_sceneTex_003C00 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_sceneTex_003C00"
 static const ALIGN_ASSET(2) char FIRE_bs_sceneTex_003C00[] = dFIRE_bs_sceneTex_003C00;
 
-#define dFIRE_bs_sceneTex_004400 "__OTR__scenes/nonmq/FIRE_bs_scene/FIRE_bs_sceneTex_004400"
+#define dFIRE_bs_sceneTex_004400 "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_sceneTex_004400"
 static const ALIGN_ASSET(2) char FIRE_bs_sceneTex_004400[] = dFIRE_bs_sceneTex_004400;
 
+#define dFIRE_bs_sceneCollisionHeader_002BCC "__OTR__scenes/shared/FIRE_bs_scene/FIRE_bs_sceneCollisionHeader_002BCC"
+static const ALIGN_ASSET(2) char FIRE_bs_sceneCollisionHeader_002BCC[] = dFIRE_bs_sceneCollisionHeader_002BCC;
+
+
 #endif // DUNGEONS_FIRE_BS_SCENE_H
diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_0.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_0.h
index 87fc1832d..9be04e2b3 100644
--- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_0.h
+++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_0.h
@@ -3,14 +3,20 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdan_room_0DL_002768 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0DL_002768"
-static const ALIGN_ASSET(2) char HAKAdan_room_0DL_002768[] = dHAKAdan_room_0DL_002768;
+#define dHAKAdan_room_0Tex_008230 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0Tex_008230"
+static const ALIGN_ASSET(2) char HAKAdan_room_0Tex_008230[] = dHAKAdan_room_0Tex_008230;
 
 #define dHAKAdan_room_0Tex_009230 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0Tex_009230"
 static const ALIGN_ASSET(2) char HAKAdan_room_0Tex_009230[] = dHAKAdan_room_0Tex_009230;
 
-#define dHAKAdan_room_0Tex_008230 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0Tex_008230"
-static const ALIGN_ASSET(2) char HAKAdan_room_0Tex_008230[] = dHAKAdan_room_0Tex_008230;
+#define dHAKAdan_room_0Tex_00A230 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0Tex_00A230"
+static const ALIGN_ASSET(2) char HAKAdan_room_0Tex_00A230[] = dHAKAdan_room_0Tex_00A230;
+
+#define dHAKAdan_room_0Tex_00AD48 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0Tex_00AD48"
+static const ALIGN_ASSET(2) char HAKAdan_room_0Tex_00AD48[] = dHAKAdan_room_0Tex_00AD48;
+
+#define dHAKAdan_room_0DL_002768 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0DL_002768"
+static const ALIGN_ASSET(2) char HAKAdan_room_0DL_002768[] = dHAKAdan_room_0DL_002768;
 
 #define dHAKAdan_room_0DL_005FF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0DL_005FF0"
 static const ALIGN_ASSET(2) char HAKAdan_room_0DL_005FF0[] = dHAKAdan_room_0DL_005FF0;
@@ -18,9 +24,6 @@ static const ALIGN_ASSET(2) char HAKAdan_room_0DL_005FF0[] = dHAKAdan_room_0DL_0
 #define dHAKAdan_room_0DL_000D00 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0DL_000D00"
 static const ALIGN_ASSET(2) char HAKAdan_room_0DL_000D00[] = dHAKAdan_room_0DL_000D00;
 
-#define dHAKAdan_room_0Tex_00A230 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0Tex_00A230"
-static const ALIGN_ASSET(2) char HAKAdan_room_0Tex_00A230[] = dHAKAdan_room_0Tex_00A230;
-
 #define dHAKAdan_room_0DL_007EC8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0DL_007EC8"
 static const ALIGN_ASSET(2) char HAKAdan_room_0DL_007EC8[] = dHAKAdan_room_0DL_007EC8;
 
@@ -30,8 +33,5 @@ static const ALIGN_ASSET(2) char HAKAdan_room_0DL_0045C0[] = dHAKAdan_room_0DL_0
 #define dHAKAdan_room_0DL_00AC40 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0DL_00AC40"
 static const ALIGN_ASSET(2) char HAKAdan_room_0DL_00AC40[] = dHAKAdan_room_0DL_00AC40;
 
-#define dHAKAdan_room_0Tex_00AD48 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0Tex_00AD48"
-static const ALIGN_ASSET(2) char HAKAdan_room_0Tex_00AD48[] = dHAKAdan_room_0Tex_00AD48;
-
 
 #endif // DUNGEONS_HAKADAN_ROOM_0_H
diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_1.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_1.h
index 5bd5de9bd..2639c7de5 100644
--- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_1.h
+++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_1.h
@@ -3,12 +3,12 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdan_room_1DL_001110 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_1DL_001110"
-static const ALIGN_ASSET(2) char HAKAdan_room_1DL_001110[] = dHAKAdan_room_1DL_001110;
-
 #define dHAKAdan_room_1Tex_0012E8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_1Tex_0012E8"
 static const ALIGN_ASSET(2) char HAKAdan_room_1Tex_0012E8[] = dHAKAdan_room_1Tex_0012E8;
 
+#define dHAKAdan_room_1DL_001110 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_1DL_001110"
+static const ALIGN_ASSET(2) char HAKAdan_room_1DL_001110[] = dHAKAdan_room_1DL_001110;
+
 #define dHAKAdan_room_1DL_000270 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_1DL_000270"
 static const ALIGN_ASSET(2) char HAKAdan_room_1DL_000270[] = dHAKAdan_room_1DL_000270;
 
diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_10.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_10.h
index 993a39b5d..c865e3e75 100644
--- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_10.h
+++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_10.h
@@ -3,32 +3,35 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdan_room_10DL_0019C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10DL_0019C0"
-static const ALIGN_ASSET(2) char HAKAdan_room_10DL_0019C0[] = dHAKAdan_room_10DL_0019C0;
-
-#define dHAKAdan_room_10Tex_004FF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10Tex_004FF0"
-static const ALIGN_ASSET(2) char HAKAdan_room_10Tex_004FF0[] = dHAKAdan_room_10Tex_004FF0;
-
-#define dHAKAdan_room_10DL_002B70 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10DL_002B70"
-static const ALIGN_ASSET(2) char HAKAdan_room_10DL_002B70[] = dHAKAdan_room_10DL_002B70;
-
-#define dHAKAdan_room_10Tex_006BF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10Tex_006BF0"
-static const ALIGN_ASSET(2) char HAKAdan_room_10Tex_006BF0[] = dHAKAdan_room_10Tex_006BF0;
-
-#define dHAKAdan_room_10Tex_003FF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10Tex_003FF0"
-static const ALIGN_ASSET(2) char HAKAdan_room_10Tex_003FF0[] = dHAKAdan_room_10Tex_003FF0;
+#define dHAKAdan_room_10Tex_0039F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10Tex_0039F0"
+static const ALIGN_ASSET(2) char HAKAdan_room_10Tex_0039F0[] = dHAKAdan_room_10Tex_0039F0;
 
 #define dHAKAdan_room_10Tex_003DF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10Tex_003DF0"
 static const ALIGN_ASSET(2) char HAKAdan_room_10Tex_003DF0[] = dHAKAdan_room_10Tex_003DF0;
 
-#define dHAKAdan_room_10Tex_0073F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10Tex_0073F0"
-static const ALIGN_ASSET(2) char HAKAdan_room_10Tex_0073F0[] = dHAKAdan_room_10Tex_0073F0;
+#define dHAKAdan_room_10Tex_003FF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10Tex_003FF0"
+static const ALIGN_ASSET(2) char HAKAdan_room_10Tex_003FF0[] = dHAKAdan_room_10Tex_003FF0;
+
+#define dHAKAdan_room_10Tex_004FF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10Tex_004FF0"
+static const ALIGN_ASSET(2) char HAKAdan_room_10Tex_004FF0[] = dHAKAdan_room_10Tex_004FF0;
+
+#define dHAKAdan_room_10Tex_005FF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10Tex_005FF0"
+static const ALIGN_ASSET(2) char HAKAdan_room_10Tex_005FF0[] = dHAKAdan_room_10Tex_005FF0;
 
 #define dHAKAdan_room_10Tex_0067F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10Tex_0067F0"
 static const ALIGN_ASSET(2) char HAKAdan_room_10Tex_0067F0[] = dHAKAdan_room_10Tex_0067F0;
 
-#define dHAKAdan_room_10Tex_0039F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10Tex_0039F0"
-static const ALIGN_ASSET(2) char HAKAdan_room_10Tex_0039F0[] = dHAKAdan_room_10Tex_0039F0;
+#define dHAKAdan_room_10Tex_006BF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10Tex_006BF0"
+static const ALIGN_ASSET(2) char HAKAdan_room_10Tex_006BF0[] = dHAKAdan_room_10Tex_006BF0;
+
+#define dHAKAdan_room_10Tex_0073F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10Tex_0073F0"
+static const ALIGN_ASSET(2) char HAKAdan_room_10Tex_0073F0[] = dHAKAdan_room_10Tex_0073F0;
+
+#define dHAKAdan_room_10DL_0019C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10DL_0019C0"
+static const ALIGN_ASSET(2) char HAKAdan_room_10DL_0019C0[] = dHAKAdan_room_10DL_0019C0;
+
+#define dHAKAdan_room_10DL_002B70 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10DL_002B70"
+static const ALIGN_ASSET(2) char HAKAdan_room_10DL_002B70[] = dHAKAdan_room_10DL_002B70;
 
 #define dHAKAdan_room_10DL_003430 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10DL_003430"
 static const ALIGN_ASSET(2) char HAKAdan_room_10DL_003430[] = dHAKAdan_room_10DL_003430;
@@ -39,9 +42,6 @@ static const ALIGN_ASSET(2) char HAKAdan_room_10DL_0016B8[] = dHAKAdan_room_10DL
 #define dHAKAdan_room_10DL_001440 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10DL_001440"
 static const ALIGN_ASSET(2) char HAKAdan_room_10DL_001440[] = dHAKAdan_room_10DL_001440;
 
-#define dHAKAdan_room_10Tex_005FF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10Tex_005FF0"
-static const ALIGN_ASSET(2) char HAKAdan_room_10Tex_005FF0[] = dHAKAdan_room_10Tex_005FF0;
-
 #define dHAKAdan_room_10DL_003858 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_10DL_003858"
 static const ALIGN_ASSET(2) char HAKAdan_room_10DL_003858[] = dHAKAdan_room_10DL_003858;
 
diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_11.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_11.h
index e25cfb03b..f1f234f36 100644
--- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_11.h
+++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_11.h
@@ -3,39 +3,39 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdan_room_11DL_0008B0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11DL_0008B0"
-static const ALIGN_ASSET(2) char HAKAdan_room_11DL_0008B0[] = dHAKAdan_room_11DL_0008B0;
-
-#define dHAKAdan_room_11Tex_002A60 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11Tex_002A60"
-static const ALIGN_ASSET(2) char HAKAdan_room_11Tex_002A60[] = dHAKAdan_room_11Tex_002A60;
+#define dHAKAdan_room_11Tex_001E60 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11Tex_001E60"
+static const ALIGN_ASSET(2) char HAKAdan_room_11Tex_001E60[] = dHAKAdan_room_11Tex_001E60;
 
 #define dHAKAdan_room_11Tex_002660 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11Tex_002660"
 static const ALIGN_ASSET(2) char HAKAdan_room_11Tex_002660[] = dHAKAdan_room_11Tex_002660;
 
-#define dHAKAdan_room_11DL_001928 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11DL_001928"
-static const ALIGN_ASSET(2) char HAKAdan_room_11DL_001928[] = dHAKAdan_room_11DL_001928;
+#define dHAKAdan_room_11Tex_002A60 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11Tex_002A60"
+static const ALIGN_ASSET(2) char HAKAdan_room_11Tex_002A60[] = dHAKAdan_room_11Tex_002A60;
 
-#define dHAKAdan_room_11Tex_001E60 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11Tex_001E60"
-static const ALIGN_ASSET(2) char HAKAdan_room_11Tex_001E60[] = dHAKAdan_room_11Tex_001E60;
+#define dHAKAdan_room_11Tex_002C60 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11Tex_002C60"
+static const ALIGN_ASSET(2) char HAKAdan_room_11Tex_002C60[] = dHAKAdan_room_11Tex_002C60;
+
+#define dHAKAdan_room_11Tex_003460 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11Tex_003460"
+static const ALIGN_ASSET(2) char HAKAdan_room_11Tex_003460[] = dHAKAdan_room_11Tex_003460;
 
 #define dHAKAdan_room_11Tex_003C60 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11Tex_003C60"
 static const ALIGN_ASSET(2) char HAKAdan_room_11Tex_003C60[] = dHAKAdan_room_11Tex_003C60;
 
+#define dHAKAdan_room_11DL_0008B0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11DL_0008B0"
+static const ALIGN_ASSET(2) char HAKAdan_room_11DL_0008B0[] = dHAKAdan_room_11DL_0008B0;
+
+#define dHAKAdan_room_11DL_001928 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11DL_001928"
+static const ALIGN_ASSET(2) char HAKAdan_room_11DL_001928[] = dHAKAdan_room_11DL_001928;
+
 #define dHAKAdan_room_11DL_0013D0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11DL_0013D0"
 static const ALIGN_ASSET(2) char HAKAdan_room_11DL_0013D0[] = dHAKAdan_room_11DL_0013D0;
 
-#define dHAKAdan_room_11Tex_002C60 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11Tex_002C60"
-static const ALIGN_ASSET(2) char HAKAdan_room_11Tex_002C60[] = dHAKAdan_room_11Tex_002C60;
-
 #define dHAKAdan_room_11DL_001B78 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11DL_001B78"
 static const ALIGN_ASSET(2) char HAKAdan_room_11DL_001B78[] = dHAKAdan_room_11DL_001B78;
 
 #define dHAKAdan_room_11DL_000F30 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11DL_000F30"
 static const ALIGN_ASSET(2) char HAKAdan_room_11DL_000F30[] = dHAKAdan_room_11DL_000F30;
 
-#define dHAKAdan_room_11Tex_003460 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11Tex_003460"
-static const ALIGN_ASSET(2) char HAKAdan_room_11Tex_003460[] = dHAKAdan_room_11Tex_003460;
-
 #define dHAKAdan_room_11DL_001D58 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_11DL_001D58"
 static const ALIGN_ASSET(2) char HAKAdan_room_11DL_001D58[] = dHAKAdan_room_11DL_001D58;
 
diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_12.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_12.h
index b71de72c1..dde09068a 100644
--- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_12.h
+++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_12.h
@@ -3,38 +3,38 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdan_room_12DL_002A88 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12DL_002A88"
-static const ALIGN_ASSET(2) char HAKAdan_room_12DL_002A88[] = dHAKAdan_room_12DL_002A88;
-
-#define dHAKAdan_room_12Tex_003B48 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_003B48"
-static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_003B48[] = dHAKAdan_room_12Tex_003B48;
-
-#define dHAKAdan_room_12Tex_003748 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_003748"
-static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_003748[] = dHAKAdan_room_12Tex_003748;
-
-#define dHAKAdan_room_12Tex_003D48 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_003D48"
-static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_003D48[] = dHAKAdan_room_12Tex_003D48;
-
-#define dHAKAdan_room_12DL_0014F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12DL_0014F0"
-static const ALIGN_ASSET(2) char HAKAdan_room_12DL_0014F0[] = dHAKAdan_room_12DL_0014F0;
-
-#define dHAKAdan_room_12DL_001C60 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12DL_001C60"
-static const ALIGN_ASSET(2) char HAKAdan_room_12DL_001C60[] = dHAKAdan_room_12DL_001C60;
-
-#define dHAKAdan_room_12Tex_004D48 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_004D48"
-static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_004D48[] = dHAKAdan_room_12Tex_004D48;
-
-#define dHAKAdan_room_12DL_000CF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12DL_000CF0"
-static const ALIGN_ASSET(2) char HAKAdan_room_12DL_000CF0[] = dHAKAdan_room_12DL_000CF0;
-
-#define dHAKAdan_room_12Tex_005548 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_005548"
-static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_005548[] = dHAKAdan_room_12Tex_005548;
-
 #define dHAKAdan_room_12Tex_003348 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_003348"
 static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_003348[] = dHAKAdan_room_12Tex_003348;
 
 #define dHAKAdan_room_12Tex_003548 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_003548"
 static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_003548[] = dHAKAdan_room_12Tex_003548;
 
+#define dHAKAdan_room_12Tex_003748 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_003748"
+static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_003748[] = dHAKAdan_room_12Tex_003748;
+
+#define dHAKAdan_room_12Tex_003B48 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_003B48"
+static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_003B48[] = dHAKAdan_room_12Tex_003B48;
+
+#define dHAKAdan_room_12Tex_003D48 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_003D48"
+static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_003D48[] = dHAKAdan_room_12Tex_003D48;
+
+#define dHAKAdan_room_12Tex_004D48 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_004D48"
+static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_004D48[] = dHAKAdan_room_12Tex_004D48;
+
+#define dHAKAdan_room_12Tex_005548 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_005548"
+static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_005548[] = dHAKAdan_room_12Tex_005548;
+
+#define dHAKAdan_room_12DL_002A88 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12DL_002A88"
+static const ALIGN_ASSET(2) char HAKAdan_room_12DL_002A88[] = dHAKAdan_room_12DL_002A88;
+
+#define dHAKAdan_room_12DL_0014F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12DL_0014F0"
+static const ALIGN_ASSET(2) char HAKAdan_room_12DL_0014F0[] = dHAKAdan_room_12DL_0014F0;
+
+#define dHAKAdan_room_12DL_001C60 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12DL_001C60"
+static const ALIGN_ASSET(2) char HAKAdan_room_12DL_001C60[] = dHAKAdan_room_12DL_001C60;
+
+#define dHAKAdan_room_12DL_000CF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12DL_000CF0"
+static const ALIGN_ASSET(2) char HAKAdan_room_12DL_000CF0[] = dHAKAdan_room_12DL_000CF0;
+
 
 #endif // DUNGEONS_HAKADAN_ROOM_12_H
diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_13.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_13.h
index ef3b0cd41..2a4dea0b4 100644
--- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_13.h
+++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_13.h
@@ -3,12 +3,12 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdan_room_13DL_0006E0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_13DL_0006E0"
-static const ALIGN_ASSET(2) char HAKAdan_room_13DL_0006E0[] = dHAKAdan_room_13DL_0006E0;
-
 #define dHAKAdan_room_13Tex_000818 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_13Tex_000818"
 static const ALIGN_ASSET(2) char HAKAdan_room_13Tex_000818[] = dHAKAdan_room_13Tex_000818;
 
+#define dHAKAdan_room_13DL_0006E0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_13DL_0006E0"
+static const ALIGN_ASSET(2) char HAKAdan_room_13DL_0006E0[] = dHAKAdan_room_13DL_0006E0;
+
 #define dHAKAdan_room_13DL_000450 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_13DL_000450"
 static const ALIGN_ASSET(2) char HAKAdan_room_13DL_000450[] = dHAKAdan_room_13DL_000450;
 
diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_14.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_14.h
index 7b99f6eb5..735340083 100644
--- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_14.h
+++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_14.h
@@ -3,38 +3,38 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdan_room_14DL_002D08 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14DL_002D08"
-static const ALIGN_ASSET(2) char HAKAdan_room_14DL_002D08[] = dHAKAdan_room_14DL_002D08;
-
-#define dHAKAdan_room_14Tex_003D00 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14Tex_003D00"
-static const ALIGN_ASSET(2) char HAKAdan_room_14Tex_003D00[] = dHAKAdan_room_14Tex_003D00;
-
-#define dHAKAdan_room_14Tex_003900 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14Tex_003900"
-static const ALIGN_ASSET(2) char HAKAdan_room_14Tex_003900[] = dHAKAdan_room_14Tex_003900;
-
-#define dHAKAdan_room_14Tex_003F00 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14Tex_003F00"
-static const ALIGN_ASSET(2) char HAKAdan_room_14Tex_003F00[] = dHAKAdan_room_14Tex_003F00;
-
-#define dHAKAdan_room_14DL_000470 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14DL_000470"
-static const ALIGN_ASSET(2) char HAKAdan_room_14DL_000470[] = dHAKAdan_room_14DL_000470;
-
-#define dHAKAdan_room_14DL_001AE8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14DL_001AE8"
-static const ALIGN_ASSET(2) char HAKAdan_room_14DL_001AE8[] = dHAKAdan_room_14DL_001AE8;
-
 #define dHAKAdan_room_14Tex_003500 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14Tex_003500"
 static const ALIGN_ASSET(2) char HAKAdan_room_14Tex_003500[] = dHAKAdan_room_14Tex_003500;
 
 #define dHAKAdan_room_14Tex_003700 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14Tex_003700"
 static const ALIGN_ASSET(2) char HAKAdan_room_14Tex_003700[] = dHAKAdan_room_14Tex_003700;
 
-#define dHAKAdan_room_14Tex_005700 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14Tex_005700"
-static const ALIGN_ASSET(2) char HAKAdan_room_14Tex_005700[] = dHAKAdan_room_14Tex_005700;
+#define dHAKAdan_room_14Tex_003900 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14Tex_003900"
+static const ALIGN_ASSET(2) char HAKAdan_room_14Tex_003900[] = dHAKAdan_room_14Tex_003900;
 
-#define dHAKAdan_room_14DL_000DC0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14DL_000DC0"
-static const ALIGN_ASSET(2) char HAKAdan_room_14DL_000DC0[] = dHAKAdan_room_14DL_000DC0;
+#define dHAKAdan_room_14Tex_003D00 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14Tex_003D00"
+static const ALIGN_ASSET(2) char HAKAdan_room_14Tex_003D00[] = dHAKAdan_room_14Tex_003D00;
+
+#define dHAKAdan_room_14Tex_003F00 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14Tex_003F00"
+static const ALIGN_ASSET(2) char HAKAdan_room_14Tex_003F00[] = dHAKAdan_room_14Tex_003F00;
 
 #define dHAKAdan_room_14Tex_004F00 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14Tex_004F00"
 static const ALIGN_ASSET(2) char HAKAdan_room_14Tex_004F00[] = dHAKAdan_room_14Tex_004F00;
 
+#define dHAKAdan_room_14Tex_005700 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14Tex_005700"
+static const ALIGN_ASSET(2) char HAKAdan_room_14Tex_005700[] = dHAKAdan_room_14Tex_005700;
+
+#define dHAKAdan_room_14DL_002D08 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14DL_002D08"
+static const ALIGN_ASSET(2) char HAKAdan_room_14DL_002D08[] = dHAKAdan_room_14DL_002D08;
+
+#define dHAKAdan_room_14DL_000470 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14DL_000470"
+static const ALIGN_ASSET(2) char HAKAdan_room_14DL_000470[] = dHAKAdan_room_14DL_000470;
+
+#define dHAKAdan_room_14DL_001AE8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14DL_001AE8"
+static const ALIGN_ASSET(2) char HAKAdan_room_14DL_001AE8[] = dHAKAdan_room_14DL_001AE8;
+
+#define dHAKAdan_room_14DL_000DC0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_14DL_000DC0"
+static const ALIGN_ASSET(2) char HAKAdan_room_14DL_000DC0[] = dHAKAdan_room_14DL_000DC0;
+
 
 #endif // DUNGEONS_HAKADAN_ROOM_14_H
diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_15.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_15.h
index 5bae3d3dd..101bd4482 100644
--- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_15.h
+++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_15.h
@@ -3,38 +3,38 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdan_room_15DL_003340 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15DL_003340"
-static const ALIGN_ASSET(2) char HAKAdan_room_15DL_003340[] = dHAKAdan_room_15DL_003340;
-
-#define dHAKAdan_room_15Tex_005EC0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15Tex_005EC0"
-static const ALIGN_ASSET(2) char HAKAdan_room_15Tex_005EC0[] = dHAKAdan_room_15Tex_005EC0;
-
-#define dHAKAdan_room_15Tex_005AC0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15Tex_005AC0"
-static const ALIGN_ASSET(2) char HAKAdan_room_15Tex_005AC0[] = dHAKAdan_room_15Tex_005AC0;
-
-#define dHAKAdan_room_15DL_004428 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15DL_004428"
-static const ALIGN_ASSET(2) char HAKAdan_room_15DL_004428[] = dHAKAdan_room_15DL_004428;
-
-#define dHAKAdan_room_15DL_001350 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15DL_001350"
-static const ALIGN_ASSET(2) char HAKAdan_room_15DL_001350[] = dHAKAdan_room_15DL_001350;
-
-#define dHAKAdan_room_15Tex_0070C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15Tex_0070C0"
-static const ALIGN_ASSET(2) char HAKAdan_room_15Tex_0070C0[] = dHAKAdan_room_15Tex_0070C0;
-
 #define dHAKAdan_room_15Tex_0056C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15Tex_0056C0"
 static const ALIGN_ASSET(2) char HAKAdan_room_15Tex_0056C0[] = dHAKAdan_room_15Tex_0056C0;
 
 #define dHAKAdan_room_15Tex_0058C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15Tex_0058C0"
 static const ALIGN_ASSET(2) char HAKAdan_room_15Tex_0058C0[] = dHAKAdan_room_15Tex_0058C0;
 
-#define dHAKAdan_room_15DL_0053B0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15DL_0053B0"
-static const ALIGN_ASSET(2) char HAKAdan_room_15DL_0053B0[] = dHAKAdan_room_15DL_0053B0;
+#define dHAKAdan_room_15Tex_005AC0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15Tex_005AC0"
+static const ALIGN_ASSET(2) char HAKAdan_room_15Tex_005AC0[] = dHAKAdan_room_15Tex_005AC0;
 
-#define dHAKAdan_room_15Tex_0068C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15Tex_0068C0"
-static const ALIGN_ASSET(2) char HAKAdan_room_15Tex_0068C0[] = dHAKAdan_room_15Tex_0068C0;
+#define dHAKAdan_room_15Tex_005EC0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15Tex_005EC0"
+static const ALIGN_ASSET(2) char HAKAdan_room_15Tex_005EC0[] = dHAKAdan_room_15Tex_005EC0;
 
 #define dHAKAdan_room_15Tex_0060C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15Tex_0060C0"
 static const ALIGN_ASSET(2) char HAKAdan_room_15Tex_0060C0[] = dHAKAdan_room_15Tex_0060C0;
 
+#define dHAKAdan_room_15Tex_0068C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15Tex_0068C0"
+static const ALIGN_ASSET(2) char HAKAdan_room_15Tex_0068C0[] = dHAKAdan_room_15Tex_0068C0;
+
+#define dHAKAdan_room_15Tex_0070C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15Tex_0070C0"
+static const ALIGN_ASSET(2) char HAKAdan_room_15Tex_0070C0[] = dHAKAdan_room_15Tex_0070C0;
+
+#define dHAKAdan_room_15DL_003340 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15DL_003340"
+static const ALIGN_ASSET(2) char HAKAdan_room_15DL_003340[] = dHAKAdan_room_15DL_003340;
+
+#define dHAKAdan_room_15DL_004428 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15DL_004428"
+static const ALIGN_ASSET(2) char HAKAdan_room_15DL_004428[] = dHAKAdan_room_15DL_004428;
+
+#define dHAKAdan_room_15DL_001350 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15DL_001350"
+static const ALIGN_ASSET(2) char HAKAdan_room_15DL_001350[] = dHAKAdan_room_15DL_001350;
+
+#define dHAKAdan_room_15DL_0053B0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_15DL_0053B0"
+static const ALIGN_ASSET(2) char HAKAdan_room_15DL_0053B0[] = dHAKAdan_room_15DL_0053B0;
+
 
 #endif // DUNGEONS_HAKADAN_ROOM_15_H
diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_16.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_16.h
index f6b0ce048..c35a4b434 100644
--- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_16.h
+++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_16.h
@@ -3,12 +3,12 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdan_room_16DL_001858 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_16DL_001858"
-static const ALIGN_ASSET(2) char HAKAdan_room_16DL_001858[] = dHAKAdan_room_16DL_001858;
-
 #define dHAKAdan_room_16Tex_001930 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_16Tex_001930"
 static const ALIGN_ASSET(2) char HAKAdan_room_16Tex_001930[] = dHAKAdan_room_16Tex_001930;
 
+#define dHAKAdan_room_16DL_001858 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_16DL_001858"
+static const ALIGN_ASSET(2) char HAKAdan_room_16DL_001858[] = dHAKAdan_room_16DL_001858;
+
 #define dHAKAdan_room_16DL_001400 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_16DL_001400"
 static const ALIGN_ASSET(2) char HAKAdan_room_16DL_001400[] = dHAKAdan_room_16DL_001400;
 
diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_17.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_17.h
index 9a86ffebd..bd7eaee03 100644
--- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_17.h
+++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_17.h
@@ -3,24 +3,27 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdan_room_17DL_000D28 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_17DL_000D28"
-static const ALIGN_ASSET(2) char HAKAdan_room_17DL_000D28[] = dHAKAdan_room_17DL_000D28;
-
 #define dHAKAdan_room_17Tex_001248 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_17Tex_001248"
 static const ALIGN_ASSET(2) char HAKAdan_room_17Tex_001248[] = dHAKAdan_room_17Tex_001248;
 
-#define dHAKAdan_room_17Tex_002048 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_17Tex_002048"
-static const ALIGN_ASSET(2) char HAKAdan_room_17Tex_002048[] = dHAKAdan_room_17Tex_002048;
+#define dHAKAdan_room_17Tex_001448 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_17Tex_001448"
+static const ALIGN_ASSET(2) char HAKAdan_room_17Tex_001448[] = dHAKAdan_room_17Tex_001448;
 
 #define dHAKAdan_room_17Tex_001C48 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_17Tex_001C48"
 static const ALIGN_ASSET(2) char HAKAdan_room_17Tex_001C48[] = dHAKAdan_room_17Tex_001C48;
 
+#define dHAKAdan_room_17Tex_002048 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_17Tex_002048"
+static const ALIGN_ASSET(2) char HAKAdan_room_17Tex_002048[] = dHAKAdan_room_17Tex_002048;
+
+#define dHAKAdan_room_17Tex_0025D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_17Tex_0025D8"
+static const ALIGN_ASSET(2) char HAKAdan_room_17Tex_0025D8[] = dHAKAdan_room_17Tex_0025D8;
+
+#define dHAKAdan_room_17DL_000D28 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_17DL_000D28"
+static const ALIGN_ASSET(2) char HAKAdan_room_17DL_000D28[] = dHAKAdan_room_17DL_000D28;
+
 #define dHAKAdan_room_17DL_000610 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_17DL_000610"
 static const ALIGN_ASSET(2) char HAKAdan_room_17DL_000610[] = dHAKAdan_room_17DL_000610;
 
-#define dHAKAdan_room_17Tex_001448 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_17Tex_001448"
-static const ALIGN_ASSET(2) char HAKAdan_room_17Tex_001448[] = dHAKAdan_room_17Tex_001448;
-
 #define dHAKAdan_room_17DL_001128 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_17DL_001128"
 static const ALIGN_ASSET(2) char HAKAdan_room_17DL_001128[] = dHAKAdan_room_17DL_001128;
 
@@ -30,8 +33,5 @@ static const ALIGN_ASSET(2) char HAKAdan_room_17DL_000400[] = dHAKAdan_room_17DL
 #define dHAKAdan_room_17DL_002510 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_17DL_002510"
 static const ALIGN_ASSET(2) char HAKAdan_room_17DL_002510[] = dHAKAdan_room_17DL_002510;
 
-#define dHAKAdan_room_17Tex_0025D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_17Tex_0025D8"
-static const ALIGN_ASSET(2) char HAKAdan_room_17Tex_0025D8[] = dHAKAdan_room_17Tex_0025D8;
-
 
 #endif // DUNGEONS_HAKADAN_ROOM_17_H
diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_18.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_18.h
index 3bf496856..2bc5db12e 100644
--- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_18.h
+++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_18.h
@@ -3,23 +3,20 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdan_room_18DL_0032A0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18DL_0032A0"
-static const ALIGN_ASSET(2) char HAKAdan_room_18DL_0032A0[] = dHAKAdan_room_18DL_0032A0;
-
-#define dHAKAdan_room_18Tex_00C708 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00C708"
-static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00C708[] = dHAKAdan_room_18Tex_00C708;
+#define dHAKAdan_room_18Tex_00B908 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00B908"
+static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00B908[] = dHAKAdan_room_18Tex_00B908;
 
 #define dHAKAdan_room_18Tex_00BB08 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00BB08"
 static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00BB08[] = dHAKAdan_room_18Tex_00BB08;
 
-#define dHAKAdan_room_18Tex_00CF08 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00CF08"
-static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00CF08[] = dHAKAdan_room_18Tex_00CF08;
+#define dHAKAdan_room_18Tex_00BF08 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00BF08"
+static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00BF08[] = dHAKAdan_room_18Tex_00BF08;
 
-#define dHAKAdan_room_18DL_000560 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18DL_000560"
-static const ALIGN_ASSET(2) char HAKAdan_room_18DL_000560[] = dHAKAdan_room_18DL_000560;
+#define dHAKAdan_room_18Tex_00C708 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00C708"
+static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00C708[] = dHAKAdan_room_18Tex_00C708;
 
-#define dHAKAdan_room_18DL_001298 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18DL_001298"
-static const ALIGN_ASSET(2) char HAKAdan_room_18DL_001298[] = dHAKAdan_room_18DL_001298;
+#define dHAKAdan_room_18Tex_00C908 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00C908"
+static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00C908[] = dHAKAdan_room_18Tex_00C908;
 
 #define dHAKAdan_room_18Tex_00CB08 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00CB08"
 static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00CB08[] = dHAKAdan_room_18Tex_00CB08;
@@ -27,11 +24,17 @@ static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00CB08[] = dHAKAdan_room_18T
 #define dHAKAdan_room_18Tex_00CD08 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00CD08"
 static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00CD08[] = dHAKAdan_room_18Tex_00CD08;
 
-#define dHAKAdan_room_18Tex_00C908 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00C908"
-static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00C908[] = dHAKAdan_room_18Tex_00C908;
+#define dHAKAdan_room_18Tex_00CF08 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00CF08"
+static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00CF08[] = dHAKAdan_room_18Tex_00CF08;
 
-#define dHAKAdan_room_18Tex_00B908 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00B908"
-static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00B908[] = dHAKAdan_room_18Tex_00B908;
+#define dHAKAdan_room_18DL_0032A0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18DL_0032A0"
+static const ALIGN_ASSET(2) char HAKAdan_room_18DL_0032A0[] = dHAKAdan_room_18DL_0032A0;
+
+#define dHAKAdan_room_18DL_000560 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18DL_000560"
+static const ALIGN_ASSET(2) char HAKAdan_room_18DL_000560[] = dHAKAdan_room_18DL_000560;
+
+#define dHAKAdan_room_18DL_001298 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18DL_001298"
+static const ALIGN_ASSET(2) char HAKAdan_room_18DL_001298[] = dHAKAdan_room_18DL_001298;
 
 #define dHAKAdan_room_18DL_004928 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18DL_004928"
 static const ALIGN_ASSET(2) char HAKAdan_room_18DL_004928[] = dHAKAdan_room_18DL_004928;
@@ -51,9 +54,6 @@ static const ALIGN_ASSET(2) char HAKAdan_room_18DL_009D28[] = dHAKAdan_room_18DL
 #define dHAKAdan_room_18DL_003BD0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18DL_003BD0"
 static const ALIGN_ASSET(2) char HAKAdan_room_18DL_003BD0[] = dHAKAdan_room_18DL_003BD0;
 
-#define dHAKAdan_room_18Tex_00BF08 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18Tex_00BF08"
-static const ALIGN_ASSET(2) char HAKAdan_room_18Tex_00BF08[] = dHAKAdan_room_18Tex_00BF08;
-
 #define dHAKAdan_room_18DL_002708 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_18DL_002708"
 static const ALIGN_ASSET(2) char HAKAdan_room_18DL_002708[] = dHAKAdan_room_18DL_002708;
 
diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_19.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_19.h
index b6204a4fd..0cd07b136 100644
--- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_19.h
+++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_19.h
@@ -3,18 +3,18 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdan_room_19DL_0011E0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_19DL_0011E0"
-static const ALIGN_ASSET(2) char HAKAdan_room_19DL_0011E0[] = dHAKAdan_room_19DL_0011E0;
+#define dHAKAdan_room_19Tex_001578 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_19Tex_001578"
+static const ALIGN_ASSET(2) char HAKAdan_room_19Tex_001578[] = dHAKAdan_room_19Tex_001578;
 
 #define dHAKAdan_room_19Tex_002578 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_19Tex_002578"
 static const ALIGN_ASSET(2) char HAKAdan_room_19Tex_002578[] = dHAKAdan_room_19Tex_002578;
 
+#define dHAKAdan_room_19DL_0011E0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_19DL_0011E0"
+static const ALIGN_ASSET(2) char HAKAdan_room_19DL_0011E0[] = dHAKAdan_room_19DL_0011E0;
+
 #define dHAKAdan_room_19DL_001490 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_19DL_001490"
 static const ALIGN_ASSET(2) char HAKAdan_room_19DL_001490[] = dHAKAdan_room_19DL_001490;
 
-#define dHAKAdan_room_19Tex_001578 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_19Tex_001578"
-static const ALIGN_ASSET(2) char HAKAdan_room_19Tex_001578[] = dHAKAdan_room_19Tex_001578;
-
 #define dHAKAdan_room_19DL_000290 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_19DL_000290"
 static const ALIGN_ASSET(2) char HAKAdan_room_19DL_000290[] = dHAKAdan_room_19DL_000290;
 
diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_2.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_2.h
index 59e816a2e..76ac06d05 100644
--- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_2.h
+++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_2.h
@@ -3,17 +3,41 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdan_room_2DL_004960 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2DL_004960"
-static const ALIGN_ASSET(2) char HAKAdan_room_2DL_004960[] = dHAKAdan_room_2DL_004960;
+#define dHAKAdan_room_2Tex_006BD8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_006BD8"
+static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_006BD8[] = dHAKAdan_room_2Tex_006BD8;
 
-#define dHAKAdan_room_2Tex_0081D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_0081D8"
-static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_0081D8[] = dHAKAdan_room_2Tex_0081D8;
+#define dHAKAdan_room_2Tex_0073D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_0073D8"
+static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_0073D8[] = dHAKAdan_room_2Tex_0073D8;
+
+#define dHAKAdan_room_2Tex_0077D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_0077D8"
+static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_0077D8[] = dHAKAdan_room_2Tex_0077D8;
 
 #define dHAKAdan_room_2Tex_007FD8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_007FD8"
 static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_007FD8[] = dHAKAdan_room_2Tex_007FD8;
 
-#define dHAKAdan_room_2Tex_0073D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_0073D8"
-static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_0073D8[] = dHAKAdan_room_2Tex_0073D8;
+#define dHAKAdan_room_2Tex_0081D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_0081D8"
+static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_0081D8[] = dHAKAdan_room_2Tex_0081D8;
+
+#define dHAKAdan_room_2Tex_0091D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_0091D8"
+static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_0091D8[] = dHAKAdan_room_2Tex_0091D8;
+
+#define dHAKAdan_room_2Tex_0099D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_0099D8"
+static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_0099D8[] = dHAKAdan_room_2Tex_0099D8;
+
+#define dHAKAdan_room_2Tex_009BD8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_009BD8"
+static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_009BD8[] = dHAKAdan_room_2Tex_009BD8;
+
+#define dHAKAdan_room_2Tex_00A3D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_00A3D8"
+static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_00A3D8[] = dHAKAdan_room_2Tex_00A3D8;
+
+#define dHAKAdan_room_2Tex_00A5D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_00A5D8"
+static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_00A5D8[] = dHAKAdan_room_2Tex_00A5D8;
+
+#define dHAKAdan_room_2Tex_00A7D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_00A7D8"
+static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_00A7D8[] = dHAKAdan_room_2Tex_00A7D8;
+
+#define dHAKAdan_room_2DL_004960 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2DL_004960"
+static const ALIGN_ASSET(2) char HAKAdan_room_2DL_004960[] = dHAKAdan_room_2DL_004960;
 
 #define dHAKAdan_room_2DL_006828 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2DL_006828"
 static const ALIGN_ASSET(2) char HAKAdan_room_2DL_006828[] = dHAKAdan_room_2DL_006828;
@@ -24,39 +48,15 @@ static const ALIGN_ASSET(2) char HAKAdan_room_2DL_005260[] = dHAKAdan_room_2DL_0
 #define dHAKAdan_room_2DL_006A90 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2DL_006A90"
 static const ALIGN_ASSET(2) char HAKAdan_room_2DL_006A90[] = dHAKAdan_room_2DL_006A90;
 
-#define dHAKAdan_room_2Tex_0077D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_0077D8"
-static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_0077D8[] = dHAKAdan_room_2Tex_0077D8;
-
 #define dHAKAdan_room_2DL_002248 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2DL_002248"
 static const ALIGN_ASSET(2) char HAKAdan_room_2DL_002248[] = dHAKAdan_room_2DL_002248;
 
-#define dHAKAdan_room_2Tex_0091D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_0091D8"
-static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_0091D8[] = dHAKAdan_room_2Tex_0091D8;
-
 #define dHAKAdan_room_2DL_003570 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2DL_003570"
 static const ALIGN_ASSET(2) char HAKAdan_room_2DL_003570[] = dHAKAdan_room_2DL_003570;
 
-#define dHAKAdan_room_2Tex_00A3D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_00A3D8"
-static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_00A3D8[] = dHAKAdan_room_2Tex_00A3D8;
-
-#define dHAKAdan_room_2Tex_00A7D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_00A7D8"
-static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_00A7D8[] = dHAKAdan_room_2Tex_00A7D8;
-
-#define dHAKAdan_room_2Tex_00A5D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_00A5D8"
-static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_00A5D8[] = dHAKAdan_room_2Tex_00A5D8;
-
-#define dHAKAdan_room_2Tex_0099D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_0099D8"
-static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_0099D8[] = dHAKAdan_room_2Tex_0099D8;
-
-#define dHAKAdan_room_2Tex_006BD8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_006BD8"
-static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_006BD8[] = dHAKAdan_room_2Tex_006BD8;
-
 #define dHAKAdan_room_2DL_005B28 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2DL_005B28"
 static const ALIGN_ASSET(2) char HAKAdan_room_2DL_005B28[] = dHAKAdan_room_2DL_005B28;
 
-#define dHAKAdan_room_2Tex_009BD8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2Tex_009BD8"
-static const ALIGN_ASSET(2) char HAKAdan_room_2Tex_009BD8[] = dHAKAdan_room_2Tex_009BD8;
-
 #define dHAKAdan_room_2DL_006158 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_2DL_006158"
 static const ALIGN_ASSET(2) char HAKAdan_room_2DL_006158[] = dHAKAdan_room_2DL_006158;
 
diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_20.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_20.h
index 227a653c7..216f497c3 100644
--- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_20.h
+++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_20.h
@@ -3,12 +3,12 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdan_room_20DL_0013D0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_20DL_0013D0"
-static const ALIGN_ASSET(2) char HAKAdan_room_20DL_0013D0[] = dHAKAdan_room_20DL_0013D0;
-
 #define dHAKAdan_room_20Tex_001640 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_20Tex_001640"
 static const ALIGN_ASSET(2) char HAKAdan_room_20Tex_001640[] = dHAKAdan_room_20Tex_001640;
 
+#define dHAKAdan_room_20DL_0013D0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_20DL_0013D0"
+static const ALIGN_ASSET(2) char HAKAdan_room_20DL_0013D0[] = dHAKAdan_room_20DL_0013D0;
+
 #define dHAKAdan_room_20DL_0002B0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_20DL_0002B0"
 static const ALIGN_ASSET(2) char HAKAdan_room_20DL_0002B0[] = dHAKAdan_room_20DL_0002B0;
 
diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_21.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_21.h
index 05e5a58bc..5fa148a10 100644
--- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_21.h
+++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_21.h
@@ -3,17 +3,14 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdan_room_21DL_006690 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21DL_006690"
-static const ALIGN_ASSET(2) char HAKAdan_room_21DL_006690[] = dHAKAdan_room_21DL_006690;
-
-#define dHAKAdan_room_21Tex_007800 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21Tex_007800"
-static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_007800[] = dHAKAdan_room_21Tex_007800;
+#define dHAKAdan_room_21Tex_006E00 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21Tex_006E00"
+static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_006E00[] = dHAKAdan_room_21Tex_006E00;
 
 #define dHAKAdan_room_21Tex_007600 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21Tex_007600"
 static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_007600[] = dHAKAdan_room_21Tex_007600;
 
-#define dHAKAdan_room_21Tex_009800 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21Tex_009800"
-static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_009800[] = dHAKAdan_room_21Tex_009800;
+#define dHAKAdan_room_21Tex_007800 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21Tex_007800"
+static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_007800[] = dHAKAdan_room_21Tex_007800;
 
 #define dHAKAdan_room_21Tex_008800 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21Tex_008800"
 static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_008800[] = dHAKAdan_room_21Tex_008800;
@@ -21,21 +18,33 @@ static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_008800[] = dHAKAdan_room_21T
 #define dHAKAdan_room_21Tex_009000 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21Tex_009000"
 static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_009000[] = dHAKAdan_room_21Tex_009000;
 
-#define dHAKAdan_room_21DL_001A60 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21DL_001A60"
-static const ALIGN_ASSET(2) char HAKAdan_room_21DL_001A60[] = dHAKAdan_room_21DL_001A60;
+#define dHAKAdan_room_21Tex_009800 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21Tex_009800"
+static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_009800[] = dHAKAdan_room_21Tex_009800;
+
+#define dHAKAdan_room_21Tex_00A000 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21Tex_00A000"
+static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_00A000[] = dHAKAdan_room_21Tex_00A000;
 
 #define dHAKAdan_room_21Tex_00A800 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21Tex_00A800"
 static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_00A800[] = dHAKAdan_room_21Tex_00A800;
 
+#define dHAKAdan_room_21Tex_00AA00 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21Tex_00AA00"
+static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_00AA00[] = dHAKAdan_room_21Tex_00AA00;
+
+#define dHAKAdan_room_21Tex_00ADA8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21Tex_00ADA8"
+static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_00ADA8[] = dHAKAdan_room_21Tex_00ADA8;
+
+#define dHAKAdan_room_21DL_006690 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21DL_006690"
+static const ALIGN_ASSET(2) char HAKAdan_room_21DL_006690[] = dHAKAdan_room_21DL_006690;
+
+#define dHAKAdan_room_21DL_001A60 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21DL_001A60"
+static const ALIGN_ASSET(2) char HAKAdan_room_21DL_001A60[] = dHAKAdan_room_21DL_001A60;
+
 #define dHAKAdan_room_21DL_005110 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21DL_005110"
 static const ALIGN_ASSET(2) char HAKAdan_room_21DL_005110[] = dHAKAdan_room_21DL_005110;
 
 #define dHAKAdan_room_21DL_003DB8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21DL_003DB8"
 static const ALIGN_ASSET(2) char HAKAdan_room_21DL_003DB8[] = dHAKAdan_room_21DL_003DB8;
 
-#define dHAKAdan_room_21Tex_00AA00 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21Tex_00AA00"
-static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_00AA00[] = dHAKAdan_room_21Tex_00AA00;
-
 #define dHAKAdan_room_21DL_000AA8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21DL_000AA8"
 static const ALIGN_ASSET(2) char HAKAdan_room_21DL_000AA8[] = dHAKAdan_room_21DL_000AA8;
 
@@ -48,24 +57,15 @@ static const ALIGN_ASSET(2) char HAKAdan_room_21DL_000710[] = dHAKAdan_room_21DL
 #define dHAKAdan_room_21DL_00ACC0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21DL_00ACC0"
 static const ALIGN_ASSET(2) char HAKAdan_room_21DL_00ACC0[] = dHAKAdan_room_21DL_00ACC0;
 
-#define dHAKAdan_room_21Tex_00ADA8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21Tex_00ADA8"
-static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_00ADA8[] = dHAKAdan_room_21Tex_00ADA8;
-
 #define dHAKAdan_room_21DL_005500 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21DL_005500"
 static const ALIGN_ASSET(2) char HAKAdan_room_21DL_005500[] = dHAKAdan_room_21DL_005500;
 
-#define dHAKAdan_room_21Tex_006E00 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21Tex_006E00"
-static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_006E00[] = dHAKAdan_room_21Tex_006E00;
-
 #define dHAKAdan_room_21DL_002CE8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21DL_002CE8"
 static const ALIGN_ASSET(2) char HAKAdan_room_21DL_002CE8[] = dHAKAdan_room_21DL_002CE8;
 
 #define dHAKAdan_room_21DL_0010D0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21DL_0010D0"
 static const ALIGN_ASSET(2) char HAKAdan_room_21DL_0010D0[] = dHAKAdan_room_21DL_0010D0;
 
-#define dHAKAdan_room_21Tex_00A000 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21Tex_00A000"
-static const ALIGN_ASSET(2) char HAKAdan_room_21Tex_00A000[] = dHAKAdan_room_21Tex_00A000;
-
 #define dHAKAdan_room_21DL_0047A0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_21DL_0047A0"
 static const ALIGN_ASSET(2) char HAKAdan_room_21DL_0047A0[] = dHAKAdan_room_21DL_0047A0;
 
diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_22.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_22.h
index ced6150dd..275f3b4aa 100644
--- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_22.h
+++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_22.h
@@ -3,17 +3,17 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdan_room_22DL_000B00 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_22DL_000B00"
-static const ALIGN_ASSET(2) char HAKAdan_room_22DL_000B00[] = dHAKAdan_room_22DL_000B00;
+#define dHAKAdan_room_22Tex_000FA8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_22Tex_000FA8"
+static const ALIGN_ASSET(2) char HAKAdan_room_22Tex_000FA8[] = dHAKAdan_room_22Tex_000FA8;
 
 #define dHAKAdan_room_22Tex_0011A8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_22Tex_0011A8"
 static const ALIGN_ASSET(2) char HAKAdan_room_22Tex_0011A8[] = dHAKAdan_room_22Tex_0011A8;
 
-#define dHAKAdan_room_22Tex_000FA8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_22Tex_000FA8"
-static const ALIGN_ASSET(2) char HAKAdan_room_22Tex_000FA8[] = dHAKAdan_room_22Tex_000FA8;
-
 #define dHAKAdan_room_22Tex_0021A8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_22Tex_0021A8"
 static const ALIGN_ASSET(2) char HAKAdan_room_22Tex_0021A8[] = dHAKAdan_room_22Tex_0021A8;
 
+#define dHAKAdan_room_22DL_000B00 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_22DL_000B00"
+static const ALIGN_ASSET(2) char HAKAdan_room_22DL_000B00[] = dHAKAdan_room_22DL_000B00;
+
 
 #endif // DUNGEONS_HAKADAN_ROOM_22_H
diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_3.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_3.h
index 8a0ddbec1..0e68a61ce 100644
--- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_3.h
+++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_3.h
@@ -3,8 +3,11 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdan_room_3DL_000CB0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_3DL_000CB0"
-static const ALIGN_ASSET(2) char HAKAdan_room_3DL_000CB0[] = dHAKAdan_room_3DL_000CB0;
+#define dHAKAdan_room_3Tex_001578 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_3Tex_001578"
+static const ALIGN_ASSET(2) char HAKAdan_room_3Tex_001578[] = dHAKAdan_room_3Tex_001578;
+
+#define dHAKAdan_room_3Tex_001D78 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_3Tex_001D78"
+static const ALIGN_ASSET(2) char HAKAdan_room_3Tex_001D78[] = dHAKAdan_room_3Tex_001D78;
 
 #define dHAKAdan_room_3Tex_002578 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_3Tex_002578"
 static const ALIGN_ASSET(2) char HAKAdan_room_3Tex_002578[] = dHAKAdan_room_3Tex_002578;
@@ -12,18 +15,15 @@ static const ALIGN_ASSET(2) char HAKAdan_room_3Tex_002578[] = dHAKAdan_room_3Tex
 #define dHAKAdan_room_3Tex_002778 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_3Tex_002778"
 static const ALIGN_ASSET(2) char HAKAdan_room_3Tex_002778[] = dHAKAdan_room_3Tex_002778;
 
+#define dHAKAdan_room_3DL_000CB0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_3DL_000CB0"
+static const ALIGN_ASSET(2) char HAKAdan_room_3DL_000CB0[] = dHAKAdan_room_3DL_000CB0;
+
 #define dHAKAdan_room_3DL_001420 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_3DL_001420"
 static const ALIGN_ASSET(2) char HAKAdan_room_3DL_001420[] = dHAKAdan_room_3DL_001420;
 
 #define dHAKAdan_room_3DL_000750 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_3DL_000750"
 static const ALIGN_ASSET(2) char HAKAdan_room_3DL_000750[] = dHAKAdan_room_3DL_000750;
 
-#define dHAKAdan_room_3Tex_001D78 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_3Tex_001D78"
-static const ALIGN_ASSET(2) char HAKAdan_room_3Tex_001D78[] = dHAKAdan_room_3Tex_001D78;
-
-#define dHAKAdan_room_3Tex_001578 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_3Tex_001578"
-static const ALIGN_ASSET(2) char HAKAdan_room_3Tex_001578[] = dHAKAdan_room_3Tex_001578;
-
 #define dHAKAdan_room_3DL_0011B0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_3DL_0011B0"
 static const ALIGN_ASSET(2) char HAKAdan_room_3DL_0011B0[] = dHAKAdan_room_3DL_0011B0;
 
diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_4.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_4.h
index 8398ab19e..21dfd2927 100644
--- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_4.h
+++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_4.h
@@ -3,12 +3,12 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdan_room_4DL_001230 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_4DL_001230"
-static const ALIGN_ASSET(2) char HAKAdan_room_4DL_001230[] = dHAKAdan_room_4DL_001230;
-
 #define dHAKAdan_room_4Tex_001458 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_4Tex_001458"
 static const ALIGN_ASSET(2) char HAKAdan_room_4Tex_001458[] = dHAKAdan_room_4Tex_001458;
 
+#define dHAKAdan_room_4DL_001230 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_4DL_001230"
+static const ALIGN_ASSET(2) char HAKAdan_room_4DL_001230[] = dHAKAdan_room_4DL_001230;
+
 #define dHAKAdan_room_4DL_000280 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_4DL_000280"
 static const ALIGN_ASSET(2) char HAKAdan_room_4DL_000280[] = dHAKAdan_room_4DL_000280;
 
diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_5.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_5.h
index 76c87596f..1063fa1d6 100644
--- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_5.h
+++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_5.h
@@ -3,14 +3,23 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdan_room_5DL_002E10 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_5DL_002E10"
-static const ALIGN_ASSET(2) char HAKAdan_room_5DL_002E10[] = dHAKAdan_room_5DL_002E10;
+#define dHAKAdan_room_5Tex_003CC0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_5Tex_003CC0"
+static const ALIGN_ASSET(2) char HAKAdan_room_5Tex_003CC0[] = dHAKAdan_room_5Tex_003CC0;
+
+#define dHAKAdan_room_5Tex_0040C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_5Tex_0040C0"
+static const ALIGN_ASSET(2) char HAKAdan_room_5Tex_0040C0[] = dHAKAdan_room_5Tex_0040C0;
 
 #define dHAKAdan_room_5Tex_0048C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_5Tex_0048C0"
 static const ALIGN_ASSET(2) char HAKAdan_room_5Tex_0048C0[] = dHAKAdan_room_5Tex_0048C0;
 
-#define dHAKAdan_room_5Tex_003CC0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_5Tex_003CC0"
-static const ALIGN_ASSET(2) char HAKAdan_room_5Tex_003CC0[] = dHAKAdan_room_5Tex_003CC0;
+#define dHAKAdan_room_5Tex_004AC0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_5Tex_004AC0"
+static const ALIGN_ASSET(2) char HAKAdan_room_5Tex_004AC0[] = dHAKAdan_room_5Tex_004AC0;
+
+#define dHAKAdan_room_5Tex_0052C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_5Tex_0052C0"
+static const ALIGN_ASSET(2) char HAKAdan_room_5Tex_0052C0[] = dHAKAdan_room_5Tex_0052C0;
+
+#define dHAKAdan_room_5DL_002E10 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_5DL_002E10"
+static const ALIGN_ASSET(2) char HAKAdan_room_5DL_002E10[] = dHAKAdan_room_5DL_002E10;
 
 #define dHAKAdan_room_5DL_003398 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_5DL_003398"
 static const ALIGN_ASSET(2) char HAKAdan_room_5DL_003398[] = dHAKAdan_room_5DL_003398;
@@ -18,21 +27,12 @@ static const ALIGN_ASSET(2) char HAKAdan_room_5DL_003398[] = dHAKAdan_room_5DL_0
 #define dHAKAdan_room_5DL_003938 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_5DL_003938"
 static const ALIGN_ASSET(2) char HAKAdan_room_5DL_003938[] = dHAKAdan_room_5DL_003938;
 
-#define dHAKAdan_room_5Tex_004AC0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_5Tex_004AC0"
-static const ALIGN_ASSET(2) char HAKAdan_room_5Tex_004AC0[] = dHAKAdan_room_5Tex_004AC0;
-
 #define dHAKAdan_room_5DL_0001F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_5DL_0001F0"
 static const ALIGN_ASSET(2) char HAKAdan_room_5DL_0001F0[] = dHAKAdan_room_5DL_0001F0;
 
-#define dHAKAdan_room_5Tex_0040C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_5Tex_0040C0"
-static const ALIGN_ASSET(2) char HAKAdan_room_5Tex_0040C0[] = dHAKAdan_room_5Tex_0040C0;
-
 #define dHAKAdan_room_5DL_003B88 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_5DL_003B88"
 static const ALIGN_ASSET(2) char HAKAdan_room_5DL_003B88[] = dHAKAdan_room_5DL_003B88;
 
-#define dHAKAdan_room_5Tex_0052C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_5Tex_0052C0"
-static const ALIGN_ASSET(2) char HAKAdan_room_5Tex_0052C0[] = dHAKAdan_room_5Tex_0052C0;
-
 #define dHAKAdan_room_5DL_0019E8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_5DL_0019E8"
 static const ALIGN_ASSET(2) char HAKAdan_room_5DL_0019E8[] = dHAKAdan_room_5DL_0019E8;
 
diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_6.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_6.h
index df746e0ef..93d89f4c2 100644
--- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_6.h
+++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_6.h
@@ -3,23 +3,26 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdan_room_6DL_004178 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6DL_004178"
-static const ALIGN_ASSET(2) char HAKAdan_room_6DL_004178[] = dHAKAdan_room_6DL_004178;
+#define dHAKAdan_room_6Tex_004BF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6Tex_004BF0"
+static const ALIGN_ASSET(2) char HAKAdan_room_6Tex_004BF0[] = dHAKAdan_room_6Tex_004BF0;
 
-#define dHAKAdan_room_6Tex_0071F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6Tex_0071F0"
-static const ALIGN_ASSET(2) char HAKAdan_room_6Tex_0071F0[] = dHAKAdan_room_6Tex_0071F0;
+#define dHAKAdan_room_6Tex_0053F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6Tex_0053F0"
+static const ALIGN_ASSET(2) char HAKAdan_room_6Tex_0053F0[] = dHAKAdan_room_6Tex_0053F0;
 
 #define dHAKAdan_room_6Tex_0055F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6Tex_0055F0"
 static const ALIGN_ASSET(2) char HAKAdan_room_6Tex_0055F0[] = dHAKAdan_room_6Tex_0055F0;
 
-#define dHAKAdan_room_6Tex_006DF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6Tex_006DF0"
-static const ALIGN_ASSET(2) char HAKAdan_room_6Tex_006DF0[] = dHAKAdan_room_6Tex_006DF0;
-
 #define dHAKAdan_room_6Tex_0065F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6Tex_0065F0"
 static const ALIGN_ASSET(2) char HAKAdan_room_6Tex_0065F0[] = dHAKAdan_room_6Tex_0065F0;
 
-#define dHAKAdan_room_6Tex_0053F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6Tex_0053F0"
-static const ALIGN_ASSET(2) char HAKAdan_room_6Tex_0053F0[] = dHAKAdan_room_6Tex_0053F0;
+#define dHAKAdan_room_6Tex_006DF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6Tex_006DF0"
+static const ALIGN_ASSET(2) char HAKAdan_room_6Tex_006DF0[] = dHAKAdan_room_6Tex_006DF0;
+
+#define dHAKAdan_room_6Tex_0071F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6Tex_0071F0"
+static const ALIGN_ASSET(2) char HAKAdan_room_6Tex_0071F0[] = dHAKAdan_room_6Tex_0071F0;
+
+#define dHAKAdan_room_6DL_004178 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6DL_004178"
+static const ALIGN_ASSET(2) char HAKAdan_room_6DL_004178[] = dHAKAdan_room_6DL_004178;
 
 #define dHAKAdan_room_6DL_001B40 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6DL_001B40"
 static const ALIGN_ASSET(2) char HAKAdan_room_6DL_001B40[] = dHAKAdan_room_6DL_001B40;
@@ -27,8 +30,5 @@ static const ALIGN_ASSET(2) char HAKAdan_room_6DL_001B40[] = dHAKAdan_room_6DL_0
 #define dHAKAdan_room_6DL_004B18 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6DL_004B18"
 static const ALIGN_ASSET(2) char HAKAdan_room_6DL_004B18[] = dHAKAdan_room_6DL_004B18;
 
-#define dHAKAdan_room_6Tex_004BF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6Tex_004BF0"
-static const ALIGN_ASSET(2) char HAKAdan_room_6Tex_004BF0[] = dHAKAdan_room_6Tex_004BF0;
-
 
 #endif // DUNGEONS_HAKADAN_ROOM_6_H
diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_7.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_7.h
index 220e443f5..51103e4fe 100644
--- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_7.h
+++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_7.h
@@ -3,12 +3,12 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdan_room_7DL_001100 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_7DL_001100"
-static const ALIGN_ASSET(2) char HAKAdan_room_7DL_001100[] = dHAKAdan_room_7DL_001100;
-
 #define dHAKAdan_room_7Tex_0012D8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_7Tex_0012D8"
 static const ALIGN_ASSET(2) char HAKAdan_room_7Tex_0012D8[] = dHAKAdan_room_7Tex_0012D8;
 
+#define dHAKAdan_room_7DL_001100 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_7DL_001100"
+static const ALIGN_ASSET(2) char HAKAdan_room_7DL_001100[] = dHAKAdan_room_7DL_001100;
+
 #define dHAKAdan_room_7DL_000260 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_7DL_000260"
 static const ALIGN_ASSET(2) char HAKAdan_room_7DL_000260[] = dHAKAdan_room_7DL_000260;
 
diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_8.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_8.h
index 0c06b4805..fc879a1df 100644
--- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_8.h
+++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_8.h
@@ -3,14 +3,23 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdan_room_8DL_000E70 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8DL_000E70"
-static const ALIGN_ASSET(2) char HAKAdan_room_8DL_000E70[] = dHAKAdan_room_8DL_000E70;
+#define dHAKAdan_room_8Tex_003098 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8Tex_003098"
+static const ALIGN_ASSET(2) char HAKAdan_room_8Tex_003098[] = dHAKAdan_room_8Tex_003098;
+
+#define dHAKAdan_room_8Tex_003298 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8Tex_003298"
+static const ALIGN_ASSET(2) char HAKAdan_room_8Tex_003298[] = dHAKAdan_room_8Tex_003298;
+
+#define dHAKAdan_room_8Tex_004298 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8Tex_004298"
+static const ALIGN_ASSET(2) char HAKAdan_room_8Tex_004298[] = dHAKAdan_room_8Tex_004298;
+
+#define dHAKAdan_room_8Tex_004A98 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8Tex_004A98"
+static const ALIGN_ASSET(2) char HAKAdan_room_8Tex_004A98[] = dHAKAdan_room_8Tex_004A98;
 
 #define dHAKAdan_room_8Tex_004C98 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8Tex_004C98"
 static const ALIGN_ASSET(2) char HAKAdan_room_8Tex_004C98[] = dHAKAdan_room_8Tex_004C98;
 
-#define dHAKAdan_room_8Tex_003098 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8Tex_003098"
-static const ALIGN_ASSET(2) char HAKAdan_room_8Tex_003098[] = dHAKAdan_room_8Tex_003098;
+#define dHAKAdan_room_8DL_000E70 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8DL_000E70"
+static const ALIGN_ASSET(2) char HAKAdan_room_8DL_000E70[] = dHAKAdan_room_8DL_000E70;
 
 #define dHAKAdan_room_8DL_002418 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8DL_002418"
 static const ALIGN_ASSET(2) char HAKAdan_room_8DL_002418[] = dHAKAdan_room_8DL_002418;
@@ -18,17 +27,8 @@ static const ALIGN_ASSET(2) char HAKAdan_room_8DL_002418[] = dHAKAdan_room_8DL_0
 #define dHAKAdan_room_8DL_002CC8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8DL_002CC8"
 static const ALIGN_ASSET(2) char HAKAdan_room_8DL_002CC8[] = dHAKAdan_room_8DL_002CC8;
 
-#define dHAKAdan_room_8Tex_004A98 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8Tex_004A98"
-static const ALIGN_ASSET(2) char HAKAdan_room_8Tex_004A98[] = dHAKAdan_room_8Tex_004A98;
-
-#define dHAKAdan_room_8Tex_003298 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8Tex_003298"
-static const ALIGN_ASSET(2) char HAKAdan_room_8Tex_003298[] = dHAKAdan_room_8Tex_003298;
-
 #define dHAKAdan_room_8DL_001CE8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8DL_001CE8"
 static const ALIGN_ASSET(2) char HAKAdan_room_8DL_001CE8[] = dHAKAdan_room_8DL_001CE8;
 
-#define dHAKAdan_room_8Tex_004298 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8Tex_004298"
-static const ALIGN_ASSET(2) char HAKAdan_room_8Tex_004298[] = dHAKAdan_room_8Tex_004298;
-
 
 #endif // DUNGEONS_HAKADAN_ROOM_8_H
diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_9.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_9.h
index 701377160..2dd54a7bf 100644
--- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_9.h
+++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_9.h
@@ -3,18 +3,36 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdan_room_9DL_005AF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9DL_005AF0"
-static const ALIGN_ASSET(2) char HAKAdan_room_9DL_005AF0[] = dHAKAdan_room_9DL_005AF0;
+#define dHAKAdan_room_9Tex_009090 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_009090"
+static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_009090[] = dHAKAdan_room_9Tex_009090;
 
-#define dHAKAdan_room_9Tex_00C890 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00C890"
-static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00C890[] = dHAKAdan_room_9Tex_00C890;
+#define dHAKAdan_room_9Tex_009890 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_009890"
+static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_009890[] = dHAKAdan_room_9Tex_009890;
 
 #define dHAKAdan_room_9Tex_00A090 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00A090"
 static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00A090[] = dHAKAdan_room_9Tex_00A090;
 
+#define dHAKAdan_room_9Tex_00A290 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00A290"
+static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00A290[] = dHAKAdan_room_9Tex_00A290;
+
+#define dHAKAdan_room_9Tex_00B290 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00B290"
+static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00B290[] = dHAKAdan_room_9Tex_00B290;
+
 #define dHAKAdan_room_9Tex_00BA90 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00BA90"
 static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00BA90[] = dHAKAdan_room_9Tex_00BA90;
 
+#define dHAKAdan_room_9Tex_00BE90 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00BE90"
+static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00BE90[] = dHAKAdan_room_9Tex_00BE90;
+
+#define dHAKAdan_room_9Tex_00C690 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00C690"
+static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00C690[] = dHAKAdan_room_9Tex_00C690;
+
+#define dHAKAdan_room_9Tex_00C890 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00C890"
+static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00C890[] = dHAKAdan_room_9Tex_00C890;
+
+#define dHAKAdan_room_9DL_005AF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9DL_005AF0"
+static const ALIGN_ASSET(2) char HAKAdan_room_9DL_005AF0[] = dHAKAdan_room_9DL_005AF0;
+
 #define dHAKAdan_room_9DL_008E68 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9DL_008E68"
 static const ALIGN_ASSET(2) char HAKAdan_room_9DL_008E68[] = dHAKAdan_room_9DL_008E68;
 
@@ -27,30 +45,15 @@ static const ALIGN_ASSET(2) char HAKAdan_room_9DL_000470[] = dHAKAdan_room_9DL_0
 #define dHAKAdan_room_9DL_006600 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9DL_006600"
 static const ALIGN_ASSET(2) char HAKAdan_room_9DL_006600[] = dHAKAdan_room_9DL_006600;
 
-#define dHAKAdan_room_9Tex_00B290 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00B290"
-static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00B290[] = dHAKAdan_room_9Tex_00B290;
-
 #define dHAKAdan_room_9DL_008910 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9DL_008910"
 static const ALIGN_ASSET(2) char HAKAdan_room_9DL_008910[] = dHAKAdan_room_9DL_008910;
 
 #define dHAKAdan_room_9DL_002248 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9DL_002248"
 static const ALIGN_ASSET(2) char HAKAdan_room_9DL_002248[] = dHAKAdan_room_9DL_002248;
 
-#define dHAKAdan_room_9Tex_009890 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_009890"
-static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_009890[] = dHAKAdan_room_9Tex_009890;
-
 #define dHAKAdan_room_9DL_003E30 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9DL_003E30"
 static const ALIGN_ASSET(2) char HAKAdan_room_9DL_003E30[] = dHAKAdan_room_9DL_003E30;
 
-#define dHAKAdan_room_9Tex_009090 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_009090"
-static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_009090[] = dHAKAdan_room_9Tex_009090;
-
-#define dHAKAdan_room_9Tex_00C690 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00C690"
-static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00C690[] = dHAKAdan_room_9Tex_00C690;
-
-#define dHAKAdan_room_9Tex_00A290 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00A290"
-static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00A290[] = dHAKAdan_room_9Tex_00A290;
-
 #define dHAKAdan_room_9DL_0085F8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9DL_0085F8"
 static const ALIGN_ASSET(2) char HAKAdan_room_9DL_0085F8[] = dHAKAdan_room_9DL_0085F8;
 
@@ -60,8 +63,5 @@ static const ALIGN_ASSET(2) char HAKAdan_room_9DL_000868[] = dHAKAdan_room_9DL_0
 #define dHAKAdan_room_9DL_007620 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9DL_007620"
 static const ALIGN_ASSET(2) char HAKAdan_room_9DL_007620[] = dHAKAdan_room_9DL_007620;
 
-#define dHAKAdan_room_9Tex_00BE90 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_9Tex_00BE90"
-static const ALIGN_ASSET(2) char HAKAdan_room_9Tex_00BE90[] = dHAKAdan_room_9Tex_00BE90;
-
 
 #endif // DUNGEONS_HAKADAN_ROOM_9_H
diff --git a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_scene.h b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_scene.h
index f9339f787..1808817c9 100644
--- a/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_scene.h
+++ b/soh/assets/scenes/dungeons/HAKAdan/HAKAdan_scene.h
@@ -3,8 +3,11 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdan_sceneCollisionHeader_016394 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_sceneCollisionHeader_016394"
-static const ALIGN_ASSET(2) char HAKAdan_sceneCollisionHeader_016394[] = dHAKAdan_sceneCollisionHeader_016394;
+#define dHAKAdan_sceneTex_0163C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_sceneTex_0163C0"
+static const ALIGN_ASSET(2) char HAKAdan_sceneTex_0163C0[] = dHAKAdan_sceneTex_0163C0;
+
+#define dHAKAdan_sceneTex_016BC0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_sceneTex_016BC0"
+static const ALIGN_ASSET(2) char HAKAdan_sceneTex_016BC0[] = dHAKAdan_sceneTex_016BC0;
 
 #define dHAKAdan_sceneTex_0173C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_sceneTex_0173C0"
 static const ALIGN_ASSET(2) char HAKAdan_sceneTex_0173C0[] = dHAKAdan_sceneTex_0173C0;
@@ -12,10 +15,8 @@ static const ALIGN_ASSET(2) char HAKAdan_sceneTex_0173C0[] = dHAKAdan_sceneTex_0
 #define dHAKAdan_sceneTex_017BC0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_sceneTex_017BC0"
 static const ALIGN_ASSET(2) char HAKAdan_sceneTex_017BC0[] = dHAKAdan_sceneTex_017BC0;
 
-#define dHAKAdan_sceneTex_016BC0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_sceneTex_016BC0"
-static const ALIGN_ASSET(2) char HAKAdan_sceneTex_016BC0[] = dHAKAdan_sceneTex_016BC0;
+#define dHAKAdan_sceneCollisionHeader_016394 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_sceneCollisionHeader_016394"
+static const ALIGN_ASSET(2) char HAKAdan_sceneCollisionHeader_016394[] = dHAKAdan_sceneCollisionHeader_016394;
 
-#define dHAKAdan_sceneTex_0163C0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_sceneTex_0163C0"
-static const ALIGN_ASSET(2) char HAKAdan_sceneTex_0163C0[] = dHAKAdan_sceneTex_0163C0;
 
 #endif // DUNGEONS_HAKADAN_SCENE_H
diff --git a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_0.h b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_0.h
index 4faff3d1f..3294db129 100644
--- a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_0.h
+++ b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_0.h
@@ -3,32 +3,65 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdanCH_room_0DL_001D30 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_001D30"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_001D30[] = dHAKAdanCH_room_0DL_001D30;
-
-#define dHAKAdanCH_room_0Tex_013320 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_013320"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_013320[] = dHAKAdanCH_room_0Tex_013320;
-
-#define dHAKAdanCH_room_0Tex_011920 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_011920"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_011920[] = dHAKAdanCH_room_0Tex_011920;
-
-#define dHAKAdanCH_room_0Tex_011120 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_011120"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_011120[] = dHAKAdanCH_room_0Tex_011120;
+#define dHAKAdanCH_room_0Tex_00D720 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_00D720"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_00D720[] = dHAKAdanCH_room_0Tex_00D720;
 
 #define dHAKAdanCH_room_0Tex_00DF20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_00DF20"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_00DF20[] = dHAKAdanCH_room_0Tex_00DF20;
 
+#define dHAKAdanCH_room_0Tex_00E120 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_00E120"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_00E120[] = dHAKAdanCH_room_0Tex_00E120;
+
+#define dHAKAdanCH_room_0Tex_00F120 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_00F120"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_00F120[] = dHAKAdanCH_room_0Tex_00F120;
+
 #define dHAKAdanCH_room_0Tex_00F920 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_00F920"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_00F920[] = dHAKAdanCH_room_0Tex_00F920;
 
-#define dHAKAdanCH_room_0DL_004018 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_004018"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_004018[] = dHAKAdanCH_room_0DL_004018;
+#define dHAKAdanCH_room_0Tex_010120 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_010120"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_010120[] = dHAKAdanCH_room_0Tex_010120;
+
+#define dHAKAdanCH_room_0Tex_011120 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_011120"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_011120[] = dHAKAdanCH_room_0Tex_011120;
+
+#define dHAKAdanCH_room_0Tex_011920 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_011920"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_011920[] = dHAKAdanCH_room_0Tex_011920;
+
+#define dHAKAdanCH_room_0Tex_011D20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_011D20"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_011D20[] = dHAKAdanCH_room_0Tex_011D20;
 
 #define dHAKAdanCH_room_0Tex_011F20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_011F20"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_011F20[] = dHAKAdanCH_room_0Tex_011F20;
 
-#define dHAKAdanCH_room_0Tex_010120 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_010120"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_010120[] = dHAKAdanCH_room_0Tex_010120;
+#define dHAKAdanCH_room_0Tex_012720 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_012720"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_012720[] = dHAKAdanCH_room_0Tex_012720;
+
+#define dHAKAdanCH_room_0Tex_012F20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_012F20"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_012F20[] = dHAKAdanCH_room_0Tex_012F20;
+
+#define dHAKAdanCH_room_0Tex_013120 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_013120"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_013120[] = dHAKAdanCH_room_0Tex_013120;
+
+#define dHAKAdanCH_room_0Tex_013320 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_013320"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_013320[] = dHAKAdanCH_room_0Tex_013320;
+
+#define dHAKAdanCH_room_0Tex_013720 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_013720"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_013720[] = dHAKAdanCH_room_0Tex_013720;
+
+#define dHAKAdanCH_room_0Tex_013F20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_013F20"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_013F20[] = dHAKAdanCH_room_0Tex_013F20;
+
+#define dHAKAdanCH_room_0Tex_014B20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_014B20"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_014B20[] = dHAKAdanCH_room_0Tex_014B20;
+
+#define dHAKAdanCH_room_0Tex_014F20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_014F20"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_014F20[] = dHAKAdanCH_room_0Tex_014F20;
+
+#define dHAKAdanCH_room_0DL_001D30 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_001D30"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_001D30[] = dHAKAdanCH_room_0DL_001D30;
+
+#define dHAKAdanCH_room_0DL_004018 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_004018"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_004018[] = dHAKAdanCH_room_0DL_004018;
 
 #define dHAKAdanCH_room_0DL_004D18 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_004D18"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_004D18[] = dHAKAdanCH_room_0DL_004D18;
@@ -36,9 +69,6 @@ static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_004D18[] = dHAKAdanCH_room_0
 #define dHAKAdanCH_room_0DL_0057C0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_0057C0"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_0057C0[] = dHAKAdanCH_room_0DL_0057C0;
 
-#define dHAKAdanCH_room_0Tex_00E120 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_00E120"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_00E120[] = dHAKAdanCH_room_0Tex_00E120;
-
 #define dHAKAdanCH_room_0DL_005C30 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_005C30"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_005C30[] = dHAKAdanCH_room_0DL_005C30;
 
@@ -54,9 +84,6 @@ static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_00D550[] = dHAKAdanCH_room_0
 #define dHAKAdanCH_room_0DL_001360 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_001360"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_001360[] = dHAKAdanCH_room_0DL_001360;
 
-#define dHAKAdanCH_room_0Tex_013720 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_013720"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_013720[] = dHAKAdanCH_room_0Tex_013720;
-
 #define dHAKAdanCH_room_0DL_0079B0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_0079B0"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_0079B0[] = dHAKAdanCH_room_0DL_0079B0;
 
@@ -84,24 +111,15 @@ static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_002C00[] = dHAKAdanCH_room_0
 #define dHAKAdanCH_room_0DL_014430 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_014430"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_014430[] = dHAKAdanCH_room_0DL_014430;
 
-#define dHAKAdanCH_room_0Tex_014B20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_014B20"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_014B20[] = dHAKAdanCH_room_0Tex_014B20;
-
 #define dHAKAdanCH_room_0DL_014868 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_014868"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_014868[] = dHAKAdanCH_room_0DL_014868;
 
-#define dHAKAdanCH_room_0Tex_014F20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_014F20"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_014F20[] = dHAKAdanCH_room_0Tex_014F20;
-
 #define dHAKAdanCH_room_0DL_014A38 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_014A38"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_014A38[] = dHAKAdanCH_room_0DL_014A38;
 
 #define dHAKAdanCH_room_0DL_006D58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_006D58"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_006D58[] = dHAKAdanCH_room_0DL_006D58;
 
-#define dHAKAdanCH_room_0Tex_00D720 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_00D720"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_00D720[] = dHAKAdanCH_room_0Tex_00D720;
-
 #define dHAKAdanCH_room_0DL_0007B0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_0007B0"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_0007B0[] = dHAKAdanCH_room_0DL_0007B0;
 
@@ -114,30 +132,12 @@ static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_003518[] = dHAKAdanCH_room_0
 #define dHAKAdanCH_room_0DL_006760 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_006760"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_006760[] = dHAKAdanCH_room_0DL_006760;
 
-#define dHAKAdanCH_room_0Tex_011D20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_011D20"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_011D20[] = dHAKAdanCH_room_0Tex_011D20;
-
-#define dHAKAdanCH_room_0Tex_012F20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_012F20"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_012F20[] = dHAKAdanCH_room_0Tex_012F20;
-
-#define dHAKAdanCH_room_0Tex_013120 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_013120"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_013120[] = dHAKAdanCH_room_0Tex_013120;
-
-#define dHAKAdanCH_room_0Tex_013F20 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_013F20"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_013F20[] = dHAKAdanCH_room_0Tex_013F20;
-
 #define dHAKAdanCH_room_0DL_0021C0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_0021C0"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_0021C0[] = dHAKAdanCH_room_0DL_0021C0;
 
-#define dHAKAdanCH_room_0Tex_00F120 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_00F120"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_00F120[] = dHAKAdanCH_room_0Tex_00F120;
-
 #define dHAKAdanCH_room_0DL_00BAB8 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_00BAB8"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_00BAB8[] = dHAKAdanCH_room_0DL_00BAB8;
 
-#define dHAKAdanCH_room_0Tex_012720 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0Tex_012720"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_0Tex_012720[] = dHAKAdanCH_room_0Tex_012720;
-
 #define dHAKAdanCH_room_0DL_00C178 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_0DL_00C178"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_0DL_00C178[] = dHAKAdanCH_room_0DL_00C178;
 
diff --git a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_1.h b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_1.h
index 9719a3b54..5ab971600 100644
--- a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_1.h
+++ b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_1.h
@@ -3,30 +3,42 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdanCH_room_1DL_008B10 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1DL_008B10"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_1DL_008B10[] = dHAKAdanCH_room_1DL_008B10;
-
-#define dHAKAdanCH_room_1Tex_00A158 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_00A158"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_00A158[] = dHAKAdanCH_room_1Tex_00A158;
-
-#define dHAKAdanCH_room_1DL_005E60 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1DL_005E60"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_1DL_005E60[] = dHAKAdanCH_room_1DL_005E60;
-
-#define dHAKAdanCH_room_1Tex_009758 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_009758"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_009758[] = dHAKAdanCH_room_1Tex_009758;
-
 #define dHAKAdanCH_room_1Tex_008D58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_008D58"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_008D58[] = dHAKAdanCH_room_1Tex_008D58;
 
+#define dHAKAdanCH_room_1Tex_008F58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_008F58"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_008F58[] = dHAKAdanCH_room_1Tex_008F58;
+
+#define dHAKAdanCH_room_1Tex_009158 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_009158"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_009158[] = dHAKAdanCH_room_1Tex_009158;
+
 #define dHAKAdanCH_room_1Tex_009358 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_009358"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_009358[] = dHAKAdanCH_room_1Tex_009358;
 
-#define dHAKAdanCH_room_1DL_007358 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1DL_007358"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_1DL_007358[] = dHAKAdanCH_room_1DL_007358;
+#define dHAKAdanCH_room_1Tex_009758 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_009758"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_009758[] = dHAKAdanCH_room_1Tex_009758;
+
+#define dHAKAdanCH_room_1Tex_009F58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_009F58"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_009F58[] = dHAKAdanCH_room_1Tex_009F58;
+
+#define dHAKAdanCH_room_1Tex_00A158 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_00A158"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_00A158[] = dHAKAdanCH_room_1Tex_00A158;
 
 #define dHAKAdanCH_room_1Tex_00A558 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_00A558"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_00A558[] = dHAKAdanCH_room_1Tex_00A558;
 
+#define dHAKAdanCH_room_1Tex_00AD58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_00AD58"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_00AD58[] = dHAKAdanCH_room_1Tex_00AD58;
+
+#define dHAKAdanCH_room_1DL_008B10 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1DL_008B10"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_1DL_008B10[] = dHAKAdanCH_room_1DL_008B10;
+
+#define dHAKAdanCH_room_1DL_005E60 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1DL_005E60"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_1DL_005E60[] = dHAKAdanCH_room_1DL_005E60;
+
+#define dHAKAdanCH_room_1DL_007358 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1DL_007358"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_1DL_007358[] = dHAKAdanCH_room_1DL_007358;
+
 #define dHAKAdanCH_room_1DL_007EA8 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1DL_007EA8"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_1DL_007EA8[] = dHAKAdanCH_room_1DL_007EA8;
 
@@ -42,18 +54,6 @@ static const ALIGN_ASSET(2) char HAKAdanCH_room_1DL_0018D8[] = dHAKAdanCH_room_1
 #define dHAKAdanCH_room_1DL_0040C0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1DL_0040C0"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_1DL_0040C0[] = dHAKAdanCH_room_1DL_0040C0;
 
-#define dHAKAdanCH_room_1Tex_00AD58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_00AD58"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_00AD58[] = dHAKAdanCH_room_1Tex_00AD58;
-
-#define dHAKAdanCH_room_1Tex_009F58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_009F58"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_009F58[] = dHAKAdanCH_room_1Tex_009F58;
-
-#define dHAKAdanCH_room_1Tex_008F58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_008F58"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_008F58[] = dHAKAdanCH_room_1Tex_008F58;
-
-#define dHAKAdanCH_room_1Tex_009158 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_009158"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_009158[] = dHAKAdanCH_room_1Tex_009158;
-
 #define dHAKAdanCH_room_1DL_00B040 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1DL_00B040"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_1DL_00B040[] = dHAKAdanCH_room_1DL_00B040;
 
diff --git a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_2.h b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_2.h
index 072ff02de..b93776a67 100644
--- a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_2.h
+++ b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_2.h
@@ -3,23 +3,23 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdanCH_room_2DL_0009E0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_2DL_0009E0"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_2DL_0009E0[] = dHAKAdanCH_room_2DL_0009E0;
-
 #define dHAKAdanCH_room_2Tex_002958 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_2Tex_002958"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_2Tex_002958[] = dHAKAdanCH_room_2Tex_002958;
 
-#define dHAKAdanCH_room_2DL_001FA8 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_2DL_001FA8"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_2DL_001FA8[] = dHAKAdanCH_room_2DL_001FA8;
-
-#define dHAKAdanCH_room_2Tex_002F58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_2Tex_002F58"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_2Tex_002F58[] = dHAKAdanCH_room_2Tex_002F58;
+#define dHAKAdanCH_room_2Tex_002B58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_2Tex_002B58"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_2Tex_002B58[] = dHAKAdanCH_room_2Tex_002B58;
 
 #define dHAKAdanCH_room_2Tex_002D58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_2Tex_002D58"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_2Tex_002D58[] = dHAKAdanCH_room_2Tex_002D58;
 
-#define dHAKAdanCH_room_2Tex_002B58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_2Tex_002B58"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_2Tex_002B58[] = dHAKAdanCH_room_2Tex_002B58;
+#define dHAKAdanCH_room_2Tex_002F58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_2Tex_002F58"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_2Tex_002F58[] = dHAKAdanCH_room_2Tex_002F58;
+
+#define dHAKAdanCH_room_2DL_0009E0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_2DL_0009E0"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_2DL_0009E0[] = dHAKAdanCH_room_2DL_0009E0;
+
+#define dHAKAdanCH_room_2DL_001FA8 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_2DL_001FA8"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_2DL_001FA8[] = dHAKAdanCH_room_2DL_001FA8;
 
 #define dHAKAdanCH_room_2DL_0006E0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_2DL_0006E0"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_2DL_0006E0[] = dHAKAdanCH_room_2DL_0006E0;
diff --git a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_3.h b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_3.h
index f92842202..e2c4f05c8 100644
--- a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_3.h
+++ b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_3.h
@@ -3,12 +3,12 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdanCH_room_3DL_000D40 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_3DL_000D40"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_3DL_000D40[] = dHAKAdanCH_room_3DL_000D40;
-
 #define dHAKAdanCH_room_3Tex_0014C0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_3Tex_0014C0"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_3Tex_0014C0[] = dHAKAdanCH_room_3Tex_0014C0;
 
+#define dHAKAdanCH_room_3DL_000D40 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_3DL_000D40"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_3DL_000D40[] = dHAKAdanCH_room_3DL_000D40;
+
 #define dHAKAdanCH_room_3DL_0013A0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_3DL_0013A0"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_3DL_0013A0[] = dHAKAdanCH_room_3DL_0013A0;
 
diff --git a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_4.h b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_4.h
index 553ef384f..64dc85e50 100644
--- a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_4.h
+++ b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_4.h
@@ -3,18 +3,18 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdanCH_room_4DL_001270 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_4DL_001270"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_4DL_001270[] = dHAKAdanCH_room_4DL_001270;
+#define dHAKAdanCH_room_4Tex_001498 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_4Tex_001498"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_4Tex_001498[] = dHAKAdanCH_room_4Tex_001498;
 
 #define dHAKAdanCH_room_4Tex_001C98 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_4Tex_001C98"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_4Tex_001C98[] = dHAKAdanCH_room_4Tex_001C98;
 
+#define dHAKAdanCH_room_4DL_001270 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_4DL_001270"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_4DL_001270[] = dHAKAdanCH_room_4DL_001270;
+
 #define dHAKAdanCH_room_4DL_0002C0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_4DL_0002C0"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_4DL_0002C0[] = dHAKAdanCH_room_4DL_0002C0;
 
-#define dHAKAdanCH_room_4Tex_001498 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_4Tex_001498"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_4Tex_001498[] = dHAKAdanCH_room_4Tex_001498;
-
 #define dHAKAdanCH_room_4DL_000898 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_4DL_000898"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_4DL_000898[] = dHAKAdanCH_room_4DL_000898;
 
diff --git a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_5.h b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_5.h
index 6d3b6d031..e1433aa16 100644
--- a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_5.h
+++ b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_5.h
@@ -3,21 +3,21 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdanCH_room_5DL_0010A0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_5DL_0010A0"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_5DL_0010A0[] = dHAKAdanCH_room_5DL_0010A0;
-
 #define dHAKAdanCH_room_5Tex_001190 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_5Tex_001190"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_5Tex_001190[] = dHAKAdanCH_room_5Tex_001190;
 
+#define dHAKAdanCH_room_5Tex_002190 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_5Tex_002190"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_5Tex_002190[] = dHAKAdanCH_room_5Tex_002190;
+
+#define dHAKAdanCH_room_5DL_0010A0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_5DL_0010A0"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_5DL_0010A0[] = dHAKAdanCH_room_5DL_0010A0;
+
 #define dHAKAdanCH_room_5DL_000F10 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_5DL_000F10"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_5DL_000F10[] = dHAKAdanCH_room_5DL_000F10;
 
 #define dHAKAdanCH_room_5DL_000C18 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_5DL_000C18"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_5DL_000C18[] = dHAKAdanCH_room_5DL_000C18;
 
-#define dHAKAdanCH_room_5Tex_002190 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_5Tex_002190"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_5Tex_002190[] = dHAKAdanCH_room_5Tex_002190;
-
 #define dHAKAdanCH_room_5DL_000420 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_5DL_000420"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_5DL_000420[] = dHAKAdanCH_room_5DL_000420;
 
diff --git a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_6.h b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_6.h
index 9c9f28b98..1435416ec 100644
--- a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_6.h
+++ b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_6.h
@@ -3,8 +3,8 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdanCH_room_6DL_000C30 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_6DL_000C30"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_6DL_000C30[] = dHAKAdanCH_room_6DL_000C30;
+#define dHAKAdanCH_room_6Tex_000EA0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_6Tex_000EA0"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_6Tex_000EA0[] = dHAKAdanCH_room_6Tex_000EA0;
 
 #define dHAKAdanCH_room_6Tex_0016A0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_6Tex_0016A0"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_6Tex_0016A0[] = dHAKAdanCH_room_6Tex_0016A0;
@@ -12,11 +12,11 @@ static const ALIGN_ASSET(2) char HAKAdanCH_room_6Tex_0016A0[] = dHAKAdanCH_room_
 #define dHAKAdanCH_room_6Tex_0026A0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_6Tex_0026A0"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_6Tex_0026A0[] = dHAKAdanCH_room_6Tex_0026A0;
 
+#define dHAKAdanCH_room_6DL_000C30 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_6DL_000C30"
+static const ALIGN_ASSET(2) char HAKAdanCH_room_6DL_000C30[] = dHAKAdanCH_room_6DL_000C30;
+
 #define dHAKAdanCH_room_6DL_000410 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_6DL_000410"
 static const ALIGN_ASSET(2) char HAKAdanCH_room_6DL_000410[] = dHAKAdanCH_room_6DL_000410;
 
-#define dHAKAdanCH_room_6Tex_000EA0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_6Tex_000EA0"
-static const ALIGN_ASSET(2) char HAKAdanCH_room_6Tex_000EA0[] = dHAKAdanCH_room_6Tex_000EA0;
-
 
 #endif // DUNGEONS_HAKADANCH_ROOM_6_H
diff --git a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_scene.h b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_scene.h
index 871325e38..1d498a7e4 100644
--- a/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_scene.h
+++ b/soh/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_scene.h
@@ -3,19 +3,20 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdanCH_sceneCollisionHeader_00A558 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_sceneCollisionHeader_00A558"
-static const ALIGN_ASSET(2) char HAKAdanCH_sceneCollisionHeader_00A558[] = dHAKAdanCH_sceneCollisionHeader_00A558;
-
-#define dHAKAdanCH_sceneTex_00BD90 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_sceneTex_00BD90"
-static const ALIGN_ASSET(2) char HAKAdanCH_sceneTex_00BD90[] = dHAKAdanCH_sceneTex_00BD90;
+#define dHAKAdanCH_sceneTex_00A590 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_sceneTex_00A590"
+static const ALIGN_ASSET(2) char HAKAdanCH_sceneTex_00A590[] = dHAKAdanCH_sceneTex_00A590;
 
 #define dHAKAdanCH_sceneTex_00AD90 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_sceneTex_00AD90"
 static const ALIGN_ASSET(2) char HAKAdanCH_sceneTex_00AD90[] = dHAKAdanCH_sceneTex_00AD90;
 
-#define dHAKAdanCH_sceneTex_00A590 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_sceneTex_00A590"
-static const ALIGN_ASSET(2) char HAKAdanCH_sceneTex_00A590[] = dHAKAdanCH_sceneTex_00A590;
-
 #define dHAKAdanCH_sceneTex_00B590 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_sceneTex_00B590"
 static const ALIGN_ASSET(2) char HAKAdanCH_sceneTex_00B590[] = dHAKAdanCH_sceneTex_00B590;
 
+#define dHAKAdanCH_sceneTex_00BD90 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_sceneTex_00BD90"
+static const ALIGN_ASSET(2) char HAKAdanCH_sceneTex_00BD90[] = dHAKAdanCH_sceneTex_00BD90;
+
+#define dHAKAdanCH_sceneCollisionHeader_00A558 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_sceneCollisionHeader_00A558"
+static const ALIGN_ASSET(2) char HAKAdanCH_sceneCollisionHeader_00A558[] = dHAKAdanCH_sceneCollisionHeader_00A558;
+
+
 #endif // DUNGEONS_HAKADANCH_SCENE_H
diff --git a/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_0.h b/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_0.h
index 5f61f8dc5..e0c59f51f 100644
--- a/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_0.h
+++ b/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_0.h
@@ -3,17 +3,17 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdan_bs_room_0DL_0021B0 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_room_0DL_0021B0"
-static const ALIGN_ASSET(2) char HAKAdan_bs_room_0DL_0021B0[] = dHAKAdan_bs_room_0DL_0021B0;
-
-#define dHAKAdan_bs_room_0Tex_0023E0 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_room_0Tex_0023E0"
-static const ALIGN_ASSET(2) char HAKAdan_bs_room_0Tex_0023E0[] = dHAKAdan_bs_room_0Tex_0023E0;
-
-#define dHAKAdan_bs_room_0Tex_0021E0 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_room_0Tex_0021E0"
+#define dHAKAdan_bs_room_0Tex_0021E0 "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_room_0Tex_0021E0"
 static const ALIGN_ASSET(2) char HAKAdan_bs_room_0Tex_0021E0[] = dHAKAdan_bs_room_0Tex_0021E0;
 
-#define dHAKAdan_bs_room_0Tex_0027E0 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_room_0Tex_0027E0"
+#define dHAKAdan_bs_room_0Tex_0023E0 "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_room_0Tex_0023E0"
+static const ALIGN_ASSET(2) char HAKAdan_bs_room_0Tex_0023E0[] = dHAKAdan_bs_room_0Tex_0023E0;
+
+#define dHAKAdan_bs_room_0Tex_0027E0 "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_room_0Tex_0027E0"
 static const ALIGN_ASSET(2) char HAKAdan_bs_room_0Tex_0027E0[] = dHAKAdan_bs_room_0Tex_0027E0;
 
+#define dHAKAdan_bs_room_0DL_0021B0 "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_room_0DL_0021B0"
+static const ALIGN_ASSET(2) char HAKAdan_bs_room_0DL_0021B0[] = dHAKAdan_bs_room_0DL_0021B0;
+
 
 #endif // DUNGEONS_HAKADAN_BS_ROOM_0_H
diff --git a/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_1.h b/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_1.h
index 1bce316d1..e3e3fd863 100644
--- a/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_1.h
+++ b/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_1.h
@@ -3,23 +3,23 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdan_bs_room_1DL_002D20 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_room_1DL_002D20"
-static const ALIGN_ASSET(2) char HAKAdan_bs_room_1DL_002D20[] = dHAKAdan_bs_room_1DL_002D20;
-
-#define dHAKAdan_bs_room_1Tex_004F50 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_room_1Tex_004F50"
-static const ALIGN_ASSET(2) char HAKAdan_bs_room_1Tex_004F50[] = dHAKAdan_bs_room_1Tex_004F50;
-
-#define dHAKAdan_bs_room_1Tex_003750 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_room_1Tex_003750"
-static const ALIGN_ASSET(2) char HAKAdan_bs_room_1Tex_003750[] = dHAKAdan_bs_room_1Tex_003750;
-
-#define dHAKAdan_bs_room_1Tex_002F50 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_room_1Tex_002F50"
-static const ALIGN_ASSET(2) char HAKAdan_bs_room_1Tex_002F50[] = dHAKAdan_bs_room_1Tex_002F50;
-
-#define dHAKAdan_bs_room_1Tex_002D50 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_room_1Tex_002D50"
+#define dHAKAdan_bs_room_1Tex_002D50 "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_room_1Tex_002D50"
 static const ALIGN_ASSET(2) char HAKAdan_bs_room_1Tex_002D50[] = dHAKAdan_bs_room_1Tex_002D50;
 
-#define dHAKAdan_bs_room_1Tex_003F50 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_room_1Tex_003F50"
+#define dHAKAdan_bs_room_1Tex_002F50 "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_room_1Tex_002F50"
+static const ALIGN_ASSET(2) char HAKAdan_bs_room_1Tex_002F50[] = dHAKAdan_bs_room_1Tex_002F50;
+
+#define dHAKAdan_bs_room_1Tex_003750 "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_room_1Tex_003750"
+static const ALIGN_ASSET(2) char HAKAdan_bs_room_1Tex_003750[] = dHAKAdan_bs_room_1Tex_003750;
+
+#define dHAKAdan_bs_room_1Tex_003F50 "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_room_1Tex_003F50"
 static const ALIGN_ASSET(2) char HAKAdan_bs_room_1Tex_003F50[] = dHAKAdan_bs_room_1Tex_003F50;
 
+#define dHAKAdan_bs_room_1Tex_004F50 "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_room_1Tex_004F50"
+static const ALIGN_ASSET(2) char HAKAdan_bs_room_1Tex_004F50[] = dHAKAdan_bs_room_1Tex_004F50;
+
+#define dHAKAdan_bs_room_1DL_002D20 "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_room_1DL_002D20"
+static const ALIGN_ASSET(2) char HAKAdan_bs_room_1DL_002D20[] = dHAKAdan_bs_room_1DL_002D20;
+
 
 #endif // DUNGEONS_HAKADAN_BS_ROOM_1_H
diff --git a/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_scene.h b/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_scene.h
index 40292e447..3663a6564 100644
--- a/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_scene.h
+++ b/soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_scene.h
@@ -3,19 +3,20 @@
 
 #include "align_asset_macro.h"
 
-#define dHAKAdan_bs_sceneCollisionHeader_00134C "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_sceneCollisionHeader_00134C"
-static const ALIGN_ASSET(2) char HAKAdan_bs_sceneCollisionHeader_00134C[] = dHAKAdan_bs_sceneCollisionHeader_00134C;
-
-#define dHAKAdan_bs_sceneTex_001F80 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_sceneTex_001F80"
-static const ALIGN_ASSET(2) char HAKAdan_bs_sceneTex_001F80[] = dHAKAdan_bs_sceneTex_001F80;
-
-#define dHAKAdan_bs_sceneTex_001580 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_sceneTex_001580"
-static const ALIGN_ASSET(2) char HAKAdan_bs_sceneTex_001580[] = dHAKAdan_bs_sceneTex_001580;
-
-#define dHAKAdan_bs_sceneTex_001380 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_sceneTex_001380"
+#define dHAKAdan_bs_sceneTex_001380 "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_sceneTex_001380"
 static const ALIGN_ASSET(2) char HAKAdan_bs_sceneTex_001380[] = dHAKAdan_bs_sceneTex_001380;
 
-#define dHAKAdan_bs_sceneTex_001780 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_sceneTex_001780"
+#define dHAKAdan_bs_sceneTex_001580 "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_sceneTex_001580"
+static const ALIGN_ASSET(2) char HAKAdan_bs_sceneTex_001580[] = dHAKAdan_bs_sceneTex_001580;
+
+#define dHAKAdan_bs_sceneTex_001780 "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_sceneTex_001780"
 static const ALIGN_ASSET(2) char HAKAdan_bs_sceneTex_001780[] = dHAKAdan_bs_sceneTex_001780;
 
+#define dHAKAdan_bs_sceneTex_001F80 "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_sceneTex_001F80"
+static const ALIGN_ASSET(2) char HAKAdan_bs_sceneTex_001F80[] = dHAKAdan_bs_sceneTex_001F80;
+
+#define dHAKAdan_bs_sceneCollisionHeader_00134C "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_sceneCollisionHeader_00134C"
+static const ALIGN_ASSET(2) char HAKAdan_bs_sceneCollisionHeader_00134C[] = dHAKAdan_bs_sceneCollisionHeader_00134C;
+
+
 #endif // DUNGEONS_HAKADAN_BS_SCENE_H
diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_0.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_0.h
index 731bccb75..ca681cf01 100644
--- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_0.h
+++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_0.h
@@ -3,29 +3,29 @@
 
 #include "align_asset_macro.h"
 
-#define dHIDAN_room_0DL_002C50 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_0DL_002C50"
-static const ALIGN_ASSET(2) char HIDAN_room_0DL_002C50[] = dHIDAN_room_0DL_002C50;
-
-#define dHIDAN_room_0Tex_005CF0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_0Tex_005CF0"
-static const ALIGN_ASSET(2) char HIDAN_room_0Tex_005CF0[] = dHIDAN_room_0Tex_005CF0;
-
-#define dHIDAN_room_0Tex_0062F0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_0Tex_0062F0"
-static const ALIGN_ASSET(2) char HIDAN_room_0Tex_0062F0[] = dHIDAN_room_0Tex_0062F0;
-
-#define dHIDAN_room_0Tex_005AF0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_0Tex_005AF0"
-static const ALIGN_ASSET(2) char HIDAN_room_0Tex_005AF0[] = dHIDAN_room_0Tex_005AF0;
-
-#define dHIDAN_room_0Tex_0056F0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_0Tex_0056F0"
-static const ALIGN_ASSET(2) char HIDAN_room_0Tex_0056F0[] = dHIDAN_room_0Tex_0056F0;
-
 #define dHIDAN_room_0Tex_004EF0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_0Tex_004EF0"
 static const ALIGN_ASSET(2) char HIDAN_room_0Tex_004EF0[] = dHIDAN_room_0Tex_004EF0;
 
 #define dHIDAN_room_0Tex_0052F0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_0Tex_0052F0"
 static const ALIGN_ASSET(2) char HIDAN_room_0Tex_0052F0[] = dHIDAN_room_0Tex_0052F0;
 
+#define dHIDAN_room_0Tex_0056F0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_0Tex_0056F0"
+static const ALIGN_ASSET(2) char HIDAN_room_0Tex_0056F0[] = dHIDAN_room_0Tex_0056F0;
+
+#define dHIDAN_room_0Tex_005AF0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_0Tex_005AF0"
+static const ALIGN_ASSET(2) char HIDAN_room_0Tex_005AF0[] = dHIDAN_room_0Tex_005AF0;
+
+#define dHIDAN_room_0Tex_005CF0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_0Tex_005CF0"
+static const ALIGN_ASSET(2) char HIDAN_room_0Tex_005CF0[] = dHIDAN_room_0Tex_005CF0;
+
 #define dHIDAN_room_0Tex_005EF0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_0Tex_005EF0"
 static const ALIGN_ASSET(2) char HIDAN_room_0Tex_005EF0[] = dHIDAN_room_0Tex_005EF0;
 
+#define dHIDAN_room_0Tex_0062F0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_0Tex_0062F0"
+static const ALIGN_ASSET(2) char HIDAN_room_0Tex_0062F0[] = dHIDAN_room_0Tex_0062F0;
+
+#define dHIDAN_room_0DL_002C50 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_0DL_002C50"
+static const ALIGN_ASSET(2) char HIDAN_room_0DL_002C50[] = dHIDAN_room_0DL_002C50;
+
 
 #endif // DUNGEONS_HIDAN_ROOM_0_H
diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_1.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_1.h
index 84d39a9cf..3d28ebbc8 100644
--- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_1.h
+++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_1.h
@@ -3,23 +3,14 @@
 
 #include "align_asset_macro.h"
 
-#define dHIDAN_room_1DL_000DC8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1DL_000DC8"
-static const ALIGN_ASSET(2) char HIDAN_room_1DL_000DC8[] = dHIDAN_room_1DL_000DC8;
-
-#define dHIDAN_room_1Tex_009130 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1Tex_009130"
-static const ALIGN_ASSET(2) char HIDAN_room_1Tex_009130[] = dHIDAN_room_1Tex_009130;
-
-#define dHIDAN_room_1Tex_00B530 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1Tex_00B530"
-static const ALIGN_ASSET(2) char HIDAN_room_1Tex_00B530[] = dHIDAN_room_1Tex_00B530;
-
 #define dHIDAN_room_1Tex_008730 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1Tex_008730"
 static const ALIGN_ASSET(2) char HIDAN_room_1Tex_008730[] = dHIDAN_room_1Tex_008730;
 
-#define dHIDAN_room_1Tex_00A530 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1Tex_00A530"
-static const ALIGN_ASSET(2) char HIDAN_room_1Tex_00A530[] = dHIDAN_room_1Tex_00A530;
+#define dHIDAN_room_1Tex_008930 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1Tex_008930"
+static const ALIGN_ASSET(2) char HIDAN_room_1Tex_008930[] = dHIDAN_room_1Tex_008930;
 
-#define dHIDAN_room_1DL_002500 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1DL_002500"
-static const ALIGN_ASSET(2) char HIDAN_room_1DL_002500[] = dHIDAN_room_1DL_002500;
+#define dHIDAN_room_1Tex_009130 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1Tex_009130"
+static const ALIGN_ASSET(2) char HIDAN_room_1Tex_009130[] = dHIDAN_room_1Tex_009130;
 
 #define dHIDAN_room_1Tex_009930 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1Tex_009930"
 static const ALIGN_ASSET(2) char HIDAN_room_1Tex_009930[] = dHIDAN_room_1Tex_009930;
@@ -27,15 +18,27 @@ static const ALIGN_ASSET(2) char HIDAN_room_1Tex_009930[] = dHIDAN_room_1Tex_009
 #define dHIDAN_room_1Tex_00A130 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1Tex_00A130"
 static const ALIGN_ASSET(2) char HIDAN_room_1Tex_00A130[] = dHIDAN_room_1Tex_00A130;
 
+#define dHIDAN_room_1Tex_00A530 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1Tex_00A530"
+static const ALIGN_ASSET(2) char HIDAN_room_1Tex_00A530[] = dHIDAN_room_1Tex_00A530;
+
+#define dHIDAN_room_1Tex_00B530 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1Tex_00B530"
+static const ALIGN_ASSET(2) char HIDAN_room_1Tex_00B530[] = dHIDAN_room_1Tex_00B530;
+
 #define dHIDAN_room_1Tex_00BD30 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1Tex_00BD30"
 static const ALIGN_ASSET(2) char HIDAN_room_1Tex_00BD30[] = dHIDAN_room_1Tex_00BD30;
 
+#define dHIDAN_room_1Tex_00C130 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1Tex_00C130"
+static const ALIGN_ASSET(2) char HIDAN_room_1Tex_00C130[] = dHIDAN_room_1Tex_00C130;
+
+#define dHIDAN_room_1DL_000DC8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1DL_000DC8"
+static const ALIGN_ASSET(2) char HIDAN_room_1DL_000DC8[] = dHIDAN_room_1DL_000DC8;
+
+#define dHIDAN_room_1DL_002500 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1DL_002500"
+static const ALIGN_ASSET(2) char HIDAN_room_1DL_002500[] = dHIDAN_room_1DL_002500;
+
 #define dHIDAN_room_1DL_006BF8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1DL_006BF8"
 static const ALIGN_ASSET(2) char HIDAN_room_1DL_006BF8[] = dHIDAN_room_1DL_006BF8;
 
-#define dHIDAN_room_1Tex_008930 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1Tex_008930"
-static const ALIGN_ASSET(2) char HIDAN_room_1Tex_008930[] = dHIDAN_room_1Tex_008930;
-
 #define dHIDAN_room_1DL_0057B0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1DL_0057B0"
 static const ALIGN_ASSET(2) char HIDAN_room_1DL_0057B0[] = dHIDAN_room_1DL_0057B0;
 
@@ -45,9 +48,6 @@ static const ALIGN_ASSET(2) char HIDAN_room_1DL_004068[] = dHIDAN_room_1DL_00406
 #define dHIDAN_room_1DL_0002D0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1DL_0002D0"
 static const ALIGN_ASSET(2) char HIDAN_room_1DL_0002D0[] = dHIDAN_room_1DL_0002D0;
 
-#define dHIDAN_room_1Tex_00C130 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1Tex_00C130"
-static const ALIGN_ASSET(2) char HIDAN_room_1Tex_00C130[] = dHIDAN_room_1Tex_00C130;
-
 #define dHIDAN_room_1DL_008448 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_1DL_008448"
 static const ALIGN_ASSET(2) char HIDAN_room_1DL_008448[] = dHIDAN_room_1DL_008448;
 
diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_10.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_10.h
index 80e1af2c2..5920cdb0d 100644
--- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_10.h
+++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_10.h
@@ -3,63 +3,69 @@
 
 #include "align_asset_macro.h"
 
-#define dHIDAN_room_10DL_000680 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10DL_000680"
-static const ALIGN_ASSET(2) char HIDAN_room_10DL_000680[] = dHIDAN_room_10DL_000680;
-
-#define dHIDAN_room_10Tex_017018 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_017018"
-static const ALIGN_ASSET(2) char HIDAN_room_10Tex_017018[] = dHIDAN_room_10Tex_017018;
-
-#define dHIDAN_room_10DL_000B40 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10DL_000B40"
-static const ALIGN_ASSET(2) char HIDAN_room_10DL_000B40[] = dHIDAN_room_10DL_000B40;
-
 #define dHIDAN_room_10Tex_011818 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_011818"
 static const ALIGN_ASSET(2) char HIDAN_room_10Tex_011818[] = dHIDAN_room_10Tex_011818;
 
 #define dHIDAN_room_10Tex_011A18 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_011A18"
 static const ALIGN_ASSET(2) char HIDAN_room_10Tex_011A18[] = dHIDAN_room_10Tex_011A18;
 
-#define dHIDAN_room_10DL_002620 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10DL_002620"
-static const ALIGN_ASSET(2) char HIDAN_room_10DL_002620[] = dHIDAN_room_10DL_002620;
+#define dHIDAN_room_10Tex_012218 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_012218"
+static const ALIGN_ASSET(2) char HIDAN_room_10Tex_012218[] = dHIDAN_room_10Tex_012218;
 
-#define dHIDAN_room_10Tex_016A18 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_016A18"
-static const ALIGN_ASSET(2) char HIDAN_room_10Tex_016A18[] = dHIDAN_room_10Tex_016A18;
-
-#define dHIDAN_room_10Tex_016C18 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_016C18"
-static const ALIGN_ASSET(2) char HIDAN_room_10Tex_016C18[] = dHIDAN_room_10Tex_016C18;
-
-#define dHIDAN_room_10Tex_014418 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_014418"
-static const ALIGN_ASSET(2) char HIDAN_room_10Tex_014418[] = dHIDAN_room_10Tex_014418;
+#define dHIDAN_room_10Tex_012618 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_012618"
+static const ALIGN_ASSET(2) char HIDAN_room_10Tex_012618[] = dHIDAN_room_10Tex_012618;
 
 #define dHIDAN_room_10Tex_012E18 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_012E18"
 static const ALIGN_ASSET(2) char HIDAN_room_10Tex_012E18[] = dHIDAN_room_10Tex_012E18;
 
+#define dHIDAN_room_10Tex_013218 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_013218"
+static const ALIGN_ASSET(2) char HIDAN_room_10Tex_013218[] = dHIDAN_room_10Tex_013218;
+
 #define dHIDAN_room_10Tex_013418 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_013418"
 static const ALIGN_ASSET(2) char HIDAN_room_10Tex_013418[] = dHIDAN_room_10Tex_013418;
 
+#define dHIDAN_room_10Tex_014418 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_014418"
+static const ALIGN_ASSET(2) char HIDAN_room_10Tex_014418[] = dHIDAN_room_10Tex_014418;
+
+#define dHIDAN_room_10Tex_015418 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_015418"
+static const ALIGN_ASSET(2) char HIDAN_room_10Tex_015418[] = dHIDAN_room_10Tex_015418;
+
 #define dHIDAN_room_10Tex_015818 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_015818"
 static const ALIGN_ASSET(2) char HIDAN_room_10Tex_015818[] = dHIDAN_room_10Tex_015818;
 
 #define dHIDAN_room_10Tex_015A18 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_015A18"
 static const ALIGN_ASSET(2) char HIDAN_room_10Tex_015A18[] = dHIDAN_room_10Tex_015A18;
 
+#define dHIDAN_room_10Tex_016A18 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_016A18"
+static const ALIGN_ASSET(2) char HIDAN_room_10Tex_016A18[] = dHIDAN_room_10Tex_016A18;
+
+#define dHIDAN_room_10Tex_016C18 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_016C18"
+static const ALIGN_ASSET(2) char HIDAN_room_10Tex_016C18[] = dHIDAN_room_10Tex_016C18;
+
+#define dHIDAN_room_10Tex_017018 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_017018"
+static const ALIGN_ASSET(2) char HIDAN_room_10Tex_017018[] = dHIDAN_room_10Tex_017018;
+
+#define dHIDAN_room_10Tex_017818 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_017818"
+static const ALIGN_ASSET(2) char HIDAN_room_10Tex_017818[] = dHIDAN_room_10Tex_017818;
+
+#define dHIDAN_room_10Tex_017C18 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_017C18"
+static const ALIGN_ASSET(2) char HIDAN_room_10Tex_017C18[] = dHIDAN_room_10Tex_017C18;
+
+#define dHIDAN_room_10DL_000680 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10DL_000680"
+static const ALIGN_ASSET(2) char HIDAN_room_10DL_000680[] = dHIDAN_room_10DL_000680;
+
+#define dHIDAN_room_10DL_000B40 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10DL_000B40"
+static const ALIGN_ASSET(2) char HIDAN_room_10DL_000B40[] = dHIDAN_room_10DL_000B40;
+
+#define dHIDAN_room_10DL_002620 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10DL_002620"
+static const ALIGN_ASSET(2) char HIDAN_room_10DL_002620[] = dHIDAN_room_10DL_002620;
+
 #define dHIDAN_room_10DL_004900 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10DL_004900"
 static const ALIGN_ASSET(2) char HIDAN_room_10DL_004900[] = dHIDAN_room_10DL_004900;
 
 #define dHIDAN_room_10DL_0055C0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10DL_0055C0"
 static const ALIGN_ASSET(2) char HIDAN_room_10DL_0055C0[] = dHIDAN_room_10DL_0055C0;
 
-#define dHIDAN_room_10Tex_017C18 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_017C18"
-static const ALIGN_ASSET(2) char HIDAN_room_10Tex_017C18[] = dHIDAN_room_10Tex_017C18;
-
-#define dHIDAN_room_10Tex_012618 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_012618"
-static const ALIGN_ASSET(2) char HIDAN_room_10Tex_012618[] = dHIDAN_room_10Tex_012618;
-
-#define dHIDAN_room_10Tex_013218 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_013218"
-static const ALIGN_ASSET(2) char HIDAN_room_10Tex_013218[] = dHIDAN_room_10Tex_013218;
-
-#define dHIDAN_room_10Tex_017818 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_017818"
-static const ALIGN_ASSET(2) char HIDAN_room_10Tex_017818[] = dHIDAN_room_10Tex_017818;
-
 #define dHIDAN_room_10DL_0069D0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10DL_0069D0"
 static const ALIGN_ASSET(2) char HIDAN_room_10DL_0069D0[] = dHIDAN_room_10DL_0069D0;
 
@@ -78,12 +84,6 @@ static const ALIGN_ASSET(2) char HIDAN_room_10DL_00D970[] = dHIDAN_room_10DL_00D
 #define dHIDAN_room_10DL_00FBD0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10DL_00FBD0"
 static const ALIGN_ASSET(2) char HIDAN_room_10DL_00FBD0[] = dHIDAN_room_10DL_00FBD0;
 
-#define dHIDAN_room_10Tex_015418 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_015418"
-static const ALIGN_ASSET(2) char HIDAN_room_10Tex_015418[] = dHIDAN_room_10Tex_015418;
-
-#define dHIDAN_room_10Tex_012218 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10Tex_012218"
-static const ALIGN_ASSET(2) char HIDAN_room_10Tex_012218[] = dHIDAN_room_10Tex_012218;
-
 #define dHIDAN_room_10DL_011610 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_10DL_011610"
 static const ALIGN_ASSET(2) char HIDAN_room_10DL_011610[] = dHIDAN_room_10DL_011610;
 
diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_11.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_11.h
index c49f0f91c..1ebe930bc 100644
--- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_11.h
+++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_11.h
@@ -3,21 +3,21 @@
 
 #include "align_asset_macro.h"
 
-#define dHIDAN_room_11DL_0009E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_11DL_0009E0"
-static const ALIGN_ASSET(2) char HIDAN_room_11DL_0009E0[] = dHIDAN_room_11DL_0009E0;
+#define dHIDAN_room_11Tex_0027D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_11Tex_0027D8"
+static const ALIGN_ASSET(2) char HIDAN_room_11Tex_0027D8[] = dHIDAN_room_11Tex_0027D8;
+
+#define dHIDAN_room_11Tex_002FD8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_11Tex_002FD8"
+static const ALIGN_ASSET(2) char HIDAN_room_11Tex_002FD8[] = dHIDAN_room_11Tex_002FD8;
 
 #define dHIDAN_room_11Tex_0033D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_11Tex_0033D8"
 static const ALIGN_ASSET(2) char HIDAN_room_11Tex_0033D8[] = dHIDAN_room_11Tex_0033D8;
 
-#define dHIDAN_room_11Tex_0027D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_11Tex_0027D8"
-static const ALIGN_ASSET(2) char HIDAN_room_11Tex_0027D8[] = dHIDAN_room_11Tex_0027D8;
+#define dHIDAN_room_11DL_0009E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_11DL_0009E0"
+static const ALIGN_ASSET(2) char HIDAN_room_11DL_0009E0[] = dHIDAN_room_11DL_0009E0;
 
 #define dHIDAN_room_11DL_001908 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_11DL_001908"
 static const ALIGN_ASSET(2) char HIDAN_room_11DL_001908[] = dHIDAN_room_11DL_001908;
 
-#define dHIDAN_room_11Tex_002FD8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_11Tex_002FD8"
-static const ALIGN_ASSET(2) char HIDAN_room_11Tex_002FD8[] = dHIDAN_room_11Tex_002FD8;
-
 #define dHIDAN_room_11DL_002628 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_11DL_002628"
 static const ALIGN_ASSET(2) char HIDAN_room_11DL_002628[] = dHIDAN_room_11DL_002628;
 
diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_12.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_12.h
index 691f1756b..7a8f22118 100644
--- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_12.h
+++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_12.h
@@ -3,23 +3,23 @@
 
 #include "align_asset_macro.h"
 
-#define dHIDAN_room_12DL_000B70 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_12DL_000B70"
-static const ALIGN_ASSET(2) char HIDAN_room_12DL_000B70[] = dHIDAN_room_12DL_000B70;
-
-#define dHIDAN_room_12Tex_002768 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_12Tex_002768"
-static const ALIGN_ASSET(2) char HIDAN_room_12Tex_002768[] = dHIDAN_room_12Tex_002768;
-
-#define dHIDAN_room_12DL_001520 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_12DL_001520"
-static const ALIGN_ASSET(2) char HIDAN_room_12DL_001520[] = dHIDAN_room_12DL_001520;
-
-#define dHIDAN_room_12DL_001A58 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_12DL_001A58"
-static const ALIGN_ASSET(2) char HIDAN_room_12DL_001A58[] = dHIDAN_room_12DL_001A58;
-
 #define dHIDAN_room_12Tex_001D68 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_12Tex_001D68"
 static const ALIGN_ASSET(2) char HIDAN_room_12Tex_001D68[] = dHIDAN_room_12Tex_001D68;
 
 #define dHIDAN_room_12Tex_001F68 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_12Tex_001F68"
 static const ALIGN_ASSET(2) char HIDAN_room_12Tex_001F68[] = dHIDAN_room_12Tex_001F68;
 
+#define dHIDAN_room_12Tex_002768 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_12Tex_002768"
+static const ALIGN_ASSET(2) char HIDAN_room_12Tex_002768[] = dHIDAN_room_12Tex_002768;
+
+#define dHIDAN_room_12DL_000B70 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_12DL_000B70"
+static const ALIGN_ASSET(2) char HIDAN_room_12DL_000B70[] = dHIDAN_room_12DL_000B70;
+
+#define dHIDAN_room_12DL_001520 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_12DL_001520"
+static const ALIGN_ASSET(2) char HIDAN_room_12DL_001520[] = dHIDAN_room_12DL_001520;
+
+#define dHIDAN_room_12DL_001A58 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_12DL_001A58"
+static const ALIGN_ASSET(2) char HIDAN_room_12DL_001A58[] = dHIDAN_room_12DL_001A58;
+
 
 #endif // DUNGEONS_HIDAN_ROOM_12_H
diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_13.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_13.h
index 5fa60bbc4..5f5eecde7 100644
--- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_13.h
+++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_13.h
@@ -3,41 +3,41 @@
 
 #include "align_asset_macro.h"
 
-#define dHIDAN_room_13DL_001210 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13DL_001210"
-static const ALIGN_ASSET(2) char HIDAN_room_13DL_001210[] = dHIDAN_room_13DL_001210;
-
-#define dHIDAN_room_13Tex_00B388 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13Tex_00B388"
-static const ALIGN_ASSET(2) char HIDAN_room_13Tex_00B388[] = dHIDAN_room_13Tex_00B388;
-
 #define dHIDAN_room_13Tex_00A788 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13Tex_00A788"
 static const ALIGN_ASSET(2) char HIDAN_room_13Tex_00A788[] = dHIDAN_room_13Tex_00A788;
 
 #define dHIDAN_room_13Tex_00AF88 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13Tex_00AF88"
 static const ALIGN_ASSET(2) char HIDAN_room_13Tex_00AF88[] = dHIDAN_room_13Tex_00AF88;
 
+#define dHIDAN_room_13Tex_00B388 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13Tex_00B388"
+static const ALIGN_ASSET(2) char HIDAN_room_13Tex_00B388[] = dHIDAN_room_13Tex_00B388;
+
+#define dHIDAN_room_13Tex_00B788 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13Tex_00B788"
+static const ALIGN_ASSET(2) char HIDAN_room_13Tex_00B788[] = dHIDAN_room_13Tex_00B788;
+
+#define dHIDAN_room_13Tex_00BB88 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13Tex_00BB88"
+static const ALIGN_ASSET(2) char HIDAN_room_13Tex_00BB88[] = dHIDAN_room_13Tex_00BB88;
+
+#define dHIDAN_room_13Tex_00C388 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13Tex_00C388"
+static const ALIGN_ASSET(2) char HIDAN_room_13Tex_00C388[] = dHIDAN_room_13Tex_00C388;
+
+#define dHIDAN_room_13DL_001210 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13DL_001210"
+static const ALIGN_ASSET(2) char HIDAN_room_13DL_001210[] = dHIDAN_room_13DL_001210;
+
 #define dHIDAN_room_13DL_0031F8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13DL_0031F8"
 static const ALIGN_ASSET(2) char HIDAN_room_13DL_0031F8[] = dHIDAN_room_13DL_0031F8;
 
 #define dHIDAN_room_13DL_005138 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13DL_005138"
 static const ALIGN_ASSET(2) char HIDAN_room_13DL_005138[] = dHIDAN_room_13DL_005138;
 
-#define dHIDAN_room_13Tex_00C388 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13Tex_00C388"
-static const ALIGN_ASSET(2) char HIDAN_room_13Tex_00C388[] = dHIDAN_room_13Tex_00C388;
-
 #define dHIDAN_room_13DL_007908 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13DL_007908"
 static const ALIGN_ASSET(2) char HIDAN_room_13DL_007908[] = dHIDAN_room_13DL_007908;
 
-#define dHIDAN_room_13Tex_00BB88 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13Tex_00BB88"
-static const ALIGN_ASSET(2) char HIDAN_room_13Tex_00BB88[] = dHIDAN_room_13Tex_00BB88;
-
 #define dHIDAN_room_13DL_009160 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13DL_009160"
 static const ALIGN_ASSET(2) char HIDAN_room_13DL_009160[] = dHIDAN_room_13DL_009160;
 
 #define dHIDAN_room_13DL_00A228 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13DL_00A228"
 static const ALIGN_ASSET(2) char HIDAN_room_13DL_00A228[] = dHIDAN_room_13DL_00A228;
 
-#define dHIDAN_room_13Tex_00B788 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_13Tex_00B788"
-static const ALIGN_ASSET(2) char HIDAN_room_13Tex_00B788[] = dHIDAN_room_13Tex_00B788;
-
 
 #endif // DUNGEONS_HIDAN_ROOM_13_H
diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_14.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_14.h
index ced1a642a..e3cd47a89 100644
--- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_14.h
+++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_14.h
@@ -3,14 +3,14 @@
 
 #include "align_asset_macro.h"
 
-#define dHIDAN_room_14DL_001030 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_14DL_001030"
-static const ALIGN_ASSET(2) char HIDAN_room_14DL_001030[] = dHIDAN_room_14DL_001030;
+#define dHIDAN_room_14Tex_0019F8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_14Tex_0019F8"
+static const ALIGN_ASSET(2) char HIDAN_room_14Tex_0019F8[] = dHIDAN_room_14Tex_0019F8;
 
 #define dHIDAN_room_14Tex_001DF8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_14Tex_001DF8"
 static const ALIGN_ASSET(2) char HIDAN_room_14Tex_001DF8[] = dHIDAN_room_14Tex_001DF8;
 
-#define dHIDAN_room_14Tex_0019F8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_14Tex_0019F8"
-static const ALIGN_ASSET(2) char HIDAN_room_14Tex_0019F8[] = dHIDAN_room_14Tex_0019F8;
+#define dHIDAN_room_14DL_001030 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_14DL_001030"
+static const ALIGN_ASSET(2) char HIDAN_room_14DL_001030[] = dHIDAN_room_14DL_001030;
 
 
 #endif // DUNGEONS_HIDAN_ROOM_14_H
diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_15.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_15.h
index 715769058..6e73050fd 100644
--- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_15.h
+++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_15.h
@@ -3,11 +3,11 @@
 
 #include "align_asset_macro.h"
 
-#define dHIDAN_room_15DL_000910 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_15DL_000910"
-static const ALIGN_ASSET(2) char HIDAN_room_15DL_000910[] = dHIDAN_room_15DL_000910;
-
 #define dHIDAN_room_15Tex_000D88 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_15Tex_000D88"
 static const ALIGN_ASSET(2) char HIDAN_room_15Tex_000D88[] = dHIDAN_room_15Tex_000D88;
 
+#define dHIDAN_room_15DL_000910 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_15DL_000910"
+static const ALIGN_ASSET(2) char HIDAN_room_15DL_000910[] = dHIDAN_room_15DL_000910;
+
 
 #endif // DUNGEONS_HIDAN_ROOM_15_H
diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_16.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_16.h
index ed501ffee..aeb65e809 100644
--- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_16.h
+++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_16.h
@@ -3,56 +3,56 @@
 
 #include "align_asset_macro.h"
 
-#define dHIDAN_room_16DL_000350 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16DL_000350"
-static const ALIGN_ASSET(2) char HIDAN_room_16DL_000350[] = dHIDAN_room_16DL_000350;
-
-#define dHIDAN_room_16Tex_009DE0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_009DE0"
-static const ALIGN_ASSET(2) char HIDAN_room_16Tex_009DE0[] = dHIDAN_room_16Tex_009DE0;
-
-#define dHIDAN_room_16DL_001480 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16DL_001480"
-static const ALIGN_ASSET(2) char HIDAN_room_16DL_001480[] = dHIDAN_room_16DL_001480;
+#define dHIDAN_room_16Tex_006DE0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_006DE0"
+static const ALIGN_ASSET(2) char HIDAN_room_16Tex_006DE0[] = dHIDAN_room_16Tex_006DE0;
 
 #define dHIDAN_room_16Tex_006FE0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_006FE0"
 static const ALIGN_ASSET(2) char HIDAN_room_16Tex_006FE0[] = dHIDAN_room_16Tex_006FE0;
 
-#define dHIDAN_room_16Tex_006DE0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_006DE0"
-static const ALIGN_ASSET(2) char HIDAN_room_16Tex_006DE0[] = dHIDAN_room_16Tex_006DE0;
-
-#define dHIDAN_room_16Tex_00A5E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_00A5E0"
-static const ALIGN_ASSET(2) char HIDAN_room_16Tex_00A5E0[] = dHIDAN_room_16Tex_00A5E0;
-
-#define dHIDAN_room_16Tex_0085E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_0085E0"
-static const ALIGN_ASSET(2) char HIDAN_room_16Tex_0085E0[] = dHIDAN_room_16Tex_0085E0;
-
 #define dHIDAN_room_16Tex_0077E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_0077E0"
 static const ALIGN_ASSET(2) char HIDAN_room_16Tex_0077E0[] = dHIDAN_room_16Tex_0077E0;
 
-#define dHIDAN_room_16Tex_0091E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_0091E0"
-static const ALIGN_ASSET(2) char HIDAN_room_16Tex_0091E0[] = dHIDAN_room_16Tex_0091E0;
-
-#define dHIDAN_room_16Tex_0083E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_0083E0"
-static const ALIGN_ASSET(2) char HIDAN_room_16Tex_0083E0[] = dHIDAN_room_16Tex_0083E0;
-
-#define dHIDAN_room_16DL_003B58 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16DL_003B58"
-static const ALIGN_ASSET(2) char HIDAN_room_16DL_003B58[] = dHIDAN_room_16DL_003B58;
-
-#define dHIDAN_room_16Tex_0095E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_0095E0"
-static const ALIGN_ASSET(2) char HIDAN_room_16Tex_0095E0[] = dHIDAN_room_16Tex_0095E0;
-
 #define dHIDAN_room_16Tex_007FE0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_007FE0"
 static const ALIGN_ASSET(2) char HIDAN_room_16Tex_007FE0[] = dHIDAN_room_16Tex_007FE0;
 
-#define dHIDAN_room_16Tex_00B1E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_00B1E0"
-static const ALIGN_ASSET(2) char HIDAN_room_16Tex_00B1E0[] = dHIDAN_room_16Tex_00B1E0;
+#define dHIDAN_room_16Tex_0083E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_0083E0"
+static const ALIGN_ASSET(2) char HIDAN_room_16Tex_0083E0[] = dHIDAN_room_16Tex_0083E0;
 
-#define dHIDAN_room_16Tex_00A9E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_00A9E0"
-static const ALIGN_ASSET(2) char HIDAN_room_16Tex_00A9E0[] = dHIDAN_room_16Tex_00A9E0;
-
-#define dHIDAN_room_16DL_005ED8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16DL_005ED8"
-static const ALIGN_ASSET(2) char HIDAN_room_16DL_005ED8[] = dHIDAN_room_16DL_005ED8;
+#define dHIDAN_room_16Tex_0085E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_0085E0"
+static const ALIGN_ASSET(2) char HIDAN_room_16Tex_0085E0[] = dHIDAN_room_16Tex_0085E0;
 
 #define dHIDAN_room_16Tex_008DE0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_008DE0"
 static const ALIGN_ASSET(2) char HIDAN_room_16Tex_008DE0[] = dHIDAN_room_16Tex_008DE0;
 
+#define dHIDAN_room_16Tex_0091E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_0091E0"
+static const ALIGN_ASSET(2) char HIDAN_room_16Tex_0091E0[] = dHIDAN_room_16Tex_0091E0;
+
+#define dHIDAN_room_16Tex_0095E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_0095E0"
+static const ALIGN_ASSET(2) char HIDAN_room_16Tex_0095E0[] = dHIDAN_room_16Tex_0095E0;
+
+#define dHIDAN_room_16Tex_009DE0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_009DE0"
+static const ALIGN_ASSET(2) char HIDAN_room_16Tex_009DE0[] = dHIDAN_room_16Tex_009DE0;
+
+#define dHIDAN_room_16Tex_00A5E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_00A5E0"
+static const ALIGN_ASSET(2) char HIDAN_room_16Tex_00A5E0[] = dHIDAN_room_16Tex_00A5E0;
+
+#define dHIDAN_room_16Tex_00A9E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_00A9E0"
+static const ALIGN_ASSET(2) char HIDAN_room_16Tex_00A9E0[] = dHIDAN_room_16Tex_00A9E0;
+
+#define dHIDAN_room_16Tex_00B1E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16Tex_00B1E0"
+static const ALIGN_ASSET(2) char HIDAN_room_16Tex_00B1E0[] = dHIDAN_room_16Tex_00B1E0;
+
+#define dHIDAN_room_16DL_000350 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16DL_000350"
+static const ALIGN_ASSET(2) char HIDAN_room_16DL_000350[] = dHIDAN_room_16DL_000350;
+
+#define dHIDAN_room_16DL_001480 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16DL_001480"
+static const ALIGN_ASSET(2) char HIDAN_room_16DL_001480[] = dHIDAN_room_16DL_001480;
+
+#define dHIDAN_room_16DL_003B58 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16DL_003B58"
+static const ALIGN_ASSET(2) char HIDAN_room_16DL_003B58[] = dHIDAN_room_16DL_003B58;
+
+#define dHIDAN_room_16DL_005ED8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_16DL_005ED8"
+static const ALIGN_ASSET(2) char HIDAN_room_16DL_005ED8[] = dHIDAN_room_16DL_005ED8;
+
 
 #endif // DUNGEONS_HIDAN_ROOM_16_H
diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_17.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_17.h
index eea1ecdd2..238015bf0 100644
--- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_17.h
+++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_17.h
@@ -3,24 +3,6 @@
 
 #include "align_asset_macro.h"
 
-#define dHIDAN_room_17DL_003290 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_17DL_003290"
-static const ALIGN_ASSET(2) char HIDAN_room_17DL_003290[] = dHIDAN_room_17DL_003290;
-
-#define dHIDAN_room_17Tex_007968 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_17Tex_007968"
-static const ALIGN_ASSET(2) char HIDAN_room_17Tex_007968[] = dHIDAN_room_17Tex_007968;
-
-#define dHIDAN_room_17Tex_008968 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_17Tex_008968"
-static const ALIGN_ASSET(2) char HIDAN_room_17Tex_008968[] = dHIDAN_room_17Tex_008968;
-
-#define dHIDAN_room_17Tex_008168 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_17Tex_008168"
-static const ALIGN_ASSET(2) char HIDAN_room_17Tex_008168[] = dHIDAN_room_17Tex_008168;
-
-#define dHIDAN_room_17Tex_007168 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_17Tex_007168"
-static const ALIGN_ASSET(2) char HIDAN_room_17Tex_007168[] = dHIDAN_room_17Tex_007168;
-
-#define dHIDAN_room_17Tex_006968 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_17Tex_006968"
-static const ALIGN_ASSET(2) char HIDAN_room_17Tex_006968[] = dHIDAN_room_17Tex_006968;
-
 #define dHIDAN_room_17Tex_005168 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_17Tex_005168"
 static const ALIGN_ASSET(2) char HIDAN_room_17Tex_005168[] = dHIDAN_room_17Tex_005168;
 
@@ -30,5 +12,23 @@ static const ALIGN_ASSET(2) char HIDAN_room_17Tex_005968[] = dHIDAN_room_17Tex_0
 #define dHIDAN_room_17Tex_006168 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_17Tex_006168"
 static const ALIGN_ASSET(2) char HIDAN_room_17Tex_006168[] = dHIDAN_room_17Tex_006168;
 
+#define dHIDAN_room_17Tex_006968 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_17Tex_006968"
+static const ALIGN_ASSET(2) char HIDAN_room_17Tex_006968[] = dHIDAN_room_17Tex_006968;
+
+#define dHIDAN_room_17Tex_007168 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_17Tex_007168"
+static const ALIGN_ASSET(2) char HIDAN_room_17Tex_007168[] = dHIDAN_room_17Tex_007168;
+
+#define dHIDAN_room_17Tex_007968 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_17Tex_007968"
+static const ALIGN_ASSET(2) char HIDAN_room_17Tex_007968[] = dHIDAN_room_17Tex_007968;
+
+#define dHIDAN_room_17Tex_008168 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_17Tex_008168"
+static const ALIGN_ASSET(2) char HIDAN_room_17Tex_008168[] = dHIDAN_room_17Tex_008168;
+
+#define dHIDAN_room_17Tex_008968 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_17Tex_008968"
+static const ALIGN_ASSET(2) char HIDAN_room_17Tex_008968[] = dHIDAN_room_17Tex_008968;
+
+#define dHIDAN_room_17DL_003290 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_17DL_003290"
+static const ALIGN_ASSET(2) char HIDAN_room_17DL_003290[] = dHIDAN_room_17DL_003290;
+
 
 #endif // DUNGEONS_HIDAN_ROOM_17_H
diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_18.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_18.h
index e28427abf..d6904d05a 100644
--- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_18.h
+++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_18.h
@@ -3,17 +3,14 @@
 
 #include "align_asset_macro.h"
 
-#define dHIDAN_room_18DL_001890 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_18DL_001890"
-static const ALIGN_ASSET(2) char HIDAN_room_18DL_001890[] = dHIDAN_room_18DL_001890;
-
-#define dHIDAN_room_18Tex_0033F8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_18Tex_0033F8"
-static const ALIGN_ASSET(2) char HIDAN_room_18Tex_0033F8[] = dHIDAN_room_18Tex_0033F8;
+#define dHIDAN_room_18Tex_0027F8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_18Tex_0027F8"
+static const ALIGN_ASSET(2) char HIDAN_room_18Tex_0027F8[] = dHIDAN_room_18Tex_0027F8;
 
 #define dHIDAN_room_18Tex_002FF8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_18Tex_002FF8"
 static const ALIGN_ASSET(2) char HIDAN_room_18Tex_002FF8[] = dHIDAN_room_18Tex_002FF8;
 
-#define dHIDAN_room_18Tex_0027F8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_18Tex_0027F8"
-static const ALIGN_ASSET(2) char HIDAN_room_18Tex_0027F8[] = dHIDAN_room_18Tex_0027F8;
+#define dHIDAN_room_18Tex_0033F8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_18Tex_0033F8"
+static const ALIGN_ASSET(2) char HIDAN_room_18Tex_0033F8[] = dHIDAN_room_18Tex_0033F8;
 
 #define dHIDAN_room_18Tex_0037F8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_18Tex_0037F8"
 static const ALIGN_ASSET(2) char HIDAN_room_18Tex_0037F8[] = dHIDAN_room_18Tex_0037F8;
@@ -21,5 +18,8 @@ static const ALIGN_ASSET(2) char HIDAN_room_18Tex_0037F8[] = dHIDAN_room_18Tex_0
 #define dHIDAN_room_18Tex_0039F8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_18Tex_0039F8"
 static const ALIGN_ASSET(2) char HIDAN_room_18Tex_0039F8[] = dHIDAN_room_18Tex_0039F8;
 
+#define dHIDAN_room_18DL_001890 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_18DL_001890"
+static const ALIGN_ASSET(2) char HIDAN_room_18DL_001890[] = dHIDAN_room_18DL_001890;
+
 
 #endif // DUNGEONS_HIDAN_ROOM_18_H
diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_19.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_19.h
index b809f6f4f..d9d0f5f7b 100644
--- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_19.h
+++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_19.h
@@ -3,23 +3,23 @@
 
 #include "align_asset_macro.h"
 
-#define dHIDAN_room_19DL_001C00 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_19DL_001C00"
-static const ALIGN_ASSET(2) char HIDAN_room_19DL_001C00[] = dHIDAN_room_19DL_001C00;
-
 #define dHIDAN_room_19Tex_002E28 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_19Tex_002E28"
 static const ALIGN_ASSET(2) char HIDAN_room_19Tex_002E28[] = dHIDAN_room_19Tex_002E28;
 
-#define dHIDAN_room_19Tex_003E28 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_19Tex_003E28"
-static const ALIGN_ASSET(2) char HIDAN_room_19Tex_003E28[] = dHIDAN_room_19Tex_003E28;
-
-#define dHIDAN_room_19Tex_003A28 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_19Tex_003A28"
-static const ALIGN_ASSET(2) char HIDAN_room_19Tex_003A28[] = dHIDAN_room_19Tex_003A28;
-
-#define dHIDAN_room_19Tex_004028 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_19Tex_004028"
-static const ALIGN_ASSET(2) char HIDAN_room_19Tex_004028[] = dHIDAN_room_19Tex_004028;
-
 #define dHIDAN_room_19Tex_003628 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_19Tex_003628"
 static const ALIGN_ASSET(2) char HIDAN_room_19Tex_003628[] = dHIDAN_room_19Tex_003628;
 
+#define dHIDAN_room_19Tex_003A28 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_19Tex_003A28"
+static const ALIGN_ASSET(2) char HIDAN_room_19Tex_003A28[] = dHIDAN_room_19Tex_003A28;
+
+#define dHIDAN_room_19Tex_003E28 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_19Tex_003E28"
+static const ALIGN_ASSET(2) char HIDAN_room_19Tex_003E28[] = dHIDAN_room_19Tex_003E28;
+
+#define dHIDAN_room_19Tex_004028 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_19Tex_004028"
+static const ALIGN_ASSET(2) char HIDAN_room_19Tex_004028[] = dHIDAN_room_19Tex_004028;
+
+#define dHIDAN_room_19DL_001C00 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_19DL_001C00"
+static const ALIGN_ASSET(2) char HIDAN_room_19DL_001C00[] = dHIDAN_room_19DL_001C00;
+
 
 #endif // DUNGEONS_HIDAN_ROOM_19_H
diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_2.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_2.h
index 131325d78..25e6e6909 100644
--- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_2.h
+++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_2.h
@@ -3,21 +3,27 @@
 
 #include "align_asset_macro.h"
 
-#define dHIDAN_room_2DL_0094C0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2DL_0094C0"
-static const ALIGN_ASSET(2) char HIDAN_room_2DL_0094C0[] = dHIDAN_room_2DL_0094C0;
+#define dHIDAN_room_2Tex_009628 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_009628"
+static const ALIGN_ASSET(2) char HIDAN_room_2Tex_009628[] = dHIDAN_room_2Tex_009628;
 
-#define dHIDAN_room_2Tex_00E428 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00E428"
-static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00E428[] = dHIDAN_room_2Tex_00E428;
+#define dHIDAN_room_2Tex_009828 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_009828"
+static const ALIGN_ASSET(2) char HIDAN_room_2Tex_009828[] = dHIDAN_room_2Tex_009828;
 
-#define dHIDAN_room_2DL_002A80 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2DL_002A80"
-static const ALIGN_ASSET(2) char HIDAN_room_2DL_002A80[] = dHIDAN_room_2DL_002A80;
-
-#define dHIDAN_room_2Tex_00F028 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00F028"
-static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00F028[] = dHIDAN_room_2Tex_00F028;
+#define dHIDAN_room_2Tex_00A028 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00A028"
+static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00A028[] = dHIDAN_room_2Tex_00A028;
 
 #define dHIDAN_room_2Tex_00A828 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00A828"
 static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00A828[] = dHIDAN_room_2Tex_00A828;
 
+#define dHIDAN_room_2Tex_00AC28 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00AC28"
+static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00AC28[] = dHIDAN_room_2Tex_00AC28;
+
+#define dHIDAN_room_2Tex_00BC28 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00BC28"
+static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00BC28[] = dHIDAN_room_2Tex_00BC28;
+
+#define dHIDAN_room_2Tex_00CC28 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00CC28"
+static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00CC28[] = dHIDAN_room_2Tex_00CC28;
+
 #define dHIDAN_room_2Tex_00CE28 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00CE28"
 static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00CE28[] = dHIDAN_room_2Tex_00CE28;
 
@@ -27,20 +33,23 @@ static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00DE28[] = dHIDAN_room_2Tex_00D
 #define dHIDAN_room_2Tex_00E028 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00E028"
 static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00E028[] = dHIDAN_room_2Tex_00E028;
 
-#define dHIDAN_room_2Tex_00AC28 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00AC28"
-static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00AC28[] = dHIDAN_room_2Tex_00AC28;
+#define dHIDAN_room_2Tex_00E428 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00E428"
+static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00E428[] = dHIDAN_room_2Tex_00E428;
 
-#define dHIDAN_room_2Tex_00CC28 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00CC28"
-static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00CC28[] = dHIDAN_room_2Tex_00CC28;
+#define dHIDAN_room_2Tex_00EC28 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00EC28"
+static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00EC28[] = dHIDAN_room_2Tex_00EC28;
 
-#define dHIDAN_room_2Tex_00A028 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00A028"
-static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00A028[] = dHIDAN_room_2Tex_00A028;
+#define dHIDAN_room_2Tex_00F028 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00F028"
+static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00F028[] = dHIDAN_room_2Tex_00F028;
 
 #define dHIDAN_room_2Tex_00F828 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00F828"
 static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00F828[] = dHIDAN_room_2Tex_00F828;
 
-#define dHIDAN_room_2Tex_00BC28 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00BC28"
-static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00BC28[] = dHIDAN_room_2Tex_00BC28;
+#define dHIDAN_room_2DL_0094C0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2DL_0094C0"
+static const ALIGN_ASSET(2) char HIDAN_room_2DL_0094C0[] = dHIDAN_room_2DL_0094C0;
+
+#define dHIDAN_room_2DL_002A80 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2DL_002A80"
+static const ALIGN_ASSET(2) char HIDAN_room_2DL_002A80[] = dHIDAN_room_2DL_002A80;
 
 #define dHIDAN_room_2DL_005A80 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2DL_005A80"
 static const ALIGN_ASSET(2) char HIDAN_room_2DL_005A80[] = dHIDAN_room_2DL_005A80;
@@ -48,14 +57,5 @@ static const ALIGN_ASSET(2) char HIDAN_room_2DL_005A80[] = dHIDAN_room_2DL_005A8
 #define dHIDAN_room_2DL_0079A0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2DL_0079A0"
 static const ALIGN_ASSET(2) char HIDAN_room_2DL_0079A0[] = dHIDAN_room_2DL_0079A0;
 
-#define dHIDAN_room_2Tex_009628 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_009628"
-static const ALIGN_ASSET(2) char HIDAN_room_2Tex_009628[] = dHIDAN_room_2Tex_009628;
-
-#define dHIDAN_room_2Tex_009828 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_009828"
-static const ALIGN_ASSET(2) char HIDAN_room_2Tex_009828[] = dHIDAN_room_2Tex_009828;
-
-#define dHIDAN_room_2Tex_00EC28 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_2Tex_00EC28"
-static const ALIGN_ASSET(2) char HIDAN_room_2Tex_00EC28[] = dHIDAN_room_2Tex_00EC28;
-
 
 #endif // DUNGEONS_HIDAN_ROOM_2_H
diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_20.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_20.h
index 021845678..1a78b1028 100644
--- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_20.h
+++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_20.h
@@ -3,23 +3,8 @@
 
 #include "align_asset_macro.h"
 
-#define dHIDAN_room_20DL_001BE0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_20DL_001BE0"
-static const ALIGN_ASSET(2) char HIDAN_room_20DL_001BE0[] = dHIDAN_room_20DL_001BE0;
-
-#define dHIDAN_room_20Tex_006508 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_20Tex_006508"
-static const ALIGN_ASSET(2) char HIDAN_room_20Tex_006508[] = dHIDAN_room_20Tex_006508;
-
-#define dHIDAN_room_20Tex_005D08 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_20Tex_005D08"
-static const ALIGN_ASSET(2) char HIDAN_room_20Tex_005D08[] = dHIDAN_room_20Tex_005D08;
-
-#define dHIDAN_room_20Tex_005508 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_20Tex_005508"
-static const ALIGN_ASSET(2) char HIDAN_room_20Tex_005508[] = dHIDAN_room_20Tex_005508;
-
-#define dHIDAN_room_20Tex_004D08 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_20Tex_004D08"
-static const ALIGN_ASSET(2) char HIDAN_room_20Tex_004D08[] = dHIDAN_room_20Tex_004D08;
-
-#define dHIDAN_room_20Tex_004508 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_20Tex_004508"
-static const ALIGN_ASSET(2) char HIDAN_room_20Tex_004508[] = dHIDAN_room_20Tex_004508;
+#define dHIDAN_room_20Tex_002D08 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_20Tex_002D08"
+static const ALIGN_ASSET(2) char HIDAN_room_20Tex_002D08[] = dHIDAN_room_20Tex_002D08;
 
 #define dHIDAN_room_20Tex_003508 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_20Tex_003508"
 static const ALIGN_ASSET(2) char HIDAN_room_20Tex_003508[] = dHIDAN_room_20Tex_003508;
@@ -27,8 +12,23 @@ static const ALIGN_ASSET(2) char HIDAN_room_20Tex_003508[] = dHIDAN_room_20Tex_0
 #define dHIDAN_room_20Tex_003D08 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_20Tex_003D08"
 static const ALIGN_ASSET(2) char HIDAN_room_20Tex_003D08[] = dHIDAN_room_20Tex_003D08;
 
-#define dHIDAN_room_20Tex_002D08 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_20Tex_002D08"
-static const ALIGN_ASSET(2) char HIDAN_room_20Tex_002D08[] = dHIDAN_room_20Tex_002D08;
+#define dHIDAN_room_20Tex_004508 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_20Tex_004508"
+static const ALIGN_ASSET(2) char HIDAN_room_20Tex_004508[] = dHIDAN_room_20Tex_004508;
+
+#define dHIDAN_room_20Tex_004D08 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_20Tex_004D08"
+static const ALIGN_ASSET(2) char HIDAN_room_20Tex_004D08[] = dHIDAN_room_20Tex_004D08;
+
+#define dHIDAN_room_20Tex_005508 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_20Tex_005508"
+static const ALIGN_ASSET(2) char HIDAN_room_20Tex_005508[] = dHIDAN_room_20Tex_005508;
+
+#define dHIDAN_room_20Tex_005D08 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_20Tex_005D08"
+static const ALIGN_ASSET(2) char HIDAN_room_20Tex_005D08[] = dHIDAN_room_20Tex_005D08;
+
+#define dHIDAN_room_20Tex_006508 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_20Tex_006508"
+static const ALIGN_ASSET(2) char HIDAN_room_20Tex_006508[] = dHIDAN_room_20Tex_006508;
+
+#define dHIDAN_room_20DL_001BE0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_20DL_001BE0"
+static const ALIGN_ASSET(2) char HIDAN_room_20DL_001BE0[] = dHIDAN_room_20DL_001BE0;
 
 
 #endif // DUNGEONS_HIDAN_ROOM_20_H
diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_21.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_21.h
index 0974156e8..16df7a7ee 100644
--- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_21.h
+++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_21.h
@@ -3,18 +3,42 @@
 
 #include "align_asset_macro.h"
 
-#define dHIDAN_room_21DL_0003E8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21DL_0003E8"
-static const ALIGN_ASSET(2) char HIDAN_room_21DL_0003E8[] = dHIDAN_room_21DL_0003E8;
+#define dHIDAN_room_21Tex_004478 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_004478"
+static const ALIGN_ASSET(2) char HIDAN_room_21Tex_004478[] = dHIDAN_room_21Tex_004478;
+
+#define dHIDAN_room_21Tex_004678 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_004678"
+static const ALIGN_ASSET(2) char HIDAN_room_21Tex_004678[] = dHIDAN_room_21Tex_004678;
+
+#define dHIDAN_room_21Tex_004E78 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_004E78"
+static const ALIGN_ASSET(2) char HIDAN_room_21Tex_004E78[] = dHIDAN_room_21Tex_004E78;
+
+#define dHIDAN_room_21Tex_005678 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_005678"
+static const ALIGN_ASSET(2) char HIDAN_room_21Tex_005678[] = dHIDAN_room_21Tex_005678;
+
+#define dHIDAN_room_21Tex_005E78 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_005E78"
+static const ALIGN_ASSET(2) char HIDAN_room_21Tex_005E78[] = dHIDAN_room_21Tex_005E78;
+
+#define dHIDAN_room_21Tex_006678 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_006678"
+static const ALIGN_ASSET(2) char HIDAN_room_21Tex_006678[] = dHIDAN_room_21Tex_006678;
+
+#define dHIDAN_room_21Tex_006A78 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_006A78"
+static const ALIGN_ASSET(2) char HIDAN_room_21Tex_006A78[] = dHIDAN_room_21Tex_006A78;
+
+#define dHIDAN_room_21Tex_007278 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_007278"
+static const ALIGN_ASSET(2) char HIDAN_room_21Tex_007278[] = dHIDAN_room_21Tex_007278;
 
 #define dHIDAN_room_21Tex_007478 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_007478"
 static const ALIGN_ASSET(2) char HIDAN_room_21Tex_007478[] = dHIDAN_room_21Tex_007478;
 
-#define dHIDAN_room_21DL_000230 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21DL_000230"
-static const ALIGN_ASSET(2) char HIDAN_room_21DL_000230[] = dHIDAN_room_21DL_000230;
-
 #define dHIDAN_room_21Tex_007C78 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_007C78"
 static const ALIGN_ASSET(2) char HIDAN_room_21Tex_007C78[] = dHIDAN_room_21Tex_007C78;
 
+#define dHIDAN_room_21DL_0003E8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21DL_0003E8"
+static const ALIGN_ASSET(2) char HIDAN_room_21DL_0003E8[] = dHIDAN_room_21DL_0003E8;
+
+#define dHIDAN_room_21DL_000230 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21DL_000230"
+static const ALIGN_ASSET(2) char HIDAN_room_21DL_000230[] = dHIDAN_room_21DL_000230;
+
 #define dHIDAN_room_21DL_003FF8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21DL_003FF8"
 static const ALIGN_ASSET(2) char HIDAN_room_21DL_003FF8[] = dHIDAN_room_21DL_003FF8;
 
@@ -24,9 +48,6 @@ static const ALIGN_ASSET(2) char HIDAN_room_21DL_004348[] = dHIDAN_room_21DL_004
 #define dHIDAN_room_21DL_003AF0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21DL_003AF0"
 static const ALIGN_ASSET(2) char HIDAN_room_21DL_003AF0[] = dHIDAN_room_21DL_003AF0;
 
-#define dHIDAN_room_21Tex_004E78 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_004E78"
-static const ALIGN_ASSET(2) char HIDAN_room_21Tex_004E78[] = dHIDAN_room_21Tex_004E78;
-
 #define dHIDAN_room_21DL_003458 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21DL_003458"
 static const ALIGN_ASSET(2) char HIDAN_room_21DL_003458[] = dHIDAN_room_21DL_003458;
 
@@ -36,35 +57,14 @@ static const ALIGN_ASSET(2) char HIDAN_room_21DL_002F58[] = dHIDAN_room_21DL_002
 #define dHIDAN_room_21DL_002560 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21DL_002560"
 static const ALIGN_ASSET(2) char HIDAN_room_21DL_002560[] = dHIDAN_room_21DL_002560;
 
-#define dHIDAN_room_21Tex_004478 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_004478"
-static const ALIGN_ASSET(2) char HIDAN_room_21Tex_004478[] = dHIDAN_room_21Tex_004478;
-
-#define dHIDAN_room_21Tex_005678 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_005678"
-static const ALIGN_ASSET(2) char HIDAN_room_21Tex_005678[] = dHIDAN_room_21Tex_005678;
-
 #define dHIDAN_room_21DL_0010C0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21DL_0010C0"
 static const ALIGN_ASSET(2) char HIDAN_room_21DL_0010C0[] = dHIDAN_room_21DL_0010C0;
 
-#define dHIDAN_room_21Tex_007278 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_007278"
-static const ALIGN_ASSET(2) char HIDAN_room_21Tex_007278[] = dHIDAN_room_21Tex_007278;
-
-#define dHIDAN_room_21Tex_005E78 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_005E78"
-static const ALIGN_ASSET(2) char HIDAN_room_21Tex_005E78[] = dHIDAN_room_21Tex_005E78;
-
-#define dHIDAN_room_21Tex_004678 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_004678"
-static const ALIGN_ASSET(2) char HIDAN_room_21Tex_004678[] = dHIDAN_room_21Tex_004678;
-
-#define dHIDAN_room_21Tex_006678 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_006678"
-static const ALIGN_ASSET(2) char HIDAN_room_21Tex_006678[] = dHIDAN_room_21Tex_006678;
-
 #define dHIDAN_room_21DL_000838 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21DL_000838"
 static const ALIGN_ASSET(2) char HIDAN_room_21DL_000838[] = dHIDAN_room_21DL_000838;
 
 #define dHIDAN_room_21DL_000670 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21DL_000670"
 static const ALIGN_ASSET(2) char HIDAN_room_21DL_000670[] = dHIDAN_room_21DL_000670;
 
-#define dHIDAN_room_21Tex_006A78 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_21Tex_006A78"
-static const ALIGN_ASSET(2) char HIDAN_room_21Tex_006A78[] = dHIDAN_room_21Tex_006A78;
-
 
 #endif // DUNGEONS_HIDAN_ROOM_21_H
diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_22.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_22.h
index 63df6179d..84e10ddce 100644
--- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_22.h
+++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_22.h
@@ -3,24 +3,6 @@
 
 #include "align_asset_macro.h"
 
-#define dHIDAN_room_22DL_001AA0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_22DL_001AA0"
-static const ALIGN_ASSET(2) char HIDAN_room_22DL_001AA0[] = dHIDAN_room_22DL_001AA0;
-
-#define dHIDAN_room_22Tex_0052E8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_22Tex_0052E8"
-static const ALIGN_ASSET(2) char HIDAN_room_22Tex_0052E8[] = dHIDAN_room_22Tex_0052E8;
-
-#define dHIDAN_room_22Tex_0062E8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_22Tex_0062E8"
-static const ALIGN_ASSET(2) char HIDAN_room_22Tex_0062E8[] = dHIDAN_room_22Tex_0062E8;
-
-#define dHIDAN_room_22Tex_005AE8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_22Tex_005AE8"
-static const ALIGN_ASSET(2) char HIDAN_room_22Tex_005AE8[] = dHIDAN_room_22Tex_005AE8;
-
-#define dHIDAN_room_22Tex_004AE8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_22Tex_004AE8"
-static const ALIGN_ASSET(2) char HIDAN_room_22Tex_004AE8[] = dHIDAN_room_22Tex_004AE8;
-
-#define dHIDAN_room_22Tex_0042E8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_22Tex_0042E8"
-static const ALIGN_ASSET(2) char HIDAN_room_22Tex_0042E8[] = dHIDAN_room_22Tex_0042E8;
-
 #define dHIDAN_room_22Tex_002AE8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_22Tex_002AE8"
 static const ALIGN_ASSET(2) char HIDAN_room_22Tex_002AE8[] = dHIDAN_room_22Tex_002AE8;
 
@@ -30,5 +12,23 @@ static const ALIGN_ASSET(2) char HIDAN_room_22Tex_0032E8[] = dHIDAN_room_22Tex_0
 #define dHIDAN_room_22Tex_003AE8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_22Tex_003AE8"
 static const ALIGN_ASSET(2) char HIDAN_room_22Tex_003AE8[] = dHIDAN_room_22Tex_003AE8;
 
+#define dHIDAN_room_22Tex_0042E8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_22Tex_0042E8"
+static const ALIGN_ASSET(2) char HIDAN_room_22Tex_0042E8[] = dHIDAN_room_22Tex_0042E8;
+
+#define dHIDAN_room_22Tex_004AE8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_22Tex_004AE8"
+static const ALIGN_ASSET(2) char HIDAN_room_22Tex_004AE8[] = dHIDAN_room_22Tex_004AE8;
+
+#define dHIDAN_room_22Tex_0052E8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_22Tex_0052E8"
+static const ALIGN_ASSET(2) char HIDAN_room_22Tex_0052E8[] = dHIDAN_room_22Tex_0052E8;
+
+#define dHIDAN_room_22Tex_005AE8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_22Tex_005AE8"
+static const ALIGN_ASSET(2) char HIDAN_room_22Tex_005AE8[] = dHIDAN_room_22Tex_005AE8;
+
+#define dHIDAN_room_22Tex_0062E8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_22Tex_0062E8"
+static const ALIGN_ASSET(2) char HIDAN_room_22Tex_0062E8[] = dHIDAN_room_22Tex_0062E8;
+
+#define dHIDAN_room_22DL_001AA0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_22DL_001AA0"
+static const ALIGN_ASSET(2) char HIDAN_room_22DL_001AA0[] = dHIDAN_room_22DL_001AA0;
+
 
 #endif // DUNGEONS_HIDAN_ROOM_22_H
diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_23.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_23.h
index 193e540fb..49ce9ddea 100644
--- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_23.h
+++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_23.h
@@ -3,23 +3,8 @@
 
 #include "align_asset_macro.h"
 
-#define dHIDAN_room_23DL_001BF0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_23DL_001BF0"
-static const ALIGN_ASSET(2) char HIDAN_room_23DL_001BF0[] = dHIDAN_room_23DL_001BF0;
-
-#define dHIDAN_room_23Tex_006518 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_23Tex_006518"
-static const ALIGN_ASSET(2) char HIDAN_room_23Tex_006518[] = dHIDAN_room_23Tex_006518;
-
-#define dHIDAN_room_23Tex_005D18 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_23Tex_005D18"
-static const ALIGN_ASSET(2) char HIDAN_room_23Tex_005D18[] = dHIDAN_room_23Tex_005D18;
-
-#define dHIDAN_room_23Tex_005518 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_23Tex_005518"
-static const ALIGN_ASSET(2) char HIDAN_room_23Tex_005518[] = dHIDAN_room_23Tex_005518;
-
-#define dHIDAN_room_23Tex_004D18 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_23Tex_004D18"
-static const ALIGN_ASSET(2) char HIDAN_room_23Tex_004D18[] = dHIDAN_room_23Tex_004D18;
-
-#define dHIDAN_room_23Tex_004518 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_23Tex_004518"
-static const ALIGN_ASSET(2) char HIDAN_room_23Tex_004518[] = dHIDAN_room_23Tex_004518;
+#define dHIDAN_room_23Tex_002D18 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_23Tex_002D18"
+static const ALIGN_ASSET(2) char HIDAN_room_23Tex_002D18[] = dHIDAN_room_23Tex_002D18;
 
 #define dHIDAN_room_23Tex_003518 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_23Tex_003518"
 static const ALIGN_ASSET(2) char HIDAN_room_23Tex_003518[] = dHIDAN_room_23Tex_003518;
@@ -27,8 +12,23 @@ static const ALIGN_ASSET(2) char HIDAN_room_23Tex_003518[] = dHIDAN_room_23Tex_0
 #define dHIDAN_room_23Tex_003D18 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_23Tex_003D18"
 static const ALIGN_ASSET(2) char HIDAN_room_23Tex_003D18[] = dHIDAN_room_23Tex_003D18;
 
-#define dHIDAN_room_23Tex_002D18 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_23Tex_002D18"
-static const ALIGN_ASSET(2) char HIDAN_room_23Tex_002D18[] = dHIDAN_room_23Tex_002D18;
+#define dHIDAN_room_23Tex_004518 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_23Tex_004518"
+static const ALIGN_ASSET(2) char HIDAN_room_23Tex_004518[] = dHIDAN_room_23Tex_004518;
+
+#define dHIDAN_room_23Tex_004D18 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_23Tex_004D18"
+static const ALIGN_ASSET(2) char HIDAN_room_23Tex_004D18[] = dHIDAN_room_23Tex_004D18;
+
+#define dHIDAN_room_23Tex_005518 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_23Tex_005518"
+static const ALIGN_ASSET(2) char HIDAN_room_23Tex_005518[] = dHIDAN_room_23Tex_005518;
+
+#define dHIDAN_room_23Tex_005D18 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_23Tex_005D18"
+static const ALIGN_ASSET(2) char HIDAN_room_23Tex_005D18[] = dHIDAN_room_23Tex_005D18;
+
+#define dHIDAN_room_23Tex_006518 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_23Tex_006518"
+static const ALIGN_ASSET(2) char HIDAN_room_23Tex_006518[] = dHIDAN_room_23Tex_006518;
+
+#define dHIDAN_room_23DL_001BF0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_23DL_001BF0"
+static const ALIGN_ASSET(2) char HIDAN_room_23DL_001BF0[] = dHIDAN_room_23DL_001BF0;
 
 
 #endif // DUNGEONS_HIDAN_ROOM_23_H
diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_24.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_24.h
index 730363386..2bc510514 100644
--- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_24.h
+++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_24.h
@@ -3,18 +3,6 @@
 
 #include "align_asset_macro.h"
 
-#define dHIDAN_room_24DL_003A10 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_24DL_003A10"
-static const ALIGN_ASSET(2) char HIDAN_room_24DL_003A10[] = dHIDAN_room_24DL_003A10;
-
-#define dHIDAN_room_24Tex_004D38 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_24Tex_004D38"
-static const ALIGN_ASSET(2) char HIDAN_room_24Tex_004D38[] = dHIDAN_room_24Tex_004D38;
-
-#define dHIDAN_room_24DL_0019B0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_24DL_0019B0"
-static const ALIGN_ASSET(2) char HIDAN_room_24DL_0019B0[] = dHIDAN_room_24DL_0019B0;
-
-#define dHIDAN_room_24Tex_004938 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_24Tex_004938"
-static const ALIGN_ASSET(2) char HIDAN_room_24Tex_004938[] = dHIDAN_room_24Tex_004938;
-
 #define dHIDAN_room_24Tex_003B38 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_24Tex_003B38"
 static const ALIGN_ASSET(2) char HIDAN_room_24Tex_003B38[] = dHIDAN_room_24Tex_003B38;
 
@@ -27,6 +15,18 @@ static const ALIGN_ASSET(2) char HIDAN_room_24Tex_004338[] = dHIDAN_room_24Tex_0
 #define dHIDAN_room_24Tex_004738 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_24Tex_004738"
 static const ALIGN_ASSET(2) char HIDAN_room_24Tex_004738[] = dHIDAN_room_24Tex_004738;
 
+#define dHIDAN_room_24Tex_004938 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_24Tex_004938"
+static const ALIGN_ASSET(2) char HIDAN_room_24Tex_004938[] = dHIDAN_room_24Tex_004938;
+
+#define dHIDAN_room_24Tex_004D38 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_24Tex_004D38"
+static const ALIGN_ASSET(2) char HIDAN_room_24Tex_004D38[] = dHIDAN_room_24Tex_004D38;
+
+#define dHIDAN_room_24DL_003A10 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_24DL_003A10"
+static const ALIGN_ASSET(2) char HIDAN_room_24DL_003A10[] = dHIDAN_room_24DL_003A10;
+
+#define dHIDAN_room_24DL_0019B0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_24DL_0019B0"
+static const ALIGN_ASSET(2) char HIDAN_room_24DL_0019B0[] = dHIDAN_room_24DL_0019B0;
+
 #define dHIDAN_room_24DL_003660 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_24DL_003660"
 static const ALIGN_ASSET(2) char HIDAN_room_24DL_003660[] = dHIDAN_room_24DL_003660;
 
diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_25.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_25.h
index 8f552fcdd..01512f23b 100644
--- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_25.h
+++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_25.h
@@ -3,24 +3,6 @@
 
 #include "align_asset_macro.h"
 
-#define dHIDAN_room_25DL_001A90 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_25DL_001A90"
-static const ALIGN_ASSET(2) char HIDAN_room_25DL_001A90[] = dHIDAN_room_25DL_001A90;
-
-#define dHIDAN_room_25Tex_0052D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_25Tex_0052D8"
-static const ALIGN_ASSET(2) char HIDAN_room_25Tex_0052D8[] = dHIDAN_room_25Tex_0052D8;
-
-#define dHIDAN_room_25Tex_0062D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_25Tex_0062D8"
-static const ALIGN_ASSET(2) char HIDAN_room_25Tex_0062D8[] = dHIDAN_room_25Tex_0062D8;
-
-#define dHIDAN_room_25Tex_005AD8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_25Tex_005AD8"
-static const ALIGN_ASSET(2) char HIDAN_room_25Tex_005AD8[] = dHIDAN_room_25Tex_005AD8;
-
-#define dHIDAN_room_25Tex_004AD8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_25Tex_004AD8"
-static const ALIGN_ASSET(2) char HIDAN_room_25Tex_004AD8[] = dHIDAN_room_25Tex_004AD8;
-
-#define dHIDAN_room_25Tex_0042D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_25Tex_0042D8"
-static const ALIGN_ASSET(2) char HIDAN_room_25Tex_0042D8[] = dHIDAN_room_25Tex_0042D8;
-
 #define dHIDAN_room_25Tex_002AD8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_25Tex_002AD8"
 static const ALIGN_ASSET(2) char HIDAN_room_25Tex_002AD8[] = dHIDAN_room_25Tex_002AD8;
 
@@ -30,5 +12,23 @@ static const ALIGN_ASSET(2) char HIDAN_room_25Tex_0032D8[] = dHIDAN_room_25Tex_0
 #define dHIDAN_room_25Tex_003AD8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_25Tex_003AD8"
 static const ALIGN_ASSET(2) char HIDAN_room_25Tex_003AD8[] = dHIDAN_room_25Tex_003AD8;
 
+#define dHIDAN_room_25Tex_0042D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_25Tex_0042D8"
+static const ALIGN_ASSET(2) char HIDAN_room_25Tex_0042D8[] = dHIDAN_room_25Tex_0042D8;
+
+#define dHIDAN_room_25Tex_004AD8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_25Tex_004AD8"
+static const ALIGN_ASSET(2) char HIDAN_room_25Tex_004AD8[] = dHIDAN_room_25Tex_004AD8;
+
+#define dHIDAN_room_25Tex_0052D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_25Tex_0052D8"
+static const ALIGN_ASSET(2) char HIDAN_room_25Tex_0052D8[] = dHIDAN_room_25Tex_0052D8;
+
+#define dHIDAN_room_25Tex_005AD8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_25Tex_005AD8"
+static const ALIGN_ASSET(2) char HIDAN_room_25Tex_005AD8[] = dHIDAN_room_25Tex_005AD8;
+
+#define dHIDAN_room_25Tex_0062D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_25Tex_0062D8"
+static const ALIGN_ASSET(2) char HIDAN_room_25Tex_0062D8[] = dHIDAN_room_25Tex_0062D8;
+
+#define dHIDAN_room_25DL_001A90 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_25DL_001A90"
+static const ALIGN_ASSET(2) char HIDAN_room_25DL_001A90[] = dHIDAN_room_25DL_001A90;
+
 
 #endif // DUNGEONS_HIDAN_ROOM_25_H
diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_26.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_26.h
index 638e5d73f..20aab9f88 100644
--- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_26.h
+++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_26.h
@@ -3,18 +3,27 @@
 
 #include "align_asset_macro.h"
 
-#define dHIDAN_room_26DL_003590 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_26DL_003590"
-static const ALIGN_ASSET(2) char HIDAN_room_26DL_003590[] = dHIDAN_room_26DL_003590;
+#define dHIDAN_room_26Tex_004A98 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_26Tex_004A98"
+static const ALIGN_ASSET(2) char HIDAN_room_26Tex_004A98[] = dHIDAN_room_26Tex_004A98;
+
+#define dHIDAN_room_26Tex_005298 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_26Tex_005298"
+static const ALIGN_ASSET(2) char HIDAN_room_26Tex_005298[] = dHIDAN_room_26Tex_005298;
+
+#define dHIDAN_room_26Tex_005698 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_26Tex_005698"
+static const ALIGN_ASSET(2) char HIDAN_room_26Tex_005698[] = dHIDAN_room_26Tex_005698;
+
+#define dHIDAN_room_26Tex_005898 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_26Tex_005898"
+static const ALIGN_ASSET(2) char HIDAN_room_26Tex_005898[] = dHIDAN_room_26Tex_005898;
 
 #define dHIDAN_room_26Tex_006098 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_26Tex_006098"
 static const ALIGN_ASSET(2) char HIDAN_room_26Tex_006098[] = dHIDAN_room_26Tex_006098;
 
+#define dHIDAN_room_26DL_003590 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_26DL_003590"
+static const ALIGN_ASSET(2) char HIDAN_room_26DL_003590[] = dHIDAN_room_26DL_003590;
+
 #define dHIDAN_room_26DL_0037A0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_26DL_0037A0"
 static const ALIGN_ASSET(2) char HIDAN_room_26DL_0037A0[] = dHIDAN_room_26DL_0037A0;
 
-#define dHIDAN_room_26Tex_005898 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_26Tex_005898"
-static const ALIGN_ASSET(2) char HIDAN_room_26Tex_005898[] = dHIDAN_room_26Tex_005898;
-
 #define dHIDAN_room_26DL_000A80 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_26DL_000A80"
 static const ALIGN_ASSET(2) char HIDAN_room_26DL_000A80[] = dHIDAN_room_26DL_000A80;
 
@@ -27,12 +36,6 @@ static const ALIGN_ASSET(2) char HIDAN_room_26DL_0010C0[] = dHIDAN_room_26DL_001
 #define dHIDAN_room_26DL_001D40 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_26DL_001D40"
 static const ALIGN_ASSET(2) char HIDAN_room_26DL_001D40[] = dHIDAN_room_26DL_001D40;
 
-#define dHIDAN_room_26Tex_005698 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_26Tex_005698"
-static const ALIGN_ASSET(2) char HIDAN_room_26Tex_005698[] = dHIDAN_room_26Tex_005698;
-
-#define dHIDAN_room_26Tex_005298 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_26Tex_005298"
-static const ALIGN_ASSET(2) char HIDAN_room_26Tex_005298[] = dHIDAN_room_26Tex_005298;
-
 #define dHIDAN_room_26DL_0015B8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_26DL_0015B8"
 static const ALIGN_ASSET(2) char HIDAN_room_26DL_0015B8[] = dHIDAN_room_26DL_0015B8;
 
@@ -45,8 +48,5 @@ static const ALIGN_ASSET(2) char HIDAN_room_26DL_002F68[] = dHIDAN_room_26DL_002
 #define dHIDAN_room_26DL_0046B8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_26DL_0046B8"
 static const ALIGN_ASSET(2) char HIDAN_room_26DL_0046B8[] = dHIDAN_room_26DL_0046B8;
 
-#define dHIDAN_room_26Tex_004A98 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_26Tex_004A98"
-static const ALIGN_ASSET(2) char HIDAN_room_26Tex_004A98[] = dHIDAN_room_26Tex_004A98;
-
 
 #endif // DUNGEONS_HIDAN_ROOM_26_H
diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_3.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_3.h
index 81e9b9170..d9bf1219e 100644
--- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_3.h
+++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_3.h
@@ -3,23 +3,23 @@
 
 #include "align_asset_macro.h"
 
-#define dHIDAN_room_3DL_000980 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_3DL_000980"
-static const ALIGN_ASSET(2) char HIDAN_room_3DL_000980[] = dHIDAN_room_3DL_000980;
+#define dHIDAN_room_3Tex_001AC8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_3Tex_001AC8"
+static const ALIGN_ASSET(2) char HIDAN_room_3Tex_001AC8[] = dHIDAN_room_3Tex_001AC8;
+
+#define dHIDAN_room_3Tex_001EC8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_3Tex_001EC8"
+static const ALIGN_ASSET(2) char HIDAN_room_3Tex_001EC8[] = dHIDAN_room_3Tex_001EC8;
 
 #define dHIDAN_room_3Tex_0022C8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_3Tex_0022C8"
 static const ALIGN_ASSET(2) char HIDAN_room_3Tex_0022C8[] = dHIDAN_room_3Tex_0022C8;
 
+#define dHIDAN_room_3DL_000980 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_3DL_000980"
+static const ALIGN_ASSET(2) char HIDAN_room_3DL_000980[] = dHIDAN_room_3DL_000980;
+
 #define dHIDAN_room_3DL_0014A0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_3DL_0014A0"
 static const ALIGN_ASSET(2) char HIDAN_room_3DL_0014A0[] = dHIDAN_room_3DL_0014A0;
 
 #define dHIDAN_room_3DL_001840 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_3DL_001840"
 static const ALIGN_ASSET(2) char HIDAN_room_3DL_001840[] = dHIDAN_room_3DL_001840;
 
-#define dHIDAN_room_3Tex_001EC8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_3Tex_001EC8"
-static const ALIGN_ASSET(2) char HIDAN_room_3Tex_001EC8[] = dHIDAN_room_3Tex_001EC8;
-
-#define dHIDAN_room_3Tex_001AC8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_3Tex_001AC8"
-static const ALIGN_ASSET(2) char HIDAN_room_3Tex_001AC8[] = dHIDAN_room_3Tex_001AC8;
-
 
 #endif // DUNGEONS_HIDAN_ROOM_3_H
diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_4.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_4.h
index 7516f21d0..206e69299 100644
--- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_4.h
+++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_4.h
@@ -3,50 +3,50 @@
 
 #include "align_asset_macro.h"
 
-#define dHIDAN_room_4DL_000470 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4DL_000470"
-static const ALIGN_ASSET(2) char HIDAN_room_4DL_000470[] = dHIDAN_room_4DL_000470;
+#define dHIDAN_room_4Tex_0050F0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4Tex_0050F0"
+static const ALIGN_ASSET(2) char HIDAN_room_4Tex_0050F0[] = dHIDAN_room_4Tex_0050F0;
 
-#define dHIDAN_room_4Tex_0066F0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4Tex_0066F0"
-static const ALIGN_ASSET(2) char HIDAN_room_4Tex_0066F0[] = dHIDAN_room_4Tex_0066F0;
+#define dHIDAN_room_4Tex_0052F0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4Tex_0052F0"
+static const ALIGN_ASSET(2) char HIDAN_room_4Tex_0052F0[] = dHIDAN_room_4Tex_0052F0;
 
-#define dHIDAN_room_4DL_001A10 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4DL_001A10"
-static const ALIGN_ASSET(2) char HIDAN_room_4DL_001A10[] = dHIDAN_room_4DL_001A10;
-
-#define dHIDAN_room_4Tex_006CF0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4Tex_006CF0"
-static const ALIGN_ASSET(2) char HIDAN_room_4Tex_006CF0[] = dHIDAN_room_4Tex_006CF0;
-
-#define dHIDAN_room_4Tex_0068F0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4Tex_0068F0"
-static const ALIGN_ASSET(2) char HIDAN_room_4Tex_0068F0[] = dHIDAN_room_4Tex_0068F0;
+#define dHIDAN_room_4Tex_005AF0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4Tex_005AF0"
+static const ALIGN_ASSET(2) char HIDAN_room_4Tex_005AF0[] = dHIDAN_room_4Tex_005AF0;
 
 #define dHIDAN_room_4Tex_0062F0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4Tex_0062F0"
 static const ALIGN_ASSET(2) char HIDAN_room_4Tex_0062F0[] = dHIDAN_room_4Tex_0062F0;
 
+#define dHIDAN_room_4Tex_0066F0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4Tex_0066F0"
+static const ALIGN_ASSET(2) char HIDAN_room_4Tex_0066F0[] = dHIDAN_room_4Tex_0066F0;
+
+#define dHIDAN_room_4Tex_0068F0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4Tex_0068F0"
+static const ALIGN_ASSET(2) char HIDAN_room_4Tex_0068F0[] = dHIDAN_room_4Tex_0068F0;
+
+#define dHIDAN_room_4Tex_006CF0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4Tex_006CF0"
+static const ALIGN_ASSET(2) char HIDAN_room_4Tex_006CF0[] = dHIDAN_room_4Tex_006CF0;
+
+#define dHIDAN_room_4Tex_0070F0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4Tex_0070F0"
+static const ALIGN_ASSET(2) char HIDAN_room_4Tex_0070F0[] = dHIDAN_room_4Tex_0070F0;
+
+#define dHIDAN_room_4DL_000470 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4DL_000470"
+static const ALIGN_ASSET(2) char HIDAN_room_4DL_000470[] = dHIDAN_room_4DL_000470;
+
+#define dHIDAN_room_4DL_001A10 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4DL_001A10"
+static const ALIGN_ASSET(2) char HIDAN_room_4DL_001A10[] = dHIDAN_room_4DL_001A10;
+
 #define dHIDAN_room_4DL_0028B8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4DL_0028B8"
 static const ALIGN_ASSET(2) char HIDAN_room_4DL_0028B8[] = dHIDAN_room_4DL_0028B8;
 
-#define dHIDAN_room_4Tex_0052F0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4Tex_0052F0"
-static const ALIGN_ASSET(2) char HIDAN_room_4Tex_0052F0[] = dHIDAN_room_4Tex_0052F0;
-
 #define dHIDAN_room_4DL_003060 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4DL_003060"
 static const ALIGN_ASSET(2) char HIDAN_room_4DL_003060[] = dHIDAN_room_4DL_003060;
 
 #define dHIDAN_room_4DL_003C08 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4DL_003C08"
 static const ALIGN_ASSET(2) char HIDAN_room_4DL_003C08[] = dHIDAN_room_4DL_003C08;
 
-#define dHIDAN_room_4Tex_0050F0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4Tex_0050F0"
-static const ALIGN_ASSET(2) char HIDAN_room_4Tex_0050F0[] = dHIDAN_room_4Tex_0050F0;
-
-#define dHIDAN_room_4Tex_005AF0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4Tex_005AF0"
-static const ALIGN_ASSET(2) char HIDAN_room_4Tex_005AF0[] = dHIDAN_room_4Tex_005AF0;
-
 #define dHIDAN_room_4DL_004758 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4DL_004758"
 static const ALIGN_ASSET(2) char HIDAN_room_4DL_004758[] = dHIDAN_room_4DL_004758;
 
 #define dHIDAN_room_4DL_004DA0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4DL_004DA0"
 static const ALIGN_ASSET(2) char HIDAN_room_4DL_004DA0[] = dHIDAN_room_4DL_004DA0;
 
-#define dHIDAN_room_4Tex_0070F0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_4Tex_0070F0"
-static const ALIGN_ASSET(2) char HIDAN_room_4Tex_0070F0[] = dHIDAN_room_4Tex_0070F0;
-
 
 #endif // DUNGEONS_HIDAN_ROOM_4_H
diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_5.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_5.h
index 10aa6f123..6b6ae1f3c 100644
--- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_5.h
+++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_5.h
@@ -3,47 +3,47 @@
 
 #include "align_asset_macro.h"
 
-#define dHIDAN_room_5DL_000A60 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5DL_000A60"
-static const ALIGN_ASSET(2) char HIDAN_room_5DL_000A60[] = dHIDAN_room_5DL_000A60;
-
 #define dHIDAN_room_5Tex_007EE0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5Tex_007EE0"
 static const ALIGN_ASSET(2) char HIDAN_room_5Tex_007EE0[] = dHIDAN_room_5Tex_007EE0;
 
 #define dHIDAN_room_5Tex_0080E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5Tex_0080E0"
 static const ALIGN_ASSET(2) char HIDAN_room_5Tex_0080E0[] = dHIDAN_room_5Tex_0080E0;
 
-#define dHIDAN_room_5DL_002140 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5DL_002140"
-static const ALIGN_ASSET(2) char HIDAN_room_5DL_002140[] = dHIDAN_room_5DL_002140;
-
-#define dHIDAN_room_5Tex_0096E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5Tex_0096E0"
-static const ALIGN_ASSET(2) char HIDAN_room_5Tex_0096E0[] = dHIDAN_room_5Tex_0096E0;
+#define dHIDAN_room_5Tex_0088E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5Tex_0088E0"
+static const ALIGN_ASSET(2) char HIDAN_room_5Tex_0088E0[] = dHIDAN_room_5Tex_0088E0;
 
 #define dHIDAN_room_5Tex_008CE0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5Tex_008CE0"
 static const ALIGN_ASSET(2) char HIDAN_room_5Tex_008CE0[] = dHIDAN_room_5Tex_008CE0;
 
+#define dHIDAN_room_5Tex_0094E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5Tex_0094E0"
+static const ALIGN_ASSET(2) char HIDAN_room_5Tex_0094E0[] = dHIDAN_room_5Tex_0094E0;
+
+#define dHIDAN_room_5Tex_0096E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5Tex_0096E0"
+static const ALIGN_ASSET(2) char HIDAN_room_5Tex_0096E0[] = dHIDAN_room_5Tex_0096E0;
+
 #define dHIDAN_room_5Tex_009AE0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5Tex_009AE0"
 static const ALIGN_ASSET(2) char HIDAN_room_5Tex_009AE0[] = dHIDAN_room_5Tex_009AE0;
 
 #define dHIDAN_room_5Tex_009EE0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5Tex_009EE0"
 static const ALIGN_ASSET(2) char HIDAN_room_5Tex_009EE0[] = dHIDAN_room_5Tex_009EE0;
 
+#define dHIDAN_room_5DL_000A60 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5DL_000A60"
+static const ALIGN_ASSET(2) char HIDAN_room_5DL_000A60[] = dHIDAN_room_5DL_000A60;
+
+#define dHIDAN_room_5DL_002140 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5DL_002140"
+static const ALIGN_ASSET(2) char HIDAN_room_5DL_002140[] = dHIDAN_room_5DL_002140;
+
 #define dHIDAN_room_5DL_003BE0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5DL_003BE0"
 static const ALIGN_ASSET(2) char HIDAN_room_5DL_003BE0[] = dHIDAN_room_5DL_003BE0;
 
 #define dHIDAN_room_5DL_005058 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5DL_005058"
 static const ALIGN_ASSET(2) char HIDAN_room_5DL_005058[] = dHIDAN_room_5DL_005058;
 
-#define dHIDAN_room_5Tex_0088E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5Tex_0088E0"
-static const ALIGN_ASSET(2) char HIDAN_room_5Tex_0088E0[] = dHIDAN_room_5Tex_0088E0;
-
 #define dHIDAN_room_5DL_005D80 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5DL_005D80"
 static const ALIGN_ASSET(2) char HIDAN_room_5DL_005D80[] = dHIDAN_room_5DL_005D80;
 
 #define dHIDAN_room_5DL_007130 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5DL_007130"
 static const ALIGN_ASSET(2) char HIDAN_room_5DL_007130[] = dHIDAN_room_5DL_007130;
 
-#define dHIDAN_room_5Tex_0094E0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_5Tex_0094E0"
-static const ALIGN_ASSET(2) char HIDAN_room_5Tex_0094E0[] = dHIDAN_room_5Tex_0094E0;
-
 
 #endif // DUNGEONS_HIDAN_ROOM_5_H
diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_6.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_6.h
index 9246611f6..df7faa92c 100644
--- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_6.h
+++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_6.h
@@ -3,35 +3,35 @@
 
 #include "align_asset_macro.h"
 
-#define dHIDAN_room_6DL_002B78 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_6DL_002B78"
-static const ALIGN_ASSET(2) char HIDAN_room_6DL_002B78[] = dHIDAN_room_6DL_002B78;
+#define dHIDAN_room_6Tex_003990 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_6Tex_003990"
+static const ALIGN_ASSET(2) char HIDAN_room_6Tex_003990[] = dHIDAN_room_6Tex_003990;
 
 #define dHIDAN_room_6Tex_003B90 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_6Tex_003B90"
 static const ALIGN_ASSET(2) char HIDAN_room_6Tex_003B90[] = dHIDAN_room_6Tex_003B90;
 
+#define dHIDAN_room_6Tex_004390 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_6Tex_004390"
+static const ALIGN_ASSET(2) char HIDAN_room_6Tex_004390[] = dHIDAN_room_6Tex_004390;
+
 #define dHIDAN_room_6Tex_004B90 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_6Tex_004B90"
 static const ALIGN_ASSET(2) char HIDAN_room_6Tex_004B90[] = dHIDAN_room_6Tex_004B90;
 
-#define dHIDAN_room_6Tex_003990 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_6Tex_003990"
-static const ALIGN_ASSET(2) char HIDAN_room_6Tex_003990[] = dHIDAN_room_6Tex_003990;
-
 #define dHIDAN_room_6Tex_005B90 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_6Tex_005B90"
 static const ALIGN_ASSET(2) char HIDAN_room_6Tex_005B90[] = dHIDAN_room_6Tex_005B90;
 
 #define dHIDAN_room_6Tex_006390 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_6Tex_006390"
 static const ALIGN_ASSET(2) char HIDAN_room_6Tex_006390[] = dHIDAN_room_6Tex_006390;
 
-#define dHIDAN_room_6DL_001A00 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_6DL_001A00"
-static const ALIGN_ASSET(2) char HIDAN_room_6DL_001A00[] = dHIDAN_room_6DL_001A00;
-
 #define dHIDAN_room_6Tex_006790 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_6Tex_006790"
 static const ALIGN_ASSET(2) char HIDAN_room_6Tex_006790[] = dHIDAN_room_6Tex_006790;
 
+#define dHIDAN_room_6DL_002B78 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_6DL_002B78"
+static const ALIGN_ASSET(2) char HIDAN_room_6DL_002B78[] = dHIDAN_room_6DL_002B78;
+
+#define dHIDAN_room_6DL_001A00 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_6DL_001A00"
+static const ALIGN_ASSET(2) char HIDAN_room_6DL_001A00[] = dHIDAN_room_6DL_001A00;
+
 #define dHIDAN_room_6DL_001350 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_6DL_001350"
 static const ALIGN_ASSET(2) char HIDAN_room_6DL_001350[] = dHIDAN_room_6DL_001350;
 
-#define dHIDAN_room_6Tex_004390 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_6Tex_004390"
-static const ALIGN_ASSET(2) char HIDAN_room_6Tex_004390[] = dHIDAN_room_6Tex_004390;
-
 
 #endif // DUNGEONS_HIDAN_ROOM_6_H
diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_7.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_7.h
index 5eac179cd..a904710e5 100644
--- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_7.h
+++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_7.h
@@ -3,8 +3,11 @@
 
 #include "align_asset_macro.h"
 
-#define dHIDAN_room_7DL_000C80 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_7DL_000C80"
-static const ALIGN_ASSET(2) char HIDAN_room_7DL_000C80[] = dHIDAN_room_7DL_000C80;
+#define dHIDAN_room_7Tex_001C48 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_7Tex_001C48"
+static const ALIGN_ASSET(2) char HIDAN_room_7Tex_001C48[] = dHIDAN_room_7Tex_001C48;
+
+#define dHIDAN_room_7Tex_001E48 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_7Tex_001E48"
+static const ALIGN_ASSET(2) char HIDAN_room_7Tex_001E48[] = dHIDAN_room_7Tex_001E48;
 
 #define dHIDAN_room_7Tex_002648 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_7Tex_002648"
 static const ALIGN_ASSET(2) char HIDAN_room_7Tex_002648[] = dHIDAN_room_7Tex_002648;
@@ -12,14 +15,11 @@ static const ALIGN_ASSET(2) char HIDAN_room_7Tex_002648[] = dHIDAN_room_7Tex_002
 #define dHIDAN_room_7Tex_002A48 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_7Tex_002A48"
 static const ALIGN_ASSET(2) char HIDAN_room_7Tex_002A48[] = dHIDAN_room_7Tex_002A48;
 
+#define dHIDAN_room_7DL_000C80 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_7DL_000C80"
+static const ALIGN_ASSET(2) char HIDAN_room_7DL_000C80[] = dHIDAN_room_7DL_000C80;
+
 #define dHIDAN_room_7DL_001948 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_7DL_001948"
 static const ALIGN_ASSET(2) char HIDAN_room_7DL_001948[] = dHIDAN_room_7DL_001948;
 
-#define dHIDAN_room_7Tex_001E48 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_7Tex_001E48"
-static const ALIGN_ASSET(2) char HIDAN_room_7Tex_001E48[] = dHIDAN_room_7Tex_001E48;
-
-#define dHIDAN_room_7Tex_001C48 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_7Tex_001C48"
-static const ALIGN_ASSET(2) char HIDAN_room_7Tex_001C48[] = dHIDAN_room_7Tex_001C48;
-
 
 #endif // DUNGEONS_HIDAN_ROOM_7_H
diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_8.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_8.h
index 21ebac291..920480049 100644
--- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_8.h
+++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_8.h
@@ -3,29 +3,44 @@
 
 #include "align_asset_macro.h"
 
-#define dHIDAN_room_8DL_003668 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8DL_003668"
-static const ALIGN_ASSET(2) char HIDAN_room_8DL_003668[] = dHIDAN_room_8DL_003668;
+#define dHIDAN_room_8Tex_0050D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_0050D8"
+static const ALIGN_ASSET(2) char HIDAN_room_8Tex_0050D8[] = dHIDAN_room_8Tex_0050D8;
+
+#define dHIDAN_room_8Tex_0052D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_0052D8"
+static const ALIGN_ASSET(2) char HIDAN_room_8Tex_0052D8[] = dHIDAN_room_8Tex_0052D8;
 
 #define dHIDAN_room_8Tex_005AD8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_005AD8"
 static const ALIGN_ASSET(2) char HIDAN_room_8Tex_005AD8[] = dHIDAN_room_8Tex_005AD8;
 
-#define dHIDAN_room_8DL_002660 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8DL_002660"
-static const ALIGN_ASSET(2) char HIDAN_room_8DL_002660[] = dHIDAN_room_8DL_002660;
-
-#define dHIDAN_room_8Tex_0092D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_0092D8"
-static const ALIGN_ASSET(2) char HIDAN_room_8Tex_0092D8[] = dHIDAN_room_8Tex_0092D8;
-
-#define dHIDAN_room_8DL_000700 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8DL_000700"
-static const ALIGN_ASSET(2) char HIDAN_room_8DL_000700[] = dHIDAN_room_8DL_000700;
-
 #define dHIDAN_room_8Tex_0062D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_0062D8"
 static const ALIGN_ASSET(2) char HIDAN_room_8Tex_0062D8[] = dHIDAN_room_8Tex_0062D8;
 
+#define dHIDAN_room_8Tex_006AD8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_006AD8"
+static const ALIGN_ASSET(2) char HIDAN_room_8Tex_006AD8[] = dHIDAN_room_8Tex_006AD8;
+
+#define dHIDAN_room_8Tex_007AD8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_007AD8"
+static const ALIGN_ASSET(2) char HIDAN_room_8Tex_007AD8[] = dHIDAN_room_8Tex_007AD8;
+
+#define dHIDAN_room_8Tex_0082D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_0082D8"
+static const ALIGN_ASSET(2) char HIDAN_room_8Tex_0082D8[] = dHIDAN_room_8Tex_0082D8;
+
 #define dHIDAN_room_8Tex_0086D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_0086D8"
 static const ALIGN_ASSET(2) char HIDAN_room_8Tex_0086D8[] = dHIDAN_room_8Tex_0086D8;
 
-#define dHIDAN_room_8Tex_0082D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_0082D8"
-static const ALIGN_ASSET(2) char HIDAN_room_8Tex_0082D8[] = dHIDAN_room_8Tex_0082D8;
+#define dHIDAN_room_8Tex_008AD8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_008AD8"
+static const ALIGN_ASSET(2) char HIDAN_room_8Tex_008AD8[] = dHIDAN_room_8Tex_008AD8;
+
+#define dHIDAN_room_8Tex_0092D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_0092D8"
+static const ALIGN_ASSET(2) char HIDAN_room_8Tex_0092D8[] = dHIDAN_room_8Tex_0092D8;
+
+#define dHIDAN_room_8DL_003668 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8DL_003668"
+static const ALIGN_ASSET(2) char HIDAN_room_8DL_003668[] = dHIDAN_room_8DL_003668;
+
+#define dHIDAN_room_8DL_002660 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8DL_002660"
+static const ALIGN_ASSET(2) char HIDAN_room_8DL_002660[] = dHIDAN_room_8DL_002660;
+
+#define dHIDAN_room_8DL_000700 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8DL_000700"
+static const ALIGN_ASSET(2) char HIDAN_room_8DL_000700[] = dHIDAN_room_8DL_000700;
 
 #define dHIDAN_room_8DL_001248 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8DL_001248"
 static const ALIGN_ASSET(2) char HIDAN_room_8DL_001248[] = dHIDAN_room_8DL_001248;
@@ -36,23 +51,8 @@ static const ALIGN_ASSET(2) char HIDAN_room_8DL_001900[] = dHIDAN_room_8DL_00190
 #define dHIDAN_room_8DL_002050 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8DL_002050"
 static const ALIGN_ASSET(2) char HIDAN_room_8DL_002050[] = dHIDAN_room_8DL_002050;
 
-#define dHIDAN_room_8Tex_008AD8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_008AD8"
-static const ALIGN_ASSET(2) char HIDAN_room_8Tex_008AD8[] = dHIDAN_room_8Tex_008AD8;
-
 #define dHIDAN_room_8DL_0047E8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8DL_0047E8"
 static const ALIGN_ASSET(2) char HIDAN_room_8DL_0047E8[] = dHIDAN_room_8DL_0047E8;
 
-#define dHIDAN_room_8Tex_0052D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_0052D8"
-static const ALIGN_ASSET(2) char HIDAN_room_8Tex_0052D8[] = dHIDAN_room_8Tex_0052D8;
-
-#define dHIDAN_room_8Tex_006AD8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_006AD8"
-static const ALIGN_ASSET(2) char HIDAN_room_8Tex_006AD8[] = dHIDAN_room_8Tex_006AD8;
-
-#define dHIDAN_room_8Tex_0050D8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_0050D8"
-static const ALIGN_ASSET(2) char HIDAN_room_8Tex_0050D8[] = dHIDAN_room_8Tex_0050D8;
-
-#define dHIDAN_room_8Tex_007AD8 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_8Tex_007AD8"
-static const ALIGN_ASSET(2) char HIDAN_room_8Tex_007AD8[] = dHIDAN_room_8Tex_007AD8;
-
 
 #endif // DUNGEONS_HIDAN_ROOM_8_H
diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_9.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_9.h
index 57f2eea69..ceac93cca 100644
--- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_9.h
+++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_room_9.h
@@ -3,20 +3,8 @@
 
 #include "align_asset_macro.h"
 
-#define dHIDAN_room_9DL_002C30 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_9DL_002C30"
-static const ALIGN_ASSET(2) char HIDAN_room_9DL_002C30[] = dHIDAN_room_9DL_002C30;
-
-#define dHIDAN_room_9Tex_007768 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_9Tex_007768"
-static const ALIGN_ASSET(2) char HIDAN_room_9Tex_007768[] = dHIDAN_room_9Tex_007768;
-
-#define dHIDAN_room_9Tex_006F68 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_9Tex_006F68"
-static const ALIGN_ASSET(2) char HIDAN_room_9Tex_006F68[] = dHIDAN_room_9Tex_006F68;
-
-#define dHIDAN_room_9Tex_006768 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_9Tex_006768"
-static const ALIGN_ASSET(2) char HIDAN_room_9Tex_006768[] = dHIDAN_room_9Tex_006768;
-
-#define dHIDAN_room_9Tex_005F68 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_9Tex_005F68"
-static const ALIGN_ASSET(2) char HIDAN_room_9Tex_005F68[] = dHIDAN_room_9Tex_005F68;
+#define dHIDAN_room_9Tex_004768 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_9Tex_004768"
+static const ALIGN_ASSET(2) char HIDAN_room_9Tex_004768[] = dHIDAN_room_9Tex_004768;
 
 #define dHIDAN_room_9Tex_004F68 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_9Tex_004F68"
 static const ALIGN_ASSET(2) char HIDAN_room_9Tex_004F68[] = dHIDAN_room_9Tex_004F68;
@@ -24,11 +12,23 @@ static const ALIGN_ASSET(2) char HIDAN_room_9Tex_004F68[] = dHIDAN_room_9Tex_004
 #define dHIDAN_room_9Tex_005768 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_9Tex_005768"
 static const ALIGN_ASSET(2) char HIDAN_room_9Tex_005768[] = dHIDAN_room_9Tex_005768;
 
-#define dHIDAN_room_9Tex_004768 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_9Tex_004768"
-static const ALIGN_ASSET(2) char HIDAN_room_9Tex_004768[] = dHIDAN_room_9Tex_004768;
+#define dHIDAN_room_9Tex_005F68 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_9Tex_005F68"
+static const ALIGN_ASSET(2) char HIDAN_room_9Tex_005F68[] = dHIDAN_room_9Tex_005F68;
+
+#define dHIDAN_room_9Tex_006768 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_9Tex_006768"
+static const ALIGN_ASSET(2) char HIDAN_room_9Tex_006768[] = dHIDAN_room_9Tex_006768;
+
+#define dHIDAN_room_9Tex_006F68 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_9Tex_006F68"
+static const ALIGN_ASSET(2) char HIDAN_room_9Tex_006F68[] = dHIDAN_room_9Tex_006F68;
+
+#define dHIDAN_room_9Tex_007768 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_9Tex_007768"
+static const ALIGN_ASSET(2) char HIDAN_room_9Tex_007768[] = dHIDAN_room_9Tex_007768;
 
 #define dHIDAN_room_9Tex_007F68 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_9Tex_007F68"
 static const ALIGN_ASSET(2) char HIDAN_room_9Tex_007F68[] = dHIDAN_room_9Tex_007F68;
 
+#define dHIDAN_room_9DL_002C30 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_room_9DL_002C30"
+static const ALIGN_ASSET(2) char HIDAN_room_9DL_002C30[] = dHIDAN_room_9DL_002C30;
+
 
 #endif // DUNGEONS_HIDAN_ROOM_9_H
diff --git a/soh/assets/scenes/dungeons/HIDAN/HIDAN_scene.h b/soh/assets/scenes/dungeons/HIDAN/HIDAN_scene.h
index 41ef37126..6b729eab1 100644
--- a/soh/assets/scenes/dungeons/HIDAN/HIDAN_scene.h
+++ b/soh/assets/scenes/dungeons/HIDAN/HIDAN_scene.h
@@ -3,31 +3,32 @@
 
 #include "align_asset_macro.h"
 
-#define dHIDAN_sceneCollisionHeader_01895C "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_sceneCollisionHeader_01895C"
-static const ALIGN_ASSET(2) char HIDAN_sceneCollisionHeader_01895C[] = dHIDAN_sceneCollisionHeader_01895C;
-
-#define dHIDAN_sceneTLUT_018990 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_sceneTLUT_018990"
-static const ALIGN_ASSET(2) char HIDAN_sceneTLUT_018990[] = dHIDAN_sceneTLUT_018990;
-
-#define dHIDAN_sceneTex_0195D0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_sceneTex_0195D0"
-static const ALIGN_ASSET(2) char HIDAN_sceneTex_0195D0[] = dHIDAN_sceneTex_0195D0;
-
-#define dHIDAN_sceneTex_018DD0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_sceneTex_018DD0"
-static const ALIGN_ASSET(2) char HIDAN_sceneTex_018DD0[] = dHIDAN_sceneTex_018DD0;
+#define dHIDAN_sceneTex_0189D0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_sceneTex_0189D0"
+static const ALIGN_ASSET(2) char HIDAN_sceneTex_0189D0[] = dHIDAN_sceneTex_0189D0;
 
 #define dHIDAN_sceneTex_018BD0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_sceneTex_018BD0"
 static const ALIGN_ASSET(2) char HIDAN_sceneTex_018BD0[] = dHIDAN_sceneTex_018BD0;
 
-#define dHIDAN_sceneTLUT_0189B0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_sceneTLUT_0189B0"
-static const ALIGN_ASSET(2) char HIDAN_sceneTLUT_0189B0[] = dHIDAN_sceneTLUT_0189B0;
+#define dHIDAN_sceneTex_018DD0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_sceneTex_018DD0"
+static const ALIGN_ASSET(2) char HIDAN_sceneTex_018DD0[] = dHIDAN_sceneTex_018DD0;
+
+#define dHIDAN_sceneTex_0195D0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_sceneTex_0195D0"
+static const ALIGN_ASSET(2) char HIDAN_sceneTex_0195D0[] = dHIDAN_sceneTex_0195D0;
 
 #define dHIDAN_sceneTex_019DD0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_sceneTex_019DD0"
 static const ALIGN_ASSET(2) char HIDAN_sceneTex_019DD0[] = dHIDAN_sceneTex_019DD0;
 
-#define dHIDAN_sceneTex_0189D0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_sceneTex_0189D0"
-static const ALIGN_ASSET(2) char HIDAN_sceneTex_0189D0[] = dHIDAN_sceneTex_0189D0;
-
 #define dHIDAN_sceneTex_019FD0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_sceneTex_019FD0"
 static const ALIGN_ASSET(2) char HIDAN_sceneTex_019FD0[] = dHIDAN_sceneTex_019FD0;
 
+#define dHIDAN_sceneTLUT_018990 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_sceneTLUT_018990"
+static const ALIGN_ASSET(2) char HIDAN_sceneTLUT_018990[] = dHIDAN_sceneTLUT_018990;
+
+#define dHIDAN_sceneTLUT_0189B0 "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_sceneTLUT_0189B0"
+static const ALIGN_ASSET(2) char HIDAN_sceneTLUT_0189B0[] = dHIDAN_sceneTLUT_0189B0;
+
+#define dHIDAN_sceneCollisionHeader_01895C "__OTR__scenes/nonmq/HIDAN_scene/HIDAN_sceneCollisionHeader_01895C"
+static const ALIGN_ASSET(2) char HIDAN_sceneCollisionHeader_01895C[] = dHIDAN_sceneCollisionHeader_01895C;
+
+
 #endif // DUNGEONS_HIDAN_SCENE_H
diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_0.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_0.h
index b4400b9f4..a1c161762 100644
--- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_0.h
+++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_0.h
@@ -3,6 +3,57 @@
 
 #include "align_asset_macro.h"
 
+#define dMIZUsin_room_0Tex_00CDF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00CDF8"
+static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00CDF8[] = dMIZUsin_room_0Tex_00CDF8;
+
+#define dMIZUsin_room_0Tex_00D5F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00D5F8"
+static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00D5F8[] = dMIZUsin_room_0Tex_00D5F8;
+
+#define dMIZUsin_room_0Tex_00DDF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00DDF8"
+static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00DDF8[] = dMIZUsin_room_0Tex_00DDF8;
+
+#define dMIZUsin_room_0Tex_00E5F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00E5F8"
+static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00E5F8[] = dMIZUsin_room_0Tex_00E5F8;
+
+#define dMIZUsin_room_0Tex_00EDF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00EDF8"
+static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00EDF8[] = dMIZUsin_room_0Tex_00EDF8;
+
+#define dMIZUsin_room_0Tex_00F5F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00F5F8"
+static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00F5F8[] = dMIZUsin_room_0Tex_00F5F8;
+
+#define dMIZUsin_room_0Tex_00FDF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00FDF8"
+static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00FDF8[] = dMIZUsin_room_0Tex_00FDF8;
+
+#define dMIZUsin_room_0Tex_0105F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_0105F8"
+static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_0105F8[] = dMIZUsin_room_0Tex_0105F8;
+
+#define dMIZUsin_room_0Tex_010DF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_010DF8"
+static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_010DF8[] = dMIZUsin_room_0Tex_010DF8;
+
+#define dMIZUsin_room_0Tex_0115F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_0115F8"
+static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_0115F8[] = dMIZUsin_room_0Tex_0115F8;
+
+#define dMIZUsin_room_0Tex_011DF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_011DF8"
+static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_011DF8[] = dMIZUsin_room_0Tex_011DF8;
+
+#define dMIZUsin_room_0Tex_0125F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_0125F8"
+static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_0125F8[] = dMIZUsin_room_0Tex_0125F8;
+
+#define dMIZUsin_room_0Tex_012DF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_012DF8"
+static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_012DF8[] = dMIZUsin_room_0Tex_012DF8;
+
+#define dMIZUsin_room_0Tex_0135F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_0135F8"
+static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_0135F8[] = dMIZUsin_room_0Tex_0135F8;
+
+#define dMIZUsin_room_0Tex_013DF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_013DF8"
+static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_013DF8[] = dMIZUsin_room_0Tex_013DF8;
+
+#define dMIZUsin_room_0Tex_0145F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_0145F8"
+static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_0145F8[] = dMIZUsin_room_0Tex_0145F8;
+
+#define dMIZUsin_room_0Tex_015428 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_015428"
+static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_015428[] = dMIZUsin_room_0Tex_015428;
+
 #define dMIZUsin_room_0DL_0051B8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_0051B8"
 static const ALIGN_ASSET(2) char MIZUsin_room_0DL_0051B8[] = dMIZUsin_room_0DL_0051B8;
 
@@ -30,30 +81,18 @@ static const ALIGN_ASSET(2) char MIZUsin_room_0DL_015330[] = dMIZUsin_room_0DL_0
 #define dMIZUsin_room_0DL_003E38 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_003E38"
 static const ALIGN_ASSET(2) char MIZUsin_room_0DL_003E38[] = dMIZUsin_room_0DL_003E38;
 
-#define dMIZUsin_room_0Tex_0125F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_0125F8"
-static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_0125F8[] = dMIZUsin_room_0Tex_0125F8;
-
 #define dMIZUsin_room_0DL_0027C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_0027C8"
 static const ALIGN_ASSET(2) char MIZUsin_room_0DL_0027C8[] = dMIZUsin_room_0DL_0027C8;
 
-#define dMIZUsin_room_0Tex_00F5F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00F5F8"
-static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00F5F8[] = dMIZUsin_room_0Tex_00F5F8;
-
 #define dMIZUsin_room_0DL_015078 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_015078"
 static const ALIGN_ASSET(2) char MIZUsin_room_0DL_015078[] = dMIZUsin_room_0DL_015078;
 
-#define dMIZUsin_room_0Tex_015428 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_015428"
-static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_015428[] = dMIZUsin_room_0Tex_015428;
-
 #define dMIZUsin_room_0DL_014EC0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_014EC0"
 static const ALIGN_ASSET(2) char MIZUsin_room_0DL_014EC0[] = dMIZUsin_room_0DL_014EC0;
 
 #define dMIZUsin_room_0DL_007AC0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_007AC0"
 static const ALIGN_ASSET(2) char MIZUsin_room_0DL_007AC0[] = dMIZUsin_room_0DL_007AC0;
 
-#define dMIZUsin_room_0Tex_00DDF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00DDF8"
-static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00DDF8[] = dMIZUsin_room_0Tex_00DDF8;
-
 #define dMIZUsin_room_0DL_007620 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_007620"
 static const ALIGN_ASSET(2) char MIZUsin_room_0DL_007620[] = dMIZUsin_room_0DL_007620;
 
@@ -72,27 +111,15 @@ static const ALIGN_ASSET(2) char MIZUsin_room_0DL_007050[] = dMIZUsin_room_0DL_0
 #define dMIZUsin_room_0DL_0062E0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_0062E0"
 static const ALIGN_ASSET(2) char MIZUsin_room_0DL_0062E0[] = dMIZUsin_room_0DL_0062E0;
 
-#define dMIZUsin_room_0Tex_012DF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_012DF8"
-static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_012DF8[] = dMIZUsin_room_0Tex_012DF8;
-
 #define dMIZUsin_room_0DL_0067C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_0067C8"
 static const ALIGN_ASSET(2) char MIZUsin_room_0DL_0067C8[] = dMIZUsin_room_0DL_0067C8;
 
-#define dMIZUsin_room_0Tex_00E5F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00E5F8"
-static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00E5F8[] = dMIZUsin_room_0Tex_00E5F8;
-
 #define dMIZUsin_room_0DL_006508 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_006508"
 static const ALIGN_ASSET(2) char MIZUsin_room_0DL_006508[] = dMIZUsin_room_0DL_006508;
 
 #define dMIZUsin_room_0DL_0008F0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_0008F0"
 static const ALIGN_ASSET(2) char MIZUsin_room_0DL_0008F0[] = dMIZUsin_room_0DL_0008F0;
 
-#define dMIZUsin_room_0Tex_00CDF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00CDF8"
-static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00CDF8[] = dMIZUsin_room_0Tex_00CDF8;
-
-#define dMIZUsin_room_0Tex_00D5F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00D5F8"
-static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00D5F8[] = dMIZUsin_room_0Tex_00D5F8;
-
 #define dMIZUsin_room_0DL_005428 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_005428"
 static const ALIGN_ASSET(2) char MIZUsin_room_0DL_005428[] = dMIZUsin_room_0DL_005428;
 
@@ -126,21 +153,12 @@ static const ALIGN_ASSET(2) char MIZUsin_room_0DL_009560[] = dMIZUsin_room_0DL_0
 #define dMIZUsin_room_0DL_00CB60 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_00CB60"
 static const ALIGN_ASSET(2) char MIZUsin_room_0DL_00CB60[] = dMIZUsin_room_0DL_00CB60;
 
-#define dMIZUsin_room_0Tex_00EDF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00EDF8"
-static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00EDF8[] = dMIZUsin_room_0Tex_00EDF8;
-
 #define dMIZUsin_room_0DL_00C180 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_00C180"
 static const ALIGN_ASSET(2) char MIZUsin_room_0DL_00C180[] = dMIZUsin_room_0DL_00C180;
 
-#define dMIZUsin_room_0Tex_011DF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_011DF8"
-static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_011DF8[] = dMIZUsin_room_0Tex_011DF8;
-
 #define dMIZUsin_room_0DL_00B018 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_00B018"
 static const ALIGN_ASSET(2) char MIZUsin_room_0DL_00B018[] = dMIZUsin_room_0DL_00B018;
 
-#define dMIZUsin_room_0Tex_010DF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_010DF8"
-static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_010DF8[] = dMIZUsin_room_0Tex_010DF8;
-
 #define dMIZUsin_room_0DL_00B328 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_00B328"
 static const ALIGN_ASSET(2) char MIZUsin_room_0DL_00B328[] = dMIZUsin_room_0DL_00B328;
 
@@ -150,21 +168,12 @@ static const ALIGN_ASSET(2) char MIZUsin_room_0DL_00B730[] = dMIZUsin_room_0DL_0
 #define dMIZUsin_room_0DL_00ABB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_00ABB8"
 static const ALIGN_ASSET(2) char MIZUsin_room_0DL_00ABB8[] = dMIZUsin_room_0DL_00ABB8;
 
-#define dMIZUsin_room_0Tex_00FDF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_00FDF8"
-static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_00FDF8[] = dMIZUsin_room_0Tex_00FDF8;
-
 #define dMIZUsin_room_0DL_00BCC8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_00BCC8"
 static const ALIGN_ASSET(2) char MIZUsin_room_0DL_00BCC8[] = dMIZUsin_room_0DL_00BCC8;
 
-#define dMIZUsin_room_0Tex_0115F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_0115F8"
-static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_0115F8[] = dMIZUsin_room_0Tex_0115F8;
-
 #define dMIZUsin_room_0DL_00A550 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_00A550"
 static const ALIGN_ASSET(2) char MIZUsin_room_0DL_00A550[] = dMIZUsin_room_0DL_00A550;
 
-#define dMIZUsin_room_0Tex_0105F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_0105F8"
-static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_0105F8[] = dMIZUsin_room_0Tex_0105F8;
-
 #define dMIZUsin_room_0DL_001D70 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_001D70"
 static const ALIGN_ASSET(2) char MIZUsin_room_0DL_001D70[] = dMIZUsin_room_0DL_001D70;
 
@@ -174,20 +183,11 @@ static const ALIGN_ASSET(2) char MIZUsin_room_0DL_004D90[] = dMIZUsin_room_0DL_0
 #define dMIZUsin_room_0DL_00C5D8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_00C5D8"
 static const ALIGN_ASSET(2) char MIZUsin_room_0DL_00C5D8[] = dMIZUsin_room_0DL_00C5D8;
 
-#define dMIZUsin_room_0Tex_013DF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_013DF8"
-static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_013DF8[] = dMIZUsin_room_0Tex_013DF8;
-
 #define dMIZUsin_room_0DL_00C840 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_00C840"
 static const ALIGN_ASSET(2) char MIZUsin_room_0DL_00C840[] = dMIZUsin_room_0DL_00C840;
 
-#define dMIZUsin_room_0Tex_0135F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_0135F8"
-static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_0135F8[] = dMIZUsin_room_0Tex_0135F8;
-
 #define dMIZUsin_room_0DL_009D60 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0DL_009D60"
 static const ALIGN_ASSET(2) char MIZUsin_room_0DL_009D60[] = dMIZUsin_room_0DL_009D60;
 
-#define dMIZUsin_room_0Tex_0145F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_0Tex_0145F8"
-static const ALIGN_ASSET(2) char MIZUsin_room_0Tex_0145F8[] = dMIZUsin_room_0Tex_0145F8;
-
 
 #endif // DUNGEONS_MIZUSIN_ROOM_0_H
diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_1.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_1.h
index 0d57dedd4..9594569cd 100644
--- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_1.h
+++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_1.h
@@ -3,6 +3,33 @@
 
 #include "align_asset_macro.h"
 
+#define dMIZUsin_room_1Tex_0059D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0059D0"
+static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0059D0[] = dMIZUsin_room_1Tex_0059D0;
+
+#define dMIZUsin_room_1Tex_0061D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0061D0"
+static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0061D0[] = dMIZUsin_room_1Tex_0061D0;
+
+#define dMIZUsin_room_1Tex_0069D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0069D0"
+static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0069D0[] = dMIZUsin_room_1Tex_0069D0;
+
+#define dMIZUsin_room_1Tex_0071D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0071D0"
+static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0071D0[] = dMIZUsin_room_1Tex_0071D0;
+
+#define dMIZUsin_room_1Tex_0079D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0079D0"
+static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0079D0[] = dMIZUsin_room_1Tex_0079D0;
+
+#define dMIZUsin_room_1Tex_0081D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0081D0"
+static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0081D0[] = dMIZUsin_room_1Tex_0081D0;
+
+#define dMIZUsin_room_1Tex_0089D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0089D0"
+static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0089D0[] = dMIZUsin_room_1Tex_0089D0;
+
+#define dMIZUsin_room_1Tex_0091D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0091D0"
+static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0091D0[] = dMIZUsin_room_1Tex_0091D0;
+
+#define dMIZUsin_room_1Tex_0099D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0099D0"
+static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0099D0[] = dMIZUsin_room_1Tex_0099D0;
+
 #define dMIZUsin_room_1DL_003D70 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1DL_003D70"
 static const ALIGN_ASSET(2) char MIZUsin_room_1DL_003D70[] = dMIZUsin_room_1DL_003D70;
 
@@ -12,54 +39,27 @@ static const ALIGN_ASSET(2) char MIZUsin_room_1DL_005818[] = dMIZUsin_room_1DL_0
 #define dMIZUsin_room_1DL_004B18 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1DL_004B18"
 static const ALIGN_ASSET(2) char MIZUsin_room_1DL_004B18[] = dMIZUsin_room_1DL_004B18;
 
-#define dMIZUsin_room_1Tex_0089D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0089D0"
-static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0089D0[] = dMIZUsin_room_1Tex_0089D0;
-
 #define dMIZUsin_room_1DL_003888 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1DL_003888"
 static const ALIGN_ASSET(2) char MIZUsin_room_1DL_003888[] = dMIZUsin_room_1DL_003888;
 
-#define dMIZUsin_room_1Tex_0069D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0069D0"
-static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0069D0[] = dMIZUsin_room_1Tex_0069D0;
-
 #define dMIZUsin_room_1DL_0045D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1DL_0045D0"
 static const ALIGN_ASSET(2) char MIZUsin_room_1DL_0045D0[] = dMIZUsin_room_1DL_0045D0;
 
-#define dMIZUsin_room_1Tex_0071D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0071D0"
-static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0071D0[] = dMIZUsin_room_1Tex_0071D0;
-
 #define dMIZUsin_room_1DL_003030 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1DL_003030"
 static const ALIGN_ASSET(2) char MIZUsin_room_1DL_003030[] = dMIZUsin_room_1DL_003030;
 
-#define dMIZUsin_room_1Tex_0079D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0079D0"
-static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0079D0[] = dMIZUsin_room_1Tex_0079D0;
-
 #define dMIZUsin_room_1DL_002C40 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1DL_002C40"
 static const ALIGN_ASSET(2) char MIZUsin_room_1DL_002C40[] = dMIZUsin_room_1DL_002C40;
 
-#define dMIZUsin_room_1Tex_0091D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0091D0"
-static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0091D0[] = dMIZUsin_room_1Tex_0091D0;
-
 #define dMIZUsin_room_1DL_004DF8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1DL_004DF8"
 static const ALIGN_ASSET(2) char MIZUsin_room_1DL_004DF8[] = dMIZUsin_room_1DL_004DF8;
 
-#define dMIZUsin_room_1Tex_0059D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0059D0"
-static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0059D0[] = dMIZUsin_room_1Tex_0059D0;
-
-#define dMIZUsin_room_1Tex_0061D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0061D0"
-static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0061D0[] = dMIZUsin_room_1Tex_0061D0;
-
 #define dMIZUsin_room_1DL_005050 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1DL_005050"
 static const ALIGN_ASSET(2) char MIZUsin_room_1DL_005050[] = dMIZUsin_room_1DL_005050;
 
-#define dMIZUsin_room_1Tex_0099D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0099D0"
-static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0099D0[] = dMIZUsin_room_1Tex_0099D0;
-
 #define dMIZUsin_room_1DL_001F20 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1DL_001F20"
 static const ALIGN_ASSET(2) char MIZUsin_room_1DL_001F20[] = dMIZUsin_room_1DL_001F20;
 
-#define dMIZUsin_room_1Tex_0081D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1Tex_0081D0"
-static const ALIGN_ASSET(2) char MIZUsin_room_1Tex_0081D0[] = dMIZUsin_room_1Tex_0081D0;
-
 #define dMIZUsin_room_1DL_0028D8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_1DL_0028D8"
 static const ALIGN_ASSET(2) char MIZUsin_room_1DL_0028D8[] = dMIZUsin_room_1DL_0028D8;
 
diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_10.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_10.h
index 3731303d2..bef89d909 100644
--- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_10.h
+++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_10.h
@@ -3,30 +3,30 @@
 
 #include "align_asset_macro.h"
 
+#define dMIZUsin_room_10Tex_003870 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_10Tex_003870"
+static const ALIGN_ASSET(2) char MIZUsin_room_10Tex_003870[] = dMIZUsin_room_10Tex_003870;
+
+#define dMIZUsin_room_10Tex_004070 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_10Tex_004070"
+static const ALIGN_ASSET(2) char MIZUsin_room_10Tex_004070[] = dMIZUsin_room_10Tex_004070;
+
+#define dMIZUsin_room_10Tex_004870 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_10Tex_004870"
+static const ALIGN_ASSET(2) char MIZUsin_room_10Tex_004870[] = dMIZUsin_room_10Tex_004870;
+
+#define dMIZUsin_room_10Tex_005070 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_10Tex_005070"
+static const ALIGN_ASSET(2) char MIZUsin_room_10Tex_005070[] = dMIZUsin_room_10Tex_005070;
+
+#define dMIZUsin_room_10Tex_005870 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_10Tex_005870"
+static const ALIGN_ASSET(2) char MIZUsin_room_10Tex_005870[] = dMIZUsin_room_10Tex_005870;
+
 #define dMIZUsin_room_10DL_001B80 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_10DL_001B80"
 static const ALIGN_ASSET(2) char MIZUsin_room_10DL_001B80[] = dMIZUsin_room_10DL_001B80;
 
 #define dMIZUsin_room_10DL_000FE0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_10DL_000FE0"
 static const ALIGN_ASSET(2) char MIZUsin_room_10DL_000FE0[] = dMIZUsin_room_10DL_000FE0;
 
-#define dMIZUsin_room_10Tex_004870 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_10Tex_004870"
-static const ALIGN_ASSET(2) char MIZUsin_room_10Tex_004870[] = dMIZUsin_room_10Tex_004870;
-
-#define dMIZUsin_room_10Tex_005870 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_10Tex_005870"
-static const ALIGN_ASSET(2) char MIZUsin_room_10Tex_005870[] = dMIZUsin_room_10Tex_005870;
-
-#define dMIZUsin_room_10Tex_005070 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_10Tex_005070"
-static const ALIGN_ASSET(2) char MIZUsin_room_10Tex_005070[] = dMIZUsin_room_10Tex_005070;
-
-#define dMIZUsin_room_10Tex_004070 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_10Tex_004070"
-static const ALIGN_ASSET(2) char MIZUsin_room_10Tex_004070[] = dMIZUsin_room_10Tex_004070;
-
 #define dMIZUsin_room_10DL_003298 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_10DL_003298"
 static const ALIGN_ASSET(2) char MIZUsin_room_10DL_003298[] = dMIZUsin_room_10DL_003298;
 
-#define dMIZUsin_room_10Tex_003870 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_10Tex_003870"
-static const ALIGN_ASSET(2) char MIZUsin_room_10Tex_003870[] = dMIZUsin_room_10Tex_003870;
-
 #define dMIZUsin_room_10DL_001E60 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_10DL_001E60"
 static const ALIGN_ASSET(2) char MIZUsin_room_10DL_001E60[] = dMIZUsin_room_10DL_001E60;
 
diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_11.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_11.h
index d7aa9a0bf..81dccfd81 100644
--- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_11.h
+++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_11.h
@@ -3,15 +3,6 @@
 
 #include "align_asset_macro.h"
 
-#define dMIZUsin_room_11DL_001580 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_11DL_001580"
-static const ALIGN_ASSET(2) char MIZUsin_room_11DL_001580[] = dMIZUsin_room_11DL_001580;
-
-#define dMIZUsin_room_11Tex_003A20 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_11Tex_003A20"
-static const ALIGN_ASSET(2) char MIZUsin_room_11Tex_003A20[] = dMIZUsin_room_11Tex_003A20;
-
-#define dMIZUsin_room_11Tex_004220 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_11Tex_004220"
-static const ALIGN_ASSET(2) char MIZUsin_room_11Tex_004220[] = dMIZUsin_room_11Tex_004220;
-
 #define dMIZUsin_room_11Tex_002220 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_11Tex_002220"
 static const ALIGN_ASSET(2) char MIZUsin_room_11Tex_002220[] = dMIZUsin_room_11Tex_002220;
 
@@ -21,5 +12,14 @@ static const ALIGN_ASSET(2) char MIZUsin_room_11Tex_002A20[] = dMIZUsin_room_11T
 #define dMIZUsin_room_11Tex_003220 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_11Tex_003220"
 static const ALIGN_ASSET(2) char MIZUsin_room_11Tex_003220[] = dMIZUsin_room_11Tex_003220;
 
+#define dMIZUsin_room_11Tex_003A20 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_11Tex_003A20"
+static const ALIGN_ASSET(2) char MIZUsin_room_11Tex_003A20[] = dMIZUsin_room_11Tex_003A20;
+
+#define dMIZUsin_room_11Tex_004220 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_11Tex_004220"
+static const ALIGN_ASSET(2) char MIZUsin_room_11Tex_004220[] = dMIZUsin_room_11Tex_004220;
+
+#define dMIZUsin_room_11DL_001580 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_11DL_001580"
+static const ALIGN_ASSET(2) char MIZUsin_room_11DL_001580[] = dMIZUsin_room_11DL_001580;
+
 
 #endif // DUNGEONS_MIZUSIN_ROOM_11_H
diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_12.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_12.h
index 2ed26b79e..3d8db9a6b 100644
--- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_12.h
+++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_12.h
@@ -3,42 +3,42 @@
 
 #include "align_asset_macro.h"
 
+#define dMIZUsin_room_12Tex_0039C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12Tex_0039C8"
+static const ALIGN_ASSET(2) char MIZUsin_room_12Tex_0039C8[] = dMIZUsin_room_12Tex_0039C8;
+
+#define dMIZUsin_room_12Tex_0041C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12Tex_0041C8"
+static const ALIGN_ASSET(2) char MIZUsin_room_12Tex_0041C8[] = dMIZUsin_room_12Tex_0041C8;
+
+#define dMIZUsin_room_12Tex_0049C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12Tex_0049C8"
+static const ALIGN_ASSET(2) char MIZUsin_room_12Tex_0049C8[] = dMIZUsin_room_12Tex_0049C8;
+
+#define dMIZUsin_room_12Tex_0051C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12Tex_0051C8"
+static const ALIGN_ASSET(2) char MIZUsin_room_12Tex_0051C8[] = dMIZUsin_room_12Tex_0051C8;
+
+#define dMIZUsin_room_12Tex_006628 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12Tex_006628"
+static const ALIGN_ASSET(2) char MIZUsin_room_12Tex_006628[] = dMIZUsin_room_12Tex_006628;
+
 #define dMIZUsin_room_12DL_0024F0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12DL_0024F0"
 static const ALIGN_ASSET(2) char MIZUsin_room_12DL_0024F0[] = dMIZUsin_room_12DL_0024F0;
 
 #define dMIZUsin_room_12DL_0035A8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12DL_0035A8"
 static const ALIGN_ASSET(2) char MIZUsin_room_12DL_0035A8[] = dMIZUsin_room_12DL_0035A8;
 
-#define dMIZUsin_room_12Tex_0051C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12Tex_0051C8"
-static const ALIGN_ASSET(2) char MIZUsin_room_12Tex_0051C8[] = dMIZUsin_room_12Tex_0051C8;
-
 #define dMIZUsin_room_12DL_002D30 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12DL_002D30"
 static const ALIGN_ASSET(2) char MIZUsin_room_12DL_002D30[] = dMIZUsin_room_12DL_002D30;
 
-#define dMIZUsin_room_12Tex_0039C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12Tex_0039C8"
-static const ALIGN_ASSET(2) char MIZUsin_room_12Tex_0039C8[] = dMIZUsin_room_12Tex_0039C8;
-
 #define dMIZUsin_room_12DL_0061C0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12DL_0061C0"
 static const ALIGN_ASSET(2) char MIZUsin_room_12DL_0061C0[] = dMIZUsin_room_12DL_0061C0;
 
-#define dMIZUsin_room_12Tex_006628 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12Tex_006628"
-static const ALIGN_ASSET(2) char MIZUsin_room_12Tex_006628[] = dMIZUsin_room_12Tex_006628;
-
 #define dMIZUsin_room_12DL_006518 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12DL_006518"
 static const ALIGN_ASSET(2) char MIZUsin_room_12DL_006518[] = dMIZUsin_room_12DL_006518;
 
 #define dMIZUsin_room_12DL_000DF0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12DL_000DF0"
 static const ALIGN_ASSET(2) char MIZUsin_room_12DL_000DF0[] = dMIZUsin_room_12DL_000DF0;
 
-#define dMIZUsin_room_12Tex_0041C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12Tex_0041C8"
-static const ALIGN_ASSET(2) char MIZUsin_room_12Tex_0041C8[] = dMIZUsin_room_12Tex_0041C8;
-
 #define dMIZUsin_room_12DL_002F68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12DL_002F68"
 static const ALIGN_ASSET(2) char MIZUsin_room_12DL_002F68[] = dMIZUsin_room_12DL_002F68;
 
-#define dMIZUsin_room_12Tex_0049C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12Tex_0049C8"
-static const ALIGN_ASSET(2) char MIZUsin_room_12Tex_0049C8[] = dMIZUsin_room_12Tex_0049C8;
-
 #define dMIZUsin_room_12DL_000AC8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_12DL_000AC8"
 static const ALIGN_ASSET(2) char MIZUsin_room_12DL_000AC8[] = dMIZUsin_room_12DL_000AC8;
 
diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_13.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_13.h
index a185aef22..b674f2065 100644
--- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_13.h
+++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_13.h
@@ -3,11 +3,11 @@
 
 #include "align_asset_macro.h"
 
-#define dMIZUsin_room_13DL_000130 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_13DL_000130"
-static const ALIGN_ASSET(2) char MIZUsin_room_13DL_000130[] = dMIZUsin_room_13DL_000130;
-
 #define dMIZUsin_room_13Tex_0001F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_13Tex_0001F8"
 static const ALIGN_ASSET(2) char MIZUsin_room_13Tex_0001F8[] = dMIZUsin_room_13Tex_0001F8;
 
+#define dMIZUsin_room_13DL_000130 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_13DL_000130"
+static const ALIGN_ASSET(2) char MIZUsin_room_13DL_000130[] = dMIZUsin_room_13DL_000130;
+
 
 #endif // DUNGEONS_MIZUSIN_ROOM_13_H
diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_14.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_14.h
index 077589b46..652d159e2 100644
--- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_14.h
+++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_14.h
@@ -3,14 +3,14 @@
 
 #include "align_asset_macro.h"
 
-#define dMIZUsin_room_14DL_0009E0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14DL_0009E0"
-static const ALIGN_ASSET(2) char MIZUsin_room_14DL_0009E0[] = dMIZUsin_room_14DL_0009E0;
+#define dMIZUsin_room_14Tex_003680 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_003680"
+static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_003680[] = dMIZUsin_room_14Tex_003680;
 
-#define dMIZUsin_room_14DL_002548 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14DL_002548"
-static const ALIGN_ASSET(2) char MIZUsin_room_14DL_002548[] = dMIZUsin_room_14DL_002548;
+#define dMIZUsin_room_14Tex_003E80 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_003E80"
+static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_003E80[] = dMIZUsin_room_14Tex_003E80;
 
-#define dMIZUsin_room_14Tex_006680 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_006680"
-static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_006680[] = dMIZUsin_room_14Tex_006680;
+#define dMIZUsin_room_14Tex_004680 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_004680"
+static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_004680[] = dMIZUsin_room_14Tex_004680;
 
 #define dMIZUsin_room_14Tex_004E80 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_004E80"
 static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_004E80[] = dMIZUsin_room_14Tex_004E80;
@@ -18,27 +18,27 @@ static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_004E80[] = dMIZUsin_room_14T
 #define dMIZUsin_room_14Tex_005680 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_005680"
 static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_005680[] = dMIZUsin_room_14Tex_005680;
 
-#define dMIZUsin_room_14Tex_004680 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_004680"
-static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_004680[] = dMIZUsin_room_14Tex_004680;
+#define dMIZUsin_room_14Tex_005E80 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_005E80"
+static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_005E80[] = dMIZUsin_room_14Tex_005E80;
+
+#define dMIZUsin_room_14Tex_006680 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_006680"
+static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_006680[] = dMIZUsin_room_14Tex_006680;
+
+#define dMIZUsin_room_14DL_0009E0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14DL_0009E0"
+static const ALIGN_ASSET(2) char MIZUsin_room_14DL_0009E0[] = dMIZUsin_room_14DL_0009E0;
+
+#define dMIZUsin_room_14DL_002548 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14DL_002548"
+static const ALIGN_ASSET(2) char MIZUsin_room_14DL_002548[] = dMIZUsin_room_14DL_002548;
 
 #define dMIZUsin_room_14DL_000FB0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14DL_000FB0"
 static const ALIGN_ASSET(2) char MIZUsin_room_14DL_000FB0[] = dMIZUsin_room_14DL_000FB0;
 
-#define dMIZUsin_room_14Tex_003E80 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_003E80"
-static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_003E80[] = dMIZUsin_room_14Tex_003E80;
-
 #define dMIZUsin_room_14DL_003520 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14DL_003520"
 static const ALIGN_ASSET(2) char MIZUsin_room_14DL_003520[] = dMIZUsin_room_14DL_003520;
 
-#define dMIZUsin_room_14Tex_005E80 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_005E80"
-static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_005E80[] = dMIZUsin_room_14Tex_005E80;
-
 #define dMIZUsin_room_14DL_000E38 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14DL_000E38"
 static const ALIGN_ASSET(2) char MIZUsin_room_14DL_000E38[] = dMIZUsin_room_14DL_000E38;
 
-#define dMIZUsin_room_14Tex_003680 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14Tex_003680"
-static const ALIGN_ASSET(2) char MIZUsin_room_14Tex_003680[] = dMIZUsin_room_14Tex_003680;
-
 #define dMIZUsin_room_14DL_000C68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_14DL_000C68"
 static const ALIGN_ASSET(2) char MIZUsin_room_14DL_000C68[] = dMIZUsin_room_14DL_000C68;
 
diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_15.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_15.h
index 70f65104c..77a20854a 100644
--- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_15.h
+++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_15.h
@@ -3,20 +3,20 @@
 
 #include "align_asset_macro.h"
 
-#define dMIZUsin_room_15DL_001990 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15DL_001990"
-static const ALIGN_ASSET(2) char MIZUsin_room_15DL_001990[] = dMIZUsin_room_15DL_001990;
+#define dMIZUsin_room_15Tex_002C68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_002C68"
+static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_002C68[] = dMIZUsin_room_15Tex_002C68;
 
-#define dMIZUsin_room_15Tex_006C68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_006C68"
-static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_006C68[] = dMIZUsin_room_15Tex_006C68;
+#define dMIZUsin_room_15Tex_003468 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_003468"
+static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_003468[] = dMIZUsin_room_15Tex_003468;
 
-#define dMIZUsin_room_15Tex_006468 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_006468"
-static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_006468[] = dMIZUsin_room_15Tex_006468;
+#define dMIZUsin_room_15Tex_003C68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_003C68"
+static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_003C68[] = dMIZUsin_room_15Tex_003C68;
 
 #define dMIZUsin_room_15Tex_004468 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_004468"
 static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_004468[] = dMIZUsin_room_15Tex_004468;
 
-#define dMIZUsin_room_15Tex_003468 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_003468"
-static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_003468[] = dMIZUsin_room_15Tex_003468;
+#define dMIZUsin_room_15Tex_004C68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_004C68"
+static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_004C68[] = dMIZUsin_room_15Tex_004C68;
 
 #define dMIZUsin_room_15Tex_005468 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_005468"
 static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_005468[] = dMIZUsin_room_15Tex_005468;
@@ -24,17 +24,17 @@ static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_005468[] = dMIZUsin_room_15T
 #define dMIZUsin_room_15Tex_005C68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_005C68"
 static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_005C68[] = dMIZUsin_room_15Tex_005C68;
 
-#define dMIZUsin_room_15Tex_004C68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_004C68"
-static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_004C68[] = dMIZUsin_room_15Tex_004C68;
+#define dMIZUsin_room_15Tex_006468 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_006468"
+static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_006468[] = dMIZUsin_room_15Tex_006468;
 
-#define dMIZUsin_room_15Tex_003C68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_003C68"
-static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_003C68[] = dMIZUsin_room_15Tex_003C68;
+#define dMIZUsin_room_15Tex_006C68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_006C68"
+static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_006C68[] = dMIZUsin_room_15Tex_006C68;
+
+#define dMIZUsin_room_15DL_001990 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15DL_001990"
+static const ALIGN_ASSET(2) char MIZUsin_room_15DL_001990[] = dMIZUsin_room_15DL_001990;
 
 #define dMIZUsin_room_15DL_002B98 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15DL_002B98"
 static const ALIGN_ASSET(2) char MIZUsin_room_15DL_002B98[] = dMIZUsin_room_15DL_002B98;
 
-#define dMIZUsin_room_15Tex_002C68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_002C68"
-static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_002C68[] = dMIZUsin_room_15Tex_002C68;
-
 
 #endif // DUNGEONS_MIZUSIN_ROOM_15_H
diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_16.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_16.h
index 0833a30ea..9354caa0a 100644
--- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_16.h
+++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_16.h
@@ -3,23 +3,23 @@
 
 #include "align_asset_macro.h"
 
-#define dMIZUsin_room_16DL_000D50 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_16DL_000D50"
-static const ALIGN_ASSET(2) char MIZUsin_room_16DL_000D50[] = dMIZUsin_room_16DL_000D50;
-
-#define dMIZUsin_room_16Tex_002330 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_16Tex_002330"
-static const ALIGN_ASSET(2) char MIZUsin_room_16Tex_002330[] = dMIZUsin_room_16Tex_002330;
-
 #define dMIZUsin_room_16Tex_001330 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_16Tex_001330"
 static const ALIGN_ASSET(2) char MIZUsin_room_16Tex_001330[] = dMIZUsin_room_16Tex_001330;
 
 #define dMIZUsin_room_16Tex_001B30 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_16Tex_001B30"
 static const ALIGN_ASSET(2) char MIZUsin_room_16Tex_001B30[] = dMIZUsin_room_16Tex_001B30;
 
-#define dMIZUsin_room_16Tex_003330 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_16Tex_003330"
-static const ALIGN_ASSET(2) char MIZUsin_room_16Tex_003330[] = dMIZUsin_room_16Tex_003330;
+#define dMIZUsin_room_16Tex_002330 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_16Tex_002330"
+static const ALIGN_ASSET(2) char MIZUsin_room_16Tex_002330[] = dMIZUsin_room_16Tex_002330;
 
 #define dMIZUsin_room_16Tex_002B30 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_16Tex_002B30"
 static const ALIGN_ASSET(2) char MIZUsin_room_16Tex_002B30[] = dMIZUsin_room_16Tex_002B30;
 
+#define dMIZUsin_room_16Tex_003330 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_16Tex_003330"
+static const ALIGN_ASSET(2) char MIZUsin_room_16Tex_003330[] = dMIZUsin_room_16Tex_003330;
+
+#define dMIZUsin_room_16DL_000D50 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_16DL_000D50"
+static const ALIGN_ASSET(2) char MIZUsin_room_16DL_000D50[] = dMIZUsin_room_16DL_000D50;
+
 
 #endif // DUNGEONS_MIZUSIN_ROOM_16_H
diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_17.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_17.h
index 99c13d5fc..fddca359d 100644
--- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_17.h
+++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_17.h
@@ -3,6 +3,24 @@
 
 #include "align_asset_macro.h"
 
+#define dMIZUsin_room_17Tex_005AA8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_005AA8"
+static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_005AA8[] = dMIZUsin_room_17Tex_005AA8;
+
+#define dMIZUsin_room_17Tex_0062A8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_0062A8"
+static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_0062A8[] = dMIZUsin_room_17Tex_0062A8;
+
+#define dMIZUsin_room_17Tex_006AA8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_006AA8"
+static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_006AA8[] = dMIZUsin_room_17Tex_006AA8;
+
+#define dMIZUsin_room_17Tex_0072A8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_0072A8"
+static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_0072A8[] = dMIZUsin_room_17Tex_0072A8;
+
+#define dMIZUsin_room_17Tex_007AA8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_007AA8"
+static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_007AA8[] = dMIZUsin_room_17Tex_007AA8;
+
+#define dMIZUsin_room_17Tex_0082A8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_0082A8"
+static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_0082A8[] = dMIZUsin_room_17Tex_0082A8;
+
 #define dMIZUsin_room_17DL_003458 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17DL_003458"
 static const ALIGN_ASSET(2) char MIZUsin_room_17DL_003458[] = dMIZUsin_room_17DL_003458;
 
@@ -12,33 +30,15 @@ static const ALIGN_ASSET(2) char MIZUsin_room_17DL_0041C8[] = dMIZUsin_room_17DL
 #define dMIZUsin_room_17DL_001010 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17DL_001010"
 static const ALIGN_ASSET(2) char MIZUsin_room_17DL_001010[] = dMIZUsin_room_17DL_001010;
 
-#define dMIZUsin_room_17Tex_006AA8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_006AA8"
-static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_006AA8[] = dMIZUsin_room_17Tex_006AA8;
-
-#define dMIZUsin_room_17Tex_007AA8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_007AA8"
-static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_007AA8[] = dMIZUsin_room_17Tex_007AA8;
-
-#define dMIZUsin_room_17Tex_0072A8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_0072A8"
-static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_0072A8[] = dMIZUsin_room_17Tex_0072A8;
-
-#define dMIZUsin_room_17Tex_0082A8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_0082A8"
-static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_0082A8[] = dMIZUsin_room_17Tex_0082A8;
-
 #define dMIZUsin_room_17DL_005928 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17DL_005928"
 static const ALIGN_ASSET(2) char MIZUsin_room_17DL_005928[] = dMIZUsin_room_17DL_005928;
 
 #define dMIZUsin_room_17DL_0056E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17DL_0056E8"
 static const ALIGN_ASSET(2) char MIZUsin_room_17DL_0056E8[] = dMIZUsin_room_17DL_0056E8;
 
-#define dMIZUsin_room_17Tex_005AA8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_005AA8"
-static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_005AA8[] = dMIZUsin_room_17Tex_005AA8;
-
 #define dMIZUsin_room_17DL_0016E0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17DL_0016E0"
 static const ALIGN_ASSET(2) char MIZUsin_room_17DL_0016E0[] = dMIZUsin_room_17DL_0016E0;
 
-#define dMIZUsin_room_17Tex_0062A8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_0062A8"
-static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_0062A8[] = dMIZUsin_room_17Tex_0062A8;
-
 #define dMIZUsin_room_17DL_001910 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17DL_001910"
 static const ALIGN_ASSET(2) char MIZUsin_room_17DL_001910[] = dMIZUsin_room_17DL_001910;
 
diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_18.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_18.h
index 47eef912b..3a4ef2d1d 100644
--- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_18.h
+++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_18.h
@@ -3,41 +3,41 @@
 
 #include "align_asset_macro.h"
 
+#define dMIZUsin_room_18Tex_0018F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18Tex_0018F8"
+static const ALIGN_ASSET(2) char MIZUsin_room_18Tex_0018F8[] = dMIZUsin_room_18Tex_0018F8;
+
+#define dMIZUsin_room_18Tex_0020F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18Tex_0020F8"
+static const ALIGN_ASSET(2) char MIZUsin_room_18Tex_0020F8[] = dMIZUsin_room_18Tex_0020F8;
+
+#define dMIZUsin_room_18Tex_0028F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18Tex_0028F8"
+static const ALIGN_ASSET(2) char MIZUsin_room_18Tex_0028F8[] = dMIZUsin_room_18Tex_0028F8;
+
+#define dMIZUsin_room_18Tex_0030F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18Tex_0030F8"
+static const ALIGN_ASSET(2) char MIZUsin_room_18Tex_0030F8[] = dMIZUsin_room_18Tex_0030F8;
+
+#define dMIZUsin_room_18Tex_0038F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18Tex_0038F8"
+static const ALIGN_ASSET(2) char MIZUsin_room_18Tex_0038F8[] = dMIZUsin_room_18Tex_0038F8;
+
 #define dMIZUsin_room_18DL_0006B0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18DL_0006B0"
 static const ALIGN_ASSET(2) char MIZUsin_room_18DL_0006B0[] = dMIZUsin_room_18DL_0006B0;
 
 #define dMIZUsin_room_18DL_000240 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18DL_000240"
 static const ALIGN_ASSET(2) char MIZUsin_room_18DL_000240[] = dMIZUsin_room_18DL_000240;
 
-#define dMIZUsin_room_18Tex_0018F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18Tex_0018F8"
-static const ALIGN_ASSET(2) char MIZUsin_room_18Tex_0018F8[] = dMIZUsin_room_18Tex_0018F8;
-
 #define dMIZUsin_room_18DL_0008F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18DL_0008F8"
 static const ALIGN_ASSET(2) char MIZUsin_room_18DL_0008F8[] = dMIZUsin_room_18DL_0008F8;
 
-#define dMIZUsin_room_18Tex_0020F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18Tex_0020F8"
-static const ALIGN_ASSET(2) char MIZUsin_room_18Tex_0020F8[] = dMIZUsin_room_18Tex_0020F8;
-
 #define dMIZUsin_room_18DL_000B38 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18DL_000B38"
 static const ALIGN_ASSET(2) char MIZUsin_room_18DL_000B38[] = dMIZUsin_room_18DL_000B38;
 
 #define dMIZUsin_room_18DL_0011A0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18DL_0011A0"
 static const ALIGN_ASSET(2) char MIZUsin_room_18DL_0011A0[] = dMIZUsin_room_18DL_0011A0;
 
-#define dMIZUsin_room_18Tex_0030F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18Tex_0030F8"
-static const ALIGN_ASSET(2) char MIZUsin_room_18Tex_0030F8[] = dMIZUsin_room_18Tex_0030F8;
-
 #define dMIZUsin_room_18DL_000E00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18DL_000E00"
 static const ALIGN_ASSET(2) char MIZUsin_room_18DL_000E00[] = dMIZUsin_room_18DL_000E00;
 
-#define dMIZUsin_room_18Tex_0028F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18Tex_0028F8"
-static const ALIGN_ASSET(2) char MIZUsin_room_18Tex_0028F8[] = dMIZUsin_room_18Tex_0028F8;
-
 #define dMIZUsin_room_18DL_001740 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18DL_001740"
 static const ALIGN_ASSET(2) char MIZUsin_room_18DL_001740[] = dMIZUsin_room_18DL_001740;
 
-#define dMIZUsin_room_18Tex_0038F8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_18Tex_0038F8"
-static const ALIGN_ASSET(2) char MIZUsin_room_18Tex_0038F8[] = dMIZUsin_room_18Tex_0038F8;
-
 
 #endif // DUNGEONS_MIZUSIN_ROOM_18_H
diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_19.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_19.h
index 58cb59dd8..22a87a626 100644
--- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_19.h
+++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_19.h
@@ -3,9 +3,6 @@
 
 #include "align_asset_macro.h"
 
-#define dMIZUsin_room_19DL_000D00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_19DL_000D00"
-static const ALIGN_ASSET(2) char MIZUsin_room_19DL_000D00[] = dMIZUsin_room_19DL_000D00;
-
 #define dMIZUsin_room_19Tex_001130 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_19Tex_001130"
 static const ALIGN_ASSET(2) char MIZUsin_room_19Tex_001130[] = dMIZUsin_room_19Tex_001130;
 
@@ -21,5 +18,8 @@ static const ALIGN_ASSET(2) char MIZUsin_room_19Tex_002930[] = dMIZUsin_room_19T
 #define dMIZUsin_room_19Tex_003130 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_19Tex_003130"
 static const ALIGN_ASSET(2) char MIZUsin_room_19Tex_003130[] = dMIZUsin_room_19Tex_003130;
 
+#define dMIZUsin_room_19DL_000D00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_19DL_000D00"
+static const ALIGN_ASSET(2) char MIZUsin_room_19DL_000D00[] = dMIZUsin_room_19DL_000D00;
+
 
 #endif // DUNGEONS_MIZUSIN_ROOM_19_H
diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_2.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_2.h
index c3e1eaf87..362f0d433 100644
--- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_2.h
+++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_2.h
@@ -3,33 +3,33 @@
 
 #include "align_asset_macro.h"
 
+#define dMIZUsin_room_2Tex_002AB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_002AB8"
+static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_002AB8[] = dMIZUsin_room_2Tex_002AB8;
+
+#define dMIZUsin_room_2Tex_0032B8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_0032B8"
+static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_0032B8[] = dMIZUsin_room_2Tex_0032B8;
+
+#define dMIZUsin_room_2Tex_003AB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_003AB8"
+static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_003AB8[] = dMIZUsin_room_2Tex_003AB8;
+
+#define dMIZUsin_room_2Tex_0042B8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_0042B8"
+static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_0042B8[] = dMIZUsin_room_2Tex_0042B8;
+
+#define dMIZUsin_room_2Tex_004AB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_004AB8"
+static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_004AB8[] = dMIZUsin_room_2Tex_004AB8;
+
+#define dMIZUsin_room_2Tex_005488 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_005488"
+static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_005488[] = dMIZUsin_room_2Tex_005488;
+
 #define dMIZUsin_room_2DL_0028A0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2DL_0028A0"
 static const ALIGN_ASSET(2) char MIZUsin_room_2DL_0028A0[] = dMIZUsin_room_2DL_0028A0;
 
 #define dMIZUsin_room_2DL_001428 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2DL_001428"
 static const ALIGN_ASSET(2) char MIZUsin_room_2DL_001428[] = dMIZUsin_room_2DL_001428;
 
-#define dMIZUsin_room_2Tex_004AB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_004AB8"
-static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_004AB8[] = dMIZUsin_room_2Tex_004AB8;
-
-#define dMIZUsin_room_2Tex_003AB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_003AB8"
-static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_003AB8[] = dMIZUsin_room_2Tex_003AB8;
-
-#define dMIZUsin_room_2Tex_002AB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_002AB8"
-static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_002AB8[] = dMIZUsin_room_2Tex_002AB8;
-
-#define dMIZUsin_room_2Tex_0042B8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_0042B8"
-static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_0042B8[] = dMIZUsin_room_2Tex_0042B8;
-
-#define dMIZUsin_room_2Tex_0032B8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_0032B8"
-static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_0032B8[] = dMIZUsin_room_2Tex_0032B8;
-
 #define dMIZUsin_room_2DL_005380 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2DL_005380"
 static const ALIGN_ASSET(2) char MIZUsin_room_2DL_005380[] = dMIZUsin_room_2DL_005380;
 
-#define dMIZUsin_room_2Tex_005488 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_005488"
-static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_005488[] = dMIZUsin_room_2Tex_005488;
-
 #define dMIZUsin_room_2DL_0004E0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2DL_0004E0"
 static const ALIGN_ASSET(2) char MIZUsin_room_2DL_0004E0[] = dMIZUsin_room_2DL_0004E0;
 
diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_20.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_20.h
index e3236ac82..1a989e899 100644
--- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_20.h
+++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_20.h
@@ -3,27 +3,39 @@
 
 #include "align_asset_macro.h"
 
+#define dMIZUsin_room_20Tex_003040 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20Tex_003040"
+static const ALIGN_ASSET(2) char MIZUsin_room_20Tex_003040[] = dMIZUsin_room_20Tex_003040;
+
+#define dMIZUsin_room_20Tex_003840 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20Tex_003840"
+static const ALIGN_ASSET(2) char MIZUsin_room_20Tex_003840[] = dMIZUsin_room_20Tex_003840;
+
+#define dMIZUsin_room_20Tex_004040 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20Tex_004040"
+static const ALIGN_ASSET(2) char MIZUsin_room_20Tex_004040[] = dMIZUsin_room_20Tex_004040;
+
+#define dMIZUsin_room_20Tex_004840 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20Tex_004840"
+static const ALIGN_ASSET(2) char MIZUsin_room_20Tex_004840[] = dMIZUsin_room_20Tex_004840;
+
+#define dMIZUsin_room_20Tex_005040 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20Tex_005040"
+static const ALIGN_ASSET(2) char MIZUsin_room_20Tex_005040[] = dMIZUsin_room_20Tex_005040;
+
+#define dMIZUsin_room_20Tex_005840 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20Tex_005840"
+static const ALIGN_ASSET(2) char MIZUsin_room_20Tex_005840[] = dMIZUsin_room_20Tex_005840;
+
+#define dMIZUsin_room_20Tex_006040 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20Tex_006040"
+static const ALIGN_ASSET(2) char MIZUsin_room_20Tex_006040[] = dMIZUsin_room_20Tex_006040;
+
 #define dMIZUsin_room_20DL_0018B8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20DL_0018B8"
 static const ALIGN_ASSET(2) char MIZUsin_room_20DL_0018B8[] = dMIZUsin_room_20DL_0018B8;
 
 #define dMIZUsin_room_20DL_0006E0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20DL_0006E0"
 static const ALIGN_ASSET(2) char MIZUsin_room_20DL_0006E0[] = dMIZUsin_room_20DL_0006E0;
 
-#define dMIZUsin_room_20Tex_004840 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20Tex_004840"
-static const ALIGN_ASSET(2) char MIZUsin_room_20Tex_004840[] = dMIZUsin_room_20Tex_004840;
-
 #define dMIZUsin_room_20DL_002ED8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20DL_002ED8"
 static const ALIGN_ASSET(2) char MIZUsin_room_20DL_002ED8[] = dMIZUsin_room_20DL_002ED8;
 
-#define dMIZUsin_room_20Tex_004040 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20Tex_004040"
-static const ALIGN_ASSET(2) char MIZUsin_room_20Tex_004040[] = dMIZUsin_room_20Tex_004040;
-
 #define dMIZUsin_room_20DL_002B30 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20DL_002B30"
 static const ALIGN_ASSET(2) char MIZUsin_room_20DL_002B30[] = dMIZUsin_room_20DL_002B30;
 
-#define dMIZUsin_room_20Tex_003840 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20Tex_003840"
-static const ALIGN_ASSET(2) char MIZUsin_room_20Tex_003840[] = dMIZUsin_room_20Tex_003840;
-
 #define dMIZUsin_room_20DL_000BA0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20DL_000BA0"
 static const ALIGN_ASSET(2) char MIZUsin_room_20DL_000BA0[] = dMIZUsin_room_20DL_000BA0;
 
@@ -33,26 +45,14 @@ static const ALIGN_ASSET(2) char MIZUsin_room_20DL_002980[] = dMIZUsin_room_20DL
 #define dMIZUsin_room_20DL_0026D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20DL_0026D0"
 static const ALIGN_ASSET(2) char MIZUsin_room_20DL_0026D0[] = dMIZUsin_room_20DL_0026D0;
 
-#define dMIZUsin_room_20Tex_005840 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20Tex_005840"
-static const ALIGN_ASSET(2) char MIZUsin_room_20Tex_005840[] = dMIZUsin_room_20Tex_005840;
-
 #define dMIZUsin_room_20DL_001D48 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20DL_001D48"
 static const ALIGN_ASSET(2) char MIZUsin_room_20DL_001D48[] = dMIZUsin_room_20DL_001D48;
 
-#define dMIZUsin_room_20Tex_005040 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20Tex_005040"
-static const ALIGN_ASSET(2) char MIZUsin_room_20Tex_005040[] = dMIZUsin_room_20Tex_005040;
-
 #define dMIZUsin_room_20DL_0022D8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20DL_0022D8"
 static const ALIGN_ASSET(2) char MIZUsin_room_20DL_0022D8[] = dMIZUsin_room_20DL_0022D8;
 
-#define dMIZUsin_room_20Tex_006040 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20Tex_006040"
-static const ALIGN_ASSET(2) char MIZUsin_room_20Tex_006040[] = dMIZUsin_room_20Tex_006040;
-
 #define dMIZUsin_room_20DL_002CB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20DL_002CB8"
 static const ALIGN_ASSET(2) char MIZUsin_room_20DL_002CB8[] = dMIZUsin_room_20DL_002CB8;
 
-#define dMIZUsin_room_20Tex_003040 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_20Tex_003040"
-static const ALIGN_ASSET(2) char MIZUsin_room_20Tex_003040[] = dMIZUsin_room_20Tex_003040;
-
 
 #endif // DUNGEONS_MIZUSIN_ROOM_20_H
diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_21.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_21.h
index 92e908ed3..c89c37208 100644
--- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_21.h
+++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_21.h
@@ -3,39 +3,39 @@
 
 #include "align_asset_macro.h"
 
+#define dMIZUsin_room_21Tex_004360 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21Tex_004360"
+static const ALIGN_ASSET(2) char MIZUsin_room_21Tex_004360[] = dMIZUsin_room_21Tex_004360;
+
+#define dMIZUsin_room_21Tex_004B60 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21Tex_004B60"
+static const ALIGN_ASSET(2) char MIZUsin_room_21Tex_004B60[] = dMIZUsin_room_21Tex_004B60;
+
+#define dMIZUsin_room_21Tex_005360 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21Tex_005360"
+static const ALIGN_ASSET(2) char MIZUsin_room_21Tex_005360[] = dMIZUsin_room_21Tex_005360;
+
+#define dMIZUsin_room_21Tex_005B60 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21Tex_005B60"
+static const ALIGN_ASSET(2) char MIZUsin_room_21Tex_005B60[] = dMIZUsin_room_21Tex_005B60;
+
+#define dMIZUsin_room_21Tex_006CA0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21Tex_006CA0"
+static const ALIGN_ASSET(2) char MIZUsin_room_21Tex_006CA0[] = dMIZUsin_room_21Tex_006CA0;
+
 #define dMIZUsin_room_21DL_0003E0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21DL_0003E0"
 static const ALIGN_ASSET(2) char MIZUsin_room_21DL_0003E0[] = dMIZUsin_room_21DL_0003E0;
 
 #define dMIZUsin_room_21DL_003CD8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21DL_003CD8"
 static const ALIGN_ASSET(2) char MIZUsin_room_21DL_003CD8[] = dMIZUsin_room_21DL_003CD8;
 
-#define dMIZUsin_room_21Tex_005360 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21Tex_005360"
-static const ALIGN_ASSET(2) char MIZUsin_room_21Tex_005360[] = dMIZUsin_room_21Tex_005360;
-
 #define dMIZUsin_room_21DL_006A40 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21DL_006A40"
 static const ALIGN_ASSET(2) char MIZUsin_room_21DL_006A40[] = dMIZUsin_room_21DL_006A40;
 
-#define dMIZUsin_room_21Tex_006CA0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21Tex_006CA0"
-static const ALIGN_ASSET(2) char MIZUsin_room_21Tex_006CA0[] = dMIZUsin_room_21Tex_006CA0;
-
 #define dMIZUsin_room_21DL_002D40 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21DL_002D40"
 static const ALIGN_ASSET(2) char MIZUsin_room_21DL_002D40[] = dMIZUsin_room_21DL_002D40;
 
-#define dMIZUsin_room_21Tex_004360 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21Tex_004360"
-static const ALIGN_ASSET(2) char MIZUsin_room_21Tex_004360[] = dMIZUsin_room_21Tex_004360;
-
 #define dMIZUsin_room_21DL_004228 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21DL_004228"
 static const ALIGN_ASSET(2) char MIZUsin_room_21DL_004228[] = dMIZUsin_room_21DL_004228;
 
-#define dMIZUsin_room_21Tex_005B60 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21Tex_005B60"
-static const ALIGN_ASSET(2) char MIZUsin_room_21Tex_005B60[] = dMIZUsin_room_21Tex_005B60;
-
 #define dMIZUsin_room_21DL_004018 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21DL_004018"
 static const ALIGN_ASSET(2) char MIZUsin_room_21DL_004018[] = dMIZUsin_room_21DL_004018;
 
-#define dMIZUsin_room_21Tex_004B60 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21Tex_004B60"
-static const ALIGN_ASSET(2) char MIZUsin_room_21Tex_004B60[] = dMIZUsin_room_21Tex_004B60;
-
 #define dMIZUsin_room_21DL_003A70 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_21DL_003A70"
 static const ALIGN_ASSET(2) char MIZUsin_room_21DL_003A70[] = dMIZUsin_room_21DL_003A70;
 
diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_22.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_22.h
index 0fc1a10b5..7bab9f20c 100644
--- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_22.h
+++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_22.h
@@ -3,65 +3,65 @@
 
 #include "align_asset_macro.h"
 
-#define dMIZUsin_room_22DL_002E40 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_002E40"
-static const ALIGN_ASSET(2) char MIZUsin_room_22DL_002E40[] = dMIZUsin_room_22DL_002E40;
-
-#define dMIZUsin_room_22Tex_0068E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0068E8"
-static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0068E8[] = dMIZUsin_room_22Tex_0068E8;
-
-#define dMIZUsin_room_22DL_003E08 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_003E08"
-static const ALIGN_ASSET(2) char MIZUsin_room_22DL_003E08[] = dMIZUsin_room_22DL_003E08;
-
-#define dMIZUsin_room_22Tex_0060E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0060E8"
-static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0060E8[] = dMIZUsin_room_22Tex_0060E8;
-
-#define dMIZUsin_room_22DL_0040C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_0040C8"
-static const ALIGN_ASSET(2) char MIZUsin_room_22DL_0040C8[] = dMIZUsin_room_22DL_0040C8;
-
-#define dMIZUsin_room_22Tex_0058E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0058E8"
-static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0058E8[] = dMIZUsin_room_22Tex_0058E8;
-
-#define dMIZUsin_room_22DL_004370 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_004370"
-static const ALIGN_ASSET(2) char MIZUsin_room_22DL_004370[] = dMIZUsin_room_22DL_004370;
-
-#define dMIZUsin_room_22Tex_0050E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0050E8"
-static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0050E8[] = dMIZUsin_room_22Tex_0050E8;
-
-#define dMIZUsin_room_22DL_0033A0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_0033A0"
-static const ALIGN_ASSET(2) char MIZUsin_room_22DL_0033A0[] = dMIZUsin_room_22DL_0033A0;
-
-#define dMIZUsin_room_22Tex_0080E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0080E8"
-static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0080E8[] = dMIZUsin_room_22Tex_0080E8;
-
-#define dMIZUsin_room_22DL_002B18 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_002B18"
-static const ALIGN_ASSET(2) char MIZUsin_room_22DL_002B18[] = dMIZUsin_room_22DL_002B18;
+#define dMIZUsin_room_22Tex_0044E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0044E8"
+static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0044E8[] = dMIZUsin_room_22Tex_0044E8;
 
 #define dMIZUsin_room_22Tex_0048E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0048E8"
 static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0048E8[] = dMIZUsin_room_22Tex_0048E8;
 
-#define dMIZUsin_room_22DL_000380 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_000380"
-static const ALIGN_ASSET(2) char MIZUsin_room_22DL_000380[] = dMIZUsin_room_22DL_000380;
+#define dMIZUsin_room_22Tex_0050E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0050E8"
+static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0050E8[] = dMIZUsin_room_22Tex_0050E8;
 
-#define dMIZUsin_room_22Tex_0044E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0044E8"
-static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0044E8[] = dMIZUsin_room_22Tex_0044E8;
+#define dMIZUsin_room_22Tex_0058E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0058E8"
+static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0058E8[] = dMIZUsin_room_22Tex_0058E8;
 
-#define dMIZUsin_room_22DL_003778 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_003778"
-static const ALIGN_ASSET(2) char MIZUsin_room_22DL_003778[] = dMIZUsin_room_22DL_003778;
+#define dMIZUsin_room_22Tex_0060E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0060E8"
+static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0060E8[] = dMIZUsin_room_22Tex_0060E8;
 
-#define dMIZUsin_room_22Tex_0078E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0078E8"
-static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0078E8[] = dMIZUsin_room_22Tex_0078E8;
-
-#define dMIZUsin_room_22DL_0006D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_0006D0"
-static const ALIGN_ASSET(2) char MIZUsin_room_22DL_0006D0[] = dMIZUsin_room_22DL_0006D0;
-
-#define dMIZUsin_room_22Tex_0088E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0088E8"
-static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0088E8[] = dMIZUsin_room_22Tex_0088E8;
-
-#define dMIZUsin_room_22DL_0020C0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_0020C0"
-static const ALIGN_ASSET(2) char MIZUsin_room_22DL_0020C0[] = dMIZUsin_room_22DL_0020C0;
+#define dMIZUsin_room_22Tex_0068E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0068E8"
+static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0068E8[] = dMIZUsin_room_22Tex_0068E8;
 
 #define dMIZUsin_room_22Tex_0070E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0070E8"
 static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0070E8[] = dMIZUsin_room_22Tex_0070E8;
 
+#define dMIZUsin_room_22Tex_0078E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0078E8"
+static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0078E8[] = dMIZUsin_room_22Tex_0078E8;
+
+#define dMIZUsin_room_22Tex_0080E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0080E8"
+static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0080E8[] = dMIZUsin_room_22Tex_0080E8;
+
+#define dMIZUsin_room_22Tex_0088E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22Tex_0088E8"
+static const ALIGN_ASSET(2) char MIZUsin_room_22Tex_0088E8[] = dMIZUsin_room_22Tex_0088E8;
+
+#define dMIZUsin_room_22DL_002E40 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_002E40"
+static const ALIGN_ASSET(2) char MIZUsin_room_22DL_002E40[] = dMIZUsin_room_22DL_002E40;
+
+#define dMIZUsin_room_22DL_003E08 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_003E08"
+static const ALIGN_ASSET(2) char MIZUsin_room_22DL_003E08[] = dMIZUsin_room_22DL_003E08;
+
+#define dMIZUsin_room_22DL_0040C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_0040C8"
+static const ALIGN_ASSET(2) char MIZUsin_room_22DL_0040C8[] = dMIZUsin_room_22DL_0040C8;
+
+#define dMIZUsin_room_22DL_004370 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_004370"
+static const ALIGN_ASSET(2) char MIZUsin_room_22DL_004370[] = dMIZUsin_room_22DL_004370;
+
+#define dMIZUsin_room_22DL_0033A0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_0033A0"
+static const ALIGN_ASSET(2) char MIZUsin_room_22DL_0033A0[] = dMIZUsin_room_22DL_0033A0;
+
+#define dMIZUsin_room_22DL_002B18 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_002B18"
+static const ALIGN_ASSET(2) char MIZUsin_room_22DL_002B18[] = dMIZUsin_room_22DL_002B18;
+
+#define dMIZUsin_room_22DL_000380 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_000380"
+static const ALIGN_ASSET(2) char MIZUsin_room_22DL_000380[] = dMIZUsin_room_22DL_000380;
+
+#define dMIZUsin_room_22DL_003778 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_003778"
+static const ALIGN_ASSET(2) char MIZUsin_room_22DL_003778[] = dMIZUsin_room_22DL_003778;
+
+#define dMIZUsin_room_22DL_0006D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_0006D0"
+static const ALIGN_ASSET(2) char MIZUsin_room_22DL_0006D0[] = dMIZUsin_room_22DL_0006D0;
+
+#define dMIZUsin_room_22DL_0020C0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_22DL_0020C0"
+static const ALIGN_ASSET(2) char MIZUsin_room_22DL_0020C0[] = dMIZUsin_room_22DL_0020C0;
+
 
 #endif // DUNGEONS_MIZUSIN_ROOM_22_H
diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_3.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_3.h
index d7b6b4650..22f77644b 100644
--- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_3.h
+++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_3.h
@@ -3,6 +3,24 @@
 
 #include "align_asset_macro.h"
 
+#define dMIZUsin_room_3Tex_0037B8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3Tex_0037B8"
+static const ALIGN_ASSET(2) char MIZUsin_room_3Tex_0037B8[] = dMIZUsin_room_3Tex_0037B8;
+
+#define dMIZUsin_room_3Tex_003FB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3Tex_003FB8"
+static const ALIGN_ASSET(2) char MIZUsin_room_3Tex_003FB8[] = dMIZUsin_room_3Tex_003FB8;
+
+#define dMIZUsin_room_3Tex_0047B8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3Tex_0047B8"
+static const ALIGN_ASSET(2) char MIZUsin_room_3Tex_0047B8[] = dMIZUsin_room_3Tex_0047B8;
+
+#define dMIZUsin_room_3Tex_004FB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3Tex_004FB8"
+static const ALIGN_ASSET(2) char MIZUsin_room_3Tex_004FB8[] = dMIZUsin_room_3Tex_004FB8;
+
+#define dMIZUsin_room_3Tex_0057B8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3Tex_0057B8"
+static const ALIGN_ASSET(2) char MIZUsin_room_3Tex_0057B8[] = dMIZUsin_room_3Tex_0057B8;
+
+#define dMIZUsin_room_3Tex_005FB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3Tex_005FB8"
+static const ALIGN_ASSET(2) char MIZUsin_room_3Tex_005FB8[] = dMIZUsin_room_3Tex_005FB8;
+
 #define dMIZUsin_room_3DL_0007F0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3DL_0007F0"
 static const ALIGN_ASSET(2) char MIZUsin_room_3DL_0007F0[] = dMIZUsin_room_3DL_0007F0;
 
@@ -12,30 +30,12 @@ static const ALIGN_ASSET(2) char MIZUsin_room_3DL_0012B0[] = dMIZUsin_room_3DL_0
 #define dMIZUsin_room_3DL_0030D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3DL_0030D0"
 static const ALIGN_ASSET(2) char MIZUsin_room_3DL_0030D0[] = dMIZUsin_room_3DL_0030D0;
 
-#define dMIZUsin_room_3Tex_0037B8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3Tex_0037B8"
-static const ALIGN_ASSET(2) char MIZUsin_room_3Tex_0037B8[] = dMIZUsin_room_3Tex_0037B8;
-
-#define dMIZUsin_room_3Tex_0057B8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3Tex_0057B8"
-static const ALIGN_ASSET(2) char MIZUsin_room_3Tex_0057B8[] = dMIZUsin_room_3Tex_0057B8;
-
-#define dMIZUsin_room_3Tex_003FB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3Tex_003FB8"
-static const ALIGN_ASSET(2) char MIZUsin_room_3Tex_003FB8[] = dMIZUsin_room_3Tex_003FB8;
-
-#define dMIZUsin_room_3Tex_004FB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3Tex_004FB8"
-static const ALIGN_ASSET(2) char MIZUsin_room_3Tex_004FB8[] = dMIZUsin_room_3Tex_004FB8;
-
-#define dMIZUsin_room_3Tex_005FB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3Tex_005FB8"
-static const ALIGN_ASSET(2) char MIZUsin_room_3Tex_005FB8[] = dMIZUsin_room_3Tex_005FB8;
-
 #define dMIZUsin_room_3DL_002190 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3DL_002190"
 static const ALIGN_ASSET(2) char MIZUsin_room_3DL_002190[] = dMIZUsin_room_3DL_002190;
 
 #define dMIZUsin_room_3DL_0003C0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3DL_0003C0"
 static const ALIGN_ASSET(2) char MIZUsin_room_3DL_0003C0[] = dMIZUsin_room_3DL_0003C0;
 
-#define dMIZUsin_room_3Tex_0047B8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3Tex_0047B8"
-static const ALIGN_ASSET(2) char MIZUsin_room_3Tex_0047B8[] = dMIZUsin_room_3Tex_0047B8;
-
 #define dMIZUsin_room_3DL_001658 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_3DL_001658"
 static const ALIGN_ASSET(2) char MIZUsin_room_3DL_001658[] = dMIZUsin_room_3DL_001658;
 
diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_4.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_4.h
index 73e796c54..d1f8f39dd 100644
--- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_4.h
+++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_4.h
@@ -3,41 +3,41 @@
 
 #include "align_asset_macro.h"
 
+#define dMIZUsin_room_4Tex_002820 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4Tex_002820"
+static const ALIGN_ASSET(2) char MIZUsin_room_4Tex_002820[] = dMIZUsin_room_4Tex_002820;
+
+#define dMIZUsin_room_4Tex_003020 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4Tex_003020"
+static const ALIGN_ASSET(2) char MIZUsin_room_4Tex_003020[] = dMIZUsin_room_4Tex_003020;
+
+#define dMIZUsin_room_4Tex_003820 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4Tex_003820"
+static const ALIGN_ASSET(2) char MIZUsin_room_4Tex_003820[] = dMIZUsin_room_4Tex_003820;
+
+#define dMIZUsin_room_4Tex_004020 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4Tex_004020"
+static const ALIGN_ASSET(2) char MIZUsin_room_4Tex_004020[] = dMIZUsin_room_4Tex_004020;
+
+#define dMIZUsin_room_4Tex_004820 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4Tex_004820"
+static const ALIGN_ASSET(2) char MIZUsin_room_4Tex_004820[] = dMIZUsin_room_4Tex_004820;
+
+#define dMIZUsin_room_4Tex_005020 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4Tex_005020"
+static const ALIGN_ASSET(2) char MIZUsin_room_4Tex_005020[] = dMIZUsin_room_4Tex_005020;
+
+#define dMIZUsin_room_4Tex_005820 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4Tex_005820"
+static const ALIGN_ASSET(2) char MIZUsin_room_4Tex_005820[] = dMIZUsin_room_4Tex_005820;
+
 #define dMIZUsin_room_4DL_000780 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4DL_000780"
 static const ALIGN_ASSET(2) char MIZUsin_room_4DL_000780[] = dMIZUsin_room_4DL_000780;
 
 #define dMIZUsin_room_4DL_0023A0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4DL_0023A0"
 static const ALIGN_ASSET(2) char MIZUsin_room_4DL_0023A0[] = dMIZUsin_room_4DL_0023A0;
 
-#define dMIZUsin_room_4Tex_004820 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4Tex_004820"
-static const ALIGN_ASSET(2) char MIZUsin_room_4Tex_004820[] = dMIZUsin_room_4Tex_004820;
-
-#define dMIZUsin_room_4Tex_005820 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4Tex_005820"
-static const ALIGN_ASSET(2) char MIZUsin_room_4Tex_005820[] = dMIZUsin_room_4Tex_005820;
-
-#define dMIZUsin_room_4Tex_005020 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4Tex_005020"
-static const ALIGN_ASSET(2) char MIZUsin_room_4Tex_005020[] = dMIZUsin_room_4Tex_005020;
-
-#define dMIZUsin_room_4Tex_004020 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4Tex_004020"
-static const ALIGN_ASSET(2) char MIZUsin_room_4Tex_004020[] = dMIZUsin_room_4Tex_004020;
-
-#define dMIZUsin_room_4Tex_003020 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4Tex_003020"
-static const ALIGN_ASSET(2) char MIZUsin_room_4Tex_003020[] = dMIZUsin_room_4Tex_003020;
-
 #define dMIZUsin_room_4DL_0016C0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4DL_0016C0"
 static const ALIGN_ASSET(2) char MIZUsin_room_4DL_0016C0[] = dMIZUsin_room_4DL_0016C0;
 
-#define dMIZUsin_room_4Tex_002820 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4Tex_002820"
-static const ALIGN_ASSET(2) char MIZUsin_room_4Tex_002820[] = dMIZUsin_room_4Tex_002820;
-
 #define dMIZUsin_room_4DL_000AD8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4DL_000AD8"
 static const ALIGN_ASSET(2) char MIZUsin_room_4DL_000AD8[] = dMIZUsin_room_4DL_000AD8;
 
 #define dMIZUsin_room_4DL_001370 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4DL_001370"
 static const ALIGN_ASSET(2) char MIZUsin_room_4DL_001370[] = dMIZUsin_room_4DL_001370;
 
-#define dMIZUsin_room_4Tex_003820 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_4Tex_003820"
-static const ALIGN_ASSET(2) char MIZUsin_room_4Tex_003820[] = dMIZUsin_room_4Tex_003820;
-
 
 #endif // DUNGEONS_MIZUSIN_ROOM_4_H
diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_5.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_5.h
index 9badd3e10..4557dcfc8 100644
--- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_5.h
+++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_5.h
@@ -3,60 +3,60 @@
 
 #include "align_asset_macro.h"
 
-#define dMIZUsin_room_5DL_0014D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5DL_0014D0"
-static const ALIGN_ASSET(2) char MIZUsin_room_5DL_0014D0[] = dMIZUsin_room_5DL_0014D0;
-
-#define dMIZUsin_room_5Tex_006A48 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_006A48"
-static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_006A48[] = dMIZUsin_room_5Tex_006A48;
-
-#define dMIZUsin_room_5Tex_005A48 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_005A48"
-static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_005A48[] = dMIZUsin_room_5Tex_005A48;
-
-#define dMIZUsin_room_5Tex_004A48 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_004A48"
-static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_004A48[] = dMIZUsin_room_5Tex_004A48;
-
-#define dMIZUsin_room_5Tex_006248 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_006248"
-static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_006248[] = dMIZUsin_room_5Tex_006248;
-
-#define dMIZUsin_room_5DL_0008E0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5DL_0008E0"
-static const ALIGN_ASSET(2) char MIZUsin_room_5DL_0008E0[] = dMIZUsin_room_5DL_0008E0;
-
-#define dMIZUsin_room_5Tex_005248 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_005248"
-static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_005248[] = dMIZUsin_room_5Tex_005248;
-
-#define dMIZUsin_room_5DL_009CB0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5DL_009CB0"
-static const ALIGN_ASSET(2) char MIZUsin_room_5DL_009CB0[] = dMIZUsin_room_5DL_009CB0;
-
-#define dMIZUsin_room_5Tex_009E38 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_009E38"
-static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_009E38[] = dMIZUsin_room_5Tex_009E38;
-
-#define dMIZUsin_room_5DL_002610 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5DL_002610"
-static const ALIGN_ASSET(2) char MIZUsin_room_5DL_002610[] = dMIZUsin_room_5DL_002610;
-
-#define dMIZUsin_room_5Tex_009248 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_009248"
-static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_009248[] = dMIZUsin_room_5Tex_009248;
-
-#define dMIZUsin_room_5Tex_008A48 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_008A48"
-static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_008A48[] = dMIZUsin_room_5Tex_008A48;
-
-#define dMIZUsin_room_5Tex_008248 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_008248"
-static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_008248[] = dMIZUsin_room_5Tex_008248;
-
-#define dMIZUsin_room_5Tex_007A48 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_007A48"
-static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_007A48[] = dMIZUsin_room_5Tex_007A48;
-
-#define dMIZUsin_room_5DL_003470 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5DL_003470"
-static const ALIGN_ASSET(2) char MIZUsin_room_5DL_003470[] = dMIZUsin_room_5DL_003470;
-
-#define dMIZUsin_room_5Tex_007248 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_007248"
-static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_007248[] = dMIZUsin_room_5Tex_007248;
-
 #define dMIZUsin_room_5Tex_003A48 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_003A48"
 static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_003A48[] = dMIZUsin_room_5Tex_003A48;
 
 #define dMIZUsin_room_5Tex_004248 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_004248"
 static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_004248[] = dMIZUsin_room_5Tex_004248;
 
+#define dMIZUsin_room_5Tex_004A48 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_004A48"
+static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_004A48[] = dMIZUsin_room_5Tex_004A48;
+
+#define dMIZUsin_room_5Tex_005248 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_005248"
+static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_005248[] = dMIZUsin_room_5Tex_005248;
+
+#define dMIZUsin_room_5Tex_005A48 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_005A48"
+static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_005A48[] = dMIZUsin_room_5Tex_005A48;
+
+#define dMIZUsin_room_5Tex_006248 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_006248"
+static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_006248[] = dMIZUsin_room_5Tex_006248;
+
+#define dMIZUsin_room_5Tex_006A48 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_006A48"
+static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_006A48[] = dMIZUsin_room_5Tex_006A48;
+
+#define dMIZUsin_room_5Tex_007248 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_007248"
+static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_007248[] = dMIZUsin_room_5Tex_007248;
+
+#define dMIZUsin_room_5Tex_007A48 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_007A48"
+static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_007A48[] = dMIZUsin_room_5Tex_007A48;
+
+#define dMIZUsin_room_5Tex_008248 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_008248"
+static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_008248[] = dMIZUsin_room_5Tex_008248;
+
+#define dMIZUsin_room_5Tex_008A48 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_008A48"
+static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_008A48[] = dMIZUsin_room_5Tex_008A48;
+
+#define dMIZUsin_room_5Tex_009248 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_009248"
+static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_009248[] = dMIZUsin_room_5Tex_009248;
+
+#define dMIZUsin_room_5Tex_009E38 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5Tex_009E38"
+static const ALIGN_ASSET(2) char MIZUsin_room_5Tex_009E38[] = dMIZUsin_room_5Tex_009E38;
+
+#define dMIZUsin_room_5DL_0014D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5DL_0014D0"
+static const ALIGN_ASSET(2) char MIZUsin_room_5DL_0014D0[] = dMIZUsin_room_5DL_0014D0;
+
+#define dMIZUsin_room_5DL_0008E0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5DL_0008E0"
+static const ALIGN_ASSET(2) char MIZUsin_room_5DL_0008E0[] = dMIZUsin_room_5DL_0008E0;
+
+#define dMIZUsin_room_5DL_009CB0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5DL_009CB0"
+static const ALIGN_ASSET(2) char MIZUsin_room_5DL_009CB0[] = dMIZUsin_room_5DL_009CB0;
+
+#define dMIZUsin_room_5DL_002610 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5DL_002610"
+static const ALIGN_ASSET(2) char MIZUsin_room_5DL_002610[] = dMIZUsin_room_5DL_002610;
+
+#define dMIZUsin_room_5DL_003470 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5DL_003470"
+static const ALIGN_ASSET(2) char MIZUsin_room_5DL_003470[] = dMIZUsin_room_5DL_003470;
+
 #define dMIZUsin_room_5DL_0004C0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_5DL_0004C0"
 static const ALIGN_ASSET(2) char MIZUsin_room_5DL_0004C0[] = dMIZUsin_room_5DL_0004C0;
 
diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_6.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_6.h
index c0b44487a..f22a4e9cd 100644
--- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_6.h
+++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_6.h
@@ -3,11 +3,35 @@
 
 #include "align_asset_macro.h"
 
-#define dMIZUsin_room_6DL_0047E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6DL_0047E8"
-static const ALIGN_ASSET(2) char MIZUsin_room_6DL_0047E8[] = dMIZUsin_room_6DL_0047E8;
+#define dMIZUsin_room_6Tex_005100 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_005100"
+static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_005100[] = dMIZUsin_room_6Tex_005100;
 
-#define dMIZUsin_room_6DL_002908 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6DL_002908"
-static const ALIGN_ASSET(2) char MIZUsin_room_6DL_002908[] = dMIZUsin_room_6DL_002908;
+#define dMIZUsin_room_6Tex_005300 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_005300"
+static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_005300[] = dMIZUsin_room_6Tex_005300;
+
+#define dMIZUsin_room_6Tex_005B00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_005B00"
+static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_005B00[] = dMIZUsin_room_6Tex_005B00;
+
+#define dMIZUsin_room_6Tex_006300 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_006300"
+static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_006300[] = dMIZUsin_room_6Tex_006300;
+
+#define dMIZUsin_room_6Tex_006500 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_006500"
+static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_006500[] = dMIZUsin_room_6Tex_006500;
+
+#define dMIZUsin_room_6Tex_006700 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_006700"
+static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_006700[] = dMIZUsin_room_6Tex_006700;
+
+#define dMIZUsin_room_6Tex_006900 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_006900"
+static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_006900[] = dMIZUsin_room_6Tex_006900;
+
+#define dMIZUsin_room_6Tex_006B00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_006B00"
+static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_006B00[] = dMIZUsin_room_6Tex_006B00;
+
+#define dMIZUsin_room_6Tex_007300 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_007300"
+static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_007300[] = dMIZUsin_room_6Tex_007300;
+
+#define dMIZUsin_room_6Tex_007B00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_007B00"
+static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_007B00[] = dMIZUsin_room_6Tex_007B00;
 
 #define dMIZUsin_room_6Tex_008300 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_008300"
 static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_008300[] = dMIZUsin_room_6Tex_008300;
@@ -15,57 +39,33 @@ static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_008300[] = dMIZUsin_room_6Tex
 #define dMIZUsin_room_6Tex_008B00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_008B00"
 static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_008B00[] = dMIZUsin_room_6Tex_008B00;
 
+#define dMIZUsin_room_6Tex_009300 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_009300"
+static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_009300[] = dMIZUsin_room_6Tex_009300;
+
+#define dMIZUsin_room_6Tex_009B00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_009B00"
+static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_009B00[] = dMIZUsin_room_6Tex_009B00;
+
 #define dMIZUsin_room_6Tex_00A300 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_00A300"
 static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_00A300[] = dMIZUsin_room_6Tex_00A300;
 
 #define dMIZUsin_room_6Tex_00AB00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_00AB00"
 static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_00AB00[] = dMIZUsin_room_6Tex_00AB00;
 
-#define dMIZUsin_room_6Tex_005300 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_005300"
-static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_005300[] = dMIZUsin_room_6Tex_005300;
+#define dMIZUsin_room_6DL_0047E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6DL_0047E8"
+static const ALIGN_ASSET(2) char MIZUsin_room_6DL_0047E8[] = dMIZUsin_room_6DL_0047E8;
 
-#define dMIZUsin_room_6Tex_007B00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_007B00"
-static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_007B00[] = dMIZUsin_room_6Tex_007B00;
-
-#define dMIZUsin_room_6Tex_007300 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_007300"
-static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_007300[] = dMIZUsin_room_6Tex_007300;
-
-#define dMIZUsin_room_6Tex_009B00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_009B00"
-static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_009B00[] = dMIZUsin_room_6Tex_009B00;
-
-#define dMIZUsin_room_6Tex_009300 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_009300"
-static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_009300[] = dMIZUsin_room_6Tex_009300;
-
-#define dMIZUsin_room_6Tex_005B00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_005B00"
-static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_005B00[] = dMIZUsin_room_6Tex_005B00;
+#define dMIZUsin_room_6DL_002908 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6DL_002908"
+static const ALIGN_ASSET(2) char MIZUsin_room_6DL_002908[] = dMIZUsin_room_6DL_002908;
 
 #define dMIZUsin_room_6DL_0014D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6DL_0014D0"
 static const ALIGN_ASSET(2) char MIZUsin_room_6DL_0014D0[] = dMIZUsin_room_6DL_0014D0;
 
-#define dMIZUsin_room_6Tex_006300 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_006300"
-static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_006300[] = dMIZUsin_room_6Tex_006300;
-
-#define dMIZUsin_room_6Tex_006700 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_006700"
-static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_006700[] = dMIZUsin_room_6Tex_006700;
-
-#define dMIZUsin_room_6Tex_006500 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_006500"
-static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_006500[] = dMIZUsin_room_6Tex_006500;
-
-#define dMIZUsin_room_6Tex_005100 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_005100"
-static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_005100[] = dMIZUsin_room_6Tex_005100;
-
-#define dMIZUsin_room_6Tex_006900 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_006900"
-static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_006900[] = dMIZUsin_room_6Tex_006900;
-
 #define dMIZUsin_room_6DL_003450 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6DL_003450"
 static const ALIGN_ASSET(2) char MIZUsin_room_6DL_003450[] = dMIZUsin_room_6DL_003450;
 
 #define dMIZUsin_room_6DL_003898 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6DL_003898"
 static const ALIGN_ASSET(2) char MIZUsin_room_6DL_003898[] = dMIZUsin_room_6DL_003898;
 
-#define dMIZUsin_room_6Tex_006B00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_006B00"
-static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_006B00[] = dMIZUsin_room_6Tex_006B00;
-
 #define dMIZUsin_room_6DL_003D08 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6DL_003D08"
 static const ALIGN_ASSET(2) char MIZUsin_room_6DL_003D08[] = dMIZUsin_room_6DL_003D08;
 
diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_7.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_7.h
index 88b8e506c..1d35c87c6 100644
--- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_7.h
+++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_7.h
@@ -3,8 +3,17 @@
 
 #include "align_asset_macro.h"
 
-#define dMIZUsin_room_7DL_0014B0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7DL_0014B0"
-static const ALIGN_ASSET(2) char MIZUsin_room_7DL_0014B0[] = dMIZUsin_room_7DL_0014B0;
+#define dMIZUsin_room_7Tex_002560 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7Tex_002560"
+static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_002560[] = dMIZUsin_room_7Tex_002560;
+
+#define dMIZUsin_room_7Tex_002D60 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7Tex_002D60"
+static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_002D60[] = dMIZUsin_room_7Tex_002D60;
+
+#define dMIZUsin_room_7Tex_003560 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7Tex_003560"
+static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_003560[] = dMIZUsin_room_7Tex_003560;
+
+#define dMIZUsin_room_7Tex_003D60 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7Tex_003D60"
+static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_003D60[] = dMIZUsin_room_7Tex_003D60;
 
 #define dMIZUsin_room_7Tex_004560 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7Tex_004560"
 static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_004560[] = dMIZUsin_room_7Tex_004560;
@@ -12,20 +21,11 @@ static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_004560[] = dMIZUsin_room_7Tex
 #define dMIZUsin_room_7Tex_004D60 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7Tex_004D60"
 static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_004D60[] = dMIZUsin_room_7Tex_004D60;
 
-#define dMIZUsin_room_7Tex_003D60 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7Tex_003D60"
-static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_003D60[] = dMIZUsin_room_7Tex_003D60;
-
-#define dMIZUsin_room_7Tex_002560 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7Tex_002560"
-static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_002560[] = dMIZUsin_room_7Tex_002560;
-
-#define dMIZUsin_room_7Tex_003560 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7Tex_003560"
-static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_003560[] = dMIZUsin_room_7Tex_003560;
+#define dMIZUsin_room_7DL_0014B0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7DL_0014B0"
+static const ALIGN_ASSET(2) char MIZUsin_room_7DL_0014B0[] = dMIZUsin_room_7DL_0014B0;
 
 #define dMIZUsin_room_7DL_002440 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7DL_002440"
 static const ALIGN_ASSET(2) char MIZUsin_room_7DL_002440[] = dMIZUsin_room_7DL_002440;
 
-#define dMIZUsin_room_7Tex_002D60 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7Tex_002D60"
-static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_002D60[] = dMIZUsin_room_7Tex_002D60;
-
 
 #endif // DUNGEONS_MIZUSIN_ROOM_7_H
diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_8.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_8.h
index f87f427db..ac1af9f06 100644
--- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_8.h
+++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_8.h
@@ -3,111 +3,111 @@
 
 #include "align_asset_macro.h"
 
+#define dMIZUsin_room_8Tex_005D98 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_005D98"
+static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_005D98[] = dMIZUsin_room_8Tex_005D98;
+
+#define dMIZUsin_room_8Tex_005F98 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_005F98"
+static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_005F98[] = dMIZUsin_room_8Tex_005F98;
+
+#define dMIZUsin_room_8Tex_006198 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_006198"
+static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_006198[] = dMIZUsin_room_8Tex_006198;
+
+#define dMIZUsin_room_8Tex_006998 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_006998"
+static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_006998[] = dMIZUsin_room_8Tex_006998;
+
+#define dMIZUsin_room_8Tex_007198 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_007198"
+static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_007198[] = dMIZUsin_room_8Tex_007198;
+
+#define dMIZUsin_room_8Tex_007398 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_007398"
+static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_007398[] = dMIZUsin_room_8Tex_007398;
+
+#define dMIZUsin_room_8Tex_007598 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_007598"
+static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_007598[] = dMIZUsin_room_8Tex_007598;
+
+#define dMIZUsin_room_8Tex_007D98 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_007D98"
+static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_007D98[] = dMIZUsin_room_8Tex_007D98;
+
+#define dMIZUsin_room_8Tex_008598 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_008598"
+static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_008598[] = dMIZUsin_room_8Tex_008598;
+
+#define dMIZUsin_room_8Tex_008D98 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_008D98"
+static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_008D98[] = dMIZUsin_room_8Tex_008D98;
+
+#define dMIZUsin_room_8Tex_009598 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_009598"
+static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_009598[] = dMIZUsin_room_8Tex_009598;
+
+#define dMIZUsin_room_8Tex_009D98 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_009D98"
+static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_009D98[] = dMIZUsin_room_8Tex_009D98;
+
+#define dMIZUsin_room_8Tex_00A598 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_00A598"
+static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_00A598[] = dMIZUsin_room_8Tex_00A598;
+
+#define dMIZUsin_room_8Tex_00AD98 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_00AD98"
+static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_00AD98[] = dMIZUsin_room_8Tex_00AD98;
+
+#define dMIZUsin_room_8Tex_00B598 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_00B598"
+static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_00B598[] = dMIZUsin_room_8Tex_00B598;
+
+#define dMIZUsin_room_8Tex_00BD98 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_00BD98"
+static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_00BD98[] = dMIZUsin_room_8Tex_00BD98;
+
+#define dMIZUsin_room_8Tex_00C598 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_00C598"
+static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_00C598[] = dMIZUsin_room_8Tex_00C598;
+
+#define dMIZUsin_room_8Tex_00D578 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_00D578"
+static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_00D578[] = dMIZUsin_room_8Tex_00D578;
+
 #define dMIZUsin_room_8DL_001398 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_001398"
 static const ALIGN_ASSET(2) char MIZUsin_room_8DL_001398[] = dMIZUsin_room_8DL_001398;
 
 #define dMIZUsin_room_8DL_004E40 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_004E40"
 static const ALIGN_ASSET(2) char MIZUsin_room_8DL_004E40[] = dMIZUsin_room_8DL_004E40;
 
-#define dMIZUsin_room_8Tex_00B598 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_00B598"
-static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_00B598[] = dMIZUsin_room_8Tex_00B598;
-
-#define dMIZUsin_room_8Tex_00AD98 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_00AD98"
-static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_00AD98[] = dMIZUsin_room_8Tex_00AD98;
-
-#define dMIZUsin_room_8Tex_00C598 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_00C598"
-static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_00C598[] = dMIZUsin_room_8Tex_00C598;
-
-#define dMIZUsin_room_8Tex_00BD98 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_00BD98"
-static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_00BD98[] = dMIZUsin_room_8Tex_00BD98;
-
-#define dMIZUsin_room_8Tex_007598 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_007598"
-static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_007598[] = dMIZUsin_room_8Tex_007598;
-
 #define dMIZUsin_room_8DL_000DB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_000DB8"
 static const ALIGN_ASSET(2) char MIZUsin_room_8DL_000DB8[] = dMIZUsin_room_8DL_000DB8;
 
-#define dMIZUsin_room_8Tex_006998 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_006998"
-static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_006998[] = dMIZUsin_room_8Tex_006998;
-
 #define dMIZUsin_room_8DL_003008 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_003008"
 static const ALIGN_ASSET(2) char MIZUsin_room_8DL_003008[] = dMIZUsin_room_8DL_003008;
 
-#define dMIZUsin_room_8Tex_009598 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_009598"
-static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_009598[] = dMIZUsin_room_8Tex_009598;
-
 #define dMIZUsin_room_8DL_0025F0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_0025F0"
 static const ALIGN_ASSET(2) char MIZUsin_room_8DL_0025F0[] = dMIZUsin_room_8DL_0025F0;
 
-#define dMIZUsin_room_8Tex_006198 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_006198"
-static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_006198[] = dMIZUsin_room_8Tex_006198;
-
 #define dMIZUsin_room_8DL_00D0A0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_00D0A0"
 static const ALIGN_ASSET(2) char MIZUsin_room_8DL_00D0A0[] = dMIZUsin_room_8DL_00D0A0;
 
-#define dMIZUsin_room_8Tex_00D578 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_00D578"
-static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_00D578[] = dMIZUsin_room_8Tex_00D578;
-
 #define dMIZUsin_room_8DL_00CED0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_00CED0"
 static const ALIGN_ASSET(2) char MIZUsin_room_8DL_00CED0[] = dMIZUsin_room_8DL_00CED0;
 
 #define dMIZUsin_room_8DL_000740 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_000740"
 static const ALIGN_ASSET(2) char MIZUsin_room_8DL_000740[] = dMIZUsin_room_8DL_000740;
 
-#define dMIZUsin_room_8Tex_008598 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_008598"
-static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_008598[] = dMIZUsin_room_8Tex_008598;
-
 #define dMIZUsin_room_8DL_003968 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_003968"
 static const ALIGN_ASSET(2) char MIZUsin_room_8DL_003968[] = dMIZUsin_room_8DL_003968;
 
-#define dMIZUsin_room_8Tex_007198 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_007198"
-static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_007198[] = dMIZUsin_room_8Tex_007198;
-
 #define dMIZUsin_room_8DL_003B70 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_003B70"
 static const ALIGN_ASSET(2) char MIZUsin_room_8DL_003B70[] = dMIZUsin_room_8DL_003B70;
 
-#define dMIZUsin_room_8Tex_005F98 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_005F98"
-static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_005F98[] = dMIZUsin_room_8Tex_005F98;
-
 #define dMIZUsin_room_8DL_0036C8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_0036C8"
 static const ALIGN_ASSET(2) char MIZUsin_room_8DL_0036C8[] = dMIZUsin_room_8DL_0036C8;
 
-#define dMIZUsin_room_8Tex_007398 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_007398"
-static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_007398[] = dMIZUsin_room_8Tex_007398;
-
 #define dMIZUsin_room_8DL_0020E0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_0020E0"
 static const ALIGN_ASSET(2) char MIZUsin_room_8DL_0020E0[] = dMIZUsin_room_8DL_0020E0;
 
-#define dMIZUsin_room_8Tex_005D98 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_005D98"
-static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_005D98[] = dMIZUsin_room_8Tex_005D98;
-
 #define dMIZUsin_room_8DL_003F58 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_003F58"
 static const ALIGN_ASSET(2) char MIZUsin_room_8DL_003F58[] = dMIZUsin_room_8DL_003F58;
 
-#define dMIZUsin_room_8Tex_009D98 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_009D98"
-static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_009D98[] = dMIZUsin_room_8Tex_009D98;
-
 #define dMIZUsin_room_8DL_00D408 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_00D408"
 static const ALIGN_ASSET(2) char MIZUsin_room_8DL_00D408[] = dMIZUsin_room_8DL_00D408;
 
 #define dMIZUsin_room_8DL_005C00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_005C00"
 static const ALIGN_ASSET(2) char MIZUsin_room_8DL_005C00[] = dMIZUsin_room_8DL_005C00;
 
-#define dMIZUsin_room_8Tex_008D98 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_008D98"
-static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_008D98[] = dMIZUsin_room_8Tex_008D98;
-
 #define dMIZUsin_room_8DL_000A78 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_000A78"
 static const ALIGN_ASSET(2) char MIZUsin_room_8DL_000A78[] = dMIZUsin_room_8DL_000A78;
 
-#define dMIZUsin_room_8Tex_00A598 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_00A598"
-static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_00A598[] = dMIZUsin_room_8Tex_00A598;
-
 #define dMIZUsin_room_8DL_003D40 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_003D40"
 static const ALIGN_ASSET(2) char MIZUsin_room_8DL_003D40[] = dMIZUsin_room_8DL_003D40;
 
-#define dMIZUsin_room_8Tex_007D98 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8Tex_007D98"
-static const ALIGN_ASSET(2) char MIZUsin_room_8Tex_007D98[] = dMIZUsin_room_8Tex_007D98;
-
 #define dMIZUsin_room_8DL_002C68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_8DL_002C68"
 static const ALIGN_ASSET(2) char MIZUsin_room_8DL_002C68[] = dMIZUsin_room_8DL_002C68;
 
diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_9.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_9.h
index b41725882..190143a9e 100644
--- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_9.h
+++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_9.h
@@ -3,45 +3,45 @@
 
 #include "align_asset_macro.h"
 
+#define dMIZUsin_room_9Tex_0036D8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_0036D8"
+static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_0036D8[] = dMIZUsin_room_9Tex_0036D8;
+
+#define dMIZUsin_room_9Tex_003ED8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_003ED8"
+static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_003ED8[] = dMIZUsin_room_9Tex_003ED8;
+
+#define dMIZUsin_room_9Tex_0046D8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_0046D8"
+static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_0046D8[] = dMIZUsin_room_9Tex_0046D8;
+
+#define dMIZUsin_room_9Tex_004ED8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_004ED8"
+static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_004ED8[] = dMIZUsin_room_9Tex_004ED8;
+
+#define dMIZUsin_room_9Tex_0056D8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_0056D8"
+static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_0056D8[] = dMIZUsin_room_9Tex_0056D8;
+
+#define dMIZUsin_room_9Tex_005ED8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_005ED8"
+static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_005ED8[] = dMIZUsin_room_9Tex_005ED8;
+
+#define dMIZUsin_room_9Tex_0066D8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_0066D8"
+static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_0066D8[] = dMIZUsin_room_9Tex_0066D8;
+
+#define dMIZUsin_room_9Tex_006ED8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_006ED8"
+static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_006ED8[] = dMIZUsin_room_9Tex_006ED8;
+
+#define dMIZUsin_room_9Tex_0078A8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_0078A8"
+static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_0078A8[] = dMIZUsin_room_9Tex_0078A8;
+
 #define dMIZUsin_room_9DL_002E20 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9DL_002E20"
 static const ALIGN_ASSET(2) char MIZUsin_room_9DL_002E20[] = dMIZUsin_room_9DL_002E20;
 
 #define dMIZUsin_room_9DL_001890 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9DL_001890"
 static const ALIGN_ASSET(2) char MIZUsin_room_9DL_001890[] = dMIZUsin_room_9DL_001890;
 
-#define dMIZUsin_room_9Tex_005ED8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_005ED8"
-static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_005ED8[] = dMIZUsin_room_9Tex_005ED8;
-
-#define dMIZUsin_room_9Tex_0056D8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_0056D8"
-static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_0056D8[] = dMIZUsin_room_9Tex_0056D8;
-
-#define dMIZUsin_room_9Tex_0046D8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_0046D8"
-static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_0046D8[] = dMIZUsin_room_9Tex_0046D8;
-
-#define dMIZUsin_room_9Tex_003ED8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_003ED8"
-static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_003ED8[] = dMIZUsin_room_9Tex_003ED8;
-
-#define dMIZUsin_room_9Tex_004ED8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_004ED8"
-static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_004ED8[] = dMIZUsin_room_9Tex_004ED8;
-
-#define dMIZUsin_room_9Tex_006ED8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_006ED8"
-static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_006ED8[] = dMIZUsin_room_9Tex_006ED8;
-
-#define dMIZUsin_room_9Tex_0066D8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_0066D8"
-static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_0066D8[] = dMIZUsin_room_9Tex_0066D8;
-
 #define dMIZUsin_room_9DL_0077A0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9DL_0077A0"
 static const ALIGN_ASSET(2) char MIZUsin_room_9DL_0077A0[] = dMIZUsin_room_9DL_0077A0;
 
-#define dMIZUsin_room_9Tex_0078A8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_0078A8"
-static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_0078A8[] = dMIZUsin_room_9Tex_0078A8;
-
 #define dMIZUsin_room_9DL_0035F0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9DL_0035F0"
 static const ALIGN_ASSET(2) char MIZUsin_room_9DL_0035F0[] = dMIZUsin_room_9DL_0035F0;
 
-#define dMIZUsin_room_9Tex_0036D8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9Tex_0036D8"
-static const ALIGN_ASSET(2) char MIZUsin_room_9Tex_0036D8[] = dMIZUsin_room_9Tex_0036D8;
-
 #define dMIZUsin_room_9DL_0030C0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_9DL_0030C0"
 static const ALIGN_ASSET(2) char MIZUsin_room_9DL_0030C0[] = dMIZUsin_room_9DL_0030C0;
 
diff --git a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_scene.h b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_scene.h
index 24897ddec..3b75e49be 100644
--- a/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_scene.h
+++ b/soh/assets/scenes/dungeons/MIZUsin/MIZUsin_scene.h
@@ -3,6 +3,15 @@
 
 #include "align_asset_macro.h"
 
+#define dMIZUsin_sceneTex_013C30 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_sceneTex_013C30"
+static const ALIGN_ASSET(2) char MIZUsin_sceneTex_013C30[] = dMIZUsin_sceneTex_013C30;
+
+#define dMIZUsin_sceneTex_014430 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_sceneTex_014430"
+static const ALIGN_ASSET(2) char MIZUsin_sceneTex_014430[] = dMIZUsin_sceneTex_014430;
+
+#define dMIZUsin_sceneTex_015030 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_sceneTex_015030"
+static const ALIGN_ASSET(2) char MIZUsin_sceneTex_015030[] = dMIZUsin_sceneTex_015030;
+
 #define dgWaterTempleDayEntranceTex "__OTR__scenes/nonmq/MIZUsin_scene/gWaterTempleDayEntranceTex"
 static const ALIGN_ASSET(2) char gWaterTempleDayEntranceTex[] = dgWaterTempleDayEntranceTex;
 
@@ -12,13 +21,5 @@ static const ALIGN_ASSET(2) char gWaterTempleNightEntranceTex[] = dgWaterTempleN
 #define dMIZUsin_sceneCollisionHeader_013C04 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_sceneCollisionHeader_013C04"
 static const ALIGN_ASSET(2) char MIZUsin_sceneCollisionHeader_013C04[] = dMIZUsin_sceneCollisionHeader_013C04;
 
-#define dMIZUsin_sceneTex_014430 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_sceneTex_014430"
-static const ALIGN_ASSET(2) char MIZUsin_sceneTex_014430[] = dMIZUsin_sceneTex_014430;
-
-#define dMIZUsin_sceneTex_013C30 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_sceneTex_013C30"
-static const ALIGN_ASSET(2) char MIZUsin_sceneTex_013C30[] = dMIZUsin_sceneTex_013C30;
-
-#define dMIZUsin_sceneTex_015030 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_sceneTex_015030"
-static const ALIGN_ASSET(2) char MIZUsin_sceneTex_015030[] = dMIZUsin_sceneTex_015030;
 
 #endif // DUNGEONS_MIZUSIN_SCENE_H
diff --git a/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_0.h b/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_0.h
index 3a57019b7..5f43bea60 100644
--- a/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_0.h
+++ b/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_0.h
@@ -3,26 +3,26 @@
 
 #include "align_asset_macro.h"
 
-#define dMIZUsin_bs_room_0DL_001460 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_0DL_001460"
-static const ALIGN_ASSET(2) char MIZUsin_bs_room_0DL_001460[] = dMIZUsin_bs_room_0DL_001460;
+#define dMIZUsin_bs_room_0Tex_001470 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_0Tex_001470"
+static const ALIGN_ASSET(2) char MIZUsin_bs_room_0Tex_001470[] = dMIZUsin_bs_room_0Tex_001470;
 
-#define dMIZUsin_bs_room_0Tex_003C70 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_0Tex_003C70"
-static const ALIGN_ASSET(2) char MIZUsin_bs_room_0Tex_003C70[] = dMIZUsin_bs_room_0Tex_003C70;
-
-#define dMIZUsin_bs_room_0Tex_003470 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_0Tex_003470"
-static const ALIGN_ASSET(2) char MIZUsin_bs_room_0Tex_003470[] = dMIZUsin_bs_room_0Tex_003470;
-
-#define dMIZUsin_bs_room_0Tex_002C70 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_0Tex_002C70"
-static const ALIGN_ASSET(2) char MIZUsin_bs_room_0Tex_002C70[] = dMIZUsin_bs_room_0Tex_002C70;
-
-#define dMIZUsin_bs_room_0Tex_002470 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_0Tex_002470"
-static const ALIGN_ASSET(2) char MIZUsin_bs_room_0Tex_002470[] = dMIZUsin_bs_room_0Tex_002470;
-
-#define dMIZUsin_bs_room_0Tex_001C70 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_0Tex_001C70"
+#define dMIZUsin_bs_room_0Tex_001C70 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_0Tex_001C70"
 static const ALIGN_ASSET(2) char MIZUsin_bs_room_0Tex_001C70[] = dMIZUsin_bs_room_0Tex_001C70;
 
-#define dMIZUsin_bs_room_0Tex_001470 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_0Tex_001470"
-static const ALIGN_ASSET(2) char MIZUsin_bs_room_0Tex_001470[] = dMIZUsin_bs_room_0Tex_001470;
+#define dMIZUsin_bs_room_0Tex_002470 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_0Tex_002470"
+static const ALIGN_ASSET(2) char MIZUsin_bs_room_0Tex_002470[] = dMIZUsin_bs_room_0Tex_002470;
+
+#define dMIZUsin_bs_room_0Tex_002C70 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_0Tex_002C70"
+static const ALIGN_ASSET(2) char MIZUsin_bs_room_0Tex_002C70[] = dMIZUsin_bs_room_0Tex_002C70;
+
+#define dMIZUsin_bs_room_0Tex_003470 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_0Tex_003470"
+static const ALIGN_ASSET(2) char MIZUsin_bs_room_0Tex_003470[] = dMIZUsin_bs_room_0Tex_003470;
+
+#define dMIZUsin_bs_room_0Tex_003C70 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_0Tex_003C70"
+static const ALIGN_ASSET(2) char MIZUsin_bs_room_0Tex_003C70[] = dMIZUsin_bs_room_0Tex_003C70;
+
+#define dMIZUsin_bs_room_0DL_001460 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_0DL_001460"
+static const ALIGN_ASSET(2) char MIZUsin_bs_room_0DL_001460[] = dMIZUsin_bs_room_0DL_001460;
 
 
 #endif // DUNGEONS_MIZUSIN_BS_ROOM_0_H
diff --git a/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_1.h b/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_1.h
index a7861cb5e..0237e15c3 100644
--- a/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_1.h
+++ b/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_1.h
@@ -3,44 +3,44 @@
 
 #include "align_asset_macro.h"
 
-#define dMIZUsin_bs_room_1DL_005688 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_1DL_005688"
-static const ALIGN_ASSET(2) char MIZUsin_bs_room_1DL_005688[] = dMIZUsin_bs_room_1DL_005688;
-
-#define dMIZUsin_bs_room_1Tex_0056E8 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_0056E8"
+#define dMIZUsin_bs_room_1Tex_0056E8 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_0056E8"
 static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_0056E8[] = dMIZUsin_bs_room_1Tex_0056E8;
 
-#define dMIZUsin_bs_room_1Tex_005EE8 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_005EE8"
+#define dMIZUsin_bs_room_1Tex_005EE8 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_005EE8"
 static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_005EE8[] = dMIZUsin_bs_room_1Tex_005EE8;
 
-#define dMIZUsin_bs_room_1Tex_007EE8 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_007EE8"
-static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_007EE8[] = dMIZUsin_bs_room_1Tex_007EE8;
-
-#define dMIZUsin_bs_room_1Tex_00A2E8 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_00A2E8"
-static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_00A2E8[] = dMIZUsin_bs_room_1Tex_00A2E8;
-
-#define dMIZUsin_bs_room_1Tex_0086E8 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_0086E8"
-static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_0086E8[] = dMIZUsin_bs_room_1Tex_0086E8;
-
-#define dMIZUsin_bs_room_1Tex_0076E8 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_0076E8"
-static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_0076E8[] = dMIZUsin_bs_room_1Tex_0076E8;
-
-#define dMIZUsin_bs_room_1Tex_006EE8 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_006EE8"
-static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_006EE8[] = dMIZUsin_bs_room_1Tex_006EE8;
-
-#define dMIZUsin_bs_room_1Tex_0066E8 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_0066E8"
+#define dMIZUsin_bs_room_1Tex_0066E8 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_0066E8"
 static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_0066E8[] = dMIZUsin_bs_room_1Tex_0066E8;
 
-#define dMIZUsin_bs_room_1Tex_0092E8 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_0092E8"
+#define dMIZUsin_bs_room_1Tex_006EE8 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_006EE8"
+static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_006EE8[] = dMIZUsin_bs_room_1Tex_006EE8;
+
+#define dMIZUsin_bs_room_1Tex_0076E8 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_0076E8"
+static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_0076E8[] = dMIZUsin_bs_room_1Tex_0076E8;
+
+#define dMIZUsin_bs_room_1Tex_007EE8 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_007EE8"
+static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_007EE8[] = dMIZUsin_bs_room_1Tex_007EE8;
+
+#define dMIZUsin_bs_room_1Tex_0086E8 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_0086E8"
+static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_0086E8[] = dMIZUsin_bs_room_1Tex_0086E8;
+
+#define dMIZUsin_bs_room_1Tex_008EE8 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_008EE8"
+static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_008EE8[] = dMIZUsin_bs_room_1Tex_008EE8;
+
+#define dMIZUsin_bs_room_1Tex_0092E8 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_0092E8"
 static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_0092E8[] = dMIZUsin_bs_room_1Tex_0092E8;
 
-#define dMIZUsin_bs_room_1Tex_009AE8 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_009AE8"
+#define dMIZUsin_bs_room_1Tex_009AE8 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_009AE8"
 static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_009AE8[] = dMIZUsin_bs_room_1Tex_009AE8;
 
-#define dMIZUsin_bs_room_1Tex_00AAE8 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_00AAE8"
+#define dMIZUsin_bs_room_1Tex_00A2E8 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_00A2E8"
+static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_00A2E8[] = dMIZUsin_bs_room_1Tex_00A2E8;
+
+#define dMIZUsin_bs_room_1Tex_00AAE8 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_00AAE8"
 static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_00AAE8[] = dMIZUsin_bs_room_1Tex_00AAE8;
 
-#define dMIZUsin_bs_room_1Tex_008EE8 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_room_1Tex_008EE8"
-static const ALIGN_ASSET(2) char MIZUsin_bs_room_1Tex_008EE8[] = dMIZUsin_bs_room_1Tex_008EE8;
+#define dMIZUsin_bs_room_1DL_005688 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_room_1DL_005688"
+static const ALIGN_ASSET(2) char MIZUsin_bs_room_1DL_005688[] = dMIZUsin_bs_room_1DL_005688;
 
 
 #endif // DUNGEONS_MIZUSIN_BS_ROOM_1_H
diff --git a/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_scene.h b/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_scene.h
index f045c3662..eef5bfed6 100644
--- a/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_scene.h
+++ b/soh/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dMIZUsin_bs_sceneCollisionHeader_001A34 "__OTR__scenes/nonmq/MIZUsin_bs_scene/MIZUsin_bs_sceneCollisionHeader_001A34"
+#define dMIZUsin_bs_sceneCollisionHeader_001A34 "__OTR__scenes/shared/MIZUsin_bs_scene/MIZUsin_bs_sceneCollisionHeader_001A34"
 static const ALIGN_ASSET(2) char MIZUsin_bs_sceneCollisionHeader_001A34[] = dMIZUsin_bs_sceneCollisionHeader_001A34;
 
 
diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_0.h b/soh/assets/scenes/dungeons/bdan/bdan_room_0.h
index 162472187..4cb2ded23 100644
--- a/soh/assets/scenes/dungeons/bdan/bdan_room_0.h
+++ b/soh/assets/scenes/dungeons/bdan/bdan_room_0.h
@@ -3,9 +3,6 @@
 
 #include "align_asset_macro.h"
 
-#define dbdan_room_0DL_002DA8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_0DL_002DA8"
-static const ALIGN_ASSET(2) char bdan_room_0DL_002DA8[] = dbdan_room_0DL_002DA8;
-
 #define dbdan_room_0Tex_002DB8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_0Tex_002DB8"
 static const ALIGN_ASSET(2) char bdan_room_0Tex_002DB8[] = dbdan_room_0Tex_002DB8;
 
@@ -15,6 +12,9 @@ static const ALIGN_ASSET(2) char bdan_room_0Tex_0031B8[] = dbdan_room_0Tex_0031B
 #define dbdan_room_0Tex_0039B8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_0Tex_0039B8"
 static const ALIGN_ASSET(2) char bdan_room_0Tex_0039B8[] = dbdan_room_0Tex_0039B8;
 
+#define dbdan_room_0DL_002DA8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_0DL_002DA8"
+static const ALIGN_ASSET(2) char bdan_room_0DL_002DA8[] = dbdan_room_0DL_002DA8;
+
 #define dbdan_room_0DL_004130 "__OTR__scenes/nonmq/bdan_scene/bdan_room_0DL_004130"
 static const ALIGN_ASSET(2) char bdan_room_0DL_004130[] = dbdan_room_0DL_004130;
 
diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_1.h b/soh/assets/scenes/dungeons/bdan/bdan_room_1.h
index 33c707378..801fc8e94 100644
--- a/soh/assets/scenes/dungeons/bdan/bdan_room_1.h
+++ b/soh/assets/scenes/dungeons/bdan/bdan_room_1.h
@@ -3,15 +3,15 @@
 
 #include "align_asset_macro.h"
 
-#define dbdan_room_1DL_004DF0 "__OTR__scenes/nonmq/bdan_scene/bdan_room_1DL_004DF0"
-static const ALIGN_ASSET(2) char bdan_room_1DL_004DF0[] = dbdan_room_1DL_004DF0;
-
 #define dbdan_room_1Tex_004E00 "__OTR__scenes/nonmq/bdan_scene/bdan_room_1Tex_004E00"
 static const ALIGN_ASSET(2) char bdan_room_1Tex_004E00[] = dbdan_room_1Tex_004E00;
 
 #define dbdan_room_1Tex_005600 "__OTR__scenes/nonmq/bdan_scene/bdan_room_1Tex_005600"
 static const ALIGN_ASSET(2) char bdan_room_1Tex_005600[] = dbdan_room_1Tex_005600;
 
+#define dbdan_room_1DL_004DF0 "__OTR__scenes/nonmq/bdan_scene/bdan_room_1DL_004DF0"
+static const ALIGN_ASSET(2) char bdan_room_1DL_004DF0[] = dbdan_room_1DL_004DF0;
+
 #define dbdan_room_1DL_005FA8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_1DL_005FA8"
 static const ALIGN_ASSET(2) char bdan_room_1DL_005FA8[] = dbdan_room_1DL_005FA8;
 
diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_12.h b/soh/assets/scenes/dungeons/bdan/bdan_room_12.h
index f9bf57419..3a3e95e94 100644
--- a/soh/assets/scenes/dungeons/bdan/bdan_room_12.h
+++ b/soh/assets/scenes/dungeons/bdan/bdan_room_12.h
@@ -3,12 +3,12 @@
 
 #include "align_asset_macro.h"
 
-#define dbdan_room_12DL_003848 "__OTR__scenes/nonmq/bdan_scene/bdan_room_12DL_003848"
-static const ALIGN_ASSET(2) char bdan_room_12DL_003848[] = dbdan_room_12DL_003848;
-
 #define dbdan_room_12Tex_0038E0 "__OTR__scenes/nonmq/bdan_scene/bdan_room_12Tex_0038E0"
 static const ALIGN_ASSET(2) char bdan_room_12Tex_0038E0[] = dbdan_room_12Tex_0038E0;
 
+#define dbdan_room_12DL_003848 "__OTR__scenes/nonmq/bdan_scene/bdan_room_12DL_003848"
+static const ALIGN_ASSET(2) char bdan_room_12DL_003848[] = dbdan_room_12DL_003848;
+
 #define dbdan_room_12Set_000150DL_003848 "__OTR__scenes/nonmq/bdan_scene/bdan_room_12Set_000150DL_003848"
 static const ALIGN_ASSET(2) char bdan_room_12Set_000150DL_003848[] = dbdan_room_12Set_000150DL_003848;
 
diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_13.h b/soh/assets/scenes/dungeons/bdan/bdan_room_13.h
index 8b555a2c8..4c278c578 100644
--- a/soh/assets/scenes/dungeons/bdan/bdan_room_13.h
+++ b/soh/assets/scenes/dungeons/bdan/bdan_room_13.h
@@ -3,17 +3,17 @@
 
 #include "align_asset_macro.h"
 
-#define dbdan_room_13DL_0015A8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_13DL_0015A8"
-static const ALIGN_ASSET(2) char bdan_room_13DL_0015A8[] = dbdan_room_13DL_0015A8;
-
 #define dbdan_room_13Tex_0015B8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_13Tex_0015B8"
 static const ALIGN_ASSET(2) char bdan_room_13Tex_0015B8[] = dbdan_room_13Tex_0015B8;
 
+#define dbdan_room_13Tex_001DB8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_13Tex_001DB8"
+static const ALIGN_ASSET(2) char bdan_room_13Tex_001DB8[] = dbdan_room_13Tex_001DB8;
+
 #define dbdan_room_13Tex_0021B8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_13Tex_0021B8"
 static const ALIGN_ASSET(2) char bdan_room_13Tex_0021B8[] = dbdan_room_13Tex_0021B8;
 
-#define dbdan_room_13Tex_001DB8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_13Tex_001DB8"
-static const ALIGN_ASSET(2) char bdan_room_13Tex_001DB8[] = dbdan_room_13Tex_001DB8;
+#define dbdan_room_13DL_0015A8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_13DL_0015A8"
+static const ALIGN_ASSET(2) char bdan_room_13DL_0015A8[] = dbdan_room_13DL_0015A8;
 
 #define dbdan_room_13DL_002B68 "__OTR__scenes/nonmq/bdan_scene/bdan_room_13DL_002B68"
 static const ALIGN_ASSET(2) char bdan_room_13DL_002B68[] = dbdan_room_13DL_002B68;
diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_14.h b/soh/assets/scenes/dungeons/bdan/bdan_room_14.h
index ca44e1126..f2d04b56e 100644
--- a/soh/assets/scenes/dungeons/bdan/bdan_room_14.h
+++ b/soh/assets/scenes/dungeons/bdan/bdan_room_14.h
@@ -3,8 +3,11 @@
 
 #include "align_asset_macro.h"
 
-#define dbdan_room_14DL_0045B8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_14DL_0045B8"
-static const ALIGN_ASSET(2) char bdan_room_14DL_0045B8[] = dbdan_room_14DL_0045B8;
+#define dbdan_room_14Tex_0045C8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_14Tex_0045C8"
+static const ALIGN_ASSET(2) char bdan_room_14Tex_0045C8[] = dbdan_room_14Tex_0045C8;
+
+#define dbdan_room_14Tex_004DC8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_14Tex_004DC8"
+static const ALIGN_ASSET(2) char bdan_room_14Tex_004DC8[] = dbdan_room_14Tex_004DC8;
 
 #define dbdan_room_14Tex_0055C8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_14Tex_0055C8"
 static const ALIGN_ASSET(2) char bdan_room_14Tex_0055C8[] = dbdan_room_14Tex_0055C8;
@@ -12,11 +15,8 @@ static const ALIGN_ASSET(2) char bdan_room_14Tex_0055C8[] = dbdan_room_14Tex_005
 #define dbdan_room_14Tex_0059C8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_14Tex_0059C8"
 static const ALIGN_ASSET(2) char bdan_room_14Tex_0059C8[] = dbdan_room_14Tex_0059C8;
 
-#define dbdan_room_14Tex_004DC8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_14Tex_004DC8"
-static const ALIGN_ASSET(2) char bdan_room_14Tex_004DC8[] = dbdan_room_14Tex_004DC8;
-
-#define dbdan_room_14Tex_0045C8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_14Tex_0045C8"
-static const ALIGN_ASSET(2) char bdan_room_14Tex_0045C8[] = dbdan_room_14Tex_0045C8;
+#define dbdan_room_14DL_0045B8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_14DL_0045B8"
+static const ALIGN_ASSET(2) char bdan_room_14DL_0045B8[] = dbdan_room_14DL_0045B8;
 
 #define dbdan_room_14Set_000190DL_0045B8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_14Set_000190DL_0045B8"
 static const ALIGN_ASSET(2) char bdan_room_14Set_000190DL_0045B8[] = dbdan_room_14Set_000190DL_0045B8;
diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_2.h b/soh/assets/scenes/dungeons/bdan/bdan_room_2.h
index 6e4f5c072..0c42ff9d8 100644
--- a/soh/assets/scenes/dungeons/bdan/bdan_room_2.h
+++ b/soh/assets/scenes/dungeons/bdan/bdan_room_2.h
@@ -3,11 +3,8 @@
 
 #include "align_asset_macro.h"
 
-#define dbdan_room_2DL_006DD8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_2DL_006DD8"
-static const ALIGN_ASSET(2) char bdan_room_2DL_006DD8[] = dbdan_room_2DL_006DD8;
-
-#define dbdan_room_2Tex_008E38 "__OTR__scenes/nonmq/bdan_scene/bdan_room_2Tex_008E38"
-static const ALIGN_ASSET(2) char bdan_room_2Tex_008E38[] = dbdan_room_2Tex_008E38;
+#define dbdan_room_2Tex_006E38 "__OTR__scenes/nonmq/bdan_scene/bdan_room_2Tex_006E38"
+static const ALIGN_ASSET(2) char bdan_room_2Tex_006E38[] = dbdan_room_2Tex_006E38;
 
 #define dbdan_room_2Tex_007E38 "__OTR__scenes/nonmq/bdan_scene/bdan_room_2Tex_007E38"
 static const ALIGN_ASSET(2) char bdan_room_2Tex_007E38[] = dbdan_room_2Tex_007E38;
@@ -15,8 +12,11 @@ static const ALIGN_ASSET(2) char bdan_room_2Tex_007E38[] = dbdan_room_2Tex_007E3
 #define dbdan_room_2Tex_008638 "__OTR__scenes/nonmq/bdan_scene/bdan_room_2Tex_008638"
 static const ALIGN_ASSET(2) char bdan_room_2Tex_008638[] = dbdan_room_2Tex_008638;
 
-#define dbdan_room_2Tex_006E38 "__OTR__scenes/nonmq/bdan_scene/bdan_room_2Tex_006E38"
-static const ALIGN_ASSET(2) char bdan_room_2Tex_006E38[] = dbdan_room_2Tex_006E38;
+#define dbdan_room_2Tex_008E38 "__OTR__scenes/nonmq/bdan_scene/bdan_room_2Tex_008E38"
+static const ALIGN_ASSET(2) char bdan_room_2Tex_008E38[] = dbdan_room_2Tex_008E38;
+
+#define dbdan_room_2DL_006DD8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_2DL_006DD8"
+static const ALIGN_ASSET(2) char bdan_room_2DL_006DD8[] = dbdan_room_2DL_006DD8;
 
 #define dbdan_room_2Set_000180DL_006DD8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_2Set_000180DL_006DD8"
 static const ALIGN_ASSET(2) char bdan_room_2Set_000180DL_006DD8[] = dbdan_room_2Set_000180DL_006DD8;
diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_3.h b/soh/assets/scenes/dungeons/bdan/bdan_room_3.h
index 49e4d32a9..9bca1fb3b 100644
--- a/soh/assets/scenes/dungeons/bdan/bdan_room_3.h
+++ b/soh/assets/scenes/dungeons/bdan/bdan_room_3.h
@@ -3,23 +3,23 @@
 
 #include "align_asset_macro.h"
 
-#define dbdan_room_3DL_004858 "__OTR__scenes/nonmq/bdan_scene/bdan_room_3DL_004858"
-static const ALIGN_ASSET(2) char bdan_room_3DL_004858[] = dbdan_room_3DL_004858;
+#define dbdan_room_3Tex_004888 "__OTR__scenes/nonmq/bdan_scene/bdan_room_3Tex_004888"
+static const ALIGN_ASSET(2) char bdan_room_3Tex_004888[] = dbdan_room_3Tex_004888;
 
 #define dbdan_room_3Tex_005888 "__OTR__scenes/nonmq/bdan_scene/bdan_room_3Tex_005888"
 static const ALIGN_ASSET(2) char bdan_room_3Tex_005888[] = dbdan_room_3Tex_005888;
 
-#define dbdan_room_3Tex_006488 "__OTR__scenes/nonmq/bdan_scene/bdan_room_3Tex_006488"
-static const ALIGN_ASSET(2) char bdan_room_3Tex_006488[] = dbdan_room_3Tex_006488;
-
 #define dbdan_room_3Tex_006088 "__OTR__scenes/nonmq/bdan_scene/bdan_room_3Tex_006088"
 static const ALIGN_ASSET(2) char bdan_room_3Tex_006088[] = dbdan_room_3Tex_006088;
 
+#define dbdan_room_3Tex_006488 "__OTR__scenes/nonmq/bdan_scene/bdan_room_3Tex_006488"
+static const ALIGN_ASSET(2) char bdan_room_3Tex_006488[] = dbdan_room_3Tex_006488;
+
 #define dbdan_room_3Tex_006C88 "__OTR__scenes/nonmq/bdan_scene/bdan_room_3Tex_006C88"
 static const ALIGN_ASSET(2) char bdan_room_3Tex_006C88[] = dbdan_room_3Tex_006C88;
 
-#define dbdan_room_3Tex_004888 "__OTR__scenes/nonmq/bdan_scene/bdan_room_3Tex_004888"
-static const ALIGN_ASSET(2) char bdan_room_3Tex_004888[] = dbdan_room_3Tex_004888;
+#define dbdan_room_3DL_004858 "__OTR__scenes/nonmq/bdan_scene/bdan_room_3DL_004858"
+static const ALIGN_ASSET(2) char bdan_room_3DL_004858[] = dbdan_room_3DL_004858;
 
 #define dbdan_room_3DL_007250 "__OTR__scenes/nonmq/bdan_scene/bdan_room_3DL_007250"
 static const ALIGN_ASSET(2) char bdan_room_3DL_007250[] = dbdan_room_3DL_007250;
diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_4.h b/soh/assets/scenes/dungeons/bdan/bdan_room_4.h
index 8256559d5..559ba128d 100644
--- a/soh/assets/scenes/dungeons/bdan/bdan_room_4.h
+++ b/soh/assets/scenes/dungeons/bdan/bdan_room_4.h
@@ -3,9 +3,6 @@
 
 #include "align_asset_macro.h"
 
-#define dbdan_room_4DL_002B20 "__OTR__scenes/nonmq/bdan_scene/bdan_room_4DL_002B20"
-static const ALIGN_ASSET(2) char bdan_room_4DL_002B20[] = dbdan_room_4DL_002B20;
-
 #define dbdan_room_4Tex_002B30 "__OTR__scenes/nonmq/bdan_scene/bdan_room_4Tex_002B30"
 static const ALIGN_ASSET(2) char bdan_room_4Tex_002B30[] = dbdan_room_4Tex_002B30;
 
@@ -15,6 +12,9 @@ static const ALIGN_ASSET(2) char bdan_room_4Tex_002F30[] = dbdan_room_4Tex_002F3
 #define dbdan_room_4Tex_003730 "__OTR__scenes/nonmq/bdan_scene/bdan_room_4Tex_003730"
 static const ALIGN_ASSET(2) char bdan_room_4Tex_003730[] = dbdan_room_4Tex_003730;
 
+#define dbdan_room_4DL_002B20 "__OTR__scenes/nonmq/bdan_scene/bdan_room_4DL_002B20"
+static const ALIGN_ASSET(2) char bdan_room_4DL_002B20[] = dbdan_room_4DL_002B20;
+
 #define dbdan_room_4DL_0040F0 "__OTR__scenes/nonmq/bdan_scene/bdan_room_4DL_0040F0"
 static const ALIGN_ASSET(2) char bdan_room_4DL_0040F0[] = dbdan_room_4DL_0040F0;
 
diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_5.h b/soh/assets/scenes/dungeons/bdan/bdan_room_5.h
index 775950fba..b469af6b8 100644
--- a/soh/assets/scenes/dungeons/bdan/bdan_room_5.h
+++ b/soh/assets/scenes/dungeons/bdan/bdan_room_5.h
@@ -3,26 +3,26 @@
 
 #include "align_asset_macro.h"
 
-#define dbdan_room_5DL_002498 "__OTR__scenes/nonmq/bdan_scene/bdan_room_5DL_002498"
-static const ALIGN_ASSET(2) char bdan_room_5DL_002498[] = dbdan_room_5DL_002498;
-
 #define dbdan_room_5Tex_0024A8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_5Tex_0024A8"
 static const ALIGN_ASSET(2) char bdan_room_5Tex_0024A8[] = dbdan_room_5Tex_0024A8;
 
-#define dbdan_room_5Tex_0030A8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_5Tex_0030A8"
-static const ALIGN_ASSET(2) char bdan_room_5Tex_0030A8[] = dbdan_room_5Tex_0030A8;
-
 #define dbdan_room_5Tex_0028A8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_5Tex_0028A8"
 static const ALIGN_ASSET(2) char bdan_room_5Tex_0028A8[] = dbdan_room_5Tex_0028A8;
 
-#define dbdan_room_5DL_004070 "__OTR__scenes/nonmq/bdan_scene/bdan_room_5DL_004070"
-static const ALIGN_ASSET(2) char bdan_room_5DL_004070[] = dbdan_room_5DL_004070;
+#define dbdan_room_5Tex_0030A8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_5Tex_0030A8"
+static const ALIGN_ASSET(2) char bdan_room_5Tex_0030A8[] = dbdan_room_5Tex_0030A8;
+
+#define dbdan_room_5Tex_004090 "__OTR__scenes/nonmq/bdan_scene/bdan_room_5Tex_004090"
+static const ALIGN_ASSET(2) char bdan_room_5Tex_004090[] = dbdan_room_5Tex_004090;
 
 #define dbdan_room_5Tex_005090 "__OTR__scenes/nonmq/bdan_scene/bdan_room_5Tex_005090"
 static const ALIGN_ASSET(2) char bdan_room_5Tex_005090[] = dbdan_room_5Tex_005090;
 
-#define dbdan_room_5Tex_004090 "__OTR__scenes/nonmq/bdan_scene/bdan_room_5Tex_004090"
-static const ALIGN_ASSET(2) char bdan_room_5Tex_004090[] = dbdan_room_5Tex_004090;
+#define dbdan_room_5DL_002498 "__OTR__scenes/nonmq/bdan_scene/bdan_room_5DL_002498"
+static const ALIGN_ASSET(2) char bdan_room_5DL_002498[] = dbdan_room_5DL_002498;
+
+#define dbdan_room_5DL_004070 "__OTR__scenes/nonmq/bdan_scene/bdan_room_5DL_004070"
+static const ALIGN_ASSET(2) char bdan_room_5DL_004070[] = dbdan_room_5DL_004070;
 
 #define dbdan_room_5Set_000180DL_002498 "__OTR__scenes/nonmq/bdan_scene/bdan_room_5Set_000180DL_002498"
 static const ALIGN_ASSET(2) char bdan_room_5Set_000180DL_002498[] = dbdan_room_5Set_000180DL_002498;
diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_6.h b/soh/assets/scenes/dungeons/bdan/bdan_room_6.h
index a0be4719d..57ac10b90 100644
--- a/soh/assets/scenes/dungeons/bdan/bdan_room_6.h
+++ b/soh/assets/scenes/dungeons/bdan/bdan_room_6.h
@@ -3,15 +3,15 @@
 
 #include "align_asset_macro.h"
 
-#define dbdan_room_6DL_003048 "__OTR__scenes/nonmq/bdan_scene/bdan_room_6DL_003048"
-static const ALIGN_ASSET(2) char bdan_room_6DL_003048[] = dbdan_room_6DL_003048;
-
 #define dbdan_room_6Tex_003068 "__OTR__scenes/nonmq/bdan_scene/bdan_room_6Tex_003068"
 static const ALIGN_ASSET(2) char bdan_room_6Tex_003068[] = dbdan_room_6Tex_003068;
 
 #define dbdan_room_6Tex_003868 "__OTR__scenes/nonmq/bdan_scene/bdan_room_6Tex_003868"
 static const ALIGN_ASSET(2) char bdan_room_6Tex_003868[] = dbdan_room_6Tex_003868;
 
+#define dbdan_room_6DL_003048 "__OTR__scenes/nonmq/bdan_scene/bdan_room_6DL_003048"
+static const ALIGN_ASSET(2) char bdan_room_6DL_003048[] = dbdan_room_6DL_003048;
+
 #define dbdan_room_6DL_004230 "__OTR__scenes/nonmq/bdan_scene/bdan_room_6DL_004230"
 static const ALIGN_ASSET(2) char bdan_room_6DL_004230[] = dbdan_room_6DL_004230;
 
diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_7.h b/soh/assets/scenes/dungeons/bdan/bdan_room_7.h
index 1a7f6555b..744daf427 100644
--- a/soh/assets/scenes/dungeons/bdan/bdan_room_7.h
+++ b/soh/assets/scenes/dungeons/bdan/bdan_room_7.h
@@ -3,15 +3,15 @@
 
 #include "align_asset_macro.h"
 
-#define dbdan_room_7DL_002CB8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_7DL_002CB8"
-static const ALIGN_ASSET(2) char bdan_room_7DL_002CB8[] = dbdan_room_7DL_002CB8;
-
 #define dbdan_room_7Tex_002CD0 "__OTR__scenes/nonmq/bdan_scene/bdan_room_7Tex_002CD0"
 static const ALIGN_ASSET(2) char bdan_room_7Tex_002CD0[] = dbdan_room_7Tex_002CD0;
 
 #define dbdan_room_7Tex_0030D0 "__OTR__scenes/nonmq/bdan_scene/bdan_room_7Tex_0030D0"
 static const ALIGN_ASSET(2) char bdan_room_7Tex_0030D0[] = dbdan_room_7Tex_0030D0;
 
+#define dbdan_room_7DL_002CB8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_7DL_002CB8"
+static const ALIGN_ASSET(2) char bdan_room_7DL_002CB8[] = dbdan_room_7DL_002CB8;
+
 #define dbdan_room_7Set_000150DL_002CB8 "__OTR__scenes/nonmq/bdan_scene/bdan_room_7Set_000150DL_002CB8"
 static const ALIGN_ASSET(2) char bdan_room_7Set_000150DL_002CB8[] = dbdan_room_7Set_000150DL_002CB8;
 
diff --git a/soh/assets/scenes/dungeons/bdan/bdan_room_9.h b/soh/assets/scenes/dungeons/bdan/bdan_room_9.h
index 186b21f3e..bc3ee1255 100644
--- a/soh/assets/scenes/dungeons/bdan/bdan_room_9.h
+++ b/soh/assets/scenes/dungeons/bdan/bdan_room_9.h
@@ -3,12 +3,12 @@
 
 #include "align_asset_macro.h"
 
-#define dbdan_room_9DL_003790 "__OTR__scenes/nonmq/bdan_scene/bdan_room_9DL_003790"
-static const ALIGN_ASSET(2) char bdan_room_9DL_003790[] = dbdan_room_9DL_003790;
-
 #define dbdan_room_9Tex_003828 "__OTR__scenes/nonmq/bdan_scene/bdan_room_9Tex_003828"
 static const ALIGN_ASSET(2) char bdan_room_9Tex_003828[] = dbdan_room_9Tex_003828;
 
+#define dbdan_room_9DL_003790 "__OTR__scenes/nonmq/bdan_scene/bdan_room_9DL_003790"
+static const ALIGN_ASSET(2) char bdan_room_9DL_003790[] = dbdan_room_9DL_003790;
+
 #define dbdan_room_9Set_0000A0DL_003790 "__OTR__scenes/nonmq/bdan_scene/bdan_room_9Set_0000A0DL_003790"
 static const ALIGN_ASSET(2) char bdan_room_9Set_0000A0DL_003790[] = dbdan_room_9Set_0000A0DL_003790;
 
diff --git a/soh/assets/scenes/dungeons/bdan/bdan_scene.h b/soh/assets/scenes/dungeons/bdan/bdan_scene.h
index 6cf171fdc..11cd718a9 100644
--- a/soh/assets/scenes/dungeons/bdan/bdan_scene.h
+++ b/soh/assets/scenes/dungeons/bdan/bdan_scene.h
@@ -3,14 +3,14 @@
 
 #include "align_asset_macro.h"
 
-#define dgJabuJabuIntroCs "__OTR__scenes/nonmq/bdan_scene/gJabuJabuIntroCs"
-static const ALIGN_ASSET(2) char gJabuJabuIntroCs[] = dgJabuJabuIntroCs;
+#define dbdan_sceneTex_013E00 "__OTR__scenes/nonmq/bdan_scene/bdan_sceneTex_013E00"
+static const ALIGN_ASSET(2) char bdan_sceneTex_013E00[] = dbdan_sceneTex_013E00;
 
-#define dbdan_sceneCollisionHeader_013074 "__OTR__scenes/nonmq/bdan_scene/bdan_sceneCollisionHeader_013074"
-static const ALIGN_ASSET(2) char bdan_sceneCollisionHeader_013074[] = dbdan_sceneCollisionHeader_013074;
+#define dbdan_sceneTex_014600 "__OTR__scenes/nonmq/bdan_scene/bdan_sceneTex_014600"
+static const ALIGN_ASSET(2) char bdan_sceneTex_014600[] = dbdan_sceneTex_014600;
 
-#define dbdan_sceneTLUT_013BF8 "__OTR__scenes/nonmq/bdan_scene/bdan_sceneTLUT_013BF8"
-static const ALIGN_ASSET(2) char bdan_sceneTLUT_013BF8[] = dbdan_sceneTLUT_013BF8;
+#define dbdan_sceneTex_014A00 "__OTR__scenes/nonmq/bdan_scene/bdan_sceneTex_014A00"
+static const ALIGN_ASSET(2) char bdan_sceneTex_014A00[] = dbdan_sceneTex_014A00;
 
 #define dbdan_sceneTex_015200 "__OTR__scenes/nonmq/bdan_scene/bdan_sceneTex_015200"
 static const ALIGN_ASSET(2) char bdan_sceneTex_015200[] = dbdan_sceneTex_015200;
@@ -18,14 +18,14 @@ static const ALIGN_ASSET(2) char bdan_sceneTex_015200[] = dbdan_sceneTex_015200;
 #define dbdan_sceneTLUT_0139F0 "__OTR__scenes/nonmq/bdan_scene/bdan_sceneTLUT_0139F0"
 static const ALIGN_ASSET(2) char bdan_sceneTLUT_0139F0[] = dbdan_sceneTLUT_0139F0;
 
-#define dbdan_sceneTex_014A00 "__OTR__scenes/nonmq/bdan_scene/bdan_sceneTex_014A00"
-static const ALIGN_ASSET(2) char bdan_sceneTex_014A00[] = dbdan_sceneTex_014A00;
+#define dbdan_sceneTLUT_013BF8 "__OTR__scenes/nonmq/bdan_scene/bdan_sceneTLUT_013BF8"
+static const ALIGN_ASSET(2) char bdan_sceneTLUT_013BF8[] = dbdan_sceneTLUT_013BF8;
 
-#define dbdan_sceneTex_014600 "__OTR__scenes/nonmq/bdan_scene/bdan_sceneTex_014600"
-static const ALIGN_ASSET(2) char bdan_sceneTex_014600[] = dbdan_sceneTex_014600;
+#define dgJabuJabuIntroCs "__OTR__scenes/nonmq/bdan_scene/gJabuJabuIntroCs"
+static const ALIGN_ASSET(2) char gJabuJabuIntroCs[] = dgJabuJabuIntroCs;
 
-#define dbdan_sceneTex_013E00 "__OTR__scenes/nonmq/bdan_scene/bdan_sceneTex_013E00"
-static const ALIGN_ASSET(2) char bdan_sceneTex_013E00[] = dbdan_sceneTex_013E00;
+#define dbdan_sceneCollisionHeader_013074 "__OTR__scenes/nonmq/bdan_scene/bdan_sceneCollisionHeader_013074"
+static const ALIGN_ASSET(2) char bdan_sceneCollisionHeader_013074[] = dbdan_sceneCollisionHeader_013074;
 
 #define dbdan_sceneCollisionHeader_013074 "__OTR__scenes/nonmq/bdan_scene/bdan_sceneCollisionHeader_013074"
 
diff --git a/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_room_0.h b/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_room_0.h
index 0311e3c48..1fdc43640 100644
--- a/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_room_0.h
+++ b/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_room_0.h
@@ -3,23 +3,23 @@
 
 #include "align_asset_macro.h"
 
-#define dbdan_boss_room_0DL_001E28 "__OTR__scenes/nonmq/bdan_boss_scene/bdan_boss_room_0DL_001E28"
-static const ALIGN_ASSET(2) char bdan_boss_room_0DL_001E28[] = dbdan_boss_room_0DL_001E28;
-
-#define dbdan_boss_room_0Tex_002040 "__OTR__scenes/nonmq/bdan_boss_scene/bdan_boss_room_0Tex_002040"
+#define dbdan_boss_room_0Tex_002040 "__OTR__scenes/shared/bdan_boss_scene/bdan_boss_room_0Tex_002040"
 static const ALIGN_ASSET(2) char bdan_boss_room_0Tex_002040[] = dbdan_boss_room_0Tex_002040;
 
-#define dbdan_boss_room_0TLUT_001E38 "__OTR__scenes/nonmq/bdan_boss_scene/bdan_boss_room_0TLUT_001E38"
-static const ALIGN_ASSET(2) char bdan_boss_room_0TLUT_001E38[] = dbdan_boss_room_0TLUT_001E38;
-
-#define dbdan_boss_room_0DL_002A00 "__OTR__scenes/nonmq/bdan_boss_scene/bdan_boss_room_0DL_002A00"
-static const ALIGN_ASSET(2) char bdan_boss_room_0DL_002A00[] = dbdan_boss_room_0DL_002A00;
-
-#define dbdan_boss_room_0Tex_002C18 "__OTR__scenes/nonmq/bdan_boss_scene/bdan_boss_room_0Tex_002C18"
+#define dbdan_boss_room_0Tex_002C18 "__OTR__scenes/shared/bdan_boss_scene/bdan_boss_room_0Tex_002C18"
 static const ALIGN_ASSET(2) char bdan_boss_room_0Tex_002C18[] = dbdan_boss_room_0Tex_002C18;
 
-#define dbdan_boss_room_0TLUT_002A10 "__OTR__scenes/nonmq/bdan_boss_scene/bdan_boss_room_0TLUT_002A10"
+#define dbdan_boss_room_0TLUT_001E38 "__OTR__scenes/shared/bdan_boss_scene/bdan_boss_room_0TLUT_001E38"
+static const ALIGN_ASSET(2) char bdan_boss_room_0TLUT_001E38[] = dbdan_boss_room_0TLUT_001E38;
+
+#define dbdan_boss_room_0TLUT_002A10 "__OTR__scenes/shared/bdan_boss_scene/bdan_boss_room_0TLUT_002A10"
 static const ALIGN_ASSET(2) char bdan_boss_room_0TLUT_002A10[] = dbdan_boss_room_0TLUT_002A10;
 
+#define dbdan_boss_room_0DL_001E28 "__OTR__scenes/shared/bdan_boss_scene/bdan_boss_room_0DL_001E28"
+static const ALIGN_ASSET(2) char bdan_boss_room_0DL_001E28[] = dbdan_boss_room_0DL_001E28;
+
+#define dbdan_boss_room_0DL_002A00 "__OTR__scenes/shared/bdan_boss_scene/bdan_boss_room_0DL_002A00"
+static const ALIGN_ASSET(2) char bdan_boss_room_0DL_002A00[] = dbdan_boss_room_0DL_002A00;
+
 
 #endif // DUNGEONS_BDAN_BOSS_ROOM_0_H
diff --git a/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_room_1.h b/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_room_1.h
index 854997c56..4fc368fff 100644
--- a/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_room_1.h
+++ b/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_room_1.h
@@ -3,20 +3,20 @@
 
 #include "align_asset_macro.h"
 
-#define dbdan_boss_room_1DL_003A58 "__OTR__scenes/nonmq/bdan_boss_scene/bdan_boss_room_1DL_003A58"
-static const ALIGN_ASSET(2) char bdan_boss_room_1DL_003A58[] = dbdan_boss_room_1DL_003A58;
+#define dbdan_boss_room_1Tex_003CB8 "__OTR__scenes/shared/bdan_boss_scene/bdan_boss_room_1Tex_003CB8"
+static const ALIGN_ASSET(2) char bdan_boss_room_1Tex_003CB8[] = dbdan_boss_room_1Tex_003CB8;
 
-#define dbdan_boss_room_1Tex_0048B8 "__OTR__scenes/nonmq/bdan_boss_scene/bdan_boss_room_1Tex_0048B8"
-static const ALIGN_ASSET(2) char bdan_boss_room_1Tex_0048B8[] = dbdan_boss_room_1Tex_0048B8;
-
-#define dbdan_boss_room_1TLUT_003AB0 "__OTR__scenes/nonmq/bdan_boss_scene/bdan_boss_room_1TLUT_003AB0"
-static const ALIGN_ASSET(2) char bdan_boss_room_1TLUT_003AB0[] = dbdan_boss_room_1TLUT_003AB0;
-
-#define dbdan_boss_room_1Tex_0044B8 "__OTR__scenes/nonmq/bdan_boss_scene/bdan_boss_room_1Tex_0044B8"
+#define dbdan_boss_room_1Tex_0044B8 "__OTR__scenes/shared/bdan_boss_scene/bdan_boss_room_1Tex_0044B8"
 static const ALIGN_ASSET(2) char bdan_boss_room_1Tex_0044B8[] = dbdan_boss_room_1Tex_0044B8;
 
-#define dbdan_boss_room_1Tex_003CB8 "__OTR__scenes/nonmq/bdan_boss_scene/bdan_boss_room_1Tex_003CB8"
-static const ALIGN_ASSET(2) char bdan_boss_room_1Tex_003CB8[] = dbdan_boss_room_1Tex_003CB8;
+#define dbdan_boss_room_1Tex_0048B8 "__OTR__scenes/shared/bdan_boss_scene/bdan_boss_room_1Tex_0048B8"
+static const ALIGN_ASSET(2) char bdan_boss_room_1Tex_0048B8[] = dbdan_boss_room_1Tex_0048B8;
+
+#define dbdan_boss_room_1TLUT_003AB0 "__OTR__scenes/shared/bdan_boss_scene/bdan_boss_room_1TLUT_003AB0"
+static const ALIGN_ASSET(2) char bdan_boss_room_1TLUT_003AB0[] = dbdan_boss_room_1TLUT_003AB0;
+
+#define dbdan_boss_room_1DL_003A58 "__OTR__scenes/shared/bdan_boss_scene/bdan_boss_room_1DL_003A58"
+static const ALIGN_ASSET(2) char bdan_boss_room_1DL_003A58[] = dbdan_boss_room_1DL_003A58;
 
 
 #endif // DUNGEONS_BDAN_BOSS_ROOM_1_H
diff --git a/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_scene.h b/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_scene.h
index 01827e86a..5f7d97fa8 100644
--- a/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_scene.h
+++ b/soh/assets/scenes/dungeons/bdan_boss/bdan_boss_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dbdan_boss_sceneCollisionHeader_000E14 "__OTR__scenes/nonmq/bdan_boss_scene/bdan_boss_sceneCollisionHeader_000E14"
+#define dbdan_boss_sceneCollisionHeader_000E14 "__OTR__scenes/shared/bdan_boss_scene/bdan_boss_sceneCollisionHeader_000E14"
 static const ALIGN_ASSET(2) char bdan_boss_sceneCollisionHeader_000E14[] = dbdan_boss_sceneCollisionHeader_000E14;
 
 
diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_0.h b/soh/assets/scenes/dungeons/ddan/ddan_room_0.h
index e475c26d0..27075a8aa 100644
--- a/soh/assets/scenes/dungeons/ddan/ddan_room_0.h
+++ b/soh/assets/scenes/dungeons/ddan/ddan_room_0.h
@@ -3,66 +3,93 @@
 
 #include "align_asset_macro.h"
 
-#define dddan_room_0DL_000D98 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_000D98"
-static const ALIGN_ASSET(2) char ddan_room_0DL_000D98[] = dddan_room_0DL_000D98;
-
-#define dddan_room_0Tex_018C98 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_018C98"
-static const ALIGN_ASSET(2) char ddan_room_0Tex_018C98[] = dddan_room_0Tex_018C98;
+#define dddan_room_0Tex_011498 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_011498"
+static const ALIGN_ASSET(2) char ddan_room_0Tex_011498[] = dddan_room_0Tex_011498;
 
 #define dddan_room_0Tex_011898 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_011898"
 static const ALIGN_ASSET(2) char ddan_room_0Tex_011898[] = dddan_room_0Tex_011898;
 
-#define dddan_room_0Tex_01B498 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_01B498"
-static const ALIGN_ASSET(2) char ddan_room_0Tex_01B498[] = dddan_room_0Tex_01B498;
-
-#define dddan_room_0DL_001710 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_001710"
-static const ALIGN_ASSET(2) char ddan_room_0DL_001710[] = dddan_room_0DL_001710;
-
-#define dddan_room_0Tex_016898 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_016898"
-static const ALIGN_ASSET(2) char ddan_room_0Tex_016898[] = dddan_room_0Tex_016898;
-
-#define dddan_room_0DL_0021E0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_0021E0"
-static const ALIGN_ASSET(2) char ddan_room_0DL_0021E0[] = dddan_room_0DL_0021E0;
+#define dddan_room_0Tex_011C98 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_011C98"
+static const ALIGN_ASSET(2) char ddan_room_0Tex_011C98[] = dddan_room_0Tex_011C98;
 
 #define dddan_room_0Tex_012498 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_012498"
 static const ALIGN_ASSET(2) char ddan_room_0Tex_012498[] = dddan_room_0Tex_012498;
 
+#define dddan_room_0Tex_012C98 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_012C98"
+static const ALIGN_ASSET(2) char ddan_room_0Tex_012C98[] = dddan_room_0Tex_012C98;
+
+#define dddan_room_0Tex_013C98 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_013C98"
+static const ALIGN_ASSET(2) char ddan_room_0Tex_013C98[] = dddan_room_0Tex_013C98;
+
+#define dddan_room_0Tex_014C98 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_014C98"
+static const ALIGN_ASSET(2) char ddan_room_0Tex_014C98[] = dddan_room_0Tex_014C98;
+
+#define dddan_room_0Tex_015498 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_015498"
+static const ALIGN_ASSET(2) char ddan_room_0Tex_015498[] = dddan_room_0Tex_015498;
+
+#define dddan_room_0Tex_015C98 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_015C98"
+static const ALIGN_ASSET(2) char ddan_room_0Tex_015C98[] = dddan_room_0Tex_015C98;
+
+#define dddan_room_0Tex_016498 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_016498"
+static const ALIGN_ASSET(2) char ddan_room_0Tex_016498[] = dddan_room_0Tex_016498;
+
+#define dddan_room_0Tex_016898 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_016898"
+static const ALIGN_ASSET(2) char ddan_room_0Tex_016898[] = dddan_room_0Tex_016898;
+
+#define dddan_room_0Tex_017098 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_017098"
+static const ALIGN_ASSET(2) char ddan_room_0Tex_017098[] = dddan_room_0Tex_017098;
+
+#define dddan_room_0Tex_017898 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_017898"
+static const ALIGN_ASSET(2) char ddan_room_0Tex_017898[] = dddan_room_0Tex_017898;
+
+#define dddan_room_0Tex_017C98 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_017C98"
+static const ALIGN_ASSET(2) char ddan_room_0Tex_017C98[] = dddan_room_0Tex_017C98;
+
 #define dddan_room_0Tex_018498 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_018498"
 static const ALIGN_ASSET(2) char ddan_room_0Tex_018498[] = dddan_room_0Tex_018498;
 
+#define dddan_room_0Tex_018C98 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_018C98"
+static const ALIGN_ASSET(2) char ddan_room_0Tex_018C98[] = dddan_room_0Tex_018C98;
+
+#define dddan_room_0Tex_019498 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_019498"
+static const ALIGN_ASSET(2) char ddan_room_0Tex_019498[] = dddan_room_0Tex_019498;
+
+#define dddan_room_0Tex_01A498 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_01A498"
+static const ALIGN_ASSET(2) char ddan_room_0Tex_01A498[] = dddan_room_0Tex_01A498;
+
+#define dddan_room_0Tex_01B498 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_01B498"
+static const ALIGN_ASSET(2) char ddan_room_0Tex_01B498[] = dddan_room_0Tex_01B498;
+
+#define dddan_room_0TLUT_011290 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0TLUT_011290"
+static const ALIGN_ASSET(2) char ddan_room_0TLUT_011290[] = dddan_room_0TLUT_011290;
+
+#define dddan_room_0DL_000D98 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_000D98"
+static const ALIGN_ASSET(2) char ddan_room_0DL_000D98[] = dddan_room_0DL_000D98;
+
+#define dddan_room_0DL_001710 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_001710"
+static const ALIGN_ASSET(2) char ddan_room_0DL_001710[] = dddan_room_0DL_001710;
+
+#define dddan_room_0DL_0021E0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_0021E0"
+static const ALIGN_ASSET(2) char ddan_room_0DL_0021E0[] = dddan_room_0DL_0021E0;
+
 #define dddan_room_0DL_002F28 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_002F28"
 static const ALIGN_ASSET(2) char ddan_room_0DL_002F28[] = dddan_room_0DL_002F28;
 
 #define dddan_room_0DL_004110 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_004110"
 static const ALIGN_ASSET(2) char ddan_room_0DL_004110[] = dddan_room_0DL_004110;
 
-#define dddan_room_0Tex_015C98 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_015C98"
-static const ALIGN_ASSET(2) char ddan_room_0Tex_015C98[] = dddan_room_0Tex_015C98;
-
 #define dddan_room_0DL_0050A8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_0050A8"
 static const ALIGN_ASSET(2) char ddan_room_0DL_0050A8[] = dddan_room_0DL_0050A8;
 
 #define dddan_room_0DL_006588 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_006588"
 static const ALIGN_ASSET(2) char ddan_room_0DL_006588[] = dddan_room_0DL_006588;
 
-#define dddan_room_0Tex_017898 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_017898"
-static const ALIGN_ASSET(2) char ddan_room_0Tex_017898[] = dddan_room_0Tex_017898;
-
-#define dddan_room_0Tex_016498 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_016498"
-static const ALIGN_ASSET(2) char ddan_room_0Tex_016498[] = dddan_room_0Tex_016498;
-
-#define dddan_room_0TLUT_011290 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0TLUT_011290"
-static const ALIGN_ASSET(2) char ddan_room_0TLUT_011290[] = dddan_room_0TLUT_011290;
-
 #define dddan_room_0DL_0072B8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_0072B8"
 static const ALIGN_ASSET(2) char ddan_room_0DL_0072B8[] = dddan_room_0DL_0072B8;
 
 #define dddan_room_0DL_007E68 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_007E68"
 static const ALIGN_ASSET(2) char ddan_room_0DL_007E68[] = dddan_room_0DL_007E68;
 
-#define dddan_room_0Tex_011498 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_011498"
-static const ALIGN_ASSET(2) char ddan_room_0Tex_011498[] = dddan_room_0Tex_011498;
-
 #define dddan_room_0DL_009110 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_009110"
 static const ALIGN_ASSET(2) char ddan_room_0DL_009110[] = dddan_room_0DL_009110;
 
@@ -72,9 +99,6 @@ static const ALIGN_ASSET(2) char ddan_room_0DL_00A0B8[] = dddan_room_0DL_00A0B8;
 #define dddan_room_0DL_00AE68 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_00AE68"
 static const ALIGN_ASSET(2) char ddan_room_0DL_00AE68[] = dddan_room_0DL_00AE68;
 
-#define dddan_room_0Tex_017098 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_017098"
-static const ALIGN_ASSET(2) char ddan_room_0Tex_017098[] = dddan_room_0Tex_017098;
-
 #define dddan_room_0DL_00B520 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_00B520"
 static const ALIGN_ASSET(2) char ddan_room_0DL_00B520[] = dddan_room_0DL_00B520;
 
@@ -87,36 +111,12 @@ static const ALIGN_ASSET(2) char ddan_room_0DL_00C518[] = dddan_room_0DL_00C518;
 #define dddan_room_0DL_00CD38 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_00CD38"
 static const ALIGN_ASSET(2) char ddan_room_0DL_00CD38[] = dddan_room_0DL_00CD38;
 
-#define dddan_room_0Tex_013C98 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_013C98"
-static const ALIGN_ASSET(2) char ddan_room_0Tex_013C98[] = dddan_room_0Tex_013C98;
-
-#define dddan_room_0Tex_011C98 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_011C98"
-static const ALIGN_ASSET(2) char ddan_room_0Tex_011C98[] = dddan_room_0Tex_011C98;
-
-#define dddan_room_0Tex_012C98 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_012C98"
-static const ALIGN_ASSET(2) char ddan_room_0Tex_012C98[] = dddan_room_0Tex_012C98;
-
 #define dddan_room_0DL_00DE20 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_00DE20"
 static const ALIGN_ASSET(2) char ddan_room_0DL_00DE20[] = dddan_room_0DL_00DE20;
 
-#define dddan_room_0Tex_01A498 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_01A498"
-static const ALIGN_ASSET(2) char ddan_room_0Tex_01A498[] = dddan_room_0Tex_01A498;
-
-#define dddan_room_0Tex_019498 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_019498"
-static const ALIGN_ASSET(2) char ddan_room_0Tex_019498[] = dddan_room_0Tex_019498;
-
-#define dddan_room_0Tex_014C98 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_014C98"
-static const ALIGN_ASSET(2) char ddan_room_0Tex_014C98[] = dddan_room_0Tex_014C98;
-
 #define dddan_room_0DL_00F100 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_00F100"
 static const ALIGN_ASSET(2) char ddan_room_0DL_00F100[] = dddan_room_0DL_00F100;
 
-#define dddan_room_0Tex_017C98 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_017C98"
-static const ALIGN_ASSET(2) char ddan_room_0Tex_017C98[] = dddan_room_0Tex_017C98;
-
-#define dddan_room_0Tex_015498 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0Tex_015498"
-static const ALIGN_ASSET(2) char ddan_room_0Tex_015498[] = dddan_room_0Tex_015498;
-
 #define dddan_room_0DL_010238 "__OTR__scenes/nonmq/ddan_scene/ddan_room_0DL_010238"
 static const ALIGN_ASSET(2) char ddan_room_0DL_010238[] = dddan_room_0DL_010238;
 
diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_1.h b/soh/assets/scenes/dungeons/ddan/ddan_room_1.h
index 56cdae2d3..51b404364 100644
--- a/soh/assets/scenes/dungeons/ddan/ddan_room_1.h
+++ b/soh/assets/scenes/dungeons/ddan/ddan_room_1.h
@@ -3,41 +3,41 @@
 
 #include "align_asset_macro.h"
 
-#define dddan_room_1DL_002520 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1DL_002520"
-static const ALIGN_ASSET(2) char ddan_room_1DL_002520[] = dddan_room_1DL_002520;
-
 #define dddan_room_1Tex_004770 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1Tex_004770"
 static const ALIGN_ASSET(2) char ddan_room_1Tex_004770[] = dddan_room_1Tex_004770;
 
-#define dddan_room_1Tex_007F70 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1Tex_007F70"
-static const ALIGN_ASSET(2) char ddan_room_1Tex_007F70[] = dddan_room_1Tex_007F70;
+#define dddan_room_1Tex_004B70 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1Tex_004B70"
+static const ALIGN_ASSET(2) char ddan_room_1Tex_004B70[] = dddan_room_1Tex_004B70;
 
-#define dddan_room_1Tex_008770 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1Tex_008770"
-static const ALIGN_ASSET(2) char ddan_room_1Tex_008770[] = dddan_room_1Tex_008770;
-
-#define dddan_room_1Tex_009770 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1Tex_009770"
-static const ALIGN_ASSET(2) char ddan_room_1Tex_009770[] = dddan_room_1Tex_009770;
+#define dddan_room_1Tex_004F70 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1Tex_004F70"
+static const ALIGN_ASSET(2) char ddan_room_1Tex_004F70[] = dddan_room_1Tex_004F70;
 
 #define dddan_room_1Tex_005770 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1Tex_005770"
 static const ALIGN_ASSET(2) char ddan_room_1Tex_005770[] = dddan_room_1Tex_005770;
 
-#define dddan_room_1Tex_004B70 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1Tex_004B70"
-static const ALIGN_ASSET(2) char ddan_room_1Tex_004B70[] = dddan_room_1Tex_004B70;
-
 #define dddan_room_1Tex_005F70 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1Tex_005F70"
 static const ALIGN_ASSET(2) char ddan_room_1Tex_005F70[] = dddan_room_1Tex_005F70;
 
 #define dddan_room_1Tex_006F70 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1Tex_006F70"
 static const ALIGN_ASSET(2) char ddan_room_1Tex_006F70[] = dddan_room_1Tex_006F70;
 
-#define dddan_room_1Tex_004F70 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1Tex_004F70"
-static const ALIGN_ASSET(2) char ddan_room_1Tex_004F70[] = dddan_room_1Tex_004F70;
+#define dddan_room_1Tex_007F70 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1Tex_007F70"
+static const ALIGN_ASSET(2) char ddan_room_1Tex_007F70[] = dddan_room_1Tex_007F70;
 
-#define dddan_room_1DL_004630 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1DL_004630"
-static const ALIGN_ASSET(2) char ddan_room_1DL_004630[] = dddan_room_1DL_004630;
+#define dddan_room_1Tex_008770 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1Tex_008770"
+static const ALIGN_ASSET(2) char ddan_room_1Tex_008770[] = dddan_room_1Tex_008770;
 
 #define dddan_room_1Tex_008F70 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1Tex_008F70"
 static const ALIGN_ASSET(2) char ddan_room_1Tex_008F70[] = dddan_room_1Tex_008F70;
 
+#define dddan_room_1Tex_009770 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1Tex_009770"
+static const ALIGN_ASSET(2) char ddan_room_1Tex_009770[] = dddan_room_1Tex_009770;
+
+#define dddan_room_1DL_002520 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1DL_002520"
+static const ALIGN_ASSET(2) char ddan_room_1DL_002520[] = dddan_room_1DL_002520;
+
+#define dddan_room_1DL_004630 "__OTR__scenes/nonmq/ddan_scene/ddan_room_1DL_004630"
+static const ALIGN_ASSET(2) char ddan_room_1DL_004630[] = dddan_room_1DL_004630;
+
 
 #endif // DUNGEONS_DDAN_ROOM_1_H
diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_10.h b/soh/assets/scenes/dungeons/ddan/ddan_room_10.h
index e7cd22c3a..429fff0f4 100644
--- a/soh/assets/scenes/dungeons/ddan/ddan_room_10.h
+++ b/soh/assets/scenes/dungeons/ddan/ddan_room_10.h
@@ -3,20 +3,26 @@
 
 #include "align_asset_macro.h"
 
-#define dddan_room_10DL_001B10 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10DL_001B10"
-static const ALIGN_ASSET(2) char ddan_room_10DL_001B10[] = dddan_room_10DL_001B10;
+#define dddan_room_10Tex_002B10 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_002B10"
+static const ALIGN_ASSET(2) char ddan_room_10Tex_002B10[] = dddan_room_10Tex_002B10;
 
-#define dddan_room_10Tex_004F10 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_004F10"
-static const ALIGN_ASSET(2) char ddan_room_10Tex_004F10[] = dddan_room_10Tex_004F10;
+#define dddan_room_10Tex_002F10 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_002F10"
+static const ALIGN_ASSET(2) char ddan_room_10Tex_002F10[] = dddan_room_10Tex_002F10;
+
+#define dddan_room_10Tex_003710 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_003710"
+static const ALIGN_ASSET(2) char ddan_room_10Tex_003710[] = dddan_room_10Tex_003710;
+
+#define dddan_room_10Tex_003B10 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_003B10"
+static const ALIGN_ASSET(2) char ddan_room_10Tex_003B10[] = dddan_room_10Tex_003B10;
+
+#define dddan_room_10Tex_004310 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_004310"
+static const ALIGN_ASSET(2) char ddan_room_10Tex_004310[] = dddan_room_10Tex_004310;
 
 #define dddan_room_10Tex_004710 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_004710"
 static const ALIGN_ASSET(2) char ddan_room_10Tex_004710[] = dddan_room_10Tex_004710;
 
-#define dddan_room_10Tex_007B10 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_007B10"
-static const ALIGN_ASSET(2) char ddan_room_10Tex_007B10[] = dddan_room_10Tex_007B10;
-
-#define dddan_room_10Tex_002F10 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_002F10"
-static const ALIGN_ASSET(2) char ddan_room_10Tex_002F10[] = dddan_room_10Tex_002F10;
+#define dddan_room_10Tex_004F10 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_004F10"
+static const ALIGN_ASSET(2) char ddan_room_10Tex_004F10[] = dddan_room_10Tex_004F10;
 
 #define dddan_room_10Tex_005310 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_005310"
 static const ALIGN_ASSET(2) char ddan_room_10Tex_005310[] = dddan_room_10Tex_005310;
@@ -24,20 +30,14 @@ static const ALIGN_ASSET(2) char ddan_room_10Tex_005310[] = dddan_room_10Tex_005
 #define dddan_room_10Tex_006310 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_006310"
 static const ALIGN_ASSET(2) char ddan_room_10Tex_006310[] = dddan_room_10Tex_006310;
 
-#define dddan_room_10Tex_003B10 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_003B10"
-static const ALIGN_ASSET(2) char ddan_room_10Tex_003B10[] = dddan_room_10Tex_003B10;
-
-#define dddan_room_10Tex_003710 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_003710"
-static const ALIGN_ASSET(2) char ddan_room_10Tex_003710[] = dddan_room_10Tex_003710;
-
-#define dddan_room_10Tex_004310 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_004310"
-static const ALIGN_ASSET(2) char ddan_room_10Tex_004310[] = dddan_room_10Tex_004310;
-
-#define dddan_room_10Tex_002B10 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_002B10"
-static const ALIGN_ASSET(2) char ddan_room_10Tex_002B10[] = dddan_room_10Tex_002B10;
-
 #define dddan_room_10Tex_007310 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_007310"
 static const ALIGN_ASSET(2) char ddan_room_10Tex_007310[] = dddan_room_10Tex_007310;
 
+#define dddan_room_10Tex_007B10 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10Tex_007B10"
+static const ALIGN_ASSET(2) char ddan_room_10Tex_007B10[] = dddan_room_10Tex_007B10;
+
+#define dddan_room_10DL_001B10 "__OTR__scenes/nonmq/ddan_scene/ddan_room_10DL_001B10"
+static const ALIGN_ASSET(2) char ddan_room_10DL_001B10[] = dddan_room_10DL_001B10;
+
 
 #endif // DUNGEONS_DDAN_ROOM_10_H
diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_11.h b/soh/assets/scenes/dungeons/ddan/ddan_room_11.h
index 2dfed8d44..d2fd67440 100644
--- a/soh/assets/scenes/dungeons/ddan/ddan_room_11.h
+++ b/soh/assets/scenes/dungeons/ddan/ddan_room_11.h
@@ -3,17 +3,17 @@
 
 #include "align_asset_macro.h"
 
-#define dddan_room_11DL_0006A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_11DL_0006A0"
-static const ALIGN_ASSET(2) char ddan_room_11DL_0006A0[] = dddan_room_11DL_0006A0;
-
-#define dddan_room_11Tex_001C30 "__OTR__scenes/nonmq/ddan_scene/ddan_room_11Tex_001C30"
-static const ALIGN_ASSET(2) char ddan_room_11Tex_001C30[] = dddan_room_11Tex_001C30;
+#define dddan_room_11Tex_000C30 "__OTR__scenes/nonmq/ddan_scene/ddan_room_11Tex_000C30"
+static const ALIGN_ASSET(2) char ddan_room_11Tex_000C30[] = dddan_room_11Tex_000C30;
 
 #define dddan_room_11Tex_001430 "__OTR__scenes/nonmq/ddan_scene/ddan_room_11Tex_001430"
 static const ALIGN_ASSET(2) char ddan_room_11Tex_001430[] = dddan_room_11Tex_001430;
 
-#define dddan_room_11Tex_000C30 "__OTR__scenes/nonmq/ddan_scene/ddan_room_11Tex_000C30"
-static const ALIGN_ASSET(2) char ddan_room_11Tex_000C30[] = dddan_room_11Tex_000C30;
+#define dddan_room_11Tex_001C30 "__OTR__scenes/nonmq/ddan_scene/ddan_room_11Tex_001C30"
+static const ALIGN_ASSET(2) char ddan_room_11Tex_001C30[] = dddan_room_11Tex_001C30;
+
+#define dddan_room_11DL_0006A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_11DL_0006A0"
+static const ALIGN_ASSET(2) char ddan_room_11DL_0006A0[] = dddan_room_11DL_0006A0;
 
 
 #endif // DUNGEONS_DDAN_ROOM_11_H
diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_12.h b/soh/assets/scenes/dungeons/ddan/ddan_room_12.h
index f63f65ec2..443d91a02 100644
--- a/soh/assets/scenes/dungeons/ddan/ddan_room_12.h
+++ b/soh/assets/scenes/dungeons/ddan/ddan_room_12.h
@@ -3,44 +3,44 @@
 
 #include "align_asset_macro.h"
 
-#define dddan_room_12DL_001BE0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12DL_001BE0"
-static const ALIGN_ASSET(2) char ddan_room_12DL_001BE0[] = dddan_room_12DL_001BE0;
-
-#define dddan_room_12Tex_007B80 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_007B80"
-static const ALIGN_ASSET(2) char ddan_room_12Tex_007B80[] = dddan_room_12Tex_007B80;
-
-#define dddan_room_12Tex_005380 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_005380"
-static const ALIGN_ASSET(2) char ddan_room_12Tex_005380[] = dddan_room_12Tex_005380;
-
-#define dddan_room_12Tex_007780 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_007780"
-static const ALIGN_ASSET(2) char ddan_room_12Tex_007780[] = dddan_room_12Tex_007780;
-
-#define dddan_room_12Tex_004B80 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_004B80"
-static const ALIGN_ASSET(2) char ddan_room_12Tex_004B80[] = dddan_room_12Tex_004B80;
-
-#define dddan_room_12Tex_008380 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_008380"
-static const ALIGN_ASSET(2) char ddan_room_12Tex_008380[] = dddan_room_12Tex_008380;
+#define dddan_room_12Tex_002F80 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_002F80"
+static const ALIGN_ASSET(2) char ddan_room_12Tex_002F80[] = dddan_room_12Tex_002F80;
 
 #define dddan_room_12Tex_003380 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_003380"
 static const ALIGN_ASSET(2) char ddan_room_12Tex_003380[] = dddan_room_12Tex_003380;
 
-#define dddan_room_12Tex_006780 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_006780"
-static const ALIGN_ASSET(2) char ddan_room_12Tex_006780[] = dddan_room_12Tex_006780;
-
-#define dddan_room_12Tex_005780 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_005780"
-static const ALIGN_ASSET(2) char ddan_room_12Tex_005780[] = dddan_room_12Tex_005780;
+#define dddan_room_12Tex_003B80 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_003B80"
+static const ALIGN_ASSET(2) char ddan_room_12Tex_003B80[] = dddan_room_12Tex_003B80;
 
 #define dddan_room_12Tex_003F80 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_003F80"
 static const ALIGN_ASSET(2) char ddan_room_12Tex_003F80[] = dddan_room_12Tex_003F80;
 
-#define dddan_room_12Tex_003B80 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_003B80"
-static const ALIGN_ASSET(2) char ddan_room_12Tex_003B80[] = dddan_room_12Tex_003B80;
-
 #define dddan_room_12Tex_004780 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_004780"
 static const ALIGN_ASSET(2) char ddan_room_12Tex_004780[] = dddan_room_12Tex_004780;
 
-#define dddan_room_12Tex_002F80 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_002F80"
-static const ALIGN_ASSET(2) char ddan_room_12Tex_002F80[] = dddan_room_12Tex_002F80;
+#define dddan_room_12Tex_004B80 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_004B80"
+static const ALIGN_ASSET(2) char ddan_room_12Tex_004B80[] = dddan_room_12Tex_004B80;
+
+#define dddan_room_12Tex_005380 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_005380"
+static const ALIGN_ASSET(2) char ddan_room_12Tex_005380[] = dddan_room_12Tex_005380;
+
+#define dddan_room_12Tex_005780 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_005780"
+static const ALIGN_ASSET(2) char ddan_room_12Tex_005780[] = dddan_room_12Tex_005780;
+
+#define dddan_room_12Tex_006780 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_006780"
+static const ALIGN_ASSET(2) char ddan_room_12Tex_006780[] = dddan_room_12Tex_006780;
+
+#define dddan_room_12Tex_007780 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_007780"
+static const ALIGN_ASSET(2) char ddan_room_12Tex_007780[] = dddan_room_12Tex_007780;
+
+#define dddan_room_12Tex_007B80 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_007B80"
+static const ALIGN_ASSET(2) char ddan_room_12Tex_007B80[] = dddan_room_12Tex_007B80;
+
+#define dddan_room_12Tex_008380 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12Tex_008380"
+static const ALIGN_ASSET(2) char ddan_room_12Tex_008380[] = dddan_room_12Tex_008380;
+
+#define dddan_room_12DL_001BE0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_12DL_001BE0"
+static const ALIGN_ASSET(2) char ddan_room_12DL_001BE0[] = dddan_room_12DL_001BE0;
 
 
 #endif // DUNGEONS_DDAN_ROOM_12_H
diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_13.h b/soh/assets/scenes/dungeons/ddan/ddan_room_13.h
index ba9752dcc..ebb860af3 100644
--- a/soh/assets/scenes/dungeons/ddan/ddan_room_13.h
+++ b/soh/assets/scenes/dungeons/ddan/ddan_room_13.h
@@ -3,20 +3,20 @@
 
 #include "align_asset_macro.h"
 
-#define dddan_room_13DL_0006E0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_13DL_0006E0"
-static const ALIGN_ASSET(2) char ddan_room_13DL_0006E0[] = dddan_room_13DL_0006E0;
+#define dddan_room_13Tex_000CC8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_13Tex_000CC8"
+static const ALIGN_ASSET(2) char ddan_room_13Tex_000CC8[] = dddan_room_13Tex_000CC8;
 
 #define dddan_room_13Tex_0014C8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_13Tex_0014C8"
 static const ALIGN_ASSET(2) char ddan_room_13Tex_0014C8[] = dddan_room_13Tex_0014C8;
 
-#define dddan_room_13Tex_0020C8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_13Tex_0020C8"
-static const ALIGN_ASSET(2) char ddan_room_13Tex_0020C8[] = dddan_room_13Tex_0020C8;
-
-#define dddan_room_13Tex_000CC8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_13Tex_000CC8"
-static const ALIGN_ASSET(2) char ddan_room_13Tex_000CC8[] = dddan_room_13Tex_000CC8;
-
 #define dddan_room_13Tex_001CC8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_13Tex_001CC8"
 static const ALIGN_ASSET(2) char ddan_room_13Tex_001CC8[] = dddan_room_13Tex_001CC8;
 
+#define dddan_room_13Tex_0020C8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_13Tex_0020C8"
+static const ALIGN_ASSET(2) char ddan_room_13Tex_0020C8[] = dddan_room_13Tex_0020C8;
+
+#define dddan_room_13DL_0006E0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_13DL_0006E0"
+static const ALIGN_ASSET(2) char ddan_room_13DL_0006E0[] = dddan_room_13DL_0006E0;
+
 
 #endif // DUNGEONS_DDAN_ROOM_13_H
diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_14.h b/soh/assets/scenes/dungeons/ddan/ddan_room_14.h
index 7d37556f9..114d62339 100644
--- a/soh/assets/scenes/dungeons/ddan/ddan_room_14.h
+++ b/soh/assets/scenes/dungeons/ddan/ddan_room_14.h
@@ -3,20 +3,20 @@
 
 #include "align_asset_macro.h"
 
-#define dddan_room_14DL_0006A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_14DL_0006A0"
-static const ALIGN_ASSET(2) char ddan_room_14DL_0006A0[] = dddan_room_14DL_0006A0;
-
 #define dddan_room_14Tex_000CC8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_14Tex_000CC8"
 static const ALIGN_ASSET(2) char ddan_room_14Tex_000CC8[] = dddan_room_14Tex_000CC8;
 
-#define dddan_room_14Tex_0020C8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_14Tex_0020C8"
-static const ALIGN_ASSET(2) char ddan_room_14Tex_0020C8[] = dddan_room_14Tex_0020C8;
-
 #define dddan_room_14Tex_0014C8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_14Tex_0014C8"
 static const ALIGN_ASSET(2) char ddan_room_14Tex_0014C8[] = dddan_room_14Tex_0014C8;
 
 #define dddan_room_14Tex_001CC8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_14Tex_001CC8"
 static const ALIGN_ASSET(2) char ddan_room_14Tex_001CC8[] = dddan_room_14Tex_001CC8;
 
+#define dddan_room_14Tex_0020C8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_14Tex_0020C8"
+static const ALIGN_ASSET(2) char ddan_room_14Tex_0020C8[] = dddan_room_14Tex_0020C8;
+
+#define dddan_room_14DL_0006A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_14DL_0006A0"
+static const ALIGN_ASSET(2) char ddan_room_14DL_0006A0[] = dddan_room_14DL_0006A0;
+
 
 #endif // DUNGEONS_DDAN_ROOM_14_H
diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_15.h b/soh/assets/scenes/dungeons/ddan/ddan_room_15.h
index 8b3993eca..df5973361 100644
--- a/soh/assets/scenes/dungeons/ddan/ddan_room_15.h
+++ b/soh/assets/scenes/dungeons/ddan/ddan_room_15.h
@@ -3,8 +3,11 @@
 
 #include "align_asset_macro.h"
 
-#define dddan_room_15DL_000780 "__OTR__scenes/nonmq/ddan_scene/ddan_room_15DL_000780"
-static const ALIGN_ASSET(2) char ddan_room_15DL_000780[] = dddan_room_15DL_000780;
+#define dddan_room_15Tex_000D28 "__OTR__scenes/nonmq/ddan_scene/ddan_room_15Tex_000D28"
+static const ALIGN_ASSET(2) char ddan_room_15Tex_000D28[] = dddan_room_15Tex_000D28;
+
+#define dddan_room_15Tex_001528 "__OTR__scenes/nonmq/ddan_scene/ddan_room_15Tex_001528"
+static const ALIGN_ASSET(2) char ddan_room_15Tex_001528[] = dddan_room_15Tex_001528;
 
 #define dddan_room_15Tex_001D28 "__OTR__scenes/nonmq/ddan_scene/ddan_room_15Tex_001D28"
 static const ALIGN_ASSET(2) char ddan_room_15Tex_001D28[] = dddan_room_15Tex_001D28;
@@ -12,11 +15,8 @@ static const ALIGN_ASSET(2) char ddan_room_15Tex_001D28[] = dddan_room_15Tex_001
 #define dddan_room_15Tex_002528 "__OTR__scenes/nonmq/ddan_scene/ddan_room_15Tex_002528"
 static const ALIGN_ASSET(2) char ddan_room_15Tex_002528[] = dddan_room_15Tex_002528;
 
-#define dddan_room_15Tex_001528 "__OTR__scenes/nonmq/ddan_scene/ddan_room_15Tex_001528"
-static const ALIGN_ASSET(2) char ddan_room_15Tex_001528[] = dddan_room_15Tex_001528;
-
-#define dddan_room_15Tex_000D28 "__OTR__scenes/nonmq/ddan_scene/ddan_room_15Tex_000D28"
-static const ALIGN_ASSET(2) char ddan_room_15Tex_000D28[] = dddan_room_15Tex_000D28;
+#define dddan_room_15DL_000780 "__OTR__scenes/nonmq/ddan_scene/ddan_room_15DL_000780"
+static const ALIGN_ASSET(2) char ddan_room_15DL_000780[] = dddan_room_15DL_000780;
 
 
 #endif // DUNGEONS_DDAN_ROOM_15_H
diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_16.h b/soh/assets/scenes/dungeons/ddan/ddan_room_16.h
index f34baa433..963050044 100644
--- a/soh/assets/scenes/dungeons/ddan/ddan_room_16.h
+++ b/soh/assets/scenes/dungeons/ddan/ddan_room_16.h
@@ -3,11 +3,14 @@
 
 #include "align_asset_macro.h"
 
-#define dddan_room_16DL_0009D0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_16DL_0009D0"
-static const ALIGN_ASSET(2) char ddan_room_16DL_0009D0[] = dddan_room_16DL_0009D0;
+#define dddan_room_16Tex_002158 "__OTR__scenes/nonmq/ddan_scene/ddan_room_16Tex_002158"
+static const ALIGN_ASSET(2) char ddan_room_16Tex_002158[] = dddan_room_16Tex_002158;
 
-#define dddan_room_16Tex_005158 "__OTR__scenes/nonmq/ddan_scene/ddan_room_16Tex_005158"
-static const ALIGN_ASSET(2) char ddan_room_16Tex_005158[] = dddan_room_16Tex_005158;
+#define dddan_room_16Tex_003158 "__OTR__scenes/nonmq/ddan_scene/ddan_room_16Tex_003158"
+static const ALIGN_ASSET(2) char ddan_room_16Tex_003158[] = dddan_room_16Tex_003158;
+
+#define dddan_room_16Tex_003958 "__OTR__scenes/nonmq/ddan_scene/ddan_room_16Tex_003958"
+static const ALIGN_ASSET(2) char ddan_room_16Tex_003958[] = dddan_room_16Tex_003958;
 
 #define dddan_room_16Tex_004158 "__OTR__scenes/nonmq/ddan_scene/ddan_room_16Tex_004158"
 static const ALIGN_ASSET(2) char ddan_room_16Tex_004158[] = dddan_room_16Tex_004158;
@@ -15,17 +18,14 @@ static const ALIGN_ASSET(2) char ddan_room_16Tex_004158[] = dddan_room_16Tex_004
 #define dddan_room_16Tex_004958 "__OTR__scenes/nonmq/ddan_scene/ddan_room_16Tex_004958"
 static const ALIGN_ASSET(2) char ddan_room_16Tex_004958[] = dddan_room_16Tex_004958;
 
+#define dddan_room_16Tex_005158 "__OTR__scenes/nonmq/ddan_scene/ddan_room_16Tex_005158"
+static const ALIGN_ASSET(2) char ddan_room_16Tex_005158[] = dddan_room_16Tex_005158;
+
+#define dddan_room_16DL_0009D0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_16DL_0009D0"
+static const ALIGN_ASSET(2) char ddan_room_16DL_0009D0[] = dddan_room_16DL_0009D0;
+
 #define dddan_room_16DL_0019B8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_16DL_0019B8"
 static const ALIGN_ASSET(2) char ddan_room_16DL_0019B8[] = dddan_room_16DL_0019B8;
 
-#define dddan_room_16Tex_003158 "__OTR__scenes/nonmq/ddan_scene/ddan_room_16Tex_003158"
-static const ALIGN_ASSET(2) char ddan_room_16Tex_003158[] = dddan_room_16Tex_003158;
-
-#define dddan_room_16Tex_002158 "__OTR__scenes/nonmq/ddan_scene/ddan_room_16Tex_002158"
-static const ALIGN_ASSET(2) char ddan_room_16Tex_002158[] = dddan_room_16Tex_002158;
-
-#define dddan_room_16Tex_003958 "__OTR__scenes/nonmq/ddan_scene/ddan_room_16Tex_003958"
-static const ALIGN_ASSET(2) char ddan_room_16Tex_003958[] = dddan_room_16Tex_003958;
-
 
 #endif // DUNGEONS_DDAN_ROOM_16_H
diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_2.h b/soh/assets/scenes/dungeons/ddan/ddan_room_2.h
index 2c8a3c2ed..687616b82 100644
--- a/soh/assets/scenes/dungeons/ddan/ddan_room_2.h
+++ b/soh/assets/scenes/dungeons/ddan/ddan_room_2.h
@@ -3,41 +3,41 @@
 
 #include "align_asset_macro.h"
 
-#define dddan_room_2DL_001B30 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2DL_001B30"
-static const ALIGN_ASSET(2) char ddan_room_2DL_001B30[] = dddan_room_2DL_001B30;
-
-#define dddan_room_2Tex_004B80 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2Tex_004B80"
-static const ALIGN_ASSET(2) char ddan_room_2Tex_004B80[] = dddan_room_2Tex_004B80;
-
-#define dddan_room_2Tex_006380 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2Tex_006380"
-static const ALIGN_ASSET(2) char ddan_room_2Tex_006380[] = dddan_room_2Tex_006380;
-
 #define dddan_room_2Tex_003B80 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2Tex_003B80"
 static const ALIGN_ASSET(2) char ddan_room_2Tex_003B80[] = dddan_room_2Tex_003B80;
 
-#define dddan_room_2Tex_005F80 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2Tex_005F80"
-static const ALIGN_ASSET(2) char ddan_room_2Tex_005F80[] = dddan_room_2Tex_005F80;
-
-#define dddan_room_2Tex_005380 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2Tex_005380"
-static const ALIGN_ASSET(2) char ddan_room_2Tex_005380[] = dddan_room_2Tex_005380;
-
-#define dddan_room_2Tex_004780 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2Tex_004780"
-static const ALIGN_ASSET(2) char ddan_room_2Tex_004780[] = dddan_room_2Tex_004780;
-
 #define dddan_room_2Tex_004380 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2Tex_004380"
 static const ALIGN_ASSET(2) char ddan_room_2Tex_004380[] = dddan_room_2Tex_004380;
 
+#define dddan_room_2Tex_004780 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2Tex_004780"
+static const ALIGN_ASSET(2) char ddan_room_2Tex_004780[] = dddan_room_2Tex_004780;
+
+#define dddan_room_2Tex_004B80 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2Tex_004B80"
+static const ALIGN_ASSET(2) char ddan_room_2Tex_004B80[] = dddan_room_2Tex_004B80;
+
+#define dddan_room_2Tex_005380 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2Tex_005380"
+static const ALIGN_ASSET(2) char ddan_room_2Tex_005380[] = dddan_room_2Tex_005380;
+
 #define dddan_room_2Tex_005B80 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2Tex_005B80"
 static const ALIGN_ASSET(2) char ddan_room_2Tex_005B80[] = dddan_room_2Tex_005B80;
 
+#define dddan_room_2Tex_005F80 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2Tex_005F80"
+static const ALIGN_ASSET(2) char ddan_room_2Tex_005F80[] = dddan_room_2Tex_005F80;
+
+#define dddan_room_2Tex_006380 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2Tex_006380"
+static const ALIGN_ASSET(2) char ddan_room_2Tex_006380[] = dddan_room_2Tex_006380;
+
+#define dddan_room_2Tex_006EB8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2Tex_006EB8"
+static const ALIGN_ASSET(2) char ddan_room_2Tex_006EB8[] = dddan_room_2Tex_006EB8;
+
+#define dddan_room_2DL_001B30 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2DL_001B30"
+static const ALIGN_ASSET(2) char ddan_room_2DL_001B30[] = dddan_room_2DL_001B30;
+
 #define dddan_room_2DL_0035C8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2DL_0035C8"
 static const ALIGN_ASSET(2) char ddan_room_2DL_0035C8[] = dddan_room_2DL_0035C8;
 
 #define dddan_room_2DL_006CB0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2DL_006CB0"
 static const ALIGN_ASSET(2) char ddan_room_2DL_006CB0[] = dddan_room_2DL_006CB0;
 
-#define dddan_room_2Tex_006EB8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_2Tex_006EB8"
-static const ALIGN_ASSET(2) char ddan_room_2Tex_006EB8[] = dddan_room_2Tex_006EB8;
-
 
 #endif // DUNGEONS_DDAN_ROOM_2_H
diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_3.h b/soh/assets/scenes/dungeons/ddan/ddan_room_3.h
index 76b5b7bb9..f23526a81 100644
--- a/soh/assets/scenes/dungeons/ddan/ddan_room_3.h
+++ b/soh/assets/scenes/dungeons/ddan/ddan_room_3.h
@@ -3,23 +3,11 @@
 
 #include "align_asset_macro.h"
 
-#define dddan_room_3DL_0018F0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3DL_0018F0"
-static const ALIGN_ASSET(2) char ddan_room_3DL_0018F0[] = dddan_room_3DL_0018F0;
-
-#define dddan_room_3Tex_00A838 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_00A838"
-static const ALIGN_ASSET(2) char ddan_room_3Tex_00A838[] = dddan_room_3Tex_00A838;
-
-#define dddan_room_3Tex_008C38 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_008C38"
-static const ALIGN_ASSET(2) char ddan_room_3Tex_008C38[] = dddan_room_3Tex_008C38;
-
-#define dddan_room_3Tex_00D038 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_00D038"
-static const ALIGN_ASSET(2) char ddan_room_3Tex_00D038[] = dddan_room_3Tex_00D038;
-
 #define dddan_room_3Tex_008838 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_008838"
 static const ALIGN_ASSET(2) char ddan_room_3Tex_008838[] = dddan_room_3Tex_008838;
 
-#define dddan_room_3DL_002A40 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3DL_002A40"
-static const ALIGN_ASSET(2) char ddan_room_3DL_002A40[] = dddan_room_3DL_002A40;
+#define dddan_room_3Tex_008C38 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_008C38"
+static const ALIGN_ASSET(2) char ddan_room_3Tex_008C38[] = dddan_room_3Tex_008C38;
 
 #define dddan_room_3Tex_009438 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_009438"
 static const ALIGN_ASSET(2) char ddan_room_3Tex_009438[] = dddan_room_3Tex_009438;
@@ -30,26 +18,47 @@ static const ALIGN_ASSET(2) char ddan_room_3Tex_009838[] = dddan_room_3Tex_00983
 #define dddan_room_3Tex_00A038 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_00A038"
 static const ALIGN_ASSET(2) char ddan_room_3Tex_00A038[] = dddan_room_3Tex_00A038;
 
+#define dddan_room_3Tex_00A838 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_00A838"
+static const ALIGN_ASSET(2) char ddan_room_3Tex_00A838[] = dddan_room_3Tex_00A838;
+
+#define dddan_room_3Tex_00B038 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_00B038"
+static const ALIGN_ASSET(2) char ddan_room_3Tex_00B038[] = dddan_room_3Tex_00B038;
+
+#define dddan_room_3Tex_00B438 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_00B438"
+static const ALIGN_ASSET(2) char ddan_room_3Tex_00B438[] = dddan_room_3Tex_00B438;
+
 #define dddan_room_3Tex_00B838 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_00B838"
 static const ALIGN_ASSET(2) char ddan_room_3Tex_00B838[] = dddan_room_3Tex_00B838;
 
 #define dddan_room_3Tex_00BC38 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_00BC38"
 static const ALIGN_ASSET(2) char ddan_room_3Tex_00BC38[] = dddan_room_3Tex_00BC38;
 
-#define dddan_room_3DL_003968 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3DL_003968"
-static const ALIGN_ASSET(2) char ddan_room_3DL_003968[] = dddan_room_3DL_003968;
-
 #define dddan_room_3Tex_00C438 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_00C438"
 static const ALIGN_ASSET(2) char ddan_room_3Tex_00C438[] = dddan_room_3Tex_00C438;
 
-#define dddan_room_3DL_005098 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3DL_005098"
-static const ALIGN_ASSET(2) char ddan_room_3DL_005098[] = dddan_room_3DL_005098;
-
 #define dddan_room_3Tex_00CC38 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_00CC38"
 static const ALIGN_ASSET(2) char ddan_room_3Tex_00CC38[] = dddan_room_3Tex_00CC38;
 
-#define dddan_room_3Tex_00B438 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_00B438"
-static const ALIGN_ASSET(2) char ddan_room_3Tex_00B438[] = dddan_room_3Tex_00B438;
+#define dddan_room_3Tex_00D038 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_00D038"
+static const ALIGN_ASSET(2) char ddan_room_3Tex_00D038[] = dddan_room_3Tex_00D038;
+
+#define dddan_room_3Tex_00D668 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_00D668"
+static const ALIGN_ASSET(2) char ddan_room_3Tex_00D668[] = dddan_room_3Tex_00D668;
+
+#define dddan_room_3TLUT_008630 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3TLUT_008630"
+static const ALIGN_ASSET(2) char ddan_room_3TLUT_008630[] = dddan_room_3TLUT_008630;
+
+#define dddan_room_3DL_0018F0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3DL_0018F0"
+static const ALIGN_ASSET(2) char ddan_room_3DL_0018F0[] = dddan_room_3DL_0018F0;
+
+#define dddan_room_3DL_002A40 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3DL_002A40"
+static const ALIGN_ASSET(2) char ddan_room_3DL_002A40[] = dddan_room_3DL_002A40;
+
+#define dddan_room_3DL_003968 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3DL_003968"
+static const ALIGN_ASSET(2) char ddan_room_3DL_003968[] = dddan_room_3DL_003968;
+
+#define dddan_room_3DL_005098 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3DL_005098"
+static const ALIGN_ASSET(2) char ddan_room_3DL_005098[] = dddan_room_3DL_005098;
 
 #define dddan_room_3DL_006510 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3DL_006510"
 static const ALIGN_ASSET(2) char ddan_room_3DL_006510[] = dddan_room_3DL_006510;
@@ -63,21 +72,12 @@ static const ALIGN_ASSET(2) char ddan_room_3DL_007990[] = dddan_room_3DL_007990;
 #define dddan_room_3DL_008018 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3DL_008018"
 static const ALIGN_ASSET(2) char ddan_room_3DL_008018[] = dddan_room_3DL_008018;
 
-#define dddan_room_3TLUT_008630 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3TLUT_008630"
-static const ALIGN_ASSET(2) char ddan_room_3TLUT_008630[] = dddan_room_3TLUT_008630;
-
 #define dddan_room_3DL_008430 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3DL_008430"
 static const ALIGN_ASSET(2) char ddan_room_3DL_008430[] = dddan_room_3DL_008430;
 
-#define dddan_room_3Tex_00B038 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_00B038"
-static const ALIGN_ASSET(2) char ddan_room_3Tex_00B038[] = dddan_room_3Tex_00B038;
-
 #define dddan_room_3DL_00D560 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3DL_00D560"
 static const ALIGN_ASSET(2) char ddan_room_3DL_00D560[] = dddan_room_3DL_00D560;
 
-#define dddan_room_3Tex_00D668 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3Tex_00D668"
-static const ALIGN_ASSET(2) char ddan_room_3Tex_00D668[] = dddan_room_3Tex_00D668;
-
 #define dddan_room_3DL_000430 "__OTR__scenes/nonmq/ddan_scene/ddan_room_3DL_000430"
 static const ALIGN_ASSET(2) char ddan_room_3DL_000430[] = dddan_room_3DL_000430;
 
diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_4.h b/soh/assets/scenes/dungeons/ddan/ddan_room_4.h
index f8e792c01..1944d691c 100644
--- a/soh/assets/scenes/dungeons/ddan/ddan_room_4.h
+++ b/soh/assets/scenes/dungeons/ddan/ddan_room_4.h
@@ -3,35 +3,35 @@
 
 #include "align_asset_macro.h"
 
-#define dddan_room_4DL_003260 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4DL_003260"
-static const ALIGN_ASSET(2) char ddan_room_4DL_003260[] = dddan_room_4DL_003260;
-
-#define dddan_room_4Tex_007D58 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4Tex_007D58"
-static const ALIGN_ASSET(2) char ddan_room_4Tex_007D58[] = dddan_room_4Tex_007D58;
+#define dddan_room_4Tex_006D58 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4Tex_006D58"
+static const ALIGN_ASSET(2) char ddan_room_4Tex_006D58[] = dddan_room_4Tex_006D58;
 
 #define dddan_room_4Tex_007158 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4Tex_007158"
 static const ALIGN_ASSET(2) char ddan_room_4Tex_007158[] = dddan_room_4Tex_007158;
 
-#define dddan_room_4TLUT_006B50 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4TLUT_006B50"
-static const ALIGN_ASSET(2) char ddan_room_4TLUT_006B50[] = dddan_room_4TLUT_006B50;
-
-#define dddan_room_4Tex_009158 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4Tex_009158"
-static const ALIGN_ASSET(2) char ddan_room_4Tex_009158[] = dddan_room_4Tex_009158;
-
 #define dddan_room_4Tex_007558 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4Tex_007558"
 static const ALIGN_ASSET(2) char ddan_room_4Tex_007558[] = dddan_room_4Tex_007558;
 
-#define dddan_room_4Tex_008D58 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4Tex_008D58"
-static const ALIGN_ASSET(2) char ddan_room_4Tex_008D58[] = dddan_room_4Tex_008D58;
-
-#define dddan_room_4Tex_006D58 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4Tex_006D58"
-static const ALIGN_ASSET(2) char ddan_room_4Tex_006D58[] = dddan_room_4Tex_006D58;
-
-#define dddan_room_4DL_0068C0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4DL_0068C0"
-static const ALIGN_ASSET(2) char ddan_room_4DL_0068C0[] = dddan_room_4DL_0068C0;
+#define dddan_room_4Tex_007D58 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4Tex_007D58"
+static const ALIGN_ASSET(2) char ddan_room_4Tex_007D58[] = dddan_room_4Tex_007D58;
 
 #define dddan_room_4Tex_008558 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4Tex_008558"
 static const ALIGN_ASSET(2) char ddan_room_4Tex_008558[] = dddan_room_4Tex_008558;
 
+#define dddan_room_4Tex_008D58 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4Tex_008D58"
+static const ALIGN_ASSET(2) char ddan_room_4Tex_008D58[] = dddan_room_4Tex_008D58;
+
+#define dddan_room_4Tex_009158 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4Tex_009158"
+static const ALIGN_ASSET(2) char ddan_room_4Tex_009158[] = dddan_room_4Tex_009158;
+
+#define dddan_room_4TLUT_006B50 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4TLUT_006B50"
+static const ALIGN_ASSET(2) char ddan_room_4TLUT_006B50[] = dddan_room_4TLUT_006B50;
+
+#define dddan_room_4DL_003260 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4DL_003260"
+static const ALIGN_ASSET(2) char ddan_room_4DL_003260[] = dddan_room_4DL_003260;
+
+#define dddan_room_4DL_0068C0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_4DL_0068C0"
+static const ALIGN_ASSET(2) char ddan_room_4DL_0068C0[] = dddan_room_4DL_0068C0;
+
 
 #endif // DUNGEONS_DDAN_ROOM_4_H
diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_5.h b/soh/assets/scenes/dungeons/ddan/ddan_room_5.h
index 0ff71839f..92776c592 100644
--- a/soh/assets/scenes/dungeons/ddan/ddan_room_5.h
+++ b/soh/assets/scenes/dungeons/ddan/ddan_room_5.h
@@ -3,29 +3,29 @@
 
 #include "align_asset_macro.h"
 
-#define dddan_room_5DL_001D70 "__OTR__scenes/nonmq/ddan_scene/ddan_room_5DL_001D70"
-static const ALIGN_ASSET(2) char ddan_room_5DL_001D70[] = dddan_room_5DL_001D70;
-
-#define dddan_room_5Tex_0042B8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_5Tex_0042B8"
-static const ALIGN_ASSET(2) char ddan_room_5Tex_0042B8[] = dddan_room_5Tex_0042B8;
-
-#define dddan_room_5Tex_004AB8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_5Tex_004AB8"
-static const ALIGN_ASSET(2) char ddan_room_5Tex_004AB8[] = dddan_room_5Tex_004AB8;
-
 #define dddan_room_5Tex_0032B8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_5Tex_0032B8"
 static const ALIGN_ASSET(2) char ddan_room_5Tex_0032B8[] = dddan_room_5Tex_0032B8;
 
-#define dddan_room_5Tex_004EB8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_5Tex_004EB8"
-static const ALIGN_ASSET(2) char ddan_room_5Tex_004EB8[] = dddan_room_5Tex_004EB8;
-
-#define dddan_room_5Tex_0046B8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_5Tex_0046B8"
-static const ALIGN_ASSET(2) char ddan_room_5Tex_0046B8[] = dddan_room_5Tex_0046B8;
-
 #define dddan_room_5Tex_003AB8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_5Tex_003AB8"
 static const ALIGN_ASSET(2) char ddan_room_5Tex_003AB8[] = dddan_room_5Tex_003AB8;
 
+#define dddan_room_5Tex_0042B8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_5Tex_0042B8"
+static const ALIGN_ASSET(2) char ddan_room_5Tex_0042B8[] = dddan_room_5Tex_0042B8;
+
+#define dddan_room_5Tex_0046B8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_5Tex_0046B8"
+static const ALIGN_ASSET(2) char ddan_room_5Tex_0046B8[] = dddan_room_5Tex_0046B8;
+
+#define dddan_room_5Tex_004AB8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_5Tex_004AB8"
+static const ALIGN_ASSET(2) char ddan_room_5Tex_004AB8[] = dddan_room_5Tex_004AB8;
+
+#define dddan_room_5Tex_004EB8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_5Tex_004EB8"
+static const ALIGN_ASSET(2) char ddan_room_5Tex_004EB8[] = dddan_room_5Tex_004EB8;
+
 #define dddan_room_5Tex_0056B8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_5Tex_0056B8"
 static const ALIGN_ASSET(2) char ddan_room_5Tex_0056B8[] = dddan_room_5Tex_0056B8;
 
+#define dddan_room_5DL_001D70 "__OTR__scenes/nonmq/ddan_scene/ddan_room_5DL_001D70"
+static const ALIGN_ASSET(2) char ddan_room_5DL_001D70[] = dddan_room_5DL_001D70;
+
 
 #endif // DUNGEONS_DDAN_ROOM_5_H
diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_6.h b/soh/assets/scenes/dungeons/ddan/ddan_room_6.h
index d4a6a0ede..472520ec3 100644
--- a/soh/assets/scenes/dungeons/ddan/ddan_room_6.h
+++ b/soh/assets/scenes/dungeons/ddan/ddan_room_6.h
@@ -3,20 +3,20 @@
 
 #include "align_asset_macro.h"
 
-#define dddan_room_6DL_000700 "__OTR__scenes/nonmq/ddan_scene/ddan_room_6DL_000700"
-static const ALIGN_ASSET(2) char ddan_room_6DL_000700[] = dddan_room_6DL_000700;
-
 #define dddan_room_6Tex_000CA8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_6Tex_000CA8"
 static const ALIGN_ASSET(2) char ddan_room_6Tex_000CA8[] = dddan_room_6Tex_000CA8;
 
 #define dddan_room_6Tex_0014A8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_6Tex_0014A8"
 static const ALIGN_ASSET(2) char ddan_room_6Tex_0014A8[] = dddan_room_6Tex_0014A8;
 
-#define dddan_room_6Tex_0020A8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_6Tex_0020A8"
-static const ALIGN_ASSET(2) char ddan_room_6Tex_0020A8[] = dddan_room_6Tex_0020A8;
-
 #define dddan_room_6Tex_001CA8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_6Tex_001CA8"
 static const ALIGN_ASSET(2) char ddan_room_6Tex_001CA8[] = dddan_room_6Tex_001CA8;
 
+#define dddan_room_6Tex_0020A8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_6Tex_0020A8"
+static const ALIGN_ASSET(2) char ddan_room_6Tex_0020A8[] = dddan_room_6Tex_0020A8;
+
+#define dddan_room_6DL_000700 "__OTR__scenes/nonmq/ddan_scene/ddan_room_6DL_000700"
+static const ALIGN_ASSET(2) char ddan_room_6DL_000700[] = dddan_room_6DL_000700;
+
 
 #endif // DUNGEONS_DDAN_ROOM_6_H
diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_7.h b/soh/assets/scenes/dungeons/ddan/ddan_room_7.h
index 034fa7ac1..1de794e98 100644
--- a/soh/assets/scenes/dungeons/ddan/ddan_room_7.h
+++ b/soh/assets/scenes/dungeons/ddan/ddan_room_7.h
@@ -3,18 +3,12 @@
 
 #include "align_asset_macro.h"
 
-#define dddan_room_7DL_002670 "__OTR__scenes/nonmq/ddan_scene/ddan_room_7DL_002670"
-static const ALIGN_ASSET(2) char ddan_room_7DL_002670[] = dddan_room_7DL_002670;
-
 #define dddan_room_7Tex_0046F8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_7Tex_0046F8"
 static const ALIGN_ASSET(2) char ddan_room_7Tex_0046F8[] = dddan_room_7Tex_0046F8;
 
 #define dddan_room_7Tex_004AF8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_7Tex_004AF8"
 static const ALIGN_ASSET(2) char ddan_room_7Tex_004AF8[] = dddan_room_7Tex_004AF8;
 
-#define dddan_room_7Tex_0066F8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_7Tex_0066F8"
-static const ALIGN_ASSET(2) char ddan_room_7Tex_0066F8[] = dddan_room_7Tex_0066F8;
-
 #define dddan_room_7Tex_004EF8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_7Tex_004EF8"
 static const ALIGN_ASSET(2) char ddan_room_7Tex_004EF8[] = dddan_room_7Tex_004EF8;
 
@@ -24,9 +18,15 @@ static const ALIGN_ASSET(2) char ddan_room_7Tex_0056F8[] = dddan_room_7Tex_0056F
 #define dddan_room_7Tex_005EF8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_7Tex_005EF8"
 static const ALIGN_ASSET(2) char ddan_room_7Tex_005EF8[] = dddan_room_7Tex_005EF8;
 
+#define dddan_room_7Tex_0066F8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_7Tex_0066F8"
+static const ALIGN_ASSET(2) char ddan_room_7Tex_0066F8[] = dddan_room_7Tex_0066F8;
+
 #define dddan_room_7Tex_006EF8 "__OTR__scenes/nonmq/ddan_scene/ddan_room_7Tex_006EF8"
 static const ALIGN_ASSET(2) char ddan_room_7Tex_006EF8[] = dddan_room_7Tex_006EF8;
 
+#define dddan_room_7DL_002670 "__OTR__scenes/nonmq/ddan_scene/ddan_room_7DL_002670"
+static const ALIGN_ASSET(2) char ddan_room_7DL_002670[] = dddan_room_7DL_002670;
+
 #define dddan_room_7DL_004538 "__OTR__scenes/nonmq/ddan_scene/ddan_room_7DL_004538"
 static const ALIGN_ASSET(2) char ddan_room_7DL_004538[] = dddan_room_7DL_004538;
 
diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_8.h b/soh/assets/scenes/dungeons/ddan/ddan_room_8.h
index 6a2cf811e..2878c82b3 100644
--- a/soh/assets/scenes/dungeons/ddan/ddan_room_8.h
+++ b/soh/assets/scenes/dungeons/ddan/ddan_room_8.h
@@ -3,38 +3,17 @@
 
 #include "align_asset_macro.h"
 
-#define dddan_room_8DL_002610 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8DL_002610"
-static const ALIGN_ASSET(2) char ddan_room_8DL_002610[] = dddan_room_8DL_002610;
+#define dddan_room_8Tex_0041A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0041A0"
+static const ALIGN_ASSET(2) char ddan_room_8Tex_0041A0[] = dddan_room_8Tex_0041A0;
 
-#define dddan_room_8Tex_0089A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0089A0"
-static const ALIGN_ASSET(2) char ddan_room_8Tex_0089A0[] = dddan_room_8Tex_0089A0;
-
-#define dddan_room_8Tex_0071A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0071A0"
-static const ALIGN_ASSET(2) char ddan_room_8Tex_0071A0[] = dddan_room_8Tex_0071A0;
-
-#define dddan_room_8Tex_0091A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0091A0"
-static const ALIGN_ASSET(2) char ddan_room_8Tex_0091A0[] = dddan_room_8Tex_0091A0;
-
-#define dddan_room_8Tex_0051A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0051A0"
-static const ALIGN_ASSET(2) char ddan_room_8Tex_0051A0[] = dddan_room_8Tex_0051A0;
-
-#define dddan_room_8Tex_0081A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0081A0"
-static const ALIGN_ASSET(2) char ddan_room_8Tex_0081A0[] = dddan_room_8Tex_0081A0;
+#define dddan_room_8Tex_0049A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0049A0"
+static const ALIGN_ASSET(2) char ddan_room_8Tex_0049A0[] = dddan_room_8Tex_0049A0;
 
 #define dddan_room_8Tex_004DA0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_004DA0"
 static const ALIGN_ASSET(2) char ddan_room_8Tex_004DA0[] = dddan_room_8Tex_004DA0;
 
-#define dddan_room_8Tex_0069A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0069A0"
-static const ALIGN_ASSET(2) char ddan_room_8Tex_0069A0[] = dddan_room_8Tex_0069A0;
-
-#define dddan_room_8Tex_0041A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0041A0"
-static const ALIGN_ASSET(2) char ddan_room_8Tex_0041A0[] = dddan_room_8Tex_0041A0;
-
-#define dddan_room_8Tex_0079A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0079A0"
-static const ALIGN_ASSET(2) char ddan_room_8Tex_0079A0[] = dddan_room_8Tex_0079A0;
-
-#define dddan_room_8Tex_0049A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0049A0"
-static const ALIGN_ASSET(2) char ddan_room_8Tex_0049A0[] = dddan_room_8Tex_0049A0;
+#define dddan_room_8Tex_0051A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0051A0"
+static const ALIGN_ASSET(2) char ddan_room_8Tex_0051A0[] = dddan_room_8Tex_0051A0;
 
 #define dddan_room_8Tex_0059A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0059A0"
 static const ALIGN_ASSET(2) char ddan_room_8Tex_0059A0[] = dddan_room_8Tex_0059A0;
@@ -42,5 +21,26 @@ static const ALIGN_ASSET(2) char ddan_room_8Tex_0059A0[] = dddan_room_8Tex_0059A
 #define dddan_room_8Tex_0061A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0061A0"
 static const ALIGN_ASSET(2) char ddan_room_8Tex_0061A0[] = dddan_room_8Tex_0061A0;
 
+#define dddan_room_8Tex_0069A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0069A0"
+static const ALIGN_ASSET(2) char ddan_room_8Tex_0069A0[] = dddan_room_8Tex_0069A0;
+
+#define dddan_room_8Tex_0071A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0071A0"
+static const ALIGN_ASSET(2) char ddan_room_8Tex_0071A0[] = dddan_room_8Tex_0071A0;
+
+#define dddan_room_8Tex_0079A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0079A0"
+static const ALIGN_ASSET(2) char ddan_room_8Tex_0079A0[] = dddan_room_8Tex_0079A0;
+
+#define dddan_room_8Tex_0081A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0081A0"
+static const ALIGN_ASSET(2) char ddan_room_8Tex_0081A0[] = dddan_room_8Tex_0081A0;
+
+#define dddan_room_8Tex_0089A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0089A0"
+static const ALIGN_ASSET(2) char ddan_room_8Tex_0089A0[] = dddan_room_8Tex_0089A0;
+
+#define dddan_room_8Tex_0091A0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8Tex_0091A0"
+static const ALIGN_ASSET(2) char ddan_room_8Tex_0091A0[] = dddan_room_8Tex_0091A0;
+
+#define dddan_room_8DL_002610 "__OTR__scenes/nonmq/ddan_scene/ddan_room_8DL_002610"
+static const ALIGN_ASSET(2) char ddan_room_8DL_002610[] = dddan_room_8DL_002610;
+
 
 #endif // DUNGEONS_DDAN_ROOM_8_H
diff --git a/soh/assets/scenes/dungeons/ddan/ddan_room_9.h b/soh/assets/scenes/dungeons/ddan/ddan_room_9.h
index dee3f237e..17eb8941f 100644
--- a/soh/assets/scenes/dungeons/ddan/ddan_room_9.h
+++ b/soh/assets/scenes/dungeons/ddan/ddan_room_9.h
@@ -3,35 +3,8 @@
 
 #include "align_asset_macro.h"
 
-#define dddan_room_9DL_0032B0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9DL_0032B0"
-static const ALIGN_ASSET(2) char ddan_room_9DL_0032B0[] = dddan_room_9DL_0032B0;
-
-#define dddan_room_9Tex_009128 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_009128"
-static const ALIGN_ASSET(2) char ddan_room_9Tex_009128[] = dddan_room_9Tex_009128;
-
-#define dddan_room_9Tex_009928 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_009928"
-static const ALIGN_ASSET(2) char ddan_room_9Tex_009928[] = dddan_room_9Tex_009928;
-
-#define dddan_room_9Tex_00B128 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_00B128"
-static const ALIGN_ASSET(2) char ddan_room_9Tex_00B128[] = dddan_room_9Tex_00B128;
-
-#define dddan_room_9Tex_006928 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_006928"
-static const ALIGN_ASSET(2) char ddan_room_9Tex_006928[] = dddan_room_9Tex_006928;
-
-#define dddan_room_9Tex_006128 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_006128"
-static const ALIGN_ASSET(2) char ddan_room_9Tex_006128[] = dddan_room_9Tex_006128;
-
-#define dddan_room_9Tex_008D28 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_008D28"
-static const ALIGN_ASSET(2) char ddan_room_9Tex_008D28[] = dddan_room_9Tex_008D28;
-
-#define dddan_room_9Tex_007D28 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_007D28"
-static const ALIGN_ASSET(2) char ddan_room_9Tex_007D28[] = dddan_room_9Tex_007D28;
-
-#define dddan_room_9Tex_006D28 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_006D28"
-static const ALIGN_ASSET(2) char ddan_room_9Tex_006D28[] = dddan_room_9Tex_006D28;
-
-#define dddan_room_9Tex_00A128 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_00A128"
-static const ALIGN_ASSET(2) char ddan_room_9Tex_00A128[] = dddan_room_9Tex_00A128;
+#define dddan_room_9Tex_005128 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_005128"
+static const ALIGN_ASSET(2) char ddan_room_9Tex_005128[] = dddan_room_9Tex_005128;
 
 #define dddan_room_9Tex_005528 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_005528"
 static const ALIGN_ASSET(2) char ddan_room_9Tex_005528[] = dddan_room_9Tex_005528;
@@ -39,11 +12,38 @@ static const ALIGN_ASSET(2) char ddan_room_9Tex_005528[] = dddan_room_9Tex_00552
 #define dddan_room_9Tex_005D28 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_005D28"
 static const ALIGN_ASSET(2) char ddan_room_9Tex_005D28[] = dddan_room_9Tex_005D28;
 
-#define dddan_room_9Tex_005128 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_005128"
-static const ALIGN_ASSET(2) char ddan_room_9Tex_005128[] = dddan_room_9Tex_005128;
+#define dddan_room_9Tex_006128 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_006128"
+static const ALIGN_ASSET(2) char ddan_room_9Tex_006128[] = dddan_room_9Tex_006128;
+
+#define dddan_room_9Tex_006928 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_006928"
+static const ALIGN_ASSET(2) char ddan_room_9Tex_006928[] = dddan_room_9Tex_006928;
+
+#define dddan_room_9Tex_006D28 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_006D28"
+static const ALIGN_ASSET(2) char ddan_room_9Tex_006D28[] = dddan_room_9Tex_006D28;
+
+#define dddan_room_9Tex_007D28 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_007D28"
+static const ALIGN_ASSET(2) char ddan_room_9Tex_007D28[] = dddan_room_9Tex_007D28;
+
+#define dddan_room_9Tex_008D28 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_008D28"
+static const ALIGN_ASSET(2) char ddan_room_9Tex_008D28[] = dddan_room_9Tex_008D28;
+
+#define dddan_room_9Tex_009128 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_009128"
+static const ALIGN_ASSET(2) char ddan_room_9Tex_009128[] = dddan_room_9Tex_009128;
+
+#define dddan_room_9Tex_009928 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_009928"
+static const ALIGN_ASSET(2) char ddan_room_9Tex_009928[] = dddan_room_9Tex_009928;
+
+#define dddan_room_9Tex_00A128 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_00A128"
+static const ALIGN_ASSET(2) char ddan_room_9Tex_00A128[] = dddan_room_9Tex_00A128;
 
 #define dddan_room_9Tex_00A928 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_00A928"
 static const ALIGN_ASSET(2) char ddan_room_9Tex_00A928[] = dddan_room_9Tex_00A928;
 
+#define dddan_room_9Tex_00B128 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9Tex_00B128"
+static const ALIGN_ASSET(2) char ddan_room_9Tex_00B128[] = dddan_room_9Tex_00B128;
+
+#define dddan_room_9DL_0032B0 "__OTR__scenes/nonmq/ddan_scene/ddan_room_9DL_0032B0"
+static const ALIGN_ASSET(2) char ddan_room_9DL_0032B0[] = dddan_room_9DL_0032B0;
+
 
 #endif // DUNGEONS_DDAN_ROOM_9_H
diff --git a/soh/assets/scenes/dungeons/ddan/ddan_scene.h b/soh/assets/scenes/dungeons/ddan/ddan_scene.h
index 358ec5d21..c53b12a07 100644
--- a/soh/assets/scenes/dungeons/ddan/ddan_scene.h
+++ b/soh/assets/scenes/dungeons/ddan/ddan_scene.h
@@ -3,6 +3,9 @@
 
 #include "align_asset_macro.h"
 
+#define dddan_sceneTLUT_011D70 "__OTR__scenes/nonmq/ddan_scene/ddan_sceneTLUT_011D70"
+static const ALIGN_ASSET(2) char ddan_sceneTLUT_011D70[] = dddan_sceneTLUT_011D70;
+
 #define dgDCDayEntranceTex "__OTR__scenes/nonmq/ddan_scene/gDCDayEntranceTex"
 static const ALIGN_ASSET(2) char gDCDayEntranceTex[] = dgDCDayEntranceTex;
 
@@ -39,7 +42,5 @@ static const ALIGN_ASSET(2) char gDcOpeningCs[] = dgDcOpeningCs;
 #define dddan_sceneCollisionHeader_011D40 "__OTR__scenes/nonmq/ddan_scene/ddan_sceneCollisionHeader_011D40"
 static const ALIGN_ASSET(2) char ddan_sceneCollisionHeader_011D40[] = dddan_sceneCollisionHeader_011D40;
 
-#define dddan_sceneTLUT_011D70 "__OTR__scenes/nonmq/ddan_scene/ddan_sceneTLUT_011D70"
-static const ALIGN_ASSET(2) char ddan_sceneTLUT_011D70[] = dddan_sceneTLUT_011D70;
 
 #endif // DUNGEONS_DDAN_SCENE_H
diff --git a/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_room_0.h b/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_room_0.h
index 9f60814d0..9b727a9b5 100644
--- a/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_room_0.h
+++ b/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_room_0.h
@@ -3,20 +3,20 @@
 
 #include "align_asset_macro.h"
 
-#define dddan_boss_room_0DL_002000 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_0DL_002000"
-static const ALIGN_ASSET(2) char ddan_boss_room_0DL_002000[] = dddan_boss_room_0DL_002000;
-
-#define dddan_boss_room_0Tex_003A28 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_0Tex_003A28"
-static const ALIGN_ASSET(2) char ddan_boss_room_0Tex_003A28[] = dddan_boss_room_0Tex_003A28;
-
-#define dddan_boss_room_0Tex_003628 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_0Tex_003628"
+#define dddan_boss_room_0Tex_003628 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_room_0Tex_003628"
 static const ALIGN_ASSET(2) char ddan_boss_room_0Tex_003628[] = dddan_boss_room_0Tex_003628;
 
-#define dddan_boss_room_0Tex_003E28 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_0Tex_003E28"
+#define dddan_boss_room_0Tex_003A28 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_room_0Tex_003A28"
+static const ALIGN_ASSET(2) char ddan_boss_room_0Tex_003A28[] = dddan_boss_room_0Tex_003A28;
+
+#define dddan_boss_room_0Tex_003E28 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_room_0Tex_003E28"
 static const ALIGN_ASSET(2) char ddan_boss_room_0Tex_003E28[] = dddan_boss_room_0Tex_003E28;
 
-#define dddan_boss_room_0Tex_004628 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_0Tex_004628"
+#define dddan_boss_room_0Tex_004628 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_room_0Tex_004628"
 static const ALIGN_ASSET(2) char ddan_boss_room_0Tex_004628[] = dddan_boss_room_0Tex_004628;
 
+#define dddan_boss_room_0DL_002000 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_room_0DL_002000"
+static const ALIGN_ASSET(2) char ddan_boss_room_0DL_002000[] = dddan_boss_room_0DL_002000;
+
 
 #endif // DUNGEONS_DDAN_BOSS_ROOM_0_H
diff --git a/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_room_1.h b/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_room_1.h
index f73a076d6..68cbacb81 100644
--- a/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_room_1.h
+++ b/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_room_1.h
@@ -3,19 +3,19 @@
 
 #include "align_asset_macro.h"
 
-#define dgDodongosCavernBossLavaFloorTex "__OTR__scenes/nonmq/ddan_boss_scene/gDodongosCavernBossLavaFloorTex"
-static const ALIGN_ASSET(2) char gDodongosCavernBossLavaFloorTex[] = dgDodongosCavernBossLavaFloorTex;
-
-#define dddan_boss_room_1DL_001A38 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_1DL_001A38"
-static const ALIGN_ASSET(2) char ddan_boss_room_1DL_001A38[] = dddan_boss_room_1DL_001A38;
-
-#define dddan_boss_room_1Tex_0031D8 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_1Tex_0031D8"
+#define dddan_boss_room_1Tex_0031D8 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_room_1Tex_0031D8"
 static const ALIGN_ASSET(2) char ddan_boss_room_1Tex_0031D8[] = dddan_boss_room_1Tex_0031D8;
 
-#define dddan_boss_room_1Tex_0039D8 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_1Tex_0039D8"
+#define dddan_boss_room_1Tex_0039D8 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_room_1Tex_0039D8"
 static const ALIGN_ASSET(2) char ddan_boss_room_1Tex_0039D8[] = dddan_boss_room_1Tex_0039D8;
 
-#define dddan_boss_room_1DL_000A50 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_1DL_000A50"
+#define dgDodongosCavernBossLavaFloorTex "__OTR__scenes/shared/ddan_boss_scene/gDodongosCavernBossLavaFloorTex"
+static const ALIGN_ASSET(2) char gDodongosCavernBossLavaFloorTex[] = dgDodongosCavernBossLavaFloorTex;
+
+#define dddan_boss_room_1DL_001A38 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_room_1DL_001A38"
+static const ALIGN_ASSET(2) char ddan_boss_room_1DL_001A38[] = dddan_boss_room_1DL_001A38;
+
+#define dddan_boss_room_1DL_000A50 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_room_1DL_000A50"
 static const ALIGN_ASSET(2) char ddan_boss_room_1DL_000A50[] = dddan_boss_room_1DL_000A50;
 
 
diff --git a/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_scene.h b/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_scene.h
index 285a15c40..43bcc056f 100644
--- a/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_scene.h
+++ b/soh/assets/scenes/dungeons/ddan_boss/ddan_boss_scene.h
@@ -3,19 +3,20 @@
 
 #include "align_asset_macro.h"
 
-#define dddan_boss_sceneCollisionHeader_000E20 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_sceneCollisionHeader_000E20"
-static const ALIGN_ASSET(2) char ddan_boss_sceneCollisionHeader_000E20[] = dddan_boss_sceneCollisionHeader_000E20;
-
-#define dddan_boss_sceneTex_001858 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_sceneTex_001858"
-static const ALIGN_ASSET(2) char ddan_boss_sceneTex_001858[] = dddan_boss_sceneTex_001858;
-
-#define dddan_boss_sceneTLUT_000E50 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_sceneTLUT_000E50"
-static const ALIGN_ASSET(2) char ddan_boss_sceneTLUT_000E50[] = dddan_boss_sceneTLUT_000E50;
-
-#define dddan_boss_sceneTex_002058 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_sceneTex_002058"
-static const ALIGN_ASSET(2) char ddan_boss_sceneTex_002058[] = dddan_boss_sceneTex_002058;
-
-#define dddan_boss_sceneTex_001058 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_sceneTex_001058"
+#define dddan_boss_sceneTex_001058 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_sceneTex_001058"
 static const ALIGN_ASSET(2) char ddan_boss_sceneTex_001058[] = dddan_boss_sceneTex_001058;
 
+#define dddan_boss_sceneTex_001858 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_sceneTex_001858"
+static const ALIGN_ASSET(2) char ddan_boss_sceneTex_001858[] = dddan_boss_sceneTex_001858;
+
+#define dddan_boss_sceneTex_002058 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_sceneTex_002058"
+static const ALIGN_ASSET(2) char ddan_boss_sceneTex_002058[] = dddan_boss_sceneTex_002058;
+
+#define dddan_boss_sceneTLUT_000E50 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_sceneTLUT_000E50"
+static const ALIGN_ASSET(2) char ddan_boss_sceneTLUT_000E50[] = dddan_boss_sceneTLUT_000E50;
+
+#define dddan_boss_sceneCollisionHeader_000E20 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_sceneCollisionHeader_000E20"
+static const ALIGN_ASSET(2) char ddan_boss_sceneCollisionHeader_000E20[] = dddan_boss_sceneCollisionHeader_000E20;
+
+
 #endif // DUNGEONS_DDAN_BOSS_SCENE_H
diff --git a/soh/assets/scenes/dungeons/ganon/ganon_room_0.h b/soh/assets/scenes/dungeons/ganon/ganon_room_0.h
index 06e6b05ac..f27d9f7c5 100644
--- a/soh/assets/scenes/dungeons/ganon/ganon_room_0.h
+++ b/soh/assets/scenes/dungeons/ganon/ganon_room_0.h
@@ -3,32 +3,32 @@
 
 #include "align_asset_macro.h"
 
-#define dganon_room_0DL_004C50 "__OTR__scenes/nonmq/ganon_scene/ganon_room_0DL_004C50"
-static const ALIGN_ASSET(2) char ganon_room_0DL_004C50[] = dganon_room_0DL_004C50;
-
-#define dganon_room_0Tex_004C68 "__OTR__scenes/nonmq/ganon_scene/ganon_room_0Tex_004C68"
+#define dganon_room_0Tex_004C68 "__OTR__scenes/shared/ganon_scene/ganon_room_0Tex_004C68"
 static const ALIGN_ASSET(2) char ganon_room_0Tex_004C68[] = dganon_room_0Tex_004C68;
 
-#define dganon_room_0Tex_005468 "__OTR__scenes/nonmq/ganon_scene/ganon_room_0Tex_005468"
+#define dganon_room_0Tex_005468 "__OTR__scenes/shared/ganon_scene/ganon_room_0Tex_005468"
 static const ALIGN_ASSET(2) char ganon_room_0Tex_005468[] = dganon_room_0Tex_005468;
 
-#define dganon_room_0Tex_007068 "__OTR__scenes/nonmq/ganon_scene/ganon_room_0Tex_007068"
-static const ALIGN_ASSET(2) char ganon_room_0Tex_007068[] = dganon_room_0Tex_007068;
-
-#define dganon_room_0Tex_006068 "__OTR__scenes/nonmq/ganon_scene/ganon_room_0Tex_006068"
-static const ALIGN_ASSET(2) char ganon_room_0Tex_006068[] = dganon_room_0Tex_006068;
-
-#define dganon_room_0Tex_006868 "__OTR__scenes/nonmq/ganon_scene/ganon_room_0Tex_006868"
-static const ALIGN_ASSET(2) char ganon_room_0Tex_006868[] = dganon_room_0Tex_006868;
-
-#define dganon_room_0Tex_005C68 "__OTR__scenes/nonmq/ganon_scene/ganon_room_0Tex_005C68"
+#define dganon_room_0Tex_005C68 "__OTR__scenes/shared/ganon_scene/ganon_room_0Tex_005C68"
 static const ALIGN_ASSET(2) char ganon_room_0Tex_005C68[] = dganon_room_0Tex_005C68;
 
-#define dganon_room_0DL_0076C0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_0DL_0076C0"
-static const ALIGN_ASSET(2) char ganon_room_0DL_0076C0[] = dganon_room_0DL_0076C0;
+#define dganon_room_0Tex_006068 "__OTR__scenes/shared/ganon_scene/ganon_room_0Tex_006068"
+static const ALIGN_ASSET(2) char ganon_room_0Tex_006068[] = dganon_room_0Tex_006068;
 
-#define dganon_room_0Tex_0076D0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_0Tex_0076D0"
+#define dganon_room_0Tex_006868 "__OTR__scenes/shared/ganon_scene/ganon_room_0Tex_006868"
+static const ALIGN_ASSET(2) char ganon_room_0Tex_006868[] = dganon_room_0Tex_006868;
+
+#define dganon_room_0Tex_007068 "__OTR__scenes/shared/ganon_scene/ganon_room_0Tex_007068"
+static const ALIGN_ASSET(2) char ganon_room_0Tex_007068[] = dganon_room_0Tex_007068;
+
+#define dganon_room_0Tex_0076D0 "__OTR__scenes/shared/ganon_scene/ganon_room_0Tex_0076D0"
 static const ALIGN_ASSET(2) char ganon_room_0Tex_0076D0[] = dganon_room_0Tex_0076D0;
 
+#define dganon_room_0DL_004C50 "__OTR__scenes/shared/ganon_scene/ganon_room_0DL_004C50"
+static const ALIGN_ASSET(2) char ganon_room_0DL_004C50[] = dganon_room_0DL_004C50;
+
+#define dganon_room_0DL_0076C0 "__OTR__scenes/shared/ganon_scene/ganon_room_0DL_0076C0"
+static const ALIGN_ASSET(2) char ganon_room_0DL_0076C0[] = dganon_room_0DL_0076C0;
+
 
 #endif // DUNGEONS_GANON_ROOM_0_H
diff --git a/soh/assets/scenes/dungeons/ganon/ganon_room_1.h b/soh/assets/scenes/dungeons/ganon/ganon_room_1.h
index b4af253ec..4009286dd 100644
--- a/soh/assets/scenes/dungeons/ganon/ganon_room_1.h
+++ b/soh/assets/scenes/dungeons/ganon/ganon_room_1.h
@@ -3,23 +3,23 @@
 
 #include "align_asset_macro.h"
 
-#define dganon_room_1DL_005360 "__OTR__scenes/nonmq/ganon_scene/ganon_room_1DL_005360"
-static const ALIGN_ASSET(2) char ganon_room_1DL_005360[] = dganon_room_1DL_005360;
-
-#define dganon_room_1Tex_006370 "__OTR__scenes/nonmq/ganon_scene/ganon_room_1Tex_006370"
-static const ALIGN_ASSET(2) char ganon_room_1Tex_006370[] = dganon_room_1Tex_006370;
-
-#define dganon_room_1Tex_005F70 "__OTR__scenes/nonmq/ganon_scene/ganon_room_1Tex_005F70"
-static const ALIGN_ASSET(2) char ganon_room_1Tex_005F70[] = dganon_room_1Tex_005F70;
-
-#define dganon_room_1Tex_005B70 "__OTR__scenes/nonmq/ganon_scene/ganon_room_1Tex_005B70"
-static const ALIGN_ASSET(2) char ganon_room_1Tex_005B70[] = dganon_room_1Tex_005B70;
-
-#define dganon_room_1Tex_005370 "__OTR__scenes/nonmq/ganon_scene/ganon_room_1Tex_005370"
+#define dganon_room_1Tex_005370 "__OTR__scenes/shared/ganon_scene/ganon_room_1Tex_005370"
 static const ALIGN_ASSET(2) char ganon_room_1Tex_005370[] = dganon_room_1Tex_005370;
 
-#define dganon_room_1Tex_006770 "__OTR__scenes/nonmq/ganon_scene/ganon_room_1Tex_006770"
+#define dganon_room_1Tex_005B70 "__OTR__scenes/shared/ganon_scene/ganon_room_1Tex_005B70"
+static const ALIGN_ASSET(2) char ganon_room_1Tex_005B70[] = dganon_room_1Tex_005B70;
+
+#define dganon_room_1Tex_005F70 "__OTR__scenes/shared/ganon_scene/ganon_room_1Tex_005F70"
+static const ALIGN_ASSET(2) char ganon_room_1Tex_005F70[] = dganon_room_1Tex_005F70;
+
+#define dganon_room_1Tex_006370 "__OTR__scenes/shared/ganon_scene/ganon_room_1Tex_006370"
+static const ALIGN_ASSET(2) char ganon_room_1Tex_006370[] = dganon_room_1Tex_006370;
+
+#define dganon_room_1Tex_006770 "__OTR__scenes/shared/ganon_scene/ganon_room_1Tex_006770"
 static const ALIGN_ASSET(2) char ganon_room_1Tex_006770[] = dganon_room_1Tex_006770;
 
+#define dganon_room_1DL_005360 "__OTR__scenes/shared/ganon_scene/ganon_room_1DL_005360"
+static const ALIGN_ASSET(2) char ganon_room_1DL_005360[] = dganon_room_1DL_005360;
+
 
 #endif // DUNGEONS_GANON_ROOM_1_H
diff --git a/soh/assets/scenes/dungeons/ganon/ganon_room_2.h b/soh/assets/scenes/dungeons/ganon/ganon_room_2.h
index d43f70ddb..3868e6e91 100644
--- a/soh/assets/scenes/dungeons/ganon/ganon_room_2.h
+++ b/soh/assets/scenes/dungeons/ganon/ganon_room_2.h
@@ -3,35 +3,35 @@
 
 #include "align_asset_macro.h"
 
-#define dganon_room_2DL_003DD8 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2DL_003DD8"
-static const ALIGN_ASSET(2) char ganon_room_2DL_003DD8[] = dganon_room_2DL_003DD8;
-
-#define dganon_room_2Tex_005DF0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2Tex_005DF0"
-static const ALIGN_ASSET(2) char ganon_room_2Tex_005DF0[] = dganon_room_2Tex_005DF0;
-
-#define dganon_room_2Tex_004DF0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2Tex_004DF0"
-static const ALIGN_ASSET(2) char ganon_room_2Tex_004DF0[] = dganon_room_2Tex_004DF0;
-
-#define dganon_room_2Tex_0059F0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2Tex_0059F0"
-static const ALIGN_ASSET(2) char ganon_room_2Tex_0059F0[] = dganon_room_2Tex_0059F0;
-
-#define dganon_room_2Tex_0041F0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2Tex_0041F0"
-static const ALIGN_ASSET(2) char ganon_room_2Tex_0041F0[] = dganon_room_2Tex_0041F0;
-
-#define dganon_room_2Tex_0049F0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2Tex_0049F0"
-static const ALIGN_ASSET(2) char ganon_room_2Tex_0049F0[] = dganon_room_2Tex_0049F0;
-
-#define dganon_room_2Tex_003DF0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2Tex_003DF0"
+#define dganon_room_2Tex_003DF0 "__OTR__scenes/shared/ganon_scene/ganon_room_2Tex_003DF0"
 static const ALIGN_ASSET(2) char ganon_room_2Tex_003DF0[] = dganon_room_2Tex_003DF0;
 
-#define dganon_room_2Tex_0051F0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2Tex_0051F0"
+#define dganon_room_2Tex_0041F0 "__OTR__scenes/shared/ganon_scene/ganon_room_2Tex_0041F0"
+static const ALIGN_ASSET(2) char ganon_room_2Tex_0041F0[] = dganon_room_2Tex_0041F0;
+
+#define dganon_room_2Tex_0049F0 "__OTR__scenes/shared/ganon_scene/ganon_room_2Tex_0049F0"
+static const ALIGN_ASSET(2) char ganon_room_2Tex_0049F0[] = dganon_room_2Tex_0049F0;
+
+#define dganon_room_2Tex_004DF0 "__OTR__scenes/shared/ganon_scene/ganon_room_2Tex_004DF0"
+static const ALIGN_ASSET(2) char ganon_room_2Tex_004DF0[] = dganon_room_2Tex_004DF0;
+
+#define dganon_room_2Tex_0051F0 "__OTR__scenes/shared/ganon_scene/ganon_room_2Tex_0051F0"
 static const ALIGN_ASSET(2) char ganon_room_2Tex_0051F0[] = dganon_room_2Tex_0051F0;
 
-#define dganon_room_2DL_007040 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2DL_007040"
-static const ALIGN_ASSET(2) char ganon_room_2DL_007040[] = dganon_room_2DL_007040;
+#define dganon_room_2Tex_0059F0 "__OTR__scenes/shared/ganon_scene/ganon_room_2Tex_0059F0"
+static const ALIGN_ASSET(2) char ganon_room_2Tex_0059F0[] = dganon_room_2Tex_0059F0;
 
-#define dganon_room_2Tex_007050 "__OTR__scenes/nonmq/ganon_scene/ganon_room_2Tex_007050"
+#define dganon_room_2Tex_005DF0 "__OTR__scenes/shared/ganon_scene/ganon_room_2Tex_005DF0"
+static const ALIGN_ASSET(2) char ganon_room_2Tex_005DF0[] = dganon_room_2Tex_005DF0;
+
+#define dganon_room_2Tex_007050 "__OTR__scenes/shared/ganon_scene/ganon_room_2Tex_007050"
 static const ALIGN_ASSET(2) char ganon_room_2Tex_007050[] = dganon_room_2Tex_007050;
 
+#define dganon_room_2DL_003DD8 "__OTR__scenes/shared/ganon_scene/ganon_room_2DL_003DD8"
+static const ALIGN_ASSET(2) char ganon_room_2DL_003DD8[] = dganon_room_2DL_003DD8;
+
+#define dganon_room_2DL_007040 "__OTR__scenes/shared/ganon_scene/ganon_room_2DL_007040"
+static const ALIGN_ASSET(2) char ganon_room_2DL_007040[] = dganon_room_2DL_007040;
+
 
 #endif // DUNGEONS_GANON_ROOM_2_H
diff --git a/soh/assets/scenes/dungeons/ganon/ganon_room_3.h b/soh/assets/scenes/dungeons/ganon/ganon_room_3.h
index c81614fdf..8e6ba9076 100644
--- a/soh/assets/scenes/dungeons/ganon/ganon_room_3.h
+++ b/soh/assets/scenes/dungeons/ganon/ganon_room_3.h
@@ -3,23 +3,23 @@
 
 #include "align_asset_macro.h"
 
-#define dganon_room_3DL_004F20 "__OTR__scenes/nonmq/ganon_scene/ganon_room_3DL_004F20"
-static const ALIGN_ASSET(2) char ganon_room_3DL_004F20[] = dganon_room_3DL_004F20;
-
-#define dganon_room_3Tex_004F30 "__OTR__scenes/nonmq/ganon_scene/ganon_room_3Tex_004F30"
+#define dganon_room_3Tex_004F30 "__OTR__scenes/shared/ganon_scene/ganon_room_3Tex_004F30"
 static const ALIGN_ASSET(2) char ganon_room_3Tex_004F30[] = dganon_room_3Tex_004F30;
 
-#define dganon_room_3Tex_005330 "__OTR__scenes/nonmq/ganon_scene/ganon_room_3Tex_005330"
+#define dganon_room_3Tex_005330 "__OTR__scenes/shared/ganon_scene/ganon_room_3Tex_005330"
 static const ALIGN_ASSET(2) char ganon_room_3Tex_005330[] = dganon_room_3Tex_005330;
 
-#define dganon_room_3Tex_005730 "__OTR__scenes/nonmq/ganon_scene/ganon_room_3Tex_005730"
+#define dganon_room_3Tex_005730 "__OTR__scenes/shared/ganon_scene/ganon_room_3Tex_005730"
 static const ALIGN_ASSET(2) char ganon_room_3Tex_005730[] = dganon_room_3Tex_005730;
 
-#define dganon_room_3Tex_005F30 "__OTR__scenes/nonmq/ganon_scene/ganon_room_3Tex_005F30"
+#define dganon_room_3Tex_005F30 "__OTR__scenes/shared/ganon_scene/ganon_room_3Tex_005F30"
 static const ALIGN_ASSET(2) char ganon_room_3Tex_005F30[] = dganon_room_3Tex_005F30;
 
-#define dganon_room_3Tex_006730 "__OTR__scenes/nonmq/ganon_scene/ganon_room_3Tex_006730"
+#define dganon_room_3Tex_006730 "__OTR__scenes/shared/ganon_scene/ganon_room_3Tex_006730"
 static const ALIGN_ASSET(2) char ganon_room_3Tex_006730[] = dganon_room_3Tex_006730;
 
+#define dganon_room_3DL_004F20 "__OTR__scenes/shared/ganon_scene/ganon_room_3DL_004F20"
+static const ALIGN_ASSET(2) char ganon_room_3DL_004F20[] = dganon_room_3DL_004F20;
+
 
 #endif // DUNGEONS_GANON_ROOM_3_H
diff --git a/soh/assets/scenes/dungeons/ganon/ganon_room_4.h b/soh/assets/scenes/dungeons/ganon/ganon_room_4.h
index f08d2e722..e20ca9722 100644
--- a/soh/assets/scenes/dungeons/ganon/ganon_room_4.h
+++ b/soh/assets/scenes/dungeons/ganon/ganon_room_4.h
@@ -3,44 +3,44 @@
 
 #include "align_asset_macro.h"
 
-#define dganon_room_4DL_004650 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4DL_004650"
-static const ALIGN_ASSET(2) char ganon_room_4DL_004650[] = dganon_room_4DL_004650;
-
-#define dganon_room_4Tex_007668 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_007668"
-static const ALIGN_ASSET(2) char ganon_room_4Tex_007668[] = dganon_room_4Tex_007668;
-
-#define dganon_room_4Tex_004668 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_004668"
+#define dganon_room_4Tex_004668 "__OTR__scenes/shared/ganon_scene/ganon_room_4Tex_004668"
 static const ALIGN_ASSET(2) char ganon_room_4Tex_004668[] = dganon_room_4Tex_004668;
 
-#define dganon_room_4Tex_005A68 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_005A68"
-static const ALIGN_ASSET(2) char ganon_room_4Tex_005A68[] = dganon_room_4Tex_005A68;
-
-#define dganon_room_4Tex_006268 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_006268"
-static const ALIGN_ASSET(2) char ganon_room_4Tex_006268[] = dganon_room_4Tex_006268;
-
-#define dganon_room_4Tex_005668 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_005668"
-static const ALIGN_ASSET(2) char ganon_room_4Tex_005668[] = dganon_room_4Tex_005668;
-
-#define dganon_room_4Tex_004E68 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_004E68"
+#define dganon_room_4Tex_004E68 "__OTR__scenes/shared/ganon_scene/ganon_room_4Tex_004E68"
 static const ALIGN_ASSET(2) char ganon_room_4Tex_004E68[] = dganon_room_4Tex_004E68;
 
-#define dganon_room_4Tex_006668 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_006668"
+#define dganon_room_4Tex_005668 "__OTR__scenes/shared/ganon_scene/ganon_room_4Tex_005668"
+static const ALIGN_ASSET(2) char ganon_room_4Tex_005668[] = dganon_room_4Tex_005668;
+
+#define dganon_room_4Tex_005A68 "__OTR__scenes/shared/ganon_scene/ganon_room_4Tex_005A68"
+static const ALIGN_ASSET(2) char ganon_room_4Tex_005A68[] = dganon_room_4Tex_005A68;
+
+#define dganon_room_4Tex_006268 "__OTR__scenes/shared/ganon_scene/ganon_room_4Tex_006268"
+static const ALIGN_ASSET(2) char ganon_room_4Tex_006268[] = dganon_room_4Tex_006268;
+
+#define dganon_room_4Tex_006668 "__OTR__scenes/shared/ganon_scene/ganon_room_4Tex_006668"
 static const ALIGN_ASSET(2) char ganon_room_4Tex_006668[] = dganon_room_4Tex_006668;
 
-#define dganon_room_4Tex_006E68 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_006E68"
-static const ALIGN_ASSET(2) char ganon_room_4Tex_006E68[] = dganon_room_4Tex_006E68;
-
-#define dganon_room_4Tex_007E68 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_007E68"
-static const ALIGN_ASSET(2) char ganon_room_4Tex_007E68[] = dganon_room_4Tex_007E68;
-
-#define dganon_room_4Tex_006A68 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_006A68"
+#define dganon_room_4Tex_006A68 "__OTR__scenes/shared/ganon_scene/ganon_room_4Tex_006A68"
 static const ALIGN_ASSET(2) char ganon_room_4Tex_006A68[] = dganon_room_4Tex_006A68;
 
-#define dganon_room_4DL_0088C0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4DL_0088C0"
-static const ALIGN_ASSET(2) char ganon_room_4DL_0088C0[] = dganon_room_4DL_0088C0;
+#define dganon_room_4Tex_006E68 "__OTR__scenes/shared/ganon_scene/ganon_room_4Tex_006E68"
+static const ALIGN_ASSET(2) char ganon_room_4Tex_006E68[] = dganon_room_4Tex_006E68;
 
-#define dganon_room_4Tex_0088D0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_4Tex_0088D0"
+#define dganon_room_4Tex_007668 "__OTR__scenes/shared/ganon_scene/ganon_room_4Tex_007668"
+static const ALIGN_ASSET(2) char ganon_room_4Tex_007668[] = dganon_room_4Tex_007668;
+
+#define dganon_room_4Tex_007E68 "__OTR__scenes/shared/ganon_scene/ganon_room_4Tex_007E68"
+static const ALIGN_ASSET(2) char ganon_room_4Tex_007E68[] = dganon_room_4Tex_007E68;
+
+#define dganon_room_4Tex_0088D0 "__OTR__scenes/shared/ganon_scene/ganon_room_4Tex_0088D0"
 static const ALIGN_ASSET(2) char ganon_room_4Tex_0088D0[] = dganon_room_4Tex_0088D0;
 
+#define dganon_room_4DL_004650 "__OTR__scenes/shared/ganon_scene/ganon_room_4DL_004650"
+static const ALIGN_ASSET(2) char ganon_room_4DL_004650[] = dganon_room_4DL_004650;
+
+#define dganon_room_4DL_0088C0 "__OTR__scenes/shared/ganon_scene/ganon_room_4DL_0088C0"
+static const ALIGN_ASSET(2) char ganon_room_4DL_0088C0[] = dganon_room_4DL_0088C0;
+
 
 #endif // DUNGEONS_GANON_ROOM_4_H
diff --git a/soh/assets/scenes/dungeons/ganon/ganon_room_5.h b/soh/assets/scenes/dungeons/ganon/ganon_room_5.h
index 063b5a746..45284c02a 100644
--- a/soh/assets/scenes/dungeons/ganon/ganon_room_5.h
+++ b/soh/assets/scenes/dungeons/ganon/ganon_room_5.h
@@ -3,26 +3,26 @@
 
 #include "align_asset_macro.h"
 
-#define dganon_room_5DL_005AF8 "__OTR__scenes/nonmq/ganon_scene/ganon_room_5DL_005AF8"
-static const ALIGN_ASSET(2) char ganon_room_5DL_005AF8[] = dganon_room_5DL_005AF8;
-
-#define dganon_room_5Tex_007F08 "__OTR__scenes/nonmq/ganon_scene/ganon_room_5Tex_007F08"
-static const ALIGN_ASSET(2) char ganon_room_5Tex_007F08[] = dganon_room_5Tex_007F08;
-
-#define dganon_room_5Tex_007B08 "__OTR__scenes/nonmq/ganon_scene/ganon_room_5Tex_007B08"
-static const ALIGN_ASSET(2) char ganon_room_5Tex_007B08[] = dganon_room_5Tex_007B08;
-
-#define dganon_room_5Tex_005B08 "__OTR__scenes/nonmq/ganon_scene/ganon_room_5Tex_005B08"
+#define dganon_room_5Tex_005B08 "__OTR__scenes/shared/ganon_scene/ganon_room_5Tex_005B08"
 static const ALIGN_ASSET(2) char ganon_room_5Tex_005B08[] = dganon_room_5Tex_005B08;
 
-#define dganon_room_5Tex_008308 "__OTR__scenes/nonmq/ganon_scene/ganon_room_5Tex_008308"
-static const ALIGN_ASSET(2) char ganon_room_5Tex_008308[] = dganon_room_5Tex_008308;
+#define dganon_room_5Tex_006308 "__OTR__scenes/shared/ganon_scene/ganon_room_5Tex_006308"
+static const ALIGN_ASSET(2) char ganon_room_5Tex_006308[] = dganon_room_5Tex_006308;
 
-#define dganon_room_5Tex_006B08 "__OTR__scenes/nonmq/ganon_scene/ganon_room_5Tex_006B08"
+#define dganon_room_5Tex_006B08 "__OTR__scenes/shared/ganon_scene/ganon_room_5Tex_006B08"
 static const ALIGN_ASSET(2) char ganon_room_5Tex_006B08[] = dganon_room_5Tex_006B08;
 
-#define dganon_room_5Tex_006308 "__OTR__scenes/nonmq/ganon_scene/ganon_room_5Tex_006308"
-static const ALIGN_ASSET(2) char ganon_room_5Tex_006308[] = dganon_room_5Tex_006308;
+#define dganon_room_5Tex_007B08 "__OTR__scenes/shared/ganon_scene/ganon_room_5Tex_007B08"
+static const ALIGN_ASSET(2) char ganon_room_5Tex_007B08[] = dganon_room_5Tex_007B08;
+
+#define dganon_room_5Tex_007F08 "__OTR__scenes/shared/ganon_scene/ganon_room_5Tex_007F08"
+static const ALIGN_ASSET(2) char ganon_room_5Tex_007F08[] = dganon_room_5Tex_007F08;
+
+#define dganon_room_5Tex_008308 "__OTR__scenes/shared/ganon_scene/ganon_room_5Tex_008308"
+static const ALIGN_ASSET(2) char ganon_room_5Tex_008308[] = dganon_room_5Tex_008308;
+
+#define dganon_room_5DL_005AF8 "__OTR__scenes/shared/ganon_scene/ganon_room_5DL_005AF8"
+static const ALIGN_ASSET(2) char ganon_room_5DL_005AF8[] = dganon_room_5DL_005AF8;
 
 
 #endif // DUNGEONS_GANON_ROOM_5_H
diff --git a/soh/assets/scenes/dungeons/ganon/ganon_room_6.h b/soh/assets/scenes/dungeons/ganon/ganon_room_6.h
index 626ce1890..cec4dc81e 100644
--- a/soh/assets/scenes/dungeons/ganon/ganon_room_6.h
+++ b/soh/assets/scenes/dungeons/ganon/ganon_room_6.h
@@ -3,35 +3,35 @@
 
 #include "align_asset_macro.h"
 
-#define dganon_room_6DL_006DF0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_6DL_006DF0"
-static const ALIGN_ASSET(2) char ganon_room_6DL_006DF0[] = dganon_room_6DL_006DF0;
-
-#define dganon_room_6Tex_007A00 "__OTR__scenes/nonmq/ganon_scene/ganon_room_6Tex_007A00"
-static const ALIGN_ASSET(2) char ganon_room_6Tex_007A00[] = dganon_room_6Tex_007A00;
-
-#define dganon_room_6Tex_008200 "__OTR__scenes/nonmq/ganon_scene/ganon_room_6Tex_008200"
-static const ALIGN_ASSET(2) char ganon_room_6Tex_008200[] = dganon_room_6Tex_008200;
-
-#define dganon_room_6Tex_007200 "__OTR__scenes/nonmq/ganon_scene/ganon_room_6Tex_007200"
-static const ALIGN_ASSET(2) char ganon_room_6Tex_007200[] = dganon_room_6Tex_007200;
-
-#define dganon_room_6Tex_008B00 "__OTR__scenes/nonmq/ganon_scene/ganon_room_6Tex_008B00"
-static const ALIGN_ASSET(2) char ganon_room_6Tex_008B00[] = dganon_room_6Tex_008B00;
-
-#define dganon_room_6Tex_007600 "__OTR__scenes/nonmq/ganon_scene/ganon_room_6Tex_007600"
-static const ALIGN_ASSET(2) char ganon_room_6Tex_007600[] = dganon_room_6Tex_007600;
-
-#define dganon_room_6Tex_006E00 "__OTR__scenes/nonmq/ganon_scene/ganon_room_6Tex_006E00"
+#define dganon_room_6Tex_006E00 "__OTR__scenes/shared/ganon_scene/ganon_room_6Tex_006E00"
 static const ALIGN_ASSET(2) char ganon_room_6Tex_006E00[] = dganon_room_6Tex_006E00;
 
-#define dganon_room_6Tex_008300 "__OTR__scenes/nonmq/ganon_scene/ganon_room_6Tex_008300"
+#define dganon_room_6Tex_007200 "__OTR__scenes/shared/ganon_scene/ganon_room_6Tex_007200"
+static const ALIGN_ASSET(2) char ganon_room_6Tex_007200[] = dganon_room_6Tex_007200;
+
+#define dganon_room_6Tex_007600 "__OTR__scenes/shared/ganon_scene/ganon_room_6Tex_007600"
+static const ALIGN_ASSET(2) char ganon_room_6Tex_007600[] = dganon_room_6Tex_007600;
+
+#define dganon_room_6Tex_007A00 "__OTR__scenes/shared/ganon_scene/ganon_room_6Tex_007A00"
+static const ALIGN_ASSET(2) char ganon_room_6Tex_007A00[] = dganon_room_6Tex_007A00;
+
+#define dganon_room_6Tex_008200 "__OTR__scenes/shared/ganon_scene/ganon_room_6Tex_008200"
+static const ALIGN_ASSET(2) char ganon_room_6Tex_008200[] = dganon_room_6Tex_008200;
+
+#define dganon_room_6Tex_008300 "__OTR__scenes/shared/ganon_scene/ganon_room_6Tex_008300"
 static const ALIGN_ASSET(2) char ganon_room_6Tex_008300[] = dganon_room_6Tex_008300;
 
-#define dganon_room_6DL_009388 "__OTR__scenes/nonmq/ganon_scene/ganon_room_6DL_009388"
-static const ALIGN_ASSET(2) char ganon_room_6DL_009388[] = dganon_room_6DL_009388;
+#define dganon_room_6Tex_008B00 "__OTR__scenes/shared/ganon_scene/ganon_room_6Tex_008B00"
+static const ALIGN_ASSET(2) char ganon_room_6Tex_008B00[] = dganon_room_6Tex_008B00;
 
-#define dganon_room_6Tex_009398 "__OTR__scenes/nonmq/ganon_scene/ganon_room_6Tex_009398"
+#define dganon_room_6Tex_009398 "__OTR__scenes/shared/ganon_scene/ganon_room_6Tex_009398"
 static const ALIGN_ASSET(2) char ganon_room_6Tex_009398[] = dganon_room_6Tex_009398;
 
+#define dganon_room_6DL_006DF0 "__OTR__scenes/shared/ganon_scene/ganon_room_6DL_006DF0"
+static const ALIGN_ASSET(2) char ganon_room_6DL_006DF0[] = dganon_room_6DL_006DF0;
+
+#define dganon_room_6DL_009388 "__OTR__scenes/shared/ganon_scene/ganon_room_6DL_009388"
+static const ALIGN_ASSET(2) char ganon_room_6DL_009388[] = dganon_room_6DL_009388;
+
 
 #endif // DUNGEONS_GANON_ROOM_6_H
diff --git a/soh/assets/scenes/dungeons/ganon/ganon_room_7.h b/soh/assets/scenes/dungeons/ganon/ganon_room_7.h
index 522239a0d..6e7d0c10f 100644
--- a/soh/assets/scenes/dungeons/ganon/ganon_room_7.h
+++ b/soh/assets/scenes/dungeons/ganon/ganon_room_7.h
@@ -3,32 +3,32 @@
 
 #include "align_asset_macro.h"
 
-#define dganon_room_7DL_0071C8 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7DL_0071C8"
-static const ALIGN_ASSET(2) char ganon_room_7DL_0071C8[] = dganon_room_7DL_0071C8;
-
-#define dganon_room_7Tex_0085E0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7Tex_0085E0"
-static const ALIGN_ASSET(2) char ganon_room_7Tex_0085E0[] = dganon_room_7Tex_0085E0;
-
-#define dganon_room_7Tex_0089E0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7Tex_0089E0"
-static const ALIGN_ASSET(2) char ganon_room_7Tex_0089E0[] = dganon_room_7Tex_0089E0;
-
-#define dganon_room_7Tex_007DE0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7Tex_007DE0"
-static const ALIGN_ASSET(2) char ganon_room_7Tex_007DE0[] = dganon_room_7Tex_007DE0;
-
-#define dganon_room_7Tex_0075E0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7Tex_0075E0"
-static const ALIGN_ASSET(2) char ganon_room_7Tex_0075E0[] = dganon_room_7Tex_0075E0;
-
-#define dganon_room_7Tex_0091E0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7Tex_0091E0"
-static const ALIGN_ASSET(2) char ganon_room_7Tex_0091E0[] = dganon_room_7Tex_0091E0;
-
-#define dganon_room_7Tex_0071E0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7Tex_0071E0"
+#define dganon_room_7Tex_0071E0 "__OTR__scenes/shared/ganon_scene/ganon_room_7Tex_0071E0"
 static const ALIGN_ASSET(2) char ganon_room_7Tex_0071E0[] = dganon_room_7Tex_0071E0;
 
-#define dganon_room_7DL_009F88 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7DL_009F88"
-static const ALIGN_ASSET(2) char ganon_room_7DL_009F88[] = dganon_room_7DL_009F88;
+#define dganon_room_7Tex_0075E0 "__OTR__scenes/shared/ganon_scene/ganon_room_7Tex_0075E0"
+static const ALIGN_ASSET(2) char ganon_room_7Tex_0075E0[] = dganon_room_7Tex_0075E0;
 
-#define dganon_room_7Tex_009F98 "__OTR__scenes/nonmq/ganon_scene/ganon_room_7Tex_009F98"
+#define dganon_room_7Tex_007DE0 "__OTR__scenes/shared/ganon_scene/ganon_room_7Tex_007DE0"
+static const ALIGN_ASSET(2) char ganon_room_7Tex_007DE0[] = dganon_room_7Tex_007DE0;
+
+#define dganon_room_7Tex_0085E0 "__OTR__scenes/shared/ganon_scene/ganon_room_7Tex_0085E0"
+static const ALIGN_ASSET(2) char ganon_room_7Tex_0085E0[] = dganon_room_7Tex_0085E0;
+
+#define dganon_room_7Tex_0089E0 "__OTR__scenes/shared/ganon_scene/ganon_room_7Tex_0089E0"
+static const ALIGN_ASSET(2) char ganon_room_7Tex_0089E0[] = dganon_room_7Tex_0089E0;
+
+#define dganon_room_7Tex_0091E0 "__OTR__scenes/shared/ganon_scene/ganon_room_7Tex_0091E0"
+static const ALIGN_ASSET(2) char ganon_room_7Tex_0091E0[] = dganon_room_7Tex_0091E0;
+
+#define dganon_room_7Tex_009F98 "__OTR__scenes/shared/ganon_scene/ganon_room_7Tex_009F98"
 static const ALIGN_ASSET(2) char ganon_room_7Tex_009F98[] = dganon_room_7Tex_009F98;
 
+#define dganon_room_7DL_0071C8 "__OTR__scenes/shared/ganon_scene/ganon_room_7DL_0071C8"
+static const ALIGN_ASSET(2) char ganon_room_7DL_0071C8[] = dganon_room_7DL_0071C8;
+
+#define dganon_room_7DL_009F88 "__OTR__scenes/shared/ganon_scene/ganon_room_7DL_009F88"
+static const ALIGN_ASSET(2) char ganon_room_7DL_009F88[] = dganon_room_7DL_009F88;
+
 
 #endif // DUNGEONS_GANON_ROOM_7_H
diff --git a/soh/assets/scenes/dungeons/ganon/ganon_room_8.h b/soh/assets/scenes/dungeons/ganon/ganon_room_8.h
index 40aacf021..5e3337220 100644
--- a/soh/assets/scenes/dungeons/ganon/ganon_room_8.h
+++ b/soh/assets/scenes/dungeons/ganon/ganon_room_8.h
@@ -3,35 +3,35 @@
 
 #include "align_asset_macro.h"
 
-#define dganon_room_8DL_004940 "__OTR__scenes/nonmq/ganon_scene/ganon_room_8DL_004940"
-static const ALIGN_ASSET(2) char ganon_room_8DL_004940[] = dganon_room_8DL_004940;
-
-#define dganon_room_8Tex_005BE0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_8Tex_005BE0"
-static const ALIGN_ASSET(2) char ganon_room_8Tex_005BE0[] = dganon_room_8Tex_005BE0;
-
-#define dganon_room_8Tex_0053E0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_8Tex_0053E0"
-static const ALIGN_ASSET(2) char ganon_room_8Tex_0053E0[] = dganon_room_8Tex_0053E0;
-
-#define dganon_room_8Tex_005320 "__OTR__scenes/nonmq/ganon_scene/ganon_room_8Tex_005320"
-static const ALIGN_ASSET(2) char ganon_room_8Tex_005320[] = dganon_room_8Tex_005320;
-
-#define dganon_room_8Tex_005220 "__OTR__scenes/nonmq/ganon_scene/ganon_room_8Tex_005220"
-static const ALIGN_ASSET(2) char ganon_room_8Tex_005220[] = dganon_room_8Tex_005220;
-
-#define dganon_room_8Tex_004A20 "__OTR__scenes/nonmq/ganon_scene/ganon_room_8Tex_004A20"
+#define dganon_room_8Tex_004A20 "__OTR__scenes/shared/ganon_scene/ganon_room_8Tex_004A20"
 static const ALIGN_ASSET(2) char ganon_room_8Tex_004A20[] = dganon_room_8Tex_004A20;
 
-#define dganon_room_8TLUT_004950 "__OTR__scenes/nonmq/ganon_scene/ganon_room_8TLUT_004950"
-static const ALIGN_ASSET(2) char ganon_room_8TLUT_004950[] = dganon_room_8TLUT_004950;
+#define dganon_room_8Tex_005220 "__OTR__scenes/shared/ganon_scene/ganon_room_8Tex_005220"
+static const ALIGN_ASSET(2) char ganon_room_8Tex_005220[] = dganon_room_8Tex_005220;
 
-#define dganon_room_8Tex_0063E0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_8Tex_0063E0"
-static const ALIGN_ASSET(2) char ganon_room_8Tex_0063E0[] = dganon_room_8Tex_0063E0;
+#define dganon_room_8Tex_005320 "__OTR__scenes/shared/ganon_scene/ganon_room_8Tex_005320"
+static const ALIGN_ASSET(2) char ganon_room_8Tex_005320[] = dganon_room_8Tex_005320;
 
-#define dganon_room_8Tex_005360 "__OTR__scenes/nonmq/ganon_scene/ganon_room_8Tex_005360"
+#define dganon_room_8Tex_005360 "__OTR__scenes/shared/ganon_scene/ganon_room_8Tex_005360"
 static const ALIGN_ASSET(2) char ganon_room_8Tex_005360[] = dganon_room_8Tex_005360;
 
-#define dganon_room_8Tex_005FE0 "__OTR__scenes/nonmq/ganon_scene/ganon_room_8Tex_005FE0"
+#define dganon_room_8Tex_0053E0 "__OTR__scenes/shared/ganon_scene/ganon_room_8Tex_0053E0"
+static const ALIGN_ASSET(2) char ganon_room_8Tex_0053E0[] = dganon_room_8Tex_0053E0;
+
+#define dganon_room_8Tex_005BE0 "__OTR__scenes/shared/ganon_scene/ganon_room_8Tex_005BE0"
+static const ALIGN_ASSET(2) char ganon_room_8Tex_005BE0[] = dganon_room_8Tex_005BE0;
+
+#define dganon_room_8Tex_005FE0 "__OTR__scenes/shared/ganon_scene/ganon_room_8Tex_005FE0"
 static const ALIGN_ASSET(2) char ganon_room_8Tex_005FE0[] = dganon_room_8Tex_005FE0;
 
+#define dganon_room_8Tex_0063E0 "__OTR__scenes/shared/ganon_scene/ganon_room_8Tex_0063E0"
+static const ALIGN_ASSET(2) char ganon_room_8Tex_0063E0[] = dganon_room_8Tex_0063E0;
+
+#define dganon_room_8TLUT_004950 "__OTR__scenes/shared/ganon_scene/ganon_room_8TLUT_004950"
+static const ALIGN_ASSET(2) char ganon_room_8TLUT_004950[] = dganon_room_8TLUT_004950;
+
+#define dganon_room_8DL_004940 "__OTR__scenes/shared/ganon_scene/ganon_room_8DL_004940"
+static const ALIGN_ASSET(2) char ganon_room_8DL_004940[] = dganon_room_8DL_004940;
+
 
 #endif // DUNGEONS_GANON_ROOM_8_H
diff --git a/soh/assets/scenes/dungeons/ganon/ganon_room_9.h b/soh/assets/scenes/dungeons/ganon/ganon_room_9.h
index 47cad0daa..ba88c5a76 100644
--- a/soh/assets/scenes/dungeons/ganon/ganon_room_9.h
+++ b/soh/assets/scenes/dungeons/ganon/ganon_room_9.h
@@ -3,41 +3,41 @@
 
 #include "align_asset_macro.h"
 
-#define dganon_room_9DL_001F08 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9DL_001F08"
-static const ALIGN_ASSET(2) char ganon_room_9DL_001F08[] = dganon_room_9DL_001F08;
-
-#define dganon_room_9Tex_004D20 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9Tex_004D20"
-static const ALIGN_ASSET(2) char ganon_room_9Tex_004D20[] = dganon_room_9Tex_004D20;
-
-#define dganon_room_9Tex_003D20 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9Tex_003D20"
-static const ALIGN_ASSET(2) char ganon_room_9Tex_003D20[] = dganon_room_9Tex_003D20;
-
-#define dganon_room_9Tex_002120 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9Tex_002120"
+#define dganon_room_9Tex_002120 "__OTR__scenes/shared/ganon_scene/ganon_room_9Tex_002120"
 static const ALIGN_ASSET(2) char ganon_room_9Tex_002120[] = dganon_room_9Tex_002120;
 
-#define dganon_room_9Tex_005120 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9Tex_005120"
-static const ALIGN_ASSET(2) char ganon_room_9Tex_005120[] = dganon_room_9Tex_005120;
-
-#define dganon_room_9Tex_002920 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9Tex_002920"
+#define dganon_room_9Tex_002920 "__OTR__scenes/shared/ganon_scene/ganon_room_9Tex_002920"
 static const ALIGN_ASSET(2) char ganon_room_9Tex_002920[] = dganon_room_9Tex_002920;
 
-#define dganon_room_9TLUT_001F18 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9TLUT_001F18"
-static const ALIGN_ASSET(2) char ganon_room_9TLUT_001F18[] = dganon_room_9TLUT_001F18;
-
-#define dganon_room_9Tex_004520 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9Tex_004520"
-static const ALIGN_ASSET(2) char ganon_room_9Tex_004520[] = dganon_room_9Tex_004520;
-
-#define dganon_room_9Tex_002D20 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9Tex_002D20"
+#define dganon_room_9Tex_002D20 "__OTR__scenes/shared/ganon_scene/ganon_room_9Tex_002D20"
 static const ALIGN_ASSET(2) char ganon_room_9Tex_002D20[] = dganon_room_9Tex_002D20;
 
-#define dganon_room_9Tex_003120 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9Tex_003120"
+#define dganon_room_9Tex_003120 "__OTR__scenes/shared/ganon_scene/ganon_room_9Tex_003120"
 static const ALIGN_ASSET(2) char ganon_room_9Tex_003120[] = dganon_room_9Tex_003120;
 
-#define dganon_room_9Tex_003520 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9Tex_003520"
+#define dganon_room_9Tex_003520 "__OTR__scenes/shared/ganon_scene/ganon_room_9Tex_003520"
 static const ALIGN_ASSET(2) char ganon_room_9Tex_003520[] = dganon_room_9Tex_003520;
 
-#define dganon_room_9Tex_003920 "__OTR__scenes/nonmq/ganon_scene/ganon_room_9Tex_003920"
+#define dganon_room_9Tex_003920 "__OTR__scenes/shared/ganon_scene/ganon_room_9Tex_003920"
 static const ALIGN_ASSET(2) char ganon_room_9Tex_003920[] = dganon_room_9Tex_003920;
 
+#define dganon_room_9Tex_003D20 "__OTR__scenes/shared/ganon_scene/ganon_room_9Tex_003D20"
+static const ALIGN_ASSET(2) char ganon_room_9Tex_003D20[] = dganon_room_9Tex_003D20;
+
+#define dganon_room_9Tex_004520 "__OTR__scenes/shared/ganon_scene/ganon_room_9Tex_004520"
+static const ALIGN_ASSET(2) char ganon_room_9Tex_004520[] = dganon_room_9Tex_004520;
+
+#define dganon_room_9Tex_004D20 "__OTR__scenes/shared/ganon_scene/ganon_room_9Tex_004D20"
+static const ALIGN_ASSET(2) char ganon_room_9Tex_004D20[] = dganon_room_9Tex_004D20;
+
+#define dganon_room_9Tex_005120 "__OTR__scenes/shared/ganon_scene/ganon_room_9Tex_005120"
+static const ALIGN_ASSET(2) char ganon_room_9Tex_005120[] = dganon_room_9Tex_005120;
+
+#define dganon_room_9TLUT_001F18 "__OTR__scenes/shared/ganon_scene/ganon_room_9TLUT_001F18"
+static const ALIGN_ASSET(2) char ganon_room_9TLUT_001F18[] = dganon_room_9TLUT_001F18;
+
+#define dganon_room_9DL_001F08 "__OTR__scenes/shared/ganon_scene/ganon_room_9DL_001F08"
+static const ALIGN_ASSET(2) char ganon_room_9DL_001F08[] = dganon_room_9DL_001F08;
+
 
 #endif // DUNGEONS_GANON_ROOM_9_H
diff --git a/soh/assets/scenes/dungeons/ganon/ganon_scene.h b/soh/assets/scenes/dungeons/ganon/ganon_scene.h
index 58eff87d2..cc4542ec6 100644
--- a/soh/assets/scenes/dungeons/ganon/ganon_scene.h
+++ b/soh/assets/scenes/dungeons/ganon/ganon_scene.h
@@ -3,34 +3,35 @@
 
 #include "align_asset_macro.h"
 
-#define dganon_sceneCollisionHeader_00E7A0 "__OTR__scenes/nonmq/ganon_scene/ganon_sceneCollisionHeader_00E7A0"
-static const ALIGN_ASSET(2) char ganon_sceneCollisionHeader_00E7A0[] = dganon_sceneCollisionHeader_00E7A0;
-
-#define dganon_sceneTex_00FBA8 "__OTR__scenes/nonmq/ganon_scene/ganon_sceneTex_00FBA8"
-static const ALIGN_ASSET(2) char ganon_sceneTex_00FBA8[] = dganon_sceneTex_00FBA8;
-
-#define dganon_sceneTLUT_00E7D0 "__OTR__scenes/nonmq/ganon_scene/ganon_sceneTLUT_00E7D0"
-static const ALIGN_ASSET(2) char ganon_sceneTLUT_00E7D0[] = dganon_sceneTLUT_00E7D0;
-
-#define dganon_sceneTex_00EFA8 "__OTR__scenes/nonmq/ganon_scene/ganon_sceneTex_00EFA8"
+#define dganon_sceneTex_00EFA8 "__OTR__scenes/shared/ganon_scene/ganon_sceneTex_00EFA8"
 static const ALIGN_ASSET(2) char ganon_sceneTex_00EFA8[] = dganon_sceneTex_00EFA8;
 
-#define dganon_sceneTLUT_00EDA0 "__OTR__scenes/nonmq/ganon_scene/ganon_sceneTLUT_00EDA0"
-static const ALIGN_ASSET(2) char ganon_sceneTLUT_00EDA0[] = dganon_sceneTLUT_00EDA0;
-
-#define dganon_sceneTex_00F3A8 "__OTR__scenes/nonmq/ganon_scene/ganon_sceneTex_00F3A8"
+#define dganon_sceneTex_00F3A8 "__OTR__scenes/shared/ganon_scene/ganon_sceneTex_00F3A8"
 static const ALIGN_ASSET(2) char ganon_sceneTex_00F3A8[] = dganon_sceneTex_00F3A8;
 
-#define dganon_sceneTex_00F7A8 "__OTR__scenes/nonmq/ganon_scene/ganon_sceneTex_00F7A8"
+#define dganon_sceneTex_00F7A8 "__OTR__scenes/shared/ganon_scene/ganon_sceneTex_00F7A8"
 static const ALIGN_ASSET(2) char ganon_sceneTex_00F7A8[] = dganon_sceneTex_00F7A8;
 
-#define dganon_sceneTex_00FFA8 "__OTR__scenes/nonmq/ganon_scene/ganon_sceneTex_00FFA8"
+#define dganon_sceneTex_00FBA8 "__OTR__scenes/shared/ganon_scene/ganon_sceneTex_00FBA8"
+static const ALIGN_ASSET(2) char ganon_sceneTex_00FBA8[] = dganon_sceneTex_00FBA8;
+
+#define dganon_sceneTex_00FFA8 "__OTR__scenes/shared/ganon_scene/ganon_sceneTex_00FFA8"
 static const ALIGN_ASSET(2) char ganon_sceneTex_00FFA8[] = dganon_sceneTex_00FFA8;
 
-#define dganon_sceneTLUT_00EBE0 "__OTR__scenes/nonmq/ganon_scene/ganon_sceneTLUT_00EBE0"
-static const ALIGN_ASSET(2) char ganon_sceneTLUT_00EBE0[] = dganon_sceneTLUT_00EBE0;
+#define dganon_sceneTLUT_00E7D0 "__OTR__scenes/shared/ganon_scene/ganon_sceneTLUT_00E7D0"
+static const ALIGN_ASSET(2) char ganon_sceneTLUT_00E7D0[] = dganon_sceneTLUT_00E7D0;
 
-#define dganon_sceneTLUT_00E9D8 "__OTR__scenes/nonmq/ganon_scene/ganon_sceneTLUT_00E9D8"
+#define dganon_sceneTLUT_00E9D8 "__OTR__scenes/shared/ganon_scene/ganon_sceneTLUT_00E9D8"
 static const ALIGN_ASSET(2) char ganon_sceneTLUT_00E9D8[] = dganon_sceneTLUT_00E9D8;
 
+#define dganon_sceneTLUT_00EBE0 "__OTR__scenes/shared/ganon_scene/ganon_sceneTLUT_00EBE0"
+static const ALIGN_ASSET(2) char ganon_sceneTLUT_00EBE0[] = dganon_sceneTLUT_00EBE0;
+
+#define dganon_sceneTLUT_00EDA0 "__OTR__scenes/shared/ganon_scene/ganon_sceneTLUT_00EDA0"
+static const ALIGN_ASSET(2) char ganon_sceneTLUT_00EDA0[] = dganon_sceneTLUT_00EDA0;
+
+#define dganon_sceneCollisionHeader_00E7A0 "__OTR__scenes/shared/ganon_scene/ganon_sceneCollisionHeader_00E7A0"
+static const ALIGN_ASSET(2) char ganon_sceneCollisionHeader_00E7A0[] = dganon_sceneCollisionHeader_00E7A0;
+
+
 #endif // DUNGEONS_GANON_SCENE_H
diff --git a/soh/assets/scenes/dungeons/ganon_boss/ganon_boss_room_0.h b/soh/assets/scenes/dungeons/ganon_boss/ganon_boss_room_0.h
index 58fc10437..e7e7812fd 100644
--- a/soh/assets/scenes/dungeons/ganon_boss/ganon_boss_room_0.h
+++ b/soh/assets/scenes/dungeons/ganon_boss/ganon_boss_room_0.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dganon_boss_room_0DL_005E50 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_room_0DL_005E50"
+#define dganon_boss_room_0DL_005E50 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_room_0DL_005E50"
 static const ALIGN_ASSET(2) char ganon_boss_room_0DL_005E50[] = dganon_boss_room_0DL_005E50;
 
 
diff --git a/soh/assets/scenes/dungeons/ganon_boss/ganon_boss_scene.h b/soh/assets/scenes/dungeons/ganon_boss/ganon_boss_scene.h
index 13d810fbd..ad661db4c 100644
--- a/soh/assets/scenes/dungeons/ganon_boss/ganon_boss_scene.h
+++ b/soh/assets/scenes/dungeons/ganon_boss/ganon_boss_scene.h
@@ -3,76 +3,77 @@
 
 #include "align_asset_macro.h"
 
-#define dganon_boss_sceneCollisionHeader_001520 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneCollisionHeader_001520"
-static const ALIGN_ASSET(2) char ganon_boss_sceneCollisionHeader_001520[] = dganon_boss_sceneCollisionHeader_001520;
-
-#define dganon_boss_sceneTex_002798 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_002798"
-static const ALIGN_ASSET(2) char ganon_boss_sceneTex_002798[] = dganon_boss_sceneTex_002798;
-
-#define dganon_boss_sceneTLUT_001C50 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTLUT_001C50"
-static const ALIGN_ASSET(2) char ganon_boss_sceneTLUT_001C50[] = dganon_boss_sceneTLUT_001C50;
-
-#define dganon_boss_sceneTex_002B98 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_002B98"
-static const ALIGN_ASSET(2) char ganon_boss_sceneTex_002B98[] = dganon_boss_sceneTex_002B98;
-
-#define dganon_boss_sceneTLUT_001A90 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTLUT_001A90"
-static const ALIGN_ASSET(2) char ganon_boss_sceneTLUT_001A90[] = dganon_boss_sceneTLUT_001A90;
-
-#define dganon_boss_sceneTex_004C18 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_004C18"
-static const ALIGN_ASSET(2) char ganon_boss_sceneTex_004C18[] = dganon_boss_sceneTex_004C18;
-
-#define dganon_boss_sceneTex_006C18 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_006C18"
-static const ALIGN_ASSET(2) char ganon_boss_sceneTex_006C18[] = dganon_boss_sceneTex_006C18;
-
-#define dganon_boss_sceneTLUT_001680 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTLUT_001680"
-static const ALIGN_ASSET(2) char ganon_boss_sceneTLUT_001680[] = dganon_boss_sceneTLUT_001680;
-
-#define dganon_boss_sceneTex_002C18 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_002C18"
-static const ALIGN_ASSET(2) char ganon_boss_sceneTex_002C18[] = dganon_boss_sceneTex_002C18;
-
-#define dganon_boss_sceneTex_005018 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_005018"
-static const ALIGN_ASSET(2) char ganon_boss_sceneTex_005018[] = dganon_boss_sceneTex_005018;
-
-#define dganon_boss_sceneTex_002658 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_002658"
-static const ALIGN_ASSET(2) char ganon_boss_sceneTex_002658[] = dganon_boss_sceneTex_002658;
-
-#define dganon_boss_sceneTex_003C18 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_003C18"
-static const ALIGN_ASSET(2) char ganon_boss_sceneTex_003C18[] = dganon_boss_sceneTex_003C18;
-
-#define dganon_boss_sceneTLUT_001620 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTLUT_001620"
-static const ALIGN_ASSET(2) char ganon_boss_sceneTLUT_001620[] = dganon_boss_sceneTLUT_001620;
-
-#define dganon_boss_sceneTex_002758 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_002758"
-static const ALIGN_ASSET(2) char ganon_boss_sceneTex_002758[] = dganon_boss_sceneTex_002758;
-
-#define dganon_boss_sceneTex_006418 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_006418"
-static const ALIGN_ASSET(2) char ganon_boss_sceneTex_006418[] = dganon_boss_sceneTex_006418;
-
-#define dganon_boss_sceneTex_001E58 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_001E58"
+#define dganon_boss_sceneTex_001E58 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_001E58"
 static const ALIGN_ASSET(2) char ganon_boss_sceneTex_001E58[] = dganon_boss_sceneTex_001E58;
 
-#define dganon_boss_sceneTLUT_001550 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTLUT_001550"
-static const ALIGN_ASSET(2) char ganon_boss_sceneTLUT_001550[] = dganon_boss_sceneTLUT_001550;
+#define dganon_boss_sceneTex_002658 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_002658"
+static const ALIGN_ASSET(2) char ganon_boss_sceneTex_002658[] = dganon_boss_sceneTex_002658;
 
-#define dganon_boss_sceneTex_006018 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_006018"
-static const ALIGN_ASSET(2) char ganon_boss_sceneTex_006018[] = dganon_boss_sceneTex_006018;
+#define dganon_boss_sceneTex_002758 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_002758"
+static const ALIGN_ASSET(2) char ganon_boss_sceneTex_002758[] = dganon_boss_sceneTex_002758;
 
-#define dganon_boss_sceneTex_005818 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_005818"
-static const ALIGN_ASSET(2) char ganon_boss_sceneTex_005818[] = dganon_boss_sceneTex_005818;
+#define dganon_boss_sceneTex_002798 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_002798"
+static const ALIGN_ASSET(2) char ganon_boss_sceneTex_002798[] = dganon_boss_sceneTex_002798;
 
-#define dganon_boss_sceneTLUT_001888 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTLUT_001888"
-static const ALIGN_ASSET(2) char ganon_boss_sceneTLUT_001888[] = dganon_boss_sceneTLUT_001888;
+#define dganon_boss_sceneTex_002B98 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_002B98"
+static const ALIGN_ASSET(2) char ganon_boss_sceneTex_002B98[] = dganon_boss_sceneTex_002B98;
 
-#define dganon_boss_sceneTex_004818 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_004818"
-static const ALIGN_ASSET(2) char ganon_boss_sceneTex_004818[] = dganon_boss_sceneTex_004818;
+#define dganon_boss_sceneTex_002C18 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_002C18"
+static const ALIGN_ASSET(2) char ganon_boss_sceneTex_002C18[] = dganon_boss_sceneTex_002C18;
 
-#define dganon_boss_sceneTex_004418 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_004418"
-static const ALIGN_ASSET(2) char ganon_boss_sceneTex_004418[] = dganon_boss_sceneTex_004418;
+#define dganon_boss_sceneTex_003C18 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_003C18"
+static const ALIGN_ASSET(2) char ganon_boss_sceneTex_003C18[] = dganon_boss_sceneTex_003C18;
 
-#define dganon_boss_sceneTex_004018 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_004018"
+#define dganon_boss_sceneTex_004018 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_004018"
 static const ALIGN_ASSET(2) char ganon_boss_sceneTex_004018[] = dganon_boss_sceneTex_004018;
 
-#define dganon_boss_sceneTex_007418 "__OTR__scenes/nonmq/ganon_boss_scene/ganon_boss_sceneTex_007418"
+#define dganon_boss_sceneTex_004418 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_004418"
+static const ALIGN_ASSET(2) char ganon_boss_sceneTex_004418[] = dganon_boss_sceneTex_004418;
+
+#define dganon_boss_sceneTex_004818 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_004818"
+static const ALIGN_ASSET(2) char ganon_boss_sceneTex_004818[] = dganon_boss_sceneTex_004818;
+
+#define dganon_boss_sceneTex_004C18 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_004C18"
+static const ALIGN_ASSET(2) char ganon_boss_sceneTex_004C18[] = dganon_boss_sceneTex_004C18;
+
+#define dganon_boss_sceneTex_005018 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_005018"
+static const ALIGN_ASSET(2) char ganon_boss_sceneTex_005018[] = dganon_boss_sceneTex_005018;
+
+#define dganon_boss_sceneTex_005818 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_005818"
+static const ALIGN_ASSET(2) char ganon_boss_sceneTex_005818[] = dganon_boss_sceneTex_005818;
+
+#define dganon_boss_sceneTex_006018 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_006018"
+static const ALIGN_ASSET(2) char ganon_boss_sceneTex_006018[] = dganon_boss_sceneTex_006018;
+
+#define dganon_boss_sceneTex_006418 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_006418"
+static const ALIGN_ASSET(2) char ganon_boss_sceneTex_006418[] = dganon_boss_sceneTex_006418;
+
+#define dganon_boss_sceneTex_006C18 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_006C18"
+static const ALIGN_ASSET(2) char ganon_boss_sceneTex_006C18[] = dganon_boss_sceneTex_006C18;
+
+#define dganon_boss_sceneTex_007418 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTex_007418"
 static const ALIGN_ASSET(2) char ganon_boss_sceneTex_007418[] = dganon_boss_sceneTex_007418;
 
+#define dganon_boss_sceneTLUT_001550 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTLUT_001550"
+static const ALIGN_ASSET(2) char ganon_boss_sceneTLUT_001550[] = dganon_boss_sceneTLUT_001550;
+
+#define dganon_boss_sceneTLUT_001620 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTLUT_001620"
+static const ALIGN_ASSET(2) char ganon_boss_sceneTLUT_001620[] = dganon_boss_sceneTLUT_001620;
+
+#define dganon_boss_sceneTLUT_001680 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTLUT_001680"
+static const ALIGN_ASSET(2) char ganon_boss_sceneTLUT_001680[] = dganon_boss_sceneTLUT_001680;
+
+#define dganon_boss_sceneTLUT_001888 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTLUT_001888"
+static const ALIGN_ASSET(2) char ganon_boss_sceneTLUT_001888[] = dganon_boss_sceneTLUT_001888;
+
+#define dganon_boss_sceneTLUT_001A90 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTLUT_001A90"
+static const ALIGN_ASSET(2) char ganon_boss_sceneTLUT_001A90[] = dganon_boss_sceneTLUT_001A90;
+
+#define dganon_boss_sceneTLUT_001C50 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneTLUT_001C50"
+static const ALIGN_ASSET(2) char ganon_boss_sceneTLUT_001C50[] = dganon_boss_sceneTLUT_001C50;
+
+#define dganon_boss_sceneCollisionHeader_001520 "__OTR__scenes/shared/ganon_boss_scene/ganon_boss_sceneCollisionHeader_001520"
+static const ALIGN_ASSET(2) char ganon_boss_sceneCollisionHeader_001520[] = dganon_boss_sceneCollisionHeader_001520;
+
+
 #endif // DUNGEONS_GANON_BOSS_SCENE_H
diff --git a/soh/assets/scenes/dungeons/ganon_demo/ganon_demo_room_0.h b/soh/assets/scenes/dungeons/ganon_demo/ganon_demo_room_0.h
index c1927a945..b2c0ce76a 100644
--- a/soh/assets/scenes/dungeons/ganon_demo/ganon_demo_room_0.h
+++ b/soh/assets/scenes/dungeons/ganon_demo/ganon_demo_room_0.h
@@ -3,16 +3,16 @@
 
 #include "align_asset_macro.h"
 
-#define dganon_demo_room_0DL_003D58 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_room_0DL_003D58"
+#define dganon_demo_room_0DL_003D58 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_room_0DL_003D58"
 static const ALIGN_ASSET(2) char ganon_demo_room_0DL_003D58[] = dganon_demo_room_0DL_003D58;
 
-#define dganon_demo_room_0DL_004140 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_room_0DL_004140"
+#define dganon_demo_room_0DL_004140 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_room_0DL_004140"
 static const ALIGN_ASSET(2) char ganon_demo_room_0DL_004140[] = dganon_demo_room_0DL_004140;
 
-#define dganon_demo_room_0Set_000230DL_003D58 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_room_0Set_000230DL_003D58"
+#define dganon_demo_room_0Set_000230DL_003D58 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_room_0Set_000230DL_003D58"
 static const ALIGN_ASSET(2) char ganon_demo_room_0Set_000230DL_003D58[] = dganon_demo_room_0Set_000230DL_003D58;
 
-#define dganon_demo_room_0Set_000230DL_004140 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_room_0Set_000230DL_004140"
+#define dganon_demo_room_0Set_000230DL_004140 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_room_0Set_000230DL_004140"
 static const ALIGN_ASSET(2) char ganon_demo_room_0Set_000230DL_004140[] = dganon_demo_room_0Set_000230DL_004140;
 
 
diff --git a/soh/assets/scenes/dungeons/ganon_demo/ganon_demo_scene.h b/soh/assets/scenes/dungeons/ganon_demo/ganon_demo_scene.h
index 0044d616d..ffa379765 100644
--- a/soh/assets/scenes/dungeons/ganon_demo/ganon_demo_scene.h
+++ b/soh/assets/scenes/dungeons/ganon_demo/ganon_demo_scene.h
@@ -3,43 +3,43 @@
 
 #include "align_asset_macro.h"
 
-#define dganon_demo_sceneCollisionHeader_001AA0 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneCollisionHeader_001AA0"
-static const ALIGN_ASSET(2) char ganon_demo_sceneCollisionHeader_001AA0[] = dganon_demo_sceneCollisionHeader_001AA0;
-
-#define dganon_demo_sceneTex_008370 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_008370"
-static const ALIGN_ASSET(2) char ganon_demo_sceneTex_008370[] = dganon_demo_sceneTex_008370;
-
-#define dganon_demo_sceneTex_007370 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_007370"
-static const ALIGN_ASSET(2) char ganon_demo_sceneTex_007370[] = dganon_demo_sceneTex_007370;
-
-#define dganon_demo_sceneTex_008870 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_008870"
-static const ALIGN_ASSET(2) char ganon_demo_sceneTex_008870[] = dganon_demo_sceneTex_008870;
-
-#define dganon_demo_sceneTex_008770 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_008770"
-static const ALIGN_ASSET(2) char ganon_demo_sceneTex_008770[] = dganon_demo_sceneTex_008770;
-
-#define dganon_demo_sceneTex_006370 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_006370"
-static const ALIGN_ASSET(2) char ganon_demo_sceneTex_006370[] = dganon_demo_sceneTex_006370;
-
-#define dganon_demo_sceneTex_005B70 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_005B70"
-static const ALIGN_ASSET(2) char ganon_demo_sceneTex_005B70[] = dganon_demo_sceneTex_005B70;
-
-#define dganon_demo_sceneTex_004B70 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_004B70"
-static const ALIGN_ASSET(2) char ganon_demo_sceneTex_004B70[] = dganon_demo_sceneTex_004B70;
-
-#define dganon_demo_sceneTex_003B70 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_003B70"
-static const ALIGN_ASSET(2) char ganon_demo_sceneTex_003B70[] = dganon_demo_sceneTex_003B70;
-
-#define dganon_demo_sceneTex_002B70 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_002B70"
-static const ALIGN_ASSET(2) char ganon_demo_sceneTex_002B70[] = dganon_demo_sceneTex_002B70;
-
-#define dganon_demo_sceneTex_001B70 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_001B70"
+#define dganon_demo_sceneTex_001B70 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneTex_001B70"
 static const ALIGN_ASSET(2) char ganon_demo_sceneTex_001B70[] = dganon_demo_sceneTex_001B70;
 
-#define dganon_demo_sceneTex_006B70 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneTex_006B70"
+#define dganon_demo_sceneTex_002B70 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneTex_002B70"
+static const ALIGN_ASSET(2) char ganon_demo_sceneTex_002B70[] = dganon_demo_sceneTex_002B70;
+
+#define dganon_demo_sceneTex_003B70 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneTex_003B70"
+static const ALIGN_ASSET(2) char ganon_demo_sceneTex_003B70[] = dganon_demo_sceneTex_003B70;
+
+#define dganon_demo_sceneTex_004B70 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneTex_004B70"
+static const ALIGN_ASSET(2) char ganon_demo_sceneTex_004B70[] = dganon_demo_sceneTex_004B70;
+
+#define dganon_demo_sceneTex_005B70 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneTex_005B70"
+static const ALIGN_ASSET(2) char ganon_demo_sceneTex_005B70[] = dganon_demo_sceneTex_005B70;
+
+#define dganon_demo_sceneTex_006370 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneTex_006370"
+static const ALIGN_ASSET(2) char ganon_demo_sceneTex_006370[] = dganon_demo_sceneTex_006370;
+
+#define dganon_demo_sceneTex_006B70 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneTex_006B70"
 static const ALIGN_ASSET(2) char ganon_demo_sceneTex_006B70[] = dganon_demo_sceneTex_006B70;
 
-#define dganon_demo_sceneCollisionHeader_001AA0 "__OTR__scenes/nonmq/ganon_demo_scene/ganon_demo_sceneCollisionHeader_001AA0"
+#define dganon_demo_sceneTex_007370 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneTex_007370"
+static const ALIGN_ASSET(2) char ganon_demo_sceneTex_007370[] = dganon_demo_sceneTex_007370;
+
+#define dganon_demo_sceneTex_008370 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneTex_008370"
+static const ALIGN_ASSET(2) char ganon_demo_sceneTex_008370[] = dganon_demo_sceneTex_008370;
+
+#define dganon_demo_sceneTex_008770 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneTex_008770"
+static const ALIGN_ASSET(2) char ganon_demo_sceneTex_008770[] = dganon_demo_sceneTex_008770;
+
+#define dganon_demo_sceneTex_008870 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneTex_008870"
+static const ALIGN_ASSET(2) char ganon_demo_sceneTex_008870[] = dganon_demo_sceneTex_008870;
+
+#define dganon_demo_sceneCollisionHeader_001AA0 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneCollisionHeader_001AA0"
+static const ALIGN_ASSET(2) char ganon_demo_sceneCollisionHeader_001AA0[] = dganon_demo_sceneCollisionHeader_001AA0;
+
+#define dganon_demo_sceneCollisionHeader_001AA0 "__OTR__scenes/shared/ganon_demo_scene/ganon_demo_sceneCollisionHeader_001AA0"
 
 
 #endif // DUNGEONS_GANON_DEMO_SCENE_H
diff --git a/soh/assets/scenes/dungeons/ganon_final/ganon_final_room_0.h b/soh/assets/scenes/dungeons/ganon_final/ganon_final_room_0.h
index 5a859ed00..633e0a348 100644
--- a/soh/assets/scenes/dungeons/ganon_final/ganon_final_room_0.h
+++ b/soh/assets/scenes/dungeons/ganon_final/ganon_final_room_0.h
@@ -3,10 +3,10 @@
 
 #include "align_asset_macro.h"
 
-#define dganon_final_room_0DL_00CA40 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_room_0DL_00CA40"
+#define dganon_final_room_0DL_00CA40 "__OTR__scenes/shared/ganon_final_scene/ganon_final_room_0DL_00CA40"
 static const ALIGN_ASSET(2) char ganon_final_room_0DL_00CA40[] = dganon_final_room_0DL_00CA40;
 
-#define dganon_final_room_0DL_00CE98 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_room_0DL_00CE98"
+#define dganon_final_room_0DL_00CE98 "__OTR__scenes/shared/ganon_final_scene/ganon_final_room_0DL_00CE98"
 static const ALIGN_ASSET(2) char ganon_final_room_0DL_00CE98[] = dganon_final_room_0DL_00CE98;
 
 
diff --git a/soh/assets/scenes/dungeons/ganon_final/ganon_final_scene.h b/soh/assets/scenes/dungeons/ganon_final/ganon_final_scene.h
index efa7738d1..78ee3c548 100644
--- a/soh/assets/scenes/dungeons/ganon_final/ganon_final_scene.h
+++ b/soh/assets/scenes/dungeons/ganon_final/ganon_final_scene.h
@@ -3,82 +3,83 @@
 
 #include "align_asset_macro.h"
 
-#define dganon_final_sceneCollisionHeader_002354 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneCollisionHeader_002354"
-static const ALIGN_ASSET(2) char ganon_final_sceneCollisionHeader_002354[] = dganon_final_sceneCollisionHeader_002354;
-
-#define dganon_final_sceneTex_00A580 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_00A580"
-static const ALIGN_ASSET(2) char ganon_final_sceneTex_00A580[] = dganon_final_sceneTex_00A580;
-
-#define dganon_final_sceneTex_00BD80 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_00BD80"
-static const ALIGN_ASSET(2) char ganon_final_sceneTex_00BD80[] = dganon_final_sceneTex_00BD80;
-
-#define dganon_final_sceneTex_00AD80 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_00AD80"
-static const ALIGN_ASSET(2) char ganon_final_sceneTex_00AD80[] = dganon_final_sceneTex_00AD80;
-
-#define dganon_final_sceneTex_00CD80 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_00CD80"
-static const ALIGN_ASSET(2) char ganon_final_sceneTex_00CD80[] = dganon_final_sceneTex_00CD80;
-
-#define dganon_final_sceneTex_004D80 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_004D80"
-static const ALIGN_ASSET(2) char ganon_final_sceneTex_004D80[] = dganon_final_sceneTex_004D80;
-
-#define dganon_final_sceneTex_006D80 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_006D80"
-static const ALIGN_ASSET(2) char ganon_final_sceneTex_006D80[] = dganon_final_sceneTex_006D80;
-
-#define dganon_final_sceneTex_003D80 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_003D80"
-static const ALIGN_ASSET(2) char ganon_final_sceneTex_003D80[] = dganon_final_sceneTex_003D80;
-
-#define dganon_final_sceneTex_010580 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_010580"
-static const ALIGN_ASSET(2) char ganon_final_sceneTex_010580[] = dganon_final_sceneTex_010580;
-
-#define dganon_final_sceneTex_00CE80 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_00CE80"
-static const ALIGN_ASSET(2) char ganon_final_sceneTex_00CE80[] = dganon_final_sceneTex_00CE80;
-
-#define dganon_final_sceneTex_00DE80 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_00DE80"
-static const ALIGN_ASSET(2) char ganon_final_sceneTex_00DE80[] = dganon_final_sceneTex_00DE80;
-
-#define dganon_final_sceneTex_002980 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_002980"
-static const ALIGN_ASSET(2) char ganon_final_sceneTex_002980[] = dganon_final_sceneTex_002980;
-
-#define dganon_final_sceneTex_002380 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_002380"
+#define dganon_final_sceneTex_002380 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_002380"
 static const ALIGN_ASSET(2) char ganon_final_sceneTex_002380[] = dganon_final_sceneTex_002380;
 
-#define dganon_final_sceneTex_002D80 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_002D80"
-static const ALIGN_ASSET(2) char ganon_final_sceneTex_002D80[] = dganon_final_sceneTex_002D80;
-
-#define dganon_final_sceneTex_007580 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_007580"
-static const ALIGN_ASSET(2) char ganon_final_sceneTex_007580[] = dganon_final_sceneTex_007580;
-
-#define dganon_final_sceneTex_00E180 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_00E180"
-static const ALIGN_ASSET(2) char ganon_final_sceneTex_00E180[] = dganon_final_sceneTex_00E180;
-
-#define dganon_final_sceneTex_00F580 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_00F580"
-static const ALIGN_ASSET(2) char ganon_final_sceneTex_00F580[] = dganon_final_sceneTex_00F580;
-
-#define dganon_final_sceneTex_005D80 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_005D80"
-static const ALIGN_ASSET(2) char ganon_final_sceneTex_005D80[] = dganon_final_sceneTex_005D80;
-
-#define dganon_final_sceneTex_008580 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_008580"
-static const ALIGN_ASSET(2) char ganon_final_sceneTex_008580[] = dganon_final_sceneTex_008580;
-
-#define dganon_final_sceneTex_009580 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_009580"
-static const ALIGN_ASSET(2) char ganon_final_sceneTex_009580[] = dganon_final_sceneTex_009580;
-
-#define dganon_final_sceneTex_010980 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_010980"
-static const ALIGN_ASSET(2) char ganon_final_sceneTex_010980[] = dganon_final_sceneTex_010980;
-
-#define dganon_final_sceneTex_004580 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_004580"
-static const ALIGN_ASSET(2) char ganon_final_sceneTex_004580[] = dganon_final_sceneTex_004580;
-
-#define dganon_final_sceneTex_002780 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_002780"
+#define dganon_final_sceneTex_002780 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_002780"
 static const ALIGN_ASSET(2) char ganon_final_sceneTex_002780[] = dganon_final_sceneTex_002780;
 
-#define dganon_final_sceneTex_00F180 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_00F180"
-static const ALIGN_ASSET(2) char ganon_final_sceneTex_00F180[] = dganon_final_sceneTex_00F180;
+#define dganon_final_sceneTex_002980 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_002980"
+static const ALIGN_ASSET(2) char ganon_final_sceneTex_002980[] = dganon_final_sceneTex_002980;
 
-#define dganon_final_sceneTex_00E080 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_00E080"
+#define dganon_final_sceneTex_002D80 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_002D80"
+static const ALIGN_ASSET(2) char ganon_final_sceneTex_002D80[] = dganon_final_sceneTex_002D80;
+
+#define dganon_final_sceneTex_003D80 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_003D80"
+static const ALIGN_ASSET(2) char ganon_final_sceneTex_003D80[] = dganon_final_sceneTex_003D80;
+
+#define dganon_final_sceneTex_004580 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_004580"
+static const ALIGN_ASSET(2) char ganon_final_sceneTex_004580[] = dganon_final_sceneTex_004580;
+
+#define dganon_final_sceneTex_004D80 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_004D80"
+static const ALIGN_ASSET(2) char ganon_final_sceneTex_004D80[] = dganon_final_sceneTex_004D80;
+
+#define dganon_final_sceneTex_005D80 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_005D80"
+static const ALIGN_ASSET(2) char ganon_final_sceneTex_005D80[] = dganon_final_sceneTex_005D80;
+
+#define dganon_final_sceneTex_006D80 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_006D80"
+static const ALIGN_ASSET(2) char ganon_final_sceneTex_006D80[] = dganon_final_sceneTex_006D80;
+
+#define dganon_final_sceneTex_007580 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_007580"
+static const ALIGN_ASSET(2) char ganon_final_sceneTex_007580[] = dganon_final_sceneTex_007580;
+
+#define dganon_final_sceneTex_008580 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_008580"
+static const ALIGN_ASSET(2) char ganon_final_sceneTex_008580[] = dganon_final_sceneTex_008580;
+
+#define dganon_final_sceneTex_009580 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_009580"
+static const ALIGN_ASSET(2) char ganon_final_sceneTex_009580[] = dganon_final_sceneTex_009580;
+
+#define dganon_final_sceneTex_00A580 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_00A580"
+static const ALIGN_ASSET(2) char ganon_final_sceneTex_00A580[] = dganon_final_sceneTex_00A580;
+
+#define dganon_final_sceneTex_00AD80 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_00AD80"
+static const ALIGN_ASSET(2) char ganon_final_sceneTex_00AD80[] = dganon_final_sceneTex_00AD80;
+
+#define dganon_final_sceneTex_00BD80 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_00BD80"
+static const ALIGN_ASSET(2) char ganon_final_sceneTex_00BD80[] = dganon_final_sceneTex_00BD80;
+
+#define dganon_final_sceneTex_00CD80 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_00CD80"
+static const ALIGN_ASSET(2) char ganon_final_sceneTex_00CD80[] = dganon_final_sceneTex_00CD80;
+
+#define dganon_final_sceneTex_00CE80 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_00CE80"
+static const ALIGN_ASSET(2) char ganon_final_sceneTex_00CE80[] = dganon_final_sceneTex_00CE80;
+
+#define dganon_final_sceneTex_00DE80 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_00DE80"
+static const ALIGN_ASSET(2) char ganon_final_sceneTex_00DE80[] = dganon_final_sceneTex_00DE80;
+
+#define dganon_final_sceneTex_00E080 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_00E080"
 static const ALIGN_ASSET(2) char ganon_final_sceneTex_00E080[] = dganon_final_sceneTex_00E080;
 
-#define dganon_final_sceneTex_011180 "__OTR__scenes/nonmq/ganon_final_scene/ganon_final_sceneTex_011180"
+#define dganon_final_sceneTex_00E180 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_00E180"
+static const ALIGN_ASSET(2) char ganon_final_sceneTex_00E180[] = dganon_final_sceneTex_00E180;
+
+#define dganon_final_sceneTex_00F180 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_00F180"
+static const ALIGN_ASSET(2) char ganon_final_sceneTex_00F180[] = dganon_final_sceneTex_00F180;
+
+#define dganon_final_sceneTex_00F580 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_00F580"
+static const ALIGN_ASSET(2) char ganon_final_sceneTex_00F580[] = dganon_final_sceneTex_00F580;
+
+#define dganon_final_sceneTex_010580 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_010580"
+static const ALIGN_ASSET(2) char ganon_final_sceneTex_010580[] = dganon_final_sceneTex_010580;
+
+#define dganon_final_sceneTex_010980 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_010980"
+static const ALIGN_ASSET(2) char ganon_final_sceneTex_010980[] = dganon_final_sceneTex_010980;
+
+#define dganon_final_sceneTex_011180 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneTex_011180"
 static const ALIGN_ASSET(2) char ganon_final_sceneTex_011180[] = dganon_final_sceneTex_011180;
 
+#define dganon_final_sceneCollisionHeader_002354 "__OTR__scenes/shared/ganon_final_scene/ganon_final_sceneCollisionHeader_002354"
+static const ALIGN_ASSET(2) char ganon_final_sceneCollisionHeader_002354[] = dganon_final_sceneCollisionHeader_002354;
+
+
 #endif // DUNGEONS_GANON_FINAL_SCENE_H
diff --git a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_0.h b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_0.h
index ca506aa89..5ca345c1b 100644
--- a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_0.h
+++ b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_0.h
@@ -3,34 +3,34 @@
 
 #include "align_asset_macro.h"
 
-#define dganon_sonogo_room_0DL_005010 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_0DL_005010"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_0DL_005010[] = dganon_sonogo_room_0DL_005010;
-
-#define dganon_sonogo_room_0Tex_005820 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_0Tex_005820"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_0Tex_005820[] = dganon_sonogo_room_0Tex_005820;
-
-#define dganon_sonogo_room_0Tex_005020 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_0Tex_005020"
+#define dganon_sonogo_room_0Tex_005020 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_0Tex_005020"
 static const ALIGN_ASSET(2) char ganon_sonogo_room_0Tex_005020[] = dganon_sonogo_room_0Tex_005020;
 
-#define dganon_sonogo_room_0Tex_007820 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_0Tex_007820"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_0Tex_007820[] = dganon_sonogo_room_0Tex_007820;
+#define dganon_sonogo_room_0Tex_005820 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_0Tex_005820"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_0Tex_005820[] = dganon_sonogo_room_0Tex_005820;
 
-#define dganon_sonogo_room_0Tex_006020 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_0Tex_006020"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_0Tex_006020[] = dganon_sonogo_room_0Tex_006020;
-
-#define dganon_sonogo_room_0Tex_006820 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_0Tex_006820"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_0Tex_006820[] = dganon_sonogo_room_0Tex_006820;
-
-#define dganon_sonogo_room_0Tex_007420 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_0Tex_007420"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_0Tex_007420[] = dganon_sonogo_room_0Tex_007420;
-
-#define dganon_sonogo_room_0Tex_007020 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_0Tex_007020"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_0Tex_007020[] = dganon_sonogo_room_0Tex_007020;
-
-#define dganon_sonogo_room_0Tex_005C20 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_0Tex_005C20"
+#define dganon_sonogo_room_0Tex_005C20 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_0Tex_005C20"
 static const ALIGN_ASSET(2) char ganon_sonogo_room_0Tex_005C20[] = dganon_sonogo_room_0Tex_005C20;
 
-#define dganon_sonogo_room_0DL_007E70 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_0DL_007E70"
+#define dganon_sonogo_room_0Tex_006020 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_0Tex_006020"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_0Tex_006020[] = dganon_sonogo_room_0Tex_006020;
+
+#define dganon_sonogo_room_0Tex_006820 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_0Tex_006820"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_0Tex_006820[] = dganon_sonogo_room_0Tex_006820;
+
+#define dganon_sonogo_room_0Tex_007020 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_0Tex_007020"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_0Tex_007020[] = dganon_sonogo_room_0Tex_007020;
+
+#define dganon_sonogo_room_0Tex_007420 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_0Tex_007420"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_0Tex_007420[] = dganon_sonogo_room_0Tex_007420;
+
+#define dganon_sonogo_room_0Tex_007820 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_0Tex_007820"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_0Tex_007820[] = dganon_sonogo_room_0Tex_007820;
+
+#define dganon_sonogo_room_0DL_005010 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_0DL_005010"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_0DL_005010[] = dganon_sonogo_room_0DL_005010;
+
+#define dganon_sonogo_room_0DL_007E70 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_0DL_007E70"
 static const ALIGN_ASSET(2) char ganon_sonogo_room_0DL_007E70[] = dganon_sonogo_room_0DL_007E70;
 
 
diff --git a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_1.h b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_1.h
index f4d721082..291cf604b 100644
--- a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_1.h
+++ b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_1.h
@@ -3,37 +3,37 @@
 
 #include "align_asset_macro.h"
 
-#define dganon_sonogo_room_1DL_004138 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_1DL_004138"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_1DL_004138[] = dganon_sonogo_room_1DL_004138;
-
-#define dganon_sonogo_room_1Tex_004948 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_1Tex_004948"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_004948[] = dganon_sonogo_room_1Tex_004948;
-
-#define dganon_sonogo_room_1Tex_006948 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_1Tex_006948"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_006948[] = dganon_sonogo_room_1Tex_006948;
-
-#define dganon_sonogo_room_1Tex_005948 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_1Tex_005948"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_005948[] = dganon_sonogo_room_1Tex_005948;
-
-#define dganon_sonogo_room_1Tex_006548 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_1Tex_006548"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_006548[] = dganon_sonogo_room_1Tex_006548;
-
-#define dganon_sonogo_room_1Tex_004D48 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_1Tex_004D48"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_004D48[] = dganon_sonogo_room_1Tex_004D48;
-
-#define dganon_sonogo_room_1Tex_005548 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_1Tex_005548"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_005548[] = dganon_sonogo_room_1Tex_005548;
-
-#define dganon_sonogo_room_1Tex_004148 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_1Tex_004148"
+#define dganon_sonogo_room_1Tex_004148 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_1Tex_004148"
 static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_004148[] = dganon_sonogo_room_1Tex_004148;
 
-#define dganon_sonogo_room_1Tex_005D48 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_1Tex_005D48"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_005D48[] = dganon_sonogo_room_1Tex_005D48;
-
-#define dganon_sonogo_room_1Tex_004548 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_1Tex_004548"
+#define dganon_sonogo_room_1Tex_004548 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_1Tex_004548"
 static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_004548[] = dganon_sonogo_room_1Tex_004548;
 
-#define dganon_sonogo_room_1DL_007BA0 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_1DL_007BA0"
+#define dganon_sonogo_room_1Tex_004948 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_1Tex_004948"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_004948[] = dganon_sonogo_room_1Tex_004948;
+
+#define dganon_sonogo_room_1Tex_004D48 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_1Tex_004D48"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_004D48[] = dganon_sonogo_room_1Tex_004D48;
+
+#define dganon_sonogo_room_1Tex_005548 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_1Tex_005548"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_005548[] = dganon_sonogo_room_1Tex_005548;
+
+#define dganon_sonogo_room_1Tex_005948 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_1Tex_005948"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_005948[] = dganon_sonogo_room_1Tex_005948;
+
+#define dganon_sonogo_room_1Tex_005D48 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_1Tex_005D48"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_005D48[] = dganon_sonogo_room_1Tex_005D48;
+
+#define dganon_sonogo_room_1Tex_006548 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_1Tex_006548"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_006548[] = dganon_sonogo_room_1Tex_006548;
+
+#define dganon_sonogo_room_1Tex_006948 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_1Tex_006948"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_1Tex_006948[] = dganon_sonogo_room_1Tex_006948;
+
+#define dganon_sonogo_room_1DL_004138 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_1DL_004138"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_1DL_004138[] = dganon_sonogo_room_1DL_004138;
+
+#define dganon_sonogo_room_1DL_007BA0 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_1DL_007BA0"
 static const ALIGN_ASSET(2) char ganon_sonogo_room_1DL_007BA0[] = dganon_sonogo_room_1DL_007BA0;
 
 
diff --git a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_2.h b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_2.h
index 584de962e..f09eaf090 100644
--- a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_2.h
+++ b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_2.h
@@ -3,43 +3,43 @@
 
 #include "align_asset_macro.h"
 
-#define dganon_sonogo_room_2DL_004A30 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_2DL_004A30"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_2DL_004A30[] = dganon_sonogo_room_2DL_004A30;
-
-#define dganon_sonogo_room_2Tex_006640 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_2Tex_006640"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_006640[] = dganon_sonogo_room_2Tex_006640;
-
-#define dganon_sonogo_room_2Tex_007A40 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_2Tex_007A40"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_007A40[] = dganon_sonogo_room_2Tex_007A40;
-
-#define dganon_sonogo_room_2Tex_005240 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_2Tex_005240"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_005240[] = dganon_sonogo_room_2Tex_005240;
-
-#define dganon_sonogo_room_2Tex_005A40 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_2Tex_005A40"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_005A40[] = dganon_sonogo_room_2Tex_005A40;
-
-#define dganon_sonogo_room_2Tex_006240 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_2Tex_006240"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_006240[] = dganon_sonogo_room_2Tex_006240;
-
-#define dganon_sonogo_room_2Tex_005640 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_2Tex_005640"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_005640[] = dganon_sonogo_room_2Tex_005640;
-
-#define dganon_sonogo_room_2Tex_004A40 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_2Tex_004A40"
+#define dganon_sonogo_room_2Tex_004A40 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_2Tex_004A40"
 static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_004A40[] = dganon_sonogo_room_2Tex_004A40;
 
-#define dganon_sonogo_room_2Tex_006A40 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_2Tex_006A40"
+#define dganon_sonogo_room_2Tex_005240 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_2Tex_005240"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_005240[] = dganon_sonogo_room_2Tex_005240;
+
+#define dganon_sonogo_room_2Tex_005640 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_2Tex_005640"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_005640[] = dganon_sonogo_room_2Tex_005640;
+
+#define dganon_sonogo_room_2Tex_005A40 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_2Tex_005A40"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_005A40[] = dganon_sonogo_room_2Tex_005A40;
+
+#define dganon_sonogo_room_2Tex_006240 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_2Tex_006240"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_006240[] = dganon_sonogo_room_2Tex_006240;
+
+#define dganon_sonogo_room_2Tex_006640 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_2Tex_006640"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_006640[] = dganon_sonogo_room_2Tex_006640;
+
+#define dganon_sonogo_room_2Tex_006A40 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_2Tex_006A40"
 static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_006A40[] = dganon_sonogo_room_2Tex_006A40;
 
-#define dganon_sonogo_room_2Tex_007240 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_2Tex_007240"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_007240[] = dganon_sonogo_room_2Tex_007240;
-
-#define dganon_sonogo_room_2Tex_008240 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_2Tex_008240"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_008240[] = dganon_sonogo_room_2Tex_008240;
-
-#define dganon_sonogo_room_2Tex_006E40 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_2Tex_006E40"
+#define dganon_sonogo_room_2Tex_006E40 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_2Tex_006E40"
 static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_006E40[] = dganon_sonogo_room_2Tex_006E40;
 
-#define dganon_sonogo_room_2DL_008C90 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_2DL_008C90"
+#define dganon_sonogo_room_2Tex_007240 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_2Tex_007240"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_007240[] = dganon_sonogo_room_2Tex_007240;
+
+#define dganon_sonogo_room_2Tex_007A40 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_2Tex_007A40"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_007A40[] = dganon_sonogo_room_2Tex_007A40;
+
+#define dganon_sonogo_room_2Tex_008240 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_2Tex_008240"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_2Tex_008240[] = dganon_sonogo_room_2Tex_008240;
+
+#define dganon_sonogo_room_2DL_004A30 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_2DL_004A30"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_2DL_004A30[] = dganon_sonogo_room_2DL_004A30;
+
+#define dganon_sonogo_room_2DL_008C90 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_2DL_008C90"
 static const ALIGN_ASSET(2) char ganon_sonogo_room_2DL_008C90[] = dganon_sonogo_room_2DL_008C90;
 
 
diff --git a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_3.h b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_3.h
index 77620980e..592025452 100644
--- a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_3.h
+++ b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_3.h
@@ -3,20 +3,20 @@
 
 #include "align_asset_macro.h"
 
-#define dganon_sonogo_room_3DL_003A28 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_3DL_003A28"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_3DL_003A28[] = dganon_sonogo_room_3DL_003A28;
-
-#define dganon_sonogo_room_3Tex_003A38 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_3Tex_003A38"
+#define dganon_sonogo_room_3Tex_003A38 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_3Tex_003A38"
 static const ALIGN_ASSET(2) char ganon_sonogo_room_3Tex_003A38[] = dganon_sonogo_room_3Tex_003A38;
 
-#define dganon_sonogo_room_3Tex_004E38 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_3Tex_004E38"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_3Tex_004E38[] = dganon_sonogo_room_3Tex_004E38;
+#define dganon_sonogo_room_3Tex_003E38 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_3Tex_003E38"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_3Tex_003E38[] = dganon_sonogo_room_3Tex_003E38;
 
-#define dganon_sonogo_room_3Tex_004638 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_3Tex_004638"
+#define dganon_sonogo_room_3Tex_004638 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_3Tex_004638"
 static const ALIGN_ASSET(2) char ganon_sonogo_room_3Tex_004638[] = dganon_sonogo_room_3Tex_004638;
 
-#define dganon_sonogo_room_3Tex_003E38 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_3Tex_003E38"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_3Tex_003E38[] = dganon_sonogo_room_3Tex_003E38;
+#define dganon_sonogo_room_3Tex_004E38 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_3Tex_004E38"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_3Tex_004E38[] = dganon_sonogo_room_3Tex_004E38;
+
+#define dganon_sonogo_room_3DL_003A28 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_3DL_003A28"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_3DL_003A28[] = dganon_sonogo_room_3DL_003A28;
 
 
 #endif // DUNGEONS_GANON_SONOGO_ROOM_3_H
diff --git a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_4.h b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_4.h
index c56319d02..9931d3547 100644
--- a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_4.h
+++ b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_4.h
@@ -3,47 +3,47 @@
 
 #include "align_asset_macro.h"
 
-#define dganon_sonogo_room_4DL_004830 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_4DL_004830"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_4DL_004830[] = dganon_sonogo_room_4DL_004830;
-
-#define dganon_sonogo_room_4Tex_005CE8 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_4Tex_005CE8"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_005CE8[] = dganon_sonogo_room_4Tex_005CE8;
-
-#define dganon_sonogo_room_4TLUT_004910 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_4TLUT_004910"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_4TLUT_004910[] = dganon_sonogo_room_4TLUT_004910;
-
-#define dganon_sonogo_room_4Tex_0064E8 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_4Tex_0064E8"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_0064E8[] = dganon_sonogo_room_4Tex_0064E8;
-
-#define dganon_sonogo_room_4TLUT_004B18 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_4TLUT_004B18"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_4TLUT_004B18[] = dganon_sonogo_room_4TLUT_004B18;
-
-#define dganon_sonogo_room_4Tex_0053A8 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_4Tex_0053A8"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_0053A8[] = dganon_sonogo_room_4Tex_0053A8;
-
-#define dganon_sonogo_room_4Tex_0074E8 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_4Tex_0074E8"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_0074E8[] = dganon_sonogo_room_4Tex_0074E8;
-
-#define dganon_sonogo_room_4Tex_0054E8 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_4Tex_0054E8"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_0054E8[] = dganon_sonogo_room_4Tex_0054E8;
-
-#define dganon_sonogo_room_4Tex_0068E8 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_4Tex_0068E8"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_0068E8[] = dganon_sonogo_room_4Tex_0068E8;
-
-#define dganon_sonogo_room_4Tex_004BA8 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_4Tex_004BA8"
+#define dganon_sonogo_room_4Tex_004BA8 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_4Tex_004BA8"
 static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_004BA8[] = dganon_sonogo_room_4Tex_004BA8;
 
-#define dganon_sonogo_room_4TLUT_004840 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_4TLUT_004840"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_4TLUT_004840[] = dganon_sonogo_room_4TLUT_004840;
+#define dganon_sonogo_room_4Tex_0053A8 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_4Tex_0053A8"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_0053A8[] = dganon_sonogo_room_4Tex_0053A8;
 
-#define dganon_sonogo_room_4Tex_007CE8 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_4Tex_007CE8"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_007CE8[] = dganon_sonogo_room_4Tex_007CE8;
+#define dganon_sonogo_room_4Tex_0054A8 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_4Tex_0054A8"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_0054A8[] = dganon_sonogo_room_4Tex_0054A8;
 
-#define dganon_sonogo_room_4Tex_006CE8 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_4Tex_006CE8"
+#define dganon_sonogo_room_4Tex_0054E8 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_4Tex_0054E8"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_0054E8[] = dganon_sonogo_room_4Tex_0054E8;
+
+#define dganon_sonogo_room_4Tex_005CE8 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_4Tex_005CE8"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_005CE8[] = dganon_sonogo_room_4Tex_005CE8;
+
+#define dganon_sonogo_room_4Tex_0064E8 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_4Tex_0064E8"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_0064E8[] = dganon_sonogo_room_4Tex_0064E8;
+
+#define dganon_sonogo_room_4Tex_0068E8 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_4Tex_0068E8"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_0068E8[] = dganon_sonogo_room_4Tex_0068E8;
+
+#define dganon_sonogo_room_4Tex_006CE8 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_4Tex_006CE8"
 static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_006CE8[] = dganon_sonogo_room_4Tex_006CE8;
 
-#define dganon_sonogo_room_4Tex_0054A8 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_room_4Tex_0054A8"
-static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_0054A8[] = dganon_sonogo_room_4Tex_0054A8;
+#define dganon_sonogo_room_4Tex_0074E8 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_4Tex_0074E8"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_0074E8[] = dganon_sonogo_room_4Tex_0074E8;
+
+#define dganon_sonogo_room_4Tex_007CE8 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_4Tex_007CE8"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_4Tex_007CE8[] = dganon_sonogo_room_4Tex_007CE8;
+
+#define dganon_sonogo_room_4TLUT_004840 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_4TLUT_004840"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_4TLUT_004840[] = dganon_sonogo_room_4TLUT_004840;
+
+#define dganon_sonogo_room_4TLUT_004910 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_4TLUT_004910"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_4TLUT_004910[] = dganon_sonogo_room_4TLUT_004910;
+
+#define dganon_sonogo_room_4TLUT_004B18 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_4TLUT_004B18"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_4TLUT_004B18[] = dganon_sonogo_room_4TLUT_004B18;
+
+#define dganon_sonogo_room_4DL_004830 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_room_4DL_004830"
+static const ALIGN_ASSET(2) char ganon_sonogo_room_4DL_004830[] = dganon_sonogo_room_4DL_004830;
 
 
 #endif // DUNGEONS_GANON_SONOGO_ROOM_4_H
diff --git a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_scene.h b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_scene.h
index 429616fc0..ec48d7402 100644
--- a/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_scene.h
+++ b/soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_scene.h
@@ -3,25 +3,26 @@
 
 #include "align_asset_macro.h"
 
-#define dganon_sonogo_sceneCollisionHeader_0062CC "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_sceneCollisionHeader_0062CC"
-static const ALIGN_ASSET(2) char ganon_sonogo_sceneCollisionHeader_0062CC[] = dganon_sonogo_sceneCollisionHeader_0062CC;
-
-#define dganon_sonogo_sceneTex_007310 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_sceneTex_007310"
-static const ALIGN_ASSET(2) char ganon_sonogo_sceneTex_007310[] = dganon_sonogo_sceneTex_007310;
-
-#define dganon_sonogo_sceneTLUT_006300 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_sceneTLUT_006300"
-static const ALIGN_ASSET(2) char ganon_sonogo_sceneTLUT_006300[] = dganon_sonogo_sceneTLUT_006300;
-
-#define dganon_sonogo_sceneTex_006710 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_sceneTex_006710"
+#define dganon_sonogo_sceneTex_006710 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_sceneTex_006710"
 static const ALIGN_ASSET(2) char ganon_sonogo_sceneTex_006710[] = dganon_sonogo_sceneTex_006710;
 
-#define dganon_sonogo_sceneTLUT_006508 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_sceneTLUT_006508"
-static const ALIGN_ASSET(2) char ganon_sonogo_sceneTLUT_006508[] = dganon_sonogo_sceneTLUT_006508;
-
-#define dganon_sonogo_sceneTex_006F10 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_sceneTex_006F10"
+#define dganon_sonogo_sceneTex_006F10 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_sceneTex_006F10"
 static const ALIGN_ASSET(2) char ganon_sonogo_sceneTex_006F10[] = dganon_sonogo_sceneTex_006F10;
 
-#define dganon_sonogo_sceneTex_007710 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_sceneTex_007710"
+#define dganon_sonogo_sceneTex_007310 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_sceneTex_007310"
+static const ALIGN_ASSET(2) char ganon_sonogo_sceneTex_007310[] = dganon_sonogo_sceneTex_007310;
+
+#define dganon_sonogo_sceneTex_007710 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_sceneTex_007710"
 static const ALIGN_ASSET(2) char ganon_sonogo_sceneTex_007710[] = dganon_sonogo_sceneTex_007710;
 
+#define dganon_sonogo_sceneTLUT_006300 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_sceneTLUT_006300"
+static const ALIGN_ASSET(2) char ganon_sonogo_sceneTLUT_006300[] = dganon_sonogo_sceneTLUT_006300;
+
+#define dganon_sonogo_sceneTLUT_006508 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_sceneTLUT_006508"
+static const ALIGN_ASSET(2) char ganon_sonogo_sceneTLUT_006508[] = dganon_sonogo_sceneTLUT_006508;
+
+#define dganon_sonogo_sceneCollisionHeader_0062CC "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_sceneCollisionHeader_0062CC"
+static const ALIGN_ASSET(2) char ganon_sonogo_sceneCollisionHeader_0062CC[] = dganon_sonogo_sceneCollisionHeader_0062CC;
+
+
 #endif // DUNGEONS_GANON_SONOGO_SCENE_H
diff --git a/soh/assets/scenes/dungeons/ganon_tou/ganon_tou_room_0.h b/soh/assets/scenes/dungeons/ganon_tou/ganon_tou_room_0.h
index a6c570778..1500981f9 100644
--- a/soh/assets/scenes/dungeons/ganon_tou/ganon_tou_room_0.h
+++ b/soh/assets/scenes/dungeons/ganon_tou/ganon_tou_room_0.h
@@ -3,85 +3,85 @@
 
 #include "align_asset_macro.h"
 
-#define dganon_tou_room_0DL_0084A8 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0DL_0084A8"
-static const ALIGN_ASSET(2) char ganon_tou_room_0DL_0084A8[] = dganon_tou_room_0DL_0084A8;
-
-#define dganon_tou_room_0Tex_00E750 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00E750"
-static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00E750[] = dganon_tou_room_0Tex_00E750;
-
-#define dganon_tou_room_0Tex_00D750 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00D750"
-static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00D750[] = dganon_tou_room_0Tex_00D750;
-
-#define dganon_tou_room_0Tex_008550 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_008550"
+#define dganon_tou_room_0Tex_008550 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_008550"
 static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_008550[] = dganon_tou_room_0Tex_008550;
 
-#define dganon_tou_room_0Tex_00FF50 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00FF50"
-static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00FF50[] = dganon_tou_room_0Tex_00FF50;
-
-#define dganon_tou_room_0Tex_00FB50 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00FB50"
-static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00FB50[] = dganon_tou_room_0Tex_00FB50;
-
-#define dganon_tou_room_0Tex_00BF50 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00BF50"
-static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00BF50[] = dganon_tou_room_0Tex_00BF50;
-
-#define dganon_tou_room_0Tex_00B950 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00B950"
-static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00B950[] = dganon_tou_room_0Tex_00B950;
-
-#define dganon_tou_room_0Tex_00B550 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00B550"
-static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00B550[] = dganon_tou_room_0Tex_00B550;
-
-#define dganon_tou_room_0Tex_00CF50 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00CF50"
-static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00CF50[] = dganon_tou_room_0Tex_00CF50;
-
-#define dganon_tou_room_0Tex_00BD50 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00BD50"
-static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00BD50[] = dganon_tou_room_0Tex_00BD50;
-
-#define dganon_tou_room_0Tex_00B150 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00B150"
-static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00B150[] = dganon_tou_room_0Tex_00B150;
-
-#define dganon_tou_room_0Tex_010550 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_010550"
-static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_010550[] = dganon_tou_room_0Tex_010550;
-
-#define dganon_tou_room_0Tex_010150 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_010150"
-static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_010150[] = dganon_tou_room_0Tex_010150;
-
-#define dganon_tou_room_0Tex_00F750 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00F750"
-static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00F750[] = dganon_tou_room_0Tex_00F750;
-
-#define dganon_tou_room_0Tex_00A150 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_00A150"
-static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00A150[] = dganon_tou_room_0Tex_00A150;
-
-#define dganon_tou_room_0Tex_009150 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_009150"
-static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_009150[] = dganon_tou_room_0Tex_009150;
-
-#define dganon_tou_room_0Tex_008F50 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_008F50"
-static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_008F50[] = dganon_tou_room_0Tex_008F50;
-
-#define dganon_tou_room_0Tex_008D50 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_008D50"
+#define dganon_tou_room_0Tex_008D50 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_008D50"
 static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_008D50[] = dganon_tou_room_0Tex_008D50;
 
-#define dganon_tou_room_0DL_0124B8 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0DL_0124B8"
-static const ALIGN_ASSET(2) char ganon_tou_room_0DL_0124B8[] = dganon_tou_room_0DL_0124B8;
+#define dganon_tou_room_0Tex_008F50 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_008F50"
+static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_008F50[] = dganon_tou_room_0Tex_008F50;
 
-#define dganon_tou_room_0Tex_0125F0 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_0125F0"
-static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_0125F0[] = dganon_tou_room_0Tex_0125F0;
+#define dganon_tou_room_0Tex_009150 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_009150"
+static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_009150[] = dganon_tou_room_0Tex_009150;
 
-#define dganon_tou_room_0Tex_0139F0 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_0139F0"
-static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_0139F0[] = dganon_tou_room_0Tex_0139F0;
+#define dganon_tou_room_0Tex_00A150 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00A150"
+static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00A150[] = dganon_tou_room_0Tex_00A150;
 
-#define dganon_tou_room_0Tex_012DF0 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_012DF0"
-static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_012DF0[] = dganon_tou_room_0Tex_012DF0;
+#define dganon_tou_room_0Tex_00B150 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00B150"
+static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00B150[] = dganon_tou_room_0Tex_00B150;
 
-#define dganon_tou_room_0Tex_0135F0 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_0135F0"
-static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_0135F0[] = dganon_tou_room_0Tex_0135F0;
+#define dganon_tou_room_0Tex_00B550 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00B550"
+static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00B550[] = dganon_tou_room_0Tex_00B550;
 
-#define dganon_tou_room_0Tex_0124F0 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Tex_0124F0"
+#define dganon_tou_room_0Tex_00B950 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00B950"
+static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00B950[] = dganon_tou_room_0Tex_00B950;
+
+#define dganon_tou_room_0Tex_00BD50 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00BD50"
+static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00BD50[] = dganon_tou_room_0Tex_00BD50;
+
+#define dganon_tou_room_0Tex_00BF50 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00BF50"
+static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00BF50[] = dganon_tou_room_0Tex_00BF50;
+
+#define dganon_tou_room_0Tex_00CF50 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00CF50"
+static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00CF50[] = dganon_tou_room_0Tex_00CF50;
+
+#define dganon_tou_room_0Tex_00D750 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00D750"
+static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00D750[] = dganon_tou_room_0Tex_00D750;
+
+#define dganon_tou_room_0Tex_00E750 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00E750"
+static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00E750[] = dganon_tou_room_0Tex_00E750;
+
+#define dganon_tou_room_0Tex_00F750 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00F750"
+static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00F750[] = dganon_tou_room_0Tex_00F750;
+
+#define dganon_tou_room_0Tex_00FB50 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00FB50"
+static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00FB50[] = dganon_tou_room_0Tex_00FB50;
+
+#define dganon_tou_room_0Tex_00FF50 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_00FF50"
+static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_00FF50[] = dganon_tou_room_0Tex_00FF50;
+
+#define dganon_tou_room_0Tex_010150 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_010150"
+static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_010150[] = dganon_tou_room_0Tex_010150;
+
+#define dganon_tou_room_0Tex_010550 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_010550"
+static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_010550[] = dganon_tou_room_0Tex_010550;
+
+#define dganon_tou_room_0Tex_0124F0 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_0124F0"
 static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_0124F0[] = dganon_tou_room_0Tex_0124F0;
 
-#define dganon_tou_room_0Set_000160DL_0084A8 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Set_000160DL_0084A8"
+#define dganon_tou_room_0Tex_0125F0 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_0125F0"
+static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_0125F0[] = dganon_tou_room_0Tex_0125F0;
+
+#define dganon_tou_room_0Tex_012DF0 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_012DF0"
+static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_012DF0[] = dganon_tou_room_0Tex_012DF0;
+
+#define dganon_tou_room_0Tex_0135F0 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_0135F0"
+static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_0135F0[] = dganon_tou_room_0Tex_0135F0;
+
+#define dganon_tou_room_0Tex_0139F0 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Tex_0139F0"
+static const ALIGN_ASSET(2) char ganon_tou_room_0Tex_0139F0[] = dganon_tou_room_0Tex_0139F0;
+
+#define dganon_tou_room_0DL_0084A8 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0DL_0084A8"
+static const ALIGN_ASSET(2) char ganon_tou_room_0DL_0084A8[] = dganon_tou_room_0DL_0084A8;
+
+#define dganon_tou_room_0DL_0124B8 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0DL_0124B8"
+static const ALIGN_ASSET(2) char ganon_tou_room_0DL_0124B8[] = dganon_tou_room_0DL_0124B8;
+
+#define dganon_tou_room_0Set_000160DL_0084A8 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Set_000160DL_0084A8"
 static const ALIGN_ASSET(2) char ganon_tou_room_0Set_000160DL_0084A8[] = dganon_tou_room_0Set_000160DL_0084A8;
 
-#define dganon_tou_room_0Set_000160DL_0124B8 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_room_0Set_000160DL_0124B8"
+#define dganon_tou_room_0Set_000160DL_0124B8 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_room_0Set_000160DL_0124B8"
 static const ALIGN_ASSET(2) char ganon_tou_room_0Set_000160DL_0124B8[] = dganon_tou_room_0Set_000160DL_0124B8;
 
 
diff --git a/soh/assets/scenes/dungeons/ganon_tou/ganon_tou_scene.h b/soh/assets/scenes/dungeons/ganon_tou/ganon_tou_scene.h
index 0b16597af..403eb7872 100644
--- a/soh/assets/scenes/dungeons/ganon_tou/ganon_tou_scene.h
+++ b/soh/assets/scenes/dungeons/ganon_tou/ganon_tou_scene.h
@@ -3,19 +3,19 @@
 
 #include "align_asset_macro.h"
 
-#define dgRainbowBridgeCs "__OTR__scenes/nonmq/ganon_tou_scene/gRainbowBridgeCs"
-static const ALIGN_ASSET(2) char gRainbowBridgeCs[] = dgRainbowBridgeCs;
-
-#define dgGanonsCastleIntroCs "__OTR__scenes/nonmq/ganon_tou_scene/gGanonsCastleIntroCs"
-static const ALIGN_ASSET(2) char gGanonsCastleIntroCs[] = dgGanonsCastleIntroCs;
-
-#define dganon_tou_sceneCollisionHeader_002610 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_sceneCollisionHeader_002610"
-static const ALIGN_ASSET(2) char ganon_tou_sceneCollisionHeader_002610[] = dganon_tou_sceneCollisionHeader_002610;
-
-#define dganon_tou_sceneTex_003280 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_sceneTex_003280"
+#define dganon_tou_sceneTex_003280 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_sceneTex_003280"
 static const ALIGN_ASSET(2) char ganon_tou_sceneTex_003280[] = dganon_tou_sceneTex_003280;
 
-#define dganon_tou_sceneCollisionHeader_002610 "__OTR__scenes/nonmq/ganon_tou_scene/ganon_tou_sceneCollisionHeader_002610"
+#define dgRainbowBridgeCs "__OTR__scenes/shared/ganon_tou_scene/gRainbowBridgeCs"
+static const ALIGN_ASSET(2) char gRainbowBridgeCs[] = dgRainbowBridgeCs;
+
+#define dgGanonsCastleIntroCs "__OTR__scenes/shared/ganon_tou_scene/gGanonsCastleIntroCs"
+static const ALIGN_ASSET(2) char gGanonsCastleIntroCs[] = dgGanonsCastleIntroCs;
+
+#define dganon_tou_sceneCollisionHeader_002610 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_sceneCollisionHeader_002610"
+static const ALIGN_ASSET(2) char ganon_tou_sceneCollisionHeader_002610[] = dganon_tou_sceneCollisionHeader_002610;
+
+#define dganon_tou_sceneCollisionHeader_002610 "__OTR__scenes/shared/ganon_tou_scene/ganon_tou_sceneCollisionHeader_002610"
 
 
 #endif // DUNGEONS_GANON_TOU_SCENE_H
diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_0.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_0.h
index b1f1e276a..8b687d735 100644
--- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_0.h
+++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_0.h
@@ -3,12 +3,15 @@
 
 #include "align_asset_macro.h"
 
-#define dganontika_room_0DL_000550 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_0DL_000550"
-static const ALIGN_ASSET(2) char ganontika_room_0DL_000550[] = dganontika_room_0DL_000550;
-
 #define dganontika_room_0Tex_007F48 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_0Tex_007F48"
 static const ALIGN_ASSET(2) char ganontika_room_0Tex_007F48[] = dganontika_room_0Tex_007F48;
 
+#define dganontika_room_0Tex_008A10 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_0Tex_008A10"
+static const ALIGN_ASSET(2) char ganontika_room_0Tex_008A10[] = dganontika_room_0Tex_008A10;
+
+#define dganontika_room_0DL_000550 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_0DL_000550"
+static const ALIGN_ASSET(2) char ganontika_room_0DL_000550[] = dganontika_room_0DL_000550;
+
 #define dganontika_room_0DL_000B30 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_0DL_000B30"
 static const ALIGN_ASSET(2) char ganontika_room_0DL_000B30[] = dganontika_room_0DL_000B30;
 
@@ -18,9 +21,6 @@ static const ALIGN_ASSET(2) char ganontika_room_0DL_001088[] = dganontika_room_0
 #define dganontika_room_0DL_008910 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_0DL_008910"
 static const ALIGN_ASSET(2) char ganontika_room_0DL_008910[] = dganontika_room_0DL_008910;
 
-#define dganontika_room_0Tex_008A10 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_0Tex_008A10"
-static const ALIGN_ASSET(2) char ganontika_room_0Tex_008A10[] = dganontika_room_0Tex_008A10;
-
 #define dganontika_room_0DL_001670 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_0DL_001670"
 static const ALIGN_ASSET(2) char ganontika_room_0DL_001670[] = dganontika_room_0DL_001670;
 
diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_1.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_1.h
index d1c2ddb40..fda95c8ae 100644
--- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_1.h
+++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_1.h
@@ -3,32 +3,83 @@
 
 #include "align_asset_macro.h"
 
-#define dganontika_room_1DL_0007C0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_0007C0"
-static const ALIGN_ASSET(2) char ganontika_room_1DL_0007C0[] = dganontika_room_1DL_0007C0;
+#define dganontika_room_1Tex_00D9E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_00D9E0"
+static const ALIGN_ASSET(2) char ganontika_room_1Tex_00D9E0[] = dganontika_room_1Tex_00D9E0;
+
+#define dganontika_room_1Tex_00E9E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_00E9E0"
+static const ALIGN_ASSET(2) char ganontika_room_1Tex_00E9E0[] = dganontika_room_1Tex_00E9E0;
+
+#define dganontika_room_1Tex_00F9E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_00F9E0"
+static const ALIGN_ASSET(2) char ganontika_room_1Tex_00F9E0[] = dganontika_room_1Tex_00F9E0;
+
+#define dganontika_room_1Tex_0109E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0109E0"
+static const ALIGN_ASSET(2) char ganontika_room_1Tex_0109E0[] = dganontika_room_1Tex_0109E0;
+
+#define dganontika_room_1Tex_0119E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0119E0"
+static const ALIGN_ASSET(2) char ganontika_room_1Tex_0119E0[] = dganontika_room_1Tex_0119E0;
+
+#define dganontika_room_1Tex_0121E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0121E0"
+static const ALIGN_ASSET(2) char ganontika_room_1Tex_0121E0[] = dganontika_room_1Tex_0121E0;
 
 #define dganontika_room_1Tex_0129E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0129E0"
 static const ALIGN_ASSET(2) char ganontika_room_1Tex_0129E0[] = dganontika_room_1Tex_0129E0;
 
+#define dganontika_room_1Tex_0131E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0131E0"
+static const ALIGN_ASSET(2) char ganontika_room_1Tex_0131E0[] = dganontika_room_1Tex_0131E0;
+
 #define dganontika_room_1Tex_0139E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0139E0"
 static const ALIGN_ASSET(2) char ganontika_room_1Tex_0139E0[] = dganontika_room_1Tex_0139E0;
 
-#define dganontika_room_1DL_000F60 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_000F60"
-static const ALIGN_ASSET(2) char ganontika_room_1DL_000F60[] = dganontika_room_1DL_000F60;
+#define dganontika_room_1Tex_0141E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0141E0"
+static const ALIGN_ASSET(2) char ganontika_room_1Tex_0141E0[] = dganontika_room_1Tex_0141E0;
 
-#define dganontika_room_1Tex_019DE0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_019DE0"
-static const ALIGN_ASSET(2) char ganontika_room_1Tex_019DE0[] = dganontika_room_1Tex_019DE0;
+#define dganontika_room_1Tex_0149E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0149E0"
+static const ALIGN_ASSET(2) char ganontika_room_1Tex_0149E0[] = dganontika_room_1Tex_0149E0;
 
-#define dganontika_room_1Tex_0199E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0199E0"
-static const ALIGN_ASSET(2) char ganontika_room_1Tex_0199E0[] = dganontika_room_1Tex_0199E0;
+#define dganontika_room_1Tex_0151E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0151E0"
+static const ALIGN_ASSET(2) char ganontika_room_1Tex_0151E0[] = dganontika_room_1Tex_0151E0;
 
-#define dganontika_room_1DL_001A08 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_001A08"
-static const ALIGN_ASSET(2) char ganontika_room_1DL_001A08[] = dganontika_room_1DL_001A08;
+#define dganontika_room_1Tex_0159E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0159E0"
+static const ALIGN_ASSET(2) char ganontika_room_1Tex_0159E0[] = dganontika_room_1Tex_0159E0;
+
+#define dganontika_room_1Tex_0161E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0161E0"
+static const ALIGN_ASSET(2) char ganontika_room_1Tex_0161E0[] = dganontika_room_1Tex_0161E0;
+
+#define dganontika_room_1Tex_0169E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0169E0"
+static const ALIGN_ASSET(2) char ganontika_room_1Tex_0169E0[] = dganontika_room_1Tex_0169E0;
+
+#define dganontika_room_1Tex_0171E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0171E0"
+static const ALIGN_ASSET(2) char ganontika_room_1Tex_0171E0[] = dganontika_room_1Tex_0171E0;
+
+#define dganontika_room_1Tex_0179E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0179E0"
+static const ALIGN_ASSET(2) char ganontika_room_1Tex_0179E0[] = dganontika_room_1Tex_0179E0;
+
+#define dganontika_room_1Tex_0181E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0181E0"
+static const ALIGN_ASSET(2) char ganontika_room_1Tex_0181E0[] = dganontika_room_1Tex_0181E0;
 
 #define dganontika_room_1Tex_0189E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0189E0"
 static const ALIGN_ASSET(2) char ganontika_room_1Tex_0189E0[] = dganontika_room_1Tex_0189E0;
 
-#define dganontika_room_1Tex_0141E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0141E0"
-static const ALIGN_ASSET(2) char ganontika_room_1Tex_0141E0[] = dganontika_room_1Tex_0141E0;
+#define dganontika_room_1Tex_0199E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0199E0"
+static const ALIGN_ASSET(2) char ganontika_room_1Tex_0199E0[] = dganontika_room_1Tex_0199E0;
+
+#define dganontika_room_1Tex_019DE0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_019DE0"
+static const ALIGN_ASSET(2) char ganontika_room_1Tex_019DE0[] = dganontika_room_1Tex_019DE0;
+
+#define dganontika_room_1Tex_01B9C8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_01B9C8"
+static const ALIGN_ASSET(2) char ganontika_room_1Tex_01B9C8[] = dganontika_room_1Tex_01B9C8;
+
+#define dganontika_room_1TLUT_00D9C0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1TLUT_00D9C0"
+static const ALIGN_ASSET(2) char ganontika_room_1TLUT_00D9C0[] = dganontika_room_1TLUT_00D9C0;
+
+#define dganontika_room_1DL_0007C0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_0007C0"
+static const ALIGN_ASSET(2) char ganontika_room_1DL_0007C0[] = dganontika_room_1DL_0007C0;
+
+#define dganontika_room_1DL_000F60 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_000F60"
+static const ALIGN_ASSET(2) char ganontika_room_1DL_000F60[] = dganontika_room_1DL_000F60;
+
+#define dganontika_room_1DL_001A08 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_001A08"
+static const ALIGN_ASSET(2) char ganontika_room_1DL_001A08[] = dganontika_room_1DL_001A08;
 
 #define dganontika_room_1DL_002290 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_002290"
 static const ALIGN_ASSET(2) char ganontika_room_1DL_002290[] = dganontika_room_1DL_002290;
@@ -54,15 +105,9 @@ static const ALIGN_ASSET(2) char ganontika_room_1DL_0040D8[] = dganontika_room_1
 #define dganontika_room_1DL_004450 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_004450"
 static const ALIGN_ASSET(2) char ganontika_room_1DL_004450[] = dganontika_room_1DL_004450;
 
-#define dganontika_room_1Tex_0149E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0149E0"
-static const ALIGN_ASSET(2) char ganontika_room_1Tex_0149E0[] = dganontika_room_1Tex_0149E0;
-
 #define dganontika_room_1DL_004838 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_004838"
 static const ALIGN_ASSET(2) char ganontika_room_1DL_004838[] = dganontika_room_1DL_004838;
 
-#define dganontika_room_1Tex_0121E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0121E0"
-static const ALIGN_ASSET(2) char ganontika_room_1Tex_0121E0[] = dganontika_room_1Tex_0121E0;
-
 #define dganontika_room_1DL_004B88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_004B88"
 static const ALIGN_ASSET(2) char ganontika_room_1DL_004B88[] = dganontika_room_1DL_004B88;
 
@@ -78,12 +123,6 @@ static const ALIGN_ASSET(2) char ganontika_room_1DL_005A98[] = dganontika_room_1
 #define dganontika_room_1DL_006498 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_006498"
 static const ALIGN_ASSET(2) char ganontika_room_1DL_006498[] = dganontika_room_1DL_006498;
 
-#define dganontika_room_1Tex_0151E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0151E0"
-static const ALIGN_ASSET(2) char ganontika_room_1Tex_0151E0[] = dganontika_room_1Tex_0151E0;
-
-#define dganontika_room_1Tex_0109E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0109E0"
-static const ALIGN_ASSET(2) char ganontika_room_1Tex_0109E0[] = dganontika_room_1Tex_0109E0;
-
 #define dganontika_room_1DL_007120 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_007120"
 static const ALIGN_ASSET(2) char ganontika_room_1DL_007120[] = dganontika_room_1DL_007120;
 
@@ -93,66 +132,39 @@ static const ALIGN_ASSET(2) char ganontika_room_1DL_0079A8[] = dganontika_room_1
 #define dganontika_room_1DL_008220 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_008220"
 static const ALIGN_ASSET(2) char ganontika_room_1DL_008220[] = dganontika_room_1DL_008220;
 
-#define dganontika_room_1Tex_0119E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0119E0"
-static const ALIGN_ASSET(2) char ganontika_room_1Tex_0119E0[] = dganontika_room_1Tex_0119E0;
-
 #define dganontika_room_1DL_008578 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_008578"
 static const ALIGN_ASSET(2) char ganontika_room_1DL_008578[] = dganontika_room_1DL_008578;
 
-#define dganontika_room_1Tex_0181E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0181E0"
-static const ALIGN_ASSET(2) char ganontika_room_1Tex_0181E0[] = dganontika_room_1Tex_0181E0;
-
-#define dganontika_room_1TLUT_00D9C0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1TLUT_00D9C0"
-static const ALIGN_ASSET(2) char ganontika_room_1TLUT_00D9C0[] = dganontika_room_1TLUT_00D9C0;
-
 #define dganontika_room_1DL_01A810 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_01A810"
 static const ALIGN_ASSET(2) char ganontika_room_1DL_01A810[] = dganontika_room_1DL_01A810;
 
-#define dganontika_room_1Tex_01B9C8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_01B9C8"
-static const ALIGN_ASSET(2) char ganontika_room_1Tex_01B9C8[] = dganontika_room_1Tex_01B9C8;
-
 #define dganontika_room_1DL_008738 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_008738"
 static const ALIGN_ASSET(2) char ganontika_room_1DL_008738[] = dganontika_room_1DL_008738;
 
-#define dganontika_room_1Tex_0179E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0179E0"
-static const ALIGN_ASSET(2) char ganontika_room_1Tex_0179E0[] = dganontika_room_1Tex_0179E0;
-
 #define dganontika_room_1DL_01AB58 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_01AB58"
 static const ALIGN_ASSET(2) char ganontika_room_1DL_01AB58[] = dganontika_room_1DL_01AB58;
 
 #define dganontika_room_1DL_0088F8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_0088F8"
 static const ALIGN_ASSET(2) char ganontika_room_1DL_0088F8[] = dganontika_room_1DL_0088F8;
 
-#define dganontika_room_1Tex_0171E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0171E0"
-static const ALIGN_ASSET(2) char ganontika_room_1Tex_0171E0[] = dganontika_room_1Tex_0171E0;
-
 #define dganontika_room_1DL_01AEA0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_01AEA0"
 static const ALIGN_ASSET(2) char ganontika_room_1DL_01AEA0[] = dganontika_room_1DL_01AEA0;
 
 #define dganontika_room_1DL_008AB8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_008AB8"
 static const ALIGN_ASSET(2) char ganontika_room_1DL_008AB8[] = dganontika_room_1DL_008AB8;
 
-#define dganontika_room_1Tex_0169E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0169E0"
-static const ALIGN_ASSET(2) char ganontika_room_1Tex_0169E0[] = dganontika_room_1Tex_0169E0;
-
 #define dganontika_room_1DL_01B1E8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_01B1E8"
 static const ALIGN_ASSET(2) char ganontika_room_1DL_01B1E8[] = dganontika_room_1DL_01B1E8;
 
 #define dganontika_room_1DL_008C78 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_008C78"
 static const ALIGN_ASSET(2) char ganontika_room_1DL_008C78[] = dganontika_room_1DL_008C78;
 
-#define dganontika_room_1Tex_0161E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0161E0"
-static const ALIGN_ASSET(2) char ganontika_room_1Tex_0161E0[] = dganontika_room_1Tex_0161E0;
-
 #define dganontika_room_1DL_01B530 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_01B530"
 static const ALIGN_ASSET(2) char ganontika_room_1DL_01B530[] = dganontika_room_1DL_01B530;
 
 #define dganontika_room_1DL_008E38 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_008E38"
 static const ALIGN_ASSET(2) char ganontika_room_1DL_008E38[] = dganontika_room_1DL_008E38;
 
-#define dganontika_room_1Tex_0159E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0159E0"
-static const ALIGN_ASSET(2) char ganontika_room_1Tex_0159E0[] = dganontika_room_1Tex_0159E0;
-
 #define dganontika_room_1DL_01B878 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_01B878"
 static const ALIGN_ASSET(2) char ganontika_room_1DL_01B878[] = dganontika_room_1DL_01B878;
 
@@ -171,21 +183,9 @@ static const ALIGN_ASSET(2) char ganontika_room_1DL_00A548[] = dganontika_room_1
 #define dganontika_room_1DL_00B730 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_00B730"
 static const ALIGN_ASSET(2) char ganontika_room_1DL_00B730[] = dganontika_room_1DL_00B730;
 
-#define dganontika_room_1Tex_00D9E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_00D9E0"
-static const ALIGN_ASSET(2) char ganontika_room_1Tex_00D9E0[] = dganontika_room_1Tex_00D9E0;
-
-#define dganontika_room_1Tex_00E9E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_00E9E0"
-static const ALIGN_ASSET(2) char ganontika_room_1Tex_00E9E0[] = dganontika_room_1Tex_00E9E0;
-
-#define dganontika_room_1Tex_00F9E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_00F9E0"
-static const ALIGN_ASSET(2) char ganontika_room_1Tex_00F9E0[] = dganontika_room_1Tex_00F9E0;
-
 #define dganontika_room_1DL_00C9E8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_00C9E8"
 static const ALIGN_ASSET(2) char ganontika_room_1DL_00C9E8[] = dganontika_room_1DL_00C9E8;
 
-#define dganontika_room_1Tex_0131E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1Tex_0131E0"
-static const ALIGN_ASSET(2) char ganontika_room_1Tex_0131E0[] = dganontika_room_1Tex_0131E0;
-
 #define dganontika_room_1DL_00CE08 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_1DL_00CE08"
 static const ALIGN_ASSET(2) char ganontika_room_1DL_00CE08[] = dganontika_room_1DL_00CE08;
 
diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_10.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_10.h
index ff09e407c..38e562789 100644
--- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_10.h
+++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_10.h
@@ -3,20 +3,17 @@
 
 #include "align_asset_macro.h"
 
-#define dganontika_room_10DL_000290 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_10DL_000290"
-static const ALIGN_ASSET(2) char ganontika_room_10DL_000290[] = dganontika_room_10DL_000290;
-
 #define dganontika_room_10Tex_0039B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_10Tex_0039B8"
 static const ALIGN_ASSET(2) char ganontika_room_10Tex_0039B8[] = dganontika_room_10Tex_0039B8;
 
-#define dganontika_room_10DL_000568 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_10DL_000568"
-static const ALIGN_ASSET(2) char ganontika_room_10DL_000568[] = dganontika_room_10DL_000568;
-
 #define dganontika_room_10Tex_0041B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_10Tex_0041B8"
 static const ALIGN_ASSET(2) char ganontika_room_10Tex_0041B8[] = dganontika_room_10Tex_0041B8;
 
-#define dganontika_room_10DL_0017C0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_10DL_0017C0"
-static const ALIGN_ASSET(2) char ganontika_room_10DL_0017C0[] = dganontika_room_10DL_0017C0;
+#define dganontika_room_10Tex_0049B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_10Tex_0049B8"
+static const ALIGN_ASSET(2) char ganontika_room_10Tex_0049B8[] = dganontika_room_10Tex_0049B8;
+
+#define dganontika_room_10Tex_0051B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_10Tex_0051B8"
+static const ALIGN_ASSET(2) char ganontika_room_10Tex_0051B8[] = dganontika_room_10Tex_0051B8;
 
 #define dganontika_room_10Tex_0059B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_10Tex_0059B8"
 static const ALIGN_ASSET(2) char ganontika_room_10Tex_0059B8[] = dganontika_room_10Tex_0059B8;
@@ -24,11 +21,14 @@ static const ALIGN_ASSET(2) char ganontika_room_10Tex_0059B8[] = dganontika_room
 #define dganontika_room_10Tex_005BB8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_10Tex_005BB8"
 static const ALIGN_ASSET(2) char ganontika_room_10Tex_005BB8[] = dganontika_room_10Tex_005BB8;
 
-#define dganontika_room_10Tex_0051B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_10Tex_0051B8"
-static const ALIGN_ASSET(2) char ganontika_room_10Tex_0051B8[] = dganontika_room_10Tex_0051B8;
+#define dganontika_room_10DL_000290 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_10DL_000290"
+static const ALIGN_ASSET(2) char ganontika_room_10DL_000290[] = dganontika_room_10DL_000290;
 
-#define dganontika_room_10Tex_0049B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_10Tex_0049B8"
-static const ALIGN_ASSET(2) char ganontika_room_10Tex_0049B8[] = dganontika_room_10Tex_0049B8;
+#define dganontika_room_10DL_000568 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_10DL_000568"
+static const ALIGN_ASSET(2) char ganontika_room_10DL_000568[] = dganontika_room_10DL_000568;
+
+#define dganontika_room_10DL_0017C0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_10DL_0017C0"
+static const ALIGN_ASSET(2) char ganontika_room_10DL_0017C0[] = dganontika_room_10DL_0017C0;
 
 #define dganontika_room_10DL_002AD8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_10DL_002AD8"
 static const ALIGN_ASSET(2) char ganontika_room_10DL_002AD8[] = dganontika_room_10DL_002AD8;
diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_11.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_11.h
index 02df22e39..274362df1 100644
--- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_11.h
+++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_11.h
@@ -3,27 +3,33 @@
 
 #include "align_asset_macro.h"
 
-#define dganontika_room_11DL_000390 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11DL_000390"
-static const ALIGN_ASSET(2) char ganontika_room_11DL_000390[] = dganontika_room_11DL_000390;
+#define dganontika_room_11Tex_004150 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11Tex_004150"
+static const ALIGN_ASSET(2) char ganontika_room_11Tex_004150[] = dganontika_room_11Tex_004150;
 
 #define dganontika_room_11Tex_004950 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11Tex_004950"
 static const ALIGN_ASSET(2) char ganontika_room_11Tex_004950[] = dganontika_room_11Tex_004950;
 
+#define dganontika_room_11Tex_005150 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11Tex_005150"
+static const ALIGN_ASSET(2) char ganontika_room_11Tex_005150[] = dganontika_room_11Tex_005150;
+
+#define dganontika_room_11Tex_005950 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11Tex_005950"
+static const ALIGN_ASSET(2) char ganontika_room_11Tex_005950[] = dganontika_room_11Tex_005950;
+
+#define dganontika_room_11Tex_006150 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11Tex_006150"
+static const ALIGN_ASSET(2) char ganontika_room_11Tex_006150[] = dganontika_room_11Tex_006150;
+
+#define dganontika_room_11DL_000390 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11DL_000390"
+static const ALIGN_ASSET(2) char ganontika_room_11DL_000390[] = dganontika_room_11DL_000390;
+
 #define dganontika_room_11DL_000580 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11DL_000580"
 static const ALIGN_ASSET(2) char ganontika_room_11DL_000580[] = dganontika_room_11DL_000580;
 
 #define dganontika_room_11DL_000878 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11DL_000878"
 static const ALIGN_ASSET(2) char ganontika_room_11DL_000878[] = dganontika_room_11DL_000878;
 
-#define dganontika_room_11Tex_006150 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11Tex_006150"
-static const ALIGN_ASSET(2) char ganontika_room_11Tex_006150[] = dganontika_room_11Tex_006150;
-
 #define dganontika_room_11DL_000E60 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11DL_000E60"
 static const ALIGN_ASSET(2) char ganontika_room_11DL_000E60[] = dganontika_room_11DL_000E60;
 
-#define dganontika_room_11Tex_005150 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11Tex_005150"
-static const ALIGN_ASSET(2) char ganontika_room_11Tex_005150[] = dganontika_room_11Tex_005150;
-
 #define dganontika_room_11DL_0015B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11DL_0015B8"
 static const ALIGN_ASSET(2) char ganontika_room_11DL_0015B8[] = dganontika_room_11DL_0015B8;
 
@@ -39,12 +45,6 @@ static const ALIGN_ASSET(2) char ganontika_room_11DL_0029D0[] = dganontika_room_
 #define dganontika_room_11DL_0034D8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11DL_0034D8"
 static const ALIGN_ASSET(2) char ganontika_room_11DL_0034D8[] = dganontika_room_11DL_0034D8;
 
-#define dganontika_room_11Tex_005950 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11Tex_005950"
-static const ALIGN_ASSET(2) char ganontika_room_11Tex_005950[] = dganontika_room_11Tex_005950;
-
-#define dganontika_room_11Tex_004150 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11Tex_004150"
-static const ALIGN_ASSET(2) char ganontika_room_11Tex_004150[] = dganontika_room_11Tex_004150;
-
 #define dganontika_room_11DL_003F60 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_11DL_003F60"
 static const ALIGN_ASSET(2) char ganontika_room_11DL_003F60[] = dganontika_room_11DL_003F60;
 
diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_12.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_12.h
index 003441450..08b22e156 100644
--- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_12.h
+++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_12.h
@@ -3,51 +3,57 @@
 
 #include "align_asset_macro.h"
 
-#define dganontika_room_12DL_0021C0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12DL_0021C0"
-static const ALIGN_ASSET(2) char ganontika_room_12DL_0021C0[] = dganontika_room_12DL_0021C0;
+#define dganontika_room_12Tex_005160 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_005160"
+static const ALIGN_ASSET(2) char ganontika_room_12Tex_005160[] = dganontika_room_12Tex_005160;
 
-#define dganontika_room_12Tex_008560 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_008560"
-static const ALIGN_ASSET(2) char ganontika_room_12Tex_008560[] = dganontika_room_12Tex_008560;
+#define dganontika_room_12Tex_005960 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_005960"
+static const ALIGN_ASSET(2) char ganontika_room_12Tex_005960[] = dganontika_room_12Tex_005960;
+
+#define dganontika_room_12Tex_006160 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_006160"
+static const ALIGN_ASSET(2) char ganontika_room_12Tex_006160[] = dganontika_room_12Tex_006160;
+
+#define dganontika_room_12Tex_006960 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_006960"
+static const ALIGN_ASSET(2) char ganontika_room_12Tex_006960[] = dganontika_room_12Tex_006960;
+
+#define dganontika_room_12Tex_007160 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_007160"
+static const ALIGN_ASSET(2) char ganontika_room_12Tex_007160[] = dganontika_room_12Tex_007160;
 
 #define dganontika_room_12Tex_008160 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_008160"
 static const ALIGN_ASSET(2) char ganontika_room_12Tex_008160[] = dganontika_room_12Tex_008160;
 
+#define dganontika_room_12Tex_008560 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_008560"
+static const ALIGN_ASSET(2) char ganontika_room_12Tex_008560[] = dganontika_room_12Tex_008560;
+
+#define dganontika_room_12Tex_009270 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_009270"
+static const ALIGN_ASSET(2) char ganontika_room_12Tex_009270[] = dganontika_room_12Tex_009270;
+
+#define dganontika_room_12Tex_00A270 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_00A270"
+static const ALIGN_ASSET(2) char ganontika_room_12Tex_00A270[] = dganontika_room_12Tex_00A270;
+
+#define dganontika_room_12TLUT_005140 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12TLUT_005140"
+static const ALIGN_ASSET(2) char ganontika_room_12TLUT_005140[] = dganontika_room_12TLUT_005140;
+
+#define dganontika_room_12DL_0021C0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12DL_0021C0"
+static const ALIGN_ASSET(2) char ganontika_room_12DL_0021C0[] = dganontika_room_12DL_0021C0;
+
 #define dganontika_room_12DL_002738 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12DL_002738"
 static const ALIGN_ASSET(2) char ganontika_room_12DL_002738[] = dganontika_room_12DL_002738;
 
-#define dganontika_room_12Tex_007160 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_007160"
-static const ALIGN_ASSET(2) char ganontika_room_12Tex_007160[] = dganontika_room_12Tex_007160;
-
 #define dganontika_room_12DL_002AB8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12DL_002AB8"
 static const ALIGN_ASSET(2) char ganontika_room_12DL_002AB8[] = dganontika_room_12DL_002AB8;
 
 #define dganontika_room_12DL_002C60 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12DL_002C60"
 static const ALIGN_ASSET(2) char ganontika_room_12DL_002C60[] = dganontika_room_12DL_002C60;
 
-#define dganontika_room_12Tex_006960 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_006960"
-static const ALIGN_ASSET(2) char ganontika_room_12Tex_006960[] = dganontika_room_12Tex_006960;
-
-#define dganontika_room_12TLUT_005140 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12TLUT_005140"
-static const ALIGN_ASSET(2) char ganontika_room_12TLUT_005140[] = dganontika_room_12TLUT_005140;
-
 #define dganontika_room_12DL_008F90 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12DL_008F90"
 static const ALIGN_ASSET(2) char ganontika_room_12DL_008F90[] = dganontika_room_12DL_008F90;
 
-#define dganontika_room_12Tex_009270 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_009270"
-static const ALIGN_ASSET(2) char ganontika_room_12Tex_009270[] = dganontika_room_12Tex_009270;
-
 #define dganontika_room_12DL_0031A0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12DL_0031A0"
 static const ALIGN_ASSET(2) char ganontika_room_12DL_0031A0[] = dganontika_room_12DL_0031A0;
 
-#define dganontika_room_12Tex_005960 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_005960"
-static const ALIGN_ASSET(2) char ganontika_room_12Tex_005960[] = dganontika_room_12Tex_005960;
-
 #define dganontika_room_12DL_003D30 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12DL_003D30"
 static const ALIGN_ASSET(2) char ganontika_room_12DL_003D30[] = dganontika_room_12DL_003D30;
 
-#define dganontika_room_12Tex_005160 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_005160"
-static const ALIGN_ASSET(2) char ganontika_room_12Tex_005160[] = dganontika_room_12Tex_005160;
-
 #define dganontika_room_12DL_004A08 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12DL_004A08"
 static const ALIGN_ASSET(2) char ganontika_room_12DL_004A08[] = dganontika_room_12DL_004A08;
 
@@ -60,14 +66,8 @@ static const ALIGN_ASSET(2) char ganontika_room_12DL_000330[] = dganontika_room_
 #define dganontika_room_12DL_001928 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12DL_001928"
 static const ALIGN_ASSET(2) char ganontika_room_12DL_001928[] = dganontika_room_12DL_001928;
 
-#define dganontika_room_12Tex_006160 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_006160"
-static const ALIGN_ASSET(2) char ganontika_room_12Tex_006160[] = dganontika_room_12Tex_006160;
-
 #define dganontika_room_12DL_009178 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12DL_009178"
 static const ALIGN_ASSET(2) char ganontika_room_12DL_009178[] = dganontika_room_12DL_009178;
 
-#define dganontika_room_12Tex_00A270 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_12Tex_00A270"
-static const ALIGN_ASSET(2) char ganontika_room_12Tex_00A270[] = dganontika_room_12Tex_00A270;
-
 
 #endif // DUNGEONS_GANONTIKA_ROOM_12_H
diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_13.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_13.h
index fa2e49496..8daa86500 100644
--- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_13.h
+++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_13.h
@@ -3,8 +3,20 @@
 
 #include "align_asset_macro.h"
 
-#define dganontika_room_13DL_001260 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_13DL_001260"
-static const ALIGN_ASSET(2) char ganontika_room_13DL_001260[] = dganontika_room_13DL_001260;
+#define dganontika_room_13Tex_004340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_13Tex_004340"
+static const ALIGN_ASSET(2) char ganontika_room_13Tex_004340[] = dganontika_room_13Tex_004340;
+
+#define dganontika_room_13Tex_004B40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_13Tex_004B40"
+static const ALIGN_ASSET(2) char ganontika_room_13Tex_004B40[] = dganontika_room_13Tex_004B40;
+
+#define dganontika_room_13Tex_005340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_13Tex_005340"
+static const ALIGN_ASSET(2) char ganontika_room_13Tex_005340[] = dganontika_room_13Tex_005340;
+
+#define dganontika_room_13Tex_005B40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_13Tex_005B40"
+static const ALIGN_ASSET(2) char ganontika_room_13Tex_005B40[] = dganontika_room_13Tex_005B40;
+
+#define dganontika_room_13Tex_006340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_13Tex_006340"
+static const ALIGN_ASSET(2) char ganontika_room_13Tex_006340[] = dganontika_room_13Tex_006340;
 
 #define dganontika_room_13Tex_006B40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_13Tex_006B40"
 static const ALIGN_ASSET(2) char ganontika_room_13Tex_006B40[] = dganontika_room_13Tex_006B40;
@@ -12,24 +24,12 @@ static const ALIGN_ASSET(2) char ganontika_room_13Tex_006B40[] = dganontika_room
 #define dganontika_room_13Tex_006D40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_13Tex_006D40"
 static const ALIGN_ASSET(2) char ganontika_room_13Tex_006D40[] = dganontika_room_13Tex_006D40;
 
-#define dganontika_room_13Tex_006340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_13Tex_006340"
-static const ALIGN_ASSET(2) char ganontika_room_13Tex_006340[] = dganontika_room_13Tex_006340;
-
-#define dganontika_room_13Tex_004B40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_13Tex_004B40"
-static const ALIGN_ASSET(2) char ganontika_room_13Tex_004B40[] = dganontika_room_13Tex_004B40;
-
-#define dganontika_room_13Tex_005B40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_13Tex_005B40"
-static const ALIGN_ASSET(2) char ganontika_room_13Tex_005B40[] = dganontika_room_13Tex_005B40;
-
-#define dganontika_room_13Tex_004340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_13Tex_004340"
-static const ALIGN_ASSET(2) char ganontika_room_13Tex_004340[] = dganontika_room_13Tex_004340;
+#define dganontika_room_13DL_001260 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_13DL_001260"
+static const ALIGN_ASSET(2) char ganontika_room_13DL_001260[] = dganontika_room_13DL_001260;
 
 #define dganontika_room_13DL_0024F8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_13DL_0024F8"
 static const ALIGN_ASSET(2) char ganontika_room_13DL_0024F8[] = dganontika_room_13DL_0024F8;
 
-#define dganontika_room_13Tex_005340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_13Tex_005340"
-static const ALIGN_ASSET(2) char ganontika_room_13Tex_005340[] = dganontika_room_13Tex_005340;
-
 #define dganontika_room_13DL_002CF0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_13DL_002CF0"
 static const ALIGN_ASSET(2) char ganontika_room_13DL_002CF0[] = dganontika_room_13DL_002CF0;
 
diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_14.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_14.h
index 221eace9f..b80f26bb2 100644
--- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_14.h
+++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_14.h
@@ -3,8 +3,17 @@
 
 #include "align_asset_macro.h"
 
-#define dganontika_room_14DL_000918 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14DL_000918"
-static const ALIGN_ASSET(2) char ganontika_room_14DL_000918[] = dganontika_room_14DL_000918;
+#define dganontika_room_14Tex_004FB8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14Tex_004FB8"
+static const ALIGN_ASSET(2) char ganontika_room_14Tex_004FB8[] = dganontika_room_14Tex_004FB8;
+
+#define dganontika_room_14Tex_0057B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14Tex_0057B8"
+static const ALIGN_ASSET(2) char ganontika_room_14Tex_0057B8[] = dganontika_room_14Tex_0057B8;
+
+#define dganontika_room_14Tex_005FB8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14Tex_005FB8"
+static const ALIGN_ASSET(2) char ganontika_room_14Tex_005FB8[] = dganontika_room_14Tex_005FB8;
+
+#define dganontika_room_14Tex_0067B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14Tex_0067B8"
+static const ALIGN_ASSET(2) char ganontika_room_14Tex_0067B8[] = dganontika_room_14Tex_0067B8;
 
 #define dganontika_room_14Tex_0077B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14Tex_0077B8"
 static const ALIGN_ASSET(2) char ganontika_room_14Tex_0077B8[] = dganontika_room_14Tex_0077B8;
@@ -12,8 +21,17 @@ static const ALIGN_ASSET(2) char ganontika_room_14Tex_0077B8[] = dganontika_room
 #define dganontika_room_14Tex_007BB8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14Tex_007BB8"
 static const ALIGN_ASSET(2) char ganontika_room_14Tex_007BB8[] = dganontika_room_14Tex_007BB8;
 
-#define dganontika_room_14Tex_0057B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14Tex_0057B8"
-static const ALIGN_ASSET(2) char ganontika_room_14Tex_0057B8[] = dganontika_room_14Tex_0057B8;
+#define dganontika_room_14Tex_0089C8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14Tex_0089C8"
+static const ALIGN_ASSET(2) char ganontika_room_14Tex_0089C8[] = dganontika_room_14Tex_0089C8;
+
+#define dganontika_room_14Tex_0099C8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14Tex_0099C8"
+static const ALIGN_ASSET(2) char ganontika_room_14Tex_0099C8[] = dganontika_room_14Tex_0099C8;
+
+#define dganontika_room_14TLUT_004F98 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14TLUT_004F98"
+static const ALIGN_ASSET(2) char ganontika_room_14TLUT_004F98[] = dganontika_room_14TLUT_004F98;
+
+#define dganontika_room_14DL_000918 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14DL_000918"
+static const ALIGN_ASSET(2) char ganontika_room_14DL_000918[] = dganontika_room_14DL_000918;
 
 #define dganontika_room_14DL_001110 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14DL_001110"
 static const ALIGN_ASSET(2) char ganontika_room_14DL_001110[] = dganontika_room_14DL_001110;
@@ -33,38 +51,20 @@ static const ALIGN_ASSET(2) char ganontika_room_14DL_0036E8[] = dganontika_room_
 #define dganontika_room_14DL_004920 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14DL_004920"
 static const ALIGN_ASSET(2) char ganontika_room_14DL_004920[] = dganontika_room_14DL_004920;
 
-#define dganontika_room_14Tex_0067B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14Tex_0067B8"
-static const ALIGN_ASSET(2) char ganontika_room_14Tex_0067B8[] = dganontika_room_14Tex_0067B8;
-
 #define dganontika_room_14DL_004BF8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14DL_004BF8"
 static const ALIGN_ASSET(2) char ganontika_room_14DL_004BF8[] = dganontika_room_14DL_004BF8;
 
-#define dganontika_room_14Tex_005FB8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14Tex_005FB8"
-static const ALIGN_ASSET(2) char ganontika_room_14Tex_005FB8[] = dganontika_room_14Tex_005FB8;
-
-#define dganontika_room_14TLUT_004F98 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14TLUT_004F98"
-static const ALIGN_ASSET(2) char ganontika_room_14TLUT_004F98[] = dganontika_room_14TLUT_004F98;
-
 #define dganontika_room_14DL_0085F0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14DL_0085F0"
 static const ALIGN_ASSET(2) char ganontika_room_14DL_0085F0[] = dganontika_room_14DL_0085F0;
 
-#define dganontika_room_14Tex_0089C8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14Tex_0089C8"
-static const ALIGN_ASSET(2) char ganontika_room_14Tex_0089C8[] = dganontika_room_14Tex_0089C8;
-
 #define dganontika_room_14DL_0003D0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14DL_0003D0"
 static const ALIGN_ASSET(2) char ganontika_room_14DL_0003D0[] = dganontika_room_14DL_0003D0;
 
 #define dganontika_room_14DL_004E38 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14DL_004E38"
 static const ALIGN_ASSET(2) char ganontika_room_14DL_004E38[] = dganontika_room_14DL_004E38;
 
-#define dganontika_room_14Tex_004FB8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14Tex_004FB8"
-static const ALIGN_ASSET(2) char ganontika_room_14Tex_004FB8[] = dganontika_room_14Tex_004FB8;
-
 #define dganontika_room_14DL_008888 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14DL_008888"
 static const ALIGN_ASSET(2) char ganontika_room_14DL_008888[] = dganontika_room_14DL_008888;
 
-#define dganontika_room_14Tex_0099C8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_14Tex_0099C8"
-static const ALIGN_ASSET(2) char ganontika_room_14Tex_0099C8[] = dganontika_room_14Tex_0099C8;
-
 
 #endif // DUNGEONS_GANONTIKA_ROOM_14_H
diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_15.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_15.h
index 60c463138..7bb282617 100644
--- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_15.h
+++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_15.h
@@ -3,8 +3,20 @@
 
 #include "align_asset_macro.h"
 
-#define dganontika_room_15DL_001260 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_15DL_001260"
-static const ALIGN_ASSET(2) char ganontika_room_15DL_001260[] = dganontika_room_15DL_001260;
+#define dganontika_room_15Tex_004340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_15Tex_004340"
+static const ALIGN_ASSET(2) char ganontika_room_15Tex_004340[] = dganontika_room_15Tex_004340;
+
+#define dganontika_room_15Tex_004B40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_15Tex_004B40"
+static const ALIGN_ASSET(2) char ganontika_room_15Tex_004B40[] = dganontika_room_15Tex_004B40;
+
+#define dganontika_room_15Tex_005340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_15Tex_005340"
+static const ALIGN_ASSET(2) char ganontika_room_15Tex_005340[] = dganontika_room_15Tex_005340;
+
+#define dganontika_room_15Tex_005B40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_15Tex_005B40"
+static const ALIGN_ASSET(2) char ganontika_room_15Tex_005B40[] = dganontika_room_15Tex_005B40;
+
+#define dganontika_room_15Tex_006340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_15Tex_006340"
+static const ALIGN_ASSET(2) char ganontika_room_15Tex_006340[] = dganontika_room_15Tex_006340;
 
 #define dganontika_room_15Tex_006B40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_15Tex_006B40"
 static const ALIGN_ASSET(2) char ganontika_room_15Tex_006B40[] = dganontika_room_15Tex_006B40;
@@ -12,24 +24,12 @@ static const ALIGN_ASSET(2) char ganontika_room_15Tex_006B40[] = dganontika_room
 #define dganontika_room_15Tex_006D40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_15Tex_006D40"
 static const ALIGN_ASSET(2) char ganontika_room_15Tex_006D40[] = dganontika_room_15Tex_006D40;
 
-#define dganontika_room_15Tex_006340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_15Tex_006340"
-static const ALIGN_ASSET(2) char ganontika_room_15Tex_006340[] = dganontika_room_15Tex_006340;
-
-#define dganontika_room_15Tex_004B40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_15Tex_004B40"
-static const ALIGN_ASSET(2) char ganontika_room_15Tex_004B40[] = dganontika_room_15Tex_004B40;
-
-#define dganontika_room_15Tex_005B40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_15Tex_005B40"
-static const ALIGN_ASSET(2) char ganontika_room_15Tex_005B40[] = dganontika_room_15Tex_005B40;
-
-#define dganontika_room_15Tex_004340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_15Tex_004340"
-static const ALIGN_ASSET(2) char ganontika_room_15Tex_004340[] = dganontika_room_15Tex_004340;
+#define dganontika_room_15DL_001260 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_15DL_001260"
+static const ALIGN_ASSET(2) char ganontika_room_15DL_001260[] = dganontika_room_15DL_001260;
 
 #define dganontika_room_15DL_0024F8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_15DL_0024F8"
 static const ALIGN_ASSET(2) char ganontika_room_15DL_0024F8[] = dganontika_room_15DL_0024F8;
 
-#define dganontika_room_15Tex_005340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_15Tex_005340"
-static const ALIGN_ASSET(2) char ganontika_room_15Tex_005340[] = dganontika_room_15Tex_005340;
-
 #define dganontika_room_15DL_002CF0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_15DL_002CF0"
 static const ALIGN_ASSET(2) char ganontika_room_15DL_002CF0[] = dganontika_room_15DL_002CF0;
 
diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_16.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_16.h
index 7b0b5e713..84950473a 100644
--- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_16.h
+++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_16.h
@@ -3,20 +3,20 @@
 
 #include "align_asset_macro.h"
 
-#define dganontika_room_16DL_0006F0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_16DL_0006F0"
-static const ALIGN_ASSET(2) char ganontika_room_16DL_0006F0[] = dganontika_room_16DL_0006F0;
-
 #define dganontika_room_16Tex_001630 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_16Tex_001630"
 static const ALIGN_ASSET(2) char ganontika_room_16Tex_001630[] = dganontika_room_16Tex_001630;
 
+#define dganontika_room_16Tex_002630 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_16Tex_002630"
+static const ALIGN_ASSET(2) char ganontika_room_16Tex_002630[] = dganontika_room_16Tex_002630;
+
+#define dganontika_room_16DL_0006F0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_16DL_0006F0"
+static const ALIGN_ASSET(2) char ganontika_room_16DL_0006F0[] = dganontika_room_16DL_0006F0;
+
 #define dganontika_room_16DL_000E80 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_16DL_000E80"
 static const ALIGN_ASSET(2) char ganontika_room_16DL_000E80[] = dganontika_room_16DL_000E80;
 
 #define dganontika_room_16DL_001288 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_16DL_001288"
 static const ALIGN_ASSET(2) char ganontika_room_16DL_001288[] = dganontika_room_16DL_001288;
 
-#define dganontika_room_16Tex_002630 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_16Tex_002630"
-static const ALIGN_ASSET(2) char ganontika_room_16Tex_002630[] = dganontika_room_16Tex_002630;
-
 
 #endif // DUNGEONS_GANONTIKA_ROOM_16_H
diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_17.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_17.h
index 81a2bef39..83da2d0a8 100644
--- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_17.h
+++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_17.h
@@ -3,36 +3,39 @@
 
 #include "align_asset_macro.h"
 
-#define dganontika_room_17DL_000B30 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17DL_000B30"
-static const ALIGN_ASSET(2) char ganontika_room_17DL_000B30[] = dganontika_room_17DL_000B30;
-
-#define dganontika_room_17Tex_005618 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17Tex_005618"
-static const ALIGN_ASSET(2) char ganontika_room_17Tex_005618[] = dganontika_room_17Tex_005618;
-
-#define dganontika_room_17Tex_007618 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17Tex_007618"
-static const ALIGN_ASSET(2) char ganontika_room_17Tex_007618[] = dganontika_room_17Tex_007618;
-
 #define dganontika_room_17Tex_002A18 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17Tex_002A18"
 static const ALIGN_ASSET(2) char ganontika_room_17Tex_002A18[] = dganontika_room_17Tex_002A18;
 
-#define dganontika_room_17DL_0023B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17DL_0023B8"
-static const ALIGN_ASSET(2) char ganontika_room_17DL_0023B8[] = dganontika_room_17DL_0023B8;
-
-#define dganontika_room_17Tex_004E18 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17Tex_004E18"
-static const ALIGN_ASSET(2) char ganontika_room_17Tex_004E18[] = dganontika_room_17Tex_004E18;
-
-#define dganontika_room_17Tex_003E18 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17Tex_003E18"
-static const ALIGN_ASSET(2) char ganontika_room_17Tex_003E18[] = dganontika_room_17Tex_003E18;
-
 #define dganontika_room_17Tex_002E18 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17Tex_002E18"
 static const ALIGN_ASSET(2) char ganontika_room_17Tex_002E18[] = dganontika_room_17Tex_002E18;
 
-#define dganontika_room_17DL_001448 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17DL_001448"
-static const ALIGN_ASSET(2) char ganontika_room_17DL_001448[] = dganontika_room_17DL_001448;
+#define dganontika_room_17Tex_003E18 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17Tex_003E18"
+static const ALIGN_ASSET(2) char ganontika_room_17Tex_003E18[] = dganontika_room_17Tex_003E18;
+
+#define dganontika_room_17Tex_004E18 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17Tex_004E18"
+static const ALIGN_ASSET(2) char ganontika_room_17Tex_004E18[] = dganontika_room_17Tex_004E18;
+
+#define dganontika_room_17Tex_005618 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17Tex_005618"
+static const ALIGN_ASSET(2) char ganontika_room_17Tex_005618[] = dganontika_room_17Tex_005618;
+
+#define dganontika_room_17Tex_006618 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17Tex_006618"
+static const ALIGN_ASSET(2) char ganontika_room_17Tex_006618[] = dganontika_room_17Tex_006618;
 
 #define dganontika_room_17Tex_006E18 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17Tex_006E18"
 static const ALIGN_ASSET(2) char ganontika_room_17Tex_006E18[] = dganontika_room_17Tex_006E18;
 
+#define dganontika_room_17Tex_007618 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17Tex_007618"
+static const ALIGN_ASSET(2) char ganontika_room_17Tex_007618[] = dganontika_room_17Tex_007618;
+
+#define dganontika_room_17DL_000B30 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17DL_000B30"
+static const ALIGN_ASSET(2) char ganontika_room_17DL_000B30[] = dganontika_room_17DL_000B30;
+
+#define dganontika_room_17DL_0023B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17DL_0023B8"
+static const ALIGN_ASSET(2) char ganontika_room_17DL_0023B8[] = dganontika_room_17DL_0023B8;
+
+#define dganontika_room_17DL_001448 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17DL_001448"
+static const ALIGN_ASSET(2) char ganontika_room_17DL_001448[] = dganontika_room_17DL_001448;
+
 #define dganontika_room_17DL_001720 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17DL_001720"
 static const ALIGN_ASSET(2) char ganontika_room_17DL_001720[] = dganontika_room_17DL_001720;
 
@@ -45,8 +48,5 @@ static const ALIGN_ASSET(2) char ganontika_room_17DL_001DE0[] = dganontika_room_
 #define dganontika_room_17DL_002908 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17DL_002908"
 static const ALIGN_ASSET(2) char ganontika_room_17DL_002908[] = dganontika_room_17DL_002908;
 
-#define dganontika_room_17Tex_006618 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_17Tex_006618"
-static const ALIGN_ASSET(2) char ganontika_room_17Tex_006618[] = dganontika_room_17Tex_006618;
-
 
 #endif // DUNGEONS_GANONTIKA_ROOM_17_H
diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_18.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_18.h
index b124eeff2..ef497a9b5 100644
--- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_18.h
+++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_18.h
@@ -3,59 +3,11 @@
 
 #include "align_asset_macro.h"
 
-#define dganontika_room_18DL_002E80 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_002E80"
-static const ALIGN_ASSET(2) char ganontika_room_18DL_002E80[] = dganontika_room_18DL_002E80;
-
 #define dganontika_room_18Tex_004380 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_004380"
 static const ALIGN_ASSET(2) char ganontika_room_18Tex_004380[] = dganontika_room_18Tex_004380;
 
-#define dganontika_room_18DL_0028E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_0028E0"
-static const ALIGN_ASSET(2) char ganontika_room_18DL_0028E0[] = dganontika_room_18DL_0028E0;
-
-#define dganontika_room_18Tex_007F80 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_007F80"
-static const ALIGN_ASSET(2) char ganontika_room_18Tex_007F80[] = dganontika_room_18Tex_007F80;
-
-#define dganontika_room_18DL_001720 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_001720"
-static const ALIGN_ASSET(2) char ganontika_room_18DL_001720[] = dganontika_room_18DL_001720;
-
-#define dganontika_room_18Tex_009980 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_009980"
-static const ALIGN_ASSET(2) char ganontika_room_18Tex_009980[] = dganontika_room_18Tex_009980;
-
-#define dganontika_room_18TLUT_004360 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18TLUT_004360"
-static const ALIGN_ASSET(2) char ganontika_room_18TLUT_004360[] = dganontika_room_18TLUT_004360;
-
-#define dganontika_room_18DL_00B5B0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_00B5B0"
-static const ALIGN_ASSET(2) char ganontika_room_18DL_00B5B0[] = dganontika_room_18DL_00B5B0;
-
-#define dganontika_room_18Tex_00B6E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_00B6E0"
-static const ALIGN_ASSET(2) char ganontika_room_18Tex_00B6E0[] = dganontika_room_18Tex_00B6E0;
-
-#define dganontika_room_18DL_001FC8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_001FC8"
-static const ALIGN_ASSET(2) char ganontika_room_18DL_001FC8[] = dganontika_room_18DL_001FC8;
-
-#define dganontika_room_18DL_003108 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_003108"
-static const ALIGN_ASSET(2) char ganontika_room_18DL_003108[] = dganontika_room_18DL_003108;
-
-#define dganontika_room_18Tex_00A380 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_00A380"
-static const ALIGN_ASSET(2) char ganontika_room_18Tex_00A380[] = dganontika_room_18Tex_00A380;
-
-#define dganontika_room_18DL_003530 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_003530"
-static const ALIGN_ASSET(2) char ganontika_room_18DL_003530[] = dganontika_room_18DL_003530;
-
-#define dganontika_room_18Tex_009180 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_009180"
-static const ALIGN_ASSET(2) char ganontika_room_18Tex_009180[] = dganontika_room_18Tex_009180;
-
-#define dganontika_room_18Tex_008F80 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_008F80"
-static const ALIGN_ASSET(2) char ganontika_room_18Tex_008F80[] = dganontika_room_18Tex_008F80;
-
-#define dganontika_room_18DL_003B70 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_003B70"
-static const ALIGN_ASSET(2) char ganontika_room_18DL_003B70[] = dganontika_room_18DL_003B70;
-
-#define dganontika_room_18Tex_00A180 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_00A180"
-static const ALIGN_ASSET(2) char ganontika_room_18Tex_00A180[] = dganontika_room_18Tex_00A180;
-
-#define dganontika_room_18DL_003E48 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_003E48"
-static const ALIGN_ASSET(2) char ganontika_room_18DL_003E48[] = dganontika_room_18DL_003E48;
+#define dganontika_room_18Tex_005380 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_005380"
+static const ALIGN_ASSET(2) char ganontika_room_18Tex_005380[] = dganontika_room_18Tex_005380;
 
 #define dganontika_room_18Tex_005780 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_005780"
 static const ALIGN_ASSET(2) char ganontika_room_18Tex_005780[] = dganontika_room_18Tex_005780;
@@ -66,14 +18,62 @@ static const ALIGN_ASSET(2) char ganontika_room_18Tex_006780[] = dganontika_room
 #define dganontika_room_18Tex_007780 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_007780"
 static const ALIGN_ASSET(2) char ganontika_room_18Tex_007780[] = dganontika_room_18Tex_007780;
 
+#define dganontika_room_18Tex_007F80 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_007F80"
+static const ALIGN_ASSET(2) char ganontika_room_18Tex_007F80[] = dganontika_room_18Tex_007F80;
+
+#define dganontika_room_18Tex_008F80 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_008F80"
+static const ALIGN_ASSET(2) char ganontika_room_18Tex_008F80[] = dganontika_room_18Tex_008F80;
+
+#define dganontika_room_18Tex_009180 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_009180"
+static const ALIGN_ASSET(2) char ganontika_room_18Tex_009180[] = dganontika_room_18Tex_009180;
+
+#define dganontika_room_18Tex_009980 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_009980"
+static const ALIGN_ASSET(2) char ganontika_room_18Tex_009980[] = dganontika_room_18Tex_009980;
+
+#define dganontika_room_18Tex_00A180 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_00A180"
+static const ALIGN_ASSET(2) char ganontika_room_18Tex_00A180[] = dganontika_room_18Tex_00A180;
+
+#define dganontika_room_18Tex_00A380 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_00A380"
+static const ALIGN_ASSET(2) char ganontika_room_18Tex_00A380[] = dganontika_room_18Tex_00A380;
+
+#define dganontika_room_18Tex_00B6E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_00B6E0"
+static const ALIGN_ASSET(2) char ganontika_room_18Tex_00B6E0[] = dganontika_room_18Tex_00B6E0;
+
+#define dganontika_room_18TLUT_004360 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18TLUT_004360"
+static const ALIGN_ASSET(2) char ganontika_room_18TLUT_004360[] = dganontika_room_18TLUT_004360;
+
+#define dganontika_room_18DL_002E80 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_002E80"
+static const ALIGN_ASSET(2) char ganontika_room_18DL_002E80[] = dganontika_room_18DL_002E80;
+
+#define dganontika_room_18DL_0028E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_0028E0"
+static const ALIGN_ASSET(2) char ganontika_room_18DL_0028E0[] = dganontika_room_18DL_0028E0;
+
+#define dganontika_room_18DL_001720 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_001720"
+static const ALIGN_ASSET(2) char ganontika_room_18DL_001720[] = dganontika_room_18DL_001720;
+
+#define dganontika_room_18DL_00B5B0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_00B5B0"
+static const ALIGN_ASSET(2) char ganontika_room_18DL_00B5B0[] = dganontika_room_18DL_00B5B0;
+
+#define dganontika_room_18DL_001FC8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_001FC8"
+static const ALIGN_ASSET(2) char ganontika_room_18DL_001FC8[] = dganontika_room_18DL_001FC8;
+
+#define dganontika_room_18DL_003108 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_003108"
+static const ALIGN_ASSET(2) char ganontika_room_18DL_003108[] = dganontika_room_18DL_003108;
+
+#define dganontika_room_18DL_003530 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_003530"
+static const ALIGN_ASSET(2) char ganontika_room_18DL_003530[] = dganontika_room_18DL_003530;
+
+#define dganontika_room_18DL_003B70 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_003B70"
+static const ALIGN_ASSET(2) char ganontika_room_18DL_003B70[] = dganontika_room_18DL_003B70;
+
+#define dganontika_room_18DL_003E48 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_003E48"
+static const ALIGN_ASSET(2) char ganontika_room_18DL_003E48[] = dganontika_room_18DL_003E48;
+
 #define dganontika_room_18DL_004188 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_004188"
 static const ALIGN_ASSET(2) char ganontika_room_18DL_004188[] = dganontika_room_18DL_004188;
 
 #define dganontika_room_18DL_000D70 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18DL_000D70"
 static const ALIGN_ASSET(2) char ganontika_room_18DL_000D70[] = dganontika_room_18DL_000D70;
 
-#define dganontika_room_18Tex_005380 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_18Tex_005380"
-static const ALIGN_ASSET(2) char ganontika_room_18Tex_005380[] = dganontika_room_18Tex_005380;
-
 
 #endif // DUNGEONS_GANONTIKA_ROOM_18_H
diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_19.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_19.h
index 44c804312..f1ba3ed21 100644
--- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_19.h
+++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_19.h
@@ -3,8 +3,20 @@
 
 #include "align_asset_macro.h"
 
-#define dganontika_room_19DL_001260 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_19DL_001260"
-static const ALIGN_ASSET(2) char ganontika_room_19DL_001260[] = dganontika_room_19DL_001260;
+#define dganontika_room_19Tex_004340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_19Tex_004340"
+static const ALIGN_ASSET(2) char ganontika_room_19Tex_004340[] = dganontika_room_19Tex_004340;
+
+#define dganontika_room_19Tex_004B40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_19Tex_004B40"
+static const ALIGN_ASSET(2) char ganontika_room_19Tex_004B40[] = dganontika_room_19Tex_004B40;
+
+#define dganontika_room_19Tex_005340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_19Tex_005340"
+static const ALIGN_ASSET(2) char ganontika_room_19Tex_005340[] = dganontika_room_19Tex_005340;
+
+#define dganontika_room_19Tex_005B40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_19Tex_005B40"
+static const ALIGN_ASSET(2) char ganontika_room_19Tex_005B40[] = dganontika_room_19Tex_005B40;
+
+#define dganontika_room_19Tex_006340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_19Tex_006340"
+static const ALIGN_ASSET(2) char ganontika_room_19Tex_006340[] = dganontika_room_19Tex_006340;
 
 #define dganontika_room_19Tex_006B40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_19Tex_006B40"
 static const ALIGN_ASSET(2) char ganontika_room_19Tex_006B40[] = dganontika_room_19Tex_006B40;
@@ -12,24 +24,12 @@ static const ALIGN_ASSET(2) char ganontika_room_19Tex_006B40[] = dganontika_room
 #define dganontika_room_19Tex_006D40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_19Tex_006D40"
 static const ALIGN_ASSET(2) char ganontika_room_19Tex_006D40[] = dganontika_room_19Tex_006D40;
 
-#define dganontika_room_19Tex_006340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_19Tex_006340"
-static const ALIGN_ASSET(2) char ganontika_room_19Tex_006340[] = dganontika_room_19Tex_006340;
-
-#define dganontika_room_19Tex_004B40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_19Tex_004B40"
-static const ALIGN_ASSET(2) char ganontika_room_19Tex_004B40[] = dganontika_room_19Tex_004B40;
-
-#define dganontika_room_19Tex_005B40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_19Tex_005B40"
-static const ALIGN_ASSET(2) char ganontika_room_19Tex_005B40[] = dganontika_room_19Tex_005B40;
-
-#define dganontika_room_19Tex_004340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_19Tex_004340"
-static const ALIGN_ASSET(2) char ganontika_room_19Tex_004340[] = dganontika_room_19Tex_004340;
+#define dganontika_room_19DL_001260 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_19DL_001260"
+static const ALIGN_ASSET(2) char ganontika_room_19DL_001260[] = dganontika_room_19DL_001260;
 
 #define dganontika_room_19DL_0024F8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_19DL_0024F8"
 static const ALIGN_ASSET(2) char ganontika_room_19DL_0024F8[] = dganontika_room_19DL_0024F8;
 
-#define dganontika_room_19Tex_005340 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_19Tex_005340"
-static const ALIGN_ASSET(2) char ganontika_room_19Tex_005340[] = dganontika_room_19Tex_005340;
-
 #define dganontika_room_19DL_002CF0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_19DL_002CF0"
 static const ALIGN_ASSET(2) char ganontika_room_19DL_002CF0[] = dganontika_room_19DL_002CF0;
 
diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_2.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_2.h
index 5e133520a..e7f1682f6 100644
--- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_2.h
+++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_2.h
@@ -3,14 +3,32 @@
 
 #include "align_asset_macro.h"
 
-#define dganontika_room_2DL_0006D0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2DL_0006D0"
-static const ALIGN_ASSET(2) char ganontika_room_2DL_0006D0[] = dganontika_room_2DL_0006D0;
+#define dganontika_room_2Tex_002FD8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2Tex_002FD8"
+static const ALIGN_ASSET(2) char ganontika_room_2Tex_002FD8[] = dganontika_room_2Tex_002FD8;
+
+#define dganontika_room_2Tex_0037D8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2Tex_0037D8"
+static const ALIGN_ASSET(2) char ganontika_room_2Tex_0037D8[] = dganontika_room_2Tex_0037D8;
+
+#define dganontika_room_2Tex_003FD8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2Tex_003FD8"
+static const ALIGN_ASSET(2) char ganontika_room_2Tex_003FD8[] = dganontika_room_2Tex_003FD8;
+
+#define dganontika_room_2Tex_0047D8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2Tex_0047D8"
+static const ALIGN_ASSET(2) char ganontika_room_2Tex_0047D8[] = dganontika_room_2Tex_0047D8;
 
 #define dganontika_room_2Tex_004FD8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2Tex_004FD8"
 static const ALIGN_ASSET(2) char ganontika_room_2Tex_004FD8[] = dganontika_room_2Tex_004FD8;
 
-#define dganontika_room_2Tex_0047D8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2Tex_0047D8"
-static const ALIGN_ASSET(2) char ganontika_room_2Tex_0047D8[] = dganontika_room_2Tex_0047D8;
+#define dganontika_room_2Tex_0057D8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2Tex_0057D8"
+static const ALIGN_ASSET(2) char ganontika_room_2Tex_0057D8[] = dganontika_room_2Tex_0057D8;
+
+#define dganontika_room_2Tex_005FD8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2Tex_005FD8"
+static const ALIGN_ASSET(2) char ganontika_room_2Tex_005FD8[] = dganontika_room_2Tex_005FD8;
+
+#define dganontika_room_2Tex_0067D8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2Tex_0067D8"
+static const ALIGN_ASSET(2) char ganontika_room_2Tex_0067D8[] = dganontika_room_2Tex_0067D8;
+
+#define dganontika_room_2DL_0006D0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2DL_0006D0"
+static const ALIGN_ASSET(2) char ganontika_room_2DL_0006D0[] = dganontika_room_2DL_0006D0;
 
 #define dganontika_room_2DL_000D10 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2DL_000D10"
 static const ALIGN_ASSET(2) char ganontika_room_2DL_000D10[] = dganontika_room_2DL_000D10;
@@ -21,36 +39,18 @@ static const ALIGN_ASSET(2) char ganontika_room_2DL_002E70[] = dganontika_room_2
 #define dganontika_room_2DL_0014A8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2DL_0014A8"
 static const ALIGN_ASSET(2) char ganontika_room_2DL_0014A8[] = dganontika_room_2DL_0014A8;
 
-#define dganontika_room_2Tex_0057D8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2Tex_0057D8"
-static const ALIGN_ASSET(2) char ganontika_room_2Tex_0057D8[] = dganontika_room_2Tex_0057D8;
-
 #define dganontika_room_2DL_001B68 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2DL_001B68"
 static const ALIGN_ASSET(2) char ganontika_room_2DL_001B68[] = dganontika_room_2DL_001B68;
 
-#define dganontika_room_2Tex_002FD8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2Tex_002FD8"
-static const ALIGN_ASSET(2) char ganontika_room_2Tex_002FD8[] = dganontika_room_2Tex_002FD8;
-
 #define dganontika_room_2DL_001F20 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2DL_001F20"
 static const ALIGN_ASSET(2) char ganontika_room_2DL_001F20[] = dganontika_room_2DL_001F20;
 
-#define dganontika_room_2Tex_003FD8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2Tex_003FD8"
-static const ALIGN_ASSET(2) char ganontika_room_2Tex_003FD8[] = dganontika_room_2Tex_003FD8;
-
 #define dganontika_room_2DL_002498 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2DL_002498"
 static const ALIGN_ASSET(2) char ganontika_room_2DL_002498[] = dganontika_room_2DL_002498;
 
-#define dganontika_room_2Tex_0067D8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2Tex_0067D8"
-static const ALIGN_ASSET(2) char ganontika_room_2Tex_0067D8[] = dganontika_room_2Tex_0067D8;
-
-#define dganontika_room_2Tex_005FD8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2Tex_005FD8"
-static const ALIGN_ASSET(2) char ganontika_room_2Tex_005FD8[] = dganontika_room_2Tex_005FD8;
-
 #define dganontika_room_2DL_002AE0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2DL_002AE0"
 static const ALIGN_ASSET(2) char ganontika_room_2DL_002AE0[] = dganontika_room_2DL_002AE0;
 
-#define dganontika_room_2Tex_0037D8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2Tex_0037D8"
-static const ALIGN_ASSET(2) char ganontika_room_2Tex_0037D8[] = dganontika_room_2Tex_0037D8;
-
 #define dganontika_room_2DL_000F00 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_2DL_000F00"
 static const ALIGN_ASSET(2) char ganontika_room_2DL_000F00[] = dganontika_room_2DL_000F00;
 
diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_3.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_3.h
index ca4315f72..e07d368ae 100644
--- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_3.h
+++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_3.h
@@ -3,68 +3,68 @@
 
 #include "align_asset_macro.h"
 
-#define dganontika_room_3DL_003410 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3DL_003410"
-static const ALIGN_ASSET(2) char ganontika_room_3DL_003410[] = dganontika_room_3DL_003410;
+#define dganontika_room_3Tex_003ED8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_003ED8"
+static const ALIGN_ASSET(2) char ganontika_room_3Tex_003ED8[] = dganontika_room_3Tex_003ED8;
+
+#define dganontika_room_3Tex_0046D8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_0046D8"
+static const ALIGN_ASSET(2) char ganontika_room_3Tex_0046D8[] = dganontika_room_3Tex_0046D8;
+
+#define dganontika_room_3Tex_004ED8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_004ED8"
+static const ALIGN_ASSET(2) char ganontika_room_3Tex_004ED8[] = dganontika_room_3Tex_004ED8;
+
+#define dganontika_room_3Tex_0056D8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_0056D8"
+static const ALIGN_ASSET(2) char ganontika_room_3Tex_0056D8[] = dganontika_room_3Tex_0056D8;
+
+#define dganontika_room_3Tex_005ED8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_005ED8"
+static const ALIGN_ASSET(2) char ganontika_room_3Tex_005ED8[] = dganontika_room_3Tex_005ED8;
 
 #define dganontika_room_3Tex_0066D8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_0066D8"
 static const ALIGN_ASSET(2) char ganontika_room_3Tex_0066D8[] = dganontika_room_3Tex_0066D8;
 
+#define dganontika_room_3Tex_006ED8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_006ED8"
+static const ALIGN_ASSET(2) char ganontika_room_3Tex_006ED8[] = dganontika_room_3Tex_006ED8;
+
+#define dganontika_room_3Tex_0076D8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_0076D8"
+static const ALIGN_ASSET(2) char ganontika_room_3Tex_0076D8[] = dganontika_room_3Tex_0076D8;
+
+#define dganontika_room_3Tex_008A38 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_008A38"
+static const ALIGN_ASSET(2) char ganontika_room_3Tex_008A38[] = dganontika_room_3Tex_008A38;
+
+#define dganontika_room_3TLUT_003EB8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3TLUT_003EB8"
+static const ALIGN_ASSET(2) char ganontika_room_3TLUT_003EB8[] = dganontika_room_3TLUT_003EB8;
+
+#define dganontika_room_3DL_003410 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3DL_003410"
+static const ALIGN_ASSET(2) char ganontika_room_3DL_003410[] = dganontika_room_3DL_003410;
+
 #define dganontika_room_3DL_003838 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3DL_003838"
 static const ALIGN_ASSET(2) char ganontika_room_3DL_003838[] = dganontika_room_3DL_003838;
 
 #define dganontika_room_3DL_003A60 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3DL_003A60"
 static const ALIGN_ASSET(2) char ganontika_room_3DL_003A60[] = dganontika_room_3DL_003A60;
 
-#define dganontika_room_3Tex_006ED8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_006ED8"
-static const ALIGN_ASSET(2) char ganontika_room_3Tex_006ED8[] = dganontika_room_3Tex_006ED8;
-
-#define dganontika_room_3TLUT_003EB8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3TLUT_003EB8"
-static const ALIGN_ASSET(2) char ganontika_room_3TLUT_003EB8[] = dganontika_room_3TLUT_003EB8;
-
 #define dganontika_room_3DL_008910 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3DL_008910"
 static const ALIGN_ASSET(2) char ganontika_room_3DL_008910[] = dganontika_room_3DL_008910;
 
-#define dganontika_room_3Tex_008A38 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_008A38"
-static const ALIGN_ASSET(2) char ganontika_room_3Tex_008A38[] = dganontika_room_3Tex_008A38;
-
 #define dganontika_room_3DL_003D40 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3DL_003D40"
 static const ALIGN_ASSET(2) char ganontika_room_3DL_003D40[] = dganontika_room_3DL_003D40;
 
 #define dganontika_room_3DL_000FF0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3DL_000FF0"
 static const ALIGN_ASSET(2) char ganontika_room_3DL_000FF0[] = dganontika_room_3DL_000FF0;
 
-#define dganontika_room_3Tex_004ED8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_004ED8"
-static const ALIGN_ASSET(2) char ganontika_room_3Tex_004ED8[] = dganontika_room_3Tex_004ED8;
-
 #define dganontika_room_3DL_001550 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3DL_001550"
 static const ALIGN_ASSET(2) char ganontika_room_3DL_001550[] = dganontika_room_3DL_001550;
 
-#define dganontika_room_3Tex_005ED8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_005ED8"
-static const ALIGN_ASSET(2) char ganontika_room_3Tex_005ED8[] = dganontika_room_3Tex_005ED8;
-
-#define dganontika_room_3Tex_0056D8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_0056D8"
-static const ALIGN_ASSET(2) char ganontika_room_3Tex_0056D8[] = dganontika_room_3Tex_0056D8;
-
 #define dganontika_room_3DL_001990 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3DL_001990"
 static const ALIGN_ASSET(2) char ganontika_room_3DL_001990[] = dganontika_room_3DL_001990;
 
-#define dganontika_room_3Tex_003ED8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_003ED8"
-static const ALIGN_ASSET(2) char ganontika_room_3Tex_003ED8[] = dganontika_room_3Tex_003ED8;
-
 #define dganontika_room_3DL_001C70 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3DL_001C70"
 static const ALIGN_ASSET(2) char ganontika_room_3DL_001C70[] = dganontika_room_3DL_001C70;
 
-#define dganontika_room_3Tex_0046D8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_0046D8"
-static const ALIGN_ASSET(2) char ganontika_room_3Tex_0046D8[] = dganontika_room_3Tex_0046D8;
-
 #define dganontika_room_3DL_0028E8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3DL_0028E8"
 static const ALIGN_ASSET(2) char ganontika_room_3DL_0028E8[] = dganontika_room_3DL_0028E8;
 
 #define dganontika_room_3DL_002F48 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3DL_002F48"
 static const ALIGN_ASSET(2) char ganontika_room_3DL_002F48[] = dganontika_room_3DL_002F48;
 
-#define dganontika_room_3Tex_0076D8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_3Tex_0076D8"
-static const ALIGN_ASSET(2) char ganontika_room_3Tex_0076D8[] = dganontika_room_3Tex_0076D8;
-
 
 #endif // DUNGEONS_GANONTIKA_ROOM_3_H
diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_4.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_4.h
index 483128ea0..28162722c 100644
--- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_4.h
+++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_4.h
@@ -3,8 +3,20 @@
 
 #include "align_asset_macro.h"
 
-#define dganontika_room_4DL_001440 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_4DL_001440"
-static const ALIGN_ASSET(2) char ganontika_room_4DL_001440[] = dganontika_room_4DL_001440;
+#define dganontika_room_4Tex_004288 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_4Tex_004288"
+static const ALIGN_ASSET(2) char ganontika_room_4Tex_004288[] = dganontika_room_4Tex_004288;
+
+#define dganontika_room_4Tex_004A88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_4Tex_004A88"
+static const ALIGN_ASSET(2) char ganontika_room_4Tex_004A88[] = dganontika_room_4Tex_004A88;
+
+#define dganontika_room_4Tex_005288 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_4Tex_005288"
+static const ALIGN_ASSET(2) char ganontika_room_4Tex_005288[] = dganontika_room_4Tex_005288;
+
+#define dganontika_room_4Tex_005A88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_4Tex_005A88"
+static const ALIGN_ASSET(2) char ganontika_room_4Tex_005A88[] = dganontika_room_4Tex_005A88;
+
+#define dganontika_room_4Tex_006288 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_4Tex_006288"
+static const ALIGN_ASSET(2) char ganontika_room_4Tex_006288[] = dganontika_room_4Tex_006288;
 
 #define dganontika_room_4Tex_006A88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_4Tex_006A88"
 static const ALIGN_ASSET(2) char ganontika_room_4Tex_006A88[] = dganontika_room_4Tex_006A88;
@@ -12,24 +24,12 @@ static const ALIGN_ASSET(2) char ganontika_room_4Tex_006A88[] = dganontika_room_
 #define dganontika_room_4Tex_006C88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_4Tex_006C88"
 static const ALIGN_ASSET(2) char ganontika_room_4Tex_006C88[] = dganontika_room_4Tex_006C88;
 
-#define dganontika_room_4Tex_006288 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_4Tex_006288"
-static const ALIGN_ASSET(2) char ganontika_room_4Tex_006288[] = dganontika_room_4Tex_006288;
-
-#define dganontika_room_4Tex_004A88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_4Tex_004A88"
-static const ALIGN_ASSET(2) char ganontika_room_4Tex_004A88[] = dganontika_room_4Tex_004A88;
-
-#define dganontika_room_4Tex_005A88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_4Tex_005A88"
-static const ALIGN_ASSET(2) char ganontika_room_4Tex_005A88[] = dganontika_room_4Tex_005A88;
-
-#define dganontika_room_4Tex_004288 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_4Tex_004288"
-static const ALIGN_ASSET(2) char ganontika_room_4Tex_004288[] = dganontika_room_4Tex_004288;
+#define dganontika_room_4DL_001440 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_4DL_001440"
+static const ALIGN_ASSET(2) char ganontika_room_4DL_001440[] = dganontika_room_4DL_001440;
 
 #define dganontika_room_4DL_002850 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_4DL_002850"
 static const ALIGN_ASSET(2) char ganontika_room_4DL_002850[] = dganontika_room_4DL_002850;
 
-#define dganontika_room_4Tex_005288 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_4Tex_005288"
-static const ALIGN_ASSET(2) char ganontika_room_4Tex_005288[] = dganontika_room_4Tex_005288;
-
 #define dganontika_room_4DL_003048 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_4DL_003048"
 static const ALIGN_ASSET(2) char ganontika_room_4DL_003048[] = dganontika_room_4DL_003048;
 
diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_5.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_5.h
index 28eebc360..ec1507205 100644
--- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_5.h
+++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_5.h
@@ -3,21 +3,36 @@
 
 #include "align_asset_macro.h"
 
-#define dganontika_room_5DL_0005E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5DL_0005E0"
-static const ALIGN_ASSET(2) char ganontika_room_5DL_0005E0[] = dganontika_room_5DL_0005E0;
+#define dganontika_room_5Tex_003B18 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5Tex_003B18"
+static const ALIGN_ASSET(2) char ganontika_room_5Tex_003B18[] = dganontika_room_5Tex_003B18;
+
+#define dganontika_room_5Tex_003D18 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5Tex_003D18"
+static const ALIGN_ASSET(2) char ganontika_room_5Tex_003D18[] = dganontika_room_5Tex_003D18;
+
+#define dganontika_room_5Tex_004518 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5Tex_004518"
+static const ALIGN_ASSET(2) char ganontika_room_5Tex_004518[] = dganontika_room_5Tex_004518;
 
 #define dganontika_room_5Tex_004D18 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5Tex_004D18"
 static const ALIGN_ASSET(2) char ganontika_room_5Tex_004D18[] = dganontika_room_5Tex_004D18;
 
+#define dganontika_room_5Tex_005518 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5Tex_005518"
+static const ALIGN_ASSET(2) char ganontika_room_5Tex_005518[] = dganontika_room_5Tex_005518;
+
+#define dganontika_room_5Tex_005D18 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5Tex_005D18"
+static const ALIGN_ASSET(2) char ganontika_room_5Tex_005D18[] = dganontika_room_5Tex_005D18;
+
+#define dganontika_room_5Tex_006518 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5Tex_006518"
+static const ALIGN_ASSET(2) char ganontika_room_5Tex_006518[] = dganontika_room_5Tex_006518;
+
+#define dganontika_room_5DL_0005E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5DL_0005E0"
+static const ALIGN_ASSET(2) char ganontika_room_5DL_0005E0[] = dganontika_room_5DL_0005E0;
+
 #define dganontika_room_5DL_000930 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5DL_000930"
 static const ALIGN_ASSET(2) char ganontika_room_5DL_000930[] = dganontika_room_5DL_000930;
 
 #define dganontika_room_5DL_001588 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5DL_001588"
 static const ALIGN_ASSET(2) char ganontika_room_5DL_001588[] = dganontika_room_5DL_001588;
 
-#define dganontika_room_5Tex_006518 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5Tex_006518"
-static const ALIGN_ASSET(2) char ganontika_room_5Tex_006518[] = dganontika_room_5Tex_006518;
-
 #define dganontika_room_5DL_002678 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5DL_002678"
 static const ALIGN_ASSET(2) char ganontika_room_5DL_002678[] = dganontika_room_5DL_002678;
 
@@ -27,23 +42,8 @@ static const ALIGN_ASSET(2) char ganontika_room_5DL_002E50[] = dganontika_room_5
 #define dganontika_room_5DL_0035A8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5DL_0035A8"
 static const ALIGN_ASSET(2) char ganontika_room_5DL_0035A8[] = dganontika_room_5DL_0035A8;
 
-#define dganontika_room_5Tex_003B18 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5Tex_003B18"
-static const ALIGN_ASSET(2) char ganontika_room_5Tex_003B18[] = dganontika_room_5Tex_003B18;
-
-#define dganontika_room_5Tex_003D18 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5Tex_003D18"
-static const ALIGN_ASSET(2) char ganontika_room_5Tex_003D18[] = dganontika_room_5Tex_003D18;
-
-#define dganontika_room_5Tex_005518 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5Tex_005518"
-static const ALIGN_ASSET(2) char ganontika_room_5Tex_005518[] = dganontika_room_5Tex_005518;
-
-#define dganontika_room_5Tex_004518 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5Tex_004518"
-static const ALIGN_ASSET(2) char ganontika_room_5Tex_004518[] = dganontika_room_5Tex_004518;
-
 #define dganontika_room_5DL_000320 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5DL_000320"
 static const ALIGN_ASSET(2) char ganontika_room_5DL_000320[] = dganontika_room_5DL_000320;
 
-#define dganontika_room_5Tex_005D18 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_5Tex_005D18"
-static const ALIGN_ASSET(2) char ganontika_room_5Tex_005D18[] = dganontika_room_5Tex_005D18;
-
 
 #endif // DUNGEONS_GANONTIKA_ROOM_5_H
diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_6.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_6.h
index 78207ab18..38e6e39fa 100644
--- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_6.h
+++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_6.h
@@ -3,11 +3,14 @@
 
 #include "align_asset_macro.h"
 
-#define dganontika_room_6DL_00A250 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6DL_00A250"
-static const ALIGN_ASSET(2) char ganontika_room_6DL_00A250[] = dganontika_room_6DL_00A250;
+#define dganontika_room_6Tex_00B500 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6Tex_00B500"
+static const ALIGN_ASSET(2) char ganontika_room_6Tex_00B500[] = dganontika_room_6Tex_00B500;
 
-#define dganontika_room_6Tex_00D700 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6Tex_00D700"
-static const ALIGN_ASSET(2) char ganontika_room_6Tex_00D700[] = dganontika_room_6Tex_00D700;
+#define dganontika_room_6Tex_00B900 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6Tex_00B900"
+static const ALIGN_ASSET(2) char ganontika_room_6Tex_00B900[] = dganontika_room_6Tex_00B900;
+
+#define dganontika_room_6Tex_00C100 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6Tex_00C100"
+static const ALIGN_ASSET(2) char ganontika_room_6Tex_00C100[] = dganontika_room_6Tex_00C100;
 
 #define dganontika_room_6Tex_00C900 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6Tex_00C900"
 static const ALIGN_ASSET(2) char ganontika_room_6Tex_00C900[] = dganontika_room_6Tex_00C900;
@@ -18,48 +21,45 @@ static const ALIGN_ASSET(2) char ganontika_room_6Tex_00CB00[] = dganontika_room_
 #define dganontika_room_6Tex_00CD00 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6Tex_00CD00"
 static const ALIGN_ASSET(2) char ganontika_room_6Tex_00CD00[] = dganontika_room_6Tex_00CD00;
 
+#define dganontika_room_6Tex_00CF00 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6Tex_00CF00"
+static const ALIGN_ASSET(2) char ganontika_room_6Tex_00CF00[] = dganontika_room_6Tex_00CF00;
+
+#define dganontika_room_6Tex_00D700 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6Tex_00D700"
+static const ALIGN_ASSET(2) char ganontika_room_6Tex_00D700[] = dganontika_room_6Tex_00D700;
+
+#define dganontika_room_6Tex_00D900 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6Tex_00D900"
+static const ALIGN_ASSET(2) char ganontika_room_6Tex_00D900[] = dganontika_room_6Tex_00D900;
+
+#define dganontika_room_6Tex_00EC58 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6Tex_00EC58"
+static const ALIGN_ASSET(2) char ganontika_room_6Tex_00EC58[] = dganontika_room_6Tex_00EC58;
+
+#define dganontika_room_6TLUT_00B4E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6TLUT_00B4E0"
+static const ALIGN_ASSET(2) char ganontika_room_6TLUT_00B4E0[] = dganontika_room_6TLUT_00B4E0;
+
+#define dganontika_room_6DL_00A250 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6DL_00A250"
+static const ALIGN_ASSET(2) char ganontika_room_6DL_00A250[] = dganontika_room_6DL_00A250;
+
 #define dganontika_room_6DL_007980 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6DL_007980"
 static const ALIGN_ASSET(2) char ganontika_room_6DL_007980[] = dganontika_room_6DL_007980;
 
 #define dganontika_room_6DL_0018F8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6DL_0018F8"
 static const ALIGN_ASSET(2) char ganontika_room_6DL_0018F8[] = dganontika_room_6DL_0018F8;
 
-#define dganontika_room_6Tex_00CF00 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6Tex_00CF00"
-static const ALIGN_ASSET(2) char ganontika_room_6Tex_00CF00[] = dganontika_room_6Tex_00CF00;
-
-#define dganontika_room_6TLUT_00B4E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6TLUT_00B4E0"
-static const ALIGN_ASSET(2) char ganontika_room_6TLUT_00B4E0[] = dganontika_room_6TLUT_00B4E0;
-
 #define dganontika_room_6DL_00EB30 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6DL_00EB30"
 static const ALIGN_ASSET(2) char ganontika_room_6DL_00EB30[] = dganontika_room_6DL_00EB30;
 
-#define dganontika_room_6Tex_00EC58 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6Tex_00EC58"
-static const ALIGN_ASSET(2) char ganontika_room_6Tex_00EC58[] = dganontika_room_6Tex_00EC58;
-
 #define dganontika_room_6DL_0010E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6DL_0010E0"
 static const ALIGN_ASSET(2) char ganontika_room_6DL_0010E0[] = dganontika_room_6DL_0010E0;
 
-#define dganontika_room_6Tex_00D900 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6Tex_00D900"
-static const ALIGN_ASSET(2) char ganontika_room_6Tex_00D900[] = dganontika_room_6Tex_00D900;
-
 #define dganontika_room_6DL_0015E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6DL_0015E0"
 static const ALIGN_ASSET(2) char ganontika_room_6DL_0015E0[] = dganontika_room_6DL_0015E0;
 
-#define dganontika_room_6Tex_00C100 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6Tex_00C100"
-static const ALIGN_ASSET(2) char ganontika_room_6Tex_00C100[] = dganontika_room_6Tex_00C100;
-
 #define dganontika_room_6DL_001D18 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6DL_001D18"
 static const ALIGN_ASSET(2) char ganontika_room_6DL_001D18[] = dganontika_room_6DL_001D18;
 
-#define dganontika_room_6Tex_00B500 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6Tex_00B500"
-static const ALIGN_ASSET(2) char ganontika_room_6Tex_00B500[] = dganontika_room_6Tex_00B500;
-
 #define dganontika_room_6DL_0023A0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6DL_0023A0"
 static const ALIGN_ASSET(2) char ganontika_room_6DL_0023A0[] = dganontika_room_6DL_0023A0;
 
-#define dganontika_room_6Tex_00B900 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6Tex_00B900"
-static const ALIGN_ASSET(2) char ganontika_room_6Tex_00B900[] = dganontika_room_6Tex_00B900;
-
 #define dganontika_room_6DL_002C20 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_6DL_002C20"
 static const ALIGN_ASSET(2) char ganontika_room_6DL_002C20[] = dganontika_room_6DL_002C20;
 
diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_7.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_7.h
index 079ee9d6a..f3b8d9e4a 100644
--- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_7.h
+++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_7.h
@@ -3,8 +3,20 @@
 
 #include "align_asset_macro.h"
 
-#define dganontika_room_7DL_001440 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_7DL_001440"
-static const ALIGN_ASSET(2) char ganontika_room_7DL_001440[] = dganontika_room_7DL_001440;
+#define dganontika_room_7Tex_004288 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_7Tex_004288"
+static const ALIGN_ASSET(2) char ganontika_room_7Tex_004288[] = dganontika_room_7Tex_004288;
+
+#define dganontika_room_7Tex_004A88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_7Tex_004A88"
+static const ALIGN_ASSET(2) char ganontika_room_7Tex_004A88[] = dganontika_room_7Tex_004A88;
+
+#define dganontika_room_7Tex_005288 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_7Tex_005288"
+static const ALIGN_ASSET(2) char ganontika_room_7Tex_005288[] = dganontika_room_7Tex_005288;
+
+#define dganontika_room_7Tex_005A88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_7Tex_005A88"
+static const ALIGN_ASSET(2) char ganontika_room_7Tex_005A88[] = dganontika_room_7Tex_005A88;
+
+#define dganontika_room_7Tex_006288 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_7Tex_006288"
+static const ALIGN_ASSET(2) char ganontika_room_7Tex_006288[] = dganontika_room_7Tex_006288;
 
 #define dganontika_room_7Tex_006A88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_7Tex_006A88"
 static const ALIGN_ASSET(2) char ganontika_room_7Tex_006A88[] = dganontika_room_7Tex_006A88;
@@ -12,24 +24,12 @@ static const ALIGN_ASSET(2) char ganontika_room_7Tex_006A88[] = dganontika_room_
 #define dganontika_room_7Tex_006C88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_7Tex_006C88"
 static const ALIGN_ASSET(2) char ganontika_room_7Tex_006C88[] = dganontika_room_7Tex_006C88;
 
-#define dganontika_room_7Tex_006288 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_7Tex_006288"
-static const ALIGN_ASSET(2) char ganontika_room_7Tex_006288[] = dganontika_room_7Tex_006288;
-
-#define dganontika_room_7Tex_004A88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_7Tex_004A88"
-static const ALIGN_ASSET(2) char ganontika_room_7Tex_004A88[] = dganontika_room_7Tex_004A88;
-
-#define dganontika_room_7Tex_005A88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_7Tex_005A88"
-static const ALIGN_ASSET(2) char ganontika_room_7Tex_005A88[] = dganontika_room_7Tex_005A88;
-
-#define dganontika_room_7Tex_004288 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_7Tex_004288"
-static const ALIGN_ASSET(2) char ganontika_room_7Tex_004288[] = dganontika_room_7Tex_004288;
+#define dganontika_room_7DL_001440 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_7DL_001440"
+static const ALIGN_ASSET(2) char ganontika_room_7DL_001440[] = dganontika_room_7DL_001440;
 
 #define dganontika_room_7DL_002850 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_7DL_002850"
 static const ALIGN_ASSET(2) char ganontika_room_7DL_002850[] = dganontika_room_7DL_002850;
 
-#define dganontika_room_7Tex_005288 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_7Tex_005288"
-static const ALIGN_ASSET(2) char ganontika_room_7Tex_005288[] = dganontika_room_7Tex_005288;
-
 #define dganontika_room_7DL_003048 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_7DL_003048"
 static const ALIGN_ASSET(2) char ganontika_room_7DL_003048[] = dganontika_room_7DL_003048;
 
diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_8.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_8.h
index 48ecf77a4..73fde17d6 100644
--- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_8.h
+++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_8.h
@@ -3,44 +3,44 @@
 
 #include "align_asset_macro.h"
 
+#define dganontika_room_8Tex_0034B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8Tex_0034B8"
+static const ALIGN_ASSET(2) char ganontika_room_8Tex_0034B8[] = dganontika_room_8Tex_0034B8;
+
+#define dganontika_room_8Tex_0044B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8Tex_0044B8"
+static const ALIGN_ASSET(2) char ganontika_room_8Tex_0044B8[] = dganontika_room_8Tex_0044B8;
+
+#define dganontika_room_8Tex_0054B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8Tex_0054B8"
+static const ALIGN_ASSET(2) char ganontika_room_8Tex_0054B8[] = dganontika_room_8Tex_0054B8;
+
+#define dganontika_room_8Tex_005CB8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8Tex_005CB8"
+static const ALIGN_ASSET(2) char ganontika_room_8Tex_005CB8[] = dganontika_room_8Tex_005CB8;
+
+#define dganontika_room_8Tex_006CB8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8Tex_006CB8"
+static const ALIGN_ASSET(2) char ganontika_room_8Tex_006CB8[] = dganontika_room_8Tex_006CB8;
+
+#define dganontika_room_8Tex_0074B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8Tex_0074B8"
+static const ALIGN_ASSET(2) char ganontika_room_8Tex_0074B8[] = dganontika_room_8Tex_0074B8;
+
+#define dganontika_room_8Tex_008018 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8Tex_008018"
+static const ALIGN_ASSET(2) char ganontika_room_8Tex_008018[] = dganontika_room_8Tex_008018;
+
+#define dganontika_room_8TLUT_003498 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8TLUT_003498"
+static const ALIGN_ASSET(2) char ganontika_room_8TLUT_003498[] = dganontika_room_8TLUT_003498;
+
 #define dganontika_room_8DL_002EE8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8DL_002EE8"
 static const ALIGN_ASSET(2) char ganontika_room_8DL_002EE8[] = dganontika_room_8DL_002EE8;
 
 #define dganontika_room_8DL_0030B0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8DL_0030B0"
 static const ALIGN_ASSET(2) char ganontika_room_8DL_0030B0[] = dganontika_room_8DL_0030B0;
 
-#define dganontika_room_8Tex_0074B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8Tex_0074B8"
-static const ALIGN_ASSET(2) char ganontika_room_8Tex_0074B8[] = dganontika_room_8Tex_0074B8;
-
-#define dganontika_room_8TLUT_003498 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8TLUT_003498"
-static const ALIGN_ASSET(2) char ganontika_room_8TLUT_003498[] = dganontika_room_8TLUT_003498;
-
 #define dganontika_room_8DL_007EF0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8DL_007EF0"
 static const ALIGN_ASSET(2) char ganontika_room_8DL_007EF0[] = dganontika_room_8DL_007EF0;
 
-#define dganontika_room_8Tex_008018 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8Tex_008018"
-static const ALIGN_ASSET(2) char ganontika_room_8Tex_008018[] = dganontika_room_8Tex_008018;
-
 #define dganontika_room_8DL_003360 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8DL_003360"
 static const ALIGN_ASSET(2) char ganontika_room_8DL_003360[] = dganontika_room_8DL_003360;
 
 #define dganontika_room_8DL_001DE0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8DL_001DE0"
 static const ALIGN_ASSET(2) char ganontika_room_8DL_001DE0[] = dganontika_room_8DL_001DE0;
 
-#define dganontika_room_8Tex_0044B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8Tex_0044B8"
-static const ALIGN_ASSET(2) char ganontika_room_8Tex_0044B8[] = dganontika_room_8Tex_0044B8;
-
-#define dganontika_room_8Tex_005CB8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8Tex_005CB8"
-static const ALIGN_ASSET(2) char ganontika_room_8Tex_005CB8[] = dganontika_room_8Tex_005CB8;
-
-#define dganontika_room_8Tex_0034B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8Tex_0034B8"
-static const ALIGN_ASSET(2) char ganontika_room_8Tex_0034B8[] = dganontika_room_8Tex_0034B8;
-
-#define dganontika_room_8Tex_0054B8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8Tex_0054B8"
-static const ALIGN_ASSET(2) char ganontika_room_8Tex_0054B8[] = dganontika_room_8Tex_0054B8;
-
-#define dganontika_room_8Tex_006CB8 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_8Tex_006CB8"
-static const ALIGN_ASSET(2) char ganontika_room_8Tex_006CB8[] = dganontika_room_8Tex_006CB8;
-
 
 #endif // DUNGEONS_GANONTIKA_ROOM_8_H
diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_room_9.h b/soh/assets/scenes/dungeons/ganontika/ganontika_room_9.h
index 3dc270cf0..85caf1d9b 100644
--- a/soh/assets/scenes/dungeons/ganontika/ganontika_room_9.h
+++ b/soh/assets/scenes/dungeons/ganontika/ganontika_room_9.h
@@ -3,8 +3,14 @@
 
 #include "align_asset_macro.h"
 
-#define dganontika_room_9DL_001CF0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9DL_001CF0"
-static const ALIGN_ASSET(2) char ganontika_room_9DL_001CF0[] = dganontika_room_9DL_001CF0;
+#define dganontika_room_9Tex_005488 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9Tex_005488"
+static const ALIGN_ASSET(2) char ganontika_room_9Tex_005488[] = dganontika_room_9Tex_005488;
+
+#define dganontika_room_9Tex_006488 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9Tex_006488"
+static const ALIGN_ASSET(2) char ganontika_room_9Tex_006488[] = dganontika_room_9Tex_006488;
+
+#define dganontika_room_9Tex_007488 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9Tex_007488"
+static const ALIGN_ASSET(2) char ganontika_room_9Tex_007488[] = dganontika_room_9Tex_007488;
 
 #define dganontika_room_9Tex_007C88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9Tex_007C88"
 static const ALIGN_ASSET(2) char ganontika_room_9Tex_007C88[] = dganontika_room_9Tex_007C88;
@@ -12,6 +18,21 @@ static const ALIGN_ASSET(2) char ganontika_room_9Tex_007C88[] = dganontika_room_
 #define dganontika_room_9Tex_007E88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9Tex_007E88"
 static const ALIGN_ASSET(2) char ganontika_room_9Tex_007E88[] = dganontika_room_9Tex_007E88;
 
+#define dganontika_room_9Tex_008688 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9Tex_008688"
+static const ALIGN_ASSET(2) char ganontika_room_9Tex_008688[] = dganontika_room_9Tex_008688;
+
+#define dganontika_room_9Tex_008E88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9Tex_008E88"
+static const ALIGN_ASSET(2) char ganontika_room_9Tex_008E88[] = dganontika_room_9Tex_008E88;
+
+#define dganontika_room_9Tex_009688 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9Tex_009688"
+static const ALIGN_ASSET(2) char ganontika_room_9Tex_009688[] = dganontika_room_9Tex_009688;
+
+#define dganontika_room_9Tex_00A818 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9Tex_00A818"
+static const ALIGN_ASSET(2) char ganontika_room_9Tex_00A818[] = dganontika_room_9Tex_00A818;
+
+#define dganontika_room_9DL_001CF0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9DL_001CF0"
+static const ALIGN_ASSET(2) char ganontika_room_9DL_001CF0[] = dganontika_room_9DL_001CF0;
+
 #define dganontika_room_9DL_002918 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9DL_002918"
 static const ALIGN_ASSET(2) char ganontika_room_9DL_002918[] = dganontika_room_9DL_002918;
 
@@ -24,18 +45,9 @@ static const ALIGN_ASSET(2) char ganontika_room_9DL_003B90[] = dganontika_room_9
 #define dganontika_room_9DL_0049B0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9DL_0049B0"
 static const ALIGN_ASSET(2) char ganontika_room_9DL_0049B0[] = dganontika_room_9DL_0049B0;
 
-#define dganontika_room_9Tex_008688 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9Tex_008688"
-static const ALIGN_ASSET(2) char ganontika_room_9Tex_008688[] = dganontika_room_9Tex_008688;
-
-#define dganontika_room_9Tex_009688 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9Tex_009688"
-static const ALIGN_ASSET(2) char ganontika_room_9Tex_009688[] = dganontika_room_9Tex_009688;
-
 #define dganontika_room_9DL_004D80 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9DL_004D80"
 static const ALIGN_ASSET(2) char ganontika_room_9DL_004D80[] = dganontika_room_9DL_004D80;
 
-#define dganontika_room_9Tex_008E88 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9Tex_008E88"
-static const ALIGN_ASSET(2) char ganontika_room_9Tex_008E88[] = dganontika_room_9Tex_008E88;
-
 #define dganontika_room_9DL_005038 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9DL_005038"
 static const ALIGN_ASSET(2) char ganontika_room_9DL_005038[] = dganontika_room_9DL_005038;
 
@@ -48,23 +60,11 @@ static const ALIGN_ASSET(2) char ganontika_room_9DL_0012F0[] = dganontika_room_9
 #define dganontika_room_9DL_0006E0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9DL_0006E0"
 static const ALIGN_ASSET(2) char ganontika_room_9DL_0006E0[] = dganontika_room_9DL_0006E0;
 
-#define dganontika_room_9Tex_005488 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9Tex_005488"
-static const ALIGN_ASSET(2) char ganontika_room_9Tex_005488[] = dganontika_room_9Tex_005488;
-
-#define dganontika_room_9Tex_006488 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9Tex_006488"
-static const ALIGN_ASSET(2) char ganontika_room_9Tex_006488[] = dganontika_room_9Tex_006488;
-
-#define dganontika_room_9Tex_007488 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9Tex_007488"
-static const ALIGN_ASSET(2) char ganontika_room_9Tex_007488[] = dganontika_room_9Tex_007488;
-
 #define dganontika_room_9DL_0003A0 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9DL_0003A0"
 static const ALIGN_ASSET(2) char ganontika_room_9DL_0003A0[] = dganontika_room_9DL_0003A0;
 
 #define dganontika_room_9DL_00A750 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9DL_00A750"
 static const ALIGN_ASSET(2) char ganontika_room_9DL_00A750[] = dganontika_room_9DL_00A750;
 
-#define dganontika_room_9Tex_00A818 "__OTR__scenes/nonmq/ganontika_scene/ganontika_room_9Tex_00A818"
-static const ALIGN_ASSET(2) char ganontika_room_9Tex_00A818[] = dganontika_room_9Tex_00A818;
-
 
 #endif // DUNGEONS_GANONTIKA_ROOM_9_H
diff --git a/soh/assets/scenes/dungeons/ganontika/ganontika_scene.h b/soh/assets/scenes/dungeons/ganontika/ganontika_scene.h
index 7eaf3caed..eac57cbce 100644
--- a/soh/assets/scenes/dungeons/ganontika/ganontika_scene.h
+++ b/soh/assets/scenes/dungeons/ganontika/ganontika_scene.h
@@ -3,6 +3,24 @@
 
 #include "align_asset_macro.h"
 
+#define dganontika_sceneTex_01F580 "__OTR__scenes/nonmq/ganontika_scene/ganontika_sceneTex_01F580"
+static const ALIGN_ASSET(2) char ganontika_sceneTex_01F580[] = dganontika_sceneTex_01F580;
+
+#define dganontika_sceneTex_01F780 "__OTR__scenes/nonmq/ganontika_scene/ganontika_sceneTex_01F780"
+static const ALIGN_ASSET(2) char ganontika_sceneTex_01F780[] = dganontika_sceneTex_01F780;
+
+#define dganontika_sceneTex_01FF80 "__OTR__scenes/nonmq/ganontika_scene/ganontika_sceneTex_01FF80"
+static const ALIGN_ASSET(2) char ganontika_sceneTex_01FF80[] = dganontika_sceneTex_01FF80;
+
+#define dganontika_sceneTex_020380 "__OTR__scenes/nonmq/ganontika_scene/ganontika_sceneTex_020380"
+static const ALIGN_ASSET(2) char ganontika_sceneTex_020380[] = dganontika_sceneTex_020380;
+
+#define dganontika_sceneTex_020B80 "__OTR__scenes/nonmq/ganontika_scene/ganontika_sceneTex_020B80"
+static const ALIGN_ASSET(2) char ganontika_sceneTex_020B80[] = dganontika_sceneTex_020B80;
+
+#define dganontika_sceneTLUT_01F380 "__OTR__scenes/nonmq/ganontika_scene/ganontika_sceneTLUT_01F380"
+static const ALIGN_ASSET(2) char ganontika_sceneTLUT_01F380[] = dganontika_sceneTLUT_01F380;
+
 #define dgForestTrialSageCs "__OTR__scenes/nonmq/ganontika_scene/gForestTrialSageCs"
 static const ALIGN_ASSET(2) char gForestTrialSageCs[] = dgForestTrialSageCs;
 
@@ -45,22 +63,5 @@ static const ALIGN_ASSET(2) char gShadowBarrierCs[] = dgShadowBarrierCs;
 #define dganontika_sceneCollisionHeader_019EAC "__OTR__scenes/nonmq/ganontika_scene/ganontika_sceneCollisionHeader_019EAC"
 static const ALIGN_ASSET(2) char ganontika_sceneCollisionHeader_019EAC[] = dganontika_sceneCollisionHeader_019EAC;
 
-#define dganontika_sceneTex_01F780 "__OTR__scenes/nonmq/ganontika_scene/ganontika_sceneTex_01F780"
-static const ALIGN_ASSET(2) char ganontika_sceneTex_01F780[] = dganontika_sceneTex_01F780;
-
-#define dganontika_sceneTLUT_01F380 "__OTR__scenes/nonmq/ganontika_scene/ganontika_sceneTLUT_01F380"
-static const ALIGN_ASSET(2) char ganontika_sceneTLUT_01F380[] = dganontika_sceneTLUT_01F380;
-
-#define dganontika_sceneTex_020380 "__OTR__scenes/nonmq/ganontika_scene/ganontika_sceneTex_020380"
-static const ALIGN_ASSET(2) char ganontika_sceneTex_020380[] = dganontika_sceneTex_020380;
-
-#define dganontika_sceneTex_020B80 "__OTR__scenes/nonmq/ganontika_scene/ganontika_sceneTex_020B80"
-static const ALIGN_ASSET(2) char ganontika_sceneTex_020B80[] = dganontika_sceneTex_020B80;
-
-#define dganontika_sceneTex_01F580 "__OTR__scenes/nonmq/ganontika_scene/ganontika_sceneTex_01F580"
-static const ALIGN_ASSET(2) char ganontika_sceneTex_01F580[] = dganontika_sceneTex_01F580;
-
-#define dganontika_sceneTex_01FF80 "__OTR__scenes/nonmq/ganontika_scene/ganontika_sceneTex_01FF80"
-static const ALIGN_ASSET(2) char ganontika_sceneTex_01FF80[] = dganontika_sceneTex_01FF80;
 
 #endif // DUNGEONS_GANONTIKA_SCENE_H
diff --git a/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_0.h b/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_0.h
index da4a8200c..0513a70c0 100644
--- a/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_0.h
+++ b/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_0.h
@@ -3,65 +3,65 @@
 
 #include "align_asset_macro.h"
 
-#define dganontikasonogo_room_0DL_0091C0 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0DL_0091C0"
-static const ALIGN_ASSET(2) char ganontikasonogo_room_0DL_0091C0[] = dganontikasonogo_room_0DL_0091C0;
-
-#define dganontikasonogo_room_0Tex_00B2D8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00B2D8"
-static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00B2D8[] = dganontikasonogo_room_0Tex_00B2D8;
-
-#define dganontikasonogo_room_0Tex_00D2D8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00D2D8"
-static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00D2D8[] = dganontikasonogo_room_0Tex_00D2D8;
-
-#define dganontikasonogo_room_0Tex_014AD8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_014AD8"
-static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_014AD8[] = dganontikasonogo_room_0Tex_014AD8;
-
-#define dganontikasonogo_room_0Tex_0142D8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_0142D8"
-static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_0142D8[] = dganontikasonogo_room_0Tex_0142D8;
-
-#define dganontikasonogo_room_0Tex_0132D8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_0132D8"
-static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_0132D8[] = dganontikasonogo_room_0Tex_0132D8;
-
-#define dganontikasonogo_room_0Tex_00F2D8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00F2D8"
-static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00F2D8[] = dganontikasonogo_room_0Tex_00F2D8;
-
-#define dganontikasonogo_room_0Tex_00E2D8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00E2D8"
-static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00E2D8[] = dganontikasonogo_room_0Tex_00E2D8;
-
-#define dganontikasonogo_room_0Tex_00A2D8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00A2D8"
-static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00A2D8[] = dganontikasonogo_room_0Tex_00A2D8;
-
-#define dganontikasonogo_room_0Tex_00FAD8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00FAD8"
-static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00FAD8[] = dganontikasonogo_room_0Tex_00FAD8;
-
-#define dganontikasonogo_room_0Tex_0092D8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_0092D8"
+#define dganontikasonogo_room_0Tex_0092D8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_0092D8"
 static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_0092D8[] = dganontikasonogo_room_0Tex_0092D8;
 
-#define dganontikasonogo_room_0Tex_012AD8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_012AD8"
-static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_012AD8[] = dganontikasonogo_room_0Tex_012AD8;
+#define dganontikasonogo_room_0Tex_00A2D8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00A2D8"
+static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00A2D8[] = dganontikasonogo_room_0Tex_00A2D8;
 
-#define dganontikasonogo_room_0TLUT_0092B8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0TLUT_0092B8"
-static const ALIGN_ASSET(2) char ganontikasonogo_room_0TLUT_0092B8[] = dganontikasonogo_room_0TLUT_0092B8;
+#define dganontikasonogo_room_0Tex_00B2D8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00B2D8"
+static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00B2D8[] = dganontikasonogo_room_0Tex_00B2D8;
 
-#define dganontikasonogo_room_0Tex_0122D8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_0122D8"
-static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_0122D8[] = dganontikasonogo_room_0Tex_0122D8;
-
-#define dganontikasonogo_room_0Tex_011AD8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_011AD8"
-static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_011AD8[] = dganontikasonogo_room_0Tex_011AD8;
-
-#define dganontikasonogo_room_0Tex_0112D8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_0112D8"
-static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_0112D8[] = dganontikasonogo_room_0Tex_0112D8;
-
-#define dganontikasonogo_room_0Tex_010AD8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_010AD8"
-static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_010AD8[] = dganontikasonogo_room_0Tex_010AD8;
-
-#define dganontikasonogo_room_0Tex_00C2D8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00C2D8"
+#define dganontikasonogo_room_0Tex_00C2D8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00C2D8"
 static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00C2D8[] = dganontikasonogo_room_0Tex_00C2D8;
 
-#define dganontikasonogo_room_0DL_016B48 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0DL_016B48"
-static const ALIGN_ASSET(2) char ganontikasonogo_room_0DL_016B48[] = dganontikasonogo_room_0DL_016B48;
+#define dganontikasonogo_room_0Tex_00D2D8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00D2D8"
+static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00D2D8[] = dganontikasonogo_room_0Tex_00D2D8;
 
-#define dganontikasonogo_room_0Tex_016B78 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_0Tex_016B78"
+#define dganontikasonogo_room_0Tex_00E2D8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00E2D8"
+static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00E2D8[] = dganontikasonogo_room_0Tex_00E2D8;
+
+#define dganontikasonogo_room_0Tex_00F2D8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00F2D8"
+static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00F2D8[] = dganontikasonogo_room_0Tex_00F2D8;
+
+#define dganontikasonogo_room_0Tex_00FAD8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_00FAD8"
+static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_00FAD8[] = dganontikasonogo_room_0Tex_00FAD8;
+
+#define dganontikasonogo_room_0Tex_010AD8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_010AD8"
+static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_010AD8[] = dganontikasonogo_room_0Tex_010AD8;
+
+#define dganontikasonogo_room_0Tex_0112D8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_0112D8"
+static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_0112D8[] = dganontikasonogo_room_0Tex_0112D8;
+
+#define dganontikasonogo_room_0Tex_011AD8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_011AD8"
+static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_011AD8[] = dganontikasonogo_room_0Tex_011AD8;
+
+#define dganontikasonogo_room_0Tex_0122D8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_0122D8"
+static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_0122D8[] = dganontikasonogo_room_0Tex_0122D8;
+
+#define dganontikasonogo_room_0Tex_012AD8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_012AD8"
+static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_012AD8[] = dganontikasonogo_room_0Tex_012AD8;
+
+#define dganontikasonogo_room_0Tex_0132D8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_0132D8"
+static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_0132D8[] = dganontikasonogo_room_0Tex_0132D8;
+
+#define dganontikasonogo_room_0Tex_0142D8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_0142D8"
+static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_0142D8[] = dganontikasonogo_room_0Tex_0142D8;
+
+#define dganontikasonogo_room_0Tex_014AD8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_014AD8"
+static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_014AD8[] = dganontikasonogo_room_0Tex_014AD8;
+
+#define dganontikasonogo_room_0Tex_016B78 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0Tex_016B78"
 static const ALIGN_ASSET(2) char ganontikasonogo_room_0Tex_016B78[] = dganontikasonogo_room_0Tex_016B78;
 
+#define dganontikasonogo_room_0TLUT_0092B8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0TLUT_0092B8"
+static const ALIGN_ASSET(2) char ganontikasonogo_room_0TLUT_0092B8[] = dganontikasonogo_room_0TLUT_0092B8;
+
+#define dganontikasonogo_room_0DL_0091C0 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0DL_0091C0"
+static const ALIGN_ASSET(2) char ganontikasonogo_room_0DL_0091C0[] = dganontikasonogo_room_0DL_0091C0;
+
+#define dganontikasonogo_room_0DL_016B48 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_0DL_016B48"
+static const ALIGN_ASSET(2) char ganontikasonogo_room_0DL_016B48[] = dganontikasonogo_room_0DL_016B48;
+
 
 #endif // DUNGEONS_GANONTIKASONOGO_ROOM_0_H
diff --git a/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_1.h b/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_1.h
index 6571799a5..7f2b8d872 100644
--- a/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_1.h
+++ b/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_1.h
@@ -3,23 +3,23 @@
 
 #include "align_asset_macro.h"
 
-#define dganontikasonogo_room_1DL_006BE8 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_1DL_006BE8"
-static const ALIGN_ASSET(2) char ganontikasonogo_room_1DL_006BE8[] = dganontikasonogo_room_1DL_006BE8;
-
-#define dganontikasonogo_room_1Tex_006C60 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_1Tex_006C60"
+#define dganontikasonogo_room_1Tex_006C60 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_1Tex_006C60"
 static const ALIGN_ASSET(2) char ganontikasonogo_room_1Tex_006C60[] = dganontikasonogo_room_1Tex_006C60;
 
-#define dganontikasonogo_room_1Tex_007460 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_1Tex_007460"
+#define dganontikasonogo_room_1Tex_007460 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_1Tex_007460"
 static const ALIGN_ASSET(2) char ganontikasonogo_room_1Tex_007460[] = dganontikasonogo_room_1Tex_007460;
 
-#define dganontikasonogo_room_1Tex_008460 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_1Tex_008460"
+#define dganontikasonogo_room_1Tex_008460 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_1Tex_008460"
 static const ALIGN_ASSET(2) char ganontikasonogo_room_1Tex_008460[] = dganontikasonogo_room_1Tex_008460;
 
-#define dganontikasonogo_room_1DL_009710 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_1DL_009710"
-static const ALIGN_ASSET(2) char ganontikasonogo_room_1DL_009710[] = dganontikasonogo_room_1DL_009710;
-
-#define dganontikasonogo_room_1Tex_009720 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_room_1Tex_009720"
+#define dganontikasonogo_room_1Tex_009720 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_1Tex_009720"
 static const ALIGN_ASSET(2) char ganontikasonogo_room_1Tex_009720[] = dganontikasonogo_room_1Tex_009720;
 
+#define dganontikasonogo_room_1DL_006BE8 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_1DL_006BE8"
+static const ALIGN_ASSET(2) char ganontikasonogo_room_1DL_006BE8[] = dganontikasonogo_room_1DL_006BE8;
+
+#define dganontikasonogo_room_1DL_009710 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_room_1DL_009710"
+static const ALIGN_ASSET(2) char ganontikasonogo_room_1DL_009710[] = dganontikasonogo_room_1DL_009710;
+
 
 #endif // DUNGEONS_GANONTIKASONOGO_ROOM_1_H
diff --git a/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_scene.h b/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_scene.h
index 21f8d1cea..59c7469c4 100644
--- a/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_scene.h
+++ b/soh/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_scene.h
@@ -3,13 +3,14 @@
 
 #include "align_asset_macro.h"
 
-#define dganontikasonogo_sceneCollisionHeader_002ACC "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_sceneCollisionHeader_002ACC"
-static const ALIGN_ASSET(2) char ganontikasonogo_sceneCollisionHeader_002ACC[] = dganontikasonogo_sceneCollisionHeader_002ACC;
-
-#define dganontikasonogo_sceneTex_002B00 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_sceneTex_002B00"
+#define dganontikasonogo_sceneTex_002B00 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_sceneTex_002B00"
 static const ALIGN_ASSET(2) char ganontikasonogo_sceneTex_002B00[] = dganontikasonogo_sceneTex_002B00;
 
-#define dganontikasonogo_sceneTex_003B00 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_sceneTex_003B00"
+#define dganontikasonogo_sceneTex_003B00 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_sceneTex_003B00"
 static const ALIGN_ASSET(2) char ganontikasonogo_sceneTex_003B00[] = dganontikasonogo_sceneTex_003B00;
 
+#define dganontikasonogo_sceneCollisionHeader_002ACC "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_sceneCollisionHeader_002ACC"
+static const ALIGN_ASSET(2) char ganontikasonogo_sceneCollisionHeader_002ACC[] = dganontikasonogo_sceneCollisionHeader_002ACC;
+
+
 #endif // DUNGEONS_GANONTIKASONOGO_SCENE_H
diff --git a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_0.h b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_0.h
index f5d03df17..28d9871c5 100644
--- a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_0.h
+++ b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_0.h
@@ -3,35 +3,35 @@
 
 #include "align_asset_macro.h"
 
-#define dgerudoway_room_0DL_002B58 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_0DL_002B58"
-static const ALIGN_ASSET(2) char gerudoway_room_0DL_002B58[] = dgerudoway_room_0DL_002B58;
-
-#define dgerudoway_room_0DL_004520 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_0DL_004520"
-static const ALIGN_ASSET(2) char gerudoway_room_0DL_004520[] = dgerudoway_room_0DL_004520;
-
-#define dgerudoway_room_0DL_002E68 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_0DL_002E68"
-static const ALIGN_ASSET(2) char gerudoway_room_0DL_002E68[] = dgerudoway_room_0DL_002E68;
-
-#define dgerudoway_room_0DL_0047A0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_0DL_0047A0"
-static const ALIGN_ASSET(2) char gerudoway_room_0DL_0047A0[] = dgerudoway_room_0DL_0047A0;
-
-#define dgerudoway_room_0DL_004BF8 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_0DL_004BF8"
-static const ALIGN_ASSET(2) char gerudoway_room_0DL_004BF8[] = dgerudoway_room_0DL_004BF8;
-
-#define dgerudoway_room_0DL_002858 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_0DL_002858"
-static const ALIGN_ASSET(2) char gerudoway_room_0DL_002858[] = dgerudoway_room_0DL_002858;
-
-#define dgerudoway_room_0DL_002208 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_0DL_002208"
-static const ALIGN_ASSET(2) char gerudoway_room_0DL_002208[] = dgerudoway_room_0DL_002208;
-
-#define dgerudoway_room_0DL_000E70 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_0DL_000E70"
-static const ALIGN_ASSET(2) char gerudoway_room_0DL_000E70[] = dgerudoway_room_0DL_000E70;
-
-#define dgerudoway_room_0Tex_002FB0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_0Tex_002FB0"
+#define dgerudoway_room_0Tex_002FB0 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_0Tex_002FB0"
 static const ALIGN_ASSET(2) char gerudoway_room_0Tex_002FB0[] = dgerudoway_room_0Tex_002FB0;
 
-#define dgerudoway_room_0Tex_003FB0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_0Tex_003FB0"
+#define dgerudoway_room_0Tex_003FB0 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_0Tex_003FB0"
 static const ALIGN_ASSET(2) char gerudoway_room_0Tex_003FB0[] = dgerudoway_room_0Tex_003FB0;
 
+#define dgerudoway_room_0DL_002B58 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_0DL_002B58"
+static const ALIGN_ASSET(2) char gerudoway_room_0DL_002B58[] = dgerudoway_room_0DL_002B58;
+
+#define dgerudoway_room_0DL_004520 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_0DL_004520"
+static const ALIGN_ASSET(2) char gerudoway_room_0DL_004520[] = dgerudoway_room_0DL_004520;
+
+#define dgerudoway_room_0DL_002E68 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_0DL_002E68"
+static const ALIGN_ASSET(2) char gerudoway_room_0DL_002E68[] = dgerudoway_room_0DL_002E68;
+
+#define dgerudoway_room_0DL_0047A0 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_0DL_0047A0"
+static const ALIGN_ASSET(2) char gerudoway_room_0DL_0047A0[] = dgerudoway_room_0DL_0047A0;
+
+#define dgerudoway_room_0DL_004BF8 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_0DL_004BF8"
+static const ALIGN_ASSET(2) char gerudoway_room_0DL_004BF8[] = dgerudoway_room_0DL_004BF8;
+
+#define dgerudoway_room_0DL_002858 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_0DL_002858"
+static const ALIGN_ASSET(2) char gerudoway_room_0DL_002858[] = dgerudoway_room_0DL_002858;
+
+#define dgerudoway_room_0DL_002208 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_0DL_002208"
+static const ALIGN_ASSET(2) char gerudoway_room_0DL_002208[] = dgerudoway_room_0DL_002208;
+
+#define dgerudoway_room_0DL_000E70 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_0DL_000E70"
+static const ALIGN_ASSET(2) char gerudoway_room_0DL_000E70[] = dgerudoway_room_0DL_000E70;
+
 
 #endif // DUNGEONS_GERUDOWAY_ROOM_0_H
diff --git a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_1.h b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_1.h
index 6fc0b66fd..de48f2161 100644
--- a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_1.h
+++ b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_1.h
@@ -3,49 +3,49 @@
 
 #include "align_asset_macro.h"
 
-#define dgerudoway_room_1DL_001A60 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_1DL_001A60"
-static const ALIGN_ASSET(2) char gerudoway_room_1DL_001A60[] = dgerudoway_room_1DL_001A60;
-
-#define dgerudoway_room_1DL_006C80 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_1DL_006C80"
-static const ALIGN_ASSET(2) char gerudoway_room_1DL_006C80[] = dgerudoway_room_1DL_006C80;
-
-#define dgerudoway_room_1DL_001D70 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_1DL_001D70"
-static const ALIGN_ASSET(2) char gerudoway_room_1DL_001D70[] = dgerudoway_room_1DL_001D70;
-
-#define dgerudoway_room_1DL_006F00 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_1DL_006F00"
-static const ALIGN_ASSET(2) char gerudoway_room_1DL_006F00[] = dgerudoway_room_1DL_006F00;
-
-#define dgerudoway_room_1DL_002EC8 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_1DL_002EC8"
-static const ALIGN_ASSET(2) char gerudoway_room_1DL_002EC8[] = dgerudoway_room_1DL_002EC8;
-
-#define dgerudoway_room_1Tex_005710 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_1Tex_005710"
-static const ALIGN_ASSET(2) char gerudoway_room_1Tex_005710[] = dgerudoway_room_1Tex_005710;
-
-#define dgerudoway_room_1Tex_003F10 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_1Tex_003F10"
-static const ALIGN_ASSET(2) char gerudoway_room_1Tex_003F10[] = dgerudoway_room_1Tex_003F10;
-
-#define dgerudoway_room_1Tex_003710 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_1Tex_003710"
+#define dgerudoway_room_1Tex_003710 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_1Tex_003710"
 static const ALIGN_ASSET(2) char gerudoway_room_1Tex_003710[] = dgerudoway_room_1Tex_003710;
 
-#define dgerudoway_room_1Tex_004710 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_1Tex_004710"
+#define dgerudoway_room_1Tex_003F10 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_1Tex_003F10"
+static const ALIGN_ASSET(2) char gerudoway_room_1Tex_003F10[] = dgerudoway_room_1Tex_003F10;
+
+#define dgerudoway_room_1Tex_004710 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_1Tex_004710"
 static const ALIGN_ASSET(2) char gerudoway_room_1Tex_004710[] = dgerudoway_room_1Tex_004710;
 
-#define dgerudoway_room_1DL_0071B8 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_1DL_0071B8"
-static const ALIGN_ASSET(2) char gerudoway_room_1DL_0071B8[] = dgerudoway_room_1DL_0071B8;
+#define dgerudoway_room_1Tex_005710 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_1Tex_005710"
+static const ALIGN_ASSET(2) char gerudoway_room_1Tex_005710[] = dgerudoway_room_1Tex_005710;
 
-#define dgerudoway_room_1DL_001178 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_1DL_001178"
-static const ALIGN_ASSET(2) char gerudoway_room_1DL_001178[] = dgerudoway_room_1DL_001178;
-
-#define dgerudoway_room_1DL_001710 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_1DL_001710"
-static const ALIGN_ASSET(2) char gerudoway_room_1DL_001710[] = dgerudoway_room_1DL_001710;
-
-#define dgerudoway_room_1Tex_006310 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_1Tex_006310"
-static const ALIGN_ASSET(2) char gerudoway_room_1Tex_006310[] = dgerudoway_room_1Tex_006310;
-
-#define dgerudoway_room_1Tex_005B10 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_1Tex_005B10"
+#define dgerudoway_room_1Tex_005B10 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_1Tex_005B10"
 static const ALIGN_ASSET(2) char gerudoway_room_1Tex_005B10[] = dgerudoway_room_1Tex_005B10;
 
-#define dgerudoway_room_1DL_000B90 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_1DL_000B90"
+#define dgerudoway_room_1Tex_006310 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_1Tex_006310"
+static const ALIGN_ASSET(2) char gerudoway_room_1Tex_006310[] = dgerudoway_room_1Tex_006310;
+
+#define dgerudoway_room_1DL_001A60 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_1DL_001A60"
+static const ALIGN_ASSET(2) char gerudoway_room_1DL_001A60[] = dgerudoway_room_1DL_001A60;
+
+#define dgerudoway_room_1DL_006C80 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_1DL_006C80"
+static const ALIGN_ASSET(2) char gerudoway_room_1DL_006C80[] = dgerudoway_room_1DL_006C80;
+
+#define dgerudoway_room_1DL_001D70 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_1DL_001D70"
+static const ALIGN_ASSET(2) char gerudoway_room_1DL_001D70[] = dgerudoway_room_1DL_001D70;
+
+#define dgerudoway_room_1DL_006F00 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_1DL_006F00"
+static const ALIGN_ASSET(2) char gerudoway_room_1DL_006F00[] = dgerudoway_room_1DL_006F00;
+
+#define dgerudoway_room_1DL_002EC8 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_1DL_002EC8"
+static const ALIGN_ASSET(2) char gerudoway_room_1DL_002EC8[] = dgerudoway_room_1DL_002EC8;
+
+#define dgerudoway_room_1DL_0071B8 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_1DL_0071B8"
+static const ALIGN_ASSET(2) char gerudoway_room_1DL_0071B8[] = dgerudoway_room_1DL_0071B8;
+
+#define dgerudoway_room_1DL_001178 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_1DL_001178"
+static const ALIGN_ASSET(2) char gerudoway_room_1DL_001178[] = dgerudoway_room_1DL_001178;
+
+#define dgerudoway_room_1DL_001710 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_1DL_001710"
+static const ALIGN_ASSET(2) char gerudoway_room_1DL_001710[] = dgerudoway_room_1DL_001710;
+
+#define dgerudoway_room_1DL_000B90 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_1DL_000B90"
 static const ALIGN_ASSET(2) char gerudoway_room_1DL_000B90[] = dgerudoway_room_1DL_000B90;
 
 
diff --git a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_2.h b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_2.h
index e09531528..74282e458 100644
--- a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_2.h
+++ b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_2.h
@@ -3,34 +3,34 @@
 
 #include "align_asset_macro.h"
 
-#define dgerudoway_room_2DL_001E40 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_2DL_001E40"
-static const ALIGN_ASSET(2) char gerudoway_room_2DL_001E40[] = dgerudoway_room_2DL_001E40;
-
-#define dgerudoway_room_2DL_003410 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_2DL_003410"
-static const ALIGN_ASSET(2) char gerudoway_room_2DL_003410[] = dgerudoway_room_2DL_003410;
-
-#define dgerudoway_room_2DL_002150 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_2DL_002150"
-static const ALIGN_ASSET(2) char gerudoway_room_2DL_002150[] = dgerudoway_room_2DL_002150;
-
-#define dgerudoway_room_2DL_003690 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_2DL_003690"
-static const ALIGN_ASSET(2) char gerudoway_room_2DL_003690[] = dgerudoway_room_2DL_003690;
-
-#define dgerudoway_room_2DL_003CC8 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_2DL_003CC8"
-static const ALIGN_ASSET(2) char gerudoway_room_2DL_003CC8[] = dgerudoway_room_2DL_003CC8;
-
-#define dgerudoway_room_2DL_001518 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_2DL_001518"
-static const ALIGN_ASSET(2) char gerudoway_room_2DL_001518[] = dgerudoway_room_2DL_001518;
-
-#define dgerudoway_room_2DL_001A98 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_2DL_001A98"
-static const ALIGN_ASSET(2) char gerudoway_room_2DL_001A98[] = dgerudoway_room_2DL_001A98;
-
-#define dgerudoway_room_2Tex_002298 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_2Tex_002298"
+#define dgerudoway_room_2Tex_002298 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_2Tex_002298"
 static const ALIGN_ASSET(2) char gerudoway_room_2Tex_002298[] = dgerudoway_room_2Tex_002298;
 
-#define dgerudoway_room_2Tex_002A98 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_2Tex_002A98"
+#define dgerudoway_room_2Tex_002A98 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_2Tex_002A98"
 static const ALIGN_ASSET(2) char gerudoway_room_2Tex_002A98[] = dgerudoway_room_2Tex_002A98;
 
-#define dgerudoway_room_2DL_000E80 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_2DL_000E80"
+#define dgerudoway_room_2DL_001E40 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_2DL_001E40"
+static const ALIGN_ASSET(2) char gerudoway_room_2DL_001E40[] = dgerudoway_room_2DL_001E40;
+
+#define dgerudoway_room_2DL_003410 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_2DL_003410"
+static const ALIGN_ASSET(2) char gerudoway_room_2DL_003410[] = dgerudoway_room_2DL_003410;
+
+#define dgerudoway_room_2DL_002150 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_2DL_002150"
+static const ALIGN_ASSET(2) char gerudoway_room_2DL_002150[] = dgerudoway_room_2DL_002150;
+
+#define dgerudoway_room_2DL_003690 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_2DL_003690"
+static const ALIGN_ASSET(2) char gerudoway_room_2DL_003690[] = dgerudoway_room_2DL_003690;
+
+#define dgerudoway_room_2DL_003CC8 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_2DL_003CC8"
+static const ALIGN_ASSET(2) char gerudoway_room_2DL_003CC8[] = dgerudoway_room_2DL_003CC8;
+
+#define dgerudoway_room_2DL_001518 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_2DL_001518"
+static const ALIGN_ASSET(2) char gerudoway_room_2DL_001518[] = dgerudoway_room_2DL_001518;
+
+#define dgerudoway_room_2DL_001A98 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_2DL_001A98"
+static const ALIGN_ASSET(2) char gerudoway_room_2DL_001A98[] = dgerudoway_room_2DL_001A98;
+
+#define dgerudoway_room_2DL_000E80 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_2DL_000E80"
 static const ALIGN_ASSET(2) char gerudoway_room_2DL_000E80[] = dgerudoway_room_2DL_000E80;
 
 
diff --git a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_3.h b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_3.h
index 52dbc5537..efce766af 100644
--- a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_3.h
+++ b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_3.h
@@ -3,58 +3,58 @@
 
 #include "align_asset_macro.h"
 
-#define dgerudoway_room_3DL_005540 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3DL_005540"
-static const ALIGN_ASSET(2) char gerudoway_room_3DL_005540[] = dgerudoway_room_3DL_005540;
-
-#define dgerudoway_room_3Tex_009AA0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3Tex_009AA0"
-static const ALIGN_ASSET(2) char gerudoway_room_3Tex_009AA0[] = dgerudoway_room_3Tex_009AA0;
-
-#define dgerudoway_room_3DL_002BA8 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3DL_002BA8"
-static const ALIGN_ASSET(2) char gerudoway_room_3DL_002BA8[] = dgerudoway_room_3DL_002BA8;
-
-#define dgerudoway_room_3Tex_0076A0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3Tex_0076A0"
-static const ALIGN_ASSET(2) char gerudoway_room_3Tex_0076A0[] = dgerudoway_room_3Tex_0076A0;
-
-#define dgerudoway_room_3DL_00A410 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3DL_00A410"
-static const ALIGN_ASSET(2) char gerudoway_room_3DL_00A410[] = dgerudoway_room_3DL_00A410;
-
-#define dgerudoway_room_3DL_002F28 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3DL_002F28"
-static const ALIGN_ASSET(2) char gerudoway_room_3DL_002F28[] = dgerudoway_room_3DL_002F28;
-
-#define dgerudoway_room_3DL_00A690 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3DL_00A690"
-static const ALIGN_ASSET(2) char gerudoway_room_3DL_00A690[] = dgerudoway_room_3DL_00A690;
-
-#define dgerudoway_room_3DL_006640 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3DL_006640"
-static const ALIGN_ASSET(2) char gerudoway_room_3DL_006640[] = dgerudoway_room_3DL_006640;
-
-#define dgerudoway_room_3Tex_008EA0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3Tex_008EA0"
-static const ALIGN_ASSET(2) char gerudoway_room_3Tex_008EA0[] = dgerudoway_room_3Tex_008EA0;
-
-#define dgerudoway_room_3Tex_007EA0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3Tex_007EA0"
-static const ALIGN_ASSET(2) char gerudoway_room_3Tex_007EA0[] = dgerudoway_room_3Tex_007EA0;
-
-#define dgerudoway_room_3Tex_006EA0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3Tex_006EA0"
+#define dgerudoway_room_3Tex_006EA0 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3Tex_006EA0"
 static const ALIGN_ASSET(2) char gerudoway_room_3Tex_006EA0[] = dgerudoway_room_3Tex_006EA0;
 
-#define dgerudoway_room_3DL_00B0E8 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3DL_00B0E8"
-static const ALIGN_ASSET(2) char gerudoway_room_3DL_00B0E8[] = dgerudoway_room_3DL_00B0E8;
+#define dgerudoway_room_3Tex_0076A0 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3Tex_0076A0"
+static const ALIGN_ASSET(2) char gerudoway_room_3Tex_0076A0[] = dgerudoway_room_3Tex_0076A0;
 
-#define dgerudoway_room_3DL_002658 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3DL_002658"
-static const ALIGN_ASSET(2) char gerudoway_room_3DL_002658[] = dgerudoway_room_3DL_002658;
+#define dgerudoway_room_3Tex_007EA0 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3Tex_007EA0"
+static const ALIGN_ASSET(2) char gerudoway_room_3Tex_007EA0[] = dgerudoway_room_3Tex_007EA0;
 
-#define dgerudoway_room_3DL_005378 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3DL_005378"
-static const ALIGN_ASSET(2) char gerudoway_room_3DL_005378[] = dgerudoway_room_3DL_005378;
+#define dgerudoway_room_3Tex_008EA0 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3Tex_008EA0"
+static const ALIGN_ASSET(2) char gerudoway_room_3Tex_008EA0[] = dgerudoway_room_3Tex_008EA0;
 
-#define dgerudoway_room_3Tex_0092A0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3Tex_0092A0"
+#define dgerudoway_room_3Tex_0092A0 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3Tex_0092A0"
 static const ALIGN_ASSET(2) char gerudoway_room_3Tex_0092A0[] = dgerudoway_room_3Tex_0092A0;
 
-#define dgerudoway_room_3DL_004EA8 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3DL_004EA8"
+#define dgerudoway_room_3Tex_009AA0 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3Tex_009AA0"
+static const ALIGN_ASSET(2) char gerudoway_room_3Tex_009AA0[] = dgerudoway_room_3Tex_009AA0;
+
+#define dgerudoway_room_3DL_005540 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3DL_005540"
+static const ALIGN_ASSET(2) char gerudoway_room_3DL_005540[] = dgerudoway_room_3DL_005540;
+
+#define dgerudoway_room_3DL_002BA8 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3DL_002BA8"
+static const ALIGN_ASSET(2) char gerudoway_room_3DL_002BA8[] = dgerudoway_room_3DL_002BA8;
+
+#define dgerudoway_room_3DL_00A410 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3DL_00A410"
+static const ALIGN_ASSET(2) char gerudoway_room_3DL_00A410[] = dgerudoway_room_3DL_00A410;
+
+#define dgerudoway_room_3DL_002F28 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3DL_002F28"
+static const ALIGN_ASSET(2) char gerudoway_room_3DL_002F28[] = dgerudoway_room_3DL_002F28;
+
+#define dgerudoway_room_3DL_00A690 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3DL_00A690"
+static const ALIGN_ASSET(2) char gerudoway_room_3DL_00A690[] = dgerudoway_room_3DL_00A690;
+
+#define dgerudoway_room_3DL_006640 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3DL_006640"
+static const ALIGN_ASSET(2) char gerudoway_room_3DL_006640[] = dgerudoway_room_3DL_006640;
+
+#define dgerudoway_room_3DL_00B0E8 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3DL_00B0E8"
+static const ALIGN_ASSET(2) char gerudoway_room_3DL_00B0E8[] = dgerudoway_room_3DL_00B0E8;
+
+#define dgerudoway_room_3DL_002658 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3DL_002658"
+static const ALIGN_ASSET(2) char gerudoway_room_3DL_002658[] = dgerudoway_room_3DL_002658;
+
+#define dgerudoway_room_3DL_005378 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3DL_005378"
+static const ALIGN_ASSET(2) char gerudoway_room_3DL_005378[] = dgerudoway_room_3DL_005378;
+
+#define dgerudoway_room_3DL_004EA8 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3DL_004EA8"
 static const ALIGN_ASSET(2) char gerudoway_room_3DL_004EA8[] = dgerudoway_room_3DL_004EA8;
 
-#define dgerudoway_room_3DL_001B70 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3DL_001B70"
+#define dgerudoway_room_3DL_001B70 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3DL_001B70"
 static const ALIGN_ASSET(2) char gerudoway_room_3DL_001B70[] = dgerudoway_room_3DL_001B70;
 
-#define dgerudoway_room_3DL_003E80 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_3DL_003E80"
+#define dgerudoway_room_3DL_003E80 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_3DL_003E80"
 static const ALIGN_ASSET(2) char gerudoway_room_3DL_003E80[] = dgerudoway_room_3DL_003E80;
 
 
diff --git a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_4.h b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_4.h
index 82e861932..c0ae50eb0 100644
--- a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_4.h
+++ b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_4.h
@@ -3,34 +3,34 @@
 
 #include "align_asset_macro.h"
 
-#define dgerudoway_room_4DL_001BD0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_4DL_001BD0"
-static const ALIGN_ASSET(2) char gerudoway_room_4DL_001BD0[] = dgerudoway_room_4DL_001BD0;
-
-#define dgerudoway_room_4DL_0031A0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_4DL_0031A0"
-static const ALIGN_ASSET(2) char gerudoway_room_4DL_0031A0[] = dgerudoway_room_4DL_0031A0;
-
-#define dgerudoway_room_4DL_001EE0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_4DL_001EE0"
-static const ALIGN_ASSET(2) char gerudoway_room_4DL_001EE0[] = dgerudoway_room_4DL_001EE0;
-
-#define dgerudoway_room_4DL_003420 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_4DL_003420"
-static const ALIGN_ASSET(2) char gerudoway_room_4DL_003420[] = dgerudoway_room_4DL_003420;
-
-#define dgerudoway_room_4DL_0037F8 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_4DL_0037F8"
-static const ALIGN_ASSET(2) char gerudoway_room_4DL_0037F8[] = dgerudoway_room_4DL_0037F8;
-
-#define dgerudoway_room_4DL_0012E8 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_4DL_0012E8"
-static const ALIGN_ASSET(2) char gerudoway_room_4DL_0012E8[] = dgerudoway_room_4DL_0012E8;
-
-#define dgerudoway_room_4DL_001880 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_4DL_001880"
-static const ALIGN_ASSET(2) char gerudoway_room_4DL_001880[] = dgerudoway_room_4DL_001880;
-
-#define dgerudoway_room_4Tex_002828 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_4Tex_002828"
-static const ALIGN_ASSET(2) char gerudoway_room_4Tex_002828[] = dgerudoway_room_4Tex_002828;
-
-#define dgerudoway_room_4Tex_002028 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_4Tex_002028"
+#define dgerudoway_room_4Tex_002028 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_4Tex_002028"
 static const ALIGN_ASSET(2) char gerudoway_room_4Tex_002028[] = dgerudoway_room_4Tex_002028;
 
-#define dgerudoway_room_4DL_000D10 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_4DL_000D10"
+#define dgerudoway_room_4Tex_002828 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_4Tex_002828"
+static const ALIGN_ASSET(2) char gerudoway_room_4Tex_002828[] = dgerudoway_room_4Tex_002828;
+
+#define dgerudoway_room_4DL_001BD0 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_4DL_001BD0"
+static const ALIGN_ASSET(2) char gerudoway_room_4DL_001BD0[] = dgerudoway_room_4DL_001BD0;
+
+#define dgerudoway_room_4DL_0031A0 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_4DL_0031A0"
+static const ALIGN_ASSET(2) char gerudoway_room_4DL_0031A0[] = dgerudoway_room_4DL_0031A0;
+
+#define dgerudoway_room_4DL_001EE0 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_4DL_001EE0"
+static const ALIGN_ASSET(2) char gerudoway_room_4DL_001EE0[] = dgerudoway_room_4DL_001EE0;
+
+#define dgerudoway_room_4DL_003420 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_4DL_003420"
+static const ALIGN_ASSET(2) char gerudoway_room_4DL_003420[] = dgerudoway_room_4DL_003420;
+
+#define dgerudoway_room_4DL_0037F8 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_4DL_0037F8"
+static const ALIGN_ASSET(2) char gerudoway_room_4DL_0037F8[] = dgerudoway_room_4DL_0037F8;
+
+#define dgerudoway_room_4DL_0012E8 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_4DL_0012E8"
+static const ALIGN_ASSET(2) char gerudoway_room_4DL_0012E8[] = dgerudoway_room_4DL_0012E8;
+
+#define dgerudoway_room_4DL_001880 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_4DL_001880"
+static const ALIGN_ASSET(2) char gerudoway_room_4DL_001880[] = dgerudoway_room_4DL_001880;
+
+#define dgerudoway_room_4DL_000D10 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_4DL_000D10"
 static const ALIGN_ASSET(2) char gerudoway_room_4DL_000D10[] = dgerudoway_room_4DL_000D10;
 
 
diff --git a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_5.h b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_5.h
index 61d5121f8..8e3c6ed3c 100644
--- a/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_5.h
+++ b/soh/assets/scenes/dungeons/gerudoway/gerudoway_room_5.h
@@ -3,34 +3,34 @@
 
 #include "align_asset_macro.h"
 
-#define dgerudoway_room_5DL_002BA0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_5DL_002BA0"
-static const ALIGN_ASSET(2) char gerudoway_room_5DL_002BA0[] = dgerudoway_room_5DL_002BA0;
-
-#define dgerudoway_room_5DL_004170 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_5DL_004170"
-static const ALIGN_ASSET(2) char gerudoway_room_5DL_004170[] = dgerudoway_room_5DL_004170;
-
-#define dgerudoway_room_5DL_002EB0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_5DL_002EB0"
-static const ALIGN_ASSET(2) char gerudoway_room_5DL_002EB0[] = dgerudoway_room_5DL_002EB0;
-
-#define dgerudoway_room_5DL_0043F0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_5DL_0043F0"
-static const ALIGN_ASSET(2) char gerudoway_room_5DL_0043F0[] = dgerudoway_room_5DL_0043F0;
-
-#define dgerudoway_room_5DL_004C68 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_5DL_004C68"
-static const ALIGN_ASSET(2) char gerudoway_room_5DL_004C68[] = dgerudoway_room_5DL_004C68;
-
-#define dgerudoway_room_5DL_001DE8 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_5DL_001DE8"
-static const ALIGN_ASSET(2) char gerudoway_room_5DL_001DE8[] = dgerudoway_room_5DL_001DE8;
-
-#define dgerudoway_room_5DL_002770 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_5DL_002770"
-static const ALIGN_ASSET(2) char gerudoway_room_5DL_002770[] = dgerudoway_room_5DL_002770;
-
-#define dgerudoway_room_5Tex_002FF8 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_5Tex_002FF8"
+#define dgerudoway_room_5Tex_002FF8 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_5Tex_002FF8"
 static const ALIGN_ASSET(2) char gerudoway_room_5Tex_002FF8[] = dgerudoway_room_5Tex_002FF8;
 
-#define dgerudoway_room_5Tex_0037F8 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_5Tex_0037F8"
+#define dgerudoway_room_5Tex_0037F8 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_5Tex_0037F8"
 static const ALIGN_ASSET(2) char gerudoway_room_5Tex_0037F8[] = dgerudoway_room_5Tex_0037F8;
 
-#define dgerudoway_room_5DL_0014C0 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_room_5DL_0014C0"
+#define dgerudoway_room_5DL_002BA0 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_5DL_002BA0"
+static const ALIGN_ASSET(2) char gerudoway_room_5DL_002BA0[] = dgerudoway_room_5DL_002BA0;
+
+#define dgerudoway_room_5DL_004170 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_5DL_004170"
+static const ALIGN_ASSET(2) char gerudoway_room_5DL_004170[] = dgerudoway_room_5DL_004170;
+
+#define dgerudoway_room_5DL_002EB0 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_5DL_002EB0"
+static const ALIGN_ASSET(2) char gerudoway_room_5DL_002EB0[] = dgerudoway_room_5DL_002EB0;
+
+#define dgerudoway_room_5DL_0043F0 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_5DL_0043F0"
+static const ALIGN_ASSET(2) char gerudoway_room_5DL_0043F0[] = dgerudoway_room_5DL_0043F0;
+
+#define dgerudoway_room_5DL_004C68 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_5DL_004C68"
+static const ALIGN_ASSET(2) char gerudoway_room_5DL_004C68[] = dgerudoway_room_5DL_004C68;
+
+#define dgerudoway_room_5DL_001DE8 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_5DL_001DE8"
+static const ALIGN_ASSET(2) char gerudoway_room_5DL_001DE8[] = dgerudoway_room_5DL_001DE8;
+
+#define dgerudoway_room_5DL_002770 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_5DL_002770"
+static const ALIGN_ASSET(2) char gerudoway_room_5DL_002770[] = dgerudoway_room_5DL_002770;
+
+#define dgerudoway_room_5DL_0014C0 "__OTR__scenes/shared/gerudoway_scene/gerudoway_room_5DL_0014C0"
 static const ALIGN_ASSET(2) char gerudoway_room_5DL_0014C0[] = dgerudoway_room_5DL_0014C0;
 
 
diff --git a/soh/assets/scenes/dungeons/gerudoway/gerudoway_scene.h b/soh/assets/scenes/dungeons/gerudoway/gerudoway_scene.h
index 8c4fb7e43..c5f3e3b32 100644
--- a/soh/assets/scenes/dungeons/gerudoway/gerudoway_scene.h
+++ b/soh/assets/scenes/dungeons/gerudoway/gerudoway_scene.h
@@ -3,40 +3,41 @@
 
 #include "align_asset_macro.h"
 
-#define dgThievesHideoutNightEntranceTex "__OTR__scenes/nonmq/gerudoway_scene/gThievesHideoutNightEntranceTex"
-static const ALIGN_ASSET(2) char gThievesHideoutNightEntranceTex[] = dgThievesHideoutNightEntranceTex;
-
-#define dgThievesHideoutDayEntranceTex "__OTR__scenes/nonmq/gerudoway_scene/gThievesHideoutDayEntranceTex"
-static const ALIGN_ASSET(2) char gThievesHideoutDayEntranceTex[] = dgThievesHideoutDayEntranceTex;
-
-#define dgerudoway_sceneCollisionHeader_0074EC "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_sceneCollisionHeader_0074EC"
-static const ALIGN_ASSET(2) char gerudoway_sceneCollisionHeader_0074EC[] = dgerudoway_sceneCollisionHeader_0074EC;
-
-#define dgerudoway_sceneTex_009D20 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_sceneTex_009D20"
-static const ALIGN_ASSET(2) char gerudoway_sceneTex_009D20[] = dgerudoway_sceneTex_009D20;
-
-#define dgerudoway_sceneTex_00A920 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_sceneTex_00A920"
-static const ALIGN_ASSET(2) char gerudoway_sceneTex_00A920[] = dgerudoway_sceneTex_00A920;
-
-#define dgerudoway_sceneTex_00A520 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_sceneTex_00A520"
-static const ALIGN_ASSET(2) char gerudoway_sceneTex_00A520[] = dgerudoway_sceneTex_00A520;
-
-#define dgerudoway_sceneTex_009520 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_sceneTex_009520"
-static const ALIGN_ASSET(2) char gerudoway_sceneTex_009520[] = dgerudoway_sceneTex_009520;
-
-#define dgerudoway_sceneTex_007520 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_sceneTex_007520"
+#define dgerudoway_sceneTex_007520 "__OTR__scenes/shared/gerudoway_scene/gerudoway_sceneTex_007520"
 static const ALIGN_ASSET(2) char gerudoway_sceneTex_007520[] = dgerudoway_sceneTex_007520;
 
-#define dgerudoway_sceneTex_008520 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_sceneTex_008520"
+#define dgerudoway_sceneTex_008520 "__OTR__scenes/shared/gerudoway_scene/gerudoway_sceneTex_008520"
 static const ALIGN_ASSET(2) char gerudoway_sceneTex_008520[] = dgerudoway_sceneTex_008520;
 
-#define dgerudoway_sceneTex_008D20 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_sceneTex_008D20"
+#define dgerudoway_sceneTex_008D20 "__OTR__scenes/shared/gerudoway_scene/gerudoway_sceneTex_008D20"
 static const ALIGN_ASSET(2) char gerudoway_sceneTex_008D20[] = dgerudoway_sceneTex_008D20;
 
-#define dgerudoway_sceneTex_00D120 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_sceneTex_00D120"
-static const ALIGN_ASSET(2) char gerudoway_sceneTex_00D120[] = dgerudoway_sceneTex_00D120;
+#define dgerudoway_sceneTex_009520 "__OTR__scenes/shared/gerudoway_scene/gerudoway_sceneTex_009520"
+static const ALIGN_ASSET(2) char gerudoway_sceneTex_009520[] = dgerudoway_sceneTex_009520;
 
-#define dgerudoway_sceneTex_00C120 "__OTR__scenes/nonmq/gerudoway_scene/gerudoway_sceneTex_00C120"
+#define dgerudoway_sceneTex_009D20 "__OTR__scenes/shared/gerudoway_scene/gerudoway_sceneTex_009D20"
+static const ALIGN_ASSET(2) char gerudoway_sceneTex_009D20[] = dgerudoway_sceneTex_009D20;
+
+#define dgerudoway_sceneTex_00A520 "__OTR__scenes/shared/gerudoway_scene/gerudoway_sceneTex_00A520"
+static const ALIGN_ASSET(2) char gerudoway_sceneTex_00A520[] = dgerudoway_sceneTex_00A520;
+
+#define dgerudoway_sceneTex_00A920 "__OTR__scenes/shared/gerudoway_scene/gerudoway_sceneTex_00A920"
+static const ALIGN_ASSET(2) char gerudoway_sceneTex_00A920[] = dgerudoway_sceneTex_00A920;
+
+#define dgerudoway_sceneTex_00C120 "__OTR__scenes/shared/gerudoway_scene/gerudoway_sceneTex_00C120"
 static const ALIGN_ASSET(2) char gerudoway_sceneTex_00C120[] = dgerudoway_sceneTex_00C120;
 
+#define dgerudoway_sceneTex_00D120 "__OTR__scenes/shared/gerudoway_scene/gerudoway_sceneTex_00D120"
+static const ALIGN_ASSET(2) char gerudoway_sceneTex_00D120[] = dgerudoway_sceneTex_00D120;
+
+#define dgThievesHideoutNightEntranceTex "__OTR__scenes/shared/gerudoway_scene/gThievesHideoutNightEntranceTex"
+static const ALIGN_ASSET(2) char gThievesHideoutNightEntranceTex[] = dgThievesHideoutNightEntranceTex;
+
+#define dgThievesHideoutDayEntranceTex "__OTR__scenes/shared/gerudoway_scene/gThievesHideoutDayEntranceTex"
+static const ALIGN_ASSET(2) char gThievesHideoutDayEntranceTex[] = dgThievesHideoutDayEntranceTex;
+
+#define dgerudoway_sceneCollisionHeader_0074EC "__OTR__scenes/shared/gerudoway_scene/gerudoway_sceneCollisionHeader_0074EC"
+static const ALIGN_ASSET(2) char gerudoway_sceneCollisionHeader_0074EC[] = dgerudoway_sceneCollisionHeader_0074EC;
+
+
 #endif // DUNGEONS_GERUDOWAY_SCENE_H
diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_0.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_0.h
index 7147f7c32..a7701640a 100644
--- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_0.h
+++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_0.h
@@ -3,30 +3,30 @@
 
 #include "align_asset_macro.h"
 
-#define dice_doukutu_room_0DL_002F20 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_0DL_002F20"
-static const ALIGN_ASSET(2) char ice_doukutu_room_0DL_002F20[] = dice_doukutu_room_0DL_002F20;
-
-#define dice_doukutu_room_0Tex_005750 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_0Tex_005750"
-static const ALIGN_ASSET(2) char ice_doukutu_room_0Tex_005750[] = dice_doukutu_room_0Tex_005750;
-
-#define dice_doukutu_room_0Tex_004750 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_0Tex_004750"
-static const ALIGN_ASSET(2) char ice_doukutu_room_0Tex_004750[] = dice_doukutu_room_0Tex_004750;
+#define dice_doukutu_room_0Tex_002F50 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_0Tex_002F50"
+static const ALIGN_ASSET(2) char ice_doukutu_room_0Tex_002F50[] = dice_doukutu_room_0Tex_002F50;
 
 #define dice_doukutu_room_0Tex_003F50 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_0Tex_003F50"
 static const ALIGN_ASSET(2) char ice_doukutu_room_0Tex_003F50[] = dice_doukutu_room_0Tex_003F50;
 
-#define dice_doukutu_room_0Tex_002F50 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_0Tex_002F50"
-static const ALIGN_ASSET(2) char ice_doukutu_room_0Tex_002F50[] = dice_doukutu_room_0Tex_002F50;
+#define dice_doukutu_room_0Tex_004750 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_0Tex_004750"
+static const ALIGN_ASSET(2) char ice_doukutu_room_0Tex_004750[] = dice_doukutu_room_0Tex_004750;
+
+#define dice_doukutu_room_0Tex_005750 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_0Tex_005750"
+static const ALIGN_ASSET(2) char ice_doukutu_room_0Tex_005750[] = dice_doukutu_room_0Tex_005750;
 
 #define dice_doukutu_room_0Tex_005F50 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_0Tex_005F50"
 static const ALIGN_ASSET(2) char ice_doukutu_room_0Tex_005F50[] = dice_doukutu_room_0Tex_005F50;
 
-#define dice_doukutu_room_0DL_007660 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_0DL_007660"
-static const ALIGN_ASSET(2) char ice_doukutu_room_0DL_007660[] = dice_doukutu_room_0DL_007660;
-
 #define dice_doukutu_room_0Tex_007678 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_0Tex_007678"
 static const ALIGN_ASSET(2) char ice_doukutu_room_0Tex_007678[] = dice_doukutu_room_0Tex_007678;
 
+#define dice_doukutu_room_0DL_002F20 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_0DL_002F20"
+static const ALIGN_ASSET(2) char ice_doukutu_room_0DL_002F20[] = dice_doukutu_room_0DL_002F20;
+
+#define dice_doukutu_room_0DL_007660 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_0DL_007660"
+static const ALIGN_ASSET(2) char ice_doukutu_room_0DL_007660[] = dice_doukutu_room_0DL_007660;
+
 #define dice_doukutu_room_0Set_000100DL_002F20 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_0Set_000100DL_002F20"
 static const ALIGN_ASSET(2) char ice_doukutu_room_0Set_000100DL_002F20[] = dice_doukutu_room_0Set_000100DL_002F20;
 
diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_1.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_1.h
index 4a4b3b00c..5eec36392 100644
--- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_1.h
+++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_1.h
@@ -3,41 +3,41 @@
 
 #include "align_asset_macro.h"
 
-#define dice_doukutu_room_1DL_0040D8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1DL_0040D8"
-static const ALIGN_ASSET(2) char ice_doukutu_room_1DL_0040D8[] = dice_doukutu_room_1DL_0040D8;
-
 #define dice_doukutu_room_1Tex_004110 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1Tex_004110"
 static const ALIGN_ASSET(2) char ice_doukutu_room_1Tex_004110[] = dice_doukutu_room_1Tex_004110;
 
-#define dice_doukutu_room_1Tex_006910 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1Tex_006910"
-static const ALIGN_ASSET(2) char ice_doukutu_room_1Tex_006910[] = dice_doukutu_room_1Tex_006910;
-
-#define dice_doukutu_room_1Tex_005910 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1Tex_005910"
-static const ALIGN_ASSET(2) char ice_doukutu_room_1Tex_005910[] = dice_doukutu_room_1Tex_005910;
-
 #define dice_doukutu_room_1Tex_005110 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1Tex_005110"
 static const ALIGN_ASSET(2) char ice_doukutu_room_1Tex_005110[] = dice_doukutu_room_1Tex_005110;
 
-#define dice_doukutu_room_1Tex_008110 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1Tex_008110"
-static const ALIGN_ASSET(2) char ice_doukutu_room_1Tex_008110[] = dice_doukutu_room_1Tex_008110;
+#define dice_doukutu_room_1Tex_005910 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1Tex_005910"
+static const ALIGN_ASSET(2) char ice_doukutu_room_1Tex_005910[] = dice_doukutu_room_1Tex_005910;
+
+#define dice_doukutu_room_1Tex_006910 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1Tex_006910"
+static const ALIGN_ASSET(2) char ice_doukutu_room_1Tex_006910[] = dice_doukutu_room_1Tex_006910;
 
 #define dice_doukutu_room_1Tex_007110 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1Tex_007110"
 static const ALIGN_ASSET(2) char ice_doukutu_room_1Tex_007110[] = dice_doukutu_room_1Tex_007110;
 
+#define dice_doukutu_room_1Tex_008110 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1Tex_008110"
+static const ALIGN_ASSET(2) char ice_doukutu_room_1Tex_008110[] = dice_doukutu_room_1Tex_008110;
+
 #define dice_doukutu_room_1Tex_009110 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1Tex_009110"
 static const ALIGN_ASSET(2) char ice_doukutu_room_1Tex_009110[] = dice_doukutu_room_1Tex_009110;
 
-#define dice_doukutu_room_1DL_00AB10 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1DL_00AB10"
-static const ALIGN_ASSET(2) char ice_doukutu_room_1DL_00AB10[] = dice_doukutu_room_1DL_00AB10;
-
 #define dice_doukutu_room_1Tex_00AB30 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1Tex_00AB30"
 static const ALIGN_ASSET(2) char ice_doukutu_room_1Tex_00AB30[] = dice_doukutu_room_1Tex_00AB30;
 
+#define dice_doukutu_room_1Tex_00BB30 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1Tex_00BB30"
+static const ALIGN_ASSET(2) char ice_doukutu_room_1Tex_00BB30[] = dice_doukutu_room_1Tex_00BB30;
+
 #define dice_doukutu_room_1Tex_00BD30 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1Tex_00BD30"
 static const ALIGN_ASSET(2) char ice_doukutu_room_1Tex_00BD30[] = dice_doukutu_room_1Tex_00BD30;
 
-#define dice_doukutu_room_1Tex_00BB30 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1Tex_00BB30"
-static const ALIGN_ASSET(2) char ice_doukutu_room_1Tex_00BB30[] = dice_doukutu_room_1Tex_00BB30;
+#define dice_doukutu_room_1DL_0040D8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1DL_0040D8"
+static const ALIGN_ASSET(2) char ice_doukutu_room_1DL_0040D8[] = dice_doukutu_room_1DL_0040D8;
+
+#define dice_doukutu_room_1DL_00AB10 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1DL_00AB10"
+static const ALIGN_ASSET(2) char ice_doukutu_room_1DL_00AB10[] = dice_doukutu_room_1DL_00AB10;
 
 #define dice_doukutu_room_1Set_000160DL_0040D8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_1Set_000160DL_0040D8"
 static const ALIGN_ASSET(2) char ice_doukutu_room_1Set_000160DL_0040D8[] = dice_doukutu_room_1Set_000160DL_0040D8;
diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_10.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_10.h
index 71d2a6df2..55bfe89ee 100644
--- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_10.h
+++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_10.h
@@ -3,21 +3,21 @@
 
 #include "align_asset_macro.h"
 
-#define dice_doukutu_room_10DL_0019F8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_10DL_0019F8"
-static const ALIGN_ASSET(2) char ice_doukutu_room_10DL_0019F8[] = dice_doukutu_room_10DL_0019F8;
-
 #define dice_doukutu_room_10Tex_001A28 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_10Tex_001A28"
 static const ALIGN_ASSET(2) char ice_doukutu_room_10Tex_001A28[] = dice_doukutu_room_10Tex_001A28;
 
 #define dice_doukutu_room_10Tex_002A28 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_10Tex_002A28"
 static const ALIGN_ASSET(2) char ice_doukutu_room_10Tex_002A28[] = dice_doukutu_room_10Tex_002A28;
 
-#define dice_doukutu_room_10DL_003BC8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_10DL_003BC8"
-static const ALIGN_ASSET(2) char ice_doukutu_room_10DL_003BC8[] = dice_doukutu_room_10DL_003BC8;
-
 #define dice_doukutu_room_10Tex_003BD8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_10Tex_003BD8"
 static const ALIGN_ASSET(2) char ice_doukutu_room_10Tex_003BD8[] = dice_doukutu_room_10Tex_003BD8;
 
+#define dice_doukutu_room_10DL_0019F8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_10DL_0019F8"
+static const ALIGN_ASSET(2) char ice_doukutu_room_10DL_0019F8[] = dice_doukutu_room_10DL_0019F8;
+
+#define dice_doukutu_room_10DL_003BC8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_10DL_003BC8"
+static const ALIGN_ASSET(2) char ice_doukutu_room_10DL_003BC8[] = dice_doukutu_room_10DL_003BC8;
+
 #define dice_doukutu_room_10Set_000090DL_0019F8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_10Set_000090DL_0019F8"
 static const ALIGN_ASSET(2) char ice_doukutu_room_10Set_000090DL_0019F8[] = dice_doukutu_room_10Set_000090DL_0019F8;
 
diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_11.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_11.h
index 1238986e9..067303c85 100644
--- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_11.h
+++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_11.h
@@ -3,24 +3,24 @@
 
 #include "align_asset_macro.h"
 
-#define dice_doukutu_room_11DL_0028F8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_11DL_0028F8"
-static const ALIGN_ASSET(2) char ice_doukutu_room_11DL_0028F8[] = dice_doukutu_room_11DL_0028F8;
-
 #define dice_doukutu_room_11Tex_002928 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_11Tex_002928"
 static const ALIGN_ASSET(2) char ice_doukutu_room_11Tex_002928[] = dice_doukutu_room_11Tex_002928;
 
-#define dice_doukutu_room_11Tex_003928 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_11Tex_003928"
-static const ALIGN_ASSET(2) char ice_doukutu_room_11Tex_003928[] = dice_doukutu_room_11Tex_003928;
-
 #define dice_doukutu_room_11Tex_003128 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_11Tex_003128"
 static const ALIGN_ASSET(2) char ice_doukutu_room_11Tex_003128[] = dice_doukutu_room_11Tex_003128;
 
-#define dice_doukutu_room_11DL_004838 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_11DL_004838"
-static const ALIGN_ASSET(2) char ice_doukutu_room_11DL_004838[] = dice_doukutu_room_11DL_004838;
+#define dice_doukutu_room_11Tex_003928 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_11Tex_003928"
+static const ALIGN_ASSET(2) char ice_doukutu_room_11Tex_003928[] = dice_doukutu_room_11Tex_003928;
 
 #define dice_doukutu_room_11Tex_004848 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_11Tex_004848"
 static const ALIGN_ASSET(2) char ice_doukutu_room_11Tex_004848[] = dice_doukutu_room_11Tex_004848;
 
+#define dice_doukutu_room_11DL_0028F8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_11DL_0028F8"
+static const ALIGN_ASSET(2) char ice_doukutu_room_11DL_0028F8[] = dice_doukutu_room_11DL_0028F8;
+
+#define dice_doukutu_room_11DL_004838 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_11DL_004838"
+static const ALIGN_ASSET(2) char ice_doukutu_room_11DL_004838[] = dice_doukutu_room_11DL_004838;
+
 #define dice_doukutu_room_11Set_0001B0DL_0028F8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_11Set_0001B0DL_0028F8"
 static const ALIGN_ASSET(2) char ice_doukutu_room_11Set_0001B0DL_0028F8[] = dice_doukutu_room_11Set_0001B0DL_0028F8;
 
diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_2.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_2.h
index 7bc990964..e6207e499 100644
--- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_2.h
+++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_2.h
@@ -3,24 +3,24 @@
 
 #include "align_asset_macro.h"
 
-#define dice_doukutu_room_2DL_001700 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_2DL_001700"
-static const ALIGN_ASSET(2) char ice_doukutu_room_2DL_001700[] = dice_doukutu_room_2DL_001700;
-
 #define dice_doukutu_room_2Tex_001730 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_2Tex_001730"
 static const ALIGN_ASSET(2) char ice_doukutu_room_2Tex_001730[] = dice_doukutu_room_2Tex_001730;
 
 #define dice_doukutu_room_2Tex_002730 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_2Tex_002730"
 static const ALIGN_ASSET(2) char ice_doukutu_room_2Tex_002730[] = dice_doukutu_room_2Tex_002730;
 
-#define dice_doukutu_room_2DL_003AD8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_2DL_003AD8"
-static const ALIGN_ASSET(2) char ice_doukutu_room_2DL_003AD8[] = dice_doukutu_room_2DL_003AD8;
-
 #define dice_doukutu_room_2Tex_003AF8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_2Tex_003AF8"
 static const ALIGN_ASSET(2) char ice_doukutu_room_2Tex_003AF8[] = dice_doukutu_room_2Tex_003AF8;
 
 #define dice_doukutu_room_2Tex_004AF8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_2Tex_004AF8"
 static const ALIGN_ASSET(2) char ice_doukutu_room_2Tex_004AF8[] = dice_doukutu_room_2Tex_004AF8;
 
+#define dice_doukutu_room_2DL_001700 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_2DL_001700"
+static const ALIGN_ASSET(2) char ice_doukutu_room_2DL_001700[] = dice_doukutu_room_2DL_001700;
+
+#define dice_doukutu_room_2DL_003AD8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_2DL_003AD8"
+static const ALIGN_ASSET(2) char ice_doukutu_room_2DL_003AD8[] = dice_doukutu_room_2DL_003AD8;
+
 #define dice_doukutu_room_2Set_000100DL_001700 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_2Set_000100DL_001700"
 static const ALIGN_ASSET(2) char ice_doukutu_room_2Set_000100DL_001700[] = dice_doukutu_room_2Set_000100DL_001700;
 
diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_3.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_3.h
index 28ae55028..05e30d376 100644
--- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_3.h
+++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_3.h
@@ -3,20 +3,11 @@
 
 #include "align_asset_macro.h"
 
-#define dice_doukutu_room_3DL_0031D8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_3DL_0031D8"
-static const ALIGN_ASSET(2) char ice_doukutu_room_3DL_0031D8[] = dice_doukutu_room_3DL_0031D8;
-
-#define dice_doukutu_room_3Tex_003A08 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_3Tex_003A08"
-static const ALIGN_ASSET(2) char ice_doukutu_room_3Tex_003A08[] = dice_doukutu_room_3Tex_003A08;
-
 #define dice_doukutu_room_3Tex_003208 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_3Tex_003208"
 static const ALIGN_ASSET(2) char ice_doukutu_room_3Tex_003208[] = dice_doukutu_room_3Tex_003208;
 
-#define dice_doukutu_room_3DL_005070 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_3DL_005070"
-static const ALIGN_ASSET(2) char ice_doukutu_room_3DL_005070[] = dice_doukutu_room_3DL_005070;
-
-#define dice_doukutu_room_3Tex_007090 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_3Tex_007090"
-static const ALIGN_ASSET(2) char ice_doukutu_room_3Tex_007090[] = dice_doukutu_room_3Tex_007090;
+#define dice_doukutu_room_3Tex_003A08 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_3Tex_003A08"
+static const ALIGN_ASSET(2) char ice_doukutu_room_3Tex_003A08[] = dice_doukutu_room_3Tex_003A08;
 
 #define dice_doukutu_room_3Tex_005090 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_3Tex_005090"
 static const ALIGN_ASSET(2) char ice_doukutu_room_3Tex_005090[] = dice_doukutu_room_3Tex_005090;
@@ -24,6 +15,15 @@ static const ALIGN_ASSET(2) char ice_doukutu_room_3Tex_005090[] = dice_doukutu_r
 #define dice_doukutu_room_3Tex_006090 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_3Tex_006090"
 static const ALIGN_ASSET(2) char ice_doukutu_room_3Tex_006090[] = dice_doukutu_room_3Tex_006090;
 
+#define dice_doukutu_room_3Tex_007090 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_3Tex_007090"
+static const ALIGN_ASSET(2) char ice_doukutu_room_3Tex_007090[] = dice_doukutu_room_3Tex_007090;
+
+#define dice_doukutu_room_3DL_0031D8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_3DL_0031D8"
+static const ALIGN_ASSET(2) char ice_doukutu_room_3DL_0031D8[] = dice_doukutu_room_3DL_0031D8;
+
+#define dice_doukutu_room_3DL_005070 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_3DL_005070"
+static const ALIGN_ASSET(2) char ice_doukutu_room_3DL_005070[] = dice_doukutu_room_3DL_005070;
+
 #define dice_doukutu_room_3Set_0001D0DL_0031D8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_3Set_0001D0DL_0031D8"
 static const ALIGN_ASSET(2) char ice_doukutu_room_3Set_0001D0DL_0031D8[] = dice_doukutu_room_3Set_0001D0DL_0031D8;
 
diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_4.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_4.h
index c9f1badc9..d40198b48 100644
--- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_4.h
+++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_4.h
@@ -3,30 +3,30 @@
 
 #include "align_asset_macro.h"
 
-#define dice_doukutu_room_4DL_0028B8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_4DL_0028B8"
-static const ALIGN_ASSET(2) char ice_doukutu_room_4DL_0028B8[] = dice_doukutu_room_4DL_0028B8;
-
 #define dice_doukutu_room_4Tex_0028E0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_4Tex_0028E0"
 static const ALIGN_ASSET(2) char ice_doukutu_room_4Tex_0028E0[] = dice_doukutu_room_4Tex_0028E0;
 
-#define dice_doukutu_room_4Tex_0038E0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_4Tex_0038E0"
-static const ALIGN_ASSET(2) char ice_doukutu_room_4Tex_0038E0[] = dice_doukutu_room_4Tex_0038E0;
-
 #define dice_doukutu_room_4Tex_0030E0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_4Tex_0030E0"
 static const ALIGN_ASSET(2) char ice_doukutu_room_4Tex_0030E0[] = dice_doukutu_room_4Tex_0030E0;
 
-#define dice_doukutu_room_4DL_004638 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_4DL_004638"
-static const ALIGN_ASSET(2) char ice_doukutu_room_4DL_004638[] = dice_doukutu_room_4DL_004638;
-
-#define dice_doukutu_room_4Tex_005650 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_4Tex_005650"
-static const ALIGN_ASSET(2) char ice_doukutu_room_4Tex_005650[] = dice_doukutu_room_4Tex_005650;
+#define dice_doukutu_room_4Tex_0038E0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_4Tex_0038E0"
+static const ALIGN_ASSET(2) char ice_doukutu_room_4Tex_0038E0[] = dice_doukutu_room_4Tex_0038E0;
 
 #define dice_doukutu_room_4Tex_004650 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_4Tex_004650"
 static const ALIGN_ASSET(2) char ice_doukutu_room_4Tex_004650[] = dice_doukutu_room_4Tex_004650;
 
+#define dice_doukutu_room_4Tex_005650 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_4Tex_005650"
+static const ALIGN_ASSET(2) char ice_doukutu_room_4Tex_005650[] = dice_doukutu_room_4Tex_005650;
+
 #define dice_doukutu_room_4Tex_006650 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_4Tex_006650"
 static const ALIGN_ASSET(2) char ice_doukutu_room_4Tex_006650[] = dice_doukutu_room_4Tex_006650;
 
+#define dice_doukutu_room_4DL_0028B8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_4DL_0028B8"
+static const ALIGN_ASSET(2) char ice_doukutu_room_4DL_0028B8[] = dice_doukutu_room_4DL_0028B8;
+
+#define dice_doukutu_room_4DL_004638 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_4DL_004638"
+static const ALIGN_ASSET(2) char ice_doukutu_room_4DL_004638[] = dice_doukutu_room_4DL_004638;
+
 #define dice_doukutu_room_4Set_0000F0DL_0028B8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_4Set_0000F0DL_0028B8"
 static const ALIGN_ASSET(2) char ice_doukutu_room_4Set_0000F0DL_0028B8[] = dice_doukutu_room_4Set_0000F0DL_0028B8;
 
diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_5.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_5.h
index f0388b36f..613916c9b 100644
--- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_5.h
+++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_5.h
@@ -3,23 +3,17 @@
 
 #include "align_asset_macro.h"
 
-#define dice_doukutu_room_5DL_004618 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_5DL_004618"
-static const ALIGN_ASSET(2) char ice_doukutu_room_5DL_004618[] = dice_doukutu_room_5DL_004618;
-
 #define dice_doukutu_room_5Tex_004648 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_5Tex_004648"
 static const ALIGN_ASSET(2) char ice_doukutu_room_5Tex_004648[] = dice_doukutu_room_5Tex_004648;
 
-#define dice_doukutu_room_5Tex_006648 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_5Tex_006648"
-static const ALIGN_ASSET(2) char ice_doukutu_room_5Tex_006648[] = dice_doukutu_room_5Tex_006648;
-
 #define dice_doukutu_room_5Tex_005648 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_5Tex_005648"
 static const ALIGN_ASSET(2) char ice_doukutu_room_5Tex_005648[] = dice_doukutu_room_5Tex_005648;
 
 #define dice_doukutu_room_5Tex_005E48 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_5Tex_005E48"
 static const ALIGN_ASSET(2) char ice_doukutu_room_5Tex_005E48[] = dice_doukutu_room_5Tex_005E48;
 
-#define dice_doukutu_room_5DL_007460 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_5DL_007460"
-static const ALIGN_ASSET(2) char ice_doukutu_room_5DL_007460[] = dice_doukutu_room_5DL_007460;
+#define dice_doukutu_room_5Tex_006648 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_5Tex_006648"
+static const ALIGN_ASSET(2) char ice_doukutu_room_5Tex_006648[] = dice_doukutu_room_5Tex_006648;
 
 #define dice_doukutu_room_5Tex_007478 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_5Tex_007478"
 static const ALIGN_ASSET(2) char ice_doukutu_room_5Tex_007478[] = dice_doukutu_room_5Tex_007478;
@@ -27,6 +21,12 @@ static const ALIGN_ASSET(2) char ice_doukutu_room_5Tex_007478[] = dice_doukutu_r
 #define dice_doukutu_room_5Tex_007878 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_5Tex_007878"
 static const ALIGN_ASSET(2) char ice_doukutu_room_5Tex_007878[] = dice_doukutu_room_5Tex_007878;
 
+#define dice_doukutu_room_5DL_004618 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_5DL_004618"
+static const ALIGN_ASSET(2) char ice_doukutu_room_5DL_004618[] = dice_doukutu_room_5DL_004618;
+
+#define dice_doukutu_room_5DL_007460 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_5DL_007460"
+static const ALIGN_ASSET(2) char ice_doukutu_room_5DL_007460[] = dice_doukutu_room_5DL_007460;
+
 #define dice_doukutu_room_5Set_0001C0DL_004618 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_5Set_0001C0DL_004618"
 static const ALIGN_ASSET(2) char ice_doukutu_room_5Set_0001C0DL_004618[] = dice_doukutu_room_5Set_0001C0DL_004618;
 
diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_6.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_6.h
index 7f0f897e4..4ad43b0ad 100644
--- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_6.h
+++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_6.h
@@ -3,14 +3,14 @@
 
 #include "align_asset_macro.h"
 
-#define dice_doukutu_room_6DL_002980 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_6DL_002980"
-static const ALIGN_ASSET(2) char ice_doukutu_room_6DL_002980[] = dice_doukutu_room_6DL_002980;
+#define dice_doukutu_room_6Tex_0029B0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_6Tex_0029B0"
+static const ALIGN_ASSET(2) char ice_doukutu_room_6Tex_0029B0[] = dice_doukutu_room_6Tex_0029B0;
 
 #define dice_doukutu_room_6Tex_0039B0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_6Tex_0039B0"
 static const ALIGN_ASSET(2) char ice_doukutu_room_6Tex_0039B0[] = dice_doukutu_room_6Tex_0039B0;
 
-#define dice_doukutu_room_6Tex_0029B0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_6Tex_0029B0"
-static const ALIGN_ASSET(2) char ice_doukutu_room_6Tex_0029B0[] = dice_doukutu_room_6Tex_0029B0;
+#define dice_doukutu_room_6DL_002980 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_6DL_002980"
+static const ALIGN_ASSET(2) char ice_doukutu_room_6DL_002980[] = dice_doukutu_room_6DL_002980;
 
 #define dice_doukutu_room_6Set_000110DL_002980 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_6Set_000110DL_002980"
 static const ALIGN_ASSET(2) char ice_doukutu_room_6Set_000110DL_002980[] = dice_doukutu_room_6Set_000110DL_002980;
diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_7.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_7.h
index f11032e37..c089cbb75 100644
--- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_7.h
+++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_7.h
@@ -3,21 +3,21 @@
 
 #include "align_asset_macro.h"
 
-#define dice_doukutu_room_7DL_001730 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_7DL_001730"
-static const ALIGN_ASSET(2) char ice_doukutu_room_7DL_001730[] = dice_doukutu_room_7DL_001730;
-
 #define dice_doukutu_room_7Tex_001758 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_7Tex_001758"
 static const ALIGN_ASSET(2) char ice_doukutu_room_7Tex_001758[] = dice_doukutu_room_7Tex_001758;
 
-#define dice_doukutu_room_7DL_0040A8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_7DL_0040A8"
-static const ALIGN_ASSET(2) char ice_doukutu_room_7DL_0040A8[] = dice_doukutu_room_7DL_0040A8;
-
 #define dice_doukutu_room_7Tex_0040E8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_7Tex_0040E8"
 static const ALIGN_ASSET(2) char ice_doukutu_room_7Tex_0040E8[] = dice_doukutu_room_7Tex_0040E8;
 
 #define dice_doukutu_room_7Tex_0050E8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_7Tex_0050E8"
 static const ALIGN_ASSET(2) char ice_doukutu_room_7Tex_0050E8[] = dice_doukutu_room_7Tex_0050E8;
 
+#define dice_doukutu_room_7DL_001730 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_7DL_001730"
+static const ALIGN_ASSET(2) char ice_doukutu_room_7DL_001730[] = dice_doukutu_room_7DL_001730;
+
+#define dice_doukutu_room_7DL_0040A8 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_7DL_0040A8"
+static const ALIGN_ASSET(2) char ice_doukutu_room_7DL_0040A8[] = dice_doukutu_room_7DL_0040A8;
+
 #define dice_doukutu_room_7Set_0000D0DL_001730 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_7Set_0000D0DL_001730"
 static const ALIGN_ASSET(2) char ice_doukutu_room_7Set_0000D0DL_001730[] = dice_doukutu_room_7Set_0000D0DL_001730;
 
diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_9.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_9.h
index 7a106f565..717ba4885 100644
--- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_9.h
+++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_9.h
@@ -3,30 +3,30 @@
 
 #include "align_asset_macro.h"
 
-#define dice_doukutu_room_9DL_004468 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_9DL_004468"
-static const ALIGN_ASSET(2) char ice_doukutu_room_9DL_004468[] = dice_doukutu_room_9DL_004468;
-
-#define dice_doukutu_room_9Tex_005CA0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_9Tex_005CA0"
-static const ALIGN_ASSET(2) char ice_doukutu_room_9Tex_005CA0[] = dice_doukutu_room_9Tex_005CA0;
-
-#define dice_doukutu_room_9Tex_006CA0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_9Tex_006CA0"
-static const ALIGN_ASSET(2) char ice_doukutu_room_9Tex_006CA0[] = dice_doukutu_room_9Tex_006CA0;
-
 #define dice_doukutu_room_9Tex_0044A0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_9Tex_0044A0"
 static const ALIGN_ASSET(2) char ice_doukutu_room_9Tex_0044A0[] = dice_doukutu_room_9Tex_0044A0;
 
 #define dice_doukutu_room_9Tex_0054A0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_9Tex_0054A0"
 static const ALIGN_ASSET(2) char ice_doukutu_room_9Tex_0054A0[] = dice_doukutu_room_9Tex_0054A0;
 
+#define dice_doukutu_room_9Tex_005CA0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_9Tex_005CA0"
+static const ALIGN_ASSET(2) char ice_doukutu_room_9Tex_005CA0[] = dice_doukutu_room_9Tex_005CA0;
+
 #define dice_doukutu_room_9Tex_0064A0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_9Tex_0064A0"
 static const ALIGN_ASSET(2) char ice_doukutu_room_9Tex_0064A0[] = dice_doukutu_room_9Tex_0064A0;
 
-#define dice_doukutu_room_9DL_007680 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_9DL_007680"
-static const ALIGN_ASSET(2) char ice_doukutu_room_9DL_007680[] = dice_doukutu_room_9DL_007680;
+#define dice_doukutu_room_9Tex_006CA0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_9Tex_006CA0"
+static const ALIGN_ASSET(2) char ice_doukutu_room_9Tex_006CA0[] = dice_doukutu_room_9Tex_006CA0;
 
 #define dice_doukutu_room_9Tex_007690 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_9Tex_007690"
 static const ALIGN_ASSET(2) char ice_doukutu_room_9Tex_007690[] = dice_doukutu_room_9Tex_007690;
 
+#define dice_doukutu_room_9DL_004468 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_9DL_004468"
+static const ALIGN_ASSET(2) char ice_doukutu_room_9DL_004468[] = dice_doukutu_room_9DL_004468;
+
+#define dice_doukutu_room_9DL_007680 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_9DL_007680"
+static const ALIGN_ASSET(2) char ice_doukutu_room_9DL_007680[] = dice_doukutu_room_9DL_007680;
+
 #define dice_doukutu_room_9Set_0001D0DL_004468 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_room_9Set_0001D0DL_004468"
 static const ALIGN_ASSET(2) char ice_doukutu_room_9Set_0001D0DL_004468[] = dice_doukutu_room_9Set_0001D0DL_004468;
 
diff --git a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_scene.h b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_scene.h
index e012f232e..37b5d5bca 100644
--- a/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_scene.h
+++ b/soh/assets/scenes/dungeons/ice_doukutu/ice_doukutu_scene.h
@@ -3,6 +3,24 @@
 
 #include "align_asset_macro.h"
 
+#define dice_doukutu_sceneTex_00FCC0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_sceneTex_00FCC0"
+static const ALIGN_ASSET(2) char ice_doukutu_sceneTex_00FCC0[] = dice_doukutu_sceneTex_00FCC0;
+
+#define dice_doukutu_sceneTex_0100C0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_sceneTex_0100C0"
+static const ALIGN_ASSET(2) char ice_doukutu_sceneTex_0100C0[] = dice_doukutu_sceneTex_0100C0;
+
+#define dice_doukutu_sceneTex_0108C0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_sceneTex_0108C0"
+static const ALIGN_ASSET(2) char ice_doukutu_sceneTex_0108C0[] = dice_doukutu_sceneTex_0108C0;
+
+#define dice_doukutu_sceneTex_010AC0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_sceneTex_010AC0"
+static const ALIGN_ASSET(2) char ice_doukutu_sceneTex_010AC0[] = dice_doukutu_sceneTex_010AC0;
+
+#define dice_doukutu_sceneTex_010EC0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_sceneTex_010EC0"
+static const ALIGN_ASSET(2) char ice_doukutu_sceneTex_010EC0[] = dice_doukutu_sceneTex_010EC0;
+
+#define dice_doukutu_sceneTLUT_00F8A0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_sceneTLUT_00F8A0"
+static const ALIGN_ASSET(2) char ice_doukutu_sceneTLUT_00F8A0[] = dice_doukutu_sceneTLUT_00F8A0;
+
 #define dgIceCavernSerenadeCs "__OTR__scenes/nonmq/ice_doukutu_scene/gIceCavernSerenadeCs"
 static const ALIGN_ASSET(2) char gIceCavernSerenadeCs[] = dgIceCavernSerenadeCs;
 
@@ -15,24 +33,6 @@ static const ALIGN_ASSET(2) char gIceCavernDayEntranceTex[] = dgIceCavernDayEntr
 #define dice_doukutu_sceneCollisionHeader_00F668 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_sceneCollisionHeader_00F668"
 static const ALIGN_ASSET(2) char ice_doukutu_sceneCollisionHeader_00F668[] = dice_doukutu_sceneCollisionHeader_00F668;
 
-#define dice_doukutu_sceneTex_010AC0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_sceneTex_010AC0"
-static const ALIGN_ASSET(2) char ice_doukutu_sceneTex_010AC0[] = dice_doukutu_sceneTex_010AC0;
-
-#define dice_doukutu_sceneTex_00FCC0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_sceneTex_00FCC0"
-static const ALIGN_ASSET(2) char ice_doukutu_sceneTex_00FCC0[] = dice_doukutu_sceneTex_00FCC0;
-
-#define dice_doukutu_sceneTex_0100C0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_sceneTex_0100C0"
-static const ALIGN_ASSET(2) char ice_doukutu_sceneTex_0100C0[] = dice_doukutu_sceneTex_0100C0;
-
-#define dice_doukutu_sceneTex_0108C0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_sceneTex_0108C0"
-static const ALIGN_ASSET(2) char ice_doukutu_sceneTex_0108C0[] = dice_doukutu_sceneTex_0108C0;
-
-#define dice_doukutu_sceneTex_010EC0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_sceneTex_010EC0"
-static const ALIGN_ASSET(2) char ice_doukutu_sceneTex_010EC0[] = dice_doukutu_sceneTex_010EC0;
-
-#define dice_doukutu_sceneTLUT_00F8A0 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_sceneTLUT_00F8A0"
-static const ALIGN_ASSET(2) char ice_doukutu_sceneTLUT_00F8A0[] = dice_doukutu_sceneTLUT_00F8A0;
-
 #define dice_doukutu_sceneCollisionHeader_00F668 "__OTR__scenes/nonmq/ice_doukutu_scene/ice_doukutu_sceneCollisionHeader_00F668"
 
 
diff --git a/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_0.h b/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_0.h
index eb4913db8..804cb8980 100644
--- a/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_0.h
+++ b/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_0.h
@@ -3,19 +3,19 @@
 
 #include "align_asset_macro.h"
 
-#define djyasinboss_room_0DL_0007B0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_0DL_0007B0"
-static const ALIGN_ASSET(2) char jyasinboss_room_0DL_0007B0[] = djyasinboss_room_0DL_0007B0;
-
-#define djyasinboss_room_0Tex_0007C8 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_0Tex_0007C8"
+#define djyasinboss_room_0Tex_0007C8 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_0Tex_0007C8"
 static const ALIGN_ASSET(2) char jyasinboss_room_0Tex_0007C8[] = djyasinboss_room_0Tex_0007C8;
 
-#define djyasinboss_room_0Set_000080DL_0007B0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_0Set_000080DL_0007B0"
+#define djyasinboss_room_0DL_0007B0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_0DL_0007B0"
+static const ALIGN_ASSET(2) char jyasinboss_room_0DL_0007B0[] = djyasinboss_room_0DL_0007B0;
+
+#define djyasinboss_room_0Set_000080DL_0007B0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_0Set_000080DL_0007B0"
 static const ALIGN_ASSET(2) char jyasinboss_room_0Set_000080DL_0007B0[] = djyasinboss_room_0Set_000080DL_0007B0;
 
-#define djyasinboss_room_0Set_0000C0DL_0007B0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_0Set_0000C0DL_0007B0"
+#define djyasinboss_room_0Set_0000C0DL_0007B0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_0Set_0000C0DL_0007B0"
 static const ALIGN_ASSET(2) char jyasinboss_room_0Set_0000C0DL_0007B0[] = djyasinboss_room_0Set_0000C0DL_0007B0;
 
-#define djyasinboss_room_0Set_000100DL_0007B0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_0Set_000100DL_0007B0"
+#define djyasinboss_room_0Set_000100DL_0007B0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_0Set_000100DL_0007B0"
 static const ALIGN_ASSET(2) char jyasinboss_room_0Set_000100DL_0007B0[] = djyasinboss_room_0Set_000100DL_0007B0;
 
 
diff --git a/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_1.h b/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_1.h
index 54aa427bf..2ff5ed5a3 100644
--- a/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_1.h
+++ b/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_1.h
@@ -3,40 +3,40 @@
 
 #include "align_asset_macro.h"
 
-#define djyasinboss_room_1DL_002DD0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_1DL_002DD0"
-static const ALIGN_ASSET(2) char jyasinboss_room_1DL_002DD0[] = djyasinboss_room_1DL_002DD0;
-
-#define djyasinboss_room_1Tex_006638 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_1Tex_006638"
-static const ALIGN_ASSET(2) char jyasinboss_room_1Tex_006638[] = djyasinboss_room_1Tex_006638;
-
-#define djyasinboss_room_1Tex_007638 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_1Tex_007638"
-static const ALIGN_ASSET(2) char jyasinboss_room_1Tex_007638[] = djyasinboss_room_1Tex_007638;
-
-#define djyasinboss_room_1Tex_002E38 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_1Tex_002E38"
+#define djyasinboss_room_1Tex_002E38 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_1Tex_002E38"
 static const ALIGN_ASSET(2) char jyasinboss_room_1Tex_002E38[] = djyasinboss_room_1Tex_002E38;
 
-#define djyasinboss_room_1Tex_006E38 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_1Tex_006E38"
-static const ALIGN_ASSET(2) char jyasinboss_room_1Tex_006E38[] = djyasinboss_room_1Tex_006E38;
-
-#define djyasinboss_room_1TLUT_002E18 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_1TLUT_002E18"
-static const ALIGN_ASSET(2) char jyasinboss_room_1TLUT_002E18[] = djyasinboss_room_1TLUT_002E18;
-
-#define djyasinboss_room_1Tex_005638 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_1Tex_005638"
-static const ALIGN_ASSET(2) char jyasinboss_room_1Tex_005638[] = djyasinboss_room_1Tex_005638;
-
-#define djyasinboss_room_1Tex_004E38 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_1Tex_004E38"
-static const ALIGN_ASSET(2) char jyasinboss_room_1Tex_004E38[] = djyasinboss_room_1Tex_004E38;
-
-#define djyasinboss_room_1Tex_003E38 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_1Tex_003E38"
+#define djyasinboss_room_1Tex_003E38 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_1Tex_003E38"
 static const ALIGN_ASSET(2) char jyasinboss_room_1Tex_003E38[] = djyasinboss_room_1Tex_003E38;
 
-#define djyasinboss_room_1Set_0001B0DL_002DD0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_1Set_0001B0DL_002DD0"
+#define djyasinboss_room_1Tex_004E38 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_1Tex_004E38"
+static const ALIGN_ASSET(2) char jyasinboss_room_1Tex_004E38[] = djyasinboss_room_1Tex_004E38;
+
+#define djyasinboss_room_1Tex_005638 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_1Tex_005638"
+static const ALIGN_ASSET(2) char jyasinboss_room_1Tex_005638[] = djyasinboss_room_1Tex_005638;
+
+#define djyasinboss_room_1Tex_006638 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_1Tex_006638"
+static const ALIGN_ASSET(2) char jyasinboss_room_1Tex_006638[] = djyasinboss_room_1Tex_006638;
+
+#define djyasinboss_room_1Tex_006E38 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_1Tex_006E38"
+static const ALIGN_ASSET(2) char jyasinboss_room_1Tex_006E38[] = djyasinboss_room_1Tex_006E38;
+
+#define djyasinboss_room_1Tex_007638 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_1Tex_007638"
+static const ALIGN_ASSET(2) char jyasinboss_room_1Tex_007638[] = djyasinboss_room_1Tex_007638;
+
+#define djyasinboss_room_1TLUT_002E18 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_1TLUT_002E18"
+static const ALIGN_ASSET(2) char jyasinboss_room_1TLUT_002E18[] = djyasinboss_room_1TLUT_002E18;
+
+#define djyasinboss_room_1DL_002DD0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_1DL_002DD0"
+static const ALIGN_ASSET(2) char jyasinboss_room_1DL_002DD0[] = djyasinboss_room_1DL_002DD0;
+
+#define djyasinboss_room_1Set_0001B0DL_002DD0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_1Set_0001B0DL_002DD0"
 static const ALIGN_ASSET(2) char jyasinboss_room_1Set_0001B0DL_002DD0[] = djyasinboss_room_1Set_0001B0DL_002DD0;
 
-#define djyasinboss_room_1Set_000320DL_002DD0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_1Set_000320DL_002DD0"
+#define djyasinboss_room_1Set_000320DL_002DD0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_1Set_000320DL_002DD0"
 static const ALIGN_ASSET(2) char jyasinboss_room_1Set_000320DL_002DD0[] = djyasinboss_room_1Set_000320DL_002DD0;
 
-#define djyasinboss_room_1Set_000490DL_002DD0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_1Set_000490DL_002DD0"
+#define djyasinboss_room_1Set_000490DL_002DD0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_1Set_000490DL_002DD0"
 static const ALIGN_ASSET(2) char jyasinboss_room_1Set_000490DL_002DD0[] = djyasinboss_room_1Set_000490DL_002DD0;
 
 
diff --git a/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_2.h b/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_2.h
index 3f4dbd064..0aeb1947f 100644
--- a/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_2.h
+++ b/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_2.h
@@ -3,25 +3,25 @@
 
 #include "align_asset_macro.h"
 
-#define djyasinboss_room_2DL_0021A0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_2DL_0021A0"
-static const ALIGN_ASSET(2) char jyasinboss_room_2DL_0021A0[] = djyasinboss_room_2DL_0021A0;
-
-#define djyasinboss_room_2Tex_0021C0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_2Tex_0021C0"
+#define djyasinboss_room_2Tex_0021C0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_2Tex_0021C0"
 static const ALIGN_ASSET(2) char jyasinboss_room_2Tex_0021C0[] = djyasinboss_room_2Tex_0021C0;
 
-#define djyasinboss_room_2Tex_0029C0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_2Tex_0029C0"
+#define djyasinboss_room_2Tex_0029C0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_2Tex_0029C0"
 static const ALIGN_ASSET(2) char jyasinboss_room_2Tex_0029C0[] = djyasinboss_room_2Tex_0029C0;
 
-#define djyasinboss_room_2Tex_0039C0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_2Tex_0039C0"
+#define djyasinboss_room_2Tex_0039C0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_2Tex_0039C0"
 static const ALIGN_ASSET(2) char jyasinboss_room_2Tex_0039C0[] = djyasinboss_room_2Tex_0039C0;
 
-#define djyasinboss_room_2Set_0000F0DL_0021A0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_2Set_0000F0DL_0021A0"
+#define djyasinboss_room_2DL_0021A0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_2DL_0021A0"
+static const ALIGN_ASSET(2) char jyasinboss_room_2DL_0021A0[] = djyasinboss_room_2DL_0021A0;
+
+#define djyasinboss_room_2Set_0000F0DL_0021A0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_2Set_0000F0DL_0021A0"
 static const ALIGN_ASSET(2) char jyasinboss_room_2Set_0000F0DL_0021A0[] = djyasinboss_room_2Set_0000F0DL_0021A0;
 
-#define djyasinboss_room_2Set_000130DL_0021A0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_2Set_000130DL_0021A0"
+#define djyasinboss_room_2Set_000130DL_0021A0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_2Set_000130DL_0021A0"
 static const ALIGN_ASSET(2) char jyasinboss_room_2Set_000130DL_0021A0[] = djyasinboss_room_2Set_000130DL_0021A0;
 
-#define djyasinboss_room_2Set_000170DL_0021A0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_2Set_000170DL_0021A0"
+#define djyasinboss_room_2Set_000170DL_0021A0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_2Set_000170DL_0021A0"
 static const ALIGN_ASSET(2) char jyasinboss_room_2Set_000170DL_0021A0[] = djyasinboss_room_2Set_000170DL_0021A0;
 
 
diff --git a/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_3.h b/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_3.h
index da3f66804..f4ae3cf1d 100644
--- a/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_3.h
+++ b/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_3.h
@@ -3,64 +3,64 @@
 
 #include "align_asset_macro.h"
 
-#define djyasinboss_room_3DL_003C88 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3DL_003C88"
-static const ALIGN_ASSET(2) char jyasinboss_room_3DL_003C88[] = djyasinboss_room_3DL_003C88;
-
-#define djyasinboss_room_3Tex_007F00 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_007F00"
-static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_007F00[] = djyasinboss_room_3Tex_007F00;
-
-#define djyasinboss_room_3Tex_008F00 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_008F00"
-static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_008F00[] = djyasinboss_room_3Tex_008F00;
-
-#define djyasinboss_room_3Tex_009F00 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_009F00"
-static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_009F00[] = djyasinboss_room_3Tex_009F00;
-
-#define djyasinboss_room_3TLUT_003EE0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3TLUT_003EE0"
-static const ALIGN_ASSET(2) char jyasinboss_room_3TLUT_003EE0[] = djyasinboss_room_3TLUT_003EE0;
-
-#define djyasinboss_room_3Tex_00A700 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_00A700"
-static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_00A700[] = djyasinboss_room_3Tex_00A700;
-
-#define djyasinboss_room_3Tex_00AF00 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_00AF00"
-static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_00AF00[] = djyasinboss_room_3Tex_00AF00;
-
-#define djyasinboss_room_3Tex_007700 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_007700"
-static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_007700[] = djyasinboss_room_3Tex_007700;
-
-#define djyasinboss_room_3Tex_006700 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_006700"
-static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_006700[] = djyasinboss_room_3Tex_006700;
-
-#define djyasinboss_room_3Tex_005700 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_005700"
-static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_005700[] = djyasinboss_room_3Tex_005700;
-
-#define djyasinboss_room_3TLUT_003CE0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3TLUT_003CE0"
-static const ALIGN_ASSET(2) char jyasinboss_room_3TLUT_003CE0[] = djyasinboss_room_3TLUT_003CE0;
-
-#define djyasinboss_room_3Tex_004700 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_004700"
-static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_004700[] = djyasinboss_room_3Tex_004700;
-
-#define djyasinboss_room_3Tex_004F00 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_004F00"
-static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_004F00[] = djyasinboss_room_3Tex_004F00;
-
-#define djyasinboss_room_3Tex_003F00 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_003F00"
+#define djyasinboss_room_3Tex_003F00 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_003F00"
 static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_003F00[] = djyasinboss_room_3Tex_003F00;
 
-#define djyasinboss_room_3Tex_005300 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_005300"
-static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_005300[] = djyasinboss_room_3Tex_005300;
-
-#define djyasinboss_room_3Tex_004300 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_004300"
+#define djyasinboss_room_3Tex_004300 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_004300"
 static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_004300[] = djyasinboss_room_3Tex_004300;
 
-#define djyasinboss_room_3Tex_005F00 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_005F00"
+#define djyasinboss_room_3Tex_004700 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_004700"
+static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_004700[] = djyasinboss_room_3Tex_004700;
+
+#define djyasinboss_room_3Tex_004F00 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_004F00"
+static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_004F00[] = djyasinboss_room_3Tex_004F00;
+
+#define djyasinboss_room_3Tex_005300 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_005300"
+static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_005300[] = djyasinboss_room_3Tex_005300;
+
+#define djyasinboss_room_3Tex_005700 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_005700"
+static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_005700[] = djyasinboss_room_3Tex_005700;
+
+#define djyasinboss_room_3Tex_005F00 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_005F00"
 static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_005F00[] = djyasinboss_room_3Tex_005F00;
 
-#define djyasinboss_room_3Set_0000A0DL_003C88 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Set_0000A0DL_003C88"
+#define djyasinboss_room_3Tex_006700 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_006700"
+static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_006700[] = djyasinboss_room_3Tex_006700;
+
+#define djyasinboss_room_3Tex_007700 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_007700"
+static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_007700[] = djyasinboss_room_3Tex_007700;
+
+#define djyasinboss_room_3Tex_007F00 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_007F00"
+static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_007F00[] = djyasinboss_room_3Tex_007F00;
+
+#define djyasinboss_room_3Tex_008F00 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_008F00"
+static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_008F00[] = djyasinboss_room_3Tex_008F00;
+
+#define djyasinboss_room_3Tex_009F00 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_009F00"
+static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_009F00[] = djyasinboss_room_3Tex_009F00;
+
+#define djyasinboss_room_3Tex_00A700 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_00A700"
+static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_00A700[] = djyasinboss_room_3Tex_00A700;
+
+#define djyasinboss_room_3Tex_00AF00 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_00AF00"
+static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_00AF00[] = djyasinboss_room_3Tex_00AF00;
+
+#define djyasinboss_room_3TLUT_003CE0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3TLUT_003CE0"
+static const ALIGN_ASSET(2) char jyasinboss_room_3TLUT_003CE0[] = djyasinboss_room_3TLUT_003CE0;
+
+#define djyasinboss_room_3TLUT_003EE0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3TLUT_003EE0"
+static const ALIGN_ASSET(2) char jyasinboss_room_3TLUT_003EE0[] = djyasinboss_room_3TLUT_003EE0;
+
+#define djyasinboss_room_3DL_003C88 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3DL_003C88"
+static const ALIGN_ASSET(2) char jyasinboss_room_3DL_003C88[] = djyasinboss_room_3DL_003C88;
+
+#define djyasinboss_room_3Set_0000A0DL_003C88 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Set_0000A0DL_003C88"
 static const ALIGN_ASSET(2) char jyasinboss_room_3Set_0000A0DL_003C88[] = djyasinboss_room_3Set_0000A0DL_003C88;
 
-#define djyasinboss_room_3Set_000100DL_003C88 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Set_000100DL_003C88"
+#define djyasinboss_room_3Set_000100DL_003C88 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Set_000100DL_003C88"
 static const ALIGN_ASSET(2) char jyasinboss_room_3Set_000100DL_003C88[] = djyasinboss_room_3Set_000100DL_003C88;
 
-#define djyasinboss_room_3Set_000160DL_003C88 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Set_000160DL_003C88"
+#define djyasinboss_room_3Set_000160DL_003C88 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Set_000160DL_003C88"
 static const ALIGN_ASSET(2) char jyasinboss_room_3Set_000160DL_003C88[] = djyasinboss_room_3Set_000160DL_003C88;
 
 
diff --git a/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_scene.h b/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_scene.h
index a7a1c0aca..5af788597 100644
--- a/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_scene.h
+++ b/soh/assets/scenes/dungeons/jyasinboss/jyasinboss_scene.h
@@ -3,26 +3,26 @@
 
 #include "align_asset_macro.h"
 
-#define dgSpiritBossNabooruKnuckleIntroCs "__OTR__scenes/nonmq/jyasinboss_scene/gSpiritBossNabooruKnuckleIntroCs"
-static const ALIGN_ASSET(2) char gSpiritBossNabooruKnuckleIntroCs[] = dgSpiritBossNabooruKnuckleIntroCs;
-
-#define dgSpiritBossNabooruKnuckleDefeatCs "__OTR__scenes/nonmq/jyasinboss_scene/gSpiritBossNabooruKnuckleDefeatCs"
-static const ALIGN_ASSET(2) char gSpiritBossNabooruKnuckleDefeatCs[] = dgSpiritBossNabooruKnuckleDefeatCs;
-
-#define djyasinboss_sceneCollisionHeader_002B80 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_sceneCollisionHeader_002B80"
-static const ALIGN_ASSET(2) char jyasinboss_sceneCollisionHeader_002B80[] = djyasinboss_sceneCollisionHeader_002B80;
-
-#define djyasinboss_sceneTex_007CF0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_sceneTex_007CF0"
-static const ALIGN_ASSET(2) char jyasinboss_sceneTex_007CF0[] = djyasinboss_sceneTex_007CF0;
-
-#define djyasinboss_sceneTex_006CF0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_sceneTex_006CF0"
+#define djyasinboss_sceneTex_006CF0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_sceneTex_006CF0"
 static const ALIGN_ASSET(2) char jyasinboss_sceneTex_006CF0[] = djyasinboss_sceneTex_006CF0;
 
-#define djyasinboss_sceneCollisionHeader_002B80 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_sceneCollisionHeader_002B80"
+#define djyasinboss_sceneTex_007CF0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_sceneTex_007CF0"
+static const ALIGN_ASSET(2) char jyasinboss_sceneTex_007CF0[] = djyasinboss_sceneTex_007CF0;
 
-#define djyasinboss_sceneCollisionHeader_002B80 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_sceneCollisionHeader_002B80"
+#define dgSpiritBossNabooruKnuckleIntroCs "__OTR__scenes/shared/jyasinboss_scene/gSpiritBossNabooruKnuckleIntroCs"
+static const ALIGN_ASSET(2) char gSpiritBossNabooruKnuckleIntroCs[] = dgSpiritBossNabooruKnuckleIntroCs;
 
-#define djyasinboss_sceneCollisionHeader_002B80 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_sceneCollisionHeader_002B80"
+#define dgSpiritBossNabooruKnuckleDefeatCs "__OTR__scenes/shared/jyasinboss_scene/gSpiritBossNabooruKnuckleDefeatCs"
+static const ALIGN_ASSET(2) char gSpiritBossNabooruKnuckleDefeatCs[] = dgSpiritBossNabooruKnuckleDefeatCs;
+
+#define djyasinboss_sceneCollisionHeader_002B80 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_sceneCollisionHeader_002B80"
+static const ALIGN_ASSET(2) char jyasinboss_sceneCollisionHeader_002B80[] = djyasinboss_sceneCollisionHeader_002B80;
+
+#define djyasinboss_sceneCollisionHeader_002B80 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_sceneCollisionHeader_002B80"
+
+#define djyasinboss_sceneCollisionHeader_002B80 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_sceneCollisionHeader_002B80"
+
+#define djyasinboss_sceneCollisionHeader_002B80 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_sceneCollisionHeader_002B80"
 
 
 #endif // DUNGEONS_JYASINBOSS_SCENE_H
diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_0.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_0.h
index e00ddd7da..85f2f40c4 100644
--- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_0.h
+++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_0.h
@@ -3,38 +3,50 @@
 
 #include "align_asset_macro.h"
 
-#define djyasinzou_room_0DL_004820 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0DL_004820"
-static const ALIGN_ASSET(2) char jyasinzou_room_0DL_004820[] = djyasinzou_room_0DL_004820;
-
-#define djyasinzou_room_0Tex_00C9D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00C9D8"
-static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00C9D8[] = djyasinzou_room_0Tex_00C9D8;
-
-#define djyasinzou_room_0Tex_00F9D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00F9D8"
-static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00F9D8[] = djyasinzou_room_0Tex_00F9D8;
-
-#define djyasinzou_room_0Tex_00DDD8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00DDD8"
-static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00DDD8[] = djyasinzou_room_0Tex_00DDD8;
-
-#define djyasinzou_room_0Tex_00E9D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00E9D8"
-static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00E9D8[] = djyasinzou_room_0Tex_00E9D8;
-
-#define djyasinzou_room_0Tex_00E1D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00E1D8"
-static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00E1D8[] = djyasinzou_room_0Tex_00E1D8;
-
-#define djyasinzou_room_0Tex_00D5D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00D5D8"
-static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00D5D8[] = djyasinzou_room_0Tex_00D5D8;
+#define djyasinzou_room_0Tex_00A9D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00A9D8"
+static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00A9D8[] = djyasinzou_room_0Tex_00A9D8;
 
 #define djyasinzou_room_0Tex_00B1D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00B1D8"
 static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00B1D8[] = djyasinzou_room_0Tex_00B1D8;
 
-#define djyasinzou_room_0DL_005CB0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0DL_005CB0"
-static const ALIGN_ASSET(2) char jyasinzou_room_0DL_005CB0[] = djyasinzou_room_0DL_005CB0;
+#define djyasinzou_room_0Tex_00B9D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00B9D8"
+static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00B9D8[] = djyasinzou_room_0Tex_00B9D8;
 
 #define djyasinzou_room_0Tex_00C1D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00C1D8"
 static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00C1D8[] = djyasinzou_room_0Tex_00C1D8;
 
-#define djyasinzou_room_0Tex_00B9D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00B9D8"
-static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00B9D8[] = djyasinzou_room_0Tex_00B9D8;
+#define djyasinzou_room_0Tex_00C9D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00C9D8"
+static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00C9D8[] = djyasinzou_room_0Tex_00C9D8;
+
+#define djyasinzou_room_0Tex_00D1D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00D1D8"
+static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00D1D8[] = djyasinzou_room_0Tex_00D1D8;
+
+#define djyasinzou_room_0Tex_00D5D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00D5D8"
+static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00D5D8[] = djyasinzou_room_0Tex_00D5D8;
+
+#define djyasinzou_room_0Tex_00DDD8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00DDD8"
+static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00DDD8[] = djyasinzou_room_0Tex_00DDD8;
+
+#define djyasinzou_room_0Tex_00E1D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00E1D8"
+static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00E1D8[] = djyasinzou_room_0Tex_00E1D8;
+
+#define djyasinzou_room_0Tex_00E9D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00E9D8"
+static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00E9D8[] = djyasinzou_room_0Tex_00E9D8;
+
+#define djyasinzou_room_0Tex_00F1D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00F1D8"
+static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00F1D8[] = djyasinzou_room_0Tex_00F1D8;
+
+#define djyasinzou_room_0Tex_00F9D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00F9D8"
+static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00F9D8[] = djyasinzou_room_0Tex_00F9D8;
+
+#define djyasinzou_room_0Tex_0107E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_0107E8"
+static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_0107E8[] = djyasinzou_room_0Tex_0107E8;
+
+#define djyasinzou_room_0DL_004820 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0DL_004820"
+static const ALIGN_ASSET(2) char jyasinzou_room_0DL_004820[] = djyasinzou_room_0DL_004820;
+
+#define djyasinzou_room_0DL_005CB0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0DL_005CB0"
+static const ALIGN_ASSET(2) char jyasinzou_room_0DL_005CB0[] = djyasinzou_room_0DL_005CB0;
 
 #define djyasinzou_room_0DL_007248 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0DL_007248"
 static const ALIGN_ASSET(2) char jyasinzou_room_0DL_007248[] = djyasinzou_room_0DL_007248;
@@ -51,9 +63,6 @@ static const ALIGN_ASSET(2) char jyasinzou_room_0DL_008200[] = djyasinzou_room_0
 #define djyasinzou_room_0DL_008AE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0DL_008AE0"
 static const ALIGN_ASSET(2) char jyasinzou_room_0DL_008AE0[] = djyasinzou_room_0DL_008AE0;
 
-#define djyasinzou_room_0Tex_00A9D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00A9D8"
-static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00A9D8[] = djyasinzou_room_0Tex_00A9D8;
-
 #define djyasinzou_room_0DL_006768 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0DL_006768"
 static const ALIGN_ASSET(2) char jyasinzou_room_0DL_006768[] = djyasinzou_room_0DL_006768;
 
@@ -66,18 +75,9 @@ static const ALIGN_ASSET(2) char jyasinzou_room_0DL_009A08[] = djyasinzou_room_0
 #define djyasinzou_room_0DL_0030A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0DL_0030A0"
 static const ALIGN_ASSET(2) char jyasinzou_room_0DL_0030A0[] = djyasinzou_room_0DL_0030A0;
 
-#define djyasinzou_room_0Tex_00D1D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00D1D8"
-static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00D1D8[] = djyasinzou_room_0Tex_00D1D8;
-
-#define djyasinzou_room_0Tex_00F1D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00F1D8"
-static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00F1D8[] = djyasinzou_room_0Tex_00F1D8;
-
 #define djyasinzou_room_0DL_010468 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0DL_010468"
 static const ALIGN_ASSET(2) char jyasinzou_room_0DL_010468[] = djyasinzou_room_0DL_010468;
 
-#define djyasinzou_room_0Tex_0107E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_0107E8"
-static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_0107E8[] = djyasinzou_room_0Tex_0107E8;
-
 #define djyasinzou_room_0DL_00A2B0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0DL_00A2B0"
 static const ALIGN_ASSET(2) char jyasinzou_room_0DL_00A2B0[] = djyasinzou_room_0DL_00A2B0;
 
diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_1.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_1.h
index 4b62b8fc0..a18e2e255 100644
--- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_1.h
+++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_1.h
@@ -3,20 +3,8 @@
 
 #include "align_asset_macro.h"
 
-#define djyasinzou_room_1DL_0003E0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1DL_0003E0"
-static const ALIGN_ASSET(2) char jyasinzou_room_1DL_0003E0[] = djyasinzou_room_1DL_0003E0;
-
-#define djyasinzou_room_1Tex_007348 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1Tex_007348"
-static const ALIGN_ASSET(2) char jyasinzou_room_1Tex_007348[] = djyasinzou_room_1Tex_007348;
-
-#define djyasinzou_room_1DL_0025E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1DL_0025E8"
-static const ALIGN_ASSET(2) char jyasinzou_room_1DL_0025E8[] = djyasinzou_room_1DL_0025E8;
-
-#define djyasinzou_room_1Tex_006748 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1Tex_006748"
-static const ALIGN_ASSET(2) char jyasinzou_room_1Tex_006748[] = djyasinzou_room_1Tex_006748;
-
-#define djyasinzou_room_1Tex_008B48 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1Tex_008B48"
-static const ALIGN_ASSET(2) char jyasinzou_room_1Tex_008B48[] = djyasinzou_room_1Tex_008B48;
+#define djyasinzou_room_1Tex_004F48 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1Tex_004F48"
+static const ALIGN_ASSET(2) char jyasinzou_room_1Tex_004F48[] = djyasinzou_room_1Tex_004F48;
 
 #define djyasinzou_room_1Tex_005748 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1Tex_005748"
 static const ALIGN_ASSET(2) char jyasinzou_room_1Tex_005748[] = djyasinzou_room_1Tex_005748;
@@ -24,23 +12,35 @@ static const ALIGN_ASSET(2) char jyasinzou_room_1Tex_005748[] = djyasinzou_room_
 #define djyasinzou_room_1Tex_005F48 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1Tex_005F48"
 static const ALIGN_ASSET(2) char jyasinzou_room_1Tex_005F48[] = djyasinzou_room_1Tex_005F48;
 
-#define djyasinzou_room_1Tex_007B48 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1Tex_007B48"
-static const ALIGN_ASSET(2) char jyasinzou_room_1Tex_007B48[] = djyasinzou_room_1Tex_007B48;
+#define djyasinzou_room_1Tex_006748 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1Tex_006748"
+static const ALIGN_ASSET(2) char jyasinzou_room_1Tex_006748[] = djyasinzou_room_1Tex_006748;
 
 #define djyasinzou_room_1Tex_006B48 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1Tex_006B48"
 static const ALIGN_ASSET(2) char jyasinzou_room_1Tex_006B48[] = djyasinzou_room_1Tex_006B48;
 
+#define djyasinzou_room_1Tex_007348 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1Tex_007348"
+static const ALIGN_ASSET(2) char jyasinzou_room_1Tex_007348[] = djyasinzou_room_1Tex_007348;
+
+#define djyasinzou_room_1Tex_007B48 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1Tex_007B48"
+static const ALIGN_ASSET(2) char jyasinzou_room_1Tex_007B48[] = djyasinzou_room_1Tex_007B48;
+
 #define djyasinzou_room_1Tex_008348 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1Tex_008348"
 static const ALIGN_ASSET(2) char jyasinzou_room_1Tex_008348[] = djyasinzou_room_1Tex_008348;
 
+#define djyasinzou_room_1Tex_008B48 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1Tex_008B48"
+static const ALIGN_ASSET(2) char jyasinzou_room_1Tex_008B48[] = djyasinzou_room_1Tex_008B48;
+
+#define djyasinzou_room_1DL_0003E0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1DL_0003E0"
+static const ALIGN_ASSET(2) char jyasinzou_room_1DL_0003E0[] = djyasinzou_room_1DL_0003E0;
+
+#define djyasinzou_room_1DL_0025E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1DL_0025E8"
+static const ALIGN_ASSET(2) char jyasinzou_room_1DL_0025E8[] = djyasinzou_room_1DL_0025E8;
+
 #define djyasinzou_room_1DL_0045E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1DL_0045E8"
 static const ALIGN_ASSET(2) char jyasinzou_room_1DL_0045E8[] = djyasinzou_room_1DL_0045E8;
 
 #define djyasinzou_room_1DL_004D50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1DL_004D50"
 static const ALIGN_ASSET(2) char jyasinzou_room_1DL_004D50[] = djyasinzou_room_1DL_004D50;
 
-#define djyasinzou_room_1Tex_004F48 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_1Tex_004F48"
-static const ALIGN_ASSET(2) char jyasinzou_room_1Tex_004F48[] = djyasinzou_room_1Tex_004F48;
-
 
 #endif // DUNGEONS_JYASINZOU_ROOM_1_H
diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_10.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_10.h
index 74e3a8898..98ecf178c 100644
--- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_10.h
+++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_10.h
@@ -3,17 +3,8 @@
 
 #include "align_asset_macro.h"
 
-#define djyasinzou_room_10DL_000460 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_000460"
-static const ALIGN_ASSET(2) char jyasinzou_room_10DL_000460[] = djyasinzou_room_10DL_000460;
-
-#define djyasinzou_room_10Tex_0051A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0051A0"
-static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0051A0[] = djyasinzou_room_10Tex_0051A0;
-
-#define djyasinzou_room_10DL_0008F8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_0008F8"
-static const ALIGN_ASSET(2) char jyasinzou_room_10DL_0008F8[] = djyasinzou_room_10DL_0008F8;
-
-#define djyasinzou_room_10Tex_007DA0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_007DA0"
-static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_007DA0[] = djyasinzou_room_10Tex_007DA0;
+#define djyasinzou_room_10Tex_0031A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0031A0"
+static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0031A0[] = djyasinzou_room_10Tex_0031A0;
 
 #define djyasinzou_room_10Tex_0041A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0041A0"
 static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0041A0[] = djyasinzou_room_10Tex_0041A0;
@@ -21,30 +12,45 @@ static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0041A0[] = djyasinzou_room
 #define djyasinzou_room_10Tex_0049A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0049A0"
 static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0049A0[] = djyasinzou_room_10Tex_0049A0;
 
-#define djyasinzou_room_10DL_002DE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_002DE0"
-static const ALIGN_ASSET(2) char jyasinzou_room_10DL_002DE0[] = djyasinzou_room_10DL_002DE0;
+#define djyasinzou_room_10Tex_0051A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0051A0"
+static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0051A0[] = djyasinzou_room_10Tex_0051A0;
 
-#define djyasinzou_room_10Tex_0079A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0079A0"
-static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0079A0[] = djyasinzou_room_10Tex_0079A0;
+#define djyasinzou_room_10Tex_0059A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0059A0"
+static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0059A0[] = djyasinzou_room_10Tex_0059A0;
 
-#define djyasinzou_room_10DL_000CC0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_000CC0"
-static const ALIGN_ASSET(2) char jyasinzou_room_10DL_000CC0[] = djyasinzou_room_10DL_000CC0;
-
-#define djyasinzou_room_10Tex_0069A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0069A0"
-static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0069A0[] = djyasinzou_room_10Tex_0069A0;
-
-#define djyasinzou_room_10DL_001270 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_001270"
-static const ALIGN_ASSET(2) char jyasinzou_room_10DL_001270[] = djyasinzou_room_10DL_001270;
+#define djyasinzou_room_10Tex_005DA0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_005DA0"
+static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_005DA0[] = djyasinzou_room_10Tex_005DA0;
 
 #define djyasinzou_room_10Tex_0065A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0065A0"
 static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0065A0[] = djyasinzou_room_10Tex_0065A0;
 
+#define djyasinzou_room_10Tex_0069A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0069A0"
+static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0069A0[] = djyasinzou_room_10Tex_0069A0;
+
+#define djyasinzou_room_10Tex_0079A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0079A0"
+static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0079A0[] = djyasinzou_room_10Tex_0079A0;
+
+#define djyasinzou_room_10Tex_007DA0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_007DA0"
+static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_007DA0[] = djyasinzou_room_10Tex_007DA0;
+
+#define djyasinzou_room_10DL_000460 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_000460"
+static const ALIGN_ASSET(2) char jyasinzou_room_10DL_000460[] = djyasinzou_room_10DL_000460;
+
+#define djyasinzou_room_10DL_0008F8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_0008F8"
+static const ALIGN_ASSET(2) char jyasinzou_room_10DL_0008F8[] = djyasinzou_room_10DL_0008F8;
+
+#define djyasinzou_room_10DL_002DE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_002DE0"
+static const ALIGN_ASSET(2) char jyasinzou_room_10DL_002DE0[] = djyasinzou_room_10DL_002DE0;
+
+#define djyasinzou_room_10DL_000CC0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_000CC0"
+static const ALIGN_ASSET(2) char jyasinzou_room_10DL_000CC0[] = djyasinzou_room_10DL_000CC0;
+
+#define djyasinzou_room_10DL_001270 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_001270"
+static const ALIGN_ASSET(2) char jyasinzou_room_10DL_001270[] = djyasinzou_room_10DL_001270;
+
 #define djyasinzou_room_10DL_001AA0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_001AA0"
 static const ALIGN_ASSET(2) char jyasinzou_room_10DL_001AA0[] = djyasinzou_room_10DL_001AA0;
 
-#define djyasinzou_room_10Tex_005DA0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_005DA0"
-static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_005DA0[] = djyasinzou_room_10Tex_005DA0;
-
 #define djyasinzou_room_10DL_000E80 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_000E80"
 static const ALIGN_ASSET(2) char jyasinzou_room_10DL_000E80[] = djyasinzou_room_10DL_000E80;
 
@@ -54,11 +60,5 @@ static const ALIGN_ASSET(2) char jyasinzou_room_10DL_001720[] = djyasinzou_room_
 #define djyasinzou_room_10DL_0020C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10DL_0020C8"
 static const ALIGN_ASSET(2) char jyasinzou_room_10DL_0020C8[] = djyasinzou_room_10DL_0020C8;
 
-#define djyasinzou_room_10Tex_0031A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0031A0"
-static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0031A0[] = djyasinzou_room_10Tex_0031A0;
-
-#define djyasinzou_room_10Tex_0059A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_10Tex_0059A0"
-static const ALIGN_ASSET(2) char jyasinzou_room_10Tex_0059A0[] = djyasinzou_room_10Tex_0059A0;
-
 
 #endif // DUNGEONS_JYASINZOU_ROOM_10_H
diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_11.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_11.h
index a73341a83..ec6d1703d 100644
--- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_11.h
+++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_11.h
@@ -3,14 +3,14 @@
 
 #include "align_asset_macro.h"
 
+#define djyasinzou_room_11Tex_000780 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_11Tex_000780"
+static const ALIGN_ASSET(2) char jyasinzou_room_11Tex_000780[] = djyasinzou_room_11Tex_000780;
+
 #define djyasinzou_room_11DL_000E40 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_11DL_000E40"
 static const ALIGN_ASSET(2) char jyasinzou_room_11DL_000E40[] = djyasinzou_room_11DL_000E40;
 
 #define djyasinzou_room_11DL_000530 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_11DL_000530"
 static const ALIGN_ASSET(2) char jyasinzou_room_11DL_000530[] = djyasinzou_room_11DL_000530;
 
-#define djyasinzou_room_11Tex_000780 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_11Tex_000780"
-static const ALIGN_ASSET(2) char jyasinzou_room_11Tex_000780[] = djyasinzou_room_11Tex_000780;
-
 
 #endif // DUNGEONS_JYASINZOU_ROOM_11_H
diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_12.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_12.h
index cf4a8b8fe..d39801bc0 100644
--- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_12.h
+++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_12.h
@@ -3,14 +3,14 @@
 
 #include "align_asset_macro.h"
 
-#define djyasinzou_room_12DL_0006B0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_12DL_0006B0"
-static const ALIGN_ASSET(2) char jyasinzou_room_12DL_0006B0[] = djyasinzou_room_12DL_0006B0;
+#define djyasinzou_room_12Tex_0010D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_12Tex_0010D8"
+static const ALIGN_ASSET(2) char jyasinzou_room_12Tex_0010D8[] = djyasinzou_room_12Tex_0010D8;
 
 #define djyasinzou_room_12Tex_0018D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_12Tex_0018D8"
 static const ALIGN_ASSET(2) char jyasinzou_room_12Tex_0018D8[] = djyasinzou_room_12Tex_0018D8;
 
-#define djyasinzou_room_12Tex_0010D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_12Tex_0010D8"
-static const ALIGN_ASSET(2) char jyasinzou_room_12Tex_0010D8[] = djyasinzou_room_12Tex_0010D8;
+#define djyasinzou_room_12DL_0006B0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_12DL_0006B0"
+static const ALIGN_ASSET(2) char jyasinzou_room_12DL_0006B0[] = djyasinzou_room_12DL_0006B0;
 
 #define djyasinzou_room_12DL_000B38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_12DL_000B38"
 static const ALIGN_ASSET(2) char jyasinzou_room_12DL_000B38[] = djyasinzou_room_12DL_000B38;
diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_13.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_13.h
index 276c78539..0cbc9366b 100644
--- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_13.h
+++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_13.h
@@ -3,32 +3,32 @@
 
 #include "align_asset_macro.h"
 
-#define djyasinzou_room_13DL_001B60 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_13DL_001B60"
-static const ALIGN_ASSET(2) char jyasinzou_room_13DL_001B60[] = djyasinzou_room_13DL_001B60;
-
-#define djyasinzou_room_13Tex_0044A8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_13Tex_0044A8"
-static const ALIGN_ASSET(2) char jyasinzou_room_13Tex_0044A8[] = djyasinzou_room_13Tex_0044A8;
-
 #define djyasinzou_room_13Tex_0028A8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_13Tex_0028A8"
 static const ALIGN_ASSET(2) char jyasinzou_room_13Tex_0028A8[] = djyasinzou_room_13Tex_0028A8;
 
 #define djyasinzou_room_13Tex_0030A8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_13Tex_0030A8"
 static const ALIGN_ASSET(2) char jyasinzou_room_13Tex_0030A8[] = djyasinzou_room_13Tex_0030A8;
 
+#define djyasinzou_room_13Tex_0038A8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_13Tex_0038A8"
+static const ALIGN_ASSET(2) char jyasinzou_room_13Tex_0038A8[] = djyasinzou_room_13Tex_0038A8;
+
 #define djyasinzou_room_13Tex_003CA8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_13Tex_003CA8"
 static const ALIGN_ASSET(2) char jyasinzou_room_13Tex_003CA8[] = djyasinzou_room_13Tex_003CA8;
 
-#define djyasinzou_room_13Tex_0050A8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_13Tex_0050A8"
-static const ALIGN_ASSET(2) char jyasinzou_room_13Tex_0050A8[] = djyasinzou_room_13Tex_0050A8;
-
-#define djyasinzou_room_13DL_002710 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_13DL_002710"
-static const ALIGN_ASSET(2) char jyasinzou_room_13DL_002710[] = djyasinzou_room_13DL_002710;
-
-#define djyasinzou_room_13Tex_0038A8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_13Tex_0038A8"
-static const ALIGN_ASSET(2) char jyasinzou_room_13Tex_0038A8[] = djyasinzou_room_13Tex_0038A8;
+#define djyasinzou_room_13Tex_0044A8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_13Tex_0044A8"
+static const ALIGN_ASSET(2) char jyasinzou_room_13Tex_0044A8[] = djyasinzou_room_13Tex_0044A8;
 
 #define djyasinzou_room_13Tex_004CA8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_13Tex_004CA8"
 static const ALIGN_ASSET(2) char jyasinzou_room_13Tex_004CA8[] = djyasinzou_room_13Tex_004CA8;
 
+#define djyasinzou_room_13Tex_0050A8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_13Tex_0050A8"
+static const ALIGN_ASSET(2) char jyasinzou_room_13Tex_0050A8[] = djyasinzou_room_13Tex_0050A8;
+
+#define djyasinzou_room_13DL_001B60 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_13DL_001B60"
+static const ALIGN_ASSET(2) char jyasinzou_room_13DL_001B60[] = djyasinzou_room_13DL_001B60;
+
+#define djyasinzou_room_13DL_002710 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_13DL_002710"
+static const ALIGN_ASSET(2) char jyasinzou_room_13DL_002710[] = djyasinzou_room_13DL_002710;
+
 
 #endif // DUNGEONS_JYASINZOU_ROOM_13_H
diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_14.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_14.h
index 3c47d67ec..ca88adb41 100644
--- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_14.h
+++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_14.h
@@ -3,41 +3,41 @@
 
 #include "align_asset_macro.h"
 
-#define djyasinzou_room_14DL_000350 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14DL_000350"
-static const ALIGN_ASSET(2) char jyasinzou_room_14DL_000350[] = djyasinzou_room_14DL_000350;
+#define djyasinzou_room_14Tex_001CA0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_001CA0"
+static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_001CA0[] = djyasinzou_room_14Tex_001CA0;
+
+#define djyasinzou_room_14Tex_0024A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_0024A0"
+static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_0024A0[] = djyasinzou_room_14Tex_0024A0;
+
+#define djyasinzou_room_14Tex_0028A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_0028A0"
+static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_0028A0[] = djyasinzou_room_14Tex_0028A0;
+
+#define djyasinzou_room_14Tex_0030A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_0030A0"
+static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_0030A0[] = djyasinzou_room_14Tex_0030A0;
+
+#define djyasinzou_room_14Tex_0034A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_0034A0"
+static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_0034A0[] = djyasinzou_room_14Tex_0034A0;
 
 #define djyasinzou_room_14Tex_0044A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_0044A0"
 static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_0044A0[] = djyasinzou_room_14Tex_0044A0;
 
+#define djyasinzou_room_14DL_000350 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14DL_000350"
+static const ALIGN_ASSET(2) char jyasinzou_room_14DL_000350[] = djyasinzou_room_14DL_000350;
+
 #define djyasinzou_room_14DL_000AF8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14DL_000AF8"
 static const ALIGN_ASSET(2) char jyasinzou_room_14DL_000AF8[] = djyasinzou_room_14DL_000AF8;
 
-#define djyasinzou_room_14Tex_001CA0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_001CA0"
-static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_001CA0[] = djyasinzou_room_14Tex_001CA0;
-
-#define djyasinzou_room_14Tex_0028A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_0028A0"
-static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_0028A0[] = djyasinzou_room_14Tex_0028A0;
-
 #define djyasinzou_room_14DL_001088 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14DL_001088"
 static const ALIGN_ASSET(2) char jyasinzou_room_14DL_001088[] = djyasinzou_room_14DL_001088;
 
 #define djyasinzou_room_14DL_001340 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14DL_001340"
 static const ALIGN_ASSET(2) char jyasinzou_room_14DL_001340[] = djyasinzou_room_14DL_001340;
 
-#define djyasinzou_room_14Tex_0024A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_0024A0"
-static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_0024A0[] = djyasinzou_room_14Tex_0024A0;
-
 #define djyasinzou_room_14DL_0017D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14DL_0017D8"
 static const ALIGN_ASSET(2) char jyasinzou_room_14DL_0017D8[] = djyasinzou_room_14DL_0017D8;
 
-#define djyasinzou_room_14Tex_0030A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_0030A0"
-static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_0030A0[] = djyasinzou_room_14Tex_0030A0;
-
 #define djyasinzou_room_14DL_001AE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14DL_001AE0"
 static const ALIGN_ASSET(2) char jyasinzou_room_14DL_001AE0[] = djyasinzou_room_14DL_001AE0;
 
-#define djyasinzou_room_14Tex_0034A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_14Tex_0034A0"
-static const ALIGN_ASSET(2) char jyasinzou_room_14Tex_0034A0[] = djyasinzou_room_14Tex_0034A0;
-
 
 #endif // DUNGEONS_JYASINZOU_ROOM_14_H
diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_15.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_15.h
index 65e4639d2..aac7ab8ba 100644
--- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_15.h
+++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_15.h
@@ -3,60 +3,60 @@
 
 #include "align_asset_macro.h"
 
-#define djyasinzou_room_15DL_007970 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15DL_007970"
-static const ALIGN_ASSET(2) char jyasinzou_room_15DL_007970[] = djyasinzou_room_15DL_007970;
-
-#define djyasinzou_room_15DL_000DE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15DL_000DE0"
-static const ALIGN_ASSET(2) char jyasinzou_room_15DL_000DE0[] = djyasinzou_room_15DL_000DE0;
-
-#define djyasinzou_room_15Tex_005CE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_005CE8"
-static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_005CE8[] = djyasinzou_room_15Tex_005CE8;
-
-#define djyasinzou_room_15Tex_0053E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_0053E8"
-static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_0053E8[] = djyasinzou_room_15Tex_0053E8;
-
-#define djyasinzou_room_15Tex_0043E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_0043E8"
-static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_0043E8[] = djyasinzou_room_15Tex_0043E8;
-
-#define djyasinzou_room_15Tex_004BE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_004BE8"
-static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_004BE8[] = djyasinzou_room_15Tex_004BE8;
-
-#define djyasinzou_room_15Tex_0060E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_0060E8"
-static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_0060E8[] = djyasinzou_room_15Tex_0060E8;
-
-#define djyasinzou_room_15DL_007BC0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15DL_007BC0"
-static const ALIGN_ASSET(2) char jyasinzou_room_15DL_007BC0[] = djyasinzou_room_15DL_007BC0;
-
-#define djyasinzou_room_15Tex_007C98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_007C98"
-static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_007C98[] = djyasinzou_room_15Tex_007C98;
-
-#define djyasinzou_room_15DL_002950 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15DL_002950"
-static const ALIGN_ASSET(2) char jyasinzou_room_15DL_002950[] = djyasinzou_room_15DL_002950;
-
-#define djyasinzou_room_15Tex_006CE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_006CE8"
-static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_006CE8[] = djyasinzou_room_15Tex_006CE8;
-
-#define djyasinzou_room_15DL_001A68 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15DL_001A68"
-static const ALIGN_ASSET(2) char jyasinzou_room_15DL_001A68[] = djyasinzou_room_15DL_001A68;
-
-#define djyasinzou_room_15Tex_0068E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_0068E8"
-static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_0068E8[] = djyasinzou_room_15Tex_0068E8;
-
-#define djyasinzou_room_15DL_002380 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15DL_002380"
-static const ALIGN_ASSET(2) char jyasinzou_room_15DL_002380[] = djyasinzou_room_15DL_002380;
-
-#define djyasinzou_room_15Tex_005BE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_005BE8"
-static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_005BE8[] = djyasinzou_room_15Tex_005BE8;
-
-#define djyasinzou_room_15DL_002C10 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15DL_002C10"
-static const ALIGN_ASSET(2) char jyasinzou_room_15DL_002C10[] = djyasinzou_room_15DL_002C10;
-
 #define djyasinzou_room_15Tex_002FE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_002FE8"
 static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_002FE8[] = djyasinzou_room_15Tex_002FE8;
 
 #define djyasinzou_room_15Tex_003FE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_003FE8"
 static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_003FE8[] = djyasinzou_room_15Tex_003FE8;
 
+#define djyasinzou_room_15Tex_0043E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_0043E8"
+static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_0043E8[] = djyasinzou_room_15Tex_0043E8;
+
+#define djyasinzou_room_15Tex_004BE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_004BE8"
+static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_004BE8[] = djyasinzou_room_15Tex_004BE8;
+
+#define djyasinzou_room_15Tex_0053E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_0053E8"
+static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_0053E8[] = djyasinzou_room_15Tex_0053E8;
+
+#define djyasinzou_room_15Tex_005BE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_005BE8"
+static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_005BE8[] = djyasinzou_room_15Tex_005BE8;
+
+#define djyasinzou_room_15Tex_005CE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_005CE8"
+static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_005CE8[] = djyasinzou_room_15Tex_005CE8;
+
+#define djyasinzou_room_15Tex_0060E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_0060E8"
+static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_0060E8[] = djyasinzou_room_15Tex_0060E8;
+
+#define djyasinzou_room_15Tex_0068E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_0068E8"
+static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_0068E8[] = djyasinzou_room_15Tex_0068E8;
+
+#define djyasinzou_room_15Tex_006CE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_006CE8"
+static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_006CE8[] = djyasinzou_room_15Tex_006CE8;
+
+#define djyasinzou_room_15Tex_007C98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15Tex_007C98"
+static const ALIGN_ASSET(2) char jyasinzou_room_15Tex_007C98[] = djyasinzou_room_15Tex_007C98;
+
+#define djyasinzou_room_15DL_007970 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15DL_007970"
+static const ALIGN_ASSET(2) char jyasinzou_room_15DL_007970[] = djyasinzou_room_15DL_007970;
+
+#define djyasinzou_room_15DL_000DE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15DL_000DE0"
+static const ALIGN_ASSET(2) char jyasinzou_room_15DL_000DE0[] = djyasinzou_room_15DL_000DE0;
+
+#define djyasinzou_room_15DL_007BC0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15DL_007BC0"
+static const ALIGN_ASSET(2) char jyasinzou_room_15DL_007BC0[] = djyasinzou_room_15DL_007BC0;
+
+#define djyasinzou_room_15DL_002950 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15DL_002950"
+static const ALIGN_ASSET(2) char jyasinzou_room_15DL_002950[] = djyasinzou_room_15DL_002950;
+
+#define djyasinzou_room_15DL_001A68 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15DL_001A68"
+static const ALIGN_ASSET(2) char jyasinzou_room_15DL_001A68[] = djyasinzou_room_15DL_001A68;
+
+#define djyasinzou_room_15DL_002380 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15DL_002380"
+static const ALIGN_ASSET(2) char jyasinzou_room_15DL_002380[] = djyasinzou_room_15DL_002380;
+
+#define djyasinzou_room_15DL_002C10 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15DL_002C10"
+static const ALIGN_ASSET(2) char jyasinzou_room_15DL_002C10[] = djyasinzou_room_15DL_002C10;
+
 #define djyasinzou_room_15DL_002E90 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_15DL_002E90"
 static const ALIGN_ASSET(2) char jyasinzou_room_15DL_002E90[] = djyasinzou_room_15DL_002E90;
 
diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_16.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_16.h
index ac610c97f..fd2e93a5e 100644
--- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_16.h
+++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_16.h
@@ -3,21 +3,33 @@
 
 #include "align_asset_macro.h"
 
-#define djyasinzou_room_16DL_0003F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16DL_0003F0"
-static const ALIGN_ASSET(2) char jyasinzou_room_16DL_0003F0[] = djyasinzou_room_16DL_0003F0;
+#define djyasinzou_room_16Tex_0029B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_0029B8"
+static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_0029B8[] = djyasinzou_room_16Tex_0029B8;
+
+#define djyasinzou_room_16Tex_0039B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_0039B8"
+static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_0039B8[] = djyasinzou_room_16Tex_0039B8;
+
+#define djyasinzou_room_16Tex_0041B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_0041B8"
+static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_0041B8[] = djyasinzou_room_16Tex_0041B8;
 
 #define djyasinzou_room_16Tex_0045B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_0045B8"
 static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_0045B8[] = djyasinzou_room_16Tex_0045B8;
 
+#define djyasinzou_room_16Tex_004DB8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_004DB8"
+static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_004DB8[] = djyasinzou_room_16Tex_004DB8;
+
+#define djyasinzou_room_16Tex_0051B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_0051B8"
+static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_0051B8[] = djyasinzou_room_16Tex_0051B8;
+
 #define djyasinzou_room_16Tex_0059B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_0059B8"
 static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_0059B8[] = djyasinzou_room_16Tex_0059B8;
 
+#define djyasinzou_room_16DL_0003F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16DL_0003F0"
+static const ALIGN_ASSET(2) char jyasinzou_room_16DL_0003F0[] = djyasinzou_room_16DL_0003F0;
+
 #define djyasinzou_room_16DL_0007E0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16DL_0007E0"
 static const ALIGN_ASSET(2) char jyasinzou_room_16DL_0007E0[] = djyasinzou_room_16DL_0007E0;
 
-#define djyasinzou_room_16Tex_0039B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_0039B8"
-static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_0039B8[] = djyasinzou_room_16Tex_0039B8;
-
 #define djyasinzou_room_16DL_000D90 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16DL_000D90"
 static const ALIGN_ASSET(2) char jyasinzou_room_16DL_000D90[] = djyasinzou_room_16DL_000D90;
 
@@ -30,12 +42,6 @@ static const ALIGN_ASSET(2) char jyasinzou_room_16DL_0017D0[] = djyasinzou_room_
 #define djyasinzou_room_16DL_001B40 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16DL_001B40"
 static const ALIGN_ASSET(2) char jyasinzou_room_16DL_001B40[] = djyasinzou_room_16DL_001B40;
 
-#define djyasinzou_room_16Tex_0029B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_0029B8"
-static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_0029B8[] = djyasinzou_room_16Tex_0029B8;
-
-#define djyasinzou_room_16Tex_004DB8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_004DB8"
-static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_004DB8[] = djyasinzou_room_16Tex_004DB8;
-
 #define djyasinzou_room_16DL_001DC0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16DL_001DC0"
 static const ALIGN_ASSET(2) char jyasinzou_room_16DL_001DC0[] = djyasinzou_room_16DL_001DC0;
 
@@ -48,11 +54,5 @@ static const ALIGN_ASSET(2) char jyasinzou_room_16DL_0022C0[] = djyasinzou_room_
 #define djyasinzou_room_16DL_002660 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16DL_002660"
 static const ALIGN_ASSET(2) char jyasinzou_room_16DL_002660[] = djyasinzou_room_16DL_002660;
 
-#define djyasinzou_room_16Tex_0041B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_0041B8"
-static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_0041B8[] = djyasinzou_room_16Tex_0041B8;
-
-#define djyasinzou_room_16Tex_0051B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_16Tex_0051B8"
-static const ALIGN_ASSET(2) char jyasinzou_room_16Tex_0051B8[] = djyasinzou_room_16Tex_0051B8;
-
 
 #endif // DUNGEONS_JYASINZOU_ROOM_16_H
diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_17.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_17.h
index face9bba1..65348408e 100644
--- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_17.h
+++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_17.h
@@ -3,42 +3,42 @@
 
 #include "align_asset_macro.h"
 
-#define djyasinzou_room_17DL_000980 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17DL_000980"
-static const ALIGN_ASSET(2) char jyasinzou_room_17DL_000980[] = djyasinzou_room_17DL_000980;
+#define djyasinzou_room_17Tex_005E50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17Tex_005E50"
+static const ALIGN_ASSET(2) char jyasinzou_room_17Tex_005E50[] = djyasinzou_room_17Tex_005E50;
 
 #define djyasinzou_room_17Tex_006650 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17Tex_006650"
 static const ALIGN_ASSET(2) char jyasinzou_room_17Tex_006650[] = djyasinzou_room_17Tex_006650;
 
+#define djyasinzou_room_17Tex_006E50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17Tex_006E50"
+static const ALIGN_ASSET(2) char jyasinzou_room_17Tex_006E50[] = djyasinzou_room_17Tex_006E50;
+
+#define djyasinzou_room_17Tex_007250 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17Tex_007250"
+static const ALIGN_ASSET(2) char jyasinzou_room_17Tex_007250[] = djyasinzou_room_17Tex_007250;
+
 #define djyasinzou_room_17Tex_007A50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17Tex_007A50"
 static const ALIGN_ASSET(2) char jyasinzou_room_17Tex_007A50[] = djyasinzou_room_17Tex_007A50;
 
 #define djyasinzou_room_17Tex_008250 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17Tex_008250"
 static const ALIGN_ASSET(2) char jyasinzou_room_17Tex_008250[] = djyasinzou_room_17Tex_008250;
 
+#define djyasinzou_room_17Tex_008A50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17Tex_008A50"
+static const ALIGN_ASSET(2) char jyasinzou_room_17Tex_008A50[] = djyasinzou_room_17Tex_008A50;
+
 #define djyasinzou_room_17Tex_008E50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17Tex_008E50"
 static const ALIGN_ASSET(2) char jyasinzou_room_17Tex_008E50[] = djyasinzou_room_17Tex_008E50;
 
+#define djyasinzou_room_17DL_000980 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17DL_000980"
+static const ALIGN_ASSET(2) char jyasinzou_room_17DL_000980[] = djyasinzou_room_17DL_000980;
+
 #define djyasinzou_room_17DL_0011F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17DL_0011F0"
 static const ALIGN_ASSET(2) char jyasinzou_room_17DL_0011F0[] = djyasinzou_room_17DL_0011F0;
 
-#define djyasinzou_room_17Tex_005E50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17Tex_005E50"
-static const ALIGN_ASSET(2) char jyasinzou_room_17Tex_005E50[] = djyasinzou_room_17Tex_005E50;
-
 #define djyasinzou_room_17DL_001850 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17DL_001850"
 static const ALIGN_ASSET(2) char jyasinzou_room_17DL_001850[] = djyasinzou_room_17DL_001850;
 
-#define djyasinzou_room_17Tex_008A50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17Tex_008A50"
-static const ALIGN_ASSET(2) char jyasinzou_room_17Tex_008A50[] = djyasinzou_room_17Tex_008A50;
-
-#define djyasinzou_room_17Tex_006E50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17Tex_006E50"
-static const ALIGN_ASSET(2) char jyasinzou_room_17Tex_006E50[] = djyasinzou_room_17Tex_006E50;
-
 #define djyasinzou_room_17DL_003258 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17DL_003258"
 static const ALIGN_ASSET(2) char jyasinzou_room_17DL_003258[] = djyasinzou_room_17DL_003258;
 
-#define djyasinzou_room_17Tex_007250 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17Tex_007250"
-static const ALIGN_ASSET(2) char jyasinzou_room_17Tex_007250[] = djyasinzou_room_17Tex_007250;
-
 #define djyasinzou_room_17DL_005D38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_17DL_005D38"
 static const ALIGN_ASSET(2) char jyasinzou_room_17DL_005D38[] = djyasinzou_room_17DL_005D38;
 
diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_18.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_18.h
index eaf4a1192..a68fd38be 100644
--- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_18.h
+++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_18.h
@@ -3,8 +3,20 @@
 
 #include "align_asset_macro.h"
 
-#define djyasinzou_room_18DL_000620 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18DL_000620"
-static const ALIGN_ASSET(2) char jyasinzou_room_18DL_000620[] = djyasinzou_room_18DL_000620;
+#define djyasinzou_room_18Tex_0020F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18Tex_0020F0"
+static const ALIGN_ASSET(2) char jyasinzou_room_18Tex_0020F0[] = djyasinzou_room_18Tex_0020F0;
+
+#define djyasinzou_room_18Tex_0028F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18Tex_0028F0"
+static const ALIGN_ASSET(2) char jyasinzou_room_18Tex_0028F0[] = djyasinzou_room_18Tex_0028F0;
+
+#define djyasinzou_room_18Tex_0030F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18Tex_0030F0"
+static const ALIGN_ASSET(2) char jyasinzou_room_18Tex_0030F0[] = djyasinzou_room_18Tex_0030F0;
+
+#define djyasinzou_room_18Tex_0034F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18Tex_0034F0"
+static const ALIGN_ASSET(2) char jyasinzou_room_18Tex_0034F0[] = djyasinzou_room_18Tex_0034F0;
+
+#define djyasinzou_room_18Tex_003CF0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18Tex_003CF0"
+static const ALIGN_ASSET(2) char jyasinzou_room_18Tex_003CF0[] = djyasinzou_room_18Tex_003CF0;
 
 #define djyasinzou_room_18Tex_0044F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18Tex_0044F0"
 static const ALIGN_ASSET(2) char jyasinzou_room_18Tex_0044F0[] = djyasinzou_room_18Tex_0044F0;
@@ -12,27 +24,24 @@ static const ALIGN_ASSET(2) char jyasinzou_room_18Tex_0044F0[] = djyasinzou_room
 #define djyasinzou_room_18Tex_0048F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18Tex_0048F0"
 static const ALIGN_ASSET(2) char jyasinzou_room_18Tex_0048F0[] = djyasinzou_room_18Tex_0048F0;
 
+#define djyasinzou_room_18Tex_0054E0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18Tex_0054E0"
+static const ALIGN_ASSET(2) char jyasinzou_room_18Tex_0054E0[] = djyasinzou_room_18Tex_0054E0;
+
+#define djyasinzou_room_18DL_000620 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18DL_000620"
+static const ALIGN_ASSET(2) char jyasinzou_room_18DL_000620[] = djyasinzou_room_18DL_000620;
+
 #define djyasinzou_room_18DL_000D78 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18DL_000D78"
 static const ALIGN_ASSET(2) char jyasinzou_room_18DL_000D78[] = djyasinzou_room_18DL_000D78;
 
-#define djyasinzou_room_18Tex_0028F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18Tex_0028F0"
-static const ALIGN_ASSET(2) char jyasinzou_room_18Tex_0028F0[] = djyasinzou_room_18Tex_0028F0;
-
 #define djyasinzou_room_18DL_001038 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18DL_001038"
 static const ALIGN_ASSET(2) char jyasinzou_room_18DL_001038[] = djyasinzou_room_18DL_001038;
 
 #define djyasinzou_room_18DL_001418 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18DL_001418"
 static const ALIGN_ASSET(2) char jyasinzou_room_18DL_001418[] = djyasinzou_room_18DL_001418;
 
-#define djyasinzou_room_18Tex_0034F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18Tex_0034F0"
-static const ALIGN_ASSET(2) char jyasinzou_room_18Tex_0034F0[] = djyasinzou_room_18Tex_0034F0;
-
 #define djyasinzou_room_18DL_001690 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18DL_001690"
 static const ALIGN_ASSET(2) char jyasinzou_room_18DL_001690[] = djyasinzou_room_18DL_001690;
 
-#define djyasinzou_room_18Tex_0020F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18Tex_0020F0"
-static const ALIGN_ASSET(2) char jyasinzou_room_18Tex_0020F0[] = djyasinzou_room_18Tex_0020F0;
-
 #define djyasinzou_room_18DL_005170 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18DL_005170"
 static const ALIGN_ASSET(2) char jyasinzou_room_18DL_005170[] = djyasinzou_room_18DL_005170;
 
@@ -42,20 +51,11 @@ static const ALIGN_ASSET(2) char jyasinzou_room_18DL_001900[] = djyasinzou_room_
 #define djyasinzou_room_18DL_005408 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18DL_005408"
 static const ALIGN_ASSET(2) char jyasinzou_room_18DL_005408[] = djyasinzou_room_18DL_005408;
 
-#define djyasinzou_room_18Tex_0054E0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18Tex_0054E0"
-static const ALIGN_ASSET(2) char jyasinzou_room_18Tex_0054E0[] = djyasinzou_room_18Tex_0054E0;
-
 #define djyasinzou_room_18DL_001D20 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18DL_001D20"
 static const ALIGN_ASSET(2) char jyasinzou_room_18DL_001D20[] = djyasinzou_room_18DL_001D20;
 
-#define djyasinzou_room_18Tex_003CF0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18Tex_003CF0"
-static const ALIGN_ASSET(2) char jyasinzou_room_18Tex_003CF0[] = djyasinzou_room_18Tex_003CF0;
-
 #define djyasinzou_room_18DL_001FA8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18DL_001FA8"
 static const ALIGN_ASSET(2) char jyasinzou_room_18DL_001FA8[] = djyasinzou_room_18DL_001FA8;
 
-#define djyasinzou_room_18Tex_0030F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_18Tex_0030F0"
-static const ALIGN_ASSET(2) char jyasinzou_room_18Tex_0030F0[] = djyasinzou_room_18Tex_0030F0;
-
 
 #endif // DUNGEONS_JYASINZOU_ROOM_18_H
diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_19.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_19.h
index 6e442469b..b97097c8d 100644
--- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_19.h
+++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_19.h
@@ -3,14 +3,17 @@
 
 #include "align_asset_macro.h"
 
-#define djyasinzou_room_19DL_0014E0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_19DL_0014E0"
-static const ALIGN_ASSET(2) char jyasinzou_room_19DL_0014E0[] = djyasinzou_room_19DL_0014E0;
+#define djyasinzou_room_19Tex_002DC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_19Tex_002DC8"
+static const ALIGN_ASSET(2) char jyasinzou_room_19Tex_002DC8[] = djyasinzou_room_19Tex_002DC8;
+
+#define djyasinzou_room_19Tex_003DC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_19Tex_003DC8"
+static const ALIGN_ASSET(2) char jyasinzou_room_19Tex_003DC8[] = djyasinzou_room_19Tex_003DC8;
 
 #define djyasinzou_room_19Tex_0045C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_19Tex_0045C8"
 static const ALIGN_ASSET(2) char jyasinzou_room_19Tex_0045C8[] = djyasinzou_room_19Tex_0045C8;
 
-#define djyasinzou_room_19Tex_003DC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_19Tex_003DC8"
-static const ALIGN_ASSET(2) char jyasinzou_room_19Tex_003DC8[] = djyasinzou_room_19Tex_003DC8;
+#define djyasinzou_room_19Tex_004DC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_19Tex_004DC8"
+static const ALIGN_ASSET(2) char jyasinzou_room_19Tex_004DC8[] = djyasinzou_room_19Tex_004DC8;
 
 #define djyasinzou_room_19Tex_0051C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_19Tex_0051C8"
 static const ALIGN_ASSET(2) char jyasinzou_room_19Tex_0051C8[] = djyasinzou_room_19Tex_0051C8;
@@ -18,15 +21,12 @@ static const ALIGN_ASSET(2) char jyasinzou_room_19Tex_0051C8[] = djyasinzou_room
 #define djyasinzou_room_19Tex_0055C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_19Tex_0055C8"
 static const ALIGN_ASSET(2) char jyasinzou_room_19Tex_0055C8[] = djyasinzou_room_19Tex_0055C8;
 
+#define djyasinzou_room_19DL_0014E0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_19DL_0014E0"
+static const ALIGN_ASSET(2) char jyasinzou_room_19DL_0014E0[] = djyasinzou_room_19DL_0014E0;
+
 #define djyasinzou_room_19DL_001FE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_19DL_001FE8"
 static const ALIGN_ASSET(2) char jyasinzou_room_19DL_001FE8[] = djyasinzou_room_19DL_001FE8;
 
-#define djyasinzou_room_19Tex_002DC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_19Tex_002DC8"
-static const ALIGN_ASSET(2) char jyasinzou_room_19Tex_002DC8[] = djyasinzou_room_19Tex_002DC8;
-
-#define djyasinzou_room_19Tex_004DC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_19Tex_004DC8"
-static const ALIGN_ASSET(2) char jyasinzou_room_19Tex_004DC8[] = djyasinzou_room_19Tex_004DC8;
-
 #define djyasinzou_room_19DL_002268 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_19DL_002268"
 static const ALIGN_ASSET(2) char jyasinzou_room_19DL_002268[] = djyasinzou_room_19DL_002268;
 
diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_2.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_2.h
index e93c059d5..90ab76c71 100644
--- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_2.h
+++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_2.h
@@ -3,17 +3,29 @@
 
 #include "align_asset_macro.h"
 
-#define djyasinzou_room_2DL_0006F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2DL_0006F0"
-static const ALIGN_ASSET(2) char jyasinzou_room_2DL_0006F0[] = djyasinzou_room_2DL_0006F0;
+#define djyasinzou_room_2Tex_0023B0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_0023B0"
+static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_0023B0[] = djyasinzou_room_2Tex_0023B0;
+
+#define djyasinzou_room_2Tex_0033B0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_0033B0"
+static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_0033B0[] = djyasinzou_room_2Tex_0033B0;
+
+#define djyasinzou_room_2Tex_003BB0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_003BB0"
+static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_003BB0[] = djyasinzou_room_2Tex_003BB0;
+
+#define djyasinzou_room_2Tex_003FB0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_003FB0"
+static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_003FB0[] = djyasinzou_room_2Tex_003FB0;
 
 #define djyasinzou_room_2Tex_0047B0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_0047B0"
 static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_0047B0[] = djyasinzou_room_2Tex_0047B0;
 
+#define djyasinzou_room_2Tex_004BB0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_004BB0"
+static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_004BB0[] = djyasinzou_room_2Tex_004BB0;
+
 #define djyasinzou_room_2Tex_0053B0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_0053B0"
 static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_0053B0[] = djyasinzou_room_2Tex_0053B0;
 
-#define djyasinzou_room_2Tex_0033B0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_0033B0"
-static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_0033B0[] = djyasinzou_room_2Tex_0033B0;
+#define djyasinzou_room_2DL_0006F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2DL_0006F0"
+static const ALIGN_ASSET(2) char jyasinzou_room_2DL_0006F0[] = djyasinzou_room_2DL_0006F0;
 
 #define djyasinzou_room_2DL_000C58 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2DL_000C58"
 static const ALIGN_ASSET(2) char jyasinzou_room_2DL_000C58[] = djyasinzou_room_2DL_000C58;
@@ -21,21 +33,9 @@ static const ALIGN_ASSET(2) char jyasinzou_room_2DL_000C58[] = djyasinzou_room_2
 #define djyasinzou_room_2DL_001398 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2DL_001398"
 static const ALIGN_ASSET(2) char jyasinzou_room_2DL_001398[] = djyasinzou_room_2DL_001398;
 
-#define djyasinzou_room_2Tex_004BB0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_004BB0"
-static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_004BB0[] = djyasinzou_room_2Tex_004BB0;
-
 #define djyasinzou_room_2DL_001D88 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2DL_001D88"
 static const ALIGN_ASSET(2) char jyasinzou_room_2DL_001D88[] = djyasinzou_room_2DL_001D88;
 
-#define djyasinzou_room_2Tex_003BB0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_003BB0"
-static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_003BB0[] = djyasinzou_room_2Tex_003BB0;
-
-#define djyasinzou_room_2Tex_0023B0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_0023B0"
-static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_0023B0[] = djyasinzou_room_2Tex_0023B0;
-
-#define djyasinzou_room_2Tex_003FB0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_003FB0"
-static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_003FB0[] = djyasinzou_room_2Tex_003FB0;
-
 #define djyasinzou_room_2DL_002170 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2DL_002170"
 static const ALIGN_ASSET(2) char jyasinzou_room_2DL_002170[] = djyasinzou_room_2DL_002170;
 
diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_20.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_20.h
index 9d6ec0806..5a9578848 100644
--- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_20.h
+++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_20.h
@@ -3,17 +3,8 @@
 
 #include "align_asset_macro.h"
 
-#define djyasinzou_room_20DL_000460 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_000460"
-static const ALIGN_ASSET(2) char jyasinzou_room_20DL_000460[] = djyasinzou_room_20DL_000460;
-
-#define djyasinzou_room_20Tex_0051B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0051B8"
-static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0051B8[] = djyasinzou_room_20Tex_0051B8;
-
-#define djyasinzou_room_20DL_000908 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_000908"
-static const ALIGN_ASSET(2) char jyasinzou_room_20DL_000908[] = djyasinzou_room_20DL_000908;
-
-#define djyasinzou_room_20Tex_007DB8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_007DB8"
-static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_007DB8[] = djyasinzou_room_20Tex_007DB8;
+#define djyasinzou_room_20Tex_0031B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0031B8"
+static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0031B8[] = djyasinzou_room_20Tex_0031B8;
 
 #define djyasinzou_room_20Tex_0041B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0041B8"
 static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0041B8[] = djyasinzou_room_20Tex_0041B8;
@@ -21,44 +12,53 @@ static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0041B8[] = djyasinzou_room
 #define djyasinzou_room_20Tex_0049B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0049B8"
 static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0049B8[] = djyasinzou_room_20Tex_0049B8;
 
-#define djyasinzou_room_20DL_000CD8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_000CD8"
-static const ALIGN_ASSET(2) char jyasinzou_room_20DL_000CD8[] = djyasinzou_room_20DL_000CD8;
+#define djyasinzou_room_20Tex_0051B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0051B8"
+static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0051B8[] = djyasinzou_room_20Tex_0051B8;
+
+#define djyasinzou_room_20Tex_0059B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0059B8"
+static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0059B8[] = djyasinzou_room_20Tex_0059B8;
+
+#define djyasinzou_room_20Tex_005DB8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_005DB8"
+static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_005DB8[] = djyasinzou_room_20Tex_005DB8;
+
+#define djyasinzou_room_20Tex_0065B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0065B8"
+static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0065B8[] = djyasinzou_room_20Tex_0065B8;
 
 #define djyasinzou_room_20Tex_0069B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0069B8"
 static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0069B8[] = djyasinzou_room_20Tex_0069B8;
 
+#define djyasinzou_room_20Tex_0079B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0079B8"
+static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0079B8[] = djyasinzou_room_20Tex_0079B8;
+
+#define djyasinzou_room_20Tex_007DB8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_007DB8"
+static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_007DB8[] = djyasinzou_room_20Tex_007DB8;
+
+#define djyasinzou_room_20DL_000460 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_000460"
+static const ALIGN_ASSET(2) char jyasinzou_room_20DL_000460[] = djyasinzou_room_20DL_000460;
+
+#define djyasinzou_room_20DL_000908 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_000908"
+static const ALIGN_ASSET(2) char jyasinzou_room_20DL_000908[] = djyasinzou_room_20DL_000908;
+
+#define djyasinzou_room_20DL_000CD8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_000CD8"
+static const ALIGN_ASSET(2) char jyasinzou_room_20DL_000CD8[] = djyasinzou_room_20DL_000CD8;
+
 #define djyasinzou_room_20DL_000E98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_000E98"
 static const ALIGN_ASSET(2) char jyasinzou_room_20DL_000E98[] = djyasinzou_room_20DL_000E98;
 
 #define djyasinzou_room_20DL_001278 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_001278"
 static const ALIGN_ASSET(2) char jyasinzou_room_20DL_001278[] = djyasinzou_room_20DL_001278;
 
-#define djyasinzou_room_20Tex_0065B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0065B8"
-static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0065B8[] = djyasinzou_room_20Tex_0065B8;
-
 #define djyasinzou_room_20DL_001738 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_001738"
 static const ALIGN_ASSET(2) char jyasinzou_room_20DL_001738[] = djyasinzou_room_20DL_001738;
 
 #define djyasinzou_room_20DL_001AB8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_001AB8"
 static const ALIGN_ASSET(2) char jyasinzou_room_20DL_001AB8[] = djyasinzou_room_20DL_001AB8;
 
-#define djyasinzou_room_20Tex_005DB8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_005DB8"
-static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_005DB8[] = djyasinzou_room_20Tex_005DB8;
-
 #define djyasinzou_room_20DL_0020E0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_0020E0"
 static const ALIGN_ASSET(2) char jyasinzou_room_20DL_0020E0[] = djyasinzou_room_20DL_0020E0;
 
-#define djyasinzou_room_20Tex_0031B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0031B8"
-static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0031B8[] = djyasinzou_room_20Tex_0031B8;
-
-#define djyasinzou_room_20Tex_0059B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0059B8"
-static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0059B8[] = djyasinzou_room_20Tex_0059B8;
-
 #define djyasinzou_room_20DL_002DF8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20DL_002DF8"
 static const ALIGN_ASSET(2) char jyasinzou_room_20DL_002DF8[] = djyasinzou_room_20DL_002DF8;
 
-#define djyasinzou_room_20Tex_0079B8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_20Tex_0079B8"
-static const ALIGN_ASSET(2) char jyasinzou_room_20Tex_0079B8[] = djyasinzou_room_20Tex_0079B8;
-
 
 #endif // DUNGEONS_JYASINZOU_ROOM_20_H
diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_21.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_21.h
index 5fe0e9603..89a16f4ed 100644
--- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_21.h
+++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_21.h
@@ -3,8 +3,14 @@
 
 #include "align_asset_macro.h"
 
-#define djyasinzou_room_21DL_000A80 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21DL_000A80"
-static const ALIGN_ASSET(2) char jyasinzou_room_21DL_000A80[] = djyasinzou_room_21DL_000A80;
+#define djyasinzou_room_21Tex_001660 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21Tex_001660"
+static const ALIGN_ASSET(2) char jyasinzou_room_21Tex_001660[] = djyasinzou_room_21Tex_001660;
+
+#define djyasinzou_room_21Tex_002660 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21Tex_002660"
+static const ALIGN_ASSET(2) char jyasinzou_room_21Tex_002660[] = djyasinzou_room_21Tex_002660;
+
+#define djyasinzou_room_21Tex_002E60 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21Tex_002E60"
+static const ALIGN_ASSET(2) char jyasinzou_room_21Tex_002E60[] = djyasinzou_room_21Tex_002E60;
 
 #define djyasinzou_room_21Tex_003260 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21Tex_003260"
 static const ALIGN_ASSET(2) char jyasinzou_room_21Tex_003260[] = djyasinzou_room_21Tex_003260;
@@ -12,21 +18,15 @@ static const ALIGN_ASSET(2) char jyasinzou_room_21Tex_003260[] = djyasinzou_room
 #define djyasinzou_room_21Tex_003660 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21Tex_003660"
 static const ALIGN_ASSET(2) char jyasinzou_room_21Tex_003660[] = djyasinzou_room_21Tex_003660;
 
-#define djyasinzou_room_21Tex_002660 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21Tex_002660"
-static const ALIGN_ASSET(2) char jyasinzou_room_21Tex_002660[] = djyasinzou_room_21Tex_002660;
-
 #define djyasinzou_room_21Tex_003E60 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21Tex_003E60"
 static const ALIGN_ASSET(2) char jyasinzou_room_21Tex_003E60[] = djyasinzou_room_21Tex_003E60;
 
+#define djyasinzou_room_21DL_000A80 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21DL_000A80"
+static const ALIGN_ASSET(2) char jyasinzou_room_21DL_000A80[] = djyasinzou_room_21DL_000A80;
+
 #define djyasinzou_room_21DL_0012A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21DL_0012A0"
 static const ALIGN_ASSET(2) char jyasinzou_room_21DL_0012A0[] = djyasinzou_room_21DL_0012A0;
 
-#define djyasinzou_room_21Tex_001660 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21Tex_001660"
-static const ALIGN_ASSET(2) char jyasinzou_room_21Tex_001660[] = djyasinzou_room_21Tex_001660;
-
-#define djyasinzou_room_21Tex_002E60 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21Tex_002E60"
-static const ALIGN_ASSET(2) char jyasinzou_room_21Tex_002E60[] = djyasinzou_room_21Tex_002E60;
-
 #define djyasinzou_room_21DL_001520 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21DL_001520"
 static const ALIGN_ASSET(2) char jyasinzou_room_21DL_001520[] = djyasinzou_room_21DL_001520;
 
diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_22.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_22.h
index fba5c9edc..fe74fc2f3 100644
--- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_22.h
+++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_22.h
@@ -3,27 +3,27 @@
 
 #include "align_asset_macro.h"
 
-#define djyasinzou_room_22DL_0005D0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_22DL_0005D0"
-static const ALIGN_ASSET(2) char jyasinzou_room_22DL_0005D0[] = djyasinzou_room_22DL_0005D0;
-
-#define djyasinzou_room_22Tex_002868 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_22Tex_002868"
-static const ALIGN_ASSET(2) char jyasinzou_room_22Tex_002868[] = djyasinzou_room_22Tex_002868;
+#define djyasinzou_room_22Tex_001468 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_22Tex_001468"
+static const ALIGN_ASSET(2) char jyasinzou_room_22Tex_001468[] = djyasinzou_room_22Tex_001468;
 
 #define djyasinzou_room_22Tex_001C68 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_22Tex_001C68"
 static const ALIGN_ASSET(2) char jyasinzou_room_22Tex_001C68[] = djyasinzou_room_22Tex_001C68;
 
-#define djyasinzou_room_22DL_000B30 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_22DL_000B30"
-static const ALIGN_ASSET(2) char jyasinzou_room_22DL_000B30[] = djyasinzou_room_22DL_000B30;
-
 #define djyasinzou_room_22Tex_002468 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_22Tex_002468"
 static const ALIGN_ASSET(2) char jyasinzou_room_22Tex_002468[] = djyasinzou_room_22Tex_002468;
 
+#define djyasinzou_room_22Tex_002868 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_22Tex_002868"
+static const ALIGN_ASSET(2) char jyasinzou_room_22Tex_002868[] = djyasinzou_room_22Tex_002868;
+
+#define djyasinzou_room_22DL_0005D0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_22DL_0005D0"
+static const ALIGN_ASSET(2) char jyasinzou_room_22DL_0005D0[] = djyasinzou_room_22DL_0005D0;
+
+#define djyasinzou_room_22DL_000B30 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_22DL_000B30"
+static const ALIGN_ASSET(2) char jyasinzou_room_22DL_000B30[] = djyasinzou_room_22DL_000B30;
+
 #define djyasinzou_room_22DL_000E48 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_22DL_000E48"
 static const ALIGN_ASSET(2) char jyasinzou_room_22DL_000E48[] = djyasinzou_room_22DL_000E48;
 
-#define djyasinzou_room_22Tex_001468 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_22Tex_001468"
-static const ALIGN_ASSET(2) char jyasinzou_room_22Tex_001468[] = djyasinzou_room_22Tex_001468;
-
 #define djyasinzou_room_22DL_0012C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_22DL_0012C8"
 static const ALIGN_ASSET(2) char jyasinzou_room_22DL_0012C8[] = djyasinzou_room_22DL_0012C8;
 
diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_23.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_23.h
index aa252158c..f8f789a98 100644
--- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_23.h
+++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_23.h
@@ -3,60 +3,63 @@
 
 #include "align_asset_macro.h"
 
-#define djyasinzou_room_23DL_000B48 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23DL_000B48"
-static const ALIGN_ASSET(2) char jyasinzou_room_23DL_000B48[] = djyasinzou_room_23DL_000B48;
-
-#define djyasinzou_room_23Tex_006038 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_006038"
-static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_006038[] = djyasinzou_room_23Tex_006038;
-
 #define djyasinzou_room_23Tex_004438 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_004438"
 static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_004438[] = djyasinzou_room_23Tex_004438;
 
-#define djyasinzou_room_23Tex_008838 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_008838"
-static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_008838[] = djyasinzou_room_23Tex_008838;
-
-#define djyasinzou_room_23DL_0010A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23DL_0010A0"
-static const ALIGN_ASSET(2) char jyasinzou_room_23DL_0010A0[] = djyasinzou_room_23DL_0010A0;
-
-#define djyasinzou_room_23Tex_006438 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_006438"
-static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_006438[] = djyasinzou_room_23Tex_006438;
-
-#define djyasinzou_room_23DL_0012E0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23DL_0012E0"
-static const ALIGN_ASSET(2) char jyasinzou_room_23DL_0012E0[] = djyasinzou_room_23DL_0012E0;
-
 #define djyasinzou_room_23Tex_004C38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_004C38"
 static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_004C38[] = djyasinzou_room_23Tex_004C38;
 
-#define djyasinzou_room_23DL_001550 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23DL_001550"
-static const ALIGN_ASSET(2) char jyasinzou_room_23DL_001550[] = djyasinzou_room_23DL_001550;
+#define djyasinzou_room_23Tex_005438 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_005438"
+static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_005438[] = djyasinzou_room_23Tex_005438;
 
 #define djyasinzou_room_23Tex_005838 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_005838"
 static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_005838[] = djyasinzou_room_23Tex_005838;
 
-#define djyasinzou_room_23DL_001800 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23DL_001800"
-static const ALIGN_ASSET(2) char jyasinzou_room_23DL_001800[] = djyasinzou_room_23DL_001800;
+#define djyasinzou_room_23Tex_006038 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_006038"
+static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_006038[] = djyasinzou_room_23Tex_006038;
+
+#define djyasinzou_room_23Tex_006438 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_006438"
+static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_006438[] = djyasinzou_room_23Tex_006438;
+
+#define djyasinzou_room_23Tex_006C38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_006C38"
+static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_006C38[] = djyasinzou_room_23Tex_006C38;
+
+#define djyasinzou_room_23Tex_007438 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_007438"
+static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_007438[] = djyasinzou_room_23Tex_007438;
 
 #define djyasinzou_room_23Tex_007C38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_007C38"
 static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_007C38[] = djyasinzou_room_23Tex_007C38;
 
+#define djyasinzou_room_23Tex_008038 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_008038"
+static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_008038[] = djyasinzou_room_23Tex_008038;
+
+#define djyasinzou_room_23Tex_008838 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_008838"
+static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_008838[] = djyasinzou_room_23Tex_008838;
+
+#define djyasinzou_room_23DL_000B48 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23DL_000B48"
+static const ALIGN_ASSET(2) char jyasinzou_room_23DL_000B48[] = djyasinzou_room_23DL_000B48;
+
+#define djyasinzou_room_23DL_0010A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23DL_0010A0"
+static const ALIGN_ASSET(2) char jyasinzou_room_23DL_0010A0[] = djyasinzou_room_23DL_0010A0;
+
+#define djyasinzou_room_23DL_0012E0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23DL_0012E0"
+static const ALIGN_ASSET(2) char jyasinzou_room_23DL_0012E0[] = djyasinzou_room_23DL_0012E0;
+
+#define djyasinzou_room_23DL_001550 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23DL_001550"
+static const ALIGN_ASSET(2) char jyasinzou_room_23DL_001550[] = djyasinzou_room_23DL_001550;
+
+#define djyasinzou_room_23DL_001800 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23DL_001800"
+static const ALIGN_ASSET(2) char jyasinzou_room_23DL_001800[] = djyasinzou_room_23DL_001800;
+
 #define djyasinzou_room_23DL_001AE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23DL_001AE8"
 static const ALIGN_ASSET(2) char jyasinzou_room_23DL_001AE8[] = djyasinzou_room_23DL_001AE8;
 
 #define djyasinzou_room_23DL_001E00 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23DL_001E00"
 static const ALIGN_ASSET(2) char jyasinzou_room_23DL_001E00[] = djyasinzou_room_23DL_001E00;
 
-#define djyasinzou_room_23Tex_008038 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_008038"
-static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_008038[] = djyasinzou_room_23Tex_008038;
-
-#define djyasinzou_room_23Tex_007438 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_007438"
-static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_007438[] = djyasinzou_room_23Tex_007438;
-
 #define djyasinzou_room_23DL_002B10 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23DL_002B10"
 static const ALIGN_ASSET(2) char jyasinzou_room_23DL_002B10[] = djyasinzou_room_23DL_002B10;
 
-#define djyasinzou_room_23Tex_006C38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_006C38"
-static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_006C38[] = djyasinzou_room_23Tex_006C38;
-
 #define djyasinzou_room_23DL_009140 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23DL_009140"
 static const ALIGN_ASSET(2) char jyasinzou_room_23DL_009140[] = djyasinzou_room_23DL_009140;
 
@@ -69,9 +72,6 @@ static const ALIGN_ASSET(2) char jyasinzou_room_23DL_0004F0[] = djyasinzou_room_
 #define djyasinzou_room_23DL_003DE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23DL_003DE0"
 static const ALIGN_ASSET(2) char jyasinzou_room_23DL_003DE0[] = djyasinzou_room_23DL_003DE0;
 
-#define djyasinzou_room_23Tex_005438 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23Tex_005438"
-static const ALIGN_ASSET(2) char jyasinzou_room_23Tex_005438[] = djyasinzou_room_23Tex_005438;
-
 #define djyasinzou_room_23DL_004258 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_23DL_004258"
 static const ALIGN_ASSET(2) char jyasinzou_room_23DL_004258[] = djyasinzou_room_23DL_004258;
 
diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_24.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_24.h
index 8cfeb6901..14ceaf04c 100644
--- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_24.h
+++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_24.h
@@ -3,44 +3,44 @@
 
 #include "align_asset_macro.h"
 
-#define djyasinzou_room_24DL_000A30 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24DL_000A30"
-static const ALIGN_ASSET(2) char jyasinzou_room_24DL_000A30[] = djyasinzou_room_24DL_000A30;
+#define djyasinzou_room_24Tex_001B38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_001B38"
+static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_001B38[] = djyasinzou_room_24Tex_001B38;
 
-#define djyasinzou_room_24Tex_004B38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_004B38"
-static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_004B38[] = djyasinzou_room_24Tex_004B38;
+#define djyasinzou_room_24Tex_002B38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_002B38"
+static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_002B38[] = djyasinzou_room_24Tex_002B38;
 
 #define djyasinzou_room_24Tex_003338 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_003338"
 static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_003338[] = djyasinzou_room_24Tex_003338;
 
-#define djyasinzou_room_24Tex_004338 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_004338"
-static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_004338[] = djyasinzou_room_24Tex_004338;
+#define djyasinzou_room_24Tex_003B38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_003B38"
+static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_003B38[] = djyasinzou_room_24Tex_003B38;
 
 #define djyasinzou_room_24Tex_003F38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_003F38"
 static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_003F38[] = djyasinzou_room_24Tex_003F38;
 
+#define djyasinzou_room_24Tex_004338 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_004338"
+static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_004338[] = djyasinzou_room_24Tex_004338;
+
+#define djyasinzou_room_24Tex_004B38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_004B38"
+static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_004B38[] = djyasinzou_room_24Tex_004B38;
+
+#define djyasinzou_room_24Tex_0054D0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_0054D0"
+static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_0054D0[] = djyasinzou_room_24Tex_0054D0;
+
+#define djyasinzou_room_24DL_000A30 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24DL_000A30"
+static const ALIGN_ASSET(2) char jyasinzou_room_24DL_000A30[] = djyasinzou_room_24DL_000A30;
+
 #define djyasinzou_room_24DL_001390 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24DL_001390"
 static const ALIGN_ASSET(2) char jyasinzou_room_24DL_001390[] = djyasinzou_room_24DL_001390;
 
-#define djyasinzou_room_24Tex_001B38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_001B38"
-static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_001B38[] = djyasinzou_room_24Tex_001B38;
-
-#define djyasinzou_room_24Tex_003B38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_003B38"
-static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_003B38[] = djyasinzou_room_24Tex_003B38;
-
 #define djyasinzou_room_24DL_001610 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24DL_001610"
 static const ALIGN_ASSET(2) char jyasinzou_room_24DL_001610[] = djyasinzou_room_24DL_001610;
 
 #define djyasinzou_room_24DL_001950 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24DL_001950"
 static const ALIGN_ASSET(2) char jyasinzou_room_24DL_001950[] = djyasinzou_room_24DL_001950;
 
-#define djyasinzou_room_24Tex_002B38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_002B38"
-static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_002B38[] = djyasinzou_room_24Tex_002B38;
-
 #define djyasinzou_room_24DL_005400 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24DL_005400"
 static const ALIGN_ASSET(2) char jyasinzou_room_24DL_005400[] = djyasinzou_room_24DL_005400;
 
-#define djyasinzou_room_24Tex_0054D0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_0054D0"
-static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_0054D0[] = djyasinzou_room_24Tex_0054D0;
-
 
 #endif // DUNGEONS_JYASINZOU_ROOM_24_H
diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_25.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_25.h
index 1c6fcf821..5e20f5867 100644
--- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_25.h
+++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_25.h
@@ -3,45 +3,105 @@
 
 #include "align_asset_macro.h"
 
-#define djyasinzou_room_25DL_000620 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_000620"
-static const ALIGN_ASSET(2) char jyasinzou_room_25DL_000620[] = djyasinzou_room_25DL_000620;
+#define djyasinzou_room_25Tex_00BA98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00BA98"
+static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00BA98[] = djyasinzou_room_25Tex_00BA98;
 
-#define djyasinzou_room_25Tex_015398 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_015398"
-static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_015398[] = djyasinzou_room_25Tex_015398;
-
-#define djyasinzou_room_25DL_000F10 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_000F10"
-static const ALIGN_ASSET(2) char jyasinzou_room_25DL_000F10[] = djyasinzou_room_25DL_000F10;
-
-#define djyasinzou_room_25Tex_011398 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_011398"
-static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_011398[] = djyasinzou_room_25Tex_011398;
+#define djyasinzou_room_25Tex_00BE98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00BE98"
+static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00BE98[] = djyasinzou_room_25Tex_00BE98;
 
 #define djyasinzou_room_25Tex_00CE98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00CE98"
 static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00CE98[] = djyasinzou_room_25Tex_00CE98;
 
+#define djyasinzou_room_25Tex_00D698 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00D698"
+static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00D698[] = djyasinzou_room_25Tex_00D698;
+
+#define djyasinzou_room_25Tex_00DA98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00DA98"
+static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00DA98[] = djyasinzou_room_25Tex_00DA98;
+
+#define djyasinzou_room_25Tex_00DE98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00DE98"
+static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00DE98[] = djyasinzou_room_25Tex_00DE98;
+
 #define djyasinzou_room_25Tex_00E698 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00E698"
 static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00E698[] = djyasinzou_room_25Tex_00E698;
 
+#define djyasinzou_room_25Tex_00EE98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00EE98"
+static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00EE98[] = djyasinzou_room_25Tex_00EE98;
+
+#define djyasinzou_room_25Tex_00F298 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00F298"
+static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00F298[] = djyasinzou_room_25Tex_00F298;
+
+#define djyasinzou_room_25Tex_00F698 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00F698"
+static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00F698[] = djyasinzou_room_25Tex_00F698;
+
+#define djyasinzou_room_25Tex_00FE98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00FE98"
+static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00FE98[] = djyasinzou_room_25Tex_00FE98;
+
+#define djyasinzou_room_25Tex_00FF98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00FF98"
+static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00FF98[] = djyasinzou_room_25Tex_00FF98;
+
+#define djyasinzou_room_25Tex_010398 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_010398"
+static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_010398[] = djyasinzou_room_25Tex_010398;
+
+#define djyasinzou_room_25Tex_010798 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_010798"
+static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_010798[] = djyasinzou_room_25Tex_010798;
+
+#define djyasinzou_room_25Tex_010B98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_010B98"
+static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_010B98[] = djyasinzou_room_25Tex_010B98;
+
+#define djyasinzou_room_25Tex_010F98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_010F98"
+static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_010F98[] = djyasinzou_room_25Tex_010F98;
+
+#define djyasinzou_room_25Tex_011398 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_011398"
+static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_011398[] = djyasinzou_room_25Tex_011398;
+
+#define djyasinzou_room_25Tex_011798 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_011798"
+static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_011798[] = djyasinzou_room_25Tex_011798;
+
+#define djyasinzou_room_25Tex_011F98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_011F98"
+static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_011F98[] = djyasinzou_room_25Tex_011F98;
+
+#define djyasinzou_room_25Tex_012798 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_012798"
+static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_012798[] = djyasinzou_room_25Tex_012798;
+
+#define djyasinzou_room_25Tex_012B98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_012B98"
+static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_012B98[] = djyasinzou_room_25Tex_012B98;
+
+#define djyasinzou_room_25Tex_013398 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_013398"
+static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_013398[] = djyasinzou_room_25Tex_013398;
+
+#define djyasinzou_room_25Tex_013B98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_013B98"
+static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_013B98[] = djyasinzou_room_25Tex_013B98;
+
+#define djyasinzou_room_25Tex_014398 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_014398"
+static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_014398[] = djyasinzou_room_25Tex_014398;
+
 #define djyasinzou_room_25Tex_014798 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_014798"
 static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_014798[] = djyasinzou_room_25Tex_014798;
 
+#define djyasinzou_room_25Tex_014F98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_014F98"
+static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_014F98[] = djyasinzou_room_25Tex_014F98;
+
+#define djyasinzou_room_25Tex_015398 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_015398"
+static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_015398[] = djyasinzou_room_25Tex_015398;
+
+#define djyasinzou_room_25TLUT_00B8A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25TLUT_00B8A0"
+static const ALIGN_ASSET(2) char jyasinzou_room_25TLUT_00B8A0[] = djyasinzou_room_25TLUT_00B8A0;
+
+#define djyasinzou_room_25DL_000620 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_000620"
+static const ALIGN_ASSET(2) char jyasinzou_room_25DL_000620[] = djyasinzou_room_25DL_000620;
+
+#define djyasinzou_room_25DL_000F10 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_000F10"
+static const ALIGN_ASSET(2) char jyasinzou_room_25DL_000F10[] = djyasinzou_room_25DL_000F10;
+
 #define djyasinzou_room_25DL_0019A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_0019A0"
 static const ALIGN_ASSET(2) char jyasinzou_room_25DL_0019A0[] = djyasinzou_room_25DL_0019A0;
 
 #define djyasinzou_room_25DL_001E00 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_001E00"
 static const ALIGN_ASSET(2) char jyasinzou_room_25DL_001E00[] = djyasinzou_room_25DL_001E00;
 
-#define djyasinzou_room_25Tex_013398 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_013398"
-static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_013398[] = djyasinzou_room_25Tex_013398;
-
-#define djyasinzou_room_25Tex_011F98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_011F98"
-static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_011F98[] = djyasinzou_room_25Tex_011F98;
-
 #define djyasinzou_room_25DL_002418 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_002418"
 static const ALIGN_ASSET(2) char jyasinzou_room_25DL_002418[] = djyasinzou_room_25DL_002418;
 
-#define djyasinzou_room_25Tex_011798 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_011798"
-static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_011798[] = djyasinzou_room_25Tex_011798;
-
 #define djyasinzou_room_25DL_002610 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_002610"
 static const ALIGN_ASSET(2) char jyasinzou_room_25DL_002610[] = djyasinzou_room_25DL_002610;
 
@@ -54,21 +114,12 @@ static const ALIGN_ASSET(2) char jyasinzou_room_25DL_002A00[] = djyasinzou_room_
 #define djyasinzou_room_25DL_002C78 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_002C78"
 static const ALIGN_ASSET(2) char jyasinzou_room_25DL_002C78[] = djyasinzou_room_25DL_002C78;
 
-#define djyasinzou_room_25Tex_00BA98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00BA98"
-static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00BA98[] = djyasinzou_room_25Tex_00BA98;
-
 #define djyasinzou_room_25DL_002ED8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_002ED8"
 static const ALIGN_ASSET(2) char jyasinzou_room_25DL_002ED8[] = djyasinzou_room_25DL_002ED8;
 
-#define djyasinzou_room_25Tex_014398 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_014398"
-static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_014398[] = djyasinzou_room_25Tex_014398;
-
 #define djyasinzou_room_25DL_003298 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_003298"
 static const ALIGN_ASSET(2) char jyasinzou_room_25DL_003298[] = djyasinzou_room_25DL_003298;
 
-#define djyasinzou_room_25Tex_00DE98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00DE98"
-static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00DE98[] = djyasinzou_room_25Tex_00DE98;
-
 #define djyasinzou_room_25DL_0034D0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_0034D0"
 static const ALIGN_ASSET(2) char jyasinzou_room_25DL_0034D0[] = djyasinzou_room_25DL_0034D0;
 
@@ -78,15 +129,6 @@ static const ALIGN_ASSET(2) char jyasinzou_room_25DL_0038F0[] = djyasinzou_room_
 #define djyasinzou_room_25DL_0041F8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_0041F8"
 static const ALIGN_ASSET(2) char jyasinzou_room_25DL_0041F8[] = djyasinzou_room_25DL_0041F8;
 
-#define djyasinzou_room_25Tex_012B98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_012B98"
-static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_012B98[] = djyasinzou_room_25Tex_012B98;
-
-#define djyasinzou_room_25Tex_012798 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_012798"
-static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_012798[] = djyasinzou_room_25Tex_012798;
-
-#define djyasinzou_room_25Tex_013B98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_013B98"
-static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_013B98[] = djyasinzou_room_25Tex_013B98;
-
 #define djyasinzou_room_25DL_004B60 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_004B60"
 static const ALIGN_ASSET(2) char jyasinzou_room_25DL_004B60[] = djyasinzou_room_25DL_004B60;
 
@@ -99,89 +141,47 @@ static const ALIGN_ASSET(2) char jyasinzou_room_25DL_005050[] = djyasinzou_room_
 #define djyasinzou_room_25DL_005340 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_005340"
 static const ALIGN_ASSET(2) char jyasinzou_room_25DL_005340[] = djyasinzou_room_25DL_005340;
 
-#define djyasinzou_room_25Tex_00DA98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00DA98"
-static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00DA98[] = djyasinzou_room_25Tex_00DA98;
-
-#define djyasinzou_room_25TLUT_00B8A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25TLUT_00B8A0"
-static const ALIGN_ASSET(2) char jyasinzou_room_25TLUT_00B8A0[] = djyasinzou_room_25TLUT_00B8A0;
-
 #define djyasinzou_room_25DL_005670 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_005670"
 static const ALIGN_ASSET(2) char jyasinzou_room_25DL_005670[] = djyasinzou_room_25DL_005670;
 
-#define djyasinzou_room_25Tex_010398 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_010398"
-static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_010398[] = djyasinzou_room_25Tex_010398;
-
 #define djyasinzou_room_25DL_0059D0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_0059D0"
 static const ALIGN_ASSET(2) char jyasinzou_room_25DL_0059D0[] = djyasinzou_room_25DL_0059D0;
 
 #define djyasinzou_room_25DL_005E28 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_005E28"
 static const ALIGN_ASSET(2) char jyasinzou_room_25DL_005E28[] = djyasinzou_room_25DL_005E28;
 
-#define djyasinzou_room_25Tex_00F698 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00F698"
-static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00F698[] = djyasinzou_room_25Tex_00F698;
-
 #define djyasinzou_room_25DL_006400 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_006400"
 static const ALIGN_ASSET(2) char jyasinzou_room_25DL_006400[] = djyasinzou_room_25DL_006400;
 
 #define djyasinzou_room_25DL_006E18 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_006E18"
 static const ALIGN_ASSET(2) char jyasinzou_room_25DL_006E18[] = djyasinzou_room_25DL_006E18;
 
-#define djyasinzou_room_25Tex_00F298 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00F298"
-static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00F298[] = djyasinzou_room_25Tex_00F298;
-
-#define djyasinzou_room_25Tex_010798 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_010798"
-static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_010798[] = djyasinzou_room_25Tex_010798;
-
 #define djyasinzou_room_25DL_0076A8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_0076A8"
 static const ALIGN_ASSET(2) char jyasinzou_room_25DL_0076A8[] = djyasinzou_room_25DL_0076A8;
 
-#define djyasinzou_room_25Tex_010B98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_010B98"
-static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_010B98[] = djyasinzou_room_25Tex_010B98;
-
 #define djyasinzou_room_25DL_007958 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_007958"
 static const ALIGN_ASSET(2) char jyasinzou_room_25DL_007958[] = djyasinzou_room_25DL_007958;
 
-#define djyasinzou_room_25Tex_00FE98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00FE98"
-static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00FE98[] = djyasinzou_room_25Tex_00FE98;
-
 #define djyasinzou_room_25DL_007DF0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_007DF0"
 static const ALIGN_ASSET(2) char jyasinzou_room_25DL_007DF0[] = djyasinzou_room_25DL_007DF0;
 
 #define djyasinzou_room_25DL_0083F8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_0083F8"
 static const ALIGN_ASSET(2) char jyasinzou_room_25DL_0083F8[] = djyasinzou_room_25DL_0083F8;
 
-#define djyasinzou_room_25Tex_00FF98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00FF98"
-static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00FF98[] = djyasinzou_room_25Tex_00FF98;
-
-#define djyasinzou_room_25Tex_010F98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_010F98"
-static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_010F98[] = djyasinzou_room_25Tex_010F98;
-
 #define djyasinzou_room_25DL_008C30 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_008C30"
 static const ALIGN_ASSET(2) char jyasinzou_room_25DL_008C30[] = djyasinzou_room_25DL_008C30;
 
 #define djyasinzou_room_25DL_009010 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_009010"
 static const ALIGN_ASSET(2) char jyasinzou_room_25DL_009010[] = djyasinzou_room_25DL_009010;
 
-#define djyasinzou_room_25Tex_00EE98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00EE98"
-static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00EE98[] = djyasinzou_room_25Tex_00EE98;
-
 #define djyasinzou_room_25DL_009248 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_009248"
 static const ALIGN_ASSET(2) char jyasinzou_room_25DL_009248[] = djyasinzou_room_25DL_009248;
 
 #define djyasinzou_room_25DL_00A0E0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_00A0E0"
 static const ALIGN_ASSET(2) char jyasinzou_room_25DL_00A0E0[] = djyasinzou_room_25DL_00A0E0;
 
-#define djyasinzou_room_25Tex_00D698 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00D698"
-static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00D698[] = djyasinzou_room_25Tex_00D698;
-
-#define djyasinzou_room_25Tex_014F98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_014F98"
-static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_014F98[] = djyasinzou_room_25Tex_014F98;
-
 #define djyasinzou_room_25DL_00B540 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25DL_00B540"
 static const ALIGN_ASSET(2) char jyasinzou_room_25DL_00B540[] = djyasinzou_room_25DL_00B540;
 
-#define djyasinzou_room_25Tex_00BE98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_25Tex_00BE98"
-static const ALIGN_ASSET(2) char jyasinzou_room_25Tex_00BE98[] = djyasinzou_room_25Tex_00BE98;
-
 
 #endif // DUNGEONS_JYASINZOU_ROOM_25_H
diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_26.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_26.h
index 9d9f96be5..be788a764 100644
--- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_26.h
+++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_26.h
@@ -3,14 +3,47 @@
 
 #include "align_asset_macro.h"
 
-#define djyasinzou_room_26DL_005468 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_005468"
-static const ALIGN_ASSET(2) char jyasinzou_room_26DL_005468[] = djyasinzou_room_26DL_005468;
+#define djyasinzou_room_26Tex_006CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_006CC8"
+static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_006CC8[] = djyasinzou_room_26Tex_006CC8;
+
+#define djyasinzou_room_26Tex_0070C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_0070C8"
+static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_0070C8[] = djyasinzou_room_26Tex_0070C8;
+
+#define djyasinzou_room_26Tex_0080C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_0080C8"
+static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_0080C8[] = djyasinzou_room_26Tex_0080C8;
+
+#define djyasinzou_room_26Tex_0082C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_0082C8"
+static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_0082C8[] = djyasinzou_room_26Tex_0082C8;
+
+#define djyasinzou_room_26Tex_008AC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_008AC8"
+static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_008AC8[] = djyasinzou_room_26Tex_008AC8;
+
+#define djyasinzou_room_26Tex_008CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_008CC8"
+static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_008CC8[] = djyasinzou_room_26Tex_008CC8;
+
+#define djyasinzou_room_26Tex_0094C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_0094C8"
+static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_0094C8[] = djyasinzou_room_26Tex_0094C8;
+
+#define djyasinzou_room_26Tex_009CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_009CC8"
+static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_009CC8[] = djyasinzou_room_26Tex_009CC8;
+
+#define djyasinzou_room_26Tex_00A0C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_00A0C8"
+static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_00A0C8[] = djyasinzou_room_26Tex_00A0C8;
 
 #define djyasinzou_room_26Tex_00A8C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_00A8C8"
 static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_00A8C8[] = djyasinzou_room_26Tex_00A8C8;
 
-#define djyasinzou_room_26Tex_008CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_008CC8"
-static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_008CC8[] = djyasinzou_room_26Tex_008CC8;
+#define djyasinzou_room_26Tex_00ACC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_00ACC8"
+static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_00ACC8[] = djyasinzou_room_26Tex_00ACC8;
+
+#define djyasinzou_room_26Tex_00B4C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_00B4C8"
+static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_00B4C8[] = djyasinzou_room_26Tex_00B4C8;
+
+#define djyasinzou_room_26Tex_00C2F8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_00C2F8"
+static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_00C2F8[] = djyasinzou_room_26Tex_00C2F8;
+
+#define djyasinzou_room_26DL_005468 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_005468"
+static const ALIGN_ASSET(2) char jyasinzou_room_26DL_005468[] = djyasinzou_room_26DL_005468;
 
 #define djyasinzou_room_26DL_001AD0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_001AD0"
 static const ALIGN_ASSET(2) char jyasinzou_room_26DL_001AD0[] = djyasinzou_room_26DL_001AD0;
@@ -18,9 +51,6 @@ static const ALIGN_ASSET(2) char jyasinzou_room_26DL_001AD0[] = djyasinzou_room_
 #define djyasinzou_room_26DL_002290 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_002290"
 static const ALIGN_ASSET(2) char jyasinzou_room_26DL_002290[] = djyasinzou_room_26DL_002290;
 
-#define djyasinzou_room_26Tex_008AC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_008AC8"
-static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_008AC8[] = djyasinzou_room_26Tex_008AC8;
-
 #define djyasinzou_room_26DL_0028C0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_0028C0"
 static const ALIGN_ASSET(2) char jyasinzou_room_26DL_0028C0[] = djyasinzou_room_26DL_0028C0;
 
@@ -48,39 +78,12 @@ static const ALIGN_ASSET(2) char jyasinzou_room_26DL_0035B0[] = djyasinzou_room_
 #define djyasinzou_room_26DL_0046A8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_0046A8"
 static const ALIGN_ASSET(2) char jyasinzou_room_26DL_0046A8[] = djyasinzou_room_26DL_0046A8;
 
-#define djyasinzou_room_26Tex_00A0C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_00A0C8"
-static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_00A0C8[] = djyasinzou_room_26Tex_00A0C8;
-
-#define djyasinzou_room_26Tex_0080C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_0080C8"
-static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_0080C8[] = djyasinzou_room_26Tex_0080C8;
-
-#define djyasinzou_room_26Tex_00ACC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_00ACC8"
-static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_00ACC8[] = djyasinzou_room_26Tex_00ACC8;
-
-#define djyasinzou_room_26Tex_0082C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_0082C8"
-static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_0082C8[] = djyasinzou_room_26Tex_0082C8;
-
-#define djyasinzou_room_26Tex_00B4C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_00B4C8"
-static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_00B4C8[] = djyasinzou_room_26Tex_00B4C8;
-
-#define djyasinzou_room_26Tex_0094C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_0094C8"
-static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_0094C8[] = djyasinzou_room_26Tex_0094C8;
-
-#define djyasinzou_room_26Tex_009CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_009CC8"
-static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_009CC8[] = djyasinzou_room_26Tex_009CC8;
-
 #define djyasinzou_room_26DL_00C200 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_00C200"
 static const ALIGN_ASSET(2) char jyasinzou_room_26DL_00C200[] = djyasinzou_room_26DL_00C200;
 
-#define djyasinzou_room_26Tex_00C2F8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_00C2F8"
-static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_00C2F8[] = djyasinzou_room_26Tex_00C2F8;
-
 #define djyasinzou_room_26DL_005A80 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_005A80"
 static const ALIGN_ASSET(2) char jyasinzou_room_26DL_005A80[] = djyasinzou_room_26DL_005A80;
 
-#define djyasinzou_room_26Tex_006CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_006CC8"
-static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_006CC8[] = djyasinzou_room_26Tex_006CC8;
-
 #define djyasinzou_room_26DL_005D20 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_005D20"
 static const ALIGN_ASSET(2) char jyasinzou_room_26DL_005D20[] = djyasinzou_room_26DL_005D20;
 
@@ -90,9 +93,6 @@ static const ALIGN_ASSET(2) char jyasinzou_room_26DL_005FF0[] = djyasinzou_room_
 #define djyasinzou_room_26DL_006560 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_006560"
 static const ALIGN_ASSET(2) char jyasinzou_room_26DL_006560[] = djyasinzou_room_26DL_006560;
 
-#define djyasinzou_room_26Tex_0070C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26Tex_0070C8"
-static const ALIGN_ASSET(2) char jyasinzou_room_26Tex_0070C8[] = djyasinzou_room_26Tex_0070C8;
-
 #define djyasinzou_room_26DL_006A98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_26DL_006A98"
 static const ALIGN_ASSET(2) char jyasinzou_room_26DL_006A98[] = djyasinzou_room_26DL_006A98;
 
diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_27.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_27.h
index 071317efe..ddcd8f0bc 100644
--- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_27.h
+++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_27.h
@@ -3,6 +3,15 @@
 
 #include "align_asset_macro.h"
 
+#define djyasinzou_room_27Tex_004310 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_27Tex_004310"
+static const ALIGN_ASSET(2) char jyasinzou_room_27Tex_004310[] = djyasinzou_room_27Tex_004310;
+
+#define djyasinzou_room_27Tex_004B10 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_27Tex_004B10"
+static const ALIGN_ASSET(2) char jyasinzou_room_27Tex_004B10[] = djyasinzou_room_27Tex_004B10;
+
+#define djyasinzou_room_27Tex_004F10 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_27Tex_004F10"
+static const ALIGN_ASSET(2) char jyasinzou_room_27Tex_004F10[] = djyasinzou_room_27Tex_004F10;
+
 #define djyasinzou_room_27DL_000598 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_27DL_000598"
 static const ALIGN_ASSET(2) char jyasinzou_room_27DL_000598[] = djyasinzou_room_27DL_000598;
 
@@ -24,20 +33,11 @@ static const ALIGN_ASSET(2) char jyasinzou_room_27DL_001120[] = djyasinzou_room_
 #define djyasinzou_room_27DL_001CB0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_27DL_001CB0"
 static const ALIGN_ASSET(2) char jyasinzou_room_27DL_001CB0[] = djyasinzou_room_27DL_001CB0;
 
-#define djyasinzou_room_27Tex_004310 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_27Tex_004310"
-static const ALIGN_ASSET(2) char jyasinzou_room_27Tex_004310[] = djyasinzou_room_27Tex_004310;
-
-#define djyasinzou_room_27Tex_004F10 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_27Tex_004F10"
-static const ALIGN_ASSET(2) char jyasinzou_room_27Tex_004F10[] = djyasinzou_room_27Tex_004F10;
-
 #define djyasinzou_room_27DL_003138 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_27DL_003138"
 static const ALIGN_ASSET(2) char jyasinzou_room_27DL_003138[] = djyasinzou_room_27DL_003138;
 
 #define djyasinzou_room_27DL_004150 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_27DL_004150"
 static const ALIGN_ASSET(2) char jyasinzou_room_27DL_004150[] = djyasinzou_room_27DL_004150;
 
-#define djyasinzou_room_27Tex_004B10 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_27Tex_004B10"
-static const ALIGN_ASSET(2) char jyasinzou_room_27Tex_004B10[] = djyasinzou_room_27Tex_004B10;
-
 
 #endif // DUNGEONS_JYASINZOU_ROOM_27_H
diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_28.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_28.h
index 70b76b61f..3a06d2535 100644
--- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_28.h
+++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_28.h
@@ -3,38 +3,47 @@
 
 #include "align_asset_macro.h"
 
-#define djyasinzou_room_28DL_000D00 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28DL_000D00"
-static const ALIGN_ASSET(2) char jyasinzou_room_28DL_000D00[] = djyasinzou_room_28DL_000D00;
-
-#define djyasinzou_room_28Tex_007530 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_007530"
-static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_007530[] = djyasinzou_room_28Tex_007530;
-
-#define djyasinzou_room_28Tex_005130 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_005130"
-static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_005130[] = djyasinzou_room_28Tex_005130;
-
-#define djyasinzou_room_28Tex_007E30 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_007E30"
-static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_007E30[] = djyasinzou_room_28Tex_007E30;
-
-#define djyasinzou_room_28DL_001708 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28DL_001708"
-static const ALIGN_ASSET(2) char jyasinzou_room_28DL_001708[] = djyasinzou_room_28DL_001708;
-
-#define djyasinzou_room_28Tex_008630 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_008630"
-static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_008630[] = djyasinzou_room_28Tex_008630;
-
 #define djyasinzou_room_28Tex_004130 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_004130"
 static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_004130[] = djyasinzou_room_28Tex_004130;
 
 #define djyasinzou_room_28Tex_004930 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_004930"
 static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_004930[] = djyasinzou_room_28Tex_004930;
 
-#define djyasinzou_room_28DL_0028A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28DL_0028A0"
-static const ALIGN_ASSET(2) char jyasinzou_room_28DL_0028A0[] = djyasinzou_room_28DL_0028A0;
+#define djyasinzou_room_28Tex_005130 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_005130"
+static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_005130[] = djyasinzou_room_28Tex_005130;
+
+#define djyasinzou_room_28Tex_005930 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_005930"
+static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_005930[] = djyasinzou_room_28Tex_005930;
+
+#define djyasinzou_room_28Tex_006130 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_006130"
+static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_006130[] = djyasinzou_room_28Tex_006130;
+
+#define djyasinzou_room_28Tex_006530 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_006530"
+static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_006530[] = djyasinzou_room_28Tex_006530;
+
+#define djyasinzou_room_28Tex_007530 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_007530"
+static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_007530[] = djyasinzou_room_28Tex_007530;
+
+#define djyasinzou_room_28Tex_007930 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_007930"
+static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_007930[] = djyasinzou_room_28Tex_007930;
 
 #define djyasinzou_room_28Tex_007A30 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_007A30"
 static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_007A30[] = djyasinzou_room_28Tex_007A30;
 
-#define djyasinzou_room_28Tex_007930 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_007930"
-static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_007930[] = djyasinzou_room_28Tex_007930;
+#define djyasinzou_room_28Tex_007E30 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_007E30"
+static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_007E30[] = djyasinzou_room_28Tex_007E30;
+
+#define djyasinzou_room_28Tex_008630 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_008630"
+static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_008630[] = djyasinzou_room_28Tex_008630;
+
+#define djyasinzou_room_28DL_000D00 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28DL_000D00"
+static const ALIGN_ASSET(2) char jyasinzou_room_28DL_000D00[] = djyasinzou_room_28DL_000D00;
+
+#define djyasinzou_room_28DL_001708 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28DL_001708"
+static const ALIGN_ASSET(2) char jyasinzou_room_28DL_001708[] = djyasinzou_room_28DL_001708;
+
+#define djyasinzou_room_28DL_0028A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28DL_0028A0"
+static const ALIGN_ASSET(2) char jyasinzou_room_28DL_0028A0[] = djyasinzou_room_28DL_0028A0;
 
 #define djyasinzou_room_28DL_0032F8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28DL_0032F8"
 static const ALIGN_ASSET(2) char jyasinzou_room_28DL_0032F8[] = djyasinzou_room_28DL_0032F8;
@@ -42,17 +51,8 @@ static const ALIGN_ASSET(2) char jyasinzou_room_28DL_0032F8[] = djyasinzou_room_
 #define djyasinzou_room_28DL_0035D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28DL_0035D8"
 static const ALIGN_ASSET(2) char jyasinzou_room_28DL_0035D8[] = djyasinzou_room_28DL_0035D8;
 
-#define djyasinzou_room_28Tex_006530 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_006530"
-static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_006530[] = djyasinzou_room_28Tex_006530;
-
 #define djyasinzou_room_28DL_003E18 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28DL_003E18"
 static const ALIGN_ASSET(2) char jyasinzou_room_28DL_003E18[] = djyasinzou_room_28DL_003E18;
 
-#define djyasinzou_room_28Tex_006130 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_006130"
-static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_006130[] = djyasinzou_room_28Tex_006130;
-
-#define djyasinzou_room_28Tex_005930 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_005930"
-static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_005930[] = djyasinzou_room_28Tex_005930;
-
 
 #endif // DUNGEONS_JYASINZOU_ROOM_28_H
diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_3.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_3.h
index 64354c57e..d8f9f58c4 100644
--- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_3.h
+++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_3.h
@@ -3,27 +3,27 @@
 
 #include "align_asset_macro.h"
 
-#define djyasinzou_room_3DL_001588 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_3DL_001588"
-static const ALIGN_ASSET(2) char jyasinzou_room_3DL_001588[] = djyasinzou_room_3DL_001588;
-
-#define djyasinzou_room_3Tex_0033C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_3Tex_0033C8"
-static const ALIGN_ASSET(2) char jyasinzou_room_3Tex_0033C8[] = djyasinzou_room_3Tex_0033C8;
-
-#define djyasinzou_room_3DL_001B98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_3DL_001B98"
-static const ALIGN_ASSET(2) char jyasinzou_room_3DL_001B98[] = djyasinzou_room_3DL_001B98;
+#define djyasinzou_room_3Tex_001FC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_3Tex_001FC8"
+static const ALIGN_ASSET(2) char jyasinzou_room_3Tex_001FC8[] = djyasinzou_room_3Tex_001FC8;
 
 #define djyasinzou_room_3Tex_0023C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_3Tex_0023C8"
 static const ALIGN_ASSET(2) char jyasinzou_room_3Tex_0023C8[] = djyasinzou_room_3Tex_0023C8;
 
-#define djyasinzou_room_3Tex_001FC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_3Tex_001FC8"
-static const ALIGN_ASSET(2) char jyasinzou_room_3Tex_001FC8[] = djyasinzou_room_3Tex_001FC8;
+#define djyasinzou_room_3Tex_002BC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_3Tex_002BC8"
+static const ALIGN_ASSET(2) char jyasinzou_room_3Tex_002BC8[] = djyasinzou_room_3Tex_002BC8;
+
+#define djyasinzou_room_3Tex_0033C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_3Tex_0033C8"
+static const ALIGN_ASSET(2) char jyasinzou_room_3Tex_0033C8[] = djyasinzou_room_3Tex_0033C8;
+
+#define djyasinzou_room_3DL_001588 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_3DL_001588"
+static const ALIGN_ASSET(2) char jyasinzou_room_3DL_001588[] = djyasinzou_room_3DL_001588;
+
+#define djyasinzou_room_3DL_001B98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_3DL_001B98"
+static const ALIGN_ASSET(2) char jyasinzou_room_3DL_001B98[] = djyasinzou_room_3DL_001B98;
 
 #define djyasinzou_room_3DL_000A70 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_3DL_000A70"
 static const ALIGN_ASSET(2) char jyasinzou_room_3DL_000A70[] = djyasinzou_room_3DL_000A70;
 
-#define djyasinzou_room_3Tex_002BC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_3Tex_002BC8"
-static const ALIGN_ASSET(2) char jyasinzou_room_3Tex_002BC8[] = djyasinzou_room_3Tex_002BC8;
-
 #define djyasinzou_room_3DL_001150 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_3DL_001150"
 static const ALIGN_ASSET(2) char jyasinzou_room_3DL_001150[] = djyasinzou_room_3DL_001150;
 
diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_4.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_4.h
index 36735173e..ce93be029 100644
--- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_4.h
+++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_4.h
@@ -3,48 +3,48 @@
 
 #include "align_asset_macro.h"
 
-#define djyasinzou_room_4DL_000A80 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4DL_000A80"
-static const ALIGN_ASSET(2) char jyasinzou_room_4DL_000A80[] = djyasinzou_room_4DL_000A80;
-
-#define djyasinzou_room_4Tex_004698 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4Tex_004698"
-static const ALIGN_ASSET(2) char jyasinzou_room_4Tex_004698[] = djyasinzou_room_4Tex_004698;
-
-#define djyasinzou_room_4Tex_005B98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4Tex_005B98"
-static const ALIGN_ASSET(2) char jyasinzou_room_4Tex_005B98[] = djyasinzou_room_4Tex_005B98;
+#define djyasinzou_room_4Tex_003698 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4Tex_003698"
+static const ALIGN_ASSET(2) char jyasinzou_room_4Tex_003698[] = djyasinzou_room_4Tex_003698;
 
 #define djyasinzou_room_4Tex_003E98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4Tex_003E98"
 static const ALIGN_ASSET(2) char jyasinzou_room_4Tex_003E98[] = djyasinzou_room_4Tex_003E98;
 
-#define djyasinzou_room_4Tex_006798 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4Tex_006798"
-static const ALIGN_ASSET(2) char jyasinzou_room_4Tex_006798[] = djyasinzou_room_4Tex_006798;
-
-#define djyasinzou_room_4DL_001240 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4DL_001240"
-static const ALIGN_ASSET(2) char jyasinzou_room_4DL_001240[] = djyasinzou_room_4DL_001240;
-
-#define djyasinzou_room_4Tex_005698 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4Tex_005698"
-static const ALIGN_ASSET(2) char jyasinzou_room_4Tex_005698[] = djyasinzou_room_4Tex_005698;
-
-#define djyasinzou_room_4DL_001858 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4DL_001858"
-static const ALIGN_ASSET(2) char jyasinzou_room_4DL_001858[] = djyasinzou_room_4DL_001858;
-
-#define djyasinzou_room_4Tex_005798 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4Tex_005798"
-static const ALIGN_ASSET(2) char jyasinzou_room_4Tex_005798[] = djyasinzou_room_4Tex_005798;
+#define djyasinzou_room_4Tex_004698 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4Tex_004698"
+static const ALIGN_ASSET(2) char jyasinzou_room_4Tex_004698[] = djyasinzou_room_4Tex_004698;
 
 #define djyasinzou_room_4Tex_004E98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4Tex_004E98"
 static const ALIGN_ASSET(2) char jyasinzou_room_4Tex_004E98[] = djyasinzou_room_4Tex_004E98;
 
-#define djyasinzou_room_4DL_001D50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4DL_001D50"
-static const ALIGN_ASSET(2) char jyasinzou_room_4DL_001D50[] = djyasinzou_room_4DL_001D50;
+#define djyasinzou_room_4Tex_005698 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4Tex_005698"
+static const ALIGN_ASSET(2) char jyasinzou_room_4Tex_005698[] = djyasinzou_room_4Tex_005698;
+
+#define djyasinzou_room_4Tex_005798 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4Tex_005798"
+static const ALIGN_ASSET(2) char jyasinzou_room_4Tex_005798[] = djyasinzou_room_4Tex_005798;
+
+#define djyasinzou_room_4Tex_005B98 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4Tex_005B98"
+static const ALIGN_ASSET(2) char jyasinzou_room_4Tex_005B98[] = djyasinzou_room_4Tex_005B98;
 
 #define djyasinzou_room_4Tex_006398 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4Tex_006398"
 static const ALIGN_ASSET(2) char jyasinzou_room_4Tex_006398[] = djyasinzou_room_4Tex_006398;
 
+#define djyasinzou_room_4Tex_006798 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4Tex_006798"
+static const ALIGN_ASSET(2) char jyasinzou_room_4Tex_006798[] = djyasinzou_room_4Tex_006798;
+
+#define djyasinzou_room_4DL_000A80 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4DL_000A80"
+static const ALIGN_ASSET(2) char jyasinzou_room_4DL_000A80[] = djyasinzou_room_4DL_000A80;
+
+#define djyasinzou_room_4DL_001240 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4DL_001240"
+static const ALIGN_ASSET(2) char jyasinzou_room_4DL_001240[] = djyasinzou_room_4DL_001240;
+
+#define djyasinzou_room_4DL_001858 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4DL_001858"
+static const ALIGN_ASSET(2) char jyasinzou_room_4DL_001858[] = djyasinzou_room_4DL_001858;
+
+#define djyasinzou_room_4DL_001D50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4DL_001D50"
+static const ALIGN_ASSET(2) char jyasinzou_room_4DL_001D50[] = djyasinzou_room_4DL_001D50;
+
 #define djyasinzou_room_4DL_002648 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4DL_002648"
 static const ALIGN_ASSET(2) char jyasinzou_room_4DL_002648[] = djyasinzou_room_4DL_002648;
 
-#define djyasinzou_room_4Tex_003698 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4Tex_003698"
-static const ALIGN_ASSET(2) char jyasinzou_room_4Tex_003698[] = djyasinzou_room_4Tex_003698;
-
 #define djyasinzou_room_4DL_002090 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_4DL_002090"
 static const ALIGN_ASSET(2) char jyasinzou_room_4DL_002090[] = djyasinzou_room_4DL_002090;
 
diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_5.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_5.h
index 5425cf527..f6338782c 100644
--- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_5.h
+++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_5.h
@@ -3,71 +3,104 @@
 
 #include "align_asset_macro.h"
 
-#define djyasinzou_room_5DL_001850 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_001850"
-static const ALIGN_ASSET(2) char jyasinzou_room_5DL_001850[] = djyasinzou_room_5DL_001850;
+#define djyasinzou_room_5Tex_00CBC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00CBC8"
+static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00CBC8[] = djyasinzou_room_5Tex_00CBC8;
+
+#define djyasinzou_room_5Tex_00CFC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00CFC8"
+static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00CFC8[] = djyasinzou_room_5Tex_00CFC8;
 
 #define djyasinzou_room_5Tex_00D7C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00D7C8"
 static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00D7C8[] = djyasinzou_room_5Tex_00D7C8;
 
+#define djyasinzou_room_5Tex_00DBC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00DBC8"
+static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00DBC8[] = djyasinzou_room_5Tex_00DBC8;
+
+#define djyasinzou_room_5Tex_00DFC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00DFC8"
+static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00DFC8[] = djyasinzou_room_5Tex_00DFC8;
+
+#define djyasinzou_room_5Tex_00E7C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00E7C8"
+static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00E7C8[] = djyasinzou_room_5Tex_00E7C8;
+
+#define djyasinzou_room_5Tex_00EFC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00EFC8"
+static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00EFC8[] = djyasinzou_room_5Tex_00EFC8;
+
+#define djyasinzou_room_5Tex_00F3C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00F3C8"
+static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00F3C8[] = djyasinzou_room_5Tex_00F3C8;
+
+#define djyasinzou_room_5Tex_00F7C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00F7C8"
+static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00F7C8[] = djyasinzou_room_5Tex_00F7C8;
+
+#define djyasinzou_room_5Tex_00FFC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00FFC8"
+static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00FFC8[] = djyasinzou_room_5Tex_00FFC8;
+
+#define djyasinzou_room_5Tex_0100C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0100C8"
+static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0100C8[] = djyasinzou_room_5Tex_0100C8;
+
+#define djyasinzou_room_5Tex_0108C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0108C8"
+static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0108C8[] = djyasinzou_room_5Tex_0108C8;
+
+#define djyasinzou_room_5Tex_010CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_010CC8"
+static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_010CC8[] = djyasinzou_room_5Tex_010CC8;
+
+#define djyasinzou_room_5Tex_0110C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0110C8"
+static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0110C8[] = djyasinzou_room_5Tex_0110C8;
+
+#define djyasinzou_room_5Tex_0114C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0114C8"
+static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0114C8[] = djyasinzou_room_5Tex_0114C8;
+
+#define djyasinzou_room_5Tex_0118C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0118C8"
+static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0118C8[] = djyasinzou_room_5Tex_0118C8;
+
+#define djyasinzou_room_5Tex_011CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_011CC8"
+static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_011CC8[] = djyasinzou_room_5Tex_011CC8;
+
+#define djyasinzou_room_5Tex_0124C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0124C8"
+static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0124C8[] = djyasinzou_room_5Tex_0124C8;
+
+#define djyasinzou_room_5Tex_012CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_012CC8"
+static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_012CC8[] = djyasinzou_room_5Tex_012CC8;
+
+#define djyasinzou_room_5Tex_0134C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0134C8"
+static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0134C8[] = djyasinzou_room_5Tex_0134C8;
+
+#define djyasinzou_room_5Tex_0138C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0138C8"
+static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0138C8[] = djyasinzou_room_5Tex_0138C8;
+
+#define djyasinzou_room_5Tex_0140C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0140C8"
+static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0140C8[] = djyasinzou_room_5Tex_0140C8;
+
+#define djyasinzou_room_5Tex_0148C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0148C8"
+static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0148C8[] = djyasinzou_room_5Tex_0148C8;
+
+#define djyasinzou_room_5Tex_0150C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0150C8"
+static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0150C8[] = djyasinzou_room_5Tex_0150C8;
+
 #define djyasinzou_room_5Tex_0158C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0158C8"
 static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0158C8[] = djyasinzou_room_5Tex_0158C8;
 
 #define djyasinzou_room_5Tex_015CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_015CC8"
 static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_015CC8[] = djyasinzou_room_5Tex_015CC8;
 
-#define djyasinzou_room_5Tex_0140C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0140C8"
-static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0140C8[] = djyasinzou_room_5Tex_0140C8;
+#define djyasinzou_room_5Tex_016808 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_016808"
+static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_016808[] = djyasinzou_room_5Tex_016808;
 
-#define djyasinzou_room_5Tex_0134C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0134C8"
-static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0134C8[] = djyasinzou_room_5Tex_0134C8;
-
-#define djyasinzou_room_5Tex_00DFC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00DFC8"
-static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00DFC8[] = djyasinzou_room_5Tex_00DFC8;
-
-#define djyasinzou_room_5Tex_0150C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0150C8"
-static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0150C8[] = djyasinzou_room_5Tex_0150C8;
-
-#define djyasinzou_room_5Tex_012CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_012CC8"
-static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_012CC8[] = djyasinzou_room_5Tex_012CC8;
-
-#define djyasinzou_room_5Tex_0124C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0124C8"
-static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0124C8[] = djyasinzou_room_5Tex_0124C8;
-
-#define djyasinzou_room_5Tex_00CFC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00CFC8"
-static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00CFC8[] = djyasinzou_room_5Tex_00CFC8;
-
-#define djyasinzou_room_5Tex_00E7C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00E7C8"
-static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00E7C8[] = djyasinzou_room_5Tex_00E7C8;
-
-#define djyasinzou_room_5Tex_0148C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0148C8"
-static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0148C8[] = djyasinzou_room_5Tex_0148C8;
-
-#define djyasinzou_room_5DL_0034C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_0034C8"
-static const ALIGN_ASSET(2) char jyasinzou_room_5DL_0034C8[] = djyasinzou_room_5DL_0034C8;
-
-#define djyasinzou_room_5Tex_00EFC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00EFC8"
-static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00EFC8[] = djyasinzou_room_5Tex_00EFC8;
-
-#define djyasinzou_room_5DL_003C50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_003C50"
-static const ALIGN_ASSET(2) char jyasinzou_room_5DL_003C50[] = djyasinzou_room_5DL_003C50;
-
-#define djyasinzou_room_5Tex_00DBC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00DBC8"
-static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00DBC8[] = djyasinzou_room_5Tex_00DBC8;
+#define djyasinzou_room_5Tex_017008 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_017008"
+static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_017008[] = djyasinzou_room_5Tex_017008;
 
 #define djyasinzou_room_5TLUT_00C9B0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5TLUT_00C9B0"
 static const ALIGN_ASSET(2) char jyasinzou_room_5TLUT_00C9B0[] = djyasinzou_room_5TLUT_00C9B0;
 
-#define djyasinzou_room_5Tex_00FFC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00FFC8"
-static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00FFC8[] = djyasinzou_room_5Tex_00FFC8;
+#define djyasinzou_room_5TLUT_00CBA8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5TLUT_00CBA8"
+static const ALIGN_ASSET(2) char jyasinzou_room_5TLUT_00CBA8[] = djyasinzou_room_5TLUT_00CBA8;
 
-#define djyasinzou_room_5Tex_0108C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0108C8"
-static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0108C8[] = djyasinzou_room_5Tex_0108C8;
+#define djyasinzou_room_5DL_001850 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_001850"
+static const ALIGN_ASSET(2) char jyasinzou_room_5DL_001850[] = djyasinzou_room_5DL_001850;
 
-#define djyasinzou_room_5Tex_0118C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0118C8"
-static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0118C8[] = djyasinzou_room_5Tex_0118C8;
+#define djyasinzou_room_5DL_0034C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_0034C8"
+static const ALIGN_ASSET(2) char jyasinzou_room_5DL_0034C8[] = djyasinzou_room_5DL_0034C8;
 
-#define djyasinzou_room_5Tex_0114C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0114C8"
-static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0114C8[] = djyasinzou_room_5Tex_0114C8;
+#define djyasinzou_room_5DL_003C50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_003C50"
+static const ALIGN_ASSET(2) char jyasinzou_room_5DL_003C50[] = djyasinzou_room_5DL_003C50;
 
 #define djyasinzou_room_5DL_004480 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_004480"
 static const ALIGN_ASSET(2) char jyasinzou_room_5DL_004480[] = djyasinzou_room_5DL_004480;
@@ -75,39 +108,18 @@ static const ALIGN_ASSET(2) char jyasinzou_room_5DL_004480[] = djyasinzou_room_5
 #define djyasinzou_room_5DL_005070 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_005070"
 static const ALIGN_ASSET(2) char jyasinzou_room_5DL_005070[] = djyasinzou_room_5DL_005070;
 
-#define djyasinzou_room_5Tex_00F3C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00F3C8"
-static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00F3C8[] = djyasinzou_room_5Tex_00F3C8;
-
-#define djyasinzou_room_5Tex_0100C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0100C8"
-static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0100C8[] = djyasinzou_room_5Tex_0100C8;
-
 #define djyasinzou_room_5DL_005B30 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_005B30"
 static const ALIGN_ASSET(2) char jyasinzou_room_5DL_005B30[] = djyasinzou_room_5DL_005B30;
 
-#define djyasinzou_room_5Tex_011CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_011CC8"
-static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_011CC8[] = djyasinzou_room_5Tex_011CC8;
-
-#define djyasinzou_room_5TLUT_00CBA8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5TLUT_00CBA8"
-static const ALIGN_ASSET(2) char jyasinzou_room_5TLUT_00CBA8[] = djyasinzou_room_5TLUT_00CBA8;
-
 #define djyasinzou_room_5DL_0165B0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_0165B0"
 static const ALIGN_ASSET(2) char jyasinzou_room_5DL_0165B0[] = djyasinzou_room_5DL_0165B0;
 
-#define djyasinzou_room_5Tex_016808 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_016808"
-static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_016808[] = djyasinzou_room_5Tex_016808;
-
 #define djyasinzou_room_5DL_0060E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_0060E8"
 static const ALIGN_ASSET(2) char jyasinzou_room_5DL_0060E8[] = djyasinzou_room_5DL_0060E8;
 
 #define djyasinzou_room_5DL_006F48 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_006F48"
 static const ALIGN_ASSET(2) char jyasinzou_room_5DL_006F48[] = djyasinzou_room_5DL_006F48;
 
-#define djyasinzou_room_5Tex_00F7C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00F7C8"
-static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00F7C8[] = djyasinzou_room_5Tex_00F7C8;
-
-#define djyasinzou_room_5Tex_0110C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0110C8"
-static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0110C8[] = djyasinzou_room_5Tex_0110C8;
-
 #define djyasinzou_room_5DL_007E18 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_007E18"
 static const ALIGN_ASSET(2) char jyasinzou_room_5DL_007E18[] = djyasinzou_room_5DL_007E18;
 
@@ -132,9 +144,6 @@ static const ALIGN_ASSET(2) char jyasinzou_room_5DL_0093B8[] = djyasinzou_room_5
 #define djyasinzou_room_5DL_009688 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_009688"
 static const ALIGN_ASSET(2) char jyasinzou_room_5DL_009688[] = djyasinzou_room_5DL_009688;
 
-#define djyasinzou_room_5Tex_0138C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_0138C8"
-static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_0138C8[] = djyasinzou_room_5Tex_0138C8;
-
 #define djyasinzou_room_5DL_00A018 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_00A018"
 static const ALIGN_ASSET(2) char jyasinzou_room_5DL_00A018[] = djyasinzou_room_5DL_00A018;
 
@@ -147,12 +156,6 @@ static const ALIGN_ASSET(2) char jyasinzou_room_5DL_00B428[] = djyasinzou_room_5
 #define djyasinzou_room_5DL_00BC70 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_00BC70"
 static const ALIGN_ASSET(2) char jyasinzou_room_5DL_00BC70[] = djyasinzou_room_5DL_00BC70;
 
-#define djyasinzou_room_5Tex_010CC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_010CC8"
-static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_010CC8[] = djyasinzou_room_5Tex_010CC8;
-
-#define djyasinzou_room_5Tex_00CBC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_00CBC8"
-static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_00CBC8[] = djyasinzou_room_5Tex_00CBC8;
-
 #define djyasinzou_room_5DL_00C0E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_00C0E8"
 static const ALIGN_ASSET(2) char jyasinzou_room_5DL_00C0E8[] = djyasinzou_room_5DL_00C0E8;
 
@@ -162,8 +165,5 @@ static const ALIGN_ASSET(2) char jyasinzou_room_5DL_00C638[] = djyasinzou_room_5
 #define djyasinzou_room_5DL_016730 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5DL_016730"
 static const ALIGN_ASSET(2) char jyasinzou_room_5DL_016730[] = djyasinzou_room_5DL_016730;
 
-#define djyasinzou_room_5Tex_017008 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_5Tex_017008"
-static const ALIGN_ASSET(2) char jyasinzou_room_5Tex_017008[] = djyasinzou_room_5Tex_017008;
-
 
 #endif // DUNGEONS_JYASINZOU_ROOM_5_H
diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_6.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_6.h
index 36fc78839..8c4a85895 100644
--- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_6.h
+++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_6.h
@@ -3,11 +3,8 @@
 
 #include "align_asset_macro.h"
 
-#define djyasinzou_room_6DL_000340 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6DL_000340"
-static const ALIGN_ASSET(2) char jyasinzou_room_6DL_000340[] = djyasinzou_room_6DL_000340;
-
-#define djyasinzou_room_6DL_0014D0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6DL_0014D0"
-static const ALIGN_ASSET(2) char jyasinzou_room_6DL_0014D0[] = djyasinzou_room_6DL_0014D0;
+#define djyasinzou_room_6Tex_002BE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6Tex_002BE8"
+static const ALIGN_ASSET(2) char jyasinzou_room_6Tex_002BE8[] = djyasinzou_room_6Tex_002BE8;
 
 #define djyasinzou_room_6Tex_0033E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6Tex_0033E8"
 static const ALIGN_ASSET(2) char jyasinzou_room_6Tex_0033E8[] = djyasinzou_room_6Tex_0033E8;
@@ -15,18 +12,21 @@ static const ALIGN_ASSET(2) char jyasinzou_room_6Tex_0033E8[] = djyasinzou_room_
 #define djyasinzou_room_6Tex_0037E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6Tex_0037E8"
 static const ALIGN_ASSET(2) char jyasinzou_room_6Tex_0037E8[] = djyasinzou_room_6Tex_0037E8;
 
-#define djyasinzou_room_6DL_001EC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6DL_001EC8"
-static const ALIGN_ASSET(2) char jyasinzou_room_6DL_001EC8[] = djyasinzou_room_6DL_001EC8;
-
 #define djyasinzou_room_6Tex_003FE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6Tex_003FE8"
 static const ALIGN_ASSET(2) char jyasinzou_room_6Tex_003FE8[] = djyasinzou_room_6Tex_003FE8;
 
+#define djyasinzou_room_6DL_000340 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6DL_000340"
+static const ALIGN_ASSET(2) char jyasinzou_room_6DL_000340[] = djyasinzou_room_6DL_000340;
+
+#define djyasinzou_room_6DL_0014D0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6DL_0014D0"
+static const ALIGN_ASSET(2) char jyasinzou_room_6DL_0014D0[] = djyasinzou_room_6DL_0014D0;
+
+#define djyasinzou_room_6DL_001EC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6DL_001EC8"
+static const ALIGN_ASSET(2) char jyasinzou_room_6DL_001EC8[] = djyasinzou_room_6DL_001EC8;
+
 #define djyasinzou_room_6DL_002420 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6DL_002420"
 static const ALIGN_ASSET(2) char jyasinzou_room_6DL_002420[] = djyasinzou_room_6DL_002420;
 
-#define djyasinzou_room_6Tex_002BE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6Tex_002BE8"
-static const ALIGN_ASSET(2) char jyasinzou_room_6Tex_002BE8[] = djyasinzou_room_6Tex_002BE8;
-
 #define djyasinzou_room_6DL_002950 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6DL_002950"
 static const ALIGN_ASSET(2) char jyasinzou_room_6DL_002950[] = djyasinzou_room_6DL_002950;
 
diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_7.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_7.h
index 2485cf2f5..8a4b789d5 100644
--- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_7.h
+++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_7.h
@@ -3,15 +3,24 @@
 
 #include "align_asset_macro.h"
 
-#define djyasinzou_room_7DL_000390 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7DL_000390"
-static const ALIGN_ASSET(2) char jyasinzou_room_7DL_000390[] = djyasinzou_room_7DL_000390;
-
 #define djyasinzou_room_7Tex_002908 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7Tex_002908"
 static const ALIGN_ASSET(2) char jyasinzou_room_7Tex_002908[] = djyasinzou_room_7Tex_002908;
 
+#define djyasinzou_room_7Tex_003908 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7Tex_003908"
+static const ALIGN_ASSET(2) char jyasinzou_room_7Tex_003908[] = djyasinzou_room_7Tex_003908;
+
+#define djyasinzou_room_7Tex_004108 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7Tex_004108"
+static const ALIGN_ASSET(2) char jyasinzou_room_7Tex_004108[] = djyasinzou_room_7Tex_004108;
+
 #define djyasinzou_room_7Tex_004908 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7Tex_004908"
 static const ALIGN_ASSET(2) char jyasinzou_room_7Tex_004908[] = djyasinzou_room_7Tex_004908;
 
+#define djyasinzou_room_7Tex_004D08 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7Tex_004D08"
+static const ALIGN_ASSET(2) char jyasinzou_room_7Tex_004D08[] = djyasinzou_room_7Tex_004D08;
+
+#define djyasinzou_room_7DL_000390 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7DL_000390"
+static const ALIGN_ASSET(2) char jyasinzou_room_7DL_000390[] = djyasinzou_room_7DL_000390;
+
 #define djyasinzou_room_7DL_000610 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7DL_000610"
 static const ALIGN_ASSET(2) char jyasinzou_room_7DL_000610[] = djyasinzou_room_7DL_000610;
 
@@ -30,15 +39,9 @@ static const ALIGN_ASSET(2) char jyasinzou_room_7DL_001010[] = djyasinzou_room_7
 #define djyasinzou_room_7DL_001310 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7DL_001310"
 static const ALIGN_ASSET(2) char jyasinzou_room_7DL_001310[] = djyasinzou_room_7DL_001310;
 
-#define djyasinzou_room_7Tex_003908 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7Tex_003908"
-static const ALIGN_ASSET(2) char jyasinzou_room_7Tex_003908[] = djyasinzou_room_7Tex_003908;
-
 #define djyasinzou_room_7DL_001980 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7DL_001980"
 static const ALIGN_ASSET(2) char jyasinzou_room_7DL_001980[] = djyasinzou_room_7DL_001980;
 
-#define djyasinzou_room_7Tex_004108 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7Tex_004108"
-static const ALIGN_ASSET(2) char jyasinzou_room_7Tex_004108[] = djyasinzou_room_7Tex_004108;
-
 #define djyasinzou_room_7DL_001FD8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7DL_001FD8"
 static const ALIGN_ASSET(2) char jyasinzou_room_7DL_001FD8[] = djyasinzou_room_7DL_001FD8;
 
@@ -48,8 +51,5 @@ static const ALIGN_ASSET(2) char jyasinzou_room_7DL_002340[] = djyasinzou_room_7
 #define djyasinzou_room_7DL_002630 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7DL_002630"
 static const ALIGN_ASSET(2) char jyasinzou_room_7DL_002630[] = djyasinzou_room_7DL_002630;
 
-#define djyasinzou_room_7Tex_004D08 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_7Tex_004D08"
-static const ALIGN_ASSET(2) char jyasinzou_room_7Tex_004D08[] = djyasinzou_room_7Tex_004D08;
-
 
 #endif // DUNGEONS_JYASINZOU_ROOM_7_H
diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_8.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_8.h
index 508a1b411..8f443d188 100644
--- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_8.h
+++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_8.h
@@ -3,32 +3,41 @@
 
 #include "align_asset_macro.h"
 
-#define djyasinzou_room_8DL_0009F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_0009F0"
-static const ALIGN_ASSET(2) char jyasinzou_room_8DL_0009F0[] = djyasinzou_room_8DL_0009F0;
+#define djyasinzou_room_8Tex_003A50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_003A50"
+static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_003A50[] = djyasinzou_room_8Tex_003A50;
 
-#define djyasinzou_room_8Tex_007250 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_007250"
-static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_007250[] = djyasinzou_room_8Tex_007250;
+#define djyasinzou_room_8Tex_004250 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_004250"
+static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_004250[] = djyasinzou_room_8Tex_004250;
 
-#define djyasinzou_room_8DL_0018D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_0018D8"
-static const ALIGN_ASSET(2) char jyasinzou_room_8DL_0018D8[] = djyasinzou_room_8DL_0018D8;
+#define djyasinzou_room_8Tex_004A50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_004A50"
+static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_004A50[] = djyasinzou_room_8Tex_004A50;
 
-#define djyasinzou_room_8Tex_006A50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_006A50"
-static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_006A50[] = djyasinzou_room_8Tex_006A50;
+#define djyasinzou_room_8Tex_004E50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_004E50"
+static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_004E50[] = djyasinzou_room_8Tex_004E50;
 
 #define djyasinzou_room_8Tex_005650 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_005650"
 static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_005650[] = djyasinzou_room_8Tex_005650;
 
-#define djyasinzou_room_8Tex_006250 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_006250"
-static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_006250[] = djyasinzou_room_8Tex_006250;
-
-#define djyasinzou_room_8DL_0036E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_0036E8"
-static const ALIGN_ASSET(2) char jyasinzou_room_8DL_0036E8[] = djyasinzou_room_8DL_0036E8;
-
 #define djyasinzou_room_8Tex_005E50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_005E50"
 static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_005E50[] = djyasinzou_room_8Tex_005E50;
 
-#define djyasinzou_room_8Tex_004A50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_004A50"
-static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_004A50[] = djyasinzou_room_8Tex_004A50;
+#define djyasinzou_room_8Tex_006250 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_006250"
+static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_006250[] = djyasinzou_room_8Tex_006250;
+
+#define djyasinzou_room_8Tex_006A50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_006A50"
+static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_006A50[] = djyasinzou_room_8Tex_006A50;
+
+#define djyasinzou_room_8Tex_007250 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_007250"
+static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_007250[] = djyasinzou_room_8Tex_007250;
+
+#define djyasinzou_room_8DL_0009F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_0009F0"
+static const ALIGN_ASSET(2) char jyasinzou_room_8DL_0009F0[] = djyasinzou_room_8DL_0009F0;
+
+#define djyasinzou_room_8DL_0018D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_0018D8"
+static const ALIGN_ASSET(2) char jyasinzou_room_8DL_0018D8[] = djyasinzou_room_8DL_0018D8;
+
+#define djyasinzou_room_8DL_0036E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_0036E8"
+static const ALIGN_ASSET(2) char jyasinzou_room_8DL_0036E8[] = djyasinzou_room_8DL_0036E8;
 
 #define djyasinzou_room_8DL_002350 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_002350"
 static const ALIGN_ASSET(2) char jyasinzou_room_8DL_002350[] = djyasinzou_room_8DL_002350;
@@ -36,24 +45,15 @@ static const ALIGN_ASSET(2) char jyasinzou_room_8DL_002350[] = djyasinzou_room_8
 #define djyasinzou_room_8DL_002720 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_002720"
 static const ALIGN_ASSET(2) char jyasinzou_room_8DL_002720[] = djyasinzou_room_8DL_002720;
 
-#define djyasinzou_room_8Tex_003A50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_003A50"
-static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_003A50[] = djyasinzou_room_8Tex_003A50;
-
 #define djyasinzou_room_8DL_0028E0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_0028E0"
 static const ALIGN_ASSET(2) char jyasinzou_room_8DL_0028E0[] = djyasinzou_room_8DL_0028E0;
 
-#define djyasinzou_room_8Tex_004E50 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_004E50"
-static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_004E50[] = djyasinzou_room_8Tex_004E50;
-
 #define djyasinzou_room_8DL_002B90 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_002B90"
 static const ALIGN_ASSET(2) char jyasinzou_room_8DL_002B90[] = djyasinzou_room_8DL_002B90;
 
 #define djyasinzou_room_8DL_002D70 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_002D70"
 static const ALIGN_ASSET(2) char jyasinzou_room_8DL_002D70[] = djyasinzou_room_8DL_002D70;
 
-#define djyasinzou_room_8Tex_004250 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8Tex_004250"
-static const ALIGN_ASSET(2) char jyasinzou_room_8Tex_004250[] = djyasinzou_room_8Tex_004250;
-
 #define djyasinzou_room_8DL_007ED0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_8DL_007ED0"
 static const ALIGN_ASSET(2) char jyasinzou_room_8DL_007ED0[] = djyasinzou_room_8DL_007ED0;
 
diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_9.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_9.h
index fdbd749c8..5ad9d38cb 100644
--- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_9.h
+++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_9.h
@@ -3,14 +3,17 @@
 
 #include "align_asset_macro.h"
 
-#define djyasinzou_room_9DL_0014E0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9DL_0014E0"
-static const ALIGN_ASSET(2) char jyasinzou_room_9DL_0014E0[] = djyasinzou_room_9DL_0014E0;
+#define djyasinzou_room_9Tex_002DC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9Tex_002DC8"
+static const ALIGN_ASSET(2) char jyasinzou_room_9Tex_002DC8[] = djyasinzou_room_9Tex_002DC8;
+
+#define djyasinzou_room_9Tex_003DC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9Tex_003DC8"
+static const ALIGN_ASSET(2) char jyasinzou_room_9Tex_003DC8[] = djyasinzou_room_9Tex_003DC8;
 
 #define djyasinzou_room_9Tex_0045C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9Tex_0045C8"
 static const ALIGN_ASSET(2) char jyasinzou_room_9Tex_0045C8[] = djyasinzou_room_9Tex_0045C8;
 
-#define djyasinzou_room_9Tex_003DC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9Tex_003DC8"
-static const ALIGN_ASSET(2) char jyasinzou_room_9Tex_003DC8[] = djyasinzou_room_9Tex_003DC8;
+#define djyasinzou_room_9Tex_004DC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9Tex_004DC8"
+static const ALIGN_ASSET(2) char jyasinzou_room_9Tex_004DC8[] = djyasinzou_room_9Tex_004DC8;
 
 #define djyasinzou_room_9Tex_0051C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9Tex_0051C8"
 static const ALIGN_ASSET(2) char jyasinzou_room_9Tex_0051C8[] = djyasinzou_room_9Tex_0051C8;
@@ -18,15 +21,12 @@ static const ALIGN_ASSET(2) char jyasinzou_room_9Tex_0051C8[] = djyasinzou_room_
 #define djyasinzou_room_9Tex_0055C8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9Tex_0055C8"
 static const ALIGN_ASSET(2) char jyasinzou_room_9Tex_0055C8[] = djyasinzou_room_9Tex_0055C8;
 
+#define djyasinzou_room_9DL_0014E0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9DL_0014E0"
+static const ALIGN_ASSET(2) char jyasinzou_room_9DL_0014E0[] = djyasinzou_room_9DL_0014E0;
+
 #define djyasinzou_room_9DL_001FE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9DL_001FE8"
 static const ALIGN_ASSET(2) char jyasinzou_room_9DL_001FE8[] = djyasinzou_room_9DL_001FE8;
 
-#define djyasinzou_room_9Tex_002DC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9Tex_002DC8"
-static const ALIGN_ASSET(2) char jyasinzou_room_9Tex_002DC8[] = djyasinzou_room_9Tex_002DC8;
-
-#define djyasinzou_room_9Tex_004DC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9Tex_004DC8"
-static const ALIGN_ASSET(2) char jyasinzou_room_9Tex_004DC8[] = djyasinzou_room_9Tex_004DC8;
-
 #define djyasinzou_room_9DL_002268 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_9DL_002268"
 static const ALIGN_ASSET(2) char jyasinzou_room_9DL_002268[] = djyasinzou_room_9DL_002268;
 
diff --git a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_scene.h b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_scene.h
index fa52d8cac..17d673a35 100644
--- a/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_scene.h
+++ b/soh/assets/scenes/dungeons/jyasinzou/jyasinzou_scene.h
@@ -3,6 +3,27 @@
 
 #include "align_asset_macro.h"
 
+#define djyasinzou_sceneTex_018820 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTex_018820"
+static const ALIGN_ASSET(2) char jyasinzou_sceneTex_018820[] = djyasinzou_sceneTex_018820;
+
+#define djyasinzou_sceneTex_019120 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTex_019120"
+static const ALIGN_ASSET(2) char jyasinzou_sceneTex_019120[] = djyasinzou_sceneTex_019120;
+
+#define djyasinzou_sceneTex_019320 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTex_019320"
+static const ALIGN_ASSET(2) char jyasinzou_sceneTex_019320[] = djyasinzou_sceneTex_019320;
+
+#define djyasinzou_sceneTLUT_017BE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTLUT_017BE0"
+static const ALIGN_ASSET(2) char jyasinzou_sceneTLUT_017BE0[] = djyasinzou_sceneTLUT_017BE0;
+
+#define djyasinzou_sceneTLUT_017DE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTLUT_017DE0"
+static const ALIGN_ASSET(2) char jyasinzou_sceneTLUT_017DE0[] = djyasinzou_sceneTLUT_017DE0;
+
+#define djyasinzou_sceneTLUT_017FE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTLUT_017FE0"
+static const ALIGN_ASSET(2) char jyasinzou_sceneTLUT_017FE0[] = djyasinzou_sceneTLUT_017FE0;
+
+#define djyasinzou_sceneTLUT_018000 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTLUT_018000"
+static const ALIGN_ASSET(2) char jyasinzou_sceneTLUT_018000[] = djyasinzou_sceneTLUT_018000;
+
 #define dgSpiritTempleDayEntranceTex "__OTR__scenes/nonmq/jyasinzou_scene/gSpiritTempleDayEntranceTex"
 static const ALIGN_ASSET(2) char gSpiritTempleDayEntranceTex[] = dgSpiritTempleDayEntranceTex;
 
@@ -12,25 +33,5 @@ static const ALIGN_ASSET(2) char gSpiritTempleNightEntranceTex[] = dgSpiritTempl
 #define djyasinzou_sceneCollisionHeader_01680C "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneCollisionHeader_01680C"
 static const ALIGN_ASSET(2) char jyasinzou_sceneCollisionHeader_01680C[] = djyasinzou_sceneCollisionHeader_01680C;
 
-#define djyasinzou_sceneTLUT_017BE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTLUT_017BE0"
-static const ALIGN_ASSET(2) char jyasinzou_sceneTLUT_017BE0[] = djyasinzou_sceneTLUT_017BE0;
-
-#define djyasinzou_sceneTLUT_018000 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTLUT_018000"
-static const ALIGN_ASSET(2) char jyasinzou_sceneTLUT_018000[] = djyasinzou_sceneTLUT_018000;
-
-#define djyasinzou_sceneTex_019320 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTex_019320"
-static const ALIGN_ASSET(2) char jyasinzou_sceneTex_019320[] = djyasinzou_sceneTex_019320;
-
-#define djyasinzou_sceneTex_018820 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTex_018820"
-static const ALIGN_ASSET(2) char jyasinzou_sceneTex_018820[] = djyasinzou_sceneTex_018820;
-
-#define djyasinzou_sceneTLUT_017DE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTLUT_017DE0"
-static const ALIGN_ASSET(2) char jyasinzou_sceneTLUT_017DE0[] = djyasinzou_sceneTLUT_017DE0;
-
-#define djyasinzou_sceneTLUT_017FE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTLUT_017FE0"
-static const ALIGN_ASSET(2) char jyasinzou_sceneTLUT_017FE0[] = djyasinzou_sceneTLUT_017FE0;
-
-#define djyasinzou_sceneTex_019120 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTex_019120"
-static const ALIGN_ASSET(2) char jyasinzou_sceneTex_019120[] = djyasinzou_sceneTex_019120;
 
 #endif // DUNGEONS_JYASINZOU_SCENE_H
diff --git a/soh/assets/scenes/dungeons/men/men_room_0.h b/soh/assets/scenes/dungeons/men/men_room_0.h
index 05524589e..241bd8af9 100644
--- a/soh/assets/scenes/dungeons/men/men_room_0.h
+++ b/soh/assets/scenes/dungeons/men/men_room_0.h
@@ -3,6 +3,45 @@
 
 #include "align_asset_macro.h"
 
+#define dmen_room_0Tex_008138 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_008138"
+static const ALIGN_ASSET(2) char men_room_0Tex_008138[] = dmen_room_0Tex_008138;
+
+#define dmen_room_0Tex_008938 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_008938"
+static const ALIGN_ASSET(2) char men_room_0Tex_008938[] = dmen_room_0Tex_008938;
+
+#define dmen_room_0Tex_009138 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_009138"
+static const ALIGN_ASSET(2) char men_room_0Tex_009138[] = dmen_room_0Tex_009138;
+
+#define dmen_room_0Tex_009538 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_009538"
+static const ALIGN_ASSET(2) char men_room_0Tex_009538[] = dmen_room_0Tex_009538;
+
+#define dmen_room_0Tex_009D38 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_009D38"
+static const ALIGN_ASSET(2) char men_room_0Tex_009D38[] = dmen_room_0Tex_009D38;
+
+#define dmen_room_0Tex_00A538 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_00A538"
+static const ALIGN_ASSET(2) char men_room_0Tex_00A538[] = dmen_room_0Tex_00A538;
+
+#define dmen_room_0Tex_00B538 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_00B538"
+static const ALIGN_ASSET(2) char men_room_0Tex_00B538[] = dmen_room_0Tex_00B538;
+
+#define dmen_room_0Tex_00BD38 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_00BD38"
+static const ALIGN_ASSET(2) char men_room_0Tex_00BD38[] = dmen_room_0Tex_00BD38;
+
+#define dmen_room_0Tex_00C538 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_00C538"
+static const ALIGN_ASSET(2) char men_room_0Tex_00C538[] = dmen_room_0Tex_00C538;
+
+#define dmen_room_0Tex_00D538 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_00D538"
+static const ALIGN_ASSET(2) char men_room_0Tex_00D538[] = dmen_room_0Tex_00D538;
+
+#define dmen_room_0Tex_00DD38 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_00DD38"
+static const ALIGN_ASSET(2) char men_room_0Tex_00DD38[] = dmen_room_0Tex_00DD38;
+
+#define dmen_room_0Tex_00ED38 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_00ED38"
+static const ALIGN_ASSET(2) char men_room_0Tex_00ED38[] = dmen_room_0Tex_00ED38;
+
+#define dmen_room_0Tex_00F538 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_00F538"
+static const ALIGN_ASSET(2) char men_room_0Tex_00F538[] = dmen_room_0Tex_00F538;
+
 #define dgMenDL_008118 "__OTR__scenes/nonmq/men_scene/gMenDL_008118"
 static const ALIGN_ASSET(2) char gMenDL_008118[] = dgMenDL_008118;
 
@@ -15,50 +54,11 @@ static const ALIGN_ASSET(2) char men_room_0DL_00FEA0[] = dmen_room_0DL_00FEA0;
 #define dmen_room_0DL_002AD0 "__OTR__scenes/nonmq/men_scene/men_room_0DL_002AD0"
 static const ALIGN_ASSET(2) char men_room_0DL_002AD0[] = dmen_room_0DL_002AD0;
 
-#define dmen_room_0Tex_00ED38 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_00ED38"
-static const ALIGN_ASSET(2) char men_room_0Tex_00ED38[] = dmen_room_0Tex_00ED38;
-
-#define dmen_room_0Tex_00D538 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_00D538"
-static const ALIGN_ASSET(2) char men_room_0Tex_00D538[] = dmen_room_0Tex_00D538;
-
-#define dmen_room_0Tex_008138 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_008138"
-static const ALIGN_ASSET(2) char men_room_0Tex_008138[] = dmen_room_0Tex_008138;
-
-#define dmen_room_0Tex_00F538 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_00F538"
-static const ALIGN_ASSET(2) char men_room_0Tex_00F538[] = dmen_room_0Tex_00F538;
-
-#define dmen_room_0Tex_00BD38 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_00BD38"
-static const ALIGN_ASSET(2) char men_room_0Tex_00BD38[] = dmen_room_0Tex_00BD38;
-
-#define dmen_room_0Tex_00B538 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_00B538"
-static const ALIGN_ASSET(2) char men_room_0Tex_00B538[] = dmen_room_0Tex_00B538;
-
-#define dmen_room_0Tex_009D38 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_009D38"
-static const ALIGN_ASSET(2) char men_room_0Tex_009D38[] = dmen_room_0Tex_009D38;
-
-#define dmen_room_0Tex_009138 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_009138"
-static const ALIGN_ASSET(2) char men_room_0Tex_009138[] = dmen_room_0Tex_009138;
-
 #define dmen_room_0DL_0066D0 "__OTR__scenes/nonmq/men_scene/men_room_0DL_0066D0"
 static const ALIGN_ASSET(2) char men_room_0DL_0066D0[] = dmen_room_0DL_0066D0;
 
-#define dmen_room_0Tex_00DD38 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_00DD38"
-static const ALIGN_ASSET(2) char men_room_0Tex_00DD38[] = dmen_room_0Tex_00DD38;
-
-#define dmen_room_0Tex_009538 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_009538"
-static const ALIGN_ASSET(2) char men_room_0Tex_009538[] = dmen_room_0Tex_009538;
-
-#define dmen_room_0Tex_00C538 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_00C538"
-static const ALIGN_ASSET(2) char men_room_0Tex_00C538[] = dmen_room_0Tex_00C538;
-
-#define dmen_room_0Tex_00A538 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_00A538"
-static const ALIGN_ASSET(2) char men_room_0Tex_00A538[] = dmen_room_0Tex_00A538;
-
 #define dmen_room_0DL_007FD8 "__OTR__scenes/nonmq/men_scene/men_room_0DL_007FD8"
 static const ALIGN_ASSET(2) char men_room_0DL_007FD8[] = dmen_room_0DL_007FD8;
 
-#define dmen_room_0Tex_008938 "__OTR__scenes/nonmq/men_scene/men_room_0Tex_008938"
-static const ALIGN_ASSET(2) char men_room_0Tex_008938[] = dmen_room_0Tex_008938;
-
 
 #endif // DUNGEONS_MEN_ROOM_0_H
diff --git a/soh/assets/scenes/dungeons/men/men_room_1.h b/soh/assets/scenes/dungeons/men/men_room_1.h
index 093fde806..cd08e4a69 100644
--- a/soh/assets/scenes/dungeons/men/men_room_1.h
+++ b/soh/assets/scenes/dungeons/men/men_room_1.h
@@ -3,17 +3,8 @@
 
 #include "align_asset_macro.h"
 
-#define dmen_room_1DL_001DA8 "__OTR__scenes/nonmq/men_scene/men_room_1DL_001DA8"
-static const ALIGN_ASSET(2) char men_room_1DL_001DA8[] = dmen_room_1DL_001DA8;
-
-#define dmen_room_1Tex_008A70 "__OTR__scenes/nonmq/men_scene/men_room_1Tex_008A70"
-static const ALIGN_ASSET(2) char men_room_1Tex_008A70[] = dmen_room_1Tex_008A70;
-
-#define dmen_room_1Tex_005A70 "__OTR__scenes/nonmq/men_scene/men_room_1Tex_005A70"
-static const ALIGN_ASSET(2) char men_room_1Tex_005A70[] = dmen_room_1Tex_005A70;
-
-#define dmen_room_1DL_0023A8 "__OTR__scenes/nonmq/men_scene/men_room_1DL_0023A8"
-static const ALIGN_ASSET(2) char men_room_1DL_0023A8[] = dmen_room_1DL_0023A8;
+#define dmen_room_1Tex_004270 "__OTR__scenes/nonmq/men_scene/men_room_1Tex_004270"
+static const ALIGN_ASSET(2) char men_room_1Tex_004270[] = dmen_room_1Tex_004270;
 
 #define dmen_room_1Tex_004A70 "__OTR__scenes/nonmq/men_scene/men_room_1Tex_004A70"
 static const ALIGN_ASSET(2) char men_room_1Tex_004A70[] = dmen_room_1Tex_004A70;
@@ -21,12 +12,33 @@ static const ALIGN_ASSET(2) char men_room_1Tex_004A70[] = dmen_room_1Tex_004A70;
 #define dmen_room_1Tex_005270 "__OTR__scenes/nonmq/men_scene/men_room_1Tex_005270"
 static const ALIGN_ASSET(2) char men_room_1Tex_005270[] = dmen_room_1Tex_005270;
 
-#define dmen_room_1DL_002BD0 "__OTR__scenes/nonmq/men_scene/men_room_1DL_002BD0"
-static const ALIGN_ASSET(2) char men_room_1DL_002BD0[] = dmen_room_1DL_002BD0;
+#define dmen_room_1Tex_005A70 "__OTR__scenes/nonmq/men_scene/men_room_1Tex_005A70"
+static const ALIGN_ASSET(2) char men_room_1Tex_005A70[] = dmen_room_1Tex_005A70;
 
 #define dmen_room_1Tex_006270 "__OTR__scenes/nonmq/men_scene/men_room_1Tex_006270"
 static const ALIGN_ASSET(2) char men_room_1Tex_006270[] = dmen_room_1Tex_006270;
 
+#define dmen_room_1Tex_006A70 "__OTR__scenes/nonmq/men_scene/men_room_1Tex_006A70"
+static const ALIGN_ASSET(2) char men_room_1Tex_006A70[] = dmen_room_1Tex_006A70;
+
+#define dmen_room_1Tex_007270 "__OTR__scenes/nonmq/men_scene/men_room_1Tex_007270"
+static const ALIGN_ASSET(2) char men_room_1Tex_007270[] = dmen_room_1Tex_007270;
+
+#define dmen_room_1Tex_007A70 "__OTR__scenes/nonmq/men_scene/men_room_1Tex_007A70"
+static const ALIGN_ASSET(2) char men_room_1Tex_007A70[] = dmen_room_1Tex_007A70;
+
+#define dmen_room_1Tex_008A70 "__OTR__scenes/nonmq/men_scene/men_room_1Tex_008A70"
+static const ALIGN_ASSET(2) char men_room_1Tex_008A70[] = dmen_room_1Tex_008A70;
+
+#define dmen_room_1DL_001DA8 "__OTR__scenes/nonmq/men_scene/men_room_1DL_001DA8"
+static const ALIGN_ASSET(2) char men_room_1DL_001DA8[] = dmen_room_1DL_001DA8;
+
+#define dmen_room_1DL_0023A8 "__OTR__scenes/nonmq/men_scene/men_room_1DL_0023A8"
+static const ALIGN_ASSET(2) char men_room_1DL_0023A8[] = dmen_room_1DL_0023A8;
+
+#define dmen_room_1DL_002BD0 "__OTR__scenes/nonmq/men_scene/men_room_1DL_002BD0"
+static const ALIGN_ASSET(2) char men_room_1DL_002BD0[] = dmen_room_1DL_002BD0;
+
 #define dmen_room_1DL_002FC8 "__OTR__scenes/nonmq/men_scene/men_room_1DL_002FC8"
 static const ALIGN_ASSET(2) char men_room_1DL_002FC8[] = dmen_room_1DL_002FC8;
 
@@ -42,26 +54,14 @@ static const ALIGN_ASSET(2) char men_room_1DL_003C88[] = dmen_room_1DL_003C88;
 #define dmen_room_1DL_003F40 "__OTR__scenes/nonmq/men_scene/men_room_1DL_003F40"
 static const ALIGN_ASSET(2) char men_room_1DL_003F40[] = dmen_room_1DL_003F40;
 
-#define dmen_room_1Tex_004270 "__OTR__scenes/nonmq/men_scene/men_room_1Tex_004270"
-static const ALIGN_ASSET(2) char men_room_1Tex_004270[] = dmen_room_1Tex_004270;
-
 #define dmen_room_1DL_004150 "__OTR__scenes/nonmq/men_scene/men_room_1DL_004150"
 static const ALIGN_ASSET(2) char men_room_1DL_004150[] = dmen_room_1DL_004150;
 
-#define dmen_room_1Tex_006A70 "__OTR__scenes/nonmq/men_scene/men_room_1Tex_006A70"
-static const ALIGN_ASSET(2) char men_room_1Tex_006A70[] = dmen_room_1Tex_006A70;
-
 #define dmen_room_1DL_001AB0 "__OTR__scenes/nonmq/men_scene/men_room_1DL_001AB0"
 static const ALIGN_ASSET(2) char men_room_1DL_001AB0[] = dmen_room_1DL_001AB0;
 
-#define dmen_room_1Tex_007A70 "__OTR__scenes/nonmq/men_scene/men_room_1Tex_007A70"
-static const ALIGN_ASSET(2) char men_room_1Tex_007A70[] = dmen_room_1Tex_007A70;
-
 #define dmen_room_1DL_000B70 "__OTR__scenes/nonmq/men_scene/men_room_1DL_000B70"
 static const ALIGN_ASSET(2) char men_room_1DL_000B70[] = dmen_room_1DL_000B70;
 
-#define dmen_room_1Tex_007270 "__OTR__scenes/nonmq/men_scene/men_room_1Tex_007270"
-static const ALIGN_ASSET(2) char men_room_1Tex_007270[] = dmen_room_1Tex_007270;
-
 
 #endif // DUNGEONS_MEN_ROOM_1_H
diff --git a/soh/assets/scenes/dungeons/men/men_room_10.h b/soh/assets/scenes/dungeons/men/men_room_10.h
index a278ee7c2..925378867 100644
--- a/soh/assets/scenes/dungeons/men/men_room_10.h
+++ b/soh/assets/scenes/dungeons/men/men_room_10.h
@@ -3,50 +3,50 @@
 
 #include "align_asset_macro.h"
 
+#define dmen_room_10Tex_002448 "__OTR__scenes/nonmq/men_scene/men_room_10Tex_002448"
+static const ALIGN_ASSET(2) char men_room_10Tex_002448[] = dmen_room_10Tex_002448;
+
+#define dmen_room_10Tex_002C48 "__OTR__scenes/nonmq/men_scene/men_room_10Tex_002C48"
+static const ALIGN_ASSET(2) char men_room_10Tex_002C48[] = dmen_room_10Tex_002C48;
+
+#define dmen_room_10Tex_003448 "__OTR__scenes/nonmq/men_scene/men_room_10Tex_003448"
+static const ALIGN_ASSET(2) char men_room_10Tex_003448[] = dmen_room_10Tex_003448;
+
+#define dmen_room_10Tex_003C48 "__OTR__scenes/nonmq/men_scene/men_room_10Tex_003C48"
+static const ALIGN_ASSET(2) char men_room_10Tex_003C48[] = dmen_room_10Tex_003C48;
+
+#define dmen_room_10Tex_004448 "__OTR__scenes/nonmq/men_scene/men_room_10Tex_004448"
+static const ALIGN_ASSET(2) char men_room_10Tex_004448[] = dmen_room_10Tex_004448;
+
+#define dmen_room_10Tex_004C48 "__OTR__scenes/nonmq/men_scene/men_room_10Tex_004C48"
+static const ALIGN_ASSET(2) char men_room_10Tex_004C48[] = dmen_room_10Tex_004C48;
+
+#define dmen_room_10Tex_005448 "__OTR__scenes/nonmq/men_scene/men_room_10Tex_005448"
+static const ALIGN_ASSET(2) char men_room_10Tex_005448[] = dmen_room_10Tex_005448;
+
 #define dmen_room_10DL_000280 "__OTR__scenes/nonmq/men_scene/men_room_10DL_000280"
 static const ALIGN_ASSET(2) char men_room_10DL_000280[] = dmen_room_10DL_000280;
 
 #define dmen_room_10DL_000928 "__OTR__scenes/nonmq/men_scene/men_room_10DL_000928"
 static const ALIGN_ASSET(2) char men_room_10DL_000928[] = dmen_room_10DL_000928;
 
-#define dmen_room_10Tex_004C48 "__OTR__scenes/nonmq/men_scene/men_room_10Tex_004C48"
-static const ALIGN_ASSET(2) char men_room_10Tex_004C48[] = dmen_room_10Tex_004C48;
-
 #define dmen_room_10DL_001398 "__OTR__scenes/nonmq/men_scene/men_room_10DL_001398"
 static const ALIGN_ASSET(2) char men_room_10DL_001398[] = dmen_room_10DL_001398;
 
-#define dmen_room_10Tex_005448 "__OTR__scenes/nonmq/men_scene/men_room_10Tex_005448"
-static const ALIGN_ASSET(2) char men_room_10Tex_005448[] = dmen_room_10Tex_005448;
-
 #define dmen_room_10DL_000C78 "__OTR__scenes/nonmq/men_scene/men_room_10DL_000C78"
 static const ALIGN_ASSET(2) char men_room_10DL_000C78[] = dmen_room_10DL_000C78;
 
 #define dmen_room_10DL_001AA8 "__OTR__scenes/nonmq/men_scene/men_room_10DL_001AA8"
 static const ALIGN_ASSET(2) char men_room_10DL_001AA8[] = dmen_room_10DL_001AA8;
 
-#define dmen_room_10Tex_002448 "__OTR__scenes/nonmq/men_scene/men_room_10Tex_002448"
-static const ALIGN_ASSET(2) char men_room_10Tex_002448[] = dmen_room_10Tex_002448;
-
-#define dmen_room_10Tex_003C48 "__OTR__scenes/nonmq/men_scene/men_room_10Tex_003C48"
-static const ALIGN_ASSET(2) char men_room_10Tex_003C48[] = dmen_room_10Tex_003C48;
-
 #define dmen_room_10DL_001EE8 "__OTR__scenes/nonmq/men_scene/men_room_10DL_001EE8"
 static const ALIGN_ASSET(2) char men_room_10DL_001EE8[] = dmen_room_10DL_001EE8;
 
-#define dmen_room_10Tex_002C48 "__OTR__scenes/nonmq/men_scene/men_room_10Tex_002C48"
-static const ALIGN_ASSET(2) char men_room_10Tex_002C48[] = dmen_room_10Tex_002C48;
-
 #define dmen_room_10DL_002138 "__OTR__scenes/nonmq/men_scene/men_room_10DL_002138"
 static const ALIGN_ASSET(2) char men_room_10DL_002138[] = dmen_room_10DL_002138;
 
-#define dmen_room_10Tex_003448 "__OTR__scenes/nonmq/men_scene/men_room_10Tex_003448"
-static const ALIGN_ASSET(2) char men_room_10Tex_003448[] = dmen_room_10Tex_003448;
-
 #define dmen_room_10DL_002340 "__OTR__scenes/nonmq/men_scene/men_room_10DL_002340"
 static const ALIGN_ASSET(2) char men_room_10DL_002340[] = dmen_room_10DL_002340;
 
-#define dmen_room_10Tex_004448 "__OTR__scenes/nonmq/men_scene/men_room_10Tex_004448"
-static const ALIGN_ASSET(2) char men_room_10Tex_004448[] = dmen_room_10Tex_004448;
-
 
 #endif // DUNGEONS_MEN_ROOM_10_H
diff --git a/soh/assets/scenes/dungeons/men/men_room_2.h b/soh/assets/scenes/dungeons/men/men_room_2.h
index b8fdadd96..2cb455b74 100644
--- a/soh/assets/scenes/dungeons/men/men_room_2.h
+++ b/soh/assets/scenes/dungeons/men/men_room_2.h
@@ -3,21 +3,24 @@
 
 #include "align_asset_macro.h"
 
-#define dmen_room_2DL_000580 "__OTR__scenes/nonmq/men_scene/men_room_2DL_000580"
-static const ALIGN_ASSET(2) char men_room_2DL_000580[] = dmen_room_2DL_000580;
+#define dmen_room_2Tex_003C48 "__OTR__scenes/nonmq/men_scene/men_room_2Tex_003C48"
+static const ALIGN_ASSET(2) char men_room_2Tex_003C48[] = dmen_room_2Tex_003C48;
 
 #define dmen_room_2Tex_004448 "__OTR__scenes/nonmq/men_scene/men_room_2Tex_004448"
 static const ALIGN_ASSET(2) char men_room_2Tex_004448[] = dmen_room_2Tex_004448;
 
+#define dmen_room_2Tex_004C48 "__OTR__scenes/nonmq/men_scene/men_room_2Tex_004C48"
+static const ALIGN_ASSET(2) char men_room_2Tex_004C48[] = dmen_room_2Tex_004C48;
+
+#define dmen_room_2DL_000580 "__OTR__scenes/nonmq/men_scene/men_room_2DL_000580"
+static const ALIGN_ASSET(2) char men_room_2DL_000580[] = dmen_room_2DL_000580;
+
 #define dmen_room_2DL_001300 "__OTR__scenes/nonmq/men_scene/men_room_2DL_001300"
 static const ALIGN_ASSET(2) char men_room_2DL_001300[] = dmen_room_2DL_001300;
 
 #define dmen_room_2DL_000940 "__OTR__scenes/nonmq/men_scene/men_room_2DL_000940"
 static const ALIGN_ASSET(2) char men_room_2DL_000940[] = dmen_room_2DL_000940;
 
-#define dmen_room_2Tex_004C48 "__OTR__scenes/nonmq/men_scene/men_room_2Tex_004C48"
-static const ALIGN_ASSET(2) char men_room_2Tex_004C48[] = dmen_room_2Tex_004C48;
-
 #define dmen_room_2DL_001C30 "__OTR__scenes/nonmq/men_scene/men_room_2DL_001C30"
 static const ALIGN_ASSET(2) char men_room_2DL_001C30[] = dmen_room_2DL_001C30;
 
@@ -33,8 +36,5 @@ static const ALIGN_ASSET(2) char men_room_2DL_002FA0[] = dmen_room_2DL_002FA0;
 #define dmen_room_2DL_003928 "__OTR__scenes/nonmq/men_scene/men_room_2DL_003928"
 static const ALIGN_ASSET(2) char men_room_2DL_003928[] = dmen_room_2DL_003928;
 
-#define dmen_room_2Tex_003C48 "__OTR__scenes/nonmq/men_scene/men_room_2Tex_003C48"
-static const ALIGN_ASSET(2) char men_room_2Tex_003C48[] = dmen_room_2Tex_003C48;
-
 
 #endif // DUNGEONS_MEN_ROOM_2_H
diff --git a/soh/assets/scenes/dungeons/men/men_room_3.h b/soh/assets/scenes/dungeons/men/men_room_3.h
index d839e5cf4..b58f84712 100644
--- a/soh/assets/scenes/dungeons/men/men_room_3.h
+++ b/soh/assets/scenes/dungeons/men/men_room_3.h
@@ -3,32 +3,32 @@
 
 #include "align_asset_macro.h"
 
-#define dmen_room_3DL_001740 "__OTR__scenes/nonmq/men_scene/men_room_3DL_001740"
-static const ALIGN_ASSET(2) char men_room_3DL_001740[] = dmen_room_3DL_001740;
+#define dmen_room_3Tex_003850 "__OTR__scenes/nonmq/men_scene/men_room_3Tex_003850"
+static const ALIGN_ASSET(2) char men_room_3Tex_003850[] = dmen_room_3Tex_003850;
 
 #define dmen_room_3Tex_004050 "__OTR__scenes/nonmq/men_scene/men_room_3Tex_004050"
 static const ALIGN_ASSET(2) char men_room_3Tex_004050[] = dmen_room_3Tex_004050;
 
-#define dmen_room_3Tex_003850 "__OTR__scenes/nonmq/men_scene/men_room_3Tex_003850"
-static const ALIGN_ASSET(2) char men_room_3Tex_003850[] = dmen_room_3Tex_003850;
-
-#define dmen_room_3Tex_007450 "__OTR__scenes/nonmq/men_scene/men_room_3Tex_007450"
-static const ALIGN_ASSET(2) char men_room_3Tex_007450[] = dmen_room_3Tex_007450;
+#define dmen_room_3Tex_004850 "__OTR__scenes/nonmq/men_scene/men_room_3Tex_004850"
+static const ALIGN_ASSET(2) char men_room_3Tex_004850[] = dmen_room_3Tex_004850;
 
 #define dmen_room_3Tex_005050 "__OTR__scenes/nonmq/men_scene/men_room_3Tex_005050"
 static const ALIGN_ASSET(2) char men_room_3Tex_005050[] = dmen_room_3Tex_005050;
 
+#define dmen_room_3Tex_005850 "__OTR__scenes/nonmq/men_scene/men_room_3Tex_005850"
+static const ALIGN_ASSET(2) char men_room_3Tex_005850[] = dmen_room_3Tex_005850;
+
 #define dmen_room_3Tex_005C50 "__OTR__scenes/nonmq/men_scene/men_room_3Tex_005C50"
 static const ALIGN_ASSET(2) char men_room_3Tex_005C50[] = dmen_room_3Tex_005C50;
 
 #define dmen_room_3Tex_006450 "__OTR__scenes/nonmq/men_scene/men_room_3Tex_006450"
 static const ALIGN_ASSET(2) char men_room_3Tex_006450[] = dmen_room_3Tex_006450;
 
-#define dmen_room_3Tex_005850 "__OTR__scenes/nonmq/men_scene/men_room_3Tex_005850"
-static const ALIGN_ASSET(2) char men_room_3Tex_005850[] = dmen_room_3Tex_005850;
+#define dmen_room_3Tex_007450 "__OTR__scenes/nonmq/men_scene/men_room_3Tex_007450"
+static const ALIGN_ASSET(2) char men_room_3Tex_007450[] = dmen_room_3Tex_007450;
 
-#define dmen_room_3Tex_004850 "__OTR__scenes/nonmq/men_scene/men_room_3Tex_004850"
-static const ALIGN_ASSET(2) char men_room_3Tex_004850[] = dmen_room_3Tex_004850;
+#define dmen_room_3DL_001740 "__OTR__scenes/nonmq/men_scene/men_room_3DL_001740"
+static const ALIGN_ASSET(2) char men_room_3DL_001740[] = dmen_room_3DL_001740;
 
 #define dmen_room_3DL_002768 "__OTR__scenes/nonmq/men_scene/men_room_3DL_002768"
 static const ALIGN_ASSET(2) char men_room_3DL_002768[] = dmen_room_3DL_002768;
diff --git a/soh/assets/scenes/dungeons/men/men_room_4.h b/soh/assets/scenes/dungeons/men/men_room_4.h
index c59cad6e3..663c19522 100644
--- a/soh/assets/scenes/dungeons/men/men_room_4.h
+++ b/soh/assets/scenes/dungeons/men/men_room_4.h
@@ -3,20 +3,32 @@
 
 #include "align_asset_macro.h"
 
-#define dmen_room_4DL_003EF8 "__OTR__scenes/nonmq/men_scene/men_room_4DL_003EF8"
-static const ALIGN_ASSET(2) char men_room_4DL_003EF8[] = dmen_room_4DL_003EF8;
+#define dmen_room_4Tex_0051E0 "__OTR__scenes/nonmq/men_scene/men_room_4Tex_0051E0"
+static const ALIGN_ASSET(2) char men_room_4Tex_0051E0[] = dmen_room_4Tex_0051E0;
 
-#define dmen_room_4Tex_0099E0 "__OTR__scenes/nonmq/men_scene/men_room_4Tex_0099E0"
-static const ALIGN_ASSET(2) char men_room_4Tex_0099E0[] = dmen_room_4Tex_0099E0;
+#define dmen_room_4Tex_0059E0 "__OTR__scenes/nonmq/men_scene/men_room_4Tex_0059E0"
+static const ALIGN_ASSET(2) char men_room_4Tex_0059E0[] = dmen_room_4Tex_0059E0;
 
-#define dmen_room_4DL_0046B0 "__OTR__scenes/nonmq/men_scene/men_room_4DL_0046B0"
-static const ALIGN_ASSET(2) char men_room_4DL_0046B0[] = dmen_room_4DL_0046B0;
+#define dmen_room_4Tex_0061E0 "__OTR__scenes/nonmq/men_scene/men_room_4Tex_0061E0"
+static const ALIGN_ASSET(2) char men_room_4Tex_0061E0[] = dmen_room_4Tex_0061E0;
 
 #define dmen_room_4Tex_0071E0 "__OTR__scenes/nonmq/men_scene/men_room_4Tex_0071E0"
 static const ALIGN_ASSET(2) char men_room_4Tex_0071E0[] = dmen_room_4Tex_0071E0;
 
-#define dmen_room_4Tex_0061E0 "__OTR__scenes/nonmq/men_scene/men_room_4Tex_0061E0"
-static const ALIGN_ASSET(2) char men_room_4Tex_0061E0[] = dmen_room_4Tex_0061E0;
+#define dmen_room_4Tex_0081E0 "__OTR__scenes/nonmq/men_scene/men_room_4Tex_0081E0"
+static const ALIGN_ASSET(2) char men_room_4Tex_0081E0[] = dmen_room_4Tex_0081E0;
+
+#define dmen_room_4Tex_0089E0 "__OTR__scenes/nonmq/men_scene/men_room_4Tex_0089E0"
+static const ALIGN_ASSET(2) char men_room_4Tex_0089E0[] = dmen_room_4Tex_0089E0;
+
+#define dmen_room_4Tex_0099E0 "__OTR__scenes/nonmq/men_scene/men_room_4Tex_0099E0"
+static const ALIGN_ASSET(2) char men_room_4Tex_0099E0[] = dmen_room_4Tex_0099E0;
+
+#define dmen_room_4DL_003EF8 "__OTR__scenes/nonmq/men_scene/men_room_4DL_003EF8"
+static const ALIGN_ASSET(2) char men_room_4DL_003EF8[] = dmen_room_4DL_003EF8;
+
+#define dmen_room_4DL_0046B0 "__OTR__scenes/nonmq/men_scene/men_room_4DL_0046B0"
+static const ALIGN_ASSET(2) char men_room_4DL_0046B0[] = dmen_room_4DL_0046B0;
 
 #define dmen_room_4DL_004C30 "__OTR__scenes/nonmq/men_scene/men_room_4DL_004C30"
 static const ALIGN_ASSET(2) char men_room_4DL_004C30[] = dmen_room_4DL_004C30;
@@ -24,26 +36,14 @@ static const ALIGN_ASSET(2) char men_room_4DL_004C30[] = dmen_room_4DL_004C30;
 #define dmen_room_4DL_005068 "__OTR__scenes/nonmq/men_scene/men_room_4DL_005068"
 static const ALIGN_ASSET(2) char men_room_4DL_005068[] = dmen_room_4DL_005068;
 
-#define dmen_room_4Tex_0051E0 "__OTR__scenes/nonmq/men_scene/men_room_4Tex_0051E0"
-static const ALIGN_ASSET(2) char men_room_4Tex_0051E0[] = dmen_room_4Tex_0051E0;
-
 #define dmen_room_4DL_000B10 "__OTR__scenes/nonmq/men_scene/men_room_4DL_000B10"
 static const ALIGN_ASSET(2) char men_room_4DL_000B10[] = dmen_room_4DL_000B10;
 
-#define dmen_room_4Tex_0081E0 "__OTR__scenes/nonmq/men_scene/men_room_4Tex_0081E0"
-static const ALIGN_ASSET(2) char men_room_4Tex_0081E0[] = dmen_room_4Tex_0081E0;
-
 #define dmen_room_4DL_0015C8 "__OTR__scenes/nonmq/men_scene/men_room_4DL_0015C8"
 static const ALIGN_ASSET(2) char men_room_4DL_0015C8[] = dmen_room_4DL_0015C8;
 
 #define dmen_room_4DL_002F40 "__OTR__scenes/nonmq/men_scene/men_room_4DL_002F40"
 static const ALIGN_ASSET(2) char men_room_4DL_002F40[] = dmen_room_4DL_002F40;
 
-#define dmen_room_4Tex_0089E0 "__OTR__scenes/nonmq/men_scene/men_room_4Tex_0089E0"
-static const ALIGN_ASSET(2) char men_room_4Tex_0089E0[] = dmen_room_4Tex_0089E0;
-
-#define dmen_room_4Tex_0059E0 "__OTR__scenes/nonmq/men_scene/men_room_4Tex_0059E0"
-static const ALIGN_ASSET(2) char men_room_4Tex_0059E0[] = dmen_room_4Tex_0059E0;
-
 
 #endif // DUNGEONS_MEN_ROOM_4_H
diff --git a/soh/assets/scenes/dungeons/men/men_room_5.h b/soh/assets/scenes/dungeons/men/men_room_5.h
index f54f3e7d8..d2ecdda88 100644
--- a/soh/assets/scenes/dungeons/men/men_room_5.h
+++ b/soh/assets/scenes/dungeons/men/men_room_5.h
@@ -3,29 +3,29 @@
 
 #include "align_asset_macro.h"
 
-#define dmen_room_5DL_001230 "__OTR__scenes/nonmq/men_scene/men_room_5DL_001230"
-static const ALIGN_ASSET(2) char men_room_5DL_001230[] = dmen_room_5DL_001230;
+#define dmen_room_5Tex_002418 "__OTR__scenes/nonmq/men_scene/men_room_5Tex_002418"
+static const ALIGN_ASSET(2) char men_room_5Tex_002418[] = dmen_room_5Tex_002418;
 
-#define dmen_room_5Tex_003818 "__OTR__scenes/nonmq/men_scene/men_room_5Tex_003818"
-static const ALIGN_ASSET(2) char men_room_5Tex_003818[] = dmen_room_5Tex_003818;
+#define dmen_room_5Tex_002C18 "__OTR__scenes/nonmq/men_scene/men_room_5Tex_002C18"
+static const ALIGN_ASSET(2) char men_room_5Tex_002C18[] = dmen_room_5Tex_002C18;
 
 #define dmen_room_5Tex_003018 "__OTR__scenes/nonmq/men_scene/men_room_5Tex_003018"
 static const ALIGN_ASSET(2) char men_room_5Tex_003018[] = dmen_room_5Tex_003018;
 
+#define dmen_room_5Tex_003818 "__OTR__scenes/nonmq/men_scene/men_room_5Tex_003818"
+static const ALIGN_ASSET(2) char men_room_5Tex_003818[] = dmen_room_5Tex_003818;
+
 #define dmen_room_5Tex_004018 "__OTR__scenes/nonmq/men_scene/men_room_5Tex_004018"
 static const ALIGN_ASSET(2) char men_room_5Tex_004018[] = dmen_room_5Tex_004018;
 
 #define dmen_room_5Tex_004818 "__OTR__scenes/nonmq/men_scene/men_room_5Tex_004818"
 static const ALIGN_ASSET(2) char men_room_5Tex_004818[] = dmen_room_5Tex_004818;
 
-#define dmen_room_5Tex_002C18 "__OTR__scenes/nonmq/men_scene/men_room_5Tex_002C18"
-static const ALIGN_ASSET(2) char men_room_5Tex_002C18[] = dmen_room_5Tex_002C18;
+#define dmen_room_5DL_001230 "__OTR__scenes/nonmq/men_scene/men_room_5DL_001230"
+static const ALIGN_ASSET(2) char men_room_5DL_001230[] = dmen_room_5DL_001230;
 
 #define dmen_room_5DL_002128 "__OTR__scenes/nonmq/men_scene/men_room_5DL_002128"
 static const ALIGN_ASSET(2) char men_room_5DL_002128[] = dmen_room_5DL_002128;
 
-#define dmen_room_5Tex_002418 "__OTR__scenes/nonmq/men_scene/men_room_5Tex_002418"
-static const ALIGN_ASSET(2) char men_room_5Tex_002418[] = dmen_room_5Tex_002418;
-
 
 #endif // DUNGEONS_MEN_ROOM_5_H
diff --git a/soh/assets/scenes/dungeons/men/men_room_6.h b/soh/assets/scenes/dungeons/men/men_room_6.h
index bd50f88b8..b1cb11937 100644
--- a/soh/assets/scenes/dungeons/men/men_room_6.h
+++ b/soh/assets/scenes/dungeons/men/men_room_6.h
@@ -3,62 +3,62 @@
 
 #include "align_asset_macro.h"
 
-#define dmen_room_6DL_0003D0 "__OTR__scenes/nonmq/men_scene/men_room_6DL_0003D0"
-static const ALIGN_ASSET(2) char men_room_6DL_0003D0[] = dmen_room_6DL_0003D0;
+#define dmen_room_6Tex_003F78 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_003F78"
+static const ALIGN_ASSET(2) char men_room_6Tex_003F78[] = dmen_room_6Tex_003F78;
+
+#define dmen_room_6Tex_004778 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_004778"
+static const ALIGN_ASSET(2) char men_room_6Tex_004778[] = dmen_room_6Tex_004778;
+
+#define dmen_room_6Tex_004F78 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_004F78"
+static const ALIGN_ASSET(2) char men_room_6Tex_004F78[] = dmen_room_6Tex_004F78;
+
+#define dmen_room_6Tex_005378 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_005378"
+static const ALIGN_ASSET(2) char men_room_6Tex_005378[] = dmen_room_6Tex_005378;
+
+#define dmen_room_6Tex_005B78 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_005B78"
+static const ALIGN_ASSET(2) char men_room_6Tex_005B78[] = dmen_room_6Tex_005B78;
 
 #define dmen_room_6Tex_006378 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_006378"
 static const ALIGN_ASSET(2) char men_room_6Tex_006378[] = dmen_room_6Tex_006378;
 
+#define dmen_room_6Tex_006B78 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_006B78"
+static const ALIGN_ASSET(2) char men_room_6Tex_006B78[] = dmen_room_6Tex_006B78;
+
+#define dmen_room_6Tex_007378 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_007378"
+static const ALIGN_ASSET(2) char men_room_6Tex_007378[] = dmen_room_6Tex_007378;
+
+#define dmen_room_6Tex_007778 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_007778"
+static const ALIGN_ASSET(2) char men_room_6Tex_007778[] = dmen_room_6Tex_007778;
+
+#define dmen_room_6DL_0003D0 "__OTR__scenes/nonmq/men_scene/men_room_6DL_0003D0"
+static const ALIGN_ASSET(2) char men_room_6DL_0003D0[] = dmen_room_6DL_0003D0;
+
 #define dmen_room_6DL_001068 "__OTR__scenes/nonmq/men_scene/men_room_6DL_001068"
 static const ALIGN_ASSET(2) char men_room_6DL_001068[] = dmen_room_6DL_001068;
 
 #define dmen_room_6DL_000C68 "__OTR__scenes/nonmq/men_scene/men_room_6DL_000C68"
 static const ALIGN_ASSET(2) char men_room_6DL_000C68[] = dmen_room_6DL_000C68;
 
-#define dmen_room_6Tex_004F78 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_004F78"
-static const ALIGN_ASSET(2) char men_room_6Tex_004F78[] = dmen_room_6Tex_004F78;
-
 #define dmen_room_6DL_0013D0 "__OTR__scenes/nonmq/men_scene/men_room_6DL_0013D0"
 static const ALIGN_ASSET(2) char men_room_6DL_0013D0[] = dmen_room_6DL_0013D0;
 
-#define dmen_room_6Tex_007378 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_007378"
-static const ALIGN_ASSET(2) char men_room_6Tex_007378[] = dmen_room_6Tex_007378;
-
 #define dmen_room_6DL_0017B8 "__OTR__scenes/nonmq/men_scene/men_room_6DL_0017B8"
 static const ALIGN_ASSET(2) char men_room_6DL_0017B8[] = dmen_room_6DL_0017B8;
 
 #define dmen_room_6DL_003B90 "__OTR__scenes/nonmq/men_scene/men_room_6DL_003B90"
 static const ALIGN_ASSET(2) char men_room_6DL_003B90[] = dmen_room_6DL_003B90;
 
-#define dmen_room_6Tex_003F78 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_003F78"
-static const ALIGN_ASSET(2) char men_room_6Tex_003F78[] = dmen_room_6Tex_003F78;
-
 #define dmen_room_6DL_002530 "__OTR__scenes/nonmq/men_scene/men_room_6DL_002530"
 static const ALIGN_ASSET(2) char men_room_6DL_002530[] = dmen_room_6DL_002530;
 
-#define dmen_room_6Tex_005B78 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_005B78"
-static const ALIGN_ASSET(2) char men_room_6Tex_005B78[] = dmen_room_6Tex_005B78;
-
 #define dmen_room_6DL_002DE8 "__OTR__scenes/nonmq/men_scene/men_room_6DL_002DE8"
 static const ALIGN_ASSET(2) char men_room_6DL_002DE8[] = dmen_room_6DL_002DE8;
 
-#define dmen_room_6Tex_007778 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_007778"
-static const ALIGN_ASSET(2) char men_room_6Tex_007778[] = dmen_room_6Tex_007778;
-
-#define dmen_room_6Tex_006B78 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_006B78"
-static const ALIGN_ASSET(2) char men_room_6Tex_006B78[] = dmen_room_6Tex_006B78;
-
 #define dmen_room_6DL_0034F0 "__OTR__scenes/nonmq/men_scene/men_room_6DL_0034F0"
 static const ALIGN_ASSET(2) char men_room_6DL_0034F0[] = dmen_room_6DL_0034F0;
 
-#define dmen_room_6Tex_004778 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_004778"
-static const ALIGN_ASSET(2) char men_room_6Tex_004778[] = dmen_room_6Tex_004778;
-
 #define dmen_room_6DL_003E60 "__OTR__scenes/nonmq/men_scene/men_room_6DL_003E60"
 static const ALIGN_ASSET(2) char men_room_6DL_003E60[] = dmen_room_6DL_003E60;
 
-#define dmen_room_6Tex_005378 "__OTR__scenes/nonmq/men_scene/men_room_6Tex_005378"
-static const ALIGN_ASSET(2) char men_room_6Tex_005378[] = dmen_room_6Tex_005378;
-
 
 #endif // DUNGEONS_MEN_ROOM_6_H
diff --git a/soh/assets/scenes/dungeons/men/men_room_7.h b/soh/assets/scenes/dungeons/men/men_room_7.h
index 7c9fc3602..89036fdce 100644
--- a/soh/assets/scenes/dungeons/men/men_room_7.h
+++ b/soh/assets/scenes/dungeons/men/men_room_7.h
@@ -3,41 +3,41 @@
 
 #include "align_asset_macro.h"
 
-#define dmen_room_7DL_0035D8 "__OTR__scenes/nonmq/men_scene/men_room_7DL_0035D8"
-static const ALIGN_ASSET(2) char men_room_7DL_0035D8[] = dmen_room_7DL_0035D8;
-
-#define dmen_room_7Tex_004AB8 "__OTR__scenes/nonmq/men_scene/men_room_7Tex_004AB8"
-static const ALIGN_ASSET(2) char men_room_7Tex_004AB8[] = dmen_room_7Tex_004AB8;
-
-#define dmen_room_7DL_003348 "__OTR__scenes/nonmq/men_scene/men_room_7DL_003348"
-static const ALIGN_ASSET(2) char men_room_7DL_003348[] = dmen_room_7DL_003348;
-
-#define dmen_room_7Tex_0062B8 "__OTR__scenes/nonmq/men_scene/men_room_7Tex_0062B8"
-static const ALIGN_ASSET(2) char men_room_7Tex_0062B8[] = dmen_room_7Tex_0062B8;
-
-#define dmen_room_7DL_001EC0 "__OTR__scenes/nonmq/men_scene/men_room_7DL_001EC0"
-static const ALIGN_ASSET(2) char men_room_7DL_001EC0[] = dmen_room_7DL_001EC0;
-
-#define dmen_room_7Tex_0052B8 "__OTR__scenes/nonmq/men_scene/men_room_7Tex_0052B8"
-static const ALIGN_ASSET(2) char men_room_7Tex_0052B8[] = dmen_room_7Tex_0052B8;
-
-#define dmen_room_7Tex_0072B8 "__OTR__scenes/nonmq/men_scene/men_room_7Tex_0072B8"
-static const ALIGN_ASSET(2) char men_room_7Tex_0072B8[] = dmen_room_7Tex_0072B8;
-
-#define dmen_room_7Tex_0042B8 "__OTR__scenes/nonmq/men_scene/men_room_7Tex_0042B8"
-static const ALIGN_ASSET(2) char men_room_7Tex_0042B8[] = dmen_room_7Tex_0042B8;
-
-#define dmen_room_7Tex_007AB8 "__OTR__scenes/nonmq/men_scene/men_room_7Tex_007AB8"
-static const ALIGN_ASSET(2) char men_room_7Tex_007AB8[] = dmen_room_7Tex_007AB8;
+#define dmen_room_7Tex_0036B8 "__OTR__scenes/nonmq/men_scene/men_room_7Tex_0036B8"
+static const ALIGN_ASSET(2) char men_room_7Tex_0036B8[] = dmen_room_7Tex_0036B8;
 
 #define dmen_room_7Tex_003AB8 "__OTR__scenes/nonmq/men_scene/men_room_7Tex_003AB8"
 static const ALIGN_ASSET(2) char men_room_7Tex_003AB8[] = dmen_room_7Tex_003AB8;
 
+#define dmen_room_7Tex_0042B8 "__OTR__scenes/nonmq/men_scene/men_room_7Tex_0042B8"
+static const ALIGN_ASSET(2) char men_room_7Tex_0042B8[] = dmen_room_7Tex_0042B8;
+
+#define dmen_room_7Tex_004AB8 "__OTR__scenes/nonmq/men_scene/men_room_7Tex_004AB8"
+static const ALIGN_ASSET(2) char men_room_7Tex_004AB8[] = dmen_room_7Tex_004AB8;
+
+#define dmen_room_7Tex_0052B8 "__OTR__scenes/nonmq/men_scene/men_room_7Tex_0052B8"
+static const ALIGN_ASSET(2) char men_room_7Tex_0052B8[] = dmen_room_7Tex_0052B8;
+
 #define dmen_room_7Tex_005AB8 "__OTR__scenes/nonmq/men_scene/men_room_7Tex_005AB8"
 static const ALIGN_ASSET(2) char men_room_7Tex_005AB8[] = dmen_room_7Tex_005AB8;
 
-#define dmen_room_7Tex_0036B8 "__OTR__scenes/nonmq/men_scene/men_room_7Tex_0036B8"
-static const ALIGN_ASSET(2) char men_room_7Tex_0036B8[] = dmen_room_7Tex_0036B8;
+#define dmen_room_7Tex_0062B8 "__OTR__scenes/nonmq/men_scene/men_room_7Tex_0062B8"
+static const ALIGN_ASSET(2) char men_room_7Tex_0062B8[] = dmen_room_7Tex_0062B8;
+
+#define dmen_room_7Tex_0072B8 "__OTR__scenes/nonmq/men_scene/men_room_7Tex_0072B8"
+static const ALIGN_ASSET(2) char men_room_7Tex_0072B8[] = dmen_room_7Tex_0072B8;
+
+#define dmen_room_7Tex_007AB8 "__OTR__scenes/nonmq/men_scene/men_room_7Tex_007AB8"
+static const ALIGN_ASSET(2) char men_room_7Tex_007AB8[] = dmen_room_7Tex_007AB8;
+
+#define dmen_room_7DL_0035D8 "__OTR__scenes/nonmq/men_scene/men_room_7DL_0035D8"
+static const ALIGN_ASSET(2) char men_room_7DL_0035D8[] = dmen_room_7DL_0035D8;
+
+#define dmen_room_7DL_003348 "__OTR__scenes/nonmq/men_scene/men_room_7DL_003348"
+static const ALIGN_ASSET(2) char men_room_7DL_003348[] = dmen_room_7DL_003348;
+
+#define dmen_room_7DL_001EC0 "__OTR__scenes/nonmq/men_scene/men_room_7DL_001EC0"
+static const ALIGN_ASSET(2) char men_room_7DL_001EC0[] = dmen_room_7DL_001EC0;
 
 
 #endif // DUNGEONS_MEN_ROOM_7_H
diff --git a/soh/assets/scenes/dungeons/men/men_room_8.h b/soh/assets/scenes/dungeons/men/men_room_8.h
index 115e55fec..0b74cf0cd 100644
--- a/soh/assets/scenes/dungeons/men/men_room_8.h
+++ b/soh/assets/scenes/dungeons/men/men_room_8.h
@@ -3,21 +3,33 @@
 
 #include "align_asset_macro.h"
 
-#define dmen_room_8DL_003EB0 "__OTR__scenes/nonmq/men_scene/men_room_8DL_003EB0"
-static const ALIGN_ASSET(2) char men_room_8DL_003EB0[] = dmen_room_8DL_003EB0;
+#define dmen_room_8Tex_005D30 "__OTR__scenes/nonmq/men_scene/men_room_8Tex_005D30"
+static const ALIGN_ASSET(2) char men_room_8Tex_005D30[] = dmen_room_8Tex_005D30;
 
 #define dmen_room_8Tex_006530 "__OTR__scenes/nonmq/men_scene/men_room_8Tex_006530"
 static const ALIGN_ASSET(2) char men_room_8Tex_006530[] = dmen_room_8Tex_006530;
 
+#define dmen_room_8Tex_006D30 "__OTR__scenes/nonmq/men_scene/men_room_8Tex_006D30"
+static const ALIGN_ASSET(2) char men_room_8Tex_006D30[] = dmen_room_8Tex_006D30;
+
+#define dmen_room_8Tex_007530 "__OTR__scenes/nonmq/men_scene/men_room_8Tex_007530"
+static const ALIGN_ASSET(2) char men_room_8Tex_007530[] = dmen_room_8Tex_007530;
+
+#define dmen_room_8Tex_007630 "__OTR__scenes/nonmq/men_scene/men_room_8Tex_007630"
+static const ALIGN_ASSET(2) char men_room_8Tex_007630[] = dmen_room_8Tex_007630;
+
+#define dmen_room_8Tex_007E30 "__OTR__scenes/nonmq/men_scene/men_room_8Tex_007E30"
+static const ALIGN_ASSET(2) char men_room_8Tex_007E30[] = dmen_room_8Tex_007E30;
+
+#define dmen_room_8DL_003EB0 "__OTR__scenes/nonmq/men_scene/men_room_8DL_003EB0"
+static const ALIGN_ASSET(2) char men_room_8DL_003EB0[] = dmen_room_8DL_003EB0;
+
 #define dmen_room_8DL_000330 "__OTR__scenes/nonmq/men_scene/men_room_8DL_000330"
 static const ALIGN_ASSET(2) char men_room_8DL_000330[] = dmen_room_8DL_000330;
 
 #define dmen_room_8DL_004E08 "__OTR__scenes/nonmq/men_scene/men_room_8DL_004E08"
 static const ALIGN_ASSET(2) char men_room_8DL_004E08[] = dmen_room_8DL_004E08;
 
-#define dmen_room_8Tex_005D30 "__OTR__scenes/nonmq/men_scene/men_room_8Tex_005D30"
-static const ALIGN_ASSET(2) char men_room_8Tex_005D30[] = dmen_room_8Tex_005D30;
-
 #define dmen_room_8DL_005470 "__OTR__scenes/nonmq/men_scene/men_room_8DL_005470"
 static const ALIGN_ASSET(2) char men_room_8DL_005470[] = dmen_room_8DL_005470;
 
@@ -27,26 +39,14 @@ static const ALIGN_ASSET(2) char men_room_8DL_0055F0[] = dmen_room_8DL_0055F0;
 #define dmen_room_8DL_005A08 "__OTR__scenes/nonmq/men_scene/men_room_8DL_005A08"
 static const ALIGN_ASSET(2) char men_room_8DL_005A08[] = dmen_room_8DL_005A08;
 
-#define dmen_room_8Tex_007630 "__OTR__scenes/nonmq/men_scene/men_room_8Tex_007630"
-static const ALIGN_ASSET(2) char men_room_8Tex_007630[] = dmen_room_8Tex_007630;
-
 #define dmen_room_8DL_005C20 "__OTR__scenes/nonmq/men_scene/men_room_8DL_005C20"
 static const ALIGN_ASSET(2) char men_room_8DL_005C20[] = dmen_room_8DL_005C20;
 
 #define dmen_room_8DL_002690 "__OTR__scenes/nonmq/men_scene/men_room_8DL_002690"
 static const ALIGN_ASSET(2) char men_room_8DL_002690[] = dmen_room_8DL_002690;
 
-#define dmen_room_8Tex_007530 "__OTR__scenes/nonmq/men_scene/men_room_8Tex_007530"
-static const ALIGN_ASSET(2) char men_room_8Tex_007530[] = dmen_room_8Tex_007530;
-
 #define dmen_room_8DL_000EC0 "__OTR__scenes/nonmq/men_scene/men_room_8DL_000EC0"
 static const ALIGN_ASSET(2) char men_room_8DL_000EC0[] = dmen_room_8DL_000EC0;
 
-#define dmen_room_8Tex_007E30 "__OTR__scenes/nonmq/men_scene/men_room_8Tex_007E30"
-static const ALIGN_ASSET(2) char men_room_8Tex_007E30[] = dmen_room_8Tex_007E30;
-
-#define dmen_room_8Tex_006D30 "__OTR__scenes/nonmq/men_scene/men_room_8Tex_006D30"
-static const ALIGN_ASSET(2) char men_room_8Tex_006D30[] = dmen_room_8Tex_006D30;
-
 
 #endif // DUNGEONS_MEN_ROOM_8_H
diff --git a/soh/assets/scenes/dungeons/men/men_room_9.h b/soh/assets/scenes/dungeons/men/men_room_9.h
index 5252fe02a..f3fb23fe9 100644
--- a/soh/assets/scenes/dungeons/men/men_room_9.h
+++ b/soh/assets/scenes/dungeons/men/men_room_9.h
@@ -3,12 +3,21 @@
 
 #include "align_asset_macro.h"
 
-#define dmen_room_9DL_000700 "__OTR__scenes/nonmq/men_scene/men_room_9DL_000700"
-static const ALIGN_ASSET(2) char men_room_9DL_000700[] = dmen_room_9DL_000700;
+#define dmen_room_9Tex_001AB0 "__OTR__scenes/nonmq/men_scene/men_room_9Tex_001AB0"
+static const ALIGN_ASSET(2) char men_room_9Tex_001AB0[] = dmen_room_9Tex_001AB0;
 
 #define dmen_room_9Tex_0022B0 "__OTR__scenes/nonmq/men_scene/men_room_9Tex_0022B0"
 static const ALIGN_ASSET(2) char men_room_9Tex_0022B0[] = dmen_room_9Tex_0022B0;
 
+#define dmen_room_9Tex_0026B0 "__OTR__scenes/nonmq/men_scene/men_room_9Tex_0026B0"
+static const ALIGN_ASSET(2) char men_room_9Tex_0026B0[] = dmen_room_9Tex_0026B0;
+
+#define dmen_room_9Tex_003070 "__OTR__scenes/nonmq/men_scene/men_room_9Tex_003070"
+static const ALIGN_ASSET(2) char men_room_9Tex_003070[] = dmen_room_9Tex_003070;
+
+#define dmen_room_9DL_000700 "__OTR__scenes/nonmq/men_scene/men_room_9DL_000700"
+static const ALIGN_ASSET(2) char men_room_9DL_000700[] = dmen_room_9DL_000700;
+
 #define dmen_room_9DL_000B30 "__OTR__scenes/nonmq/men_scene/men_room_9DL_000B30"
 static const ALIGN_ASSET(2) char men_room_9DL_000B30[] = dmen_room_9DL_000B30;
 
@@ -18,20 +27,11 @@ static const ALIGN_ASSET(2) char men_room_9DL_000D68[] = dmen_room_9DL_000D68;
 #define dmen_room_9DL_002F80 "__OTR__scenes/nonmq/men_scene/men_room_9DL_002F80"
 static const ALIGN_ASSET(2) char men_room_9DL_002F80[] = dmen_room_9DL_002F80;
 
-#define dmen_room_9Tex_003070 "__OTR__scenes/nonmq/men_scene/men_room_9Tex_003070"
-static const ALIGN_ASSET(2) char men_room_9Tex_003070[] = dmen_room_9Tex_003070;
-
 #define dmen_room_9DL_0014E8 "__OTR__scenes/nonmq/men_scene/men_room_9DL_0014E8"
 static const ALIGN_ASSET(2) char men_room_9DL_0014E8[] = dmen_room_9DL_0014E8;
 
-#define dmen_room_9Tex_0026B0 "__OTR__scenes/nonmq/men_scene/men_room_9Tex_0026B0"
-static const ALIGN_ASSET(2) char men_room_9Tex_0026B0[] = dmen_room_9Tex_0026B0;
-
 #define dmen_room_9DL_0019C0 "__OTR__scenes/nonmq/men_scene/men_room_9DL_0019C0"
 static const ALIGN_ASSET(2) char men_room_9DL_0019C0[] = dmen_room_9DL_0019C0;
 
-#define dmen_room_9Tex_001AB0 "__OTR__scenes/nonmq/men_scene/men_room_9Tex_001AB0"
-static const ALIGN_ASSET(2) char men_room_9Tex_001AB0[] = dmen_room_9Tex_001AB0;
-
 
 #endif // DUNGEONS_MEN_ROOM_9_H
diff --git a/soh/assets/scenes/dungeons/men/men_scene.h b/soh/assets/scenes/dungeons/men/men_scene.h
index bd22d86f3..98cb3a849 100644
--- a/soh/assets/scenes/dungeons/men/men_scene.h
+++ b/soh/assets/scenes/dungeons/men/men_scene.h
@@ -3,6 +3,15 @@
 
 #include "align_asset_macro.h"
 
+#define dmen_sceneTex_0108C0 "__OTR__scenes/nonmq/men_scene/men_sceneTex_0108C0"
+static const ALIGN_ASSET(2) char men_sceneTex_0108C0[] = dmen_sceneTex_0108C0;
+
+#define dmen_sceneTex_010CC0 "__OTR__scenes/nonmq/men_scene/men_sceneTex_010CC0"
+static const ALIGN_ASSET(2) char men_sceneTex_010CC0[] = dmen_sceneTex_010CC0;
+
+#define dmen_sceneTLUT_00F6C0 "__OTR__scenes/nonmq/men_scene/men_sceneTLUT_00F6C0"
+static const ALIGN_ASSET(2) char men_sceneTLUT_00F6C0[] = dmen_sceneTLUT_00F6C0;
+
 #define dgGTGDayEntranceTex "__OTR__scenes/nonmq/men_scene/gGTGDayEntranceTex"
 static const ALIGN_ASSET(2) char gGTGDayEntranceTex[] = dgGTGDayEntranceTex;
 
@@ -12,13 +21,5 @@ static const ALIGN_ASSET(2) char gGTGNightEntranceTex[] = dgGTGNightEntranceTex;
 #define dmen_sceneCollisionHeader_00F690 "__OTR__scenes/nonmq/men_scene/men_sceneCollisionHeader_00F690"
 static const ALIGN_ASSET(2) char men_sceneCollisionHeader_00F690[] = dmen_sceneCollisionHeader_00F690;
 
-#define dmen_sceneTLUT_00F6C0 "__OTR__scenes/nonmq/men_scene/men_sceneTLUT_00F6C0"
-static const ALIGN_ASSET(2) char men_sceneTLUT_00F6C0[] = dmen_sceneTLUT_00F6C0;
-
-#define dmen_sceneTex_010CC0 "__OTR__scenes/nonmq/men_scene/men_sceneTex_010CC0"
-static const ALIGN_ASSET(2) char men_sceneTex_010CC0[] = dmen_sceneTex_010CC0;
-
-#define dmen_sceneTex_0108C0 "__OTR__scenes/nonmq/men_scene/men_sceneTex_0108C0"
-static const ALIGN_ASSET(2) char men_sceneTex_0108C0[] = dmen_sceneTex_0108C0;
 
 #endif // DUNGEONS_MEN_SCENE_H
diff --git a/soh/assets/scenes/dungeons/moribossroom/moribossroom_room_0.h b/soh/assets/scenes/dungeons/moribossroom/moribossroom_room_0.h
index 5afbf3fd6..f21d2f809 100644
--- a/soh/assets/scenes/dungeons/moribossroom/moribossroom_room_0.h
+++ b/soh/assets/scenes/dungeons/moribossroom/moribossroom_room_0.h
@@ -3,23 +3,23 @@
 
 #include "align_asset_macro.h"
 
-#define dmoribossroom_room_0DL_003888 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_0DL_003888"
-static const ALIGN_ASSET(2) char moribossroom_room_0DL_003888[] = dmoribossroom_room_0DL_003888;
-
-#define dmoribossroom_room_0Tex_0038B8 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_0Tex_0038B8"
+#define dmoribossroom_room_0Tex_0038B8 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_0Tex_0038B8"
 static const ALIGN_ASSET(2) char moribossroom_room_0Tex_0038B8[] = dmoribossroom_room_0Tex_0038B8;
 
-#define dmoribossroom_room_0Tex_0054B8 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_0Tex_0054B8"
-static const ALIGN_ASSET(2) char moribossroom_room_0Tex_0054B8[] = dmoribossroom_room_0Tex_0054B8;
-
-#define dmoribossroom_room_0Tex_0044B8 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_0Tex_0044B8"
-static const ALIGN_ASSET(2) char moribossroom_room_0Tex_0044B8[] = dmoribossroom_room_0Tex_0044B8;
-
-#define dmoribossroom_room_0Tex_0040B8 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_0Tex_0040B8"
+#define dmoribossroom_room_0Tex_0040B8 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_0Tex_0040B8"
 static const ALIGN_ASSET(2) char moribossroom_room_0Tex_0040B8[] = dmoribossroom_room_0Tex_0040B8;
 
-#define dmoribossroom_room_0Tex_0056B8 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_0Tex_0056B8"
+#define dmoribossroom_room_0Tex_0044B8 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_0Tex_0044B8"
+static const ALIGN_ASSET(2) char moribossroom_room_0Tex_0044B8[] = dmoribossroom_room_0Tex_0044B8;
+
+#define dmoribossroom_room_0Tex_0054B8 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_0Tex_0054B8"
+static const ALIGN_ASSET(2) char moribossroom_room_0Tex_0054B8[] = dmoribossroom_room_0Tex_0054B8;
+
+#define dmoribossroom_room_0Tex_0056B8 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_0Tex_0056B8"
 static const ALIGN_ASSET(2) char moribossroom_room_0Tex_0056B8[] = dmoribossroom_room_0Tex_0056B8;
 
+#define dmoribossroom_room_0DL_003888 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_0DL_003888"
+static const ALIGN_ASSET(2) char moribossroom_room_0DL_003888[] = dmoribossroom_room_0DL_003888;
+
 
 #endif // DUNGEONS_MORIBOSSROOM_ROOM_0_H
diff --git a/soh/assets/scenes/dungeons/moribossroom/moribossroom_room_1.h b/soh/assets/scenes/dungeons/moribossroom/moribossroom_room_1.h
index 1b6eea9fa..4fe66c879 100644
--- a/soh/assets/scenes/dungeons/moribossroom/moribossroom_room_1.h
+++ b/soh/assets/scenes/dungeons/moribossroom/moribossroom_room_1.h
@@ -3,53 +3,53 @@
 
 #include "align_asset_macro.h"
 
-#define dmoribossroom_room_1DL_0067D0 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_1DL_0067D0"
-static const ALIGN_ASSET(2) char moribossroom_room_1DL_0067D0[] = dmoribossroom_room_1DL_0067D0;
-
-#define dmoribossroom_room_1Tex_007A20 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_1Tex_007A20"
-static const ALIGN_ASSET(2) char moribossroom_room_1Tex_007A20[] = dmoribossroom_room_1Tex_007A20;
-
-#define dmoribossroom_room_1Tex_006A20 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_1Tex_006A20"
+#define dmoribossroom_room_1Tex_006A20 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_1Tex_006A20"
 static const ALIGN_ASSET(2) char moribossroom_room_1Tex_006A20[] = dmoribossroom_room_1Tex_006A20;
 
-#define dmoribossroom_room_1Tex_009B20 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_1Tex_009B20"
-static const ALIGN_ASSET(2) char moribossroom_room_1Tex_009B20[] = dmoribossroom_room_1Tex_009B20;
+#define dmoribossroom_room_1Tex_007A20 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_1Tex_007A20"
+static const ALIGN_ASSET(2) char moribossroom_room_1Tex_007A20[] = dmoribossroom_room_1Tex_007A20;
 
-#define dmoribossroom_room_1Tex_009A20 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_1Tex_009A20"
-static const ALIGN_ASSET(2) char moribossroom_room_1Tex_009A20[] = dmoribossroom_room_1Tex_009A20;
-
-#define dmoribossroom_room_1Tex_00CD20 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_1Tex_00CD20"
-static const ALIGN_ASSET(2) char moribossroom_room_1Tex_00CD20[] = dmoribossroom_room_1Tex_00CD20;
-
-#define dmoribossroom_room_1TLUT_006828 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_1TLUT_006828"
-static const ALIGN_ASSET(2) char moribossroom_room_1TLUT_006828[] = dmoribossroom_room_1TLUT_006828;
-
-#define dmoribossroom_room_1Tex_00C520 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_1Tex_00C520"
-static const ALIGN_ASSET(2) char moribossroom_room_1Tex_00C520[] = dmoribossroom_room_1Tex_00C520;
-
-#define dmoribossroom_room_1Tex_00BD20 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_1Tex_00BD20"
-static const ALIGN_ASSET(2) char moribossroom_room_1Tex_00BD20[] = dmoribossroom_room_1Tex_00BD20;
-
-#define dmoribossroom_room_1Tex_00AD20 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_1Tex_00AD20"
-static const ALIGN_ASSET(2) char moribossroom_room_1Tex_00AD20[] = dmoribossroom_room_1Tex_00AD20;
-
-#define dmoribossroom_room_1Tex_00A520 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_1Tex_00A520"
-static const ALIGN_ASSET(2) char moribossroom_room_1Tex_00A520[] = dmoribossroom_room_1Tex_00A520;
-
-#define dmoribossroom_room_1Tex_009D20 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_1Tex_009D20"
-static const ALIGN_ASSET(2) char moribossroom_room_1Tex_009D20[] = dmoribossroom_room_1Tex_009D20;
-
-#define dmoribossroom_room_1Tex_008A20 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_1Tex_008A20"
+#define dmoribossroom_room_1Tex_008A20 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_1Tex_008A20"
 static const ALIGN_ASSET(2) char moribossroom_room_1Tex_008A20[] = dmoribossroom_room_1Tex_008A20;
 
-#define dmoribossroom_room_1Tex_00B520 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_1Tex_00B520"
+#define dmoribossroom_room_1Tex_009A20 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_1Tex_009A20"
+static const ALIGN_ASSET(2) char moribossroom_room_1Tex_009A20[] = dmoribossroom_room_1Tex_009A20;
+
+#define dmoribossroom_room_1Tex_009B20 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_1Tex_009B20"
+static const ALIGN_ASSET(2) char moribossroom_room_1Tex_009B20[] = dmoribossroom_room_1Tex_009B20;
+
+#define dmoribossroom_room_1Tex_009D20 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_1Tex_009D20"
+static const ALIGN_ASSET(2) char moribossroom_room_1Tex_009D20[] = dmoribossroom_room_1Tex_009D20;
+
+#define dmoribossroom_room_1Tex_00A520 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_1Tex_00A520"
+static const ALIGN_ASSET(2) char moribossroom_room_1Tex_00A520[] = dmoribossroom_room_1Tex_00A520;
+
+#define dmoribossroom_room_1Tex_00AD20 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_1Tex_00AD20"
+static const ALIGN_ASSET(2) char moribossroom_room_1Tex_00AD20[] = dmoribossroom_room_1Tex_00AD20;
+
+#define dmoribossroom_room_1Tex_00B520 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_1Tex_00B520"
 static const ALIGN_ASSET(2) char moribossroom_room_1Tex_00B520[] = dmoribossroom_room_1Tex_00B520;
 
-#define dmoribossroom_room_1DL_00D698 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_1DL_00D698"
-static const ALIGN_ASSET(2) char moribossroom_room_1DL_00D698[] = dmoribossroom_room_1DL_00D698;
+#define dmoribossroom_room_1Tex_00BD20 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_1Tex_00BD20"
+static const ALIGN_ASSET(2) char moribossroom_room_1Tex_00BD20[] = dmoribossroom_room_1Tex_00BD20;
 
-#define dmoribossroom_room_1Tex_00D6A8 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_room_1Tex_00D6A8"
+#define dmoribossroom_room_1Tex_00C520 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_1Tex_00C520"
+static const ALIGN_ASSET(2) char moribossroom_room_1Tex_00C520[] = dmoribossroom_room_1Tex_00C520;
+
+#define dmoribossroom_room_1Tex_00CD20 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_1Tex_00CD20"
+static const ALIGN_ASSET(2) char moribossroom_room_1Tex_00CD20[] = dmoribossroom_room_1Tex_00CD20;
+
+#define dmoribossroom_room_1Tex_00D6A8 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_1Tex_00D6A8"
 static const ALIGN_ASSET(2) char moribossroom_room_1Tex_00D6A8[] = dmoribossroom_room_1Tex_00D6A8;
 
+#define dmoribossroom_room_1TLUT_006828 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_1TLUT_006828"
+static const ALIGN_ASSET(2) char moribossroom_room_1TLUT_006828[] = dmoribossroom_room_1TLUT_006828;
+
+#define dmoribossroom_room_1DL_0067D0 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_1DL_0067D0"
+static const ALIGN_ASSET(2) char moribossroom_room_1DL_0067D0[] = dmoribossroom_room_1DL_0067D0;
+
+#define dmoribossroom_room_1DL_00D698 "__OTR__scenes/shared/moribossroom_scene/moribossroom_room_1DL_00D698"
+static const ALIGN_ASSET(2) char moribossroom_room_1DL_00D698[] = dmoribossroom_room_1DL_00D698;
+
 
 #endif // DUNGEONS_MORIBOSSROOM_ROOM_1_H
diff --git a/soh/assets/scenes/dungeons/moribossroom/moribossroom_scene.h b/soh/assets/scenes/dungeons/moribossroom/moribossroom_scene.h
index f80bcabd6..8a770172c 100644
--- a/soh/assets/scenes/dungeons/moribossroom/moribossroom_scene.h
+++ b/soh/assets/scenes/dungeons/moribossroom/moribossroom_scene.h
@@ -3,16 +3,17 @@
 
 #include "align_asset_macro.h"
 
-#define dmoribossroom_sceneCollisionHeader_000B1C "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_sceneCollisionHeader_000B1C"
-static const ALIGN_ASSET(2) char moribossroom_sceneCollisionHeader_000B1C[] = dmoribossroom_sceneCollisionHeader_000B1C;
-
-#define dmoribossroom_sceneTex_000CF8 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_sceneTex_000CF8"
+#define dmoribossroom_sceneTex_000CF8 "__OTR__scenes/shared/moribossroom_scene/moribossroom_sceneTex_000CF8"
 static const ALIGN_ASSET(2) char moribossroom_sceneTex_000CF8[] = dmoribossroom_sceneTex_000CF8;
 
-#define dmoribossroom_sceneTLUT_000B50 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_sceneTLUT_000B50"
-static const ALIGN_ASSET(2) char moribossroom_sceneTLUT_000B50[] = dmoribossroom_sceneTLUT_000B50;
-
-#define dmoribossroom_sceneTex_0010F8 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_sceneTex_0010F8"
+#define dmoribossroom_sceneTex_0010F8 "__OTR__scenes/shared/moribossroom_scene/moribossroom_sceneTex_0010F8"
 static const ALIGN_ASSET(2) char moribossroom_sceneTex_0010F8[] = dmoribossroom_sceneTex_0010F8;
 
+#define dmoribossroom_sceneTLUT_000B50 "__OTR__scenes/shared/moribossroom_scene/moribossroom_sceneTLUT_000B50"
+static const ALIGN_ASSET(2) char moribossroom_sceneTLUT_000B50[] = dmoribossroom_sceneTLUT_000B50;
+
+#define dmoribossroom_sceneCollisionHeader_000B1C "__OTR__scenes/shared/moribossroom_scene/moribossroom_sceneCollisionHeader_000B1C"
+static const ALIGN_ASSET(2) char moribossroom_sceneCollisionHeader_000B1C[] = dmoribossroom_sceneCollisionHeader_000B1C;
+
+
 #endif // DUNGEONS_MORIBOSSROOM_SCENE_H
diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_0.h b/soh/assets/scenes/dungeons/ydan/ydan_room_0.h
index dba7964c4..96ab43b00 100644
--- a/soh/assets/scenes/dungeons/ydan/ydan_room_0.h
+++ b/soh/assets/scenes/dungeons/ydan/ydan_room_0.h
@@ -3,90 +3,90 @@
 
 #include "align_asset_macro.h"
 
-#define dydan_room_0DL_006D88 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0DL_006D88"
-static const ALIGN_ASSET(2) char ydan_room_0DL_006D88[] = dydan_room_0DL_006D88;
-
-#define dydan_room_0Tex_00A5C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00A5C0"
-static const ALIGN_ASSET(2) char ydan_room_0Tex_00A5C0[] = dydan_room_0Tex_00A5C0;
-
-#define dydan_room_0Tex_00D5C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00D5C0"
-static const ALIGN_ASSET(2) char ydan_room_0Tex_00D5C0[] = dydan_room_0Tex_00D5C0;
-
-#define dydan_room_0Tex_00A1C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00A1C0"
-static const ALIGN_ASSET(2) char ydan_room_0Tex_00A1C0[] = dydan_room_0Tex_00A1C0;
-
-#define dydan_room_0Tex_0099C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_0099C0"
-static const ALIGN_ASSET(2) char ydan_room_0Tex_0099C0[] = dydan_room_0Tex_0099C0;
-
-#define dydan_room_0DL_012E30 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0DL_012E30"
-static const ALIGN_ASSET(2) char ydan_room_0DL_012E30[] = dydan_room_0DL_012E30;
-
-#define dydan_room_0Tex_013F48 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_013F48"
-static const ALIGN_ASSET(2) char ydan_room_0Tex_013F48[] = dydan_room_0Tex_013F48;
-
-#define dydan_room_0DL_012CA8 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0DL_012CA8"
-static const ALIGN_ASSET(2) char ydan_room_0DL_012CA8[] = dydan_room_0DL_012CA8;
-
-#define dydan_room_0Tex_012F48 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_012F48"
-static const ALIGN_ASSET(2) char ydan_room_0Tex_012F48[] = dydan_room_0Tex_012F48;
-
-#define dydan_room_0DL_005E60 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0DL_005E60"
-static const ALIGN_ASSET(2) char ydan_room_0DL_005E60[] = dydan_room_0DL_005E60;
-
 #define dydan_room_0Tex_0071C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_0071C0"
 static const ALIGN_ASSET(2) char ydan_room_0Tex_0071C0[] = dydan_room_0Tex_0071C0;
 
 #define dydan_room_0Tex_0081C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_0081C0"
 static const ALIGN_ASSET(2) char ydan_room_0Tex_0081C0[] = dydan_room_0Tex_0081C0;
 
+#define dydan_room_0Tex_0091C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_0091C0"
+static const ALIGN_ASSET(2) char ydan_room_0Tex_0091C0[] = dydan_room_0Tex_0091C0;
+
+#define dydan_room_0Tex_0099C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_0099C0"
+static const ALIGN_ASSET(2) char ydan_room_0Tex_0099C0[] = dydan_room_0Tex_0099C0;
+
+#define dydan_room_0Tex_00A1C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00A1C0"
+static const ALIGN_ASSET(2) char ydan_room_0Tex_00A1C0[] = dydan_room_0Tex_00A1C0;
+
+#define dydan_room_0Tex_00A5C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00A5C0"
+static const ALIGN_ASSET(2) char ydan_room_0Tex_00A5C0[] = dydan_room_0Tex_00A5C0;
+
+#define dydan_room_0Tex_00ADC0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00ADC0"
+static const ALIGN_ASSET(2) char ydan_room_0Tex_00ADC0[] = dydan_room_0Tex_00ADC0;
+
+#define dydan_room_0Tex_00B5C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00B5C0"
+static const ALIGN_ASSET(2) char ydan_room_0Tex_00B5C0[] = dydan_room_0Tex_00B5C0;
+
+#define dydan_room_0Tex_00BDC0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00BDC0"
+static const ALIGN_ASSET(2) char ydan_room_0Tex_00BDC0[] = dydan_room_0Tex_00BDC0;
+
+#define dydan_room_0Tex_00C5C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00C5C0"
+static const ALIGN_ASSET(2) char ydan_room_0Tex_00C5C0[] = dydan_room_0Tex_00C5C0;
+
+#define dydan_room_0Tex_00CDC0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00CDC0"
+static const ALIGN_ASSET(2) char ydan_room_0Tex_00CDC0[] = dydan_room_0Tex_00CDC0;
+
+#define dydan_room_0Tex_00D5C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00D5C0"
+static const ALIGN_ASSET(2) char ydan_room_0Tex_00D5C0[] = dydan_room_0Tex_00D5C0;
+
+#define dydan_room_0Tex_00D9C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00D9C0"
+static const ALIGN_ASSET(2) char ydan_room_0Tex_00D9C0[] = dydan_room_0Tex_00D9C0;
+
+#define dydan_room_0Tex_00E1C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00E1C0"
+static const ALIGN_ASSET(2) char ydan_room_0Tex_00E1C0[] = dydan_room_0Tex_00E1C0;
+
+#define dydan_room_0Tex_00E9C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00E9C0"
+static const ALIGN_ASSET(2) char ydan_room_0Tex_00E9C0[] = dydan_room_0Tex_00E9C0;
+
+#define dydan_room_0Tex_00F1C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00F1C0"
+static const ALIGN_ASSET(2) char ydan_room_0Tex_00F1C0[] = dydan_room_0Tex_00F1C0;
+
 #define dydan_room_0Tex_00F9C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00F9C0"
 static const ALIGN_ASSET(2) char ydan_room_0Tex_00F9C0[] = dydan_room_0Tex_00F9C0;
 
-#define dydan_room_0DL_0124C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0DL_0124C0"
-static const ALIGN_ASSET(2) char ydan_room_0DL_0124C0[] = dydan_room_0DL_0124C0;
+#define dydan_room_0Tex_0109C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_0109C0"
+static const ALIGN_ASSET(2) char ydan_room_0Tex_0109C0[] = dydan_room_0Tex_0109C0;
+
+#define dydan_room_0Tex_012F48 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_012F48"
+static const ALIGN_ASSET(2) char ydan_room_0Tex_012F48[] = dydan_room_0Tex_012F48;
+
+#define dydan_room_0Tex_013F48 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_013F48"
+static const ALIGN_ASSET(2) char ydan_room_0Tex_013F48[] = dydan_room_0Tex_013F48;
 
 #define dydan_room_0Tex_014348 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_014348"
 static const ALIGN_ASSET(2) char ydan_room_0Tex_014348[] = dydan_room_0Tex_014348;
 
+#define dydan_room_0DL_006D88 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0DL_006D88"
+static const ALIGN_ASSET(2) char ydan_room_0DL_006D88[] = dydan_room_0DL_006D88;
+
+#define dydan_room_0DL_012E30 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0DL_012E30"
+static const ALIGN_ASSET(2) char ydan_room_0DL_012E30[] = dydan_room_0DL_012E30;
+
+#define dydan_room_0DL_012CA8 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0DL_012CA8"
+static const ALIGN_ASSET(2) char ydan_room_0DL_012CA8[] = dydan_room_0DL_012CA8;
+
+#define dydan_room_0DL_005E60 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0DL_005E60"
+static const ALIGN_ASSET(2) char ydan_room_0DL_005E60[] = dydan_room_0DL_005E60;
+
+#define dydan_room_0DL_0124C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0DL_0124C0"
+static const ALIGN_ASSET(2) char ydan_room_0DL_0124C0[] = dydan_room_0DL_0124C0;
+
 #define dydan_room_0DL_006798 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0DL_006798"
 static const ALIGN_ASSET(2) char ydan_room_0DL_006798[] = dydan_room_0DL_006798;
 
 #define dydan_room_0DL_003450 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0DL_003450"
 static const ALIGN_ASSET(2) char ydan_room_0DL_003450[] = dydan_room_0DL_003450;
 
-#define dydan_room_0Tex_0091C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_0091C0"
-static const ALIGN_ASSET(2) char ydan_room_0Tex_0091C0[] = dydan_room_0Tex_0091C0;
-
-#define dydan_room_0Tex_00E1C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00E1C0"
-static const ALIGN_ASSET(2) char ydan_room_0Tex_00E1C0[] = dydan_room_0Tex_00E1C0;
-
-#define dydan_room_0Tex_0109C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_0109C0"
-static const ALIGN_ASSET(2) char ydan_room_0Tex_0109C0[] = dydan_room_0Tex_0109C0;
-
-#define dydan_room_0Tex_00D9C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00D9C0"
-static const ALIGN_ASSET(2) char ydan_room_0Tex_00D9C0[] = dydan_room_0Tex_00D9C0;
-
-#define dydan_room_0Tex_00C5C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00C5C0"
-static const ALIGN_ASSET(2) char ydan_room_0Tex_00C5C0[] = dydan_room_0Tex_00C5C0;
-
-#define dydan_room_0Tex_00B5C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00B5C0"
-static const ALIGN_ASSET(2) char ydan_room_0Tex_00B5C0[] = dydan_room_0Tex_00B5C0;
-
-#define dydan_room_0Tex_00F1C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00F1C0"
-static const ALIGN_ASSET(2) char ydan_room_0Tex_00F1C0[] = dydan_room_0Tex_00F1C0;
-
-#define dydan_room_0Tex_00E9C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00E9C0"
-static const ALIGN_ASSET(2) char ydan_room_0Tex_00E9C0[] = dydan_room_0Tex_00E9C0;
-
-#define dydan_room_0Tex_00CDC0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00CDC0"
-static const ALIGN_ASSET(2) char ydan_room_0Tex_00CDC0[] = dydan_room_0Tex_00CDC0;
-
-#define dydan_room_0Tex_00BDC0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00BDC0"
-static const ALIGN_ASSET(2) char ydan_room_0Tex_00BDC0[] = dydan_room_0Tex_00BDC0;
-
-#define dydan_room_0Tex_00ADC0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0Tex_00ADC0"
-static const ALIGN_ASSET(2) char ydan_room_0Tex_00ADC0[] = dydan_room_0Tex_00ADC0;
-
 #define dydan_room_0DL_011290 "__OTR__scenes/nonmq/ydan_scene/ydan_room_0DL_011290"
 static const ALIGN_ASSET(2) char ydan_room_0DL_011290[] = dydan_room_0DL_011290;
 
diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_1.h b/soh/assets/scenes/dungeons/ydan/ydan_room_1.h
index 3e225d8a1..7d9143896 100644
--- a/soh/assets/scenes/dungeons/ydan/ydan_room_1.h
+++ b/soh/assets/scenes/dungeons/ydan/ydan_room_1.h
@@ -3,8 +3,8 @@
 
 #include "align_asset_macro.h"
 
-#define dydan_room_1DL_000A40 "__OTR__scenes/nonmq/ydan_scene/ydan_room_1DL_000A40"
-static const ALIGN_ASSET(2) char ydan_room_1DL_000A40[] = dydan_room_1DL_000A40;
+#define dydan_room_1Tex_000F98 "__OTR__scenes/nonmq/ydan_scene/ydan_room_1Tex_000F98"
+static const ALIGN_ASSET(2) char ydan_room_1Tex_000F98[] = dydan_room_1Tex_000F98;
 
 #define dydan_room_1Tex_001798 "__OTR__scenes/nonmq/ydan_scene/ydan_room_1Tex_001798"
 static const ALIGN_ASSET(2) char ydan_room_1Tex_001798[] = dydan_room_1Tex_001798;
@@ -12,17 +12,17 @@ static const ALIGN_ASSET(2) char ydan_room_1Tex_001798[] = dydan_room_1Tex_00179
 #define dydan_room_1Tex_001F98 "__OTR__scenes/nonmq/ydan_scene/ydan_room_1Tex_001F98"
 static const ALIGN_ASSET(2) char ydan_room_1Tex_001F98[] = dydan_room_1Tex_001F98;
 
-#define dydan_room_1Tex_000F98 "__OTR__scenes/nonmq/ydan_scene/ydan_room_1Tex_000F98"
-static const ALIGN_ASSET(2) char ydan_room_1Tex_000F98[] = dydan_room_1Tex_000F98;
-
 #define dydan_room_1Tex_002798 "__OTR__scenes/nonmq/ydan_scene/ydan_room_1Tex_002798"
 static const ALIGN_ASSET(2) char ydan_room_1Tex_002798[] = dydan_room_1Tex_002798;
 
-#define dydan_room_1DL_003110 "__OTR__scenes/nonmq/ydan_scene/ydan_room_1DL_003110"
-static const ALIGN_ASSET(2) char ydan_room_1DL_003110[] = dydan_room_1DL_003110;
-
 #define dydan_room_1Tex_003200 "__OTR__scenes/nonmq/ydan_scene/ydan_room_1Tex_003200"
 static const ALIGN_ASSET(2) char ydan_room_1Tex_003200[] = dydan_room_1Tex_003200;
 
+#define dydan_room_1DL_000A40 "__OTR__scenes/nonmq/ydan_scene/ydan_room_1DL_000A40"
+static const ALIGN_ASSET(2) char ydan_room_1DL_000A40[] = dydan_room_1DL_000A40;
+
+#define dydan_room_1DL_003110 "__OTR__scenes/nonmq/ydan_scene/ydan_room_1DL_003110"
+static const ALIGN_ASSET(2) char ydan_room_1DL_003110[] = dydan_room_1DL_003110;
+
 
 #endif // DUNGEONS_YDAN_ROOM_1_H
diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_10.h b/soh/assets/scenes/dungeons/ydan/ydan_room_10.h
index d73939069..4696cb959 100644
--- a/soh/assets/scenes/dungeons/ydan/ydan_room_10.h
+++ b/soh/assets/scenes/dungeons/ydan/ydan_room_10.h
@@ -3,9 +3,6 @@
 
 #include "align_asset_macro.h"
 
-#define dydan_room_10DL_001370 "__OTR__scenes/nonmq/ydan_scene/ydan_room_10DL_001370"
-static const ALIGN_ASSET(2) char ydan_room_10DL_001370[] = dydan_room_10DL_001370;
-
 #define dydan_room_10Tex_001BE0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_10Tex_001BE0"
 static const ALIGN_ASSET(2) char ydan_room_10Tex_001BE0[] = dydan_room_10Tex_001BE0;
 
@@ -18,11 +15,14 @@ static const ALIGN_ASSET(2) char ydan_room_10Tex_002BE0[] = dydan_room_10Tex_002
 #define dydan_room_10Tex_0033E0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_10Tex_0033E0"
 static const ALIGN_ASSET(2) char ydan_room_10Tex_0033E0[] = dydan_room_10Tex_0033E0;
 
-#define dydan_room_10DL_003D20 "__OTR__scenes/nonmq/ydan_scene/ydan_room_10DL_003D20"
-static const ALIGN_ASSET(2) char ydan_room_10DL_003D20[] = dydan_room_10DL_003D20;
-
 #define dydan_room_10Tex_003DF8 "__OTR__scenes/nonmq/ydan_scene/ydan_room_10Tex_003DF8"
 static const ALIGN_ASSET(2) char ydan_room_10Tex_003DF8[] = dydan_room_10Tex_003DF8;
 
+#define dydan_room_10DL_001370 "__OTR__scenes/nonmq/ydan_scene/ydan_room_10DL_001370"
+static const ALIGN_ASSET(2) char ydan_room_10DL_001370[] = dydan_room_10DL_001370;
+
+#define dydan_room_10DL_003D20 "__OTR__scenes/nonmq/ydan_scene/ydan_room_10DL_003D20"
+static const ALIGN_ASSET(2) char ydan_room_10DL_003D20[] = dydan_room_10DL_003D20;
+
 
 #endif // DUNGEONS_YDAN_ROOM_10_H
diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_11.h b/soh/assets/scenes/dungeons/ydan/ydan_room_11.h
index 5648b2afc..c2d603257 100644
--- a/soh/assets/scenes/dungeons/ydan/ydan_room_11.h
+++ b/soh/assets/scenes/dungeons/ydan/ydan_room_11.h
@@ -3,26 +3,26 @@
 
 #include "align_asset_macro.h"
 
-#define dydan_room_11DL_002D90 "__OTR__scenes/nonmq/ydan_scene/ydan_room_11DL_002D90"
-static const ALIGN_ASSET(2) char ydan_room_11DL_002D90[] = dydan_room_11DL_002D90;
-
-#define dydan_room_11Tex_0054D8 "__OTR__scenes/nonmq/ydan_scene/ydan_room_11Tex_0054D8"
-static const ALIGN_ASSET(2) char ydan_room_11Tex_0054D8[] = dydan_room_11Tex_0054D8;
+#define dydan_room_11Tex_003CD8 "__OTR__scenes/nonmq/ydan_scene/ydan_room_11Tex_003CD8"
+static const ALIGN_ASSET(2) char ydan_room_11Tex_003CD8[] = dydan_room_11Tex_003CD8;
 
 #define dydan_room_11Tex_0044D8 "__OTR__scenes/nonmq/ydan_scene/ydan_room_11Tex_0044D8"
 static const ALIGN_ASSET(2) char ydan_room_11Tex_0044D8[] = dydan_room_11Tex_0044D8;
 
+#define dydan_room_11Tex_0054D8 "__OTR__scenes/nonmq/ydan_scene/ydan_room_11Tex_0054D8"
+static const ALIGN_ASSET(2) char ydan_room_11Tex_0054D8[] = dydan_room_11Tex_0054D8;
+
 #define dydan_room_11Tex_005CD8 "__OTR__scenes/nonmq/ydan_scene/ydan_room_11Tex_005CD8"
 static const ALIGN_ASSET(2) char ydan_room_11Tex_005CD8[] = dydan_room_11Tex_005CD8;
 
-#define dydan_room_11Tex_003CD8 "__OTR__scenes/nonmq/ydan_scene/ydan_room_11Tex_003CD8"
-static const ALIGN_ASSET(2) char ydan_room_11Tex_003CD8[] = dydan_room_11Tex_003CD8;
-
-#define dydan_room_11DL_006730 "__OTR__scenes/nonmq/ydan_scene/ydan_room_11DL_006730"
-static const ALIGN_ASSET(2) char ydan_room_11DL_006730[] = dydan_room_11DL_006730;
-
 #define dydan_room_11Tex_006968 "__OTR__scenes/nonmq/ydan_scene/ydan_room_11Tex_006968"
 static const ALIGN_ASSET(2) char ydan_room_11Tex_006968[] = dydan_room_11Tex_006968;
 
+#define dydan_room_11DL_002D90 "__OTR__scenes/nonmq/ydan_scene/ydan_room_11DL_002D90"
+static const ALIGN_ASSET(2) char ydan_room_11DL_002D90[] = dydan_room_11DL_002D90;
+
+#define dydan_room_11DL_006730 "__OTR__scenes/nonmq/ydan_scene/ydan_room_11DL_006730"
+static const ALIGN_ASSET(2) char ydan_room_11DL_006730[] = dydan_room_11DL_006730;
+
 
 #endif // DUNGEONS_YDAN_ROOM_11_H
diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_2.h b/soh/assets/scenes/dungeons/ydan/ydan_room_2.h
index 3d7fe0edc..704cee1d1 100644
--- a/soh/assets/scenes/dungeons/ydan/ydan_room_2.h
+++ b/soh/assets/scenes/dungeons/ydan/ydan_room_2.h
@@ -3,32 +3,32 @@
 
 #include "align_asset_macro.h"
 
-#define dydan_room_2DL_001160 "__OTR__scenes/nonmq/ydan_scene/ydan_room_2DL_001160"
-static const ALIGN_ASSET(2) char ydan_room_2DL_001160[] = dydan_room_2DL_001160;
-
 #define dydan_room_2Tex_001D08 "__OTR__scenes/nonmq/ydan_scene/ydan_room_2Tex_001D08"
 static const ALIGN_ASSET(2) char ydan_room_2Tex_001D08[] = dydan_room_2Tex_001D08;
 
-#define dydan_room_2Tex_002D08 "__OTR__scenes/nonmq/ydan_scene/ydan_room_2Tex_002D08"
-static const ALIGN_ASSET(2) char ydan_room_2Tex_002D08[] = dydan_room_2Tex_002D08;
-
-#define dydan_room_2Tex_004508 "__OTR__scenes/nonmq/ydan_scene/ydan_room_2Tex_004508"
-static const ALIGN_ASSET(2) char ydan_room_2Tex_004508[] = dydan_room_2Tex_004508;
-
 #define dydan_room_2Tex_002508 "__OTR__scenes/nonmq/ydan_scene/ydan_room_2Tex_002508"
 static const ALIGN_ASSET(2) char ydan_room_2Tex_002508[] = dydan_room_2Tex_002508;
 
-#define dydan_room_2Tex_003D08 "__OTR__scenes/nonmq/ydan_scene/ydan_room_2Tex_003D08"
-static const ALIGN_ASSET(2) char ydan_room_2Tex_003D08[] = dydan_room_2Tex_003D08;
+#define dydan_room_2Tex_002D08 "__OTR__scenes/nonmq/ydan_scene/ydan_room_2Tex_002D08"
+static const ALIGN_ASSET(2) char ydan_room_2Tex_002D08[] = dydan_room_2Tex_002D08;
 
 #define dydan_room_2Tex_003508 "__OTR__scenes/nonmq/ydan_scene/ydan_room_2Tex_003508"
 static const ALIGN_ASSET(2) char ydan_room_2Tex_003508[] = dydan_room_2Tex_003508;
 
-#define dydan_room_2DL_004E50 "__OTR__scenes/nonmq/ydan_scene/ydan_room_2DL_004E50"
-static const ALIGN_ASSET(2) char ydan_room_2DL_004E50[] = dydan_room_2DL_004E50;
+#define dydan_room_2Tex_003D08 "__OTR__scenes/nonmq/ydan_scene/ydan_room_2Tex_003D08"
+static const ALIGN_ASSET(2) char ydan_room_2Tex_003D08[] = dydan_room_2Tex_003D08;
+
+#define dydan_room_2Tex_004508 "__OTR__scenes/nonmq/ydan_scene/ydan_room_2Tex_004508"
+static const ALIGN_ASSET(2) char ydan_room_2Tex_004508[] = dydan_room_2Tex_004508;
 
 #define dydan_room_2Tex_004F28 "__OTR__scenes/nonmq/ydan_scene/ydan_room_2Tex_004F28"
 static const ALIGN_ASSET(2) char ydan_room_2Tex_004F28[] = dydan_room_2Tex_004F28;
 
+#define dydan_room_2DL_001160 "__OTR__scenes/nonmq/ydan_scene/ydan_room_2DL_001160"
+static const ALIGN_ASSET(2) char ydan_room_2DL_001160[] = dydan_room_2DL_001160;
+
+#define dydan_room_2DL_004E50 "__OTR__scenes/nonmq/ydan_scene/ydan_room_2DL_004E50"
+static const ALIGN_ASSET(2) char ydan_room_2DL_004E50[] = dydan_room_2DL_004E50;
+
 
 #endif // DUNGEONS_YDAN_ROOM_2_H
diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_3.h b/soh/assets/scenes/dungeons/ydan/ydan_room_3.h
index 22d270141..7e0643741 100644
--- a/soh/assets/scenes/dungeons/ydan/ydan_room_3.h
+++ b/soh/assets/scenes/dungeons/ydan/ydan_room_3.h
@@ -3,77 +3,41 @@
 
 #include "align_asset_macro.h"
 
-#define dydan_room_3DL_000F00 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_000F00"
-static const ALIGN_ASSET(2) char ydan_room_3DL_000F00[] = dydan_room_3DL_000F00;
-
-#define dydan_room_3Tex_008CC0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_008CC0"
-static const ALIGN_ASSET(2) char ydan_room_3Tex_008CC0[] = dydan_room_3Tex_008CC0;
-
-#define dydan_room_3DL_005160 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_005160"
-static const ALIGN_ASSET(2) char ydan_room_3DL_005160[] = dydan_room_3DL_005160;
+#define dydan_room_3Tex_0074C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_0074C0"
+static const ALIGN_ASSET(2) char ydan_room_3Tex_0074C0[] = dydan_room_3Tex_0074C0;
 
 #define dydan_room_3Tex_0084C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_0084C0"
 static const ALIGN_ASSET(2) char ydan_room_3Tex_0084C0[] = dydan_room_3Tex_0084C0;
 
+#define dydan_room_3Tex_008CC0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_008CC0"
+static const ALIGN_ASSET(2) char ydan_room_3Tex_008CC0[] = dydan_room_3Tex_008CC0;
+
 #define dydan_room_3Tex_0094C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_0094C0"
 static const ALIGN_ASSET(2) char ydan_room_3Tex_0094C0[] = dydan_room_3Tex_0094C0;
 
-#define dydan_room_3DL_0106E0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_0106E0"
-static const ALIGN_ASSET(2) char ydan_room_3DL_0106E0[] = dydan_room_3DL_0106E0;
+#define dydan_room_3Tex_009CC0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_009CC0"
+static const ALIGN_ASSET(2) char ydan_room_3Tex_009CC0[] = dydan_room_3Tex_009CC0;
 
-#define dydan_room_3Tex_011DB0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_011DB0"
-static const ALIGN_ASSET(2) char ydan_room_3Tex_011DB0[] = dydan_room_3Tex_011DB0;
+#define dydan_room_3Tex_00A0C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00A0C0"
+static const ALIGN_ASSET(2) char ydan_room_3Tex_00A0C0[] = dydan_room_3Tex_00A0C0;
 
-#define dydan_room_3Tex_0131B0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_0131B0"
-static const ALIGN_ASSET(2) char ydan_room_3Tex_0131B0[] = dydan_room_3Tex_0131B0;
+#define dydan_room_3Tex_00A8C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00A8C0"
+static const ALIGN_ASSET(2) char ydan_room_3Tex_00A8C0[] = dydan_room_3Tex_00A8C0;
 
-#define dydan_room_3DL_005EC0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_005EC0"
-static const ALIGN_ASSET(2) char ydan_room_3DL_005EC0[] = dydan_room_3DL_005EC0;
+#define dydan_room_3Tex_00B0C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00B0C0"
+static const ALIGN_ASSET(2) char ydan_room_3Tex_00B0C0[] = dydan_room_3Tex_00B0C0;
 
-#define dydan_room_3Tex_00F8C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00F8C0"
-static const ALIGN_ASSET(2) char ydan_room_3Tex_00F8C0[] = dydan_room_3Tex_00F8C0;
+#define dydan_room_3Tex_00B4C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00B4C0"
+static const ALIGN_ASSET(2) char ydan_room_3Tex_00B4C0[] = dydan_room_3Tex_00B4C0;
 
 #define dydan_room_3Tex_00B8C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00B8C0"
 static const ALIGN_ASSET(2) char ydan_room_3Tex_00B8C0[] = dydan_room_3Tex_00B8C0;
 
-#define dydan_room_3Tex_00D8C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00D8C0"
-static const ALIGN_ASSET(2) char ydan_room_3Tex_00D8C0[] = dydan_room_3Tex_00D8C0;
+#define dydan_room_3Tex_00C0C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00C0C0"
+static const ALIGN_ASSET(2) char ydan_room_3Tex_00C0C0[] = dydan_room_3Tex_00C0C0;
 
-#define dydan_room_3DL_0116C8 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_0116C8"
-static const ALIGN_ASSET(2) char ydan_room_3DL_0116C8[] = dydan_room_3DL_0116C8;
-
-#define dydan_room_3DL_006B18 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_006B18"
-static const ALIGN_ASSET(2) char ydan_room_3DL_006B18[] = dydan_room_3DL_006B18;
-
-#define dydan_room_3Tex_0074C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_0074C0"
-static const ALIGN_ASSET(2) char ydan_room_3Tex_0074C0[] = dydan_room_3Tex_0074C0;
-
-#define dydan_room_3Tex_00E8C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00E8C0"
-static const ALIGN_ASSET(2) char ydan_room_3Tex_00E8C0[] = dydan_room_3Tex_00E8C0;
-
-#define dydan_room_3DL_007208 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_007208"
-static const ALIGN_ASSET(2) char ydan_room_3DL_007208[] = dydan_room_3DL_007208;
-
-#define dydan_room_3Tex_00E0C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00E0C0"
-static const ALIGN_ASSET(2) char ydan_room_3Tex_00E0C0[] = dydan_room_3Tex_00E0C0;
-
-#define dydan_room_3DL_011AC0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_011AC0"
-static const ALIGN_ASSET(2) char ydan_room_3DL_011AC0[] = dydan_room_3DL_011AC0;
-
-#define dydan_room_3DL_011C68 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_011C68"
-static const ALIGN_ASSET(2) char ydan_room_3DL_011C68[] = dydan_room_3DL_011C68;
-
-#define dydan_room_3Tex_012DB0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_012DB0"
-static const ALIGN_ASSET(2) char ydan_room_3Tex_012DB0[] = dydan_room_3Tex_012DB0;
-
-#define dydan_room_3DL_010B48 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_010B48"
-static const ALIGN_ASSET(2) char ydan_room_3DL_010B48[] = dydan_room_3DL_010B48;
-
-#define dydan_room_3DL_003408 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_003408"
-static const ALIGN_ASSET(2) char ydan_room_3DL_003408[] = dydan_room_3DL_003408;
-
-#define dydan_room_3Tex_00A0C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00A0C0"
-static const ALIGN_ASSET(2) char ydan_room_3Tex_00A0C0[] = dydan_room_3Tex_00A0C0;
+#define dydan_room_3Tex_00C8C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00C8C0"
+static const ALIGN_ASSET(2) char ydan_room_3Tex_00C8C0[] = dydan_room_3Tex_00C8C0;
 
 #define dydan_room_3Tex_00D0C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00D0C0"
 static const ALIGN_ASSET(2) char ydan_room_3Tex_00D0C0[] = dydan_room_3Tex_00D0C0;
@@ -81,23 +45,59 @@ static const ALIGN_ASSET(2) char ydan_room_3Tex_00D0C0[] = dydan_room_3Tex_00D0C
 #define dydan_room_3Tex_00D4C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00D4C0"
 static const ALIGN_ASSET(2) char ydan_room_3Tex_00D4C0[] = dydan_room_3Tex_00D4C0;
 
-#define dydan_room_3Tex_009CC0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_009CC0"
-static const ALIGN_ASSET(2) char ydan_room_3Tex_009CC0[] = dydan_room_3Tex_009CC0;
+#define dydan_room_3Tex_00D8C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00D8C0"
+static const ALIGN_ASSET(2) char ydan_room_3Tex_00D8C0[] = dydan_room_3Tex_00D8C0;
 
-#define dydan_room_3Tex_00B4C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00B4C0"
-static const ALIGN_ASSET(2) char ydan_room_3Tex_00B4C0[] = dydan_room_3Tex_00B4C0;
+#define dydan_room_3Tex_00E0C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00E0C0"
+static const ALIGN_ASSET(2) char ydan_room_3Tex_00E0C0[] = dydan_room_3Tex_00E0C0;
 
-#define dydan_room_3Tex_00A8C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00A8C0"
-static const ALIGN_ASSET(2) char ydan_room_3Tex_00A8C0[] = dydan_room_3Tex_00A8C0;
+#define dydan_room_3Tex_00E8C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00E8C0"
+static const ALIGN_ASSET(2) char ydan_room_3Tex_00E8C0[] = dydan_room_3Tex_00E8C0;
 
-#define dydan_room_3Tex_00C8C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00C8C0"
-static const ALIGN_ASSET(2) char ydan_room_3Tex_00C8C0[] = dydan_room_3Tex_00C8C0;
+#define dydan_room_3Tex_00F8C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00F8C0"
+static const ALIGN_ASSET(2) char ydan_room_3Tex_00F8C0[] = dydan_room_3Tex_00F8C0;
 
-#define dydan_room_3Tex_00C0C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00C0C0"
-static const ALIGN_ASSET(2) char ydan_room_3Tex_00C0C0[] = dydan_room_3Tex_00C0C0;
+#define dydan_room_3Tex_011DB0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_011DB0"
+static const ALIGN_ASSET(2) char ydan_room_3Tex_011DB0[] = dydan_room_3Tex_011DB0;
 
-#define dydan_room_3Tex_00B0C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_00B0C0"
-static const ALIGN_ASSET(2) char ydan_room_3Tex_00B0C0[] = dydan_room_3Tex_00B0C0;
+#define dydan_room_3Tex_012DB0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_012DB0"
+static const ALIGN_ASSET(2) char ydan_room_3Tex_012DB0[] = dydan_room_3Tex_012DB0;
+
+#define dydan_room_3Tex_0131B0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3Tex_0131B0"
+static const ALIGN_ASSET(2) char ydan_room_3Tex_0131B0[] = dydan_room_3Tex_0131B0;
+
+#define dydan_room_3DL_000F00 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_000F00"
+static const ALIGN_ASSET(2) char ydan_room_3DL_000F00[] = dydan_room_3DL_000F00;
+
+#define dydan_room_3DL_005160 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_005160"
+static const ALIGN_ASSET(2) char ydan_room_3DL_005160[] = dydan_room_3DL_005160;
+
+#define dydan_room_3DL_0106E0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_0106E0"
+static const ALIGN_ASSET(2) char ydan_room_3DL_0106E0[] = dydan_room_3DL_0106E0;
+
+#define dydan_room_3DL_005EC0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_005EC0"
+static const ALIGN_ASSET(2) char ydan_room_3DL_005EC0[] = dydan_room_3DL_005EC0;
+
+#define dydan_room_3DL_0116C8 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_0116C8"
+static const ALIGN_ASSET(2) char ydan_room_3DL_0116C8[] = dydan_room_3DL_0116C8;
+
+#define dydan_room_3DL_006B18 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_006B18"
+static const ALIGN_ASSET(2) char ydan_room_3DL_006B18[] = dydan_room_3DL_006B18;
+
+#define dydan_room_3DL_007208 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_007208"
+static const ALIGN_ASSET(2) char ydan_room_3DL_007208[] = dydan_room_3DL_007208;
+
+#define dydan_room_3DL_011AC0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_011AC0"
+static const ALIGN_ASSET(2) char ydan_room_3DL_011AC0[] = dydan_room_3DL_011AC0;
+
+#define dydan_room_3DL_011C68 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_011C68"
+static const ALIGN_ASSET(2) char ydan_room_3DL_011C68[] = dydan_room_3DL_011C68;
+
+#define dydan_room_3DL_010B48 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_010B48"
+static const ALIGN_ASSET(2) char ydan_room_3DL_010B48[] = dydan_room_3DL_010B48;
+
+#define dydan_room_3DL_003408 "__OTR__scenes/nonmq/ydan_scene/ydan_room_3DL_003408"
+static const ALIGN_ASSET(2) char ydan_room_3DL_003408[] = dydan_room_3DL_003408;
 
 
 #endif // DUNGEONS_YDAN_ROOM_3_H
diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_4.h b/soh/assets/scenes/dungeons/ydan/ydan_room_4.h
index fcc583137..505a5b79d 100644
--- a/soh/assets/scenes/dungeons/ydan/ydan_room_4.h
+++ b/soh/assets/scenes/dungeons/ydan/ydan_room_4.h
@@ -3,26 +3,26 @@
 
 #include "align_asset_macro.h"
 
-#define dydan_room_4DL_003B20 "__OTR__scenes/nonmq/ydan_scene/ydan_room_4DL_003B20"
-static const ALIGN_ASSET(2) char ydan_room_4DL_003B20[] = dydan_room_4DL_003B20;
-
-#define dydan_room_4Tex_003C28 "__OTR__scenes/nonmq/ydan_scene/ydan_room_4Tex_003C28"
-static const ALIGN_ASSET(2) char ydan_room_4Tex_003C28[] = dydan_room_4Tex_003C28;
-
-#define dydan_room_4DL_001080 "__OTR__scenes/nonmq/ydan_scene/ydan_room_4DL_001080"
-static const ALIGN_ASSET(2) char ydan_room_4DL_001080[] = dydan_room_4DL_001080;
-
-#define dydan_room_4Tex_002920 "__OTR__scenes/nonmq/ydan_scene/ydan_room_4Tex_002920"
-static const ALIGN_ASSET(2) char ydan_room_4Tex_002920[] = dydan_room_4Tex_002920;
-
-#define dydan_room_4Tex_003120 "__OTR__scenes/nonmq/ydan_scene/ydan_room_4Tex_003120"
-static const ALIGN_ASSET(2) char ydan_room_4Tex_003120[] = dydan_room_4Tex_003120;
-
 #define dydan_room_4Tex_001920 "__OTR__scenes/nonmq/ydan_scene/ydan_room_4Tex_001920"
 static const ALIGN_ASSET(2) char ydan_room_4Tex_001920[] = dydan_room_4Tex_001920;
 
 #define dydan_room_4Tex_002120 "__OTR__scenes/nonmq/ydan_scene/ydan_room_4Tex_002120"
 static const ALIGN_ASSET(2) char ydan_room_4Tex_002120[] = dydan_room_4Tex_002120;
 
+#define dydan_room_4Tex_002920 "__OTR__scenes/nonmq/ydan_scene/ydan_room_4Tex_002920"
+static const ALIGN_ASSET(2) char ydan_room_4Tex_002920[] = dydan_room_4Tex_002920;
+
+#define dydan_room_4Tex_003120 "__OTR__scenes/nonmq/ydan_scene/ydan_room_4Tex_003120"
+static const ALIGN_ASSET(2) char ydan_room_4Tex_003120[] = dydan_room_4Tex_003120;
+
+#define dydan_room_4Tex_003C28 "__OTR__scenes/nonmq/ydan_scene/ydan_room_4Tex_003C28"
+static const ALIGN_ASSET(2) char ydan_room_4Tex_003C28[] = dydan_room_4Tex_003C28;
+
+#define dydan_room_4DL_003B20 "__OTR__scenes/nonmq/ydan_scene/ydan_room_4DL_003B20"
+static const ALIGN_ASSET(2) char ydan_room_4DL_003B20[] = dydan_room_4DL_003B20;
+
+#define dydan_room_4DL_001080 "__OTR__scenes/nonmq/ydan_scene/ydan_room_4DL_001080"
+static const ALIGN_ASSET(2) char ydan_room_4DL_001080[] = dydan_room_4DL_001080;
+
 
 #endif // DUNGEONS_YDAN_ROOM_4_H
diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_5.h b/soh/assets/scenes/dungeons/ydan/ydan_room_5.h
index 342e2eb4c..cb8556415 100644
--- a/soh/assets/scenes/dungeons/ydan/ydan_room_5.h
+++ b/soh/assets/scenes/dungeons/ydan/ydan_room_5.h
@@ -3,44 +3,44 @@
 
 #include "align_asset_macro.h"
 
-#define dydan_room_5DL_003C98 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5DL_003C98"
-static const ALIGN_ASSET(2) char ydan_room_5DL_003C98[] = dydan_room_5DL_003C98;
-
 #define dydan_room_5Tex_003F88 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5Tex_003F88"
 static const ALIGN_ASSET(2) char ydan_room_5Tex_003F88[] = dydan_room_5Tex_003F88;
 
-#define dydan_room_5DL_0022F0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5DL_0022F0"
-static const ALIGN_ASSET(2) char ydan_room_5DL_0022F0[] = dydan_room_5DL_0022F0;
-
-#define dydan_room_5Tex_006B88 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5Tex_006B88"
-static const ALIGN_ASSET(2) char ydan_room_5Tex_006B88[] = dydan_room_5Tex_006B88;
+#define dydan_room_5Tex_004788 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5Tex_004788"
+static const ALIGN_ASSET(2) char ydan_room_5Tex_004788[] = dydan_room_5Tex_004788;
 
 #define dydan_room_5Tex_004F88 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5Tex_004F88"
 static const ALIGN_ASSET(2) char ydan_room_5Tex_004F88[] = dydan_room_5Tex_004F88;
 
-#define dydan_room_5Tex_007B88 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5Tex_007B88"
-static const ALIGN_ASSET(2) char ydan_room_5Tex_007B88[] = dydan_room_5Tex_007B88;
-
-#define dydan_room_5Tex_004788 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5Tex_004788"
-static const ALIGN_ASSET(2) char ydan_room_5Tex_004788[] = dydan_room_5Tex_004788;
-
 #define dydan_room_5Tex_005788 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5Tex_005788"
 static const ALIGN_ASSET(2) char ydan_room_5Tex_005788[] = dydan_room_5Tex_005788;
 
 #define dydan_room_5Tex_005B88 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5Tex_005B88"
 static const ALIGN_ASSET(2) char ydan_room_5Tex_005B88[] = dydan_room_5Tex_005B88;
 
-#define dydan_room_5Tex_007388 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5Tex_007388"
-static const ALIGN_ASSET(2) char ydan_room_5Tex_007388[] = dydan_room_5Tex_007388;
+#define dydan_room_5Tex_006388 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5Tex_006388"
+static const ALIGN_ASSET(2) char ydan_room_5Tex_006388[] = dydan_room_5Tex_006388;
+
+#define dydan_room_5Tex_006B88 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5Tex_006B88"
+static const ALIGN_ASSET(2) char ydan_room_5Tex_006B88[] = dydan_room_5Tex_006B88;
 
 #define dydan_room_5Tex_006F88 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5Tex_006F88"
 static const ALIGN_ASSET(2) char ydan_room_5Tex_006F88[] = dydan_room_5Tex_006F88;
 
-#define dydan_room_5Tex_006388 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5Tex_006388"
-static const ALIGN_ASSET(2) char ydan_room_5Tex_006388[] = dydan_room_5Tex_006388;
+#define dydan_room_5Tex_007388 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5Tex_007388"
+static const ALIGN_ASSET(2) char ydan_room_5Tex_007388[] = dydan_room_5Tex_007388;
 
 #define dydan_room_5Tex_007788 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5Tex_007788"
 static const ALIGN_ASSET(2) char ydan_room_5Tex_007788[] = dydan_room_5Tex_007788;
 
+#define dydan_room_5Tex_007B88 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5Tex_007B88"
+static const ALIGN_ASSET(2) char ydan_room_5Tex_007B88[] = dydan_room_5Tex_007B88;
+
+#define dydan_room_5DL_003C98 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5DL_003C98"
+static const ALIGN_ASSET(2) char ydan_room_5DL_003C98[] = dydan_room_5DL_003C98;
+
+#define dydan_room_5DL_0022F0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_5DL_0022F0"
+static const ALIGN_ASSET(2) char ydan_room_5DL_0022F0[] = dydan_room_5DL_0022F0;
+
 
 #endif // DUNGEONS_YDAN_ROOM_5_H
diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_6.h b/soh/assets/scenes/dungeons/ydan/ydan_room_6.h
index f88e5f7cb..4aecb4df0 100644
--- a/soh/assets/scenes/dungeons/ydan/ydan_room_6.h
+++ b/soh/assets/scenes/dungeons/ydan/ydan_room_6.h
@@ -3,26 +3,26 @@
 
 #include "align_asset_macro.h"
 
-#define dydan_room_6DL_001430 "__OTR__scenes/nonmq/ydan_scene/ydan_room_6DL_001430"
-static const ALIGN_ASSET(2) char ydan_room_6DL_001430[] = dydan_room_6DL_001430;
-
 #define dydan_room_6Tex_001F00 "__OTR__scenes/nonmq/ydan_scene/ydan_room_6Tex_001F00"
 static const ALIGN_ASSET(2) char ydan_room_6Tex_001F00[] = dydan_room_6Tex_001F00;
 
-#define dydan_room_6Tex_003700 "__OTR__scenes/nonmq/ydan_scene/ydan_room_6Tex_003700"
-static const ALIGN_ASSET(2) char ydan_room_6Tex_003700[] = dydan_room_6Tex_003700;
-
-#define dydan_room_6Tex_002F00 "__OTR__scenes/nonmq/ydan_scene/ydan_room_6Tex_002F00"
-static const ALIGN_ASSET(2) char ydan_room_6Tex_002F00[] = dydan_room_6Tex_002F00;
-
-#define dydan_room_6Tex_004700 "__OTR__scenes/nonmq/ydan_scene/ydan_room_6Tex_004700"
-static const ALIGN_ASSET(2) char ydan_room_6Tex_004700[] = dydan_room_6Tex_004700;
-
 #define dydan_room_6Tex_002700 "__OTR__scenes/nonmq/ydan_scene/ydan_room_6Tex_002700"
 static const ALIGN_ASSET(2) char ydan_room_6Tex_002700[] = dydan_room_6Tex_002700;
 
+#define dydan_room_6Tex_002F00 "__OTR__scenes/nonmq/ydan_scene/ydan_room_6Tex_002F00"
+static const ALIGN_ASSET(2) char ydan_room_6Tex_002F00[] = dydan_room_6Tex_002F00;
+
+#define dydan_room_6Tex_003700 "__OTR__scenes/nonmq/ydan_scene/ydan_room_6Tex_003700"
+static const ALIGN_ASSET(2) char ydan_room_6Tex_003700[] = dydan_room_6Tex_003700;
+
 #define dydan_room_6Tex_003F00 "__OTR__scenes/nonmq/ydan_scene/ydan_room_6Tex_003F00"
 static const ALIGN_ASSET(2) char ydan_room_6Tex_003F00[] = dydan_room_6Tex_003F00;
 
+#define dydan_room_6Tex_004700 "__OTR__scenes/nonmq/ydan_scene/ydan_room_6Tex_004700"
+static const ALIGN_ASSET(2) char ydan_room_6Tex_004700[] = dydan_room_6Tex_004700;
+
+#define dydan_room_6DL_001430 "__OTR__scenes/nonmq/ydan_scene/ydan_room_6DL_001430"
+static const ALIGN_ASSET(2) char ydan_room_6DL_001430[] = dydan_room_6DL_001430;
+
 
 #endif // DUNGEONS_YDAN_ROOM_6_H
diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_7.h b/soh/assets/scenes/dungeons/ydan/ydan_room_7.h
index 5f127f93d..37d60f5a0 100644
--- a/soh/assets/scenes/dungeons/ydan/ydan_room_7.h
+++ b/soh/assets/scenes/dungeons/ydan/ydan_room_7.h
@@ -3,47 +3,47 @@
 
 #include "align_asset_macro.h"
 
-#define dydan_room_7DL_0079C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7DL_0079C0"
-static const ALIGN_ASSET(2) char ydan_room_7DL_0079C0[] = dydan_room_7DL_0079C0;
-
-#define dydan_room_7Tex_007A98 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_007A98"
-static const ALIGN_ASSET(2) char ydan_room_7Tex_007A98[] = dydan_room_7Tex_007A98;
-
-#define dydan_room_7DL_001DE0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7DL_001DE0"
-static const ALIGN_ASSET(2) char ydan_room_7DL_001DE0[] = dydan_room_7DL_001DE0;
-
-#define dydan_room_7Tex_004C98 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_004C98"
-static const ALIGN_ASSET(2) char ydan_room_7Tex_004C98[] = dydan_room_7Tex_004C98;
-
-#define dydan_room_7Tex_006098 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_006098"
-static const ALIGN_ASSET(2) char ydan_room_7Tex_006098[] = dydan_room_7Tex_006098;
-
-#define dydan_room_7Tex_005898 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_005898"
-static const ALIGN_ASSET(2) char ydan_room_7Tex_005898[] = dydan_room_7Tex_005898;
-
 #define dydan_room_7Tex_002C98 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_002C98"
 static const ALIGN_ASSET(2) char ydan_room_7Tex_002C98[] = dydan_room_7Tex_002C98;
 
-#define dydan_room_7Tex_007098 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_007098"
-static const ALIGN_ASSET(2) char ydan_room_7Tex_007098[] = dydan_room_7Tex_007098;
-
 #define dydan_room_7Tex_003498 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_003498"
 static const ALIGN_ASSET(2) char ydan_room_7Tex_003498[] = dydan_room_7Tex_003498;
 
-#define dydan_room_7Tex_006C98 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_006C98"
-static const ALIGN_ASSET(2) char ydan_room_7Tex_006C98[] = dydan_room_7Tex_006C98;
-
-#define dydan_room_7Tex_005498 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_005498"
-static const ALIGN_ASSET(2) char ydan_room_7Tex_005498[] = dydan_room_7Tex_005498;
-
 #define dydan_room_7Tex_003C98 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_003C98"
 static const ALIGN_ASSET(2) char ydan_room_7Tex_003C98[] = dydan_room_7Tex_003C98;
 
-#define dydan_room_7Tex_006898 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_006898"
-static const ALIGN_ASSET(2) char ydan_room_7Tex_006898[] = dydan_room_7Tex_006898;
-
 #define dydan_room_7Tex_004498 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_004498"
 static const ALIGN_ASSET(2) char ydan_room_7Tex_004498[] = dydan_room_7Tex_004498;
 
+#define dydan_room_7Tex_004C98 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_004C98"
+static const ALIGN_ASSET(2) char ydan_room_7Tex_004C98[] = dydan_room_7Tex_004C98;
+
+#define dydan_room_7Tex_005498 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_005498"
+static const ALIGN_ASSET(2) char ydan_room_7Tex_005498[] = dydan_room_7Tex_005498;
+
+#define dydan_room_7Tex_005898 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_005898"
+static const ALIGN_ASSET(2) char ydan_room_7Tex_005898[] = dydan_room_7Tex_005898;
+
+#define dydan_room_7Tex_006098 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_006098"
+static const ALIGN_ASSET(2) char ydan_room_7Tex_006098[] = dydan_room_7Tex_006098;
+
+#define dydan_room_7Tex_006898 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_006898"
+static const ALIGN_ASSET(2) char ydan_room_7Tex_006898[] = dydan_room_7Tex_006898;
+
+#define dydan_room_7Tex_006C98 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_006C98"
+static const ALIGN_ASSET(2) char ydan_room_7Tex_006C98[] = dydan_room_7Tex_006C98;
+
+#define dydan_room_7Tex_007098 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_007098"
+static const ALIGN_ASSET(2) char ydan_room_7Tex_007098[] = dydan_room_7Tex_007098;
+
+#define dydan_room_7Tex_007A98 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7Tex_007A98"
+static const ALIGN_ASSET(2) char ydan_room_7Tex_007A98[] = dydan_room_7Tex_007A98;
+
+#define dydan_room_7DL_0079C0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7DL_0079C0"
+static const ALIGN_ASSET(2) char ydan_room_7DL_0079C0[] = dydan_room_7DL_0079C0;
+
+#define dydan_room_7DL_001DE0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_7DL_001DE0"
+static const ALIGN_ASSET(2) char ydan_room_7DL_001DE0[] = dydan_room_7DL_001DE0;
+
 
 #endif // DUNGEONS_YDAN_ROOM_7_H
diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_8.h b/soh/assets/scenes/dungeons/ydan/ydan_room_8.h
index 6af3f1fbf..181a85ad3 100644
--- a/soh/assets/scenes/dungeons/ydan/ydan_room_8.h
+++ b/soh/assets/scenes/dungeons/ydan/ydan_room_8.h
@@ -3,11 +3,11 @@
 
 #include "align_asset_macro.h"
 
-#define dydan_room_8DL_000760 "__OTR__scenes/nonmq/ydan_scene/ydan_room_8DL_000760"
-static const ALIGN_ASSET(2) char ydan_room_8DL_000760[] = dydan_room_8DL_000760;
-
 #define dydan_room_8Tex_000988 "__OTR__scenes/nonmq/ydan_scene/ydan_room_8Tex_000988"
 static const ALIGN_ASSET(2) char ydan_room_8Tex_000988[] = dydan_room_8Tex_000988;
 
+#define dydan_room_8DL_000760 "__OTR__scenes/nonmq/ydan_scene/ydan_room_8DL_000760"
+static const ALIGN_ASSET(2) char ydan_room_8DL_000760[] = dydan_room_8DL_000760;
+
 
 #endif // DUNGEONS_YDAN_ROOM_8_H
diff --git a/soh/assets/scenes/dungeons/ydan/ydan_room_9.h b/soh/assets/scenes/dungeons/ydan/ydan_room_9.h
index e6cea1c90..fd63bd09d 100644
--- a/soh/assets/scenes/dungeons/ydan/ydan_room_9.h
+++ b/soh/assets/scenes/dungeons/ydan/ydan_room_9.h
@@ -3,8 +3,8 @@
 
 #include "align_asset_macro.h"
 
-#define dydan_room_9DL_002290 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9DL_002290"
-static const ALIGN_ASSET(2) char ydan_room_9DL_002290[] = dydan_room_9DL_002290;
+#define dydan_room_9Tex_002480 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_002480"
+static const ALIGN_ASSET(2) char ydan_room_9Tex_002480[] = dydan_room_9Tex_002480;
 
 #define dydan_room_9Tex_002C80 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_002C80"
 static const ALIGN_ASSET(2) char ydan_room_9Tex_002C80[] = dydan_room_9Tex_002C80;
@@ -12,29 +12,17 @@ static const ALIGN_ASSET(2) char ydan_room_9Tex_002C80[] = dydan_room_9Tex_002C8
 #define dydan_room_9Tex_003480 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_003480"
 static const ALIGN_ASSET(2) char ydan_room_9Tex_003480[] = dydan_room_9Tex_003480;
 
-#define dydan_room_9DL_007368 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9DL_007368"
-static const ALIGN_ASSET(2) char ydan_room_9DL_007368[] = dydan_room_9DL_007368;
+#define dydan_room_9Tex_003C80 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_003C80"
+static const ALIGN_ASSET(2) char ydan_room_9Tex_003C80[] = dydan_room_9Tex_003C80;
 
-#define dydan_room_9Tex_008898 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_008898"
-static const ALIGN_ASSET(2) char ydan_room_9Tex_008898[] = dydan_room_9Tex_008898;
-
-#define dydan_room_9DL_006EA0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9DL_006EA0"
-static const ALIGN_ASSET(2) char ydan_room_9DL_006EA0[] = dydan_room_9DL_006EA0;
-
-#define dydan_room_9Tex_007498 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_007498"
-static const ALIGN_ASSET(2) char ydan_room_9Tex_007498[] = dydan_room_9Tex_007498;
-
-#define dydan_room_9DL_0013E0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9DL_0013E0"
-static const ALIGN_ASSET(2) char ydan_room_9DL_0013E0[] = dydan_room_9DL_0013E0;
-
-#define dydan_room_9Tex_002480 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_002480"
-static const ALIGN_ASSET(2) char ydan_room_9Tex_002480[] = dydan_room_9Tex_002480;
+#define dydan_room_9Tex_004480 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_004480"
+static const ALIGN_ASSET(2) char ydan_room_9Tex_004480[] = dydan_room_9Tex_004480;
 
 #define dydan_room_9Tex_004C80 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_004C80"
 static const ALIGN_ASSET(2) char ydan_room_9Tex_004C80[] = dydan_room_9Tex_004C80;
 
-#define dydan_room_9Tex_003C80 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_003C80"
-static const ALIGN_ASSET(2) char ydan_room_9Tex_003C80[] = dydan_room_9Tex_003C80;
+#define dydan_room_9Tex_005480 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_005480"
+static const ALIGN_ASSET(2) char ydan_room_9Tex_005480[] = dydan_room_9Tex_005480;
 
 #define dydan_room_9Tex_005C80 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_005C80"
 static const ALIGN_ASSET(2) char ydan_room_9Tex_005C80[] = dydan_room_9Tex_005C80;
@@ -42,17 +30,29 @@ static const ALIGN_ASSET(2) char ydan_room_9Tex_005C80[] = dydan_room_9Tex_005C8
 #define dydan_room_9Tex_006480 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_006480"
 static const ALIGN_ASSET(2) char ydan_room_9Tex_006480[] = dydan_room_9Tex_006480;
 
-#define dydan_room_9Tex_005480 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_005480"
-static const ALIGN_ASSET(2) char ydan_room_9Tex_005480[] = dydan_room_9Tex_005480;
-
-#define dydan_room_9Tex_004480 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_004480"
-static const ALIGN_ASSET(2) char ydan_room_9Tex_004480[] = dydan_room_9Tex_004480;
-
-#define dydan_room_9DL_0070E0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9DL_0070E0"
-static const ALIGN_ASSET(2) char ydan_room_9DL_0070E0[] = dydan_room_9DL_0070E0;
+#define dydan_room_9Tex_007498 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_007498"
+static const ALIGN_ASSET(2) char ydan_room_9Tex_007498[] = dydan_room_9Tex_007498;
 
 #define dydan_room_9Tex_008498 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_008498"
 static const ALIGN_ASSET(2) char ydan_room_9Tex_008498[] = dydan_room_9Tex_008498;
 
+#define dydan_room_9Tex_008898 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9Tex_008898"
+static const ALIGN_ASSET(2) char ydan_room_9Tex_008898[] = dydan_room_9Tex_008898;
+
+#define dydan_room_9DL_002290 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9DL_002290"
+static const ALIGN_ASSET(2) char ydan_room_9DL_002290[] = dydan_room_9DL_002290;
+
+#define dydan_room_9DL_007368 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9DL_007368"
+static const ALIGN_ASSET(2) char ydan_room_9DL_007368[] = dydan_room_9DL_007368;
+
+#define dydan_room_9DL_006EA0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9DL_006EA0"
+static const ALIGN_ASSET(2) char ydan_room_9DL_006EA0[] = dydan_room_9DL_006EA0;
+
+#define dydan_room_9DL_0013E0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9DL_0013E0"
+static const ALIGN_ASSET(2) char ydan_room_9DL_0013E0[] = dydan_room_9DL_0013E0;
+
+#define dydan_room_9DL_0070E0 "__OTR__scenes/nonmq/ydan_scene/ydan_room_9DL_0070E0"
+static const ALIGN_ASSET(2) char ydan_room_9DL_0070E0[] = dydan_room_9DL_0070E0;
+
 
 #endif // DUNGEONS_YDAN_ROOM_9_H
diff --git a/soh/assets/scenes/dungeons/ydan/ydan_scene.h b/soh/assets/scenes/dungeons/ydan/ydan_scene.h
index a906e44a0..38bcf804d 100644
--- a/soh/assets/scenes/dungeons/ydan/ydan_scene.h
+++ b/soh/assets/scenes/dungeons/ydan/ydan_scene.h
@@ -3,6 +3,9 @@
 
 #include "align_asset_macro.h"
 
+#define dydan_sceneTLUT_00B810 "__OTR__scenes/nonmq/ydan_scene/ydan_sceneTLUT_00B810"
+static const ALIGN_ASSET(2) char ydan_sceneTLUT_00B810[] = dydan_sceneTLUT_00B810;
+
 #define dgDekuTreeIntroCs "__OTR__scenes/nonmq/ydan_scene/gDekuTreeIntroCs"
 static const ALIGN_ASSET(2) char gDekuTreeIntroCs[] = dgDekuTreeIntroCs;
 
@@ -15,7 +18,5 @@ static const ALIGN_ASSET(2) char gYdanTex_00CA18[] = dgYdanTex_00CA18;
 #define dydan_sceneCollisionHeader_00B618 "__OTR__scenes/nonmq/ydan_scene/ydan_sceneCollisionHeader_00B618"
 static const ALIGN_ASSET(2) char ydan_sceneCollisionHeader_00B618[] = dydan_sceneCollisionHeader_00B618;
 
-#define dydan_sceneTLUT_00B810 "__OTR__scenes/nonmq/ydan_scene/ydan_sceneTLUT_00B810"
-static const ALIGN_ASSET(2) char ydan_sceneTLUT_00B810[] = dydan_sceneTLUT_00B810;
 
 #endif // DUNGEONS_YDAN_SCENE_H
diff --git a/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_room_0.h b/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_room_0.h
index b04378f32..4db4ce0b8 100644
--- a/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_room_0.h
+++ b/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_room_0.h
@@ -3,38 +3,38 @@
 
 #include "align_asset_macro.h"
 
-#define dydan_boss_room_0DL_001780 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_0DL_001780"
-static const ALIGN_ASSET(2) char ydan_boss_room_0DL_001780[] = dydan_boss_room_0DL_001780;
-
-#define dydan_boss_room_0Tex_002790 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_0Tex_002790"
-static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_002790[] = dydan_boss_room_0Tex_002790;
-
-#define dydan_boss_room_0Tex_003790 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_0Tex_003790"
-static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_003790[] = dydan_boss_room_0Tex_003790;
-
-#define dydan_boss_room_0Tex_003F90 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_0Tex_003F90"
-static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_003F90[] = dydan_boss_room_0Tex_003F90;
-
-#define dydan_boss_room_0Tex_002F90 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_0Tex_002F90"
-static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_002F90[] = dydan_boss_room_0Tex_002F90;
-
-#define dydan_boss_room_0Tex_001F90 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_0Tex_001F90"
-static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_001F90[] = dydan_boss_room_0Tex_001F90;
-
-#define dydan_boss_room_0Tex_001790 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_0Tex_001790"
+#define dydan_boss_room_0Tex_001790 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_0Tex_001790"
 static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_001790[] = dydan_boss_room_0Tex_001790;
 
-#define dydan_boss_room_0DL_004BE0 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_0DL_004BE0"
-static const ALIGN_ASSET(2) char ydan_boss_room_0DL_004BE0[] = dydan_boss_room_0DL_004BE0;
+#define dydan_boss_room_0Tex_001F90 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_0Tex_001F90"
+static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_001F90[] = dydan_boss_room_0Tex_001F90;
 
-#define dydan_boss_room_0Tex_005FF0 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_0Tex_005FF0"
-static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_005FF0[] = dydan_boss_room_0Tex_005FF0;
+#define dydan_boss_room_0Tex_002790 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_0Tex_002790"
+static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_002790[] = dydan_boss_room_0Tex_002790;
 
-#define dydan_boss_room_0Tex_004BF0 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_0Tex_004BF0"
+#define dydan_boss_room_0Tex_002F90 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_0Tex_002F90"
+static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_002F90[] = dydan_boss_room_0Tex_002F90;
+
+#define dydan_boss_room_0Tex_003790 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_0Tex_003790"
+static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_003790[] = dydan_boss_room_0Tex_003790;
+
+#define dydan_boss_room_0Tex_003F90 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_0Tex_003F90"
+static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_003F90[] = dydan_boss_room_0Tex_003F90;
+
+#define dydan_boss_room_0Tex_004BF0 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_0Tex_004BF0"
 static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_004BF0[] = dydan_boss_room_0Tex_004BF0;
 
-#define dydan_boss_room_0Tex_005BF0 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_0Tex_005BF0"
+#define dydan_boss_room_0Tex_005BF0 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_0Tex_005BF0"
 static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_005BF0[] = dydan_boss_room_0Tex_005BF0;
 
+#define dydan_boss_room_0Tex_005FF0 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_0Tex_005FF0"
+static const ALIGN_ASSET(2) char ydan_boss_room_0Tex_005FF0[] = dydan_boss_room_0Tex_005FF0;
+
+#define dydan_boss_room_0DL_001780 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_0DL_001780"
+static const ALIGN_ASSET(2) char ydan_boss_room_0DL_001780[] = dydan_boss_room_0DL_001780;
+
+#define dydan_boss_room_0DL_004BE0 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_0DL_004BE0"
+static const ALIGN_ASSET(2) char ydan_boss_room_0DL_004BE0[] = dydan_boss_room_0DL_004BE0;
+
 
 #endif // DUNGEONS_YDAN_BOSS_ROOM_0_H
diff --git a/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_room_1.h b/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_room_1.h
index 8547b762f..ee2e0b288 100644
--- a/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_room_1.h
+++ b/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_room_1.h
@@ -3,23 +3,23 @@
 
 #include "align_asset_macro.h"
 
-#define dydan_boss_room_1DL_003B28 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_1DL_003B28"
-static const ALIGN_ASSET(2) char ydan_boss_room_1DL_003B28[] = dydan_boss_room_1DL_003B28;
-
-#define dydan_boss_room_1Tex_004B38 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_1Tex_004B38"
-static const ALIGN_ASSET(2) char ydan_boss_room_1Tex_004B38[] = dydan_boss_room_1Tex_004B38;
-
-#define dydan_boss_room_1Tex_003B38 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_1Tex_003B38"
+#define dydan_boss_room_1Tex_003B38 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_1Tex_003B38"
 static const ALIGN_ASSET(2) char ydan_boss_room_1Tex_003B38[] = dydan_boss_room_1Tex_003B38;
 
-#define dydan_boss_room_1Tex_005338 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_1Tex_005338"
+#define dydan_boss_room_1Tex_004B38 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_1Tex_004B38"
+static const ALIGN_ASSET(2) char ydan_boss_room_1Tex_004B38[] = dydan_boss_room_1Tex_004B38;
+
+#define dydan_boss_room_1Tex_005338 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_1Tex_005338"
 static const ALIGN_ASSET(2) char ydan_boss_room_1Tex_005338[] = dydan_boss_room_1Tex_005338;
 
-#define dydan_boss_room_1DL_005FD8 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_1DL_005FD8"
-static const ALIGN_ASSET(2) char ydan_boss_room_1DL_005FD8[] = dydan_boss_room_1DL_005FD8;
-
-#define dydan_boss_room_1Tex_005FE8 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_room_1Tex_005FE8"
+#define dydan_boss_room_1Tex_005FE8 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_1Tex_005FE8"
 static const ALIGN_ASSET(2) char ydan_boss_room_1Tex_005FE8[] = dydan_boss_room_1Tex_005FE8;
 
+#define dydan_boss_room_1DL_003B28 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_1DL_003B28"
+static const ALIGN_ASSET(2) char ydan_boss_room_1DL_003B28[] = dydan_boss_room_1DL_003B28;
+
+#define dydan_boss_room_1DL_005FD8 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_room_1DL_005FD8"
+static const ALIGN_ASSET(2) char ydan_boss_room_1DL_005FD8[] = dydan_boss_room_1DL_005FD8;
+
 
 #endif // DUNGEONS_YDAN_BOSS_ROOM_1_H
diff --git a/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_scene.h b/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_scene.h
index 6a3c7ba69..d48a322a7 100644
--- a/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_scene.h
+++ b/soh/assets/scenes/dungeons/ydan_boss/ydan_boss_scene.h
@@ -3,13 +3,14 @@
 
 #include "align_asset_macro.h"
 
-#define dydan_boss_sceneCollisionHeader_000CFC "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_sceneCollisionHeader_000CFC"
-static const ALIGN_ASSET(2) char ydan_boss_sceneCollisionHeader_000CFC[] = dydan_boss_sceneCollisionHeader_000CFC;
-
-#define dydan_boss_sceneTLUT_000D30 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_sceneTLUT_000D30"
-static const ALIGN_ASSET(2) char ydan_boss_sceneTLUT_000D30[] = dydan_boss_sceneTLUT_000D30;
-
-#define dydan_boss_sceneTex_000F38 "__OTR__scenes/nonmq/ydan_boss_scene/ydan_boss_sceneTex_000F38"
+#define dydan_boss_sceneTex_000F38 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_sceneTex_000F38"
 static const ALIGN_ASSET(2) char ydan_boss_sceneTex_000F38[] = dydan_boss_sceneTex_000F38;
 
+#define dydan_boss_sceneTLUT_000D30 "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_sceneTLUT_000D30"
+static const ALIGN_ASSET(2) char ydan_boss_sceneTLUT_000D30[] = dydan_boss_sceneTLUT_000D30;
+
+#define dydan_boss_sceneCollisionHeader_000CFC "__OTR__scenes/shared/ydan_boss_scene/ydan_boss_sceneCollisionHeader_000CFC"
+static const ALIGN_ASSET(2) char ydan_boss_sceneCollisionHeader_000CFC[] = dydan_boss_sceneCollisionHeader_000CFC;
+
+
 #endif // DUNGEONS_YDAN_BOSS_SCENE_H
diff --git a/soh/assets/scenes/indoors/bowling/bowling_room_0.h b/soh/assets/scenes/indoors/bowling/bowling_room_0.h
index a82819b68..1f3ea54cb 100644
--- a/soh/assets/scenes/indoors/bowling/bowling_room_0.h
+++ b/soh/assets/scenes/indoors/bowling/bowling_room_0.h
@@ -3,10 +3,10 @@
 
 #include "align_asset_macro.h"
 
-#define dbowling_room_0DL_004D90 "__OTR__scenes/nonmq/bowling_scene/bowling_room_0DL_004D90"
+#define dbowling_room_0DL_004D90 "__OTR__scenes/shared/bowling_scene/bowling_room_0DL_004D90"
 static const ALIGN_ASSET(2) char bowling_room_0DL_004D90[] = dbowling_room_0DL_004D90;
 
-#define dbowling_room_0DL_0061A8 "__OTR__scenes/nonmq/bowling_scene/bowling_room_0DL_0061A8"
+#define dbowling_room_0DL_0061A8 "__OTR__scenes/shared/bowling_scene/bowling_room_0DL_0061A8"
 static const ALIGN_ASSET(2) char bowling_room_0DL_0061A8[] = dbowling_room_0DL_0061A8;
 
 
diff --git a/soh/assets/scenes/indoors/bowling/bowling_scene.h b/soh/assets/scenes/indoors/bowling/bowling_scene.h
index ed0cb984b..f999c0dd5 100644
--- a/soh/assets/scenes/indoors/bowling/bowling_scene.h
+++ b/soh/assets/scenes/indoors/bowling/bowling_scene.h
@@ -3,91 +3,92 @@
 
 #include "align_asset_macro.h"
 
-#define dbowling_sceneCollisionHeader_001A74 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneCollisionHeader_001A74"
-static const ALIGN_ASSET(2) char bowling_sceneCollisionHeader_001A74[] = dbowling_sceneCollisionHeader_001A74;
-
-#define dbowling_sceneTex_00DB20 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_00DB20"
-static const ALIGN_ASSET(2) char bowling_sceneTex_00DB20[] = dbowling_sceneTex_00DB20;
-
-#define dbowling_sceneTex_00BF20 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_00BF20"
-static const ALIGN_ASSET(2) char bowling_sceneTex_00BF20[] = dbowling_sceneTex_00BF20;
-
-#define dbowling_sceneTex_009120 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_009120"
-static const ALIGN_ASSET(2) char bowling_sceneTex_009120[] = dbowling_sceneTex_009120;
-
-#define dbowling_sceneTex_008920 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_008920"
-static const ALIGN_ASSET(2) char bowling_sceneTex_008920[] = dbowling_sceneTex_008920;
-
-#define dbowling_sceneTex_00D720 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_00D720"
-static const ALIGN_ASSET(2) char bowling_sceneTex_00D720[] = dbowling_sceneTex_00D720;
-
-#define dbowling_sceneTex_008120 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_008120"
-static const ALIGN_ASSET(2) char bowling_sceneTex_008120[] = dbowling_sceneTex_008120;
-
-#define dbowling_sceneTex_00A120 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_00A120"
-static const ALIGN_ASSET(2) char bowling_sceneTex_00A120[] = dbowling_sceneTex_00A120;
-
-#define dbowling_sceneTex_006120 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_006120"
-static const ALIGN_ASSET(2) char bowling_sceneTex_006120[] = dbowling_sceneTex_006120;
-
-#define dbowling_sceneTex_005920 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_005920"
-static const ALIGN_ASSET(2) char bowling_sceneTex_005920[] = dbowling_sceneTex_005920;
-
-#define dbowling_sceneTex_005320 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_005320"
-static const ALIGN_ASSET(2) char bowling_sceneTex_005320[] = dbowling_sceneTex_005320;
-
-#define dbowling_sceneTex_005120 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_005120"
-static const ALIGN_ASSET(2) char bowling_sceneTex_005120[] = dbowling_sceneTex_005120;
-
-#define dbowling_sceneTex_003720 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_003720"
-static const ALIGN_ASSET(2) char bowling_sceneTex_003720[] = dbowling_sceneTex_003720;
-
-#define dbowling_sceneTex_004F20 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_004F20"
-static const ALIGN_ASSET(2) char bowling_sceneTex_004F20[] = dbowling_sceneTex_004F20;
-
-#define dbowling_sceneTex_002F20 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_002F20"
-static const ALIGN_ASSET(2) char bowling_sceneTex_002F20[] = dbowling_sceneTex_002F20;
-
-#define dbowling_sceneTex_002720 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_002720"
-static const ALIGN_ASSET(2) char bowling_sceneTex_002720[] = dbowling_sceneTex_002720;
-
-#define dbowling_sceneTex_0022A0 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_0022A0"
-static const ALIGN_ASSET(2) char bowling_sceneTex_0022A0[] = dbowling_sceneTex_0022A0;
-
-#define dbowling_sceneTex_005520 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_005520"
-static const ALIGN_ASSET(2) char bowling_sceneTex_005520[] = dbowling_sceneTex_005520;
-
-#define dbowling_sceneTex_002320 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_002320"
-static const ALIGN_ASSET(2) char bowling_sceneTex_002320[] = dbowling_sceneTex_002320;
-
-#define dbowling_sceneTex_001AA0 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_001AA0"
+#define dbowling_sceneTex_001AA0 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_001AA0"
 static const ALIGN_ASSET(2) char bowling_sceneTex_001AA0[] = dbowling_sceneTex_001AA0;
 
-#define dbowling_sceneTex_00C720 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_00C720"
-static const ALIGN_ASSET(2) char bowling_sceneTex_00C720[] = dbowling_sceneTex_00C720;
+#define dbowling_sceneTex_0022A0 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_0022A0"
+static const ALIGN_ASSET(2) char bowling_sceneTex_0022A0[] = dbowling_sceneTex_0022A0;
 
-#define dbowling_sceneTex_00B720 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_00B720"
-static const ALIGN_ASSET(2) char bowling_sceneTex_00B720[] = dbowling_sceneTex_00B720;
+#define dbowling_sceneTex_002320 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_002320"
+static const ALIGN_ASSET(2) char bowling_sceneTex_002320[] = dbowling_sceneTex_002320;
 
-#define dbowling_sceneTex_00BB20 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_00BB20"
-static const ALIGN_ASSET(2) char bowling_sceneTex_00BB20[] = dbowling_sceneTex_00BB20;
+#define dbowling_sceneTex_002720 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_002720"
+static const ALIGN_ASSET(2) char bowling_sceneTex_002720[] = dbowling_sceneTex_002720;
 
-#define dbowling_sceneTex_00AF20 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_00AF20"
-static const ALIGN_ASSET(2) char bowling_sceneTex_00AF20[] = dbowling_sceneTex_00AF20;
+#define dbowling_sceneTex_002F20 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_002F20"
+static const ALIGN_ASSET(2) char bowling_sceneTex_002F20[] = dbowling_sceneTex_002F20;
 
-#define dbowling_sceneTex_00A920 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_00A920"
-static const ALIGN_ASSET(2) char bowling_sceneTex_00A920[] = dbowling_sceneTex_00A920;
+#define dbowling_sceneTex_003720 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_003720"
+static const ALIGN_ASSET(2) char bowling_sceneTex_003720[] = dbowling_sceneTex_003720;
 
-#define dbowling_sceneTex_00AB20 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_00AB20"
-static const ALIGN_ASSET(2) char bowling_sceneTex_00AB20[] = dbowling_sceneTex_00AB20;
-
-#define dbowling_sceneTex_004720 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_004720"
+#define dbowling_sceneTex_004720 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_004720"
 static const ALIGN_ASSET(2) char bowling_sceneTex_004720[] = dbowling_sceneTex_004720;
 
-#define dbowling_sceneTex_007120 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_007120"
+#define dbowling_sceneTex_004F20 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_004F20"
+static const ALIGN_ASSET(2) char bowling_sceneTex_004F20[] = dbowling_sceneTex_004F20;
+
+#define dbowling_sceneTex_005120 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_005120"
+static const ALIGN_ASSET(2) char bowling_sceneTex_005120[] = dbowling_sceneTex_005120;
+
+#define dbowling_sceneTex_005320 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_005320"
+static const ALIGN_ASSET(2) char bowling_sceneTex_005320[] = dbowling_sceneTex_005320;
+
+#define dbowling_sceneTex_005520 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_005520"
+static const ALIGN_ASSET(2) char bowling_sceneTex_005520[] = dbowling_sceneTex_005520;
+
+#define dbowling_sceneTex_005920 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_005920"
+static const ALIGN_ASSET(2) char bowling_sceneTex_005920[] = dbowling_sceneTex_005920;
+
+#define dbowling_sceneTex_006120 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_006120"
+static const ALIGN_ASSET(2) char bowling_sceneTex_006120[] = dbowling_sceneTex_006120;
+
+#define dbowling_sceneTex_007120 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_007120"
 static const ALIGN_ASSET(2) char bowling_sceneTex_007120[] = dbowling_sceneTex_007120;
 
-#define dbowling_sceneTex_00AD20 "__OTR__scenes/nonmq/bowling_scene/bowling_sceneTex_00AD20"
+#define dbowling_sceneTex_008120 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_008120"
+static const ALIGN_ASSET(2) char bowling_sceneTex_008120[] = dbowling_sceneTex_008120;
+
+#define dbowling_sceneTex_008920 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_008920"
+static const ALIGN_ASSET(2) char bowling_sceneTex_008920[] = dbowling_sceneTex_008920;
+
+#define dbowling_sceneTex_009120 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_009120"
+static const ALIGN_ASSET(2) char bowling_sceneTex_009120[] = dbowling_sceneTex_009120;
+
+#define dbowling_sceneTex_00A120 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_00A120"
+static const ALIGN_ASSET(2) char bowling_sceneTex_00A120[] = dbowling_sceneTex_00A120;
+
+#define dbowling_sceneTex_00A920 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_00A920"
+static const ALIGN_ASSET(2) char bowling_sceneTex_00A920[] = dbowling_sceneTex_00A920;
+
+#define dbowling_sceneTex_00AB20 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_00AB20"
+static const ALIGN_ASSET(2) char bowling_sceneTex_00AB20[] = dbowling_sceneTex_00AB20;
+
+#define dbowling_sceneTex_00AD20 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_00AD20"
 static const ALIGN_ASSET(2) char bowling_sceneTex_00AD20[] = dbowling_sceneTex_00AD20;
 
+#define dbowling_sceneTex_00AF20 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_00AF20"
+static const ALIGN_ASSET(2) char bowling_sceneTex_00AF20[] = dbowling_sceneTex_00AF20;
+
+#define dbowling_sceneTex_00B720 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_00B720"
+static const ALIGN_ASSET(2) char bowling_sceneTex_00B720[] = dbowling_sceneTex_00B720;
+
+#define dbowling_sceneTex_00BB20 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_00BB20"
+static const ALIGN_ASSET(2) char bowling_sceneTex_00BB20[] = dbowling_sceneTex_00BB20;
+
+#define dbowling_sceneTex_00BF20 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_00BF20"
+static const ALIGN_ASSET(2) char bowling_sceneTex_00BF20[] = dbowling_sceneTex_00BF20;
+
+#define dbowling_sceneTex_00C720 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_00C720"
+static const ALIGN_ASSET(2) char bowling_sceneTex_00C720[] = dbowling_sceneTex_00C720;
+
+#define dbowling_sceneTex_00D720 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_00D720"
+static const ALIGN_ASSET(2) char bowling_sceneTex_00D720[] = dbowling_sceneTex_00D720;
+
+#define dbowling_sceneTex_00DB20 "__OTR__scenes/shared/bowling_scene/bowling_sceneTex_00DB20"
+static const ALIGN_ASSET(2) char bowling_sceneTex_00DB20[] = dbowling_sceneTex_00DB20;
+
+#define dbowling_sceneCollisionHeader_001A74 "__OTR__scenes/shared/bowling_scene/bowling_sceneCollisionHeader_001A74"
+static const ALIGN_ASSET(2) char bowling_sceneCollisionHeader_001A74[] = dbowling_sceneCollisionHeader_001A74;
+
+
 #endif // INDOORS_BOWLING_SCENE_H
diff --git a/soh/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_room_0.h b/soh/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_room_0.h
index 1d6f2c369..fc08681b6 100644
--- a/soh/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_room_0.h
+++ b/soh/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_room_0.h
@@ -3,28 +3,28 @@
 
 #include "align_asset_macro.h"
 
-#define ddaiyousei_izumi_room_0DL_002BB8 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_room_0DL_002BB8"
+#define ddaiyousei_izumi_room_0DL_002BB8 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_room_0DL_002BB8"
 static const ALIGN_ASSET(2) char daiyousei_izumi_room_0DL_002BB8[] = ddaiyousei_izumi_room_0DL_002BB8;
 
-#define ddaiyousei_izumi_room_0DL_0038F8 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_room_0DL_0038F8"
+#define ddaiyousei_izumi_room_0DL_0038F8 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_room_0DL_0038F8"
 static const ALIGN_ASSET(2) char daiyousei_izumi_room_0DL_0038F8[] = ddaiyousei_izumi_room_0DL_0038F8;
 
-#define ddaiyousei_izumi_room_0Set_000160DL_002BB8 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_000160DL_002BB8"
+#define ddaiyousei_izumi_room_0Set_000160DL_002BB8 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_000160DL_002BB8"
 static const ALIGN_ASSET(2) char daiyousei_izumi_room_0Set_000160DL_002BB8[] = ddaiyousei_izumi_room_0Set_000160DL_002BB8;
 
-#define ddaiyousei_izumi_room_0Set_000160DL_0038F8 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_000160DL_0038F8"
+#define ddaiyousei_izumi_room_0Set_000160DL_0038F8 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_000160DL_0038F8"
 static const ALIGN_ASSET(2) char daiyousei_izumi_room_0Set_000160DL_0038F8[] = ddaiyousei_izumi_room_0Set_000160DL_0038F8;
 
-#define ddaiyousei_izumi_room_0Set_0001E0DL_002BB8 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_0001E0DL_002BB8"
+#define ddaiyousei_izumi_room_0Set_0001E0DL_002BB8 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_0001E0DL_002BB8"
 static const ALIGN_ASSET(2) char daiyousei_izumi_room_0Set_0001E0DL_002BB8[] = ddaiyousei_izumi_room_0Set_0001E0DL_002BB8;
 
-#define ddaiyousei_izumi_room_0Set_0001E0DL_0038F8 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_0001E0DL_0038F8"
+#define ddaiyousei_izumi_room_0Set_0001E0DL_0038F8 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_0001E0DL_0038F8"
 static const ALIGN_ASSET(2) char daiyousei_izumi_room_0Set_0001E0DL_0038F8[] = ddaiyousei_izumi_room_0Set_0001E0DL_0038F8;
 
-#define ddaiyousei_izumi_room_0Set_000260DL_002BB8 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_000260DL_002BB8"
+#define ddaiyousei_izumi_room_0Set_000260DL_002BB8 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_000260DL_002BB8"
 static const ALIGN_ASSET(2) char daiyousei_izumi_room_0Set_000260DL_002BB8[] = ddaiyousei_izumi_room_0Set_000260DL_002BB8;
 
-#define ddaiyousei_izumi_room_0Set_000260DL_0038F8 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_000260DL_0038F8"
+#define ddaiyousei_izumi_room_0Set_000260DL_0038F8 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_000260DL_0038F8"
 static const ALIGN_ASSET(2) char daiyousei_izumi_room_0Set_000260DL_0038F8[] = ddaiyousei_izumi_room_0Set_000260DL_0038F8;
 
 
diff --git a/soh/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_scene.h b/soh/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_scene.h
index 30ff0b896..0d1d3e385 100644
--- a/soh/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_scene.h
+++ b/soh/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_scene.h
@@ -3,65 +3,65 @@
 
 #include "align_asset_macro.h"
 
-#define dgGreatFairyMagicCs "__OTR__scenes/nonmq/daiyousei_izumi_scene/gGreatFairyMagicCs"
-static const ALIGN_ASSET(2) char gGreatFairyMagicCs[] = dgGreatFairyMagicCs;
-
-#define dgGreatFairyDoubleMagicCs "__OTR__scenes/nonmq/daiyousei_izumi_scene/gGreatFairyDoubleMagicCs"
-static const ALIGN_ASSET(2) char gGreatFairyDoubleMagicCs[] = dgGreatFairyDoubleMagicCs;
-
-#define dgGreatFairyDoubleDefenseCs "__OTR__scenes/nonmq/daiyousei_izumi_scene/gGreatFairyDoubleDefenseCs"
-static const ALIGN_ASSET(2) char gGreatFairyDoubleDefenseCs[] = dgGreatFairyDoubleDefenseCs;
-
-#define ddaiyousei_izumi_sceneCollisionHeader_0043A4 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneCollisionHeader_0043A4"
-static const ALIGN_ASSET(2) char daiyousei_izumi_sceneCollisionHeader_0043A4[] = ddaiyousei_izumi_sceneCollisionHeader_0043A4;
-
-#define ddaiyousei_izumi_sceneTex_00D800 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00D800"
-static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00D800[] = ddaiyousei_izumi_sceneTex_00D800;
-
-#define ddaiyousei_izumi_sceneTex_009000 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_009000"
-static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_009000[] = ddaiyousei_izumi_sceneTex_009000;
-
-#define ddaiyousei_izumi_sceneTex_008000 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_008000"
-static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_008000[] = ddaiyousei_izumi_sceneTex_008000;
-
-#define ddaiyousei_izumi_sceneTex_007000 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_007000"
-static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_007000[] = ddaiyousei_izumi_sceneTex_007000;
-
-#define ddaiyousei_izumi_sceneTex_005000 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_005000"
-static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_005000[] = ddaiyousei_izumi_sceneTex_005000;
-
-#define ddaiyousei_izumi_sceneTex_00B000 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00B000"
-static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00B000[] = ddaiyousei_izumi_sceneTex_00B000;
-
-#define ddaiyousei_izumi_sceneTex_00D000 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00D000"
-static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00D000[] = ddaiyousei_izumi_sceneTex_00D000;
-
-#define ddaiyousei_izumi_sceneTex_00A800 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00A800"
-static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00A800[] = ddaiyousei_izumi_sceneTex_00A800;
-
-#define ddaiyousei_izumi_sceneTex_005800 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_005800"
-static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_005800[] = ddaiyousei_izumi_sceneTex_005800;
-
-#define ddaiyousei_izumi_sceneTex_004800 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_004800"
+#define ddaiyousei_izumi_sceneTex_004800 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_004800"
 static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_004800[] = ddaiyousei_izumi_sceneTex_004800;
 
-#define ddaiyousei_izumi_sceneTex_00C000 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00C000"
-static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00C000[] = ddaiyousei_izumi_sceneTex_00C000;
+#define ddaiyousei_izumi_sceneTex_005000 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_005000"
+static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_005000[] = ddaiyousei_izumi_sceneTex_005000;
 
-#define ddaiyousei_izumi_sceneTex_00A000 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00A000"
-static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00A000[] = ddaiyousei_izumi_sceneTex_00A000;
+#define ddaiyousei_izumi_sceneTex_005800 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_005800"
+static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_005800[] = ddaiyousei_izumi_sceneTex_005800;
 
-#define ddaiyousei_izumi_sceneTex_00C800 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00C800"
-static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00C800[] = ddaiyousei_izumi_sceneTex_00C800;
-
-#define ddaiyousei_izumi_sceneTex_006000 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_006000"
+#define ddaiyousei_izumi_sceneTex_006000 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_006000"
 static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_006000[] = ddaiyousei_izumi_sceneTex_006000;
 
-#define ddaiyousei_izumi_sceneCollisionHeader_0043A4 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneCollisionHeader_0043A4"
+#define ddaiyousei_izumi_sceneTex_007000 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_007000"
+static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_007000[] = ddaiyousei_izumi_sceneTex_007000;
 
-#define ddaiyousei_izumi_sceneCollisionHeader_0043A4 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneCollisionHeader_0043A4"
+#define ddaiyousei_izumi_sceneTex_008000 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_008000"
+static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_008000[] = ddaiyousei_izumi_sceneTex_008000;
 
-#define ddaiyousei_izumi_sceneCollisionHeader_0043A4 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneCollisionHeader_0043A4"
+#define ddaiyousei_izumi_sceneTex_009000 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_009000"
+static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_009000[] = ddaiyousei_izumi_sceneTex_009000;
+
+#define ddaiyousei_izumi_sceneTex_00A000 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00A000"
+static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00A000[] = ddaiyousei_izumi_sceneTex_00A000;
+
+#define ddaiyousei_izumi_sceneTex_00A800 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00A800"
+static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00A800[] = ddaiyousei_izumi_sceneTex_00A800;
+
+#define ddaiyousei_izumi_sceneTex_00B000 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00B000"
+static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00B000[] = ddaiyousei_izumi_sceneTex_00B000;
+
+#define ddaiyousei_izumi_sceneTex_00C000 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00C000"
+static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00C000[] = ddaiyousei_izumi_sceneTex_00C000;
+
+#define ddaiyousei_izumi_sceneTex_00C800 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00C800"
+static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00C800[] = ddaiyousei_izumi_sceneTex_00C800;
+
+#define ddaiyousei_izumi_sceneTex_00D000 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00D000"
+static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00D000[] = ddaiyousei_izumi_sceneTex_00D000;
+
+#define ddaiyousei_izumi_sceneTex_00D800 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00D800"
+static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00D800[] = ddaiyousei_izumi_sceneTex_00D800;
+
+#define dgGreatFairyMagicCs "__OTR__scenes/shared/daiyousei_izumi_scene/gGreatFairyMagicCs"
+static const ALIGN_ASSET(2) char gGreatFairyMagicCs[] = dgGreatFairyMagicCs;
+
+#define dgGreatFairyDoubleMagicCs "__OTR__scenes/shared/daiyousei_izumi_scene/gGreatFairyDoubleMagicCs"
+static const ALIGN_ASSET(2) char gGreatFairyDoubleMagicCs[] = dgGreatFairyDoubleMagicCs;
+
+#define dgGreatFairyDoubleDefenseCs "__OTR__scenes/shared/daiyousei_izumi_scene/gGreatFairyDoubleDefenseCs"
+static const ALIGN_ASSET(2) char gGreatFairyDoubleDefenseCs[] = dgGreatFairyDoubleDefenseCs;
+
+#define ddaiyousei_izumi_sceneCollisionHeader_0043A4 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneCollisionHeader_0043A4"
+static const ALIGN_ASSET(2) char daiyousei_izumi_sceneCollisionHeader_0043A4[] = ddaiyousei_izumi_sceneCollisionHeader_0043A4;
+
+#define ddaiyousei_izumi_sceneCollisionHeader_0043A4 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneCollisionHeader_0043A4"
+
+#define ddaiyousei_izumi_sceneCollisionHeader_0043A4 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneCollisionHeader_0043A4"
+
+#define ddaiyousei_izumi_sceneCollisionHeader_0043A4 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneCollisionHeader_0043A4"
 
 
 #endif // INDOORS_DAIYOUSEI_IZUMI_SCENE_H
diff --git a/soh/assets/scenes/indoors/hairal_niwa/hairal_niwa_room_0.h b/soh/assets/scenes/indoors/hairal_niwa/hairal_niwa_room_0.h
index 74be5a6b5..a192bfce4 100644
--- a/soh/assets/scenes/indoors/hairal_niwa/hairal_niwa_room_0.h
+++ b/soh/assets/scenes/indoors/hairal_niwa/hairal_niwa_room_0.h
@@ -3,43 +3,43 @@
 
 #include "align_asset_macro.h"
 
-#define dhairal_niwa_room_0DL_000390 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_000390"
+#define dhairal_niwa_room_0DL_000390 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_000390"
 static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_000390[] = dhairal_niwa_room_0DL_000390;
 
-#define dhairal_niwa_room_0DL_0095E0 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_0095E0"
+#define dhairal_niwa_room_0DL_0095E0 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_0095E0"
 static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_0095E0[] = dhairal_niwa_room_0DL_0095E0;
 
-#define dhairal_niwa_room_0DL_001D98 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_001D98"
+#define dhairal_niwa_room_0DL_001D98 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_001D98"
 static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_001D98[] = dhairal_niwa_room_0DL_001D98;
 
-#define dhairal_niwa_room_0DL_009958 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_009958"
+#define dhairal_niwa_room_0DL_009958 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_009958"
 static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_009958[] = dhairal_niwa_room_0DL_009958;
 
-#define dhairal_niwa_room_0DL_002DE8 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_002DE8"
+#define dhairal_niwa_room_0DL_002DE8 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_002DE8"
 static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_002DE8[] = dhairal_niwa_room_0DL_002DE8;
 
-#define dhairal_niwa_room_0DL_003CE0 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_003CE0"
+#define dhairal_niwa_room_0DL_003CE0 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_003CE0"
 static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_003CE0[] = dhairal_niwa_room_0DL_003CE0;
 
-#define dhairal_niwa_room_0DL_00A2E8 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_00A2E8"
+#define dhairal_niwa_room_0DL_00A2E8 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_00A2E8"
 static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_00A2E8[] = dhairal_niwa_room_0DL_00A2E8;
 
-#define dhairal_niwa_room_0DL_005188 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_005188"
+#define dhairal_niwa_room_0DL_005188 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_005188"
 static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_005188[] = dhairal_niwa_room_0DL_005188;
 
-#define dhairal_niwa_room_0DL_006330 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_006330"
+#define dhairal_niwa_room_0DL_006330 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_006330"
 static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_006330[] = dhairal_niwa_room_0DL_006330;
 
-#define dhairal_niwa_room_0DL_00A630 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_00A630"
+#define dhairal_niwa_room_0DL_00A630 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_00A630"
 static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_00A630[] = dhairal_niwa_room_0DL_00A630;
 
-#define dhairal_niwa_room_0DL_0082C8 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_0082C8"
+#define dhairal_niwa_room_0DL_0082C8 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_0082C8"
 static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_0082C8[] = dhairal_niwa_room_0DL_0082C8;
 
-#define dhairal_niwa_room_0DL_0090A8 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_0090A8"
+#define dhairal_niwa_room_0DL_0090A8 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_0090A8"
 static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_0090A8[] = dhairal_niwa_room_0DL_0090A8;
 
-#define dhairal_niwa_room_0DL_00A7E0 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_room_0DL_00A7E0"
+#define dhairal_niwa_room_0DL_00A7E0 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_room_0DL_00A7E0"
 static const ALIGN_ASSET(2) char hairal_niwa_room_0DL_00A7E0[] = dhairal_niwa_room_0DL_00A7E0;
 
 
diff --git a/soh/assets/scenes/indoors/hairal_niwa/hairal_niwa_scene.h b/soh/assets/scenes/indoors/hairal_niwa/hairal_niwa_scene.h
index 8f5aaa3b6..ea7122295 100644
--- a/soh/assets/scenes/indoors/hairal_niwa/hairal_niwa_scene.h
+++ b/soh/assets/scenes/indoors/hairal_niwa/hairal_niwa_scene.h
@@ -3,73 +3,74 @@
 
 #include "align_asset_macro.h"
 
-#define dhairal_niwa_sceneCollisionHeader_0030B0 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneCollisionHeader_0030B0"
-static const ALIGN_ASSET(2) char hairal_niwa_sceneCollisionHeader_0030B0[] = dhairal_niwa_sceneCollisionHeader_0030B0;
-
-#define dhairal_niwa_sceneTex_007390 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_007390"
-static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_007390[] = dhairal_niwa_sceneTex_007390;
-
-#define dhairal_niwa_sceneTex_003390 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_003390"
+#define dhairal_niwa_sceneTex_003390 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_003390"
 static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_003390[] = dhairal_niwa_sceneTex_003390;
 
-#define dhairal_niwa_sceneTex_008B90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_008B90"
-static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_008B90[] = dhairal_niwa_sceneTex_008B90;
-
-#define dhairal_niwa_sceneTex_005390 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_005390"
-static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_005390[] = dhairal_niwa_sceneTex_005390;
-
-#define dhairal_niwa_sceneTex_00D390 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_00D390"
-static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00D390[] = dhairal_niwa_sceneTex_00D390;
-
-#define dhairal_niwa_sceneTex_004B90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_004B90"
-static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_004B90[] = dhairal_niwa_sceneTex_004B90;
-
-#define dhairal_niwa_sceneTex_00EB90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_00EB90"
-static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00EB90[] = dhairal_niwa_sceneTex_00EB90;
-
-#define dhairal_niwa_sceneTex_00F390 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_00F390"
-static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00F390[] = dhairal_niwa_sceneTex_00F390;
-
-#define dhairal_niwa_sceneTex_010390 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_010390"
-static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_010390[] = dhairal_niwa_sceneTex_010390;
-
-#define dhairal_niwa_sceneTex_00FB90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_00FB90"
-static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00FB90[] = dhairal_niwa_sceneTex_00FB90;
-
-#define dhairal_niwa_sceneTex_009390 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_009390"
-static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_009390[] = dhairal_niwa_sceneTex_009390;
-
-#define dhairal_niwa_sceneTex_007B90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_007B90"
-static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_007B90[] = dhairal_niwa_sceneTex_007B90;
-
-#define dhairal_niwa_sceneTex_006390 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_006390"
-static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_006390[] = dhairal_niwa_sceneTex_006390;
-
-#define dhairal_niwa_sceneTex_00CB90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_00CB90"
-static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00CB90[] = dhairal_niwa_sceneTex_00CB90;
-
-#define dhairal_niwa_sceneTex_00B390 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_00B390"
-static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00B390[] = dhairal_niwa_sceneTex_00B390;
-
-#define dhairal_niwa_sceneTex_00AB90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_00AB90"
-static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00AB90[] = dhairal_niwa_sceneTex_00AB90;
-
-#define dhairal_niwa_sceneTex_00DB90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_00DB90"
-static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00DB90[] = dhairal_niwa_sceneTex_00DB90;
-
-#define dhairal_niwa_sceneTex_00C390 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_00C390"
-static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00C390[] = dhairal_niwa_sceneTex_00C390;
-
-#define dhairal_niwa_sceneTex_00BB90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_00BB90"
-static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00BB90[] = dhairal_niwa_sceneTex_00BB90;
-
-#define dhairal_niwa_sceneTex_009B90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_009B90"
-static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_009B90[] = dhairal_niwa_sceneTex_009B90;
-
-#define dhairal_niwa_sceneTex_005B90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_005B90"
-static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_005B90[] = dhairal_niwa_sceneTex_005B90;
-
-#define dhairal_niwa_sceneTex_003B90 "__OTR__scenes/nonmq/hairal_niwa_scene/hairal_niwa_sceneTex_003B90"
+#define dhairal_niwa_sceneTex_003B90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_003B90"
 static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_003B90[] = dhairal_niwa_sceneTex_003B90;
 
+#define dhairal_niwa_sceneTex_004B90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_004B90"
+static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_004B90[] = dhairal_niwa_sceneTex_004B90;
+
+#define dhairal_niwa_sceneTex_005390 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_005390"
+static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_005390[] = dhairal_niwa_sceneTex_005390;
+
+#define dhairal_niwa_sceneTex_005B90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_005B90"
+static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_005B90[] = dhairal_niwa_sceneTex_005B90;
+
+#define dhairal_niwa_sceneTex_006390 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_006390"
+static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_006390[] = dhairal_niwa_sceneTex_006390;
+
+#define dhairal_niwa_sceneTex_007390 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_007390"
+static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_007390[] = dhairal_niwa_sceneTex_007390;
+
+#define dhairal_niwa_sceneTex_007B90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_007B90"
+static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_007B90[] = dhairal_niwa_sceneTex_007B90;
+
+#define dhairal_niwa_sceneTex_008B90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_008B90"
+static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_008B90[] = dhairal_niwa_sceneTex_008B90;
+
+#define dhairal_niwa_sceneTex_009390 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_009390"
+static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_009390[] = dhairal_niwa_sceneTex_009390;
+
+#define dhairal_niwa_sceneTex_009B90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_009B90"
+static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_009B90[] = dhairal_niwa_sceneTex_009B90;
+
+#define dhairal_niwa_sceneTex_00AB90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_00AB90"
+static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00AB90[] = dhairal_niwa_sceneTex_00AB90;
+
+#define dhairal_niwa_sceneTex_00B390 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_00B390"
+static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00B390[] = dhairal_niwa_sceneTex_00B390;
+
+#define dhairal_niwa_sceneTex_00BB90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_00BB90"
+static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00BB90[] = dhairal_niwa_sceneTex_00BB90;
+
+#define dhairal_niwa_sceneTex_00C390 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_00C390"
+static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00C390[] = dhairal_niwa_sceneTex_00C390;
+
+#define dhairal_niwa_sceneTex_00CB90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_00CB90"
+static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00CB90[] = dhairal_niwa_sceneTex_00CB90;
+
+#define dhairal_niwa_sceneTex_00D390 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_00D390"
+static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00D390[] = dhairal_niwa_sceneTex_00D390;
+
+#define dhairal_niwa_sceneTex_00DB90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_00DB90"
+static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00DB90[] = dhairal_niwa_sceneTex_00DB90;
+
+#define dhairal_niwa_sceneTex_00EB90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_00EB90"
+static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00EB90[] = dhairal_niwa_sceneTex_00EB90;
+
+#define dhairal_niwa_sceneTex_00F390 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_00F390"
+static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00F390[] = dhairal_niwa_sceneTex_00F390;
+
+#define dhairal_niwa_sceneTex_00FB90 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_00FB90"
+static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_00FB90[] = dhairal_niwa_sceneTex_00FB90;
+
+#define dhairal_niwa_sceneTex_010390 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneTex_010390"
+static const ALIGN_ASSET(2) char hairal_niwa_sceneTex_010390[] = dhairal_niwa_sceneTex_010390;
+
+#define dhairal_niwa_sceneCollisionHeader_0030B0 "__OTR__scenes/shared/hairal_niwa_scene/hairal_niwa_sceneCollisionHeader_0030B0"
+static const ALIGN_ASSET(2) char hairal_niwa_sceneCollisionHeader_0030B0[] = dhairal_niwa_sceneCollisionHeader_0030B0;
+
+
 #endif // INDOORS_HAIRAL_NIWA_SCENE_H
diff --git a/soh/assets/scenes/indoors/hairal_niwa2/hairal_niwa2_room_0.h b/soh/assets/scenes/indoors/hairal_niwa2/hairal_niwa2_room_0.h
index 12b7e190c..b9f854ae0 100644
--- a/soh/assets/scenes/indoors/hairal_niwa2/hairal_niwa2_room_0.h
+++ b/soh/assets/scenes/indoors/hairal_niwa2/hairal_niwa2_room_0.h
@@ -3,77 +3,77 @@
 
 #include "align_asset_macro.h"
 
-#define dhairal_niwa2_room_0DL_008708 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0DL_008708"
-static const ALIGN_ASSET(2) char hairal_niwa2_room_0DL_008708[] = dhairal_niwa2_room_0DL_008708;
-
-#define dhairal_niwa2_room_0Tex_00AF50 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00AF50"
-static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00AF50[] = dhairal_niwa2_room_0Tex_00AF50;
-
-#define dhairal_niwa2_room_0Tex_008750 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_008750"
+#define dhairal_niwa2_room_0Tex_008750 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_008750"
 static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_008750[] = dhairal_niwa2_room_0Tex_008750;
 
-#define dhairal_niwa2_room_0Tex_00C750 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00C750"
-static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00C750[] = dhairal_niwa2_room_0Tex_00C750;
-
-#define dhairal_niwa2_room_0Tex_008F50 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_008F50"
+#define dhairal_niwa2_room_0Tex_008F50 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_008F50"
 static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_008F50[] = dhairal_niwa2_room_0Tex_008F50;
 
-#define dhairal_niwa2_room_0Tex_012750 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_012750"
-static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_012750[] = dhairal_niwa2_room_0Tex_012750;
-
-#define dhairal_niwa2_room_0Tex_00CF50 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00CF50"
-static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00CF50[] = dhairal_niwa2_room_0Tex_00CF50;
-
-#define dhairal_niwa2_room_0Tex_00B750 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00B750"
-static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00B750[] = dhairal_niwa2_room_0Tex_00B750;
-
-#define dhairal_niwa2_room_0Tex_010F50 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_010F50"
-static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_010F50[] = dhairal_niwa2_room_0Tex_010F50;
-
-#define dhairal_niwa2_room_0Tex_011750 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_011750"
-static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_011750[] = dhairal_niwa2_room_0Tex_011750;
-
-#define dhairal_niwa2_room_0Tex_009F50 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_009F50"
-static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_009F50[] = dhairal_niwa2_room_0Tex_009F50;
-
-#define dhairal_niwa2_room_0Tex_011F50 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_011F50"
-static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_011F50[] = dhairal_niwa2_room_0Tex_011F50;
-
-#define dhairal_niwa2_room_0Tex_00EF50 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00EF50"
-static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00EF50[] = dhairal_niwa2_room_0Tex_00EF50;
-
-#define dhairal_niwa2_room_0Tex_00E750 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00E750"
-static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00E750[] = dhairal_niwa2_room_0Tex_00E750;
-
-#define dhairal_niwa2_room_0Tex_00FF50 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00FF50"
-static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00FF50[] = dhairal_niwa2_room_0Tex_00FF50;
-
-#define dhairal_niwa2_room_0Tex_00F750 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00F750"
-static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00F750[] = dhairal_niwa2_room_0Tex_00F750;
-
-#define dhairal_niwa2_room_0Tex_00D750 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00D750"
-static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00D750[] = dhairal_niwa2_room_0Tex_00D750;
-
-#define dhairal_niwa2_room_0Tex_009750 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_009750"
+#define dhairal_niwa2_room_0Tex_009750 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_009750"
 static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_009750[] = dhairal_niwa2_room_0Tex_009750;
 
-#define dhairal_niwa2_room_0DL_014BC8 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0DL_014BC8"
-static const ALIGN_ASSET(2) char hairal_niwa2_room_0DL_014BC8[] = dhairal_niwa2_room_0DL_014BC8;
+#define dhairal_niwa2_room_0Tex_009F50 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_009F50"
+static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_009F50[] = dhairal_niwa2_room_0Tex_009F50;
 
-#define dhairal_niwa2_room_0Tex_0173F8 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_0173F8"
-static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_0173F8[] = dhairal_niwa2_room_0Tex_0173F8;
+#define dhairal_niwa2_room_0Tex_00AF50 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00AF50"
+static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00AF50[] = dhairal_niwa2_room_0Tex_00AF50;
 
-#define dhairal_niwa2_room_0Tex_015BF8 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_015BF8"
+#define dhairal_niwa2_room_0Tex_00B750 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00B750"
+static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00B750[] = dhairal_niwa2_room_0Tex_00B750;
+
+#define dhairal_niwa2_room_0Tex_00C750 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00C750"
+static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00C750[] = dhairal_niwa2_room_0Tex_00C750;
+
+#define dhairal_niwa2_room_0Tex_00CF50 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00CF50"
+static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00CF50[] = dhairal_niwa2_room_0Tex_00CF50;
+
+#define dhairal_niwa2_room_0Tex_00D750 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00D750"
+static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00D750[] = dhairal_niwa2_room_0Tex_00D750;
+
+#define dhairal_niwa2_room_0Tex_00E750 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00E750"
+static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00E750[] = dhairal_niwa2_room_0Tex_00E750;
+
+#define dhairal_niwa2_room_0Tex_00EF50 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00EF50"
+static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00EF50[] = dhairal_niwa2_room_0Tex_00EF50;
+
+#define dhairal_niwa2_room_0Tex_00F750 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00F750"
+static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00F750[] = dhairal_niwa2_room_0Tex_00F750;
+
+#define dhairal_niwa2_room_0Tex_00FF50 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_00FF50"
+static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_00FF50[] = dhairal_niwa2_room_0Tex_00FF50;
+
+#define dhairal_niwa2_room_0Tex_010F50 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_010F50"
+static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_010F50[] = dhairal_niwa2_room_0Tex_010F50;
+
+#define dhairal_niwa2_room_0Tex_011750 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_011750"
+static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_011750[] = dhairal_niwa2_room_0Tex_011750;
+
+#define dhairal_niwa2_room_0Tex_011F50 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_011F50"
+static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_011F50[] = dhairal_niwa2_room_0Tex_011F50;
+
+#define dhairal_niwa2_room_0Tex_012750 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_012750"
+static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_012750[] = dhairal_niwa2_room_0Tex_012750;
+
+#define dhairal_niwa2_room_0Tex_014BF8 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_014BF8"
+static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_014BF8[] = dhairal_niwa2_room_0Tex_014BF8;
+
+#define dhairal_niwa2_room_0Tex_015BF8 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_015BF8"
 static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_015BF8[] = dhairal_niwa2_room_0Tex_015BF8;
 
-#define dhairal_niwa2_room_0Tex_016BF8 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_016BF8"
-static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_016BF8[] = dhairal_niwa2_room_0Tex_016BF8;
-
-#define dhairal_niwa2_room_0Tex_0163F8 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_0163F8"
+#define dhairal_niwa2_room_0Tex_0163F8 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_0163F8"
 static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_0163F8[] = dhairal_niwa2_room_0Tex_0163F8;
 
-#define dhairal_niwa2_room_0Tex_014BF8 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_room_0Tex_014BF8"
-static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_014BF8[] = dhairal_niwa2_room_0Tex_014BF8;
+#define dhairal_niwa2_room_0Tex_016BF8 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_016BF8"
+static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_016BF8[] = dhairal_niwa2_room_0Tex_016BF8;
+
+#define dhairal_niwa2_room_0Tex_0173F8 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0Tex_0173F8"
+static const ALIGN_ASSET(2) char hairal_niwa2_room_0Tex_0173F8[] = dhairal_niwa2_room_0Tex_0173F8;
+
+#define dhairal_niwa2_room_0DL_008708 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0DL_008708"
+static const ALIGN_ASSET(2) char hairal_niwa2_room_0DL_008708[] = dhairal_niwa2_room_0DL_008708;
+
+#define dhairal_niwa2_room_0DL_014BC8 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_room_0DL_014BC8"
+static const ALIGN_ASSET(2) char hairal_niwa2_room_0DL_014BC8[] = dhairal_niwa2_room_0DL_014BC8;
 
 
 #endif // INDOORS_HAIRAL_NIWA2_ROOM_0_H
diff --git a/soh/assets/scenes/indoors/hairal_niwa2/hairal_niwa2_scene.h b/soh/assets/scenes/indoors/hairal_niwa2/hairal_niwa2_scene.h
index 46f96ae0d..58cc670e9 100644
--- a/soh/assets/scenes/indoors/hairal_niwa2/hairal_niwa2_scene.h
+++ b/soh/assets/scenes/indoors/hairal_niwa2/hairal_niwa2_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dhairal_niwa2_sceneCollisionHeader_002CD8 "__OTR__scenes/nonmq/hairal_niwa2_scene/hairal_niwa2_sceneCollisionHeader_002CD8"
+#define dhairal_niwa2_sceneCollisionHeader_002CD8 "__OTR__scenes/shared/hairal_niwa2_scene/hairal_niwa2_sceneCollisionHeader_002CD8"
 static const ALIGN_ASSET(2) char hairal_niwa2_sceneCollisionHeader_002CD8[] = dhairal_niwa2_sceneCollisionHeader_002CD8;
 
 
diff --git a/soh/assets/scenes/indoors/hairal_niwa_n/hairal_niwa_n_room_0.h b/soh/assets/scenes/indoors/hairal_niwa_n/hairal_niwa_n_room_0.h
index aaa3313fe..80799e7e4 100644
--- a/soh/assets/scenes/indoors/hairal_niwa_n/hairal_niwa_n_room_0.h
+++ b/soh/assets/scenes/indoors/hairal_niwa_n/hairal_niwa_n_room_0.h
@@ -3,10 +3,10 @@
 
 #include "align_asset_macro.h"
 
-#define dhairal_niwa_n_room_0DL_002FE8 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_room_0DL_002FE8"
+#define dhairal_niwa_n_room_0DL_002FE8 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_room_0DL_002FE8"
 static const ALIGN_ASSET(2) char hairal_niwa_n_room_0DL_002FE8[] = dhairal_niwa_n_room_0DL_002FE8;
 
-#define dhairal_niwa_n_room_0DL_003608 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_room_0DL_003608"
+#define dhairal_niwa_n_room_0DL_003608 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_room_0DL_003608"
 static const ALIGN_ASSET(2) char hairal_niwa_n_room_0DL_003608[] = dhairal_niwa_n_room_0DL_003608;
 
 
diff --git a/soh/assets/scenes/indoors/hairal_niwa_n/hairal_niwa_n_scene.h b/soh/assets/scenes/indoors/hairal_niwa_n/hairal_niwa_n_scene.h
index 572c26609..a86460789 100644
--- a/soh/assets/scenes/indoors/hairal_niwa_n/hairal_niwa_n_scene.h
+++ b/soh/assets/scenes/indoors/hairal_niwa_n/hairal_niwa_n_scene.h
@@ -3,46 +3,47 @@
 
 #include "align_asset_macro.h"
 
-#define dhairal_niwa_n_sceneCollisionHeader_0010C4 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneCollisionHeader_0010C4"
-static const ALIGN_ASSET(2) char hairal_niwa_n_sceneCollisionHeader_0010C4[] = dhairal_niwa_n_sceneCollisionHeader_0010C4;
-
-#define dhairal_niwa_n_sceneTex_0038F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0038F0"
-static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0038F0[] = dhairal_niwa_n_sceneTex_0038F0;
-
-#define dhairal_niwa_n_sceneTex_0010F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0010F0"
+#define dhairal_niwa_n_sceneTex_0010F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0010F0"
 static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0010F0[] = dhairal_niwa_n_sceneTex_0010F0;
 
-#define dhairal_niwa_n_sceneTex_0050F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0050F0"
-static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0050F0[] = dhairal_niwa_n_sceneTex_0050F0;
-
-#define dhairal_niwa_n_sceneTex_0020F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0020F0"
-static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0020F0[] = dhairal_niwa_n_sceneTex_0020F0;
-
-#define dhairal_niwa_n_sceneTex_0068F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0068F0"
-static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0068F0[] = dhairal_niwa_n_sceneTex_0068F0;
-
-#define dhairal_niwa_n_sceneTex_0070F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0070F0"
-static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0070F0[] = dhairal_niwa_n_sceneTex_0070F0;
-
-#define dhairal_niwa_n_sceneTex_0080F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0080F0"
-static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0080F0[] = dhairal_niwa_n_sceneTex_0080F0;
-
-#define dhairal_niwa_n_sceneTex_0078F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0078F0"
-static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0078F0[] = dhairal_niwa_n_sceneTex_0078F0;
-
-#define dhairal_niwa_n_sceneTex_0058F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0058F0"
-static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0058F0[] = dhairal_niwa_n_sceneTex_0058F0;
-
-#define dhairal_niwa_n_sceneTex_0040F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0040F0"
-static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0040F0[] = dhairal_niwa_n_sceneTex_0040F0;
-
-#define dhairal_niwa_n_sceneTex_0028F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0028F0"
-static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0028F0[] = dhairal_niwa_n_sceneTex_0028F0;
-
-#define dhairal_niwa_n_sceneTex_0060F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0060F0"
-static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0060F0[] = dhairal_niwa_n_sceneTex_0060F0;
-
-#define dhairal_niwa_n_sceneTex_0018F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0018F0"
+#define dhairal_niwa_n_sceneTex_0018F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0018F0"
 static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0018F0[] = dhairal_niwa_n_sceneTex_0018F0;
 
+#define dhairal_niwa_n_sceneTex_0020F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0020F0"
+static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0020F0[] = dhairal_niwa_n_sceneTex_0020F0;
+
+#define dhairal_niwa_n_sceneTex_0028F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0028F0"
+static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0028F0[] = dhairal_niwa_n_sceneTex_0028F0;
+
+#define dhairal_niwa_n_sceneTex_0038F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0038F0"
+static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0038F0[] = dhairal_niwa_n_sceneTex_0038F0;
+
+#define dhairal_niwa_n_sceneTex_0040F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0040F0"
+static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0040F0[] = dhairal_niwa_n_sceneTex_0040F0;
+
+#define dhairal_niwa_n_sceneTex_0050F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0050F0"
+static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0050F0[] = dhairal_niwa_n_sceneTex_0050F0;
+
+#define dhairal_niwa_n_sceneTex_0058F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0058F0"
+static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0058F0[] = dhairal_niwa_n_sceneTex_0058F0;
+
+#define dhairal_niwa_n_sceneTex_0060F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0060F0"
+static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0060F0[] = dhairal_niwa_n_sceneTex_0060F0;
+
+#define dhairal_niwa_n_sceneTex_0068F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0068F0"
+static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0068F0[] = dhairal_niwa_n_sceneTex_0068F0;
+
+#define dhairal_niwa_n_sceneTex_0070F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0070F0"
+static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0070F0[] = dhairal_niwa_n_sceneTex_0070F0;
+
+#define dhairal_niwa_n_sceneTex_0078F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0078F0"
+static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0078F0[] = dhairal_niwa_n_sceneTex_0078F0;
+
+#define dhairal_niwa_n_sceneTex_0080F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0080F0"
+static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0080F0[] = dhairal_niwa_n_sceneTex_0080F0;
+
+#define dhairal_niwa_n_sceneCollisionHeader_0010C4 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneCollisionHeader_0010C4"
+static const ALIGN_ASSET(2) char hairal_niwa_n_sceneCollisionHeader_0010C4[] = dhairal_niwa_n_sceneCollisionHeader_0010C4;
+
+
 #endif // INDOORS_HAIRAL_NIWA_N_SCENE_H
diff --git a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_0.h b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_0.h
index a078f2c1e..d4313f6d2 100644
--- a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_0.h
+++ b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_0.h
@@ -3,32 +3,32 @@
 
 #include "align_asset_macro.h"
 
-#define dhakasitarelay_room_0DL_003218 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_0DL_003218"
-static const ALIGN_ASSET(2) char hakasitarelay_room_0DL_003218[] = dhakasitarelay_room_0DL_003218;
-
-#define dhakasitarelay_room_0Tex_003248 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_0Tex_003248"
+#define dhakasitarelay_room_0Tex_003248 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_0Tex_003248"
 static const ALIGN_ASSET(2) char hakasitarelay_room_0Tex_003248[] = dhakasitarelay_room_0Tex_003248;
 
-#define dhakasitarelay_room_0Tex_004448 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_0Tex_004448"
-static const ALIGN_ASSET(2) char hakasitarelay_room_0Tex_004448[] = dhakasitarelay_room_0Tex_004448;
-
-#define dhakasitarelay_room_0Tex_005448 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_0Tex_005448"
-static const ALIGN_ASSET(2) char hakasitarelay_room_0Tex_005448[] = dhakasitarelay_room_0Tex_005448;
-
-#define dhakasitarelay_room_0Tex_005848 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_0Tex_005848"
-static const ALIGN_ASSET(2) char hakasitarelay_room_0Tex_005848[] = dhakasitarelay_room_0Tex_005848;
-
-#define dhakasitarelay_room_0Tex_004C48 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_0Tex_004C48"
-static const ALIGN_ASSET(2) char hakasitarelay_room_0Tex_004C48[] = dhakasitarelay_room_0Tex_004C48;
-
-#define dhakasitarelay_room_0Tex_003448 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_0Tex_003448"
+#define dhakasitarelay_room_0Tex_003448 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_0Tex_003448"
 static const ALIGN_ASSET(2) char hakasitarelay_room_0Tex_003448[] = dhakasitarelay_room_0Tex_003448;
 
-#define dhakasitarelay_room_0DL_0062A8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_0DL_0062A8"
-static const ALIGN_ASSET(2) char hakasitarelay_room_0DL_0062A8[] = dhakasitarelay_room_0DL_0062A8;
+#define dhakasitarelay_room_0Tex_004448 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_0Tex_004448"
+static const ALIGN_ASSET(2) char hakasitarelay_room_0Tex_004448[] = dhakasitarelay_room_0Tex_004448;
 
-#define dhakasitarelay_room_0Tex_0062B8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_0Tex_0062B8"
+#define dhakasitarelay_room_0Tex_004C48 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_0Tex_004C48"
+static const ALIGN_ASSET(2) char hakasitarelay_room_0Tex_004C48[] = dhakasitarelay_room_0Tex_004C48;
+
+#define dhakasitarelay_room_0Tex_005448 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_0Tex_005448"
+static const ALIGN_ASSET(2) char hakasitarelay_room_0Tex_005448[] = dhakasitarelay_room_0Tex_005448;
+
+#define dhakasitarelay_room_0Tex_005848 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_0Tex_005848"
+static const ALIGN_ASSET(2) char hakasitarelay_room_0Tex_005848[] = dhakasitarelay_room_0Tex_005848;
+
+#define dhakasitarelay_room_0Tex_0062B8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_0Tex_0062B8"
 static const ALIGN_ASSET(2) char hakasitarelay_room_0Tex_0062B8[] = dhakasitarelay_room_0Tex_0062B8;
 
+#define dhakasitarelay_room_0DL_003218 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_0DL_003218"
+static const ALIGN_ASSET(2) char hakasitarelay_room_0DL_003218[] = dhakasitarelay_room_0DL_003218;
+
+#define dhakasitarelay_room_0DL_0062A8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_0DL_0062A8"
+static const ALIGN_ASSET(2) char hakasitarelay_room_0DL_0062A8[] = dhakasitarelay_room_0DL_0062A8;
+
 
 #endif // INDOORS_HAKASITARELAY_ROOM_0_H
diff --git a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_1.h b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_1.h
index 8fda0afa6..5c544115c 100644
--- a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_1.h
+++ b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_1.h
@@ -3,26 +3,26 @@
 
 #include "align_asset_macro.h"
 
-#define dhakasitarelay_room_1DL_003F00 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_1DL_003F00"
-static const ALIGN_ASSET(2) char hakasitarelay_room_1DL_003F00[] = dhakasitarelay_room_1DL_003F00;
-
-#define dhakasitarelay_room_1Tex_004720 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_1Tex_004720"
-static const ALIGN_ASSET(2) char hakasitarelay_room_1Tex_004720[] = dhakasitarelay_room_1Tex_004720;
-
-#define dhakasitarelay_room_1Tex_003F20 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_1Tex_003F20"
+#define dhakasitarelay_room_1Tex_003F20 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_1Tex_003F20"
 static const ALIGN_ASSET(2) char hakasitarelay_room_1Tex_003F20[] = dhakasitarelay_room_1Tex_003F20;
 
-#define dhakasitarelay_room_1Tex_004320 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_1Tex_004320"
+#define dhakasitarelay_room_1Tex_004320 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_1Tex_004320"
 static const ALIGN_ASSET(2) char hakasitarelay_room_1Tex_004320[] = dhakasitarelay_room_1Tex_004320;
 
-#define dhakasitarelay_room_1Tex_005F20 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_1Tex_005F20"
-static const ALIGN_ASSET(2) char hakasitarelay_room_1Tex_005F20[] = dhakasitarelay_room_1Tex_005F20;
+#define dhakasitarelay_room_1Tex_004720 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_1Tex_004720"
+static const ALIGN_ASSET(2) char hakasitarelay_room_1Tex_004720[] = dhakasitarelay_room_1Tex_004720;
 
-#define dhakasitarelay_room_1Tex_005720 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_1Tex_005720"
+#define dhakasitarelay_room_1Tex_005720 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_1Tex_005720"
 static const ALIGN_ASSET(2) char hakasitarelay_room_1Tex_005720[] = dhakasitarelay_room_1Tex_005720;
 
-#define dhakasitarelay_room_1Tex_006320 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_1Tex_006320"
+#define dhakasitarelay_room_1Tex_005F20 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_1Tex_005F20"
+static const ALIGN_ASSET(2) char hakasitarelay_room_1Tex_005F20[] = dhakasitarelay_room_1Tex_005F20;
+
+#define dhakasitarelay_room_1Tex_006320 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_1Tex_006320"
 static const ALIGN_ASSET(2) char hakasitarelay_room_1Tex_006320[] = dhakasitarelay_room_1Tex_006320;
 
+#define dhakasitarelay_room_1DL_003F00 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_1DL_003F00"
+static const ALIGN_ASSET(2) char hakasitarelay_room_1DL_003F00[] = dhakasitarelay_room_1DL_003F00;
+
 
 #endif // INDOORS_HAKASITARELAY_ROOM_1_H
diff --git a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_2.h b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_2.h
index e4e766d67..809cce603 100644
--- a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_2.h
+++ b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_2.h
@@ -3,29 +3,29 @@
 
 #include "align_asset_macro.h"
 
-#define dhakasitarelay_room_2DL_005478 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_2DL_005478"
-static const ALIGN_ASSET(2) char hakasitarelay_room_2DL_005478[] = dhakasitarelay_room_2DL_005478;
-
-#define dhakasitarelay_room_2Tex_005CA8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_2Tex_005CA8"
-static const ALIGN_ASSET(2) char hakasitarelay_room_2Tex_005CA8[] = dhakasitarelay_room_2Tex_005CA8;
-
-#define dhakasitarelay_room_2Tex_0058A8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_2Tex_0058A8"
-static const ALIGN_ASSET(2) char hakasitarelay_room_2Tex_0058A8[] = dhakasitarelay_room_2Tex_0058A8;
-
-#define dhakasitarelay_room_2Tex_0054A8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_2Tex_0054A8"
+#define dhakasitarelay_room_2Tex_0054A8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_2Tex_0054A8"
 static const ALIGN_ASSET(2) char hakasitarelay_room_2Tex_0054A8[] = dhakasitarelay_room_2Tex_0054A8;
 
-#define dhakasitarelay_room_2Tex_006CA8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_2Tex_006CA8"
+#define dhakasitarelay_room_2Tex_0058A8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_2Tex_0058A8"
+static const ALIGN_ASSET(2) char hakasitarelay_room_2Tex_0058A8[] = dhakasitarelay_room_2Tex_0058A8;
+
+#define dhakasitarelay_room_2Tex_005CA8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_2Tex_005CA8"
+static const ALIGN_ASSET(2) char hakasitarelay_room_2Tex_005CA8[] = dhakasitarelay_room_2Tex_005CA8;
+
+#define dhakasitarelay_room_2Tex_006CA8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_2Tex_006CA8"
 static const ALIGN_ASSET(2) char hakasitarelay_room_2Tex_006CA8[] = dhakasitarelay_room_2Tex_006CA8;
 
-#define dhakasitarelay_room_2Tex_007CA8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_2Tex_007CA8"
-static const ALIGN_ASSET(2) char hakasitarelay_room_2Tex_007CA8[] = dhakasitarelay_room_2Tex_007CA8;
-
-#define dhakasitarelay_room_2Tex_0074A8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_2Tex_0074A8"
+#define dhakasitarelay_room_2Tex_0074A8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_2Tex_0074A8"
 static const ALIGN_ASSET(2) char hakasitarelay_room_2Tex_0074A8[] = dhakasitarelay_room_2Tex_0074A8;
 
-#define dhakasitarelay_room_2Tex_0080A8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_2Tex_0080A8"
+#define dhakasitarelay_room_2Tex_007CA8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_2Tex_007CA8"
+static const ALIGN_ASSET(2) char hakasitarelay_room_2Tex_007CA8[] = dhakasitarelay_room_2Tex_007CA8;
+
+#define dhakasitarelay_room_2Tex_0080A8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_2Tex_0080A8"
 static const ALIGN_ASSET(2) char hakasitarelay_room_2Tex_0080A8[] = dhakasitarelay_room_2Tex_0080A8;
 
+#define dhakasitarelay_room_2DL_005478 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_2DL_005478"
+static const ALIGN_ASSET(2) char hakasitarelay_room_2DL_005478[] = dhakasitarelay_room_2DL_005478;
+
 
 #endif // INDOORS_HAKASITARELAY_ROOM_2_H
diff --git a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_3.h b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_3.h
index 5b52cffd5..bb48d9531 100644
--- a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_3.h
+++ b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_3.h
@@ -3,32 +3,32 @@
 
 #include "align_asset_macro.h"
 
-#define dhakasitarelay_room_3DL_0056B0 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_3DL_0056B0"
-static const ALIGN_ASSET(2) char hakasitarelay_room_3DL_0056B0[] = dhakasitarelay_room_3DL_0056B0;
-
-#define dhakasitarelay_room_3Tex_0060E0 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_3Tex_0060E0"
-static const ALIGN_ASSET(2) char hakasitarelay_room_3Tex_0060E0[] = dhakasitarelay_room_3Tex_0060E0;
-
-#define dhakasitarelay_room_3Tex_0056E0 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_3Tex_0056E0"
+#define dhakasitarelay_room_3Tex_0056E0 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_3Tex_0056E0"
 static const ALIGN_ASSET(2) char hakasitarelay_room_3Tex_0056E0[] = dhakasitarelay_room_3Tex_0056E0;
 
-#define dhakasitarelay_room_3Tex_0084E0 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_3Tex_0084E0"
-static const ALIGN_ASSET(2) char hakasitarelay_room_3Tex_0084E0[] = dhakasitarelay_room_3Tex_0084E0;
-
-#define dhakasitarelay_room_3Tex_005EE0 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_3Tex_005EE0"
-static const ALIGN_ASSET(2) char hakasitarelay_room_3Tex_005EE0[] = dhakasitarelay_room_3Tex_005EE0;
-
-#define dhakasitarelay_room_3Tex_005AE0 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_3Tex_005AE0"
+#define dhakasitarelay_room_3Tex_005AE0 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_3Tex_005AE0"
 static const ALIGN_ASSET(2) char hakasitarelay_room_3Tex_005AE0[] = dhakasitarelay_room_3Tex_005AE0;
 
-#define dhakasitarelay_room_3Tex_007CE0 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_3Tex_007CE0"
-static const ALIGN_ASSET(2) char hakasitarelay_room_3Tex_007CE0[] = dhakasitarelay_room_3Tex_007CE0;
+#define dhakasitarelay_room_3Tex_005EE0 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_3Tex_005EE0"
+static const ALIGN_ASSET(2) char hakasitarelay_room_3Tex_005EE0[] = dhakasitarelay_room_3Tex_005EE0;
 
-#define dhakasitarelay_room_3Tex_0078E0 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_3Tex_0078E0"
+#define dhakasitarelay_room_3Tex_0060E0 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_3Tex_0060E0"
+static const ALIGN_ASSET(2) char hakasitarelay_room_3Tex_0060E0[] = dhakasitarelay_room_3Tex_0060E0;
+
+#define dhakasitarelay_room_3Tex_0070E0 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_3Tex_0070E0"
+static const ALIGN_ASSET(2) char hakasitarelay_room_3Tex_0070E0[] = dhakasitarelay_room_3Tex_0070E0;
+
+#define dhakasitarelay_room_3Tex_0078E0 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_3Tex_0078E0"
 static const ALIGN_ASSET(2) char hakasitarelay_room_3Tex_0078E0[] = dhakasitarelay_room_3Tex_0078E0;
 
-#define dhakasitarelay_room_3Tex_0070E0 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_3Tex_0070E0"
-static const ALIGN_ASSET(2) char hakasitarelay_room_3Tex_0070E0[] = dhakasitarelay_room_3Tex_0070E0;
+#define dhakasitarelay_room_3Tex_007CE0 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_3Tex_007CE0"
+static const ALIGN_ASSET(2) char hakasitarelay_room_3Tex_007CE0[] = dhakasitarelay_room_3Tex_007CE0;
+
+#define dhakasitarelay_room_3Tex_0084E0 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_3Tex_0084E0"
+static const ALIGN_ASSET(2) char hakasitarelay_room_3Tex_0084E0[] = dhakasitarelay_room_3Tex_0084E0;
+
+#define dhakasitarelay_room_3DL_0056B0 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_3DL_0056B0"
+static const ALIGN_ASSET(2) char hakasitarelay_room_3DL_0056B0[] = dhakasitarelay_room_3DL_0056B0;
 
 
 #endif // INDOORS_HAKASITARELAY_ROOM_3_H
diff --git a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_4.h b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_4.h
index db978106f..0c2f5e951 100644
--- a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_4.h
+++ b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_4.h
@@ -3,26 +3,26 @@
 
 #include "align_asset_macro.h"
 
-#define dhakasitarelay_room_4DL_001E60 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_4DL_001E60"
-static const ALIGN_ASSET(2) char hakasitarelay_room_4DL_001E60[] = dhakasitarelay_room_4DL_001E60;
-
-#define dhakasitarelay_room_4Tex_003480 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_4Tex_003480"
-static const ALIGN_ASSET(2) char hakasitarelay_room_4Tex_003480[] = dhakasitarelay_room_4Tex_003480;
-
-#define dhakasitarelay_room_4Tex_003080 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_4Tex_003080"
-static const ALIGN_ASSET(2) char hakasitarelay_room_4Tex_003080[] = dhakasitarelay_room_4Tex_003080;
-
-#define dhakasitarelay_room_4Tex_003C80 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_4Tex_003C80"
-static const ALIGN_ASSET(2) char hakasitarelay_room_4Tex_003C80[] = dhakasitarelay_room_4Tex_003C80;
-
-#define dhakasitarelay_room_4Tex_002080 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_4Tex_002080"
-static const ALIGN_ASSET(2) char hakasitarelay_room_4Tex_002080[] = dhakasitarelay_room_4Tex_002080;
-
-#define dhakasitarelay_room_4Tex_001E80 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_4Tex_001E80"
+#define dhakasitarelay_room_4Tex_001E80 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_4Tex_001E80"
 static const ALIGN_ASSET(2) char hakasitarelay_room_4Tex_001E80[] = dhakasitarelay_room_4Tex_001E80;
 
-#define dhakasitarelay_room_4Tex_002880 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_4Tex_002880"
+#define dhakasitarelay_room_4Tex_002080 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_4Tex_002080"
+static const ALIGN_ASSET(2) char hakasitarelay_room_4Tex_002080[] = dhakasitarelay_room_4Tex_002080;
+
+#define dhakasitarelay_room_4Tex_002880 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_4Tex_002880"
 static const ALIGN_ASSET(2) char hakasitarelay_room_4Tex_002880[] = dhakasitarelay_room_4Tex_002880;
 
+#define dhakasitarelay_room_4Tex_003080 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_4Tex_003080"
+static const ALIGN_ASSET(2) char hakasitarelay_room_4Tex_003080[] = dhakasitarelay_room_4Tex_003080;
+
+#define dhakasitarelay_room_4Tex_003480 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_4Tex_003480"
+static const ALIGN_ASSET(2) char hakasitarelay_room_4Tex_003480[] = dhakasitarelay_room_4Tex_003480;
+
+#define dhakasitarelay_room_4Tex_003C80 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_4Tex_003C80"
+static const ALIGN_ASSET(2) char hakasitarelay_room_4Tex_003C80[] = dhakasitarelay_room_4Tex_003C80;
+
+#define dhakasitarelay_room_4DL_001E60 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_4DL_001E60"
+static const ALIGN_ASSET(2) char hakasitarelay_room_4DL_001E60[] = dhakasitarelay_room_4DL_001E60;
+
 
 #endif // INDOORS_HAKASITARELAY_ROOM_4_H
diff --git a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_5.h b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_5.h
index 748218312..7121f6705 100644
--- a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_5.h
+++ b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_5.h
@@ -3,26 +3,26 @@
 
 #include "align_asset_macro.h"
 
-#define dhakasitarelay_room_5DL_001C08 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_5DL_001C08"
-static const ALIGN_ASSET(2) char hakasitarelay_room_5DL_001C08[] = dhakasitarelay_room_5DL_001C08;
-
-#define dhakasitarelay_room_5Tex_003C48 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_5Tex_003C48"
-static const ALIGN_ASSET(2) char hakasitarelay_room_5Tex_003C48[] = dhakasitarelay_room_5Tex_003C48;
-
-#define dhakasitarelay_room_5Tex_002448 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_5Tex_002448"
-static const ALIGN_ASSET(2) char hakasitarelay_room_5Tex_002448[] = dhakasitarelay_room_5Tex_002448;
-
-#define dhakasitarelay_room_5TLUT_001C28 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_5TLUT_001C28"
-static const ALIGN_ASSET(2) char hakasitarelay_room_5TLUT_001C28[] = dhakasitarelay_room_5TLUT_001C28;
-
-#define dhakasitarelay_room_5Tex_001C48 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_5Tex_001C48"
+#define dhakasitarelay_room_5Tex_001C48 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_5Tex_001C48"
 static const ALIGN_ASSET(2) char hakasitarelay_room_5Tex_001C48[] = dhakasitarelay_room_5Tex_001C48;
 
-#define dhakasitarelay_room_5Tex_003448 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_5Tex_003448"
+#define dhakasitarelay_room_5Tex_002448 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_5Tex_002448"
+static const ALIGN_ASSET(2) char hakasitarelay_room_5Tex_002448[] = dhakasitarelay_room_5Tex_002448;
+
+#define dhakasitarelay_room_5Tex_002C48 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_5Tex_002C48"
+static const ALIGN_ASSET(2) char hakasitarelay_room_5Tex_002C48[] = dhakasitarelay_room_5Tex_002C48;
+
+#define dhakasitarelay_room_5Tex_003448 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_5Tex_003448"
 static const ALIGN_ASSET(2) char hakasitarelay_room_5Tex_003448[] = dhakasitarelay_room_5Tex_003448;
 
-#define dhakasitarelay_room_5Tex_002C48 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_5Tex_002C48"
-static const ALIGN_ASSET(2) char hakasitarelay_room_5Tex_002C48[] = dhakasitarelay_room_5Tex_002C48;
+#define dhakasitarelay_room_5Tex_003C48 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_5Tex_003C48"
+static const ALIGN_ASSET(2) char hakasitarelay_room_5Tex_003C48[] = dhakasitarelay_room_5Tex_003C48;
+
+#define dhakasitarelay_room_5TLUT_001C28 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_5TLUT_001C28"
+static const ALIGN_ASSET(2) char hakasitarelay_room_5TLUT_001C28[] = dhakasitarelay_room_5TLUT_001C28;
+
+#define dhakasitarelay_room_5DL_001C08 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_5DL_001C08"
+static const ALIGN_ASSET(2) char hakasitarelay_room_5DL_001C08[] = dhakasitarelay_room_5DL_001C08;
 
 
 #endif // INDOORS_HAKASITARELAY_ROOM_5_H
diff --git a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_6.h b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_6.h
index edfae4957..8c1538f9c 100644
--- a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_6.h
+++ b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_6.h
@@ -3,38 +3,38 @@
 
 #include "align_asset_macro.h"
 
-#define dhakasitarelay_room_6DL_004168 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_6DL_004168"
-static const ALIGN_ASSET(2) char hakasitarelay_room_6DL_004168[] = dhakasitarelay_room_6DL_004168;
-
-#define dhakasitarelay_room_6Tex_006AA8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_6Tex_006AA8"
-static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_006AA8[] = dhakasitarelay_room_6Tex_006AA8;
-
-#define dhakasitarelay_room_6Tex_0042A8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_6Tex_0042A8"
-static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_0042A8[] = dhakasitarelay_room_6Tex_0042A8;
-
-#define dhakasitarelay_room_6Tex_005EA8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_6Tex_005EA8"
-static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_005EA8[] = dhakasitarelay_room_6Tex_005EA8;
-
-#define dhakasitarelay_room_6Tex_0056A8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_6Tex_0056A8"
-static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_0056A8[] = dhakasitarelay_room_6Tex_0056A8;
-
-#define dhakasitarelay_room_6Tex_0066A8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_6Tex_0066A8"
-static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_0066A8[] = dhakasitarelay_room_6Tex_0066A8;
-
-#define dhakasitarelay_room_6Tex_0072A8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_6Tex_0072A8"
-static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_0072A8[] = dhakasitarelay_room_6Tex_0072A8;
-
-#define dhakasitarelay_room_6Tex_004EA8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_6Tex_004EA8"
-static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_004EA8[] = dhakasitarelay_room_6Tex_004EA8;
-
-#define dhakasitarelay_room_6TLUT_004188 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_6TLUT_004188"
-static const ALIGN_ASSET(2) char hakasitarelay_room_6TLUT_004188[] = dhakasitarelay_room_6TLUT_004188;
-
-#define dhakasitarelay_room_6Tex_0041A8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_6Tex_0041A8"
+#define dhakasitarelay_room_6Tex_0041A8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_6Tex_0041A8"
 static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_0041A8[] = dhakasitarelay_room_6Tex_0041A8;
 
-#define dhakasitarelay_room_6Tex_004AA8 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_room_6Tex_004AA8"
+#define dhakasitarelay_room_6Tex_0042A8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_6Tex_0042A8"
+static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_0042A8[] = dhakasitarelay_room_6Tex_0042A8;
+
+#define dhakasitarelay_room_6Tex_004AA8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_6Tex_004AA8"
 static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_004AA8[] = dhakasitarelay_room_6Tex_004AA8;
 
+#define dhakasitarelay_room_6Tex_004EA8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_6Tex_004EA8"
+static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_004EA8[] = dhakasitarelay_room_6Tex_004EA8;
+
+#define dhakasitarelay_room_6Tex_0056A8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_6Tex_0056A8"
+static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_0056A8[] = dhakasitarelay_room_6Tex_0056A8;
+
+#define dhakasitarelay_room_6Tex_005EA8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_6Tex_005EA8"
+static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_005EA8[] = dhakasitarelay_room_6Tex_005EA8;
+
+#define dhakasitarelay_room_6Tex_0066A8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_6Tex_0066A8"
+static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_0066A8[] = dhakasitarelay_room_6Tex_0066A8;
+
+#define dhakasitarelay_room_6Tex_006AA8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_6Tex_006AA8"
+static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_006AA8[] = dhakasitarelay_room_6Tex_006AA8;
+
+#define dhakasitarelay_room_6Tex_0072A8 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_6Tex_0072A8"
+static const ALIGN_ASSET(2) char hakasitarelay_room_6Tex_0072A8[] = dhakasitarelay_room_6Tex_0072A8;
+
+#define dhakasitarelay_room_6TLUT_004188 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_6TLUT_004188"
+static const ALIGN_ASSET(2) char hakasitarelay_room_6TLUT_004188[] = dhakasitarelay_room_6TLUT_004188;
+
+#define dhakasitarelay_room_6DL_004168 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_room_6DL_004168"
+static const ALIGN_ASSET(2) char hakasitarelay_room_6DL_004168[] = dhakasitarelay_room_6DL_004168;
+
 
 #endif // INDOORS_HAKASITARELAY_ROOM_6_H
diff --git a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_scene.h b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_scene.h
index da196ba5c..2c510675f 100644
--- a/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_scene.h
+++ b/soh/assets/scenes/indoors/hakasitarelay/hakasitarelay_scene.h
@@ -3,19 +3,19 @@
 
 #include "align_asset_macro.h"
 
-#define dhakasitarelay_sceneCollisionHeader_00C04C "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_sceneCollisionHeader_00C04C"
-static const ALIGN_ASSET(2) char hakasitarelay_sceneCollisionHeader_00C04C[] = dhakasitarelay_sceneCollisionHeader_00C04C;
-
-#define dgSongOfStormsCs "__OTR__scenes/nonmq/hakasitarelay_scene/gSongOfStormsCs"
-static const ALIGN_ASSET(2) char gSongOfStormsCs[] = dgSongOfStormsCs;
-
-#define dhakasitarelay_sceneTex_00D880 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_sceneTex_00D880"
-static const ALIGN_ASSET(2) char hakasitarelay_sceneTex_00D880[] = dhakasitarelay_sceneTex_00D880;
-
-#define dhakasitarelay_sceneTex_00C080 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_sceneTex_00C080"
+#define dhakasitarelay_sceneTex_00C080 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_sceneTex_00C080"
 static const ALIGN_ASSET(2) char hakasitarelay_sceneTex_00C080[] = dhakasitarelay_sceneTex_00C080;
 
-#define dhakasitarelay_sceneTex_00D080 "__OTR__scenes/nonmq/hakasitarelay_scene/hakasitarelay_sceneTex_00D080"
+#define dhakasitarelay_sceneTex_00D080 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_sceneTex_00D080"
 static const ALIGN_ASSET(2) char hakasitarelay_sceneTex_00D080[] = dhakasitarelay_sceneTex_00D080;
 
+#define dhakasitarelay_sceneTex_00D880 "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_sceneTex_00D880"
+static const ALIGN_ASSET(2) char hakasitarelay_sceneTex_00D880[] = dhakasitarelay_sceneTex_00D880;
+
+#define dhakasitarelay_sceneCollisionHeader_00C04C "__OTR__scenes/shared/hakasitarelay_scene/hakasitarelay_sceneCollisionHeader_00C04C"
+static const ALIGN_ASSET(2) char hakasitarelay_sceneCollisionHeader_00C04C[] = dhakasitarelay_sceneCollisionHeader_00C04C;
+
+#define dgSongOfStormsCs "__OTR__scenes/shared/hakasitarelay_scene/gSongOfStormsCs"
+static const ALIGN_ASSET(2) char gSongOfStormsCs[] = dgSongOfStormsCs;
+
 #endif // INDOORS_HAKASITARELAY_SCENE_H
diff --git a/soh/assets/scenes/indoors/hut/hut_room_0.h b/soh/assets/scenes/indoors/hut/hut_room_0.h
index 3aaa9aae4..7af91cd61 100644
--- a/soh/assets/scenes/indoors/hut/hut_room_0.h
+++ b/soh/assets/scenes/indoors/hut/hut_room_0.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dhut_room_0DL_003D58 "__OTR__scenes/nonmq/hut_scene/hut_room_0DL_003D58"
+#define dhut_room_0DL_003D58 "__OTR__scenes/shared/hut_scene/hut_room_0DL_003D58"
 static const ALIGN_ASSET(2) char hut_room_0DL_003D58[] = dhut_room_0DL_003D58;
 
 
diff --git a/soh/assets/scenes/indoors/hut/hut_scene.h b/soh/assets/scenes/indoors/hut/hut_scene.h
index 5f767efae..635cfec46 100644
--- a/soh/assets/scenes/indoors/hut/hut_scene.h
+++ b/soh/assets/scenes/indoors/hut/hut_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dhut_sceneCollisionHeader_0004DC "__OTR__scenes/nonmq/hut_scene/hut_sceneCollisionHeader_0004DC"
+#define dhut_sceneCollisionHeader_0004DC "__OTR__scenes/shared/hut_scene/hut_sceneCollisionHeader_0004DC"
 static const ALIGN_ASSET(2) char hut_sceneCollisionHeader_0004DC[] = dhut_sceneCollisionHeader_0004DC;
 
 
diff --git a/soh/assets/scenes/indoors/hylia_labo/hylia_labo_room_0.h b/soh/assets/scenes/indoors/hylia_labo/hylia_labo_room_0.h
index 385754807..73cc07803 100644
--- a/soh/assets/scenes/indoors/hylia_labo/hylia_labo_room_0.h
+++ b/soh/assets/scenes/indoors/hylia_labo/hylia_labo_room_0.h
@@ -3,67 +3,67 @@
 
 #include "align_asset_macro.h"
 
-#define dhylia_labo_room_0DL_007460 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_007460"
+#define dhylia_labo_room_0DL_007460 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_007460"
 static const ALIGN_ASSET(2) char hylia_labo_room_0DL_007460[] = dhylia_labo_room_0DL_007460;
 
-#define dhylia_labo_room_0DL_002318 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_002318"
+#define dhylia_labo_room_0DL_002318 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_002318"
 static const ALIGN_ASSET(2) char hylia_labo_room_0DL_002318[] = dhylia_labo_room_0DL_002318;
 
-#define dhylia_labo_room_0DL_003500 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_003500"
+#define dhylia_labo_room_0DL_003500 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_003500"
 static const ALIGN_ASSET(2) char hylia_labo_room_0DL_003500[] = dhylia_labo_room_0DL_003500;
 
-#define dhylia_labo_room_0DL_001E10 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_001E10"
+#define dhylia_labo_room_0DL_001E10 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_001E10"
 static const ALIGN_ASSET(2) char hylia_labo_room_0DL_001E10[] = dhylia_labo_room_0DL_001E10;
 
-#define dhylia_labo_room_0DL_006CE0 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_006CE0"
+#define dhylia_labo_room_0DL_006CE0 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_006CE0"
 static const ALIGN_ASSET(2) char hylia_labo_room_0DL_006CE0[] = dhylia_labo_room_0DL_006CE0;
 
-#define dhylia_labo_room_0DL_002A30 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_002A30"
+#define dhylia_labo_room_0DL_002A30 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_002A30"
 static const ALIGN_ASSET(2) char hylia_labo_room_0DL_002A30[] = dhylia_labo_room_0DL_002A30;
 
-#define dhylia_labo_room_0DL_001500 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_001500"
+#define dhylia_labo_room_0DL_001500 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_001500"
 static const ALIGN_ASSET(2) char hylia_labo_room_0DL_001500[] = dhylia_labo_room_0DL_001500;
 
-#define dhylia_labo_room_0DL_000AC0 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_000AC0"
+#define dhylia_labo_room_0DL_000AC0 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_000AC0"
 static const ALIGN_ASSET(2) char hylia_labo_room_0DL_000AC0[] = dhylia_labo_room_0DL_000AC0;
 
-#define dhylia_labo_room_0DL_005120 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_005120"
+#define dhylia_labo_room_0DL_005120 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_005120"
 static const ALIGN_ASSET(2) char hylia_labo_room_0DL_005120[] = dhylia_labo_room_0DL_005120;
 
-#define dhylia_labo_room_0DL_001318 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_001318"
+#define dhylia_labo_room_0DL_001318 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_001318"
 static const ALIGN_ASSET(2) char hylia_labo_room_0DL_001318[] = dhylia_labo_room_0DL_001318;
 
-#define dhylia_labo_room_0DL_005738 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_005738"
+#define dhylia_labo_room_0DL_005738 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_005738"
 static const ALIGN_ASSET(2) char hylia_labo_room_0DL_005738[] = dhylia_labo_room_0DL_005738;
 
-#define dhylia_labo_room_0DL_003C80 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_003C80"
+#define dhylia_labo_room_0DL_003C80 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_003C80"
 static const ALIGN_ASSET(2) char hylia_labo_room_0DL_003C80[] = dhylia_labo_room_0DL_003C80;
 
-#define dhylia_labo_room_0DL_001AB8 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_001AB8"
+#define dhylia_labo_room_0DL_001AB8 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_001AB8"
 static const ALIGN_ASSET(2) char hylia_labo_room_0DL_001AB8[] = dhylia_labo_room_0DL_001AB8;
 
-#define dhylia_labo_room_0DL_0002C0 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_0002C0"
+#define dhylia_labo_room_0DL_0002C0 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_0002C0"
 static const ALIGN_ASSET(2) char hylia_labo_room_0DL_0002C0[] = dhylia_labo_room_0DL_0002C0;
 
-#define dhylia_labo_room_0DL_0039F0 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_0039F0"
+#define dhylia_labo_room_0DL_0039F0 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_0039F0"
 static const ALIGN_ASSET(2) char hylia_labo_room_0DL_0039F0[] = dhylia_labo_room_0DL_0039F0;
 
-#define dhylia_labo_room_0DL_005F20 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_005F20"
+#define dhylia_labo_room_0DL_005F20 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_005F20"
 static const ALIGN_ASSET(2) char hylia_labo_room_0DL_005F20[] = dhylia_labo_room_0DL_005F20;
 
-#define dhylia_labo_room_0DL_004610 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_004610"
+#define dhylia_labo_room_0DL_004610 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_004610"
 static const ALIGN_ASSET(2) char hylia_labo_room_0DL_004610[] = dhylia_labo_room_0DL_004610;
 
-#define dhylia_labo_room_0DL_0048B0 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_0048B0"
+#define dhylia_labo_room_0DL_0048B0 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_0048B0"
 static const ALIGN_ASSET(2) char hylia_labo_room_0DL_0048B0[] = dhylia_labo_room_0DL_0048B0;
 
-#define dhylia_labo_room_0DL_004A80 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_004A80"
+#define dhylia_labo_room_0DL_004A80 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_004A80"
 static const ALIGN_ASSET(2) char hylia_labo_room_0DL_004A80[] = dhylia_labo_room_0DL_004A80;
 
-#define dhylia_labo_room_0DL_005A38 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_005A38"
+#define dhylia_labo_room_0DL_005A38 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_005A38"
 static const ALIGN_ASSET(2) char hylia_labo_room_0DL_005A38[] = dhylia_labo_room_0DL_005A38;
 
-#define dhylia_labo_room_0DL_0040E0 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_room_0DL_0040E0"
+#define dhylia_labo_room_0DL_0040E0 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_room_0DL_0040E0"
 static const ALIGN_ASSET(2) char hylia_labo_room_0DL_0040E0[] = dhylia_labo_room_0DL_0040E0;
 
 
diff --git a/soh/assets/scenes/indoors/hylia_labo/hylia_labo_scene.h b/soh/assets/scenes/indoors/hylia_labo/hylia_labo_scene.h
index a724a2d64..6979a6535 100644
--- a/soh/assets/scenes/indoors/hylia_labo/hylia_labo_scene.h
+++ b/soh/assets/scenes/indoors/hylia_labo/hylia_labo_scene.h
@@ -3,100 +3,101 @@
 
 #include "align_asset_macro.h"
 
-#define dhylia_labo_sceneCollisionHeader_00105C "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneCollisionHeader_00105C"
-static const ALIGN_ASSET(2) char hylia_labo_sceneCollisionHeader_00105C[] = dhylia_labo_sceneCollisionHeader_00105C;
-
-#define dhylia_labo_sceneTex_001090 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_001090"
+#define dhylia_labo_sceneTex_001090 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_001090"
 static const ALIGN_ASSET(2) char hylia_labo_sceneTex_001090[] = dhylia_labo_sceneTex_001090;
 
-#define dhylia_labo_sceneTex_00F890 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_00F890"
-static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00F890[] = dhylia_labo_sceneTex_00F890;
-
-#define dhylia_labo_sceneTex_00B090 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_00B090"
-static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00B090[] = dhylia_labo_sceneTex_00B090;
-
-#define dhylia_labo_sceneTex_006990 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_006990"
-static const ALIGN_ASSET(2) char hylia_labo_sceneTex_006990[] = dhylia_labo_sceneTex_006990;
-
-#define dhylia_labo_sceneTex_00C890 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_00C890"
-static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00C890[] = dhylia_labo_sceneTex_00C890;
-
-#define dhylia_labo_sceneTex_007D90 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_007D90"
-static const ALIGN_ASSET(2) char hylia_labo_sceneTex_007D90[] = dhylia_labo_sceneTex_007D90;
-
-#define dhylia_labo_sceneTex_005490 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_005490"
-static const ALIGN_ASSET(2) char hylia_labo_sceneTex_005490[] = dhylia_labo_sceneTex_005490;
-
-#define dhylia_labo_sceneTex_003490 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_003490"
-static const ALIGN_ASSET(2) char hylia_labo_sceneTex_003490[] = dhylia_labo_sceneTex_003490;
-
-#define dhylia_labo_sceneTex_00C090 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_00C090"
-static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00C090[] = dhylia_labo_sceneTex_00C090;
-
-#define dhylia_labo_sceneTex_006190 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_006190"
-static const ALIGN_ASSET(2) char hylia_labo_sceneTex_006190[] = dhylia_labo_sceneTex_006190;
-
-#define dhylia_labo_sceneTex_00E890 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_00E890"
-static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00E890[] = dhylia_labo_sceneTex_00E890;
-
-#define dhylia_labo_sceneTex_010490 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_010490"
-static const ALIGN_ASSET(2) char hylia_labo_sceneTex_010490[] = dhylia_labo_sceneTex_010490;
-
-#define dhylia_labo_sceneTex_008790 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_008790"
-static const ALIGN_ASSET(2) char hylia_labo_sceneTex_008790[] = dhylia_labo_sceneTex_008790;
-
-#define dhylia_labo_sceneTex_010890 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_010890"
-static const ALIGN_ASSET(2) char hylia_labo_sceneTex_010890[] = dhylia_labo_sceneTex_010890;
-
-#define dhylia_labo_sceneTex_006090 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_006090"
-static const ALIGN_ASSET(2) char hylia_labo_sceneTex_006090[] = dhylia_labo_sceneTex_006090;
-
-#define dhylia_labo_sceneTex_00D890 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_00D890"
-static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00D890[] = dhylia_labo_sceneTex_00D890;
-
-#define dhylia_labo_sceneTex_009790 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_009790"
-static const ALIGN_ASSET(2) char hylia_labo_sceneTex_009790[] = dhylia_labo_sceneTex_009790;
-
-#define dhylia_labo_sceneTex_00D090 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_00D090"
-static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00D090[] = dhylia_labo_sceneTex_00D090;
-
-#define dhylia_labo_sceneTex_003C90 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_003C90"
-static const ALIGN_ASSET(2) char hylia_labo_sceneTex_003C90[] = dhylia_labo_sceneTex_003C90;
-
-#define dhylia_labo_sceneTex_002490 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_002490"
-static const ALIGN_ASSET(2) char hylia_labo_sceneTex_002490[] = dhylia_labo_sceneTex_002490;
-
-#define dhylia_labo_sceneTex_008590 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_008590"
-static const ALIGN_ASSET(2) char hylia_labo_sceneTex_008590[] = dhylia_labo_sceneTex_008590;
-
-#define dhylia_labo_sceneTex_006D90 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_006D90"
-static const ALIGN_ASSET(2) char hylia_labo_sceneTex_006D90[] = dhylia_labo_sceneTex_006D90;
-
-#define dhylia_labo_sceneTex_009C90 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_009C90"
-static const ALIGN_ASSET(2) char hylia_labo_sceneTex_009C90[] = dhylia_labo_sceneTex_009C90;
-
-#define dhylia_labo_sceneTex_005C90 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_005C90"
-static const ALIGN_ASSET(2) char hylia_labo_sceneTex_005C90[] = dhylia_labo_sceneTex_005C90;
-
-#define dhylia_labo_sceneTex_00A090 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_00A090"
-static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00A090[] = dhylia_labo_sceneTex_00A090;
-
-#define dhylia_labo_sceneTex_009A90 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_009A90"
-static const ALIGN_ASSET(2) char hylia_labo_sceneTex_009A90[] = dhylia_labo_sceneTex_009A90;
-
-#define dhylia_labo_sceneTex_009990 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_009990"
-static const ALIGN_ASSET(2) char hylia_labo_sceneTex_009990[] = dhylia_labo_sceneTex_009990;
-
-#define dhylia_labo_sceneTex_001490 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_001490"
+#define dhylia_labo_sceneTex_001490 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_001490"
 static const ALIGN_ASSET(2) char hylia_labo_sceneTex_001490[] = dhylia_labo_sceneTex_001490;
 
-#define dhylia_labo_sceneTex_004C90 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_004C90"
+#define dhylia_labo_sceneTex_002490 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_002490"
+static const ALIGN_ASSET(2) char hylia_labo_sceneTex_002490[] = dhylia_labo_sceneTex_002490;
+
+#define dhylia_labo_sceneTex_003490 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_003490"
+static const ALIGN_ASSET(2) char hylia_labo_sceneTex_003490[] = dhylia_labo_sceneTex_003490;
+
+#define dhylia_labo_sceneTex_003C90 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_003C90"
+static const ALIGN_ASSET(2) char hylia_labo_sceneTex_003C90[] = dhylia_labo_sceneTex_003C90;
+
+#define dhylia_labo_sceneTex_004C90 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_004C90"
 static const ALIGN_ASSET(2) char hylia_labo_sceneTex_004C90[] = dhylia_labo_sceneTex_004C90;
 
-#define dhylia_labo_sceneTex_010090 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_010090"
-static const ALIGN_ASSET(2) char hylia_labo_sceneTex_010090[] = dhylia_labo_sceneTex_010090;
+#define dhylia_labo_sceneTex_005490 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_005490"
+static const ALIGN_ASSET(2) char hylia_labo_sceneTex_005490[] = dhylia_labo_sceneTex_005490;
 
-#define dhylia_labo_sceneTex_00E090 "__OTR__scenes/nonmq/hylia_labo_scene/hylia_labo_sceneTex_00E090"
+#define dhylia_labo_sceneTex_005C90 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_005C90"
+static const ALIGN_ASSET(2) char hylia_labo_sceneTex_005C90[] = dhylia_labo_sceneTex_005C90;
+
+#define dhylia_labo_sceneTex_006090 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_006090"
+static const ALIGN_ASSET(2) char hylia_labo_sceneTex_006090[] = dhylia_labo_sceneTex_006090;
+
+#define dhylia_labo_sceneTex_006190 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_006190"
+static const ALIGN_ASSET(2) char hylia_labo_sceneTex_006190[] = dhylia_labo_sceneTex_006190;
+
+#define dhylia_labo_sceneTex_006990 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_006990"
+static const ALIGN_ASSET(2) char hylia_labo_sceneTex_006990[] = dhylia_labo_sceneTex_006990;
+
+#define dhylia_labo_sceneTex_006D90 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_006D90"
+static const ALIGN_ASSET(2) char hylia_labo_sceneTex_006D90[] = dhylia_labo_sceneTex_006D90;
+
+#define dhylia_labo_sceneTex_007D90 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_007D90"
+static const ALIGN_ASSET(2) char hylia_labo_sceneTex_007D90[] = dhylia_labo_sceneTex_007D90;
+
+#define dhylia_labo_sceneTex_008590 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_008590"
+static const ALIGN_ASSET(2) char hylia_labo_sceneTex_008590[] = dhylia_labo_sceneTex_008590;
+
+#define dhylia_labo_sceneTex_008790 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_008790"
+static const ALIGN_ASSET(2) char hylia_labo_sceneTex_008790[] = dhylia_labo_sceneTex_008790;
+
+#define dhylia_labo_sceneTex_009790 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_009790"
+static const ALIGN_ASSET(2) char hylia_labo_sceneTex_009790[] = dhylia_labo_sceneTex_009790;
+
+#define dhylia_labo_sceneTex_009990 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_009990"
+static const ALIGN_ASSET(2) char hylia_labo_sceneTex_009990[] = dhylia_labo_sceneTex_009990;
+
+#define dhylia_labo_sceneTex_009A90 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_009A90"
+static const ALIGN_ASSET(2) char hylia_labo_sceneTex_009A90[] = dhylia_labo_sceneTex_009A90;
+
+#define dhylia_labo_sceneTex_009C90 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_009C90"
+static const ALIGN_ASSET(2) char hylia_labo_sceneTex_009C90[] = dhylia_labo_sceneTex_009C90;
+
+#define dhylia_labo_sceneTex_00A090 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_00A090"
+static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00A090[] = dhylia_labo_sceneTex_00A090;
+
+#define dhylia_labo_sceneTex_00B090 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_00B090"
+static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00B090[] = dhylia_labo_sceneTex_00B090;
+
+#define dhylia_labo_sceneTex_00C090 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_00C090"
+static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00C090[] = dhylia_labo_sceneTex_00C090;
+
+#define dhylia_labo_sceneTex_00C890 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_00C890"
+static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00C890[] = dhylia_labo_sceneTex_00C890;
+
+#define dhylia_labo_sceneTex_00D090 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_00D090"
+static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00D090[] = dhylia_labo_sceneTex_00D090;
+
+#define dhylia_labo_sceneTex_00D890 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_00D890"
+static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00D890[] = dhylia_labo_sceneTex_00D890;
+
+#define dhylia_labo_sceneTex_00E090 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_00E090"
 static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00E090[] = dhylia_labo_sceneTex_00E090;
 
+#define dhylia_labo_sceneTex_00E890 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_00E890"
+static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00E890[] = dhylia_labo_sceneTex_00E890;
+
+#define dhylia_labo_sceneTex_00F890 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_00F890"
+static const ALIGN_ASSET(2) char hylia_labo_sceneTex_00F890[] = dhylia_labo_sceneTex_00F890;
+
+#define dhylia_labo_sceneTex_010090 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_010090"
+static const ALIGN_ASSET(2) char hylia_labo_sceneTex_010090[] = dhylia_labo_sceneTex_010090;
+
+#define dhylia_labo_sceneTex_010490 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_010490"
+static const ALIGN_ASSET(2) char hylia_labo_sceneTex_010490[] = dhylia_labo_sceneTex_010490;
+
+#define dhylia_labo_sceneTex_010890 "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneTex_010890"
+static const ALIGN_ASSET(2) char hylia_labo_sceneTex_010890[] = dhylia_labo_sceneTex_010890;
+
+#define dhylia_labo_sceneCollisionHeader_00105C "__OTR__scenes/shared/hylia_labo_scene/hylia_labo_sceneCollisionHeader_00105C"
+static const ALIGN_ASSET(2) char hylia_labo_sceneCollisionHeader_00105C[] = dhylia_labo_sceneCollisionHeader_00105C;
+
+
 #endif // INDOORS_HYLIA_LABO_SCENE_H
diff --git a/soh/assets/scenes/indoors/impa/impa_room_0.h b/soh/assets/scenes/indoors/impa/impa_room_0.h
index 0a522fb7d..521d34deb 100644
--- a/soh/assets/scenes/indoors/impa/impa_room_0.h
+++ b/soh/assets/scenes/indoors/impa/impa_room_0.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dimpa_room_0DL_001758 "__OTR__scenes/nonmq/impa_scene/impa_room_0DL_001758"
+#define dimpa_room_0DL_001758 "__OTR__scenes/shared/impa_scene/impa_room_0DL_001758"
 static const ALIGN_ASSET(2) char impa_room_0DL_001758[] = dimpa_room_0DL_001758;
 
 
diff --git a/soh/assets/scenes/indoors/impa/impa_scene.h b/soh/assets/scenes/indoors/impa/impa_scene.h
index bcc2aea15..8f4a58a77 100644
--- a/soh/assets/scenes/indoors/impa/impa_scene.h
+++ b/soh/assets/scenes/indoors/impa/impa_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dimpa_sceneCollisionHeader_000CE0 "__OTR__scenes/nonmq/impa_scene/impa_sceneCollisionHeader_000CE0"
+#define dimpa_sceneCollisionHeader_000CE0 "__OTR__scenes/shared/impa_scene/impa_sceneCollisionHeader_000CE0"
 static const ALIGN_ASSET(2) char impa_sceneCollisionHeader_000CE0[] = dimpa_sceneCollisionHeader_000CE0;
 
 
diff --git a/soh/assets/scenes/indoors/kakariko/kakariko_room_0.h b/soh/assets/scenes/indoors/kakariko/kakariko_room_0.h
index 36e99e7ac..ce26a5fab 100644
--- a/soh/assets/scenes/indoors/kakariko/kakariko_room_0.h
+++ b/soh/assets/scenes/indoors/kakariko/kakariko_room_0.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dkakariko_room_0DL_005760 "__OTR__scenes/nonmq/kakariko_scene/kakariko_room_0DL_005760"
+#define dkakariko_room_0DL_005760 "__OTR__scenes/shared/kakariko_scene/kakariko_room_0DL_005760"
 static const ALIGN_ASSET(2) char kakariko_room_0DL_005760[] = dkakariko_room_0DL_005760;
 
 
diff --git a/soh/assets/scenes/indoors/kakariko/kakariko_scene.h b/soh/assets/scenes/indoors/kakariko/kakariko_scene.h
index 19727894a..e8b73026e 100644
--- a/soh/assets/scenes/indoors/kakariko/kakariko_scene.h
+++ b/soh/assets/scenes/indoors/kakariko/kakariko_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dkakariko_sceneCollisionHeader_000E68 "__OTR__scenes/nonmq/kakariko_scene/kakariko_sceneCollisionHeader_000E68"
+#define dkakariko_sceneCollisionHeader_000E68 "__OTR__scenes/shared/kakariko_scene/kakariko_sceneCollisionHeader_000E68"
 static const ALIGN_ASSET(2) char kakariko_sceneCollisionHeader_000E68[] = dkakariko_sceneCollisionHeader_000E68;
 
 
diff --git a/soh/assets/scenes/indoors/kenjyanoma/kenjyanoma_room_0.h b/soh/assets/scenes/indoors/kenjyanoma/kenjyanoma_room_0.h
index fe67f2766..db447294a 100644
--- a/soh/assets/scenes/indoors/kenjyanoma/kenjyanoma_room_0.h
+++ b/soh/assets/scenes/indoors/kenjyanoma/kenjyanoma_room_0.h
@@ -3,85 +3,85 @@
 
 #include "align_asset_macro.h"
 
-#define dkenjyanoma_room_0DL_001608 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0DL_001608"
-static const ALIGN_ASSET(2) char kenjyanoma_room_0DL_001608[] = dkenjyanoma_room_0DL_001608;
-
-#define dkenjyanoma_room_0Tex_00D618 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_00D618"
-static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_00D618[] = dkenjyanoma_room_0Tex_00D618;
-
-#define dkenjyanoma_room_0Tex_00C618 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_00C618"
-static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_00C618[] = dkenjyanoma_room_0Tex_00C618;
-
-#define dkenjyanoma_room_0Tex_00B618 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_00B618"
-static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_00B618[] = dkenjyanoma_room_0Tex_00B618;
-
-#define dkenjyanoma_room_0Tex_00A618 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_00A618"
-static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_00A618[] = dkenjyanoma_room_0Tex_00A618;
-
-#define dkenjyanoma_room_0Tex_009618 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_009618"
-static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_009618[] = dkenjyanoma_room_0Tex_009618;
-
-#define dkenjyanoma_room_0Tex_008618 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_008618"
-static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_008618[] = dkenjyanoma_room_0Tex_008618;
-
-#define dkenjyanoma_room_0Tex_007618 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_007618"
-static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_007618[] = dkenjyanoma_room_0Tex_007618;
-
-#define dkenjyanoma_room_0Tex_006618 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_006618"
-static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_006618[] = dkenjyanoma_room_0Tex_006618;
-
-#define dkenjyanoma_room_0Tex_005618 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_005618"
-static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_005618[] = dkenjyanoma_room_0Tex_005618;
-
-#define dkenjyanoma_room_0Tex_004618 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_004618"
-static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_004618[] = dkenjyanoma_room_0Tex_004618;
-
-#define dkenjyanoma_room_0Tex_003618 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_003618"
-static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_003618[] = dkenjyanoma_room_0Tex_003618;
-
-#define dkenjyanoma_room_0Tex_002618 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_002618"
-static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_002618[] = dkenjyanoma_room_0Tex_002618;
-
-#define dkenjyanoma_room_0Tex_001618 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_001618"
+#define dkenjyanoma_room_0Tex_001618 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_001618"
 static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_001618[] = dkenjyanoma_room_0Tex_001618;
 
-#define dkenjyanoma_room_0DL_010CD8 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0DL_010CD8"
-static const ALIGN_ASSET(2) char kenjyanoma_room_0DL_010CD8[] = dkenjyanoma_room_0DL_010CD8;
+#define dkenjyanoma_room_0Tex_002618 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_002618"
+static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_002618[] = dkenjyanoma_room_0Tex_002618;
 
-#define dkenjyanoma_room_0Tex_010CE8 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_010CE8"
+#define dkenjyanoma_room_0Tex_003618 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_003618"
+static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_003618[] = dkenjyanoma_room_0Tex_003618;
+
+#define dkenjyanoma_room_0Tex_004618 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_004618"
+static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_004618[] = dkenjyanoma_room_0Tex_004618;
+
+#define dkenjyanoma_room_0Tex_005618 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_005618"
+static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_005618[] = dkenjyanoma_room_0Tex_005618;
+
+#define dkenjyanoma_room_0Tex_006618 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_006618"
+static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_006618[] = dkenjyanoma_room_0Tex_006618;
+
+#define dkenjyanoma_room_0Tex_007618 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_007618"
+static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_007618[] = dkenjyanoma_room_0Tex_007618;
+
+#define dkenjyanoma_room_0Tex_008618 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_008618"
+static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_008618[] = dkenjyanoma_room_0Tex_008618;
+
+#define dkenjyanoma_room_0Tex_009618 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_009618"
+static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_009618[] = dkenjyanoma_room_0Tex_009618;
+
+#define dkenjyanoma_room_0Tex_00A618 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_00A618"
+static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_00A618[] = dkenjyanoma_room_0Tex_00A618;
+
+#define dkenjyanoma_room_0Tex_00B618 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_00B618"
+static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_00B618[] = dkenjyanoma_room_0Tex_00B618;
+
+#define dkenjyanoma_room_0Tex_00C618 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_00C618"
+static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_00C618[] = dkenjyanoma_room_0Tex_00C618;
+
+#define dkenjyanoma_room_0Tex_00D618 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_00D618"
+static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_00D618[] = dkenjyanoma_room_0Tex_00D618;
+
+#define dkenjyanoma_room_0Tex_010CE8 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_010CE8"
 static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_010CE8[] = dkenjyanoma_room_0Tex_010CE8;
 
-#define dkenjyanoma_room_0Tex_012D08 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_012D08"
-static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_012D08[] = dkenjyanoma_room_0Tex_012D08;
-
-#define dkenjyanoma_room_0Tex_012508 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_012508"
-static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_012508[] = dkenjyanoma_room_0Tex_012508;
-
-#define dkenjyanoma_room_0Tex_0114E8 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_0114E8"
+#define dkenjyanoma_room_0Tex_0114E8 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_0114E8"
 static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_0114E8[] = dkenjyanoma_room_0Tex_0114E8;
 
-#define dkenjyanoma_room_0Tex_011CE8 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_011CE8"
+#define dkenjyanoma_room_0Tex_011CE8 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_011CE8"
 static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_011CE8[] = dkenjyanoma_room_0Tex_011CE8;
 
-#define dkenjyanoma_room_0Tex_011D08 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Tex_011D08"
+#define dkenjyanoma_room_0Tex_011D08 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_011D08"
 static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_011D08[] = dkenjyanoma_room_0Tex_011D08;
 
-#define dkenjyanoma_room_0Set_000110DL_001608 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Set_000110DL_001608"
+#define dkenjyanoma_room_0Tex_012508 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_012508"
+static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_012508[] = dkenjyanoma_room_0Tex_012508;
+
+#define dkenjyanoma_room_0Tex_012D08 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Tex_012D08"
+static const ALIGN_ASSET(2) char kenjyanoma_room_0Tex_012D08[] = dkenjyanoma_room_0Tex_012D08;
+
+#define dkenjyanoma_room_0DL_001608 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0DL_001608"
+static const ALIGN_ASSET(2) char kenjyanoma_room_0DL_001608[] = dkenjyanoma_room_0DL_001608;
+
+#define dkenjyanoma_room_0DL_010CD8 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0DL_010CD8"
+static const ALIGN_ASSET(2) char kenjyanoma_room_0DL_010CD8[] = dkenjyanoma_room_0DL_010CD8;
+
+#define dkenjyanoma_room_0Set_000110DL_001608 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Set_000110DL_001608"
 static const ALIGN_ASSET(2) char kenjyanoma_room_0Set_000110DL_001608[] = dkenjyanoma_room_0Set_000110DL_001608;
 
-#define dkenjyanoma_room_0Set_000110DL_010CD8 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Set_000110DL_010CD8"
+#define dkenjyanoma_room_0Set_000110DL_010CD8 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Set_000110DL_010CD8"
 static const ALIGN_ASSET(2) char kenjyanoma_room_0Set_000110DL_010CD8[] = dkenjyanoma_room_0Set_000110DL_010CD8;
 
-#define dkenjyanoma_room_0Set_000180DL_001608 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Set_000180DL_001608"
+#define dkenjyanoma_room_0Set_000180DL_001608 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Set_000180DL_001608"
 static const ALIGN_ASSET(2) char kenjyanoma_room_0Set_000180DL_001608[] = dkenjyanoma_room_0Set_000180DL_001608;
 
-#define dkenjyanoma_room_0Set_000180DL_010CD8 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Set_000180DL_010CD8"
+#define dkenjyanoma_room_0Set_000180DL_010CD8 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Set_000180DL_010CD8"
 static const ALIGN_ASSET(2) char kenjyanoma_room_0Set_000180DL_010CD8[] = dkenjyanoma_room_0Set_000180DL_010CD8;
 
-#define dkenjyanoma_room_0Set_000230DL_001608 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Set_000230DL_001608"
+#define dkenjyanoma_room_0Set_000230DL_001608 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Set_000230DL_001608"
 static const ALIGN_ASSET(2) char kenjyanoma_room_0Set_000230DL_001608[] = dkenjyanoma_room_0Set_000230DL_001608;
 
-#define dkenjyanoma_room_0Set_000230DL_010CD8 "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_room_0Set_000230DL_010CD8"
+#define dkenjyanoma_room_0Set_000230DL_010CD8 "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_room_0Set_000230DL_010CD8"
 static const ALIGN_ASSET(2) char kenjyanoma_room_0Set_000230DL_010CD8[] = dkenjyanoma_room_0Set_000230DL_010CD8;
 
 
diff --git a/soh/assets/scenes/indoors/kenjyanoma/kenjyanoma_scene.h b/soh/assets/scenes/indoors/kenjyanoma/kenjyanoma_scene.h
index 1132c6f2e..91b555e62 100644
--- a/soh/assets/scenes/indoors/kenjyanoma/kenjyanoma_scene.h
+++ b/soh/assets/scenes/indoors/kenjyanoma/kenjyanoma_scene.h
@@ -3,14 +3,14 @@
 
 #include "align_asset_macro.h"
 
-#define dkenjyanoma_sceneCollisionHeader_00359C "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_sceneCollisionHeader_00359C"
+#define dkenjyanoma_sceneCollisionHeader_00359C "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_sceneCollisionHeader_00359C"
 static const ALIGN_ASSET(2) char kenjyanoma_sceneCollisionHeader_00359C[] = dkenjyanoma_sceneCollisionHeader_00359C;
 
-#define dkenjyanoma_sceneCollisionHeader_00359C "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_sceneCollisionHeader_00359C"
+#define dkenjyanoma_sceneCollisionHeader_00359C "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_sceneCollisionHeader_00359C"
 
-#define dkenjyanoma_sceneCollisionHeader_00359C "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_sceneCollisionHeader_00359C"
+#define dkenjyanoma_sceneCollisionHeader_00359C "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_sceneCollisionHeader_00359C"
 
-#define dkenjyanoma_sceneCollisionHeader_00359C "__OTR__scenes/nonmq/kenjyanoma_scene/kenjyanoma_sceneCollisionHeader_00359C"
+#define dkenjyanoma_sceneCollisionHeader_00359C "__OTR__scenes/shared/kenjyanoma_scene/kenjyanoma_sceneCollisionHeader_00359C"
 
 
 #endif // INDOORS_KENJYANOMA_SCENE_H
diff --git a/soh/assets/scenes/indoors/kokiri_home/kokiri_home_room_0.h b/soh/assets/scenes/indoors/kokiri_home/kokiri_home_room_0.h
index 764cb901a..4047eecce 100644
--- a/soh/assets/scenes/indoors/kokiri_home/kokiri_home_room_0.h
+++ b/soh/assets/scenes/indoors/kokiri_home/kokiri_home_room_0.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dkokiri_home_room_0DL_006398 "__OTR__scenes/nonmq/kokiri_home_scene/kokiri_home_room_0DL_006398"
+#define dkokiri_home_room_0DL_006398 "__OTR__scenes/shared/kokiri_home_scene/kokiri_home_room_0DL_006398"
 static const ALIGN_ASSET(2) char kokiri_home_room_0DL_006398[] = dkokiri_home_room_0DL_006398;
 
 
diff --git a/soh/assets/scenes/indoors/kokiri_home/kokiri_home_scene.h b/soh/assets/scenes/indoors/kokiri_home/kokiri_home_scene.h
index faadb2ff9..161beb2be 100644
--- a/soh/assets/scenes/indoors/kokiri_home/kokiri_home_scene.h
+++ b/soh/assets/scenes/indoors/kokiri_home/kokiri_home_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dkokiri_home_sceneCollisionHeader_000C8C "__OTR__scenes/nonmq/kokiri_home_scene/kokiri_home_sceneCollisionHeader_000C8C"
+#define dkokiri_home_sceneCollisionHeader_000C8C "__OTR__scenes/shared/kokiri_home_scene/kokiri_home_sceneCollisionHeader_000C8C"
 static const ALIGN_ASSET(2) char kokiri_home_sceneCollisionHeader_000C8C[] = dkokiri_home_sceneCollisionHeader_000C8C;
 
 
diff --git a/soh/assets/scenes/indoors/kokiri_home3/kokiri_home3_room_0.h b/soh/assets/scenes/indoors/kokiri_home3/kokiri_home3_room_0.h
index b0a16b9f3..d88b86806 100644
--- a/soh/assets/scenes/indoors/kokiri_home3/kokiri_home3_room_0.h
+++ b/soh/assets/scenes/indoors/kokiri_home3/kokiri_home3_room_0.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dkokiri_home3_room_0DL_036590 "__OTR__scenes/nonmq/kokiri_home3_scene/kokiri_home3_room_0DL_036590"
+#define dkokiri_home3_room_0DL_036590 "__OTR__scenes/shared/kokiri_home3_scene/kokiri_home3_room_0DL_036590"
 static const ALIGN_ASSET(2) char kokiri_home3_room_0DL_036590[] = dkokiri_home3_room_0DL_036590;
 
 
diff --git a/soh/assets/scenes/indoors/kokiri_home3/kokiri_home3_scene.h b/soh/assets/scenes/indoors/kokiri_home3/kokiri_home3_scene.h
index fa6597995..a301dbf7d 100644
--- a/soh/assets/scenes/indoors/kokiri_home3/kokiri_home3_scene.h
+++ b/soh/assets/scenes/indoors/kokiri_home3/kokiri_home3_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dkokiri_home3_sceneCollisionHeader_001774 "__OTR__scenes/nonmq/kokiri_home3_scene/kokiri_home3_sceneCollisionHeader_001774"
+#define dkokiri_home3_sceneCollisionHeader_001774 "__OTR__scenes/shared/kokiri_home3_scene/kokiri_home3_sceneCollisionHeader_001774"
 static const ALIGN_ASSET(2) char kokiri_home3_sceneCollisionHeader_001774[] = dkokiri_home3_sceneCollisionHeader_001774;
 
 
diff --git a/soh/assets/scenes/indoors/kokiri_home4/kokiri_home4_room_0.h b/soh/assets/scenes/indoors/kokiri_home4/kokiri_home4_room_0.h
index e954d48dc..75cb26571 100644
--- a/soh/assets/scenes/indoors/kokiri_home4/kokiri_home4_room_0.h
+++ b/soh/assets/scenes/indoors/kokiri_home4/kokiri_home4_room_0.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dkokiri_home4_room_0DL_0388B8 "__OTR__scenes/nonmq/kokiri_home4_scene/kokiri_home4_room_0DL_0388B8"
+#define dkokiri_home4_room_0DL_0388B8 "__OTR__scenes/shared/kokiri_home4_scene/kokiri_home4_room_0DL_0388B8"
 static const ALIGN_ASSET(2) char kokiri_home4_room_0DL_0388B8[] = dkokiri_home4_room_0DL_0388B8;
 
 
diff --git a/soh/assets/scenes/indoors/kokiri_home4/kokiri_home4_scene.h b/soh/assets/scenes/indoors/kokiri_home4/kokiri_home4_scene.h
index ed244364d..35ddc7159 100644
--- a/soh/assets/scenes/indoors/kokiri_home4/kokiri_home4_scene.h
+++ b/soh/assets/scenes/indoors/kokiri_home4/kokiri_home4_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dkokiri_home4_sceneCollisionHeader_001A84 "__OTR__scenes/nonmq/kokiri_home4_scene/kokiri_home4_sceneCollisionHeader_001A84"
+#define dkokiri_home4_sceneCollisionHeader_001A84 "__OTR__scenes/shared/kokiri_home4_scene/kokiri_home4_sceneCollisionHeader_001A84"
 static const ALIGN_ASSET(2) char kokiri_home4_sceneCollisionHeader_001A84[] = dkokiri_home4_sceneCollisionHeader_001A84;
 
 
diff --git a/soh/assets/scenes/indoors/kokiri_home5/kokiri_home5_room_0.h b/soh/assets/scenes/indoors/kokiri_home5/kokiri_home5_room_0.h
index e5aacdf16..11f182e1b 100644
--- a/soh/assets/scenes/indoors/kokiri_home5/kokiri_home5_room_0.h
+++ b/soh/assets/scenes/indoors/kokiri_home5/kokiri_home5_room_0.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dkokiri_home5_room_0DL_030EE8 "__OTR__scenes/nonmq/kokiri_home5_scene/kokiri_home5_room_0DL_030EE8"
+#define dkokiri_home5_room_0DL_030EE8 "__OTR__scenes/shared/kokiri_home5_scene/kokiri_home5_room_0DL_030EE8"
 static const ALIGN_ASSET(2) char kokiri_home5_room_0DL_030EE8[] = dkokiri_home5_room_0DL_030EE8;
 
 
diff --git a/soh/assets/scenes/indoors/kokiri_home5/kokiri_home5_scene.h b/soh/assets/scenes/indoors/kokiri_home5/kokiri_home5_scene.h
index 250287b76..7662bafb8 100644
--- a/soh/assets/scenes/indoors/kokiri_home5/kokiri_home5_scene.h
+++ b/soh/assets/scenes/indoors/kokiri_home5/kokiri_home5_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dkokiri_home5_sceneCollisionHeader_0013DC "__OTR__scenes/nonmq/kokiri_home5_scene/kokiri_home5_sceneCollisionHeader_0013DC"
+#define dkokiri_home5_sceneCollisionHeader_0013DC "__OTR__scenes/shared/kokiri_home5_scene/kokiri_home5_sceneCollisionHeader_0013DC"
 static const ALIGN_ASSET(2) char kokiri_home5_sceneCollisionHeader_0013DC[] = dkokiri_home5_sceneCollisionHeader_0013DC;
 
 
diff --git a/soh/assets/scenes/indoors/labo/labo_room_0.h b/soh/assets/scenes/indoors/labo/labo_room_0.h
index e632c604b..652f90af7 100644
--- a/soh/assets/scenes/indoors/labo/labo_room_0.h
+++ b/soh/assets/scenes/indoors/labo/labo_room_0.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dlabo_room_0DL_006E50 "__OTR__scenes/nonmq/labo_scene/labo_room_0DL_006E50"
+#define dlabo_room_0DL_006E50 "__OTR__scenes/shared/labo_scene/labo_room_0DL_006E50"
 static const ALIGN_ASSET(2) char labo_room_0DL_006E50[] = dlabo_room_0DL_006E50;
 
 
diff --git a/soh/assets/scenes/indoors/labo/labo_scene.h b/soh/assets/scenes/indoors/labo/labo_scene.h
index f9a048f59..ca9cd8332 100644
--- a/soh/assets/scenes/indoors/labo/labo_scene.h
+++ b/soh/assets/scenes/indoors/labo/labo_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dlabo_sceneCollisionHeader_000EC4 "__OTR__scenes/nonmq/labo_scene/labo_sceneCollisionHeader_000EC4"
+#define dlabo_sceneCollisionHeader_000EC4 "__OTR__scenes/shared/labo_scene/labo_sceneCollisionHeader_000EC4"
 static const ALIGN_ASSET(2) char labo_sceneCollisionHeader_000EC4[] = dlabo_sceneCollisionHeader_000EC4;
 
 
diff --git a/soh/assets/scenes/indoors/link_home/link_home_room_0.h b/soh/assets/scenes/indoors/link_home/link_home_room_0.h
index 084b00855..18015eaa2 100644
--- a/soh/assets/scenes/indoors/link_home/link_home_room_0.h
+++ b/soh/assets/scenes/indoors/link_home/link_home_room_0.h
@@ -3,13 +3,13 @@
 
 #include "align_asset_macro.h"
 
-#define dlink_home_room_0DL_0023A8 "__OTR__scenes/nonmq/link_home_scene/link_home_room_0DL_0023A8"
+#define dlink_home_room_0DL_0023A8 "__OTR__scenes/shared/link_home_scene/link_home_room_0DL_0023A8"
 static const ALIGN_ASSET(2) char link_home_room_0DL_0023A8[] = dlink_home_room_0DL_0023A8;
 
-#define dlink_home_room_0Set_002400DL_0023A8 "__OTR__scenes/nonmq/link_home_scene/link_home_room_0Set_002400DL_0023A8"
+#define dlink_home_room_0Set_002400DL_0023A8 "__OTR__scenes/shared/link_home_scene/link_home_room_0Set_002400DL_0023A8"
 static const ALIGN_ASSET(2) char link_home_room_0Set_002400DL_0023A8[] = dlink_home_room_0Set_002400DL_0023A8;
 
-#define dlink_home_room_0Set_002440DL_0023A8 "__OTR__scenes/nonmq/link_home_scene/link_home_room_0Set_002440DL_0023A8"
+#define dlink_home_room_0Set_002440DL_0023A8 "__OTR__scenes/shared/link_home_scene/link_home_room_0Set_002440DL_0023A8"
 static const ALIGN_ASSET(2) char link_home_room_0Set_002440DL_0023A8[] = dlink_home_room_0Set_002440DL_0023A8;
 
 
diff --git a/soh/assets/scenes/indoors/link_home/link_home_scene.h b/soh/assets/scenes/indoors/link_home/link_home_scene.h
index d66349aa0..ad5cbeae0 100644
--- a/soh/assets/scenes/indoors/link_home/link_home_scene.h
+++ b/soh/assets/scenes/indoors/link_home/link_home_scene.h
@@ -3,12 +3,12 @@
 
 #include "align_asset_macro.h"
 
-#define dlink_home_sceneCollisionHeader_000E4C "__OTR__scenes/nonmq/link_home_scene/link_home_sceneCollisionHeader_000E4C"
+#define dlink_home_sceneCollisionHeader_000E4C "__OTR__scenes/shared/link_home_scene/link_home_sceneCollisionHeader_000E4C"
 static const ALIGN_ASSET(2) char link_home_sceneCollisionHeader_000E4C[] = dlink_home_sceneCollisionHeader_000E4C;
 
-#define dlink_home_sceneCollisionHeader_000E4C "__OTR__scenes/nonmq/link_home_scene/link_home_sceneCollisionHeader_000E4C"
+#define dlink_home_sceneCollisionHeader_000E4C "__OTR__scenes/shared/link_home_scene/link_home_sceneCollisionHeader_000E4C"
 
-#define dlink_home_sceneCollisionHeader_000E4C "__OTR__scenes/nonmq/link_home_scene/link_home_sceneCollisionHeader_000E4C"
+#define dlink_home_sceneCollisionHeader_000E4C "__OTR__scenes/shared/link_home_scene/link_home_sceneCollisionHeader_000E4C"
 
 
 #endif // INDOORS_LINK_HOME_SCENE_H
diff --git a/soh/assets/scenes/indoors/mahouya/mahouya_room_0.h b/soh/assets/scenes/indoors/mahouya/mahouya_room_0.h
index 8fbc38d42..a5aef9955 100644
--- a/soh/assets/scenes/indoors/mahouya/mahouya_room_0.h
+++ b/soh/assets/scenes/indoors/mahouya/mahouya_room_0.h
@@ -3,10 +3,10 @@
 
 #include "align_asset_macro.h"
 
-#define dmahouya_room_0DL_006548 "__OTR__scenes/nonmq/mahouya_scene/mahouya_room_0DL_006548"
+#define dmahouya_room_0DL_006548 "__OTR__scenes/shared/mahouya_scene/mahouya_room_0DL_006548"
 static const ALIGN_ASSET(2) char mahouya_room_0DL_006548[] = dmahouya_room_0DL_006548;
 
-#define dmahouya_room_0DL_006A78 "__OTR__scenes/nonmq/mahouya_scene/mahouya_room_0DL_006A78"
+#define dmahouya_room_0DL_006A78 "__OTR__scenes/shared/mahouya_scene/mahouya_room_0DL_006A78"
 static const ALIGN_ASSET(2) char mahouya_room_0DL_006A78[] = dmahouya_room_0DL_006A78;
 
 
diff --git a/soh/assets/scenes/indoors/mahouya/mahouya_scene.h b/soh/assets/scenes/indoors/mahouya/mahouya_scene.h
index 0e558bcfd..a7744e3e1 100644
--- a/soh/assets/scenes/indoors/mahouya/mahouya_scene.h
+++ b/soh/assets/scenes/indoors/mahouya/mahouya_scene.h
@@ -3,46 +3,47 @@
 
 #include "align_asset_macro.h"
 
-#define dmahouya_sceneCollisionHeader_0009F4 "__OTR__scenes/nonmq/mahouya_scene/mahouya_sceneCollisionHeader_0009F4"
-static const ALIGN_ASSET(2) char mahouya_sceneCollisionHeader_0009F4[] = dmahouya_sceneCollisionHeader_0009F4;
-
-#define dmahouya_sceneTex_009A20 "__OTR__scenes/nonmq/mahouya_scene/mahouya_sceneTex_009A20"
-static const ALIGN_ASSET(2) char mahouya_sceneTex_009A20[] = dmahouya_sceneTex_009A20;
-
-#define dmahouya_sceneTex_007A20 "__OTR__scenes/nonmq/mahouya_scene/mahouya_sceneTex_007A20"
-static const ALIGN_ASSET(2) char mahouya_sceneTex_007A20[] = dmahouya_sceneTex_007A20;
-
-#define dmahouya_sceneTex_009220 "__OTR__scenes/nonmq/mahouya_scene/mahouya_sceneTex_009220"
-static const ALIGN_ASSET(2) char mahouya_sceneTex_009220[] = dmahouya_sceneTex_009220;
-
-#define dmahouya_sceneTex_001A20 "__OTR__scenes/nonmq/mahouya_scene/mahouya_sceneTex_001A20"
-static const ALIGN_ASSET(2) char mahouya_sceneTex_001A20[] = dmahouya_sceneTex_001A20;
-
-#define dmahouya_sceneTex_001220 "__OTR__scenes/nonmq/mahouya_scene/mahouya_sceneTex_001220"
-static const ALIGN_ASSET(2) char mahouya_sceneTex_001220[] = dmahouya_sceneTex_001220;
-
-#define dmahouya_sceneTex_006220 "__OTR__scenes/nonmq/mahouya_scene/mahouya_sceneTex_006220"
-static const ALIGN_ASSET(2) char mahouya_sceneTex_006220[] = dmahouya_sceneTex_006220;
-
-#define dmahouya_sceneTex_007220 "__OTR__scenes/nonmq/mahouya_scene/mahouya_sceneTex_007220"
-static const ALIGN_ASSET(2) char mahouya_sceneTex_007220[] = dmahouya_sceneTex_007220;
-
-#define dmahouya_sceneTex_005220 "__OTR__scenes/nonmq/mahouya_scene/mahouya_sceneTex_005220"
-static const ALIGN_ASSET(2) char mahouya_sceneTex_005220[] = dmahouya_sceneTex_005220;
-
-#define dmahouya_sceneTex_004A20 "__OTR__scenes/nonmq/mahouya_scene/mahouya_sceneTex_004A20"
-static const ALIGN_ASSET(2) char mahouya_sceneTex_004A20[] = dmahouya_sceneTex_004A20;
-
-#define dmahouya_sceneTex_000A20 "__OTR__scenes/nonmq/mahouya_scene/mahouya_sceneTex_000A20"
+#define dmahouya_sceneTex_000A20 "__OTR__scenes/shared/mahouya_scene/mahouya_sceneTex_000A20"
 static const ALIGN_ASSET(2) char mahouya_sceneTex_000A20[] = dmahouya_sceneTex_000A20;
 
-#define dmahouya_sceneTex_003A20 "__OTR__scenes/nonmq/mahouya_scene/mahouya_sceneTex_003A20"
-static const ALIGN_ASSET(2) char mahouya_sceneTex_003A20[] = dmahouya_sceneTex_003A20;
+#define dmahouya_sceneTex_001220 "__OTR__scenes/shared/mahouya_scene/mahouya_sceneTex_001220"
+static const ALIGN_ASSET(2) char mahouya_sceneTex_001220[] = dmahouya_sceneTex_001220;
 
-#define dmahouya_sceneTex_002A20 "__OTR__scenes/nonmq/mahouya_scene/mahouya_sceneTex_002A20"
+#define dmahouya_sceneTex_001A20 "__OTR__scenes/shared/mahouya_scene/mahouya_sceneTex_001A20"
+static const ALIGN_ASSET(2) char mahouya_sceneTex_001A20[] = dmahouya_sceneTex_001A20;
+
+#define dmahouya_sceneTex_002A20 "__OTR__scenes/shared/mahouya_scene/mahouya_sceneTex_002A20"
 static const ALIGN_ASSET(2) char mahouya_sceneTex_002A20[] = dmahouya_sceneTex_002A20;
 
-#define dmahouya_sceneTex_008A20 "__OTR__scenes/nonmq/mahouya_scene/mahouya_sceneTex_008A20"
+#define dmahouya_sceneTex_003A20 "__OTR__scenes/shared/mahouya_scene/mahouya_sceneTex_003A20"
+static const ALIGN_ASSET(2) char mahouya_sceneTex_003A20[] = dmahouya_sceneTex_003A20;
+
+#define dmahouya_sceneTex_004A20 "__OTR__scenes/shared/mahouya_scene/mahouya_sceneTex_004A20"
+static const ALIGN_ASSET(2) char mahouya_sceneTex_004A20[] = dmahouya_sceneTex_004A20;
+
+#define dmahouya_sceneTex_005220 "__OTR__scenes/shared/mahouya_scene/mahouya_sceneTex_005220"
+static const ALIGN_ASSET(2) char mahouya_sceneTex_005220[] = dmahouya_sceneTex_005220;
+
+#define dmahouya_sceneTex_006220 "__OTR__scenes/shared/mahouya_scene/mahouya_sceneTex_006220"
+static const ALIGN_ASSET(2) char mahouya_sceneTex_006220[] = dmahouya_sceneTex_006220;
+
+#define dmahouya_sceneTex_007220 "__OTR__scenes/shared/mahouya_scene/mahouya_sceneTex_007220"
+static const ALIGN_ASSET(2) char mahouya_sceneTex_007220[] = dmahouya_sceneTex_007220;
+
+#define dmahouya_sceneTex_007A20 "__OTR__scenes/shared/mahouya_scene/mahouya_sceneTex_007A20"
+static const ALIGN_ASSET(2) char mahouya_sceneTex_007A20[] = dmahouya_sceneTex_007A20;
+
+#define dmahouya_sceneTex_008A20 "__OTR__scenes/shared/mahouya_scene/mahouya_sceneTex_008A20"
 static const ALIGN_ASSET(2) char mahouya_sceneTex_008A20[] = dmahouya_sceneTex_008A20;
 
+#define dmahouya_sceneTex_009220 "__OTR__scenes/shared/mahouya_scene/mahouya_sceneTex_009220"
+static const ALIGN_ASSET(2) char mahouya_sceneTex_009220[] = dmahouya_sceneTex_009220;
+
+#define dmahouya_sceneTex_009A20 "__OTR__scenes/shared/mahouya_scene/mahouya_sceneTex_009A20"
+static const ALIGN_ASSET(2) char mahouya_sceneTex_009A20[] = dmahouya_sceneTex_009A20;
+
+#define dmahouya_sceneCollisionHeader_0009F4 "__OTR__scenes/shared/mahouya_scene/mahouya_sceneCollisionHeader_0009F4"
+static const ALIGN_ASSET(2) char mahouya_sceneCollisionHeader_0009F4[] = dmahouya_sceneCollisionHeader_0009F4;
+
+
 #endif // INDOORS_MAHOUYA_SCENE_H
diff --git a/soh/assets/scenes/indoors/malon_stable/malon_stable_room_0.h b/soh/assets/scenes/indoors/malon_stable/malon_stable_room_0.h
index 7d95fae4d..406a7bb38 100644
--- a/soh/assets/scenes/indoors/malon_stable/malon_stable_room_0.h
+++ b/soh/assets/scenes/indoors/malon_stable/malon_stable_room_0.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dmalon_stable_room_0DL_008A00 "__OTR__scenes/nonmq/malon_stable_scene/malon_stable_room_0DL_008A00"
+#define dmalon_stable_room_0DL_008A00 "__OTR__scenes/shared/malon_stable_scene/malon_stable_room_0DL_008A00"
 static const ALIGN_ASSET(2) char malon_stable_room_0DL_008A00[] = dmalon_stable_room_0DL_008A00;
 
 
diff --git a/soh/assets/scenes/indoors/malon_stable/malon_stable_scene.h b/soh/assets/scenes/indoors/malon_stable/malon_stable_scene.h
index c8006d866..47584f2ac 100644
--- a/soh/assets/scenes/indoors/malon_stable/malon_stable_scene.h
+++ b/soh/assets/scenes/indoors/malon_stable/malon_stable_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dmalon_stable_sceneCollisionHeader_000644 "__OTR__scenes/nonmq/malon_stable_scene/malon_stable_sceneCollisionHeader_000644"
+#define dmalon_stable_sceneCollisionHeader_000644 "__OTR__scenes/shared/malon_stable_scene/malon_stable_sceneCollisionHeader_000644"
 static const ALIGN_ASSET(2) char malon_stable_sceneCollisionHeader_000644[] = dmalon_stable_sceneCollisionHeader_000644;
 
 
diff --git a/soh/assets/scenes/indoors/miharigoya/miharigoya_room_0.h b/soh/assets/scenes/indoors/miharigoya/miharigoya_room_0.h
index d532f22de..1a6098751 100644
--- a/soh/assets/scenes/indoors/miharigoya/miharigoya_room_0.h
+++ b/soh/assets/scenes/indoors/miharigoya/miharigoya_room_0.h
@@ -3,88 +3,88 @@
 
 #include "align_asset_macro.h"
 
-#define dgMiharigoyaBlob_0038D8 "__OTR__scenes/nonmq/miharigoya_room_0/gMiharigoyaBlob_0038D8"
+#define dgMiharigoyaBlob_0038D8 "__OTR__scenes/shared/miharigoya_room_0/gMiharigoyaBlob_0038D8"
 static const ALIGN_ASSET(2) char gMiharigoyaBlob_0038D8[] = dgMiharigoyaBlob_0038D8;
 
-#define dmiharigoya_room_0DL_003820 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0DL_003820"
+#define dmiharigoya_room_0DL_003820 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0DL_003820"
 static const ALIGN_ASSET(2) char miharigoya_room_0DL_003820[] = dmiharigoya_room_0DL_003820;
 
-#define dmiharigoya_room_0DL_0036A8 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0DL_0036A8"
+#define dmiharigoya_room_0DL_0036A8 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0DL_0036A8"
 static const ALIGN_ASSET(2) char miharigoya_room_0DL_0036A8[] = dmiharigoya_room_0DL_0036A8;
 
-#define dmiharigoya_room_0DL_002F30 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0DL_002F30"
+#define dmiharigoya_room_0DL_002F30 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0DL_002F30"
 static const ALIGN_ASSET(2) char miharigoya_room_0DL_002F30[] = dmiharigoya_room_0DL_002F30;
 
-#define dmiharigoya_room_0DL_002A10 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0DL_002A10"
+#define dmiharigoya_room_0DL_002A10 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0DL_002A10"
 static const ALIGN_ASSET(2) char miharigoya_room_0DL_002A10[] = dmiharigoya_room_0DL_002A10;
 
-#define dmiharigoya_room_0DL_003490 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0DL_003490"
+#define dmiharigoya_room_0DL_003490 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0DL_003490"
 static const ALIGN_ASSET(2) char miharigoya_room_0DL_003490[] = dmiharigoya_room_0DL_003490;
 
-#define dmiharigoya_room_0DL_000FE0 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0DL_000FE0"
+#define dmiharigoya_room_0DL_000FE0 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0DL_000FE0"
 static const ALIGN_ASSET(2) char miharigoya_room_0DL_000FE0[] = dmiharigoya_room_0DL_000FE0;
 
-#define dmiharigoya_room_0DL_001F48 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0DL_001F48"
+#define dmiharigoya_room_0DL_001F48 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0DL_001F48"
 static const ALIGN_ASSET(2) char miharigoya_room_0DL_001F48[] = dmiharigoya_room_0DL_001F48;
 
-#define dmiharigoya_room_0DL_002778 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0DL_002778"
+#define dmiharigoya_room_0DL_002778 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0DL_002778"
 static const ALIGN_ASSET(2) char miharigoya_room_0DL_002778[] = dmiharigoya_room_0DL_002778;
 
-#define dmiharigoya_room_0DL_000A68 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0DL_000A68"
+#define dmiharigoya_room_0DL_000A68 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0DL_000A68"
 static const ALIGN_ASSET(2) char miharigoya_room_0DL_000A68[] = dmiharigoya_room_0DL_000A68;
 
-#define dmiharigoya_room_0DL_003C40 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0DL_003C40"
+#define dmiharigoya_room_0DL_003C40 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0DL_003C40"
 static const ALIGN_ASSET(2) char miharigoya_room_0DL_003C40[] = dmiharigoya_room_0DL_003C40;
 
-#define dmiharigoya_room_0DL_000E60 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0DL_000E60"
+#define dmiharigoya_room_0DL_000E60 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0DL_000E60"
 static const ALIGN_ASSET(2) char miharigoya_room_0DL_000E60[] = dmiharigoya_room_0DL_000E60;
 
-#define dmiharigoya_room_0DL_000660 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0DL_000660"
+#define dmiharigoya_room_0DL_000660 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0DL_000660"
 static const ALIGN_ASSET(2) char miharigoya_room_0DL_000660[] = dmiharigoya_room_0DL_000660;
 
-#define dmiharigoya_room_0DL_002C60 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0DL_002C60"
+#define dmiharigoya_room_0DL_002C60 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0DL_002C60"
 static const ALIGN_ASSET(2) char miharigoya_room_0DL_002C60[] = dmiharigoya_room_0DL_002C60;
 
-#define dgMiharigoyaDL_003DA0 "__OTR__scenes/nonmq/miharigoya_scene/gMiharigoyaDL_003DA0"
+#define dgMiharigoyaDL_003DA0 "__OTR__scenes/shared/miharigoya_scene/gMiharigoyaDL_003DA0"
 static const ALIGN_ASSET(2) char gMiharigoyaDL_003DA0[] = dgMiharigoyaDL_003DA0;
 
-#define dmiharigoya_room_0Set_000470DL_003820 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0Set_000470DL_003820"
+#define dmiharigoya_room_0Set_000470DL_003820 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0Set_000470DL_003820"
 static const ALIGN_ASSET(2) char miharigoya_room_0Set_000470DL_003820[] = dmiharigoya_room_0Set_000470DL_003820;
 
-#define dmiharigoya_room_0Set_000470DL_0036A8 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0Set_000470DL_0036A8"
+#define dmiharigoya_room_0Set_000470DL_0036A8 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0Set_000470DL_0036A8"
 static const ALIGN_ASSET(2) char miharigoya_room_0Set_000470DL_0036A8[] = dmiharigoya_room_0Set_000470DL_0036A8;
 
-#define dmiharigoya_room_0Set_000470DL_002F30 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0Set_000470DL_002F30"
+#define dmiharigoya_room_0Set_000470DL_002F30 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0Set_000470DL_002F30"
 static const ALIGN_ASSET(2) char miharigoya_room_0Set_000470DL_002F30[] = dmiharigoya_room_0Set_000470DL_002F30;
 
-#define dmiharigoya_room_0Set_000470DL_002A10 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0Set_000470DL_002A10"
+#define dmiharigoya_room_0Set_000470DL_002A10 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0Set_000470DL_002A10"
 static const ALIGN_ASSET(2) char miharigoya_room_0Set_000470DL_002A10[] = dmiharigoya_room_0Set_000470DL_002A10;
 
-#define dmiharigoya_room_0Set_000470DL_003490 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0Set_000470DL_003490"
+#define dmiharigoya_room_0Set_000470DL_003490 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0Set_000470DL_003490"
 static const ALIGN_ASSET(2) char miharigoya_room_0Set_000470DL_003490[] = dmiharigoya_room_0Set_000470DL_003490;
 
-#define dmiharigoya_room_0Set_000470DL_000FE0 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0Set_000470DL_000FE0"
+#define dmiharigoya_room_0Set_000470DL_000FE0 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0Set_000470DL_000FE0"
 static const ALIGN_ASSET(2) char miharigoya_room_0Set_000470DL_000FE0[] = dmiharigoya_room_0Set_000470DL_000FE0;
 
-#define dmiharigoya_room_0Set_000470DL_001F48 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0Set_000470DL_001F48"
+#define dmiharigoya_room_0Set_000470DL_001F48 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0Set_000470DL_001F48"
 static const ALIGN_ASSET(2) char miharigoya_room_0Set_000470DL_001F48[] = dmiharigoya_room_0Set_000470DL_001F48;
 
-#define dmiharigoya_room_0Set_000470DL_002778 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0Set_000470DL_002778"
+#define dmiharigoya_room_0Set_000470DL_002778 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0Set_000470DL_002778"
 static const ALIGN_ASSET(2) char miharigoya_room_0Set_000470DL_002778[] = dmiharigoya_room_0Set_000470DL_002778;
 
-#define dmiharigoya_room_0Set_000470DL_000A68 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0Set_000470DL_000A68"
+#define dmiharigoya_room_0Set_000470DL_000A68 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0Set_000470DL_000A68"
 static const ALIGN_ASSET(2) char miharigoya_room_0Set_000470DL_000A68[] = dmiharigoya_room_0Set_000470DL_000A68;
 
-#define dmiharigoya_room_0Set_000470DL_003C40 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0Set_000470DL_003C40"
+#define dmiharigoya_room_0Set_000470DL_003C40 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0Set_000470DL_003C40"
 static const ALIGN_ASSET(2) char miharigoya_room_0Set_000470DL_003C40[] = dmiharigoya_room_0Set_000470DL_003C40;
 
-#define dmiharigoya_room_0Set_000470DL_000E60 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0Set_000470DL_000E60"
+#define dmiharigoya_room_0Set_000470DL_000E60 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0Set_000470DL_000E60"
 static const ALIGN_ASSET(2) char miharigoya_room_0Set_000470DL_000E60[] = dmiharigoya_room_0Set_000470DL_000E60;
 
-#define dmiharigoya_room_0Set_000470DL_000660 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0Set_000470DL_000660"
+#define dmiharigoya_room_0Set_000470DL_000660 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0Set_000470DL_000660"
 static const ALIGN_ASSET(2) char miharigoya_room_0Set_000470DL_000660[] = dmiharigoya_room_0Set_000470DL_000660;
 
-#define dmiharigoya_room_0Set_000470DL_002C60 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_room_0Set_000470DL_002C60"
+#define dmiharigoya_room_0Set_000470DL_002C60 "__OTR__scenes/shared/miharigoya_scene/miharigoya_room_0Set_000470DL_002C60"
 static const ALIGN_ASSET(2) char miharigoya_room_0Set_000470DL_002C60[] = dmiharigoya_room_0Set_000470DL_002C60;
 
 
diff --git a/soh/assets/scenes/indoors/miharigoya/miharigoya_scene.h b/soh/assets/scenes/indoors/miharigoya/miharigoya_scene.h
index f5c92c71e..86eefaa64 100644
--- a/soh/assets/scenes/indoors/miharigoya/miharigoya_scene.h
+++ b/soh/assets/scenes/indoors/miharigoya/miharigoya_scene.h
@@ -3,64 +3,64 @@
 
 #include "align_asset_macro.h"
 
-#define dgGuardHouseOutSideView2NightTex "__OTR__scenes/nonmq/miharigoya_scene/gGuardHouseOutSideView2NightTex"
-static const ALIGN_ASSET(2) char gGuardHouseOutSideView2NightTex[] = dgGuardHouseOutSideView2NightTex;
-
-#define dgGuardHouseOutSideView2DayTex "__OTR__scenes/nonmq/miharigoya_scene/gGuardHouseOutSideView2DayTex"
-static const ALIGN_ASSET(2) char gGuardHouseOutSideView2DayTex[] = dgGuardHouseOutSideView2DayTex;
-
-#define dgGuardHouseOutSideView1NightTex "__OTR__scenes/nonmq/miharigoya_scene/gGuardHouseOutSideView1NightTex"
-static const ALIGN_ASSET(2) char gGuardHouseOutSideView1NightTex[] = dgGuardHouseOutSideView1NightTex;
-
-#define dgGuardHouseOutSideView1DayTex "__OTR__scenes/nonmq/miharigoya_scene/gGuardHouseOutSideView1DayTex"
-static const ALIGN_ASSET(2) char gGuardHouseOutSideView1DayTex[] = dgGuardHouseOutSideView1DayTex;
-
-#define dmiharigoya_sceneCollisionHeader_000B28 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneCollisionHeader_000B28"
-static const ALIGN_ASSET(2) char miharigoya_sceneCollisionHeader_000B28[] = dmiharigoya_sceneCollisionHeader_000B28;
-
-#define dmiharigoya_sceneTex_004950 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneTex_004950"
-static const ALIGN_ASSET(2) char miharigoya_sceneTex_004950[] = dmiharigoya_sceneTex_004950;
-
-#define dmiharigoya_sceneTex_004550 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneTex_004550"
-static const ALIGN_ASSET(2) char miharigoya_sceneTex_004550[] = dmiharigoya_sceneTex_004550;
-
-#define dmiharigoya_sceneTex_008550 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneTex_008550"
-static const ALIGN_ASSET(2) char miharigoya_sceneTex_008550[] = dmiharigoya_sceneTex_008550;
-
-#define dmiharigoya_sceneTex_008D50 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneTex_008D50"
-static const ALIGN_ASSET(2) char miharigoya_sceneTex_008D50[] = dmiharigoya_sceneTex_008D50;
-
-#define dmiharigoya_sceneTex_007550 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneTex_007550"
-static const ALIGN_ASSET(2) char miharigoya_sceneTex_007550[] = dmiharigoya_sceneTex_007550;
-
-#define dmiharigoya_sceneTex_005950 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneTex_005950"
-static const ALIGN_ASSET(2) char miharigoya_sceneTex_005950[] = dmiharigoya_sceneTex_005950;
-
-#define dmiharigoya_sceneTex_00AD50 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneTex_00AD50"
-static const ALIGN_ASSET(2) char miharigoya_sceneTex_00AD50[] = dmiharigoya_sceneTex_00AD50;
-
-#define dmiharigoya_sceneTex_003350 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneTex_003350"
-static const ALIGN_ASSET(2) char miharigoya_sceneTex_003350[] = dmiharigoya_sceneTex_003350;
-
-#define dmiharigoya_sceneTex_001050 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneTex_001050"
-static const ALIGN_ASSET(2) char miharigoya_sceneTex_001050[] = dmiharigoya_sceneTex_001050;
-
-#define dmiharigoya_sceneTex_009D50 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneTex_009D50"
-static const ALIGN_ASSET(2) char miharigoya_sceneTex_009D50[] = dmiharigoya_sceneTex_009D50;
-
-#define dmiharigoya_sceneTex_005D50 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneTex_005D50"
-static const ALIGN_ASSET(2) char miharigoya_sceneTex_005D50[] = dmiharigoya_sceneTex_005D50;
-
-#define dmiharigoya_sceneTex_001150 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneTex_001150"
-static const ALIGN_ASSET(2) char miharigoya_sceneTex_001150[] = dmiharigoya_sceneTex_001150;
-
-#define dmiharigoya_sceneTex_000C50 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneTex_000C50"
+#define dmiharigoya_sceneTex_000C50 "__OTR__scenes/shared/miharigoya_scene/miharigoya_sceneTex_000C50"
 static const ALIGN_ASSET(2) char miharigoya_sceneTex_000C50[] = dmiharigoya_sceneTex_000C50;
 
-#define dmiharigoya_sceneTex_00BD50 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneTex_00BD50"
+#define dmiharigoya_sceneTex_001050 "__OTR__scenes/shared/miharigoya_scene/miharigoya_sceneTex_001050"
+static const ALIGN_ASSET(2) char miharigoya_sceneTex_001050[] = dmiharigoya_sceneTex_001050;
+
+#define dmiharigoya_sceneTex_001150 "__OTR__scenes/shared/miharigoya_scene/miharigoya_sceneTex_001150"
+static const ALIGN_ASSET(2) char miharigoya_sceneTex_001150[] = dmiharigoya_sceneTex_001150;
+
+#define dmiharigoya_sceneTex_003350 "__OTR__scenes/shared/miharigoya_scene/miharigoya_sceneTex_003350"
+static const ALIGN_ASSET(2) char miharigoya_sceneTex_003350[] = dmiharigoya_sceneTex_003350;
+
+#define dmiharigoya_sceneTex_004550 "__OTR__scenes/shared/miharigoya_scene/miharigoya_sceneTex_004550"
+static const ALIGN_ASSET(2) char miharigoya_sceneTex_004550[] = dmiharigoya_sceneTex_004550;
+
+#define dmiharigoya_sceneTex_004950 "__OTR__scenes/shared/miharigoya_scene/miharigoya_sceneTex_004950"
+static const ALIGN_ASSET(2) char miharigoya_sceneTex_004950[] = dmiharigoya_sceneTex_004950;
+
+#define dmiharigoya_sceneTex_005950 "__OTR__scenes/shared/miharigoya_scene/miharigoya_sceneTex_005950"
+static const ALIGN_ASSET(2) char miharigoya_sceneTex_005950[] = dmiharigoya_sceneTex_005950;
+
+#define dmiharigoya_sceneTex_005D50 "__OTR__scenes/shared/miharigoya_scene/miharigoya_sceneTex_005D50"
+static const ALIGN_ASSET(2) char miharigoya_sceneTex_005D50[] = dmiharigoya_sceneTex_005D50;
+
+#define dmiharigoya_sceneTex_007550 "__OTR__scenes/shared/miharigoya_scene/miharigoya_sceneTex_007550"
+static const ALIGN_ASSET(2) char miharigoya_sceneTex_007550[] = dmiharigoya_sceneTex_007550;
+
+#define dmiharigoya_sceneTex_008550 "__OTR__scenes/shared/miharigoya_scene/miharigoya_sceneTex_008550"
+static const ALIGN_ASSET(2) char miharigoya_sceneTex_008550[] = dmiharigoya_sceneTex_008550;
+
+#define dmiharigoya_sceneTex_008D50 "__OTR__scenes/shared/miharigoya_scene/miharigoya_sceneTex_008D50"
+static const ALIGN_ASSET(2) char miharigoya_sceneTex_008D50[] = dmiharigoya_sceneTex_008D50;
+
+#define dmiharigoya_sceneTex_009D50 "__OTR__scenes/shared/miharigoya_scene/miharigoya_sceneTex_009D50"
+static const ALIGN_ASSET(2) char miharigoya_sceneTex_009D50[] = dmiharigoya_sceneTex_009D50;
+
+#define dmiharigoya_sceneTex_00AD50 "__OTR__scenes/shared/miharigoya_scene/miharigoya_sceneTex_00AD50"
+static const ALIGN_ASSET(2) char miharigoya_sceneTex_00AD50[] = dmiharigoya_sceneTex_00AD50;
+
+#define dmiharigoya_sceneTex_00BD50 "__OTR__scenes/shared/miharigoya_scene/miharigoya_sceneTex_00BD50"
 static const ALIGN_ASSET(2) char miharigoya_sceneTex_00BD50[] = dmiharigoya_sceneTex_00BD50;
 
-#define dmiharigoya_sceneCollisionHeader_000B28 "__OTR__scenes/nonmq/miharigoya_scene/miharigoya_sceneCollisionHeader_000B28"
+#define dgGuardHouseOutSideView2NightTex "__OTR__scenes/shared/miharigoya_scene/gGuardHouseOutSideView2NightTex"
+static const ALIGN_ASSET(2) char gGuardHouseOutSideView2NightTex[] = dgGuardHouseOutSideView2NightTex;
+
+#define dgGuardHouseOutSideView2DayTex "__OTR__scenes/shared/miharigoya_scene/gGuardHouseOutSideView2DayTex"
+static const ALIGN_ASSET(2) char gGuardHouseOutSideView2DayTex[] = dgGuardHouseOutSideView2DayTex;
+
+#define dgGuardHouseOutSideView1NightTex "__OTR__scenes/shared/miharigoya_scene/gGuardHouseOutSideView1NightTex"
+static const ALIGN_ASSET(2) char gGuardHouseOutSideView1NightTex[] = dgGuardHouseOutSideView1NightTex;
+
+#define dgGuardHouseOutSideView1DayTex "__OTR__scenes/shared/miharigoya_scene/gGuardHouseOutSideView1DayTex"
+static const ALIGN_ASSET(2) char gGuardHouseOutSideView1DayTex[] = dgGuardHouseOutSideView1DayTex;
+
+#define dmiharigoya_sceneCollisionHeader_000B28 "__OTR__scenes/shared/miharigoya_scene/miharigoya_sceneCollisionHeader_000B28"
+static const ALIGN_ASSET(2) char miharigoya_sceneCollisionHeader_000B28[] = dmiharigoya_sceneCollisionHeader_000B28;
+
+#define dmiharigoya_sceneCollisionHeader_000B28 "__OTR__scenes/shared/miharigoya_scene/miharigoya_sceneCollisionHeader_000B28"
 
 
 #endif // INDOORS_MIHARIGOYA_SCENE_H
diff --git a/soh/assets/scenes/indoors/nakaniwa/nakaniwa_room_0.h b/soh/assets/scenes/indoors/nakaniwa/nakaniwa_room_0.h
index 7e371da85..6c4d6e38d 100644
--- a/soh/assets/scenes/indoors/nakaniwa/nakaniwa_room_0.h
+++ b/soh/assets/scenes/indoors/nakaniwa/nakaniwa_room_0.h
@@ -3,121 +3,121 @@
 
 #include "align_asset_macro.h"
 
-#define dnakaniwa_room_0DL_007178 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0DL_007178"
-static const ALIGN_ASSET(2) char nakaniwa_room_0DL_007178[] = dnakaniwa_room_0DL_007178;
-
-#define dnakaniwa_room_0Tex_012618 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_012618"
-static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_012618[] = dnakaniwa_room_0Tex_012618;
-
-#define dnakaniwa_room_0Tex_00F618 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_00F618"
-static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00F618[] = dnakaniwa_room_0Tex_00F618;
-
-#define dnakaniwa_room_0Tex_00CE18 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_00CE18"
-static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00CE18[] = dnakaniwa_room_0Tex_00CE18;
-
-#define dnakaniwa_room_0Tex_00C618 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_00C618"
-static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00C618[] = dnakaniwa_room_0Tex_00C618;
-
-#define dnakaniwa_room_0Tex_00FE18 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_00FE18"
-static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00FE18[] = dnakaniwa_room_0Tex_00FE18;
-
-#define dnakaniwa_room_0Tex_011E18 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_011E18"
-static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_011E18[] = dnakaniwa_room_0Tex_011E18;
-
-#define dnakaniwa_room_0Tex_010618 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_010618"
-static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_010618[] = dnakaniwa_room_0Tex_010618;
-
-#define dnakaniwa_room_0Tex_00EE18 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_00EE18"
-static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00EE18[] = dnakaniwa_room_0Tex_00EE18;
-
-#define dnakaniwa_room_0Tex_00DE18 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_00DE18"
-static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00DE18[] = dnakaniwa_room_0Tex_00DE18;
-
-#define dnakaniwa_room_0Tex_008418 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_008418"
-static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_008418[] = dnakaniwa_room_0Tex_008418;
-
-#define dnakaniwa_room_0Tex_008218 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_008218"
-static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_008218[] = dnakaniwa_room_0Tex_008218;
-
-#define dnakaniwa_room_0Tex_007618 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_007618"
-static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_007618[] = dnakaniwa_room_0Tex_007618;
-
-#define dnakaniwa_room_0Tex_007418 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_007418"
-static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_007418[] = dnakaniwa_room_0Tex_007418;
-
-#define dnakaniwa_room_0Tex_007218 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_007218"
+#define dnakaniwa_room_0Tex_007218 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_007218"
 static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_007218[] = dnakaniwa_room_0Tex_007218;
 
-#define dnakaniwa_room_0Tex_007A18 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_007A18"
-static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_007A18[] = dnakaniwa_room_0Tex_007A18;
+#define dnakaniwa_room_0Tex_007418 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_007418"
+static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_007418[] = dnakaniwa_room_0Tex_007418;
 
-#define dnakaniwa_room_0Tex_008618 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_008618"
-static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_008618[] = dnakaniwa_room_0Tex_008618;
+#define dnakaniwa_room_0Tex_007618 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_007618"
+static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_007618[] = dnakaniwa_room_0Tex_007618;
 
-#define dnakaniwa_room_0Tex_007818 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_007818"
+#define dnakaniwa_room_0Tex_007818 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_007818"
 static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_007818[] = dnakaniwa_room_0Tex_007818;
 
-#define dnakaniwa_room_0Tex_009E18 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_009E18"
-static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_009E18[] = dnakaniwa_room_0Tex_009E18;
+#define dnakaniwa_room_0Tex_007A18 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_007A18"
+static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_007A18[] = dnakaniwa_room_0Tex_007A18;
 
-#define dnakaniwa_room_0Tex_00E618 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_00E618"
-static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00E618[] = dnakaniwa_room_0Tex_00E618;
+#define dnakaniwa_room_0Tex_008218 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_008218"
+static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_008218[] = dnakaniwa_room_0Tex_008218;
 
-#define dnakaniwa_room_0Tex_013618 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_013618"
-static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_013618[] = dnakaniwa_room_0Tex_013618;
+#define dnakaniwa_room_0Tex_008418 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_008418"
+static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_008418[] = dnakaniwa_room_0Tex_008418;
 
-#define dnakaniwa_room_0Tex_011618 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_011618"
-static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_011618[] = dnakaniwa_room_0Tex_011618;
+#define dnakaniwa_room_0Tex_008618 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_008618"
+static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_008618[] = dnakaniwa_room_0Tex_008618;
 
-#define dnakaniwa_room_0Tex_013E18 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_013E18"
-static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_013E18[] = dnakaniwa_room_0Tex_013E18;
-
-#define dnakaniwa_room_0Tex_010E18 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_010E18"
-static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_010E18[] = dnakaniwa_room_0Tex_010E18;
-
-#define dnakaniwa_room_0Tex_012E18 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_012E18"
-static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_012E18[] = dnakaniwa_room_0Tex_012E18;
-
-#define dnakaniwa_room_0Tex_00B618 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_00B618"
-static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00B618[] = dnakaniwa_room_0Tex_00B618;
-
-#define dnakaniwa_room_0Tex_00A618 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_00A618"
-static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00A618[] = dnakaniwa_room_0Tex_00A618;
-
-#define dnakaniwa_room_0Tex_008E18 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_008E18"
+#define dnakaniwa_room_0Tex_008E18 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_008E18"
 static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_008E18[] = dnakaniwa_room_0Tex_008E18;
 
-#define dnakaniwa_room_0DL_014E98 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0DL_014E98"
-static const ALIGN_ASSET(2) char nakaniwa_room_0DL_014E98[] = dnakaniwa_room_0DL_014E98;
+#define dnakaniwa_room_0Tex_009E18 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_009E18"
+static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_009E18[] = dnakaniwa_room_0Tex_009E18;
 
-#define dnakaniwa_room_0Tex_0166C0 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_0166C0"
-static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_0166C0[] = dnakaniwa_room_0Tex_0166C0;
+#define dnakaniwa_room_0Tex_00A618 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_00A618"
+static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00A618[] = dnakaniwa_room_0Tex_00A618;
 
-#define dnakaniwa_room_0Tex_016EC0 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_016EC0"
-static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_016EC0[] = dnakaniwa_room_0Tex_016EC0;
+#define dnakaniwa_room_0Tex_00B618 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_00B618"
+static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00B618[] = dnakaniwa_room_0Tex_00B618;
 
-#define dnakaniwa_room_0Tex_0156C0 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_0156C0"
-static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_0156C0[] = dnakaniwa_room_0Tex_0156C0;
+#define dnakaniwa_room_0Tex_00C618 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_00C618"
+static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00C618[] = dnakaniwa_room_0Tex_00C618;
 
-#define dnakaniwa_room_0Tex_014EC0 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Tex_014EC0"
+#define dnakaniwa_room_0Tex_00CE18 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_00CE18"
+static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00CE18[] = dnakaniwa_room_0Tex_00CE18;
+
+#define dnakaniwa_room_0Tex_00DE18 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_00DE18"
+static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00DE18[] = dnakaniwa_room_0Tex_00DE18;
+
+#define dnakaniwa_room_0Tex_00E618 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_00E618"
+static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00E618[] = dnakaniwa_room_0Tex_00E618;
+
+#define dnakaniwa_room_0Tex_00EE18 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_00EE18"
+static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00EE18[] = dnakaniwa_room_0Tex_00EE18;
+
+#define dnakaniwa_room_0Tex_00F618 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_00F618"
+static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00F618[] = dnakaniwa_room_0Tex_00F618;
+
+#define dnakaniwa_room_0Tex_00FE18 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_00FE18"
+static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_00FE18[] = dnakaniwa_room_0Tex_00FE18;
+
+#define dnakaniwa_room_0Tex_010618 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_010618"
+static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_010618[] = dnakaniwa_room_0Tex_010618;
+
+#define dnakaniwa_room_0Tex_010E18 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_010E18"
+static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_010E18[] = dnakaniwa_room_0Tex_010E18;
+
+#define dnakaniwa_room_0Tex_011618 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_011618"
+static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_011618[] = dnakaniwa_room_0Tex_011618;
+
+#define dnakaniwa_room_0Tex_011E18 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_011E18"
+static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_011E18[] = dnakaniwa_room_0Tex_011E18;
+
+#define dnakaniwa_room_0Tex_012618 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_012618"
+static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_012618[] = dnakaniwa_room_0Tex_012618;
+
+#define dnakaniwa_room_0Tex_012E18 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_012E18"
+static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_012E18[] = dnakaniwa_room_0Tex_012E18;
+
+#define dnakaniwa_room_0Tex_013618 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_013618"
+static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_013618[] = dnakaniwa_room_0Tex_013618;
+
+#define dnakaniwa_room_0Tex_013E18 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_013E18"
+static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_013E18[] = dnakaniwa_room_0Tex_013E18;
+
+#define dnakaniwa_room_0Tex_014EC0 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_014EC0"
 static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_014EC0[] = dnakaniwa_room_0Tex_014EC0;
 
-#define dnakaniwa_room_0Set_000120DL_007178 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Set_000120DL_007178"
+#define dnakaniwa_room_0Tex_0156C0 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_0156C0"
+static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_0156C0[] = dnakaniwa_room_0Tex_0156C0;
+
+#define dnakaniwa_room_0Tex_0166C0 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_0166C0"
+static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_0166C0[] = dnakaniwa_room_0Tex_0166C0;
+
+#define dnakaniwa_room_0Tex_016EC0 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Tex_016EC0"
+static const ALIGN_ASSET(2) char nakaniwa_room_0Tex_016EC0[] = dnakaniwa_room_0Tex_016EC0;
+
+#define dnakaniwa_room_0DL_007178 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0DL_007178"
+static const ALIGN_ASSET(2) char nakaniwa_room_0DL_007178[] = dnakaniwa_room_0DL_007178;
+
+#define dnakaniwa_room_0DL_014E98 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0DL_014E98"
+static const ALIGN_ASSET(2) char nakaniwa_room_0DL_014E98[] = dnakaniwa_room_0DL_014E98;
+
+#define dnakaniwa_room_0Set_000120DL_007178 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Set_000120DL_007178"
 static const ALIGN_ASSET(2) char nakaniwa_room_0Set_000120DL_007178[] = dnakaniwa_room_0Set_000120DL_007178;
 
-#define dnakaniwa_room_0Set_000120DL_014E98 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Set_000120DL_014E98"
+#define dnakaniwa_room_0Set_000120DL_014E98 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Set_000120DL_014E98"
 static const ALIGN_ASSET(2) char nakaniwa_room_0Set_000120DL_014E98[] = dnakaniwa_room_0Set_000120DL_014E98;
 
-#define dnakaniwa_room_0Set_0001B0DL_007178 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Set_0001B0DL_007178"
+#define dnakaniwa_room_0Set_0001B0DL_007178 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Set_0001B0DL_007178"
 static const ALIGN_ASSET(2) char nakaniwa_room_0Set_0001B0DL_007178[] = dnakaniwa_room_0Set_0001B0DL_007178;
 
-#define dnakaniwa_room_0Set_0001B0DL_014E98 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Set_0001B0DL_014E98"
+#define dnakaniwa_room_0Set_0001B0DL_014E98 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Set_0001B0DL_014E98"
 static const ALIGN_ASSET(2) char nakaniwa_room_0Set_0001B0DL_014E98[] = dnakaniwa_room_0Set_0001B0DL_014E98;
 
-#define dnakaniwa_room_0Set_000240DL_007178 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Set_000240DL_007178"
+#define dnakaniwa_room_0Set_000240DL_007178 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Set_000240DL_007178"
 static const ALIGN_ASSET(2) char nakaniwa_room_0Set_000240DL_007178[] = dnakaniwa_room_0Set_000240DL_007178;
 
-#define dnakaniwa_room_0Set_000240DL_014E98 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_room_0Set_000240DL_014E98"
+#define dnakaniwa_room_0Set_000240DL_014E98 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_room_0Set_000240DL_014E98"
 static const ALIGN_ASSET(2) char nakaniwa_room_0Set_000240DL_014E98[] = dnakaniwa_room_0Set_000240DL_014E98;
 
 
diff --git a/soh/assets/scenes/indoors/nakaniwa/nakaniwa_scene.h b/soh/assets/scenes/indoors/nakaniwa/nakaniwa_scene.h
index c5884e2a6..2bb9ec106 100644
--- a/soh/assets/scenes/indoors/nakaniwa/nakaniwa_scene.h
+++ b/soh/assets/scenes/indoors/nakaniwa/nakaniwa_scene.h
@@ -3,26 +3,26 @@
 
 #include "align_asset_macro.h"
 
-#define dgZeldasCourtyardGanonCs "__OTR__scenes/nonmq/nakaniwa_scene/gZeldasCourtyardGanonCs"
+#define dgZeldasCourtyardGanonCs "__OTR__scenes/shared/nakaniwa_scene/gZeldasCourtyardGanonCs"
 static const ALIGN_ASSET(2) char gZeldasCourtyardGanonCs[] = dgZeldasCourtyardGanonCs;
 
-#define dgZeldasCourtyardWindowCs "__OTR__scenes/nonmq/nakaniwa_scene/gZeldasCourtyardWindowCs"
+#define dgZeldasCourtyardWindowCs "__OTR__scenes/shared/nakaniwa_scene/gZeldasCourtyardWindowCs"
 static const ALIGN_ASSET(2) char gZeldasCourtyardWindowCs[] = dgZeldasCourtyardWindowCs;
 
-#define dgZeldasCourtyardMeetCs "__OTR__scenes/nonmq/nakaniwa_scene/gZeldasCourtyardMeetCs"
+#define dgZeldasCourtyardMeetCs "__OTR__scenes/shared/nakaniwa_scene/gZeldasCourtyardMeetCs"
 static const ALIGN_ASSET(2) char gZeldasCourtyardMeetCs[] = dgZeldasCourtyardMeetCs;
 
-#define dgZeldasCourtyardLullabyCs "__OTR__scenes/nonmq/nakaniwa_scene/gZeldasCourtyardLullabyCs"
+#define dgZeldasCourtyardLullabyCs "__OTR__scenes/shared/nakaniwa_scene/gZeldasCourtyardLullabyCs"
 static const ALIGN_ASSET(2) char gZeldasCourtyardLullabyCs[] = dgZeldasCourtyardLullabyCs;
 
-#define dnakaniwa_sceneCollisionHeader_001BC8 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_sceneCollisionHeader_001BC8"
+#define dnakaniwa_sceneCollisionHeader_001BC8 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_sceneCollisionHeader_001BC8"
 static const ALIGN_ASSET(2) char nakaniwa_sceneCollisionHeader_001BC8[] = dnakaniwa_sceneCollisionHeader_001BC8;
 
-#define dnakaniwa_sceneCollisionHeader_001BC8 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_sceneCollisionHeader_001BC8"
+#define dnakaniwa_sceneCollisionHeader_001BC8 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_sceneCollisionHeader_001BC8"
 
-#define dnakaniwa_sceneCollisionHeader_001BC8 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_sceneCollisionHeader_001BC8"
+#define dnakaniwa_sceneCollisionHeader_001BC8 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_sceneCollisionHeader_001BC8"
 
-#define dnakaniwa_sceneCollisionHeader_001BC8 "__OTR__scenes/nonmq/nakaniwa_scene/nakaniwa_sceneCollisionHeader_001BC8"
+#define dnakaniwa_sceneCollisionHeader_001BC8 "__OTR__scenes/shared/nakaniwa_scene/nakaniwa_sceneCollisionHeader_001BC8"
 
 
 #endif // INDOORS_NAKANIWA_SCENE_H
diff --git a/soh/assets/scenes/indoors/syatekijyou/syatekijyou_room_0.h b/soh/assets/scenes/indoors/syatekijyou/syatekijyou_room_0.h
index 71a9cc181..b7cd4bbea 100644
--- a/soh/assets/scenes/indoors/syatekijyou/syatekijyou_room_0.h
+++ b/soh/assets/scenes/indoors/syatekijyou/syatekijyou_room_0.h
@@ -3,28 +3,28 @@
 
 #include "align_asset_macro.h"
 
-#define dsyatekijyou_room_0DL_006548 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_room_0DL_006548"
+#define dsyatekijyou_room_0DL_006548 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_room_0DL_006548"
 static const ALIGN_ASSET(2) char syatekijyou_room_0DL_006548[] = dsyatekijyou_room_0DL_006548;
 
-#define dsyatekijyou_room_0DL_0076D8 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_room_0DL_0076D8"
+#define dsyatekijyou_room_0DL_0076D8 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_room_0DL_0076D8"
 static const ALIGN_ASSET(2) char syatekijyou_room_0DL_0076D8[] = dsyatekijyou_room_0DL_0076D8;
 
-#define dsyatekijyou_room_0Set_0000C0DL_006548 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_room_0Set_0000C0DL_006548"
+#define dsyatekijyou_room_0Set_0000C0DL_006548 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_room_0Set_0000C0DL_006548"
 static const ALIGN_ASSET(2) char syatekijyou_room_0Set_0000C0DL_006548[] = dsyatekijyou_room_0Set_0000C0DL_006548;
 
-#define dsyatekijyou_room_0Set_0000C0DL_0076D8 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_room_0Set_0000C0DL_0076D8"
+#define dsyatekijyou_room_0Set_0000C0DL_0076D8 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_room_0Set_0000C0DL_0076D8"
 static const ALIGN_ASSET(2) char syatekijyou_room_0Set_0000C0DL_0076D8[] = dsyatekijyou_room_0Set_0000C0DL_0076D8;
 
-#define dsyatekijyou_room_0Set_0000F0DL_006548 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_room_0Set_0000F0DL_006548"
+#define dsyatekijyou_room_0Set_0000F0DL_006548 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_room_0Set_0000F0DL_006548"
 static const ALIGN_ASSET(2) char syatekijyou_room_0Set_0000F0DL_006548[] = dsyatekijyou_room_0Set_0000F0DL_006548;
 
-#define dsyatekijyou_room_0Set_0000F0DL_0076D8 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_room_0Set_0000F0DL_0076D8"
+#define dsyatekijyou_room_0Set_0000F0DL_0076D8 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_room_0Set_0000F0DL_0076D8"
 static const ALIGN_ASSET(2) char syatekijyou_room_0Set_0000F0DL_0076D8[] = dsyatekijyou_room_0Set_0000F0DL_0076D8;
 
-#define dsyatekijyou_room_0Set_0001A0DL_006548 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_room_0Set_0001A0DL_006548"
+#define dsyatekijyou_room_0Set_0001A0DL_006548 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_room_0Set_0001A0DL_006548"
 static const ALIGN_ASSET(2) char syatekijyou_room_0Set_0001A0DL_006548[] = dsyatekijyou_room_0Set_0001A0DL_006548;
 
-#define dsyatekijyou_room_0Set_0001A0DL_0076D8 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_room_0Set_0001A0DL_0076D8"
+#define dsyatekijyou_room_0Set_0001A0DL_0076D8 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_room_0Set_0001A0DL_0076D8"
 static const ALIGN_ASSET(2) char syatekijyou_room_0Set_0001A0DL_0076D8[] = dsyatekijyou_room_0Set_0001A0DL_0076D8;
 
 
diff --git a/soh/assets/scenes/indoors/syatekijyou/syatekijyou_scene.h b/soh/assets/scenes/indoors/syatekijyou/syatekijyou_scene.h
index 212daef49..1660bad47 100644
--- a/soh/assets/scenes/indoors/syatekijyou/syatekijyou_scene.h
+++ b/soh/assets/scenes/indoors/syatekijyou/syatekijyou_scene.h
@@ -3,80 +3,80 @@
 
 #include "align_asset_macro.h"
 
-#define dsyatekijyou_sceneCollisionHeader_001420 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneCollisionHeader_001420"
-static const ALIGN_ASSET(2) char syatekijyou_sceneCollisionHeader_001420[] = dsyatekijyou_sceneCollisionHeader_001420;
-
-#define dsyatekijyou_sceneTex_00A4C0 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_00A4C0"
-static const ALIGN_ASSET(2) char syatekijyou_sceneTex_00A4C0[] = dsyatekijyou_sceneTex_00A4C0;
-
-#define dsyatekijyou_sceneTex_002740 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_002740"
-static const ALIGN_ASSET(2) char syatekijyou_sceneTex_002740[] = dsyatekijyou_sceneTex_002740;
-
-#define dsyatekijyou_sceneTex_006CC0 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_006CC0"
-static const ALIGN_ASSET(2) char syatekijyou_sceneTex_006CC0[] = dsyatekijyou_sceneTex_006CC0;
-
-#define dsyatekijyou_sceneTex_00B2C0 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_00B2C0"
-static const ALIGN_ASSET(2) char syatekijyou_sceneTex_00B2C0[] = dsyatekijyou_sceneTex_00B2C0;
-
-#define dsyatekijyou_sceneTex_00B0C0 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_00B0C0"
-static const ALIGN_ASSET(2) char syatekijyou_sceneTex_00B0C0[] = dsyatekijyou_sceneTex_00B0C0;
-
-#define dsyatekijyou_sceneTex_0054C0 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_0054C0"
-static const ALIGN_ASSET(2) char syatekijyou_sceneTex_0054C0[] = dsyatekijyou_sceneTex_0054C0;
-
-#define dsyatekijyou_sceneTex_005CC0 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_005CC0"
-static const ALIGN_ASSET(2) char syatekijyou_sceneTex_005CC0[] = dsyatekijyou_sceneTex_005CC0;
-
-#define dsyatekijyou_sceneTex_0041C0 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_0041C0"
-static const ALIGN_ASSET(2) char syatekijyou_sceneTex_0041C0[] = dsyatekijyou_sceneTex_0041C0;
-
-#define dsyatekijyou_sceneTex_003DC0 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_003DC0"
-static const ALIGN_ASSET(2) char syatekijyou_sceneTex_003DC0[] = dsyatekijyou_sceneTex_003DC0;
-
-#define dsyatekijyou_sceneTex_001D40 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_001D40"
-static const ALIGN_ASSET(2) char syatekijyou_sceneTex_001D40[] = dsyatekijyou_sceneTex_001D40;
-
-#define dsyatekijyou_sceneTex_001C40 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_001C40"
+#define dsyatekijyou_sceneTex_001C40 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_001C40"
 static const ALIGN_ASSET(2) char syatekijyou_sceneTex_001C40[] = dsyatekijyou_sceneTex_001C40;
 
-#define dsyatekijyou_sceneTex_002140 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_002140"
+#define dsyatekijyou_sceneTex_001D40 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_001D40"
+static const ALIGN_ASSET(2) char syatekijyou_sceneTex_001D40[] = dsyatekijyou_sceneTex_001D40;
+
+#define dsyatekijyou_sceneTex_002140 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_002140"
 static const ALIGN_ASSET(2) char syatekijyou_sceneTex_002140[] = dsyatekijyou_sceneTex_002140;
 
-#define dsyatekijyou_sceneTex_003940 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_003940"
-static const ALIGN_ASSET(2) char syatekijyou_sceneTex_003940[] = dsyatekijyou_sceneTex_003940;
-
-#define dsyatekijyou_sceneTex_008CC0 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_008CC0"
-static const ALIGN_ASSET(2) char syatekijyou_sceneTex_008CC0[] = dsyatekijyou_sceneTex_008CC0;
-
-#define dsyatekijyou_sceneTex_007CC0 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_007CC0"
-static const ALIGN_ASSET(2) char syatekijyou_sceneTex_007CC0[] = dsyatekijyou_sceneTex_007CC0;
-
-#define dsyatekijyou_sceneTex_0051C0 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_0051C0"
-static const ALIGN_ASSET(2) char syatekijyou_sceneTex_0051C0[] = dsyatekijyou_sceneTex_0051C0;
-
-#define dsyatekijyou_sceneTex_0052C0 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_0052C0"
-static const ALIGN_ASSET(2) char syatekijyou_sceneTex_0052C0[] = dsyatekijyou_sceneTex_0052C0;
-
-#define dsyatekijyou_sceneTex_009CC0 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_009CC0"
-static const ALIGN_ASSET(2) char syatekijyou_sceneTex_009CC0[] = dsyatekijyou_sceneTex_009CC0;
-
-#define dsyatekijyou_sceneTex_002540 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_002540"
+#define dsyatekijyou_sceneTex_002540 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_002540"
 static const ALIGN_ASSET(2) char syatekijyou_sceneTex_002540[] = dsyatekijyou_sceneTex_002540;
 
-#define dsyatekijyou_sceneTex_0039C0 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_0039C0"
-static const ALIGN_ASSET(2) char syatekijyou_sceneTex_0039C0[] = dsyatekijyou_sceneTex_0039C0;
+#define dsyatekijyou_sceneTex_002740 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_002740"
+static const ALIGN_ASSET(2) char syatekijyou_sceneTex_002740[] = dsyatekijyou_sceneTex_002740;
 
-#define dsyatekijyou_sceneTex_00ACC0 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_00ACC0"
-static const ALIGN_ASSET(2) char syatekijyou_sceneTex_00ACC0[] = dsyatekijyou_sceneTex_00ACC0;
-
-#define dsyatekijyou_sceneTex_003740 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneTex_003740"
+#define dsyatekijyou_sceneTex_003740 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_003740"
 static const ALIGN_ASSET(2) char syatekijyou_sceneTex_003740[] = dsyatekijyou_sceneTex_003740;
 
-#define dsyatekijyou_sceneCollisionHeader_001420 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneCollisionHeader_001420"
+#define dsyatekijyou_sceneTex_003940 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_003940"
+static const ALIGN_ASSET(2) char syatekijyou_sceneTex_003940[] = dsyatekijyou_sceneTex_003940;
 
-#define dsyatekijyou_sceneCollisionHeader_001420 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneCollisionHeader_001420"
+#define dsyatekijyou_sceneTex_0039C0 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_0039C0"
+static const ALIGN_ASSET(2) char syatekijyou_sceneTex_0039C0[] = dsyatekijyou_sceneTex_0039C0;
 
-#define dsyatekijyou_sceneCollisionHeader_001420 "__OTR__scenes/nonmq/syatekijyou_scene/syatekijyou_sceneCollisionHeader_001420"
+#define dsyatekijyou_sceneTex_003DC0 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_003DC0"
+static const ALIGN_ASSET(2) char syatekijyou_sceneTex_003DC0[] = dsyatekijyou_sceneTex_003DC0;
+
+#define dsyatekijyou_sceneTex_0041C0 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_0041C0"
+static const ALIGN_ASSET(2) char syatekijyou_sceneTex_0041C0[] = dsyatekijyou_sceneTex_0041C0;
+
+#define dsyatekijyou_sceneTex_0051C0 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_0051C0"
+static const ALIGN_ASSET(2) char syatekijyou_sceneTex_0051C0[] = dsyatekijyou_sceneTex_0051C0;
+
+#define dsyatekijyou_sceneTex_0052C0 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_0052C0"
+static const ALIGN_ASSET(2) char syatekijyou_sceneTex_0052C0[] = dsyatekijyou_sceneTex_0052C0;
+
+#define dsyatekijyou_sceneTex_0054C0 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_0054C0"
+static const ALIGN_ASSET(2) char syatekijyou_sceneTex_0054C0[] = dsyatekijyou_sceneTex_0054C0;
+
+#define dsyatekijyou_sceneTex_005CC0 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_005CC0"
+static const ALIGN_ASSET(2) char syatekijyou_sceneTex_005CC0[] = dsyatekijyou_sceneTex_005CC0;
+
+#define dsyatekijyou_sceneTex_006CC0 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_006CC0"
+static const ALIGN_ASSET(2) char syatekijyou_sceneTex_006CC0[] = dsyatekijyou_sceneTex_006CC0;
+
+#define dsyatekijyou_sceneTex_007CC0 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_007CC0"
+static const ALIGN_ASSET(2) char syatekijyou_sceneTex_007CC0[] = dsyatekijyou_sceneTex_007CC0;
+
+#define dsyatekijyou_sceneTex_008CC0 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_008CC0"
+static const ALIGN_ASSET(2) char syatekijyou_sceneTex_008CC0[] = dsyatekijyou_sceneTex_008CC0;
+
+#define dsyatekijyou_sceneTex_009CC0 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_009CC0"
+static const ALIGN_ASSET(2) char syatekijyou_sceneTex_009CC0[] = dsyatekijyou_sceneTex_009CC0;
+
+#define dsyatekijyou_sceneTex_00A4C0 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_00A4C0"
+static const ALIGN_ASSET(2) char syatekijyou_sceneTex_00A4C0[] = dsyatekijyou_sceneTex_00A4C0;
+
+#define dsyatekijyou_sceneTex_00ACC0 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_00ACC0"
+static const ALIGN_ASSET(2) char syatekijyou_sceneTex_00ACC0[] = dsyatekijyou_sceneTex_00ACC0;
+
+#define dsyatekijyou_sceneTex_00B0C0 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_00B0C0"
+static const ALIGN_ASSET(2) char syatekijyou_sceneTex_00B0C0[] = dsyatekijyou_sceneTex_00B0C0;
+
+#define dsyatekijyou_sceneTex_00B2C0 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneTex_00B2C0"
+static const ALIGN_ASSET(2) char syatekijyou_sceneTex_00B2C0[] = dsyatekijyou_sceneTex_00B2C0;
+
+#define dsyatekijyou_sceneCollisionHeader_001420 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneCollisionHeader_001420"
+static const ALIGN_ASSET(2) char syatekijyou_sceneCollisionHeader_001420[] = dsyatekijyou_sceneCollisionHeader_001420;
+
+#define dsyatekijyou_sceneCollisionHeader_001420 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneCollisionHeader_001420"
+
+#define dsyatekijyou_sceneCollisionHeader_001420 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneCollisionHeader_001420"
+
+#define dsyatekijyou_sceneCollisionHeader_001420 "__OTR__scenes/shared/syatekijyou_scene/syatekijyou_sceneCollisionHeader_001420"
 
 
 #endif // INDOORS_SYATEKIJYOU_SCENE_H
diff --git a/soh/assets/scenes/indoors/takaraya/takaraya_room_0.h b/soh/assets/scenes/indoors/takaraya/takaraya_room_0.h
index 22aef3938..258e04cee 100644
--- a/soh/assets/scenes/indoors/takaraya/takaraya_room_0.h
+++ b/soh/assets/scenes/indoors/takaraya/takaraya_room_0.h
@@ -3,41 +3,41 @@
 
 #include "align_asset_macro.h"
 
-#define dtakaraya_room_0DL_003B98 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0DL_003B98"
-static const ALIGN_ASSET(2) char takaraya_room_0DL_003B98[] = dtakaraya_room_0DL_003B98;
-
-#define dtakaraya_room_0Tex_0083E0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_0083E0"
-static const ALIGN_ASSET(2) char takaraya_room_0Tex_0083E0[] = dtakaraya_room_0Tex_0083E0;
-
-#define dtakaraya_room_0Tex_005BE0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_005BE0"
-static const ALIGN_ASSET(2) char takaraya_room_0Tex_005BE0[] = dtakaraya_room_0Tex_005BE0;
-
-#define dtakaraya_room_0Tex_0073E0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_0073E0"
-static const ALIGN_ASSET(2) char takaraya_room_0Tex_0073E0[] = dtakaraya_room_0Tex_0073E0;
-
-#define dtakaraya_room_0Tex_006BE0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_006BE0"
-static const ALIGN_ASSET(2) char takaraya_room_0Tex_006BE0[] = dtakaraya_room_0Tex_006BE0;
-
-#define dtakaraya_room_0Tex_004BE0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_004BE0"
-static const ALIGN_ASSET(2) char takaraya_room_0Tex_004BE0[] = dtakaraya_room_0Tex_004BE0;
-
-#define dtakaraya_room_0Tex_0043E0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_0043E0"
-static const ALIGN_ASSET(2) char takaraya_room_0Tex_0043E0[] = dtakaraya_room_0Tex_0043E0;
-
-#define dtakaraya_room_0Tex_003BE0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_003BE0"
+#define dtakaraya_room_0Tex_003BE0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_003BE0"
 static const ALIGN_ASSET(2) char takaraya_room_0Tex_003BE0[] = dtakaraya_room_0Tex_003BE0;
 
-#define dtakaraya_room_0Tex_007BE0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_007BE0"
-static const ALIGN_ASSET(2) char takaraya_room_0Tex_007BE0[] = dtakaraya_room_0Tex_007BE0;
+#define dtakaraya_room_0Tex_0043E0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_0043E0"
+static const ALIGN_ASSET(2) char takaraya_room_0Tex_0043E0[] = dtakaraya_room_0Tex_0043E0;
 
-#define dtakaraya_room_0Tex_0063E0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_0063E0"
+#define dtakaraya_room_0Tex_004BE0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_004BE0"
+static const ALIGN_ASSET(2) char takaraya_room_0Tex_004BE0[] = dtakaraya_room_0Tex_004BE0;
+
+#define dtakaraya_room_0Tex_005BE0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_005BE0"
+static const ALIGN_ASSET(2) char takaraya_room_0Tex_005BE0[] = dtakaraya_room_0Tex_005BE0;
+
+#define dtakaraya_room_0Tex_0063E0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_0063E0"
 static const ALIGN_ASSET(2) char takaraya_room_0Tex_0063E0[] = dtakaraya_room_0Tex_0063E0;
 
-#define dtakaraya_room_0DL_0095B0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0DL_0095B0"
-static const ALIGN_ASSET(2) char takaraya_room_0DL_0095B0[] = dtakaraya_room_0DL_0095B0;
+#define dtakaraya_room_0Tex_006BE0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_006BE0"
+static const ALIGN_ASSET(2) char takaraya_room_0Tex_006BE0[] = dtakaraya_room_0Tex_006BE0;
 
-#define dtakaraya_room_0Tex_0095C0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_0Tex_0095C0"
+#define dtakaraya_room_0Tex_0073E0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_0073E0"
+static const ALIGN_ASSET(2) char takaraya_room_0Tex_0073E0[] = dtakaraya_room_0Tex_0073E0;
+
+#define dtakaraya_room_0Tex_007BE0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_007BE0"
+static const ALIGN_ASSET(2) char takaraya_room_0Tex_007BE0[] = dtakaraya_room_0Tex_007BE0;
+
+#define dtakaraya_room_0Tex_0083E0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_0083E0"
+static const ALIGN_ASSET(2) char takaraya_room_0Tex_0083E0[] = dtakaraya_room_0Tex_0083E0;
+
+#define dtakaraya_room_0Tex_0095C0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0Tex_0095C0"
 static const ALIGN_ASSET(2) char takaraya_room_0Tex_0095C0[] = dtakaraya_room_0Tex_0095C0;
 
+#define dtakaraya_room_0DL_003B98 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0DL_003B98"
+static const ALIGN_ASSET(2) char takaraya_room_0DL_003B98[] = dtakaraya_room_0DL_003B98;
+
+#define dtakaraya_room_0DL_0095B0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_0DL_0095B0"
+static const ALIGN_ASSET(2) char takaraya_room_0DL_0095B0[] = dtakaraya_room_0DL_0095B0;
+
 
 #endif // INDOORS_TAKARAYA_ROOM_0_H
diff --git a/soh/assets/scenes/indoors/takaraya/takaraya_room_1.h b/soh/assets/scenes/indoors/takaraya/takaraya_room_1.h
index b66f0c5eb..75ed6ac62 100644
--- a/soh/assets/scenes/indoors/takaraya/takaraya_room_1.h
+++ b/soh/assets/scenes/indoors/takaraya/takaraya_room_1.h
@@ -3,11 +3,11 @@
 
 #include "align_asset_macro.h"
 
-#define dtakaraya_room_1DL_0017D0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_1DL_0017D0"
-static const ALIGN_ASSET(2) char takaraya_room_1DL_0017D0[] = dtakaraya_room_1DL_0017D0;
-
-#define dtakaraya_room_1Tex_0017F8 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_1Tex_0017F8"
+#define dtakaraya_room_1Tex_0017F8 "__OTR__scenes/shared/takaraya_scene/takaraya_room_1Tex_0017F8"
 static const ALIGN_ASSET(2) char takaraya_room_1Tex_0017F8[] = dtakaraya_room_1Tex_0017F8;
 
+#define dtakaraya_room_1DL_0017D0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_1DL_0017D0"
+static const ALIGN_ASSET(2) char takaraya_room_1DL_0017D0[] = dtakaraya_room_1DL_0017D0;
+
 
 #endif // INDOORS_TAKARAYA_ROOM_1_H
diff --git a/soh/assets/scenes/indoors/takaraya/takaraya_room_2.h b/soh/assets/scenes/indoors/takaraya/takaraya_room_2.h
index 74f70e05b..8aae7695e 100644
--- a/soh/assets/scenes/indoors/takaraya/takaraya_room_2.h
+++ b/soh/assets/scenes/indoors/takaraya/takaraya_room_2.h
@@ -3,11 +3,11 @@
 
 #include "align_asset_macro.h"
 
-#define dtakaraya_room_2DL_001800 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_2DL_001800"
-static const ALIGN_ASSET(2) char takaraya_room_2DL_001800[] = dtakaraya_room_2DL_001800;
-
-#define dtakaraya_room_2Tex_001828 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_2Tex_001828"
+#define dtakaraya_room_2Tex_001828 "__OTR__scenes/shared/takaraya_scene/takaraya_room_2Tex_001828"
 static const ALIGN_ASSET(2) char takaraya_room_2Tex_001828[] = dtakaraya_room_2Tex_001828;
 
+#define dtakaraya_room_2DL_001800 "__OTR__scenes/shared/takaraya_scene/takaraya_room_2DL_001800"
+static const ALIGN_ASSET(2) char takaraya_room_2DL_001800[] = dtakaraya_room_2DL_001800;
+
 
 #endif // INDOORS_TAKARAYA_ROOM_2_H
diff --git a/soh/assets/scenes/indoors/takaraya/takaraya_room_3.h b/soh/assets/scenes/indoors/takaraya/takaraya_room_3.h
index edd0d0246..831ec4814 100644
--- a/soh/assets/scenes/indoors/takaraya/takaraya_room_3.h
+++ b/soh/assets/scenes/indoors/takaraya/takaraya_room_3.h
@@ -3,14 +3,14 @@
 
 #include "align_asset_macro.h"
 
-#define dtakaraya_room_3DL_0017F0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_3DL_0017F0"
-static const ALIGN_ASSET(2) char takaraya_room_3DL_0017F0[] = dtakaraya_room_3DL_0017F0;
+#define dtakaraya_room_3Tex_001818 "__OTR__scenes/shared/takaraya_scene/takaraya_room_3Tex_001818"
+static const ALIGN_ASSET(2) char takaraya_room_3Tex_001818[] = dtakaraya_room_3Tex_001818;
 
-#define dtakaraya_room_3Tex_002018 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_3Tex_002018"
+#define dtakaraya_room_3Tex_002018 "__OTR__scenes/shared/takaraya_scene/takaraya_room_3Tex_002018"
 static const ALIGN_ASSET(2) char takaraya_room_3Tex_002018[] = dtakaraya_room_3Tex_002018;
 
-#define dtakaraya_room_3Tex_001818 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_3Tex_001818"
-static const ALIGN_ASSET(2) char takaraya_room_3Tex_001818[] = dtakaraya_room_3Tex_001818;
+#define dtakaraya_room_3DL_0017F0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_3DL_0017F0"
+static const ALIGN_ASSET(2) char takaraya_room_3DL_0017F0[] = dtakaraya_room_3DL_0017F0;
 
 
 #endif // INDOORS_TAKARAYA_ROOM_3_H
diff --git a/soh/assets/scenes/indoors/takaraya/takaraya_room_4.h b/soh/assets/scenes/indoors/takaraya/takaraya_room_4.h
index 4052ba32b..2627da1e6 100644
--- a/soh/assets/scenes/indoors/takaraya/takaraya_room_4.h
+++ b/soh/assets/scenes/indoors/takaraya/takaraya_room_4.h
@@ -3,17 +3,17 @@
 
 #include "align_asset_macro.h"
 
-#define dtakaraya_room_4DL_0017F8 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_4DL_0017F8"
-static const ALIGN_ASSET(2) char takaraya_room_4DL_0017F8[] = dtakaraya_room_4DL_0017F8;
+#define dtakaraya_room_4Tex_001820 "__OTR__scenes/shared/takaraya_scene/takaraya_room_4Tex_001820"
+static const ALIGN_ASSET(2) char takaraya_room_4Tex_001820[] = dtakaraya_room_4Tex_001820;
 
-#define dtakaraya_room_4Tex_002020 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_4Tex_002020"
+#define dtakaraya_room_4Tex_002020 "__OTR__scenes/shared/takaraya_scene/takaraya_room_4Tex_002020"
 static const ALIGN_ASSET(2) char takaraya_room_4Tex_002020[] = dtakaraya_room_4Tex_002020;
 
-#define dtakaraya_room_4Tex_002820 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_4Tex_002820"
+#define dtakaraya_room_4Tex_002820 "__OTR__scenes/shared/takaraya_scene/takaraya_room_4Tex_002820"
 static const ALIGN_ASSET(2) char takaraya_room_4Tex_002820[] = dtakaraya_room_4Tex_002820;
 
-#define dtakaraya_room_4Tex_001820 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_4Tex_001820"
-static const ALIGN_ASSET(2) char takaraya_room_4Tex_001820[] = dtakaraya_room_4Tex_001820;
+#define dtakaraya_room_4DL_0017F8 "__OTR__scenes/shared/takaraya_scene/takaraya_room_4DL_0017F8"
+static const ALIGN_ASSET(2) char takaraya_room_4DL_0017F8[] = dtakaraya_room_4DL_0017F8;
 
 
 #endif // INDOORS_TAKARAYA_ROOM_4_H
diff --git a/soh/assets/scenes/indoors/takaraya/takaraya_room_5.h b/soh/assets/scenes/indoors/takaraya/takaraya_room_5.h
index 15edb2d8e..79fa4aa76 100644
--- a/soh/assets/scenes/indoors/takaraya/takaraya_room_5.h
+++ b/soh/assets/scenes/indoors/takaraya/takaraya_room_5.h
@@ -3,17 +3,17 @@
 
 #include "align_asset_macro.h"
 
-#define dtakaraya_room_5DL_0017D0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_5DL_0017D0"
-static const ALIGN_ASSET(2) char takaraya_room_5DL_0017D0[] = dtakaraya_room_5DL_0017D0;
-
-#define dtakaraya_room_5Tex_001FF8 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_5Tex_001FF8"
-static const ALIGN_ASSET(2) char takaraya_room_5Tex_001FF8[] = dtakaraya_room_5Tex_001FF8;
-
-#define dtakaraya_room_5Tex_0017F8 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_5Tex_0017F8"
+#define dtakaraya_room_5Tex_0017F8 "__OTR__scenes/shared/takaraya_scene/takaraya_room_5Tex_0017F8"
 static const ALIGN_ASSET(2) char takaraya_room_5Tex_0017F8[] = dtakaraya_room_5Tex_0017F8;
 
-#define dtakaraya_room_5Tex_0027F8 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_5Tex_0027F8"
+#define dtakaraya_room_5Tex_001FF8 "__OTR__scenes/shared/takaraya_scene/takaraya_room_5Tex_001FF8"
+static const ALIGN_ASSET(2) char takaraya_room_5Tex_001FF8[] = dtakaraya_room_5Tex_001FF8;
+
+#define dtakaraya_room_5Tex_0027F8 "__OTR__scenes/shared/takaraya_scene/takaraya_room_5Tex_0027F8"
 static const ALIGN_ASSET(2) char takaraya_room_5Tex_0027F8[] = dtakaraya_room_5Tex_0027F8;
 
+#define dtakaraya_room_5DL_0017D0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_5DL_0017D0"
+static const ALIGN_ASSET(2) char takaraya_room_5DL_0017D0[] = dtakaraya_room_5DL_0017D0;
+
 
 #endif // INDOORS_TAKARAYA_ROOM_5_H
diff --git a/soh/assets/scenes/indoors/takaraya/takaraya_room_6.h b/soh/assets/scenes/indoors/takaraya/takaraya_room_6.h
index c15d626e8..24e4115de 100644
--- a/soh/assets/scenes/indoors/takaraya/takaraya_room_6.h
+++ b/soh/assets/scenes/indoors/takaraya/takaraya_room_6.h
@@ -3,17 +3,17 @@
 
 #include "align_asset_macro.h"
 
-#define dtakaraya_room_6DL_0012D0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_6DL_0012D0"
-static const ALIGN_ASSET(2) char takaraya_room_6DL_0012D0[] = dtakaraya_room_6DL_0012D0;
-
-#define dtakaraya_room_6Tex_0022F8 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_6Tex_0022F8"
-static const ALIGN_ASSET(2) char takaraya_room_6Tex_0022F8[] = dtakaraya_room_6Tex_0022F8;
-
-#define dtakaraya_room_6Tex_0012F8 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_6Tex_0012F8"
+#define dtakaraya_room_6Tex_0012F8 "__OTR__scenes/shared/takaraya_scene/takaraya_room_6Tex_0012F8"
 static const ALIGN_ASSET(2) char takaraya_room_6Tex_0012F8[] = dtakaraya_room_6Tex_0012F8;
 
-#define dtakaraya_room_6Tex_001AF8 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_6Tex_001AF8"
+#define dtakaraya_room_6Tex_001AF8 "__OTR__scenes/shared/takaraya_scene/takaraya_room_6Tex_001AF8"
 static const ALIGN_ASSET(2) char takaraya_room_6Tex_001AF8[] = dtakaraya_room_6Tex_001AF8;
 
+#define dtakaraya_room_6Tex_0022F8 "__OTR__scenes/shared/takaraya_scene/takaraya_room_6Tex_0022F8"
+static const ALIGN_ASSET(2) char takaraya_room_6Tex_0022F8[] = dtakaraya_room_6Tex_0022F8;
+
+#define dtakaraya_room_6DL_0012D0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_6DL_0012D0"
+static const ALIGN_ASSET(2) char takaraya_room_6DL_0012D0[] = dtakaraya_room_6DL_0012D0;
+
 
 #endif // INDOORS_TAKARAYA_ROOM_6_H
diff --git a/soh/assets/scenes/indoors/takaraya/takaraya_scene.h b/soh/assets/scenes/indoors/takaraya/takaraya_scene.h
index 2296cf713..585aa720f 100644
--- a/soh/assets/scenes/indoors/takaraya/takaraya_scene.h
+++ b/soh/assets/scenes/indoors/takaraya/takaraya_scene.h
@@ -3,19 +3,20 @@
 
 #include "align_asset_macro.h"
 
-#define dtakaraya_sceneCollisionHeader_005178 "__OTR__scenes/nonmq/takaraya_scene/takaraya_sceneCollisionHeader_005178"
-static const ALIGN_ASSET(2) char takaraya_sceneCollisionHeader_005178[] = dtakaraya_sceneCollisionHeader_005178;
-
-#define dtakaraya_sceneTex_0059B0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_sceneTex_0059B0"
-static const ALIGN_ASSET(2) char takaraya_sceneTex_0059B0[] = dtakaraya_sceneTex_0059B0;
-
-#define dtakaraya_sceneTex_0051B0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_sceneTex_0051B0"
+#define dtakaraya_sceneTex_0051B0 "__OTR__scenes/shared/takaraya_scene/takaraya_sceneTex_0051B0"
 static const ALIGN_ASSET(2) char takaraya_sceneTex_0051B0[] = dtakaraya_sceneTex_0051B0;
 
-#define dtakaraya_sceneTex_0069B0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_sceneTex_0069B0"
-static const ALIGN_ASSET(2) char takaraya_sceneTex_0069B0[] = dtakaraya_sceneTex_0069B0;
+#define dtakaraya_sceneTex_0059B0 "__OTR__scenes/shared/takaraya_scene/takaraya_sceneTex_0059B0"
+static const ALIGN_ASSET(2) char takaraya_sceneTex_0059B0[] = dtakaraya_sceneTex_0059B0;
 
-#define dtakaraya_sceneTex_0061B0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_sceneTex_0061B0"
+#define dtakaraya_sceneTex_0061B0 "__OTR__scenes/shared/takaraya_scene/takaraya_sceneTex_0061B0"
 static const ALIGN_ASSET(2) char takaraya_sceneTex_0061B0[] = dtakaraya_sceneTex_0061B0;
 
+#define dtakaraya_sceneTex_0069B0 "__OTR__scenes/shared/takaraya_scene/takaraya_sceneTex_0069B0"
+static const ALIGN_ASSET(2) char takaraya_sceneTex_0069B0[] = dtakaraya_sceneTex_0069B0;
+
+#define dtakaraya_sceneCollisionHeader_005178 "__OTR__scenes/shared/takaraya_scene/takaraya_sceneCollisionHeader_005178"
+static const ALIGN_ASSET(2) char takaraya_sceneCollisionHeader_005178[] = dtakaraya_sceneCollisionHeader_005178;
+
+
 #endif // INDOORS_TAKARAYA_SCENE_H
diff --git a/soh/assets/scenes/indoors/tent/tent_room_0.h b/soh/assets/scenes/indoors/tent/tent_room_0.h
index 675c41a39..c361ca4ba 100644
--- a/soh/assets/scenes/indoors/tent/tent_room_0.h
+++ b/soh/assets/scenes/indoors/tent/tent_room_0.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dtent_room_0DL_00DE30 "__OTR__scenes/nonmq/tent_scene/tent_room_0DL_00DE30"
+#define dtent_room_0DL_00DE30 "__OTR__scenes/shared/tent_scene/tent_room_0DL_00DE30"
 static const ALIGN_ASSET(2) char tent_room_0DL_00DE30[] = dtent_room_0DL_00DE30;
 
 
diff --git a/soh/assets/scenes/indoors/tent/tent_scene.h b/soh/assets/scenes/indoors/tent/tent_scene.h
index 2a01636e4..fd0983180 100644
--- a/soh/assets/scenes/indoors/tent/tent_scene.h
+++ b/soh/assets/scenes/indoors/tent/tent_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dtent_sceneCollisionHeader_00064C "__OTR__scenes/nonmq/tent_scene/tent_sceneCollisionHeader_00064C"
+#define dtent_sceneCollisionHeader_00064C "__OTR__scenes/shared/tent_scene/tent_sceneCollisionHeader_00064C"
 static const ALIGN_ASSET(2) char tent_sceneCollisionHeader_00064C[] = dtent_sceneCollisionHeader_00064C;
 
 
diff --git a/soh/assets/scenes/indoors/tokinoma/tokinoma_room_0.h b/soh/assets/scenes/indoors/tokinoma/tokinoma_room_0.h
index d2ac5f07f..0545091c9 100644
--- a/soh/assets/scenes/indoors/tokinoma/tokinoma_room_0.h
+++ b/soh/assets/scenes/indoors/tokinoma/tokinoma_room_0.h
@@ -3,94 +3,94 @@
 
 #include "align_asset_macro.h"
 
-#define dtokinoma_room_0DL_008128 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0DL_008128"
-static const ALIGN_ASSET(2) char tokinoma_room_0DL_008128[] = dtokinoma_room_0DL_008128;
-
-#define dtokinoma_room_0Tex_0151D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_0151D8"
-static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0151D8[] = dtokinoma_room_0Tex_0151D8;
-
-#define dtokinoma_room_0Tex_0169D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_0169D8"
-static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0169D8[] = dtokinoma_room_0Tex_0169D8;
-
-#define dtokinoma_room_0Tex_0149D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_0149D8"
-static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0149D8[] = dtokinoma_room_0Tex_0149D8;
-
-#define dtokinoma_room_0Tex_0161D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_0161D8"
-static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0161D8[] = dtokinoma_room_0Tex_0161D8;
-
-#define dtokinoma_room_0Tex_0141D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_0141D8"
-static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0141D8[] = dtokinoma_room_0Tex_0141D8;
-
-#define dtokinoma_room_0Tex_0159D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_0159D8"
-static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0159D8[] = dtokinoma_room_0Tex_0159D8;
-
-#define dtokinoma_room_0Tex_0131D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_0131D8"
-static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0131D8[] = dtokinoma_room_0Tex_0131D8;
-
-#define dtokinoma_room_0Tex_0121D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_0121D8"
-static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0121D8[] = dtokinoma_room_0Tex_0121D8;
-
-#define dtokinoma_room_0Tex_0111D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_0111D8"
-static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0111D8[] = dtokinoma_room_0Tex_0111D8;
-
-#define dtokinoma_room_0Tex_0101D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_0101D8"
-static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0101D8[] = dtokinoma_room_0Tex_0101D8;
-
-#define dtokinoma_room_0Tex_00F1D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_00F1D8"
-static const ALIGN_ASSET(2) char tokinoma_room_0Tex_00F1D8[] = dtokinoma_room_0Tex_00F1D8;
-
-#define dtokinoma_room_0Tex_00E1D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_00E1D8"
-static const ALIGN_ASSET(2) char tokinoma_room_0Tex_00E1D8[] = dtokinoma_room_0Tex_00E1D8;
-
-#define dtokinoma_room_0Tex_00D1D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_00D1D8"
-static const ALIGN_ASSET(2) char tokinoma_room_0Tex_00D1D8[] = dtokinoma_room_0Tex_00D1D8;
-
-#define dtokinoma_room_0Tex_00C1D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_00C1D8"
-static const ALIGN_ASSET(2) char tokinoma_room_0Tex_00C1D8[] = dtokinoma_room_0Tex_00C1D8;
-
-#define dtokinoma_room_0Tex_00B1D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_00B1D8"
-static const ALIGN_ASSET(2) char tokinoma_room_0Tex_00B1D8[] = dtokinoma_room_0Tex_00B1D8;
-
-#define dtokinoma_room_0Tex_00A1D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_00A1D8"
-static const ALIGN_ASSET(2) char tokinoma_room_0Tex_00A1D8[] = dtokinoma_room_0Tex_00A1D8;
-
-#define dtokinoma_room_0Tex_0091D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_0091D8"
-static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0091D8[] = dtokinoma_room_0Tex_0091D8;
-
-#define dtokinoma_room_0Tex_0081D8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Tex_0081D8"
+#define dtokinoma_room_0Tex_0081D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_0081D8"
 static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0081D8[] = dtokinoma_room_0Tex_0081D8;
 
-#define dtokinoma_room_0Set_000120DL_008128 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Set_000120DL_008128"
+#define dtokinoma_room_0Tex_0091D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_0091D8"
+static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0091D8[] = dtokinoma_room_0Tex_0091D8;
+
+#define dtokinoma_room_0Tex_00A1D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_00A1D8"
+static const ALIGN_ASSET(2) char tokinoma_room_0Tex_00A1D8[] = dtokinoma_room_0Tex_00A1D8;
+
+#define dtokinoma_room_0Tex_00B1D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_00B1D8"
+static const ALIGN_ASSET(2) char tokinoma_room_0Tex_00B1D8[] = dtokinoma_room_0Tex_00B1D8;
+
+#define dtokinoma_room_0Tex_00C1D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_00C1D8"
+static const ALIGN_ASSET(2) char tokinoma_room_0Tex_00C1D8[] = dtokinoma_room_0Tex_00C1D8;
+
+#define dtokinoma_room_0Tex_00D1D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_00D1D8"
+static const ALIGN_ASSET(2) char tokinoma_room_0Tex_00D1D8[] = dtokinoma_room_0Tex_00D1D8;
+
+#define dtokinoma_room_0Tex_00E1D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_00E1D8"
+static const ALIGN_ASSET(2) char tokinoma_room_0Tex_00E1D8[] = dtokinoma_room_0Tex_00E1D8;
+
+#define dtokinoma_room_0Tex_00F1D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_00F1D8"
+static const ALIGN_ASSET(2) char tokinoma_room_0Tex_00F1D8[] = dtokinoma_room_0Tex_00F1D8;
+
+#define dtokinoma_room_0Tex_0101D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_0101D8"
+static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0101D8[] = dtokinoma_room_0Tex_0101D8;
+
+#define dtokinoma_room_0Tex_0111D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_0111D8"
+static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0111D8[] = dtokinoma_room_0Tex_0111D8;
+
+#define dtokinoma_room_0Tex_0121D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_0121D8"
+static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0121D8[] = dtokinoma_room_0Tex_0121D8;
+
+#define dtokinoma_room_0Tex_0131D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_0131D8"
+static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0131D8[] = dtokinoma_room_0Tex_0131D8;
+
+#define dtokinoma_room_0Tex_0141D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_0141D8"
+static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0141D8[] = dtokinoma_room_0Tex_0141D8;
+
+#define dtokinoma_room_0Tex_0149D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_0149D8"
+static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0149D8[] = dtokinoma_room_0Tex_0149D8;
+
+#define dtokinoma_room_0Tex_0151D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_0151D8"
+static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0151D8[] = dtokinoma_room_0Tex_0151D8;
+
+#define dtokinoma_room_0Tex_0159D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_0159D8"
+static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0159D8[] = dtokinoma_room_0Tex_0159D8;
+
+#define dtokinoma_room_0Tex_0161D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_0161D8"
+static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0161D8[] = dtokinoma_room_0Tex_0161D8;
+
+#define dtokinoma_room_0Tex_0169D8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Tex_0169D8"
+static const ALIGN_ASSET(2) char tokinoma_room_0Tex_0169D8[] = dtokinoma_room_0Tex_0169D8;
+
+#define dtokinoma_room_0DL_008128 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0DL_008128"
+static const ALIGN_ASSET(2) char tokinoma_room_0DL_008128[] = dtokinoma_room_0DL_008128;
+
+#define dtokinoma_room_0Set_000120DL_008128 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Set_000120DL_008128"
 static const ALIGN_ASSET(2) char tokinoma_room_0Set_000120DL_008128[] = dtokinoma_room_0Set_000120DL_008128;
 
-#define dtokinoma_room_0Set_0001E0DL_008128 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Set_0001E0DL_008128"
+#define dtokinoma_room_0Set_0001E0DL_008128 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Set_0001E0DL_008128"
 static const ALIGN_ASSET(2) char tokinoma_room_0Set_0001E0DL_008128[] = dtokinoma_room_0Set_0001E0DL_008128;
 
-#define dtokinoma_room_0Set_0002F0DL_008128 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Set_0002F0DL_008128"
+#define dtokinoma_room_0Set_0002F0DL_008128 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Set_0002F0DL_008128"
 static const ALIGN_ASSET(2) char tokinoma_room_0Set_0002F0DL_008128[] = dtokinoma_room_0Set_0002F0DL_008128;
 
-#define dtokinoma_room_0Set_0003B0DL_008128 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Set_0003B0DL_008128"
+#define dtokinoma_room_0Set_0003B0DL_008128 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Set_0003B0DL_008128"
 static const ALIGN_ASSET(2) char tokinoma_room_0Set_0003B0DL_008128[] = dtokinoma_room_0Set_0003B0DL_008128;
 
-#define dtokinoma_room_0Set_000430DL_008128 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Set_000430DL_008128"
+#define dtokinoma_room_0Set_000430DL_008128 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Set_000430DL_008128"
 static const ALIGN_ASSET(2) char tokinoma_room_0Set_000430DL_008128[] = dtokinoma_room_0Set_000430DL_008128;
 
-#define dtokinoma_room_0Set_0004B0DL_008128 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Set_0004B0DL_008128"
+#define dtokinoma_room_0Set_0004B0DL_008128 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Set_0004B0DL_008128"
 static const ALIGN_ASSET(2) char tokinoma_room_0Set_0004B0DL_008128[] = dtokinoma_room_0Set_0004B0DL_008128;
 
-#define dtokinoma_room_0Set_000530DL_008128 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Set_000530DL_008128"
+#define dtokinoma_room_0Set_000530DL_008128 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Set_000530DL_008128"
 static const ALIGN_ASSET(2) char tokinoma_room_0Set_000530DL_008128[] = dtokinoma_room_0Set_000530DL_008128;
 
-#define dtokinoma_room_0Set_0005B0DL_008128 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Set_0005B0DL_008128"
+#define dtokinoma_room_0Set_0005B0DL_008128 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Set_0005B0DL_008128"
 static const ALIGN_ASSET(2) char tokinoma_room_0Set_0005B0DL_008128[] = dtokinoma_room_0Set_0005B0DL_008128;
 
-#define dtokinoma_room_0Set_000610DL_008128 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Set_000610DL_008128"
+#define dtokinoma_room_0Set_000610DL_008128 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Set_000610DL_008128"
 static const ALIGN_ASSET(2) char tokinoma_room_0Set_000610DL_008128[] = dtokinoma_room_0Set_000610DL_008128;
 
-#define dtokinoma_room_0Set_000690DL_008128 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Set_000690DL_008128"
+#define dtokinoma_room_0Set_000690DL_008128 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Set_000690DL_008128"
 static const ALIGN_ASSET(2) char tokinoma_room_0Set_000690DL_008128[] = dtokinoma_room_0Set_000690DL_008128;
 
-#define dtokinoma_room_0Set_000270DL_008128 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_0Set_000270DL_008128"
+#define dtokinoma_room_0Set_000270DL_008128 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_0Set_000270DL_008128"
 static const ALIGN_ASSET(2) char tokinoma_room_0Set_000270DL_008128[] = dtokinoma_room_0Set_000270DL_008128;
 
 
diff --git a/soh/assets/scenes/indoors/tokinoma/tokinoma_room_1.h b/soh/assets/scenes/indoors/tokinoma/tokinoma_room_1.h
index 929172206..e443a293b 100644
--- a/soh/assets/scenes/indoors/tokinoma/tokinoma_room_1.h
+++ b/soh/assets/scenes/indoors/tokinoma/tokinoma_room_1.h
@@ -3,94 +3,94 @@
 
 #include "align_asset_macro.h"
 
-#define dtokinoma_room_1DL_0053E0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1DL_0053E0"
-static const ALIGN_ASSET(2) char tokinoma_room_1DL_0053E0[] = dtokinoma_room_1DL_0053E0;
-
-#define dtokinoma_room_1Tex_005858 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Tex_005858"
-static const ALIGN_ASSET(2) char tokinoma_room_1Tex_005858[] = dtokinoma_room_1Tex_005858;
-
-#define dtokinoma_room_1Tex_005658 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Tex_005658"
-static const ALIGN_ASSET(2) char tokinoma_room_1Tex_005658[] = dtokinoma_room_1Tex_005658;
-
-#define dtokinoma_room_1Tex_005458 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Tex_005458"
+#define dtokinoma_room_1Tex_005458 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Tex_005458"
 static const ALIGN_ASSET(2) char tokinoma_room_1Tex_005458[] = dtokinoma_room_1Tex_005458;
 
-#define dtokinoma_room_1DL_006470 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1DL_006470"
-static const ALIGN_ASSET(2) char tokinoma_room_1DL_006470[] = dtokinoma_room_1DL_006470;
+#define dtokinoma_room_1Tex_005658 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Tex_005658"
+static const ALIGN_ASSET(2) char tokinoma_room_1Tex_005658[] = dtokinoma_room_1Tex_005658;
 
-#define dtokinoma_room_1Tex_0068C8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Tex_0068C8"
-static const ALIGN_ASSET(2) char tokinoma_room_1Tex_0068C8[] = dtokinoma_room_1Tex_0068C8;
+#define dtokinoma_room_1Tex_005858 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Tex_005858"
+static const ALIGN_ASSET(2) char tokinoma_room_1Tex_005858[] = dtokinoma_room_1Tex_005858;
 
-#define dtokinoma_room_1Tex_0064C8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Tex_0064C8"
-static const ALIGN_ASSET(2) char tokinoma_room_1Tex_0064C8[] = dtokinoma_room_1Tex_0064C8;
-
-#define dtokinoma_room_1Tex_006488 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Tex_006488"
+#define dtokinoma_room_1Tex_006488 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Tex_006488"
 static const ALIGN_ASSET(2) char tokinoma_room_1Tex_006488[] = dtokinoma_room_1Tex_006488;
 
-#define dtokinoma_room_1Set_000150DL_0053E0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_000150DL_0053E0"
+#define dtokinoma_room_1Tex_0064C8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Tex_0064C8"
+static const ALIGN_ASSET(2) char tokinoma_room_1Tex_0064C8[] = dtokinoma_room_1Tex_0064C8;
+
+#define dtokinoma_room_1Tex_0068C8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Tex_0068C8"
+static const ALIGN_ASSET(2) char tokinoma_room_1Tex_0068C8[] = dtokinoma_room_1Tex_0068C8;
+
+#define dtokinoma_room_1DL_0053E0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1DL_0053E0"
+static const ALIGN_ASSET(2) char tokinoma_room_1DL_0053E0[] = dtokinoma_room_1DL_0053E0;
+
+#define dtokinoma_room_1DL_006470 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1DL_006470"
+static const ALIGN_ASSET(2) char tokinoma_room_1DL_006470[] = dtokinoma_room_1DL_006470;
+
+#define dtokinoma_room_1Set_000150DL_0053E0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_000150DL_0053E0"
 static const ALIGN_ASSET(2) char tokinoma_room_1Set_000150DL_0053E0[] = dtokinoma_room_1Set_000150DL_0053E0;
 
-#define dtokinoma_room_1Set_000150DL_006470 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_000150DL_006470"
+#define dtokinoma_room_1Set_000150DL_006470 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_000150DL_006470"
 static const ALIGN_ASSET(2) char tokinoma_room_1Set_000150DL_006470[] = dtokinoma_room_1Set_000150DL_006470;
 
-#define dtokinoma_room_1Set_000240DL_0053E0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_000240DL_0053E0"
+#define dtokinoma_room_1Set_000240DL_0053E0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_000240DL_0053E0"
 static const ALIGN_ASSET(2) char tokinoma_room_1Set_000240DL_0053E0[] = dtokinoma_room_1Set_000240DL_0053E0;
 
-#define dtokinoma_room_1Set_000240DL_006470 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_000240DL_006470"
+#define dtokinoma_room_1Set_000240DL_006470 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_000240DL_006470"
 static const ALIGN_ASSET(2) char tokinoma_room_1Set_000240DL_006470[] = dtokinoma_room_1Set_000240DL_006470;
 
-#define dtokinoma_room_1Set_000370DL_0053E0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_000370DL_0053E0"
+#define dtokinoma_room_1Set_000370DL_0053E0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_000370DL_0053E0"
 static const ALIGN_ASSET(2) char tokinoma_room_1Set_000370DL_0053E0[] = dtokinoma_room_1Set_000370DL_0053E0;
 
-#define dtokinoma_room_1Set_000370DL_006470 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_000370DL_006470"
+#define dtokinoma_room_1Set_000370DL_006470 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_000370DL_006470"
 static const ALIGN_ASSET(2) char tokinoma_room_1Set_000370DL_006470[] = dtokinoma_room_1Set_000370DL_006470;
 
-#define dtokinoma_room_1Set_000460DL_0053E0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_000460DL_0053E0"
+#define dtokinoma_room_1Set_000460DL_0053E0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_000460DL_0053E0"
 static const ALIGN_ASSET(2) char tokinoma_room_1Set_000460DL_0053E0[] = dtokinoma_room_1Set_000460DL_0053E0;
 
-#define dtokinoma_room_1Set_000460DL_006470 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_000460DL_006470"
+#define dtokinoma_room_1Set_000460DL_006470 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_000460DL_006470"
 static const ALIGN_ASSET(2) char tokinoma_room_1Set_000460DL_006470[] = dtokinoma_room_1Set_000460DL_006470;
 
-#define dtokinoma_room_1Set_000520DL_0053E0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_000520DL_0053E0"
+#define dtokinoma_room_1Set_000520DL_0053E0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_000520DL_0053E0"
 static const ALIGN_ASSET(2) char tokinoma_room_1Set_000520DL_0053E0[] = dtokinoma_room_1Set_000520DL_0053E0;
 
-#define dtokinoma_room_1Set_000520DL_006470 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_000520DL_006470"
+#define dtokinoma_room_1Set_000520DL_006470 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_000520DL_006470"
 static const ALIGN_ASSET(2) char tokinoma_room_1Set_000520DL_006470[] = dtokinoma_room_1Set_000520DL_006470;
 
-#define dtokinoma_room_1Set_0005D0DL_0053E0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_0005D0DL_0053E0"
+#define dtokinoma_room_1Set_0005D0DL_0053E0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_0005D0DL_0053E0"
 static const ALIGN_ASSET(2) char tokinoma_room_1Set_0005D0DL_0053E0[] = dtokinoma_room_1Set_0005D0DL_0053E0;
 
-#define dtokinoma_room_1Set_0005D0DL_006470 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_0005D0DL_006470"
+#define dtokinoma_room_1Set_0005D0DL_006470 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_0005D0DL_006470"
 static const ALIGN_ASSET(2) char tokinoma_room_1Set_0005D0DL_006470[] = dtokinoma_room_1Set_0005D0DL_006470;
 
-#define dtokinoma_room_1Set_000680DL_0053E0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_000680DL_0053E0"
+#define dtokinoma_room_1Set_000680DL_0053E0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_000680DL_0053E0"
 static const ALIGN_ASSET(2) char tokinoma_room_1Set_000680DL_0053E0[] = dtokinoma_room_1Set_000680DL_0053E0;
 
-#define dtokinoma_room_1Set_000680DL_006470 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_000680DL_006470"
+#define dtokinoma_room_1Set_000680DL_006470 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_000680DL_006470"
 static const ALIGN_ASSET(2) char tokinoma_room_1Set_000680DL_006470[] = dtokinoma_room_1Set_000680DL_006470;
 
-#define dtokinoma_room_1Set_000730DL_0053E0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_000730DL_0053E0"
+#define dtokinoma_room_1Set_000730DL_0053E0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_000730DL_0053E0"
 static const ALIGN_ASSET(2) char tokinoma_room_1Set_000730DL_0053E0[] = dtokinoma_room_1Set_000730DL_0053E0;
 
-#define dtokinoma_room_1Set_000730DL_006470 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_000730DL_006470"
+#define dtokinoma_room_1Set_000730DL_006470 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_000730DL_006470"
 static const ALIGN_ASSET(2) char tokinoma_room_1Set_000730DL_006470[] = dtokinoma_room_1Set_000730DL_006470;
 
-#define dtokinoma_room_1Set_0007F0DL_0053E0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_0007F0DL_0053E0"
+#define dtokinoma_room_1Set_0007F0DL_0053E0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_0007F0DL_0053E0"
 static const ALIGN_ASSET(2) char tokinoma_room_1Set_0007F0DL_0053E0[] = dtokinoma_room_1Set_0007F0DL_0053E0;
 
-#define dtokinoma_room_1Set_0007F0DL_006470 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_0007F0DL_006470"
+#define dtokinoma_room_1Set_0007F0DL_006470 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_0007F0DL_006470"
 static const ALIGN_ASSET(2) char tokinoma_room_1Set_0007F0DL_006470[] = dtokinoma_room_1Set_0007F0DL_006470;
 
-#define dtokinoma_room_1Set_000890DL_0053E0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_000890DL_0053E0"
+#define dtokinoma_room_1Set_000890DL_0053E0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_000890DL_0053E0"
 static const ALIGN_ASSET(2) char tokinoma_room_1Set_000890DL_0053E0[] = dtokinoma_room_1Set_000890DL_0053E0;
 
-#define dtokinoma_room_1Set_000890DL_006470 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_000890DL_006470"
+#define dtokinoma_room_1Set_000890DL_006470 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_000890DL_006470"
 static const ALIGN_ASSET(2) char tokinoma_room_1Set_000890DL_006470[] = dtokinoma_room_1Set_000890DL_006470;
 
-#define dtokinoma_room_1Set_0002B0DL_0053E0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_0002B0DL_0053E0"
+#define dtokinoma_room_1Set_0002B0DL_0053E0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_0002B0DL_0053E0"
 static const ALIGN_ASSET(2) char tokinoma_room_1Set_0002B0DL_0053E0[] = dtokinoma_room_1Set_0002B0DL_0053E0;
 
-#define dtokinoma_room_1Set_0002B0DL_006470 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_room_1Set_0002B0DL_006470"
+#define dtokinoma_room_1Set_0002B0DL_006470 "__OTR__scenes/shared/tokinoma_scene/tokinoma_room_1Set_0002B0DL_006470"
 static const ALIGN_ASSET(2) char tokinoma_room_1Set_0002B0DL_006470[] = dtokinoma_room_1Set_0002B0DL_006470;
 
 
diff --git a/soh/assets/scenes/indoors/tokinoma/tokinoma_scene.h b/soh/assets/scenes/indoors/tokinoma/tokinoma_scene.h
index 7408f61f9..e23537a01 100644
--- a/soh/assets/scenes/indoors/tokinoma/tokinoma_scene.h
+++ b/soh/assets/scenes/indoors/tokinoma/tokinoma_scene.h
@@ -3,66 +3,66 @@
 
 #include "align_asset_macro.h"
 
-#define dgTempleOfTimeFirstAdultCs "__OTR__scenes/nonmq/tokinoma_scene/gTempleOfTimeFirstAdultCs"
-static const ALIGN_ASSET(2) char gTempleOfTimeFirstAdultCs[] = dgTempleOfTimeFirstAdultCs;
-
-#define dgTempleOfTimePreludeCs "__OTR__scenes/nonmq/tokinoma_scene/gTempleOfTimePreludeCs"
-static const ALIGN_ASSET(2) char gTempleOfTimePreludeCs[] = dgTempleOfTimePreludeCs;
-
-#define dgTempleOfTimeIntroCs "__OTR__scenes/nonmq/tokinoma_scene/gTempleOfTimeIntroCs"
-static const ALIGN_ASSET(2) char gTempleOfTimeIntroCs[] = dgTempleOfTimeIntroCs;
-
-#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8"
-static const ALIGN_ASSET(2) char tokinoma_sceneCollisionHeader_0032F8[] = dtokinoma_sceneCollisionHeader_0032F8;
-
-#define dtokinoma_sceneTex_010FA0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneTex_010FA0"
-static const ALIGN_ASSET(2) char tokinoma_sceneTex_010FA0[] = dtokinoma_sceneTex_010FA0;
-
-#define dtokinoma_sceneTex_011FA0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneTex_011FA0"
-static const ALIGN_ASSET(2) char tokinoma_sceneTex_011FA0[] = dtokinoma_sceneTex_011FA0;
-
-#define dtokinoma_sceneTex_00DFA0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneTex_00DFA0"
-static const ALIGN_ASSET(2) char tokinoma_sceneTex_00DFA0[] = dtokinoma_sceneTex_00DFA0;
-
-#define dtokinoma_sceneTex_00EFA0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneTex_00EFA0"
-static const ALIGN_ASSET(2) char tokinoma_sceneTex_00EFA0[] = dtokinoma_sceneTex_00EFA0;
-
-#define dtokinoma_sceneTex_0107A0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneTex_0107A0"
-static const ALIGN_ASSET(2) char tokinoma_sceneTex_0107A0[] = dtokinoma_sceneTex_0107A0;
-
-#define dtokinoma_sceneTex_00FFA0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneTex_00FFA0"
-static const ALIGN_ASSET(2) char tokinoma_sceneTex_00FFA0[] = dtokinoma_sceneTex_00FFA0;
-
-#define dtokinoma_sceneTex_00D7A0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneTex_00D7A0"
-static const ALIGN_ASSET(2) char tokinoma_sceneTex_00D7A0[] = dtokinoma_sceneTex_00D7A0;
-
-#define dtokinoma_sceneTex_00CFA0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneTex_00CFA0"
+#define dtokinoma_sceneTex_00CFA0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneTex_00CFA0"
 static const ALIGN_ASSET(2) char tokinoma_sceneTex_00CFA0[] = dtokinoma_sceneTex_00CFA0;
 
-#define dtokinoma_sceneTex_0117A0 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneTex_0117A0"
+#define dtokinoma_sceneTex_00D7A0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneTex_00D7A0"
+static const ALIGN_ASSET(2) char tokinoma_sceneTex_00D7A0[] = dtokinoma_sceneTex_00D7A0;
+
+#define dtokinoma_sceneTex_00DFA0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneTex_00DFA0"
+static const ALIGN_ASSET(2) char tokinoma_sceneTex_00DFA0[] = dtokinoma_sceneTex_00DFA0;
+
+#define dtokinoma_sceneTex_00EFA0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneTex_00EFA0"
+static const ALIGN_ASSET(2) char tokinoma_sceneTex_00EFA0[] = dtokinoma_sceneTex_00EFA0;
+
+#define dtokinoma_sceneTex_00FFA0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneTex_00FFA0"
+static const ALIGN_ASSET(2) char tokinoma_sceneTex_00FFA0[] = dtokinoma_sceneTex_00FFA0;
+
+#define dtokinoma_sceneTex_0107A0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneTex_0107A0"
+static const ALIGN_ASSET(2) char tokinoma_sceneTex_0107A0[] = dtokinoma_sceneTex_0107A0;
+
+#define dtokinoma_sceneTex_010FA0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneTex_010FA0"
+static const ALIGN_ASSET(2) char tokinoma_sceneTex_010FA0[] = dtokinoma_sceneTex_010FA0;
+
+#define dtokinoma_sceneTex_0117A0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneTex_0117A0"
 static const ALIGN_ASSET(2) char tokinoma_sceneTex_0117A0[] = dtokinoma_sceneTex_0117A0;
 
-#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8"
+#define dtokinoma_sceneTex_011FA0 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneTex_011FA0"
+static const ALIGN_ASSET(2) char tokinoma_sceneTex_011FA0[] = dtokinoma_sceneTex_011FA0;
 
-#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8"
+#define dgTempleOfTimeFirstAdultCs "__OTR__scenes/shared/tokinoma_scene/gTempleOfTimeFirstAdultCs"
+static const ALIGN_ASSET(2) char gTempleOfTimeFirstAdultCs[] = dgTempleOfTimeFirstAdultCs;
 
-#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8"
+#define dgTempleOfTimePreludeCs "__OTR__scenes/shared/tokinoma_scene/gTempleOfTimePreludeCs"
+static const ALIGN_ASSET(2) char gTempleOfTimePreludeCs[] = dgTempleOfTimePreludeCs;
 
-#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8"
+#define dgTempleOfTimeIntroCs "__OTR__scenes/shared/tokinoma_scene/gTempleOfTimeIntroCs"
+static const ALIGN_ASSET(2) char gTempleOfTimeIntroCs[] = dgTempleOfTimeIntroCs;
 
-#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8"
+#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8"
+static const ALIGN_ASSET(2) char tokinoma_sceneCollisionHeader_0032F8[] = dtokinoma_sceneCollisionHeader_0032F8;
 
-#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8"
+#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8"
 
-#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8"
+#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8"
 
-#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8"
+#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8"
 
-#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8"
+#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8"
 
-#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8"
+#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8"
 
-#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/nonmq/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8"
+#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8"
+
+#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8"
+
+#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8"
+
+#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8"
+
+#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8"
+
+#define dtokinoma_sceneCollisionHeader_0032F8 "__OTR__scenes/shared/tokinoma_scene/tokinoma_sceneCollisionHeader_0032F8"
 
 
 #endif // INDOORS_TOKINOMA_SCENE_H
diff --git a/soh/assets/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_room_0.h b/soh/assets/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_room_0.h
index baa936861..266b01000 100644
--- a/soh/assets/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_room_0.h
+++ b/soh/assets/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_room_0.h
@@ -3,10 +3,10 @@
 
 #include "align_asset_macro.h"
 
-#define dyousei_izumi_tate_room_0DL_002C10 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_room_0DL_002C10"
+#define dyousei_izumi_tate_room_0DL_002C10 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_room_0DL_002C10"
 static const ALIGN_ASSET(2) char yousei_izumi_tate_room_0DL_002C10[] = dyousei_izumi_tate_room_0DL_002C10;
 
-#define dyousei_izumi_tate_room_0DL_003FB0 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_room_0DL_003FB0"
+#define dyousei_izumi_tate_room_0DL_003FB0 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_room_0DL_003FB0"
 static const ALIGN_ASSET(2) char yousei_izumi_tate_room_0DL_003FB0[] = dyousei_izumi_tate_room_0DL_003FB0;
 
 
diff --git a/soh/assets/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_scene.h b/soh/assets/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_scene.h
index 547f8d436..84a038312 100644
--- a/soh/assets/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_scene.h
+++ b/soh/assets/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_scene.h
@@ -3,37 +3,38 @@
 
 #include "align_asset_macro.h"
 
-#define dyousei_izumi_tate_sceneCollisionHeader_001FDC "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneCollisionHeader_001FDC"
-static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneCollisionHeader_001FDC[] = dyousei_izumi_tate_sceneCollisionHeader_001FDC;
-
-#define dyousei_izumi_tate_sceneTex_008010 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_008010"
-static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_008010[] = dyousei_izumi_tate_sceneTex_008010;
-
-#define dyousei_izumi_tate_sceneTex_005010 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_005010"
-static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_005010[] = dyousei_izumi_tate_sceneTex_005010;
-
-#define dyousei_izumi_tate_sceneTex_004810 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_004810"
-static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_004810[] = dyousei_izumi_tate_sceneTex_004810;
-
-#define dyousei_izumi_tate_sceneTex_006010 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_006010"
-static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_006010[] = dyousei_izumi_tate_sceneTex_006010;
-
-#define dyousei_izumi_tate_sceneTex_002810 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_002810"
-static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_002810[] = dyousei_izumi_tate_sceneTex_002810;
-
-#define dyousei_izumi_tate_sceneTex_005810 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_005810"
-static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_005810[] = dyousei_izumi_tate_sceneTex_005810;
-
-#define dyousei_izumi_tate_sceneTex_007810 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_007810"
-static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_007810[] = dyousei_izumi_tate_sceneTex_007810;
-
-#define dyousei_izumi_tate_sceneTex_007010 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_007010"
-static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_007010[] = dyousei_izumi_tate_sceneTex_007010;
-
-#define dyousei_izumi_tate_sceneTex_003810 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_003810"
-static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_003810[] = dyousei_izumi_tate_sceneTex_003810;
-
-#define dyousei_izumi_tate_sceneTex_002010 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_002010"
+#define dyousei_izumi_tate_sceneTex_002010 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_002010"
 static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_002010[] = dyousei_izumi_tate_sceneTex_002010;
 
+#define dyousei_izumi_tate_sceneTex_002810 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_002810"
+static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_002810[] = dyousei_izumi_tate_sceneTex_002810;
+
+#define dyousei_izumi_tate_sceneTex_003810 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_003810"
+static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_003810[] = dyousei_izumi_tate_sceneTex_003810;
+
+#define dyousei_izumi_tate_sceneTex_004810 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_004810"
+static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_004810[] = dyousei_izumi_tate_sceneTex_004810;
+
+#define dyousei_izumi_tate_sceneTex_005010 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_005010"
+static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_005010[] = dyousei_izumi_tate_sceneTex_005010;
+
+#define dyousei_izumi_tate_sceneTex_005810 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_005810"
+static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_005810[] = dyousei_izumi_tate_sceneTex_005810;
+
+#define dyousei_izumi_tate_sceneTex_006010 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_006010"
+static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_006010[] = dyousei_izumi_tate_sceneTex_006010;
+
+#define dyousei_izumi_tate_sceneTex_007010 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_007010"
+static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_007010[] = dyousei_izumi_tate_sceneTex_007010;
+
+#define dyousei_izumi_tate_sceneTex_007810 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_007810"
+static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_007810[] = dyousei_izumi_tate_sceneTex_007810;
+
+#define dyousei_izumi_tate_sceneTex_008010 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_008010"
+static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_008010[] = dyousei_izumi_tate_sceneTex_008010;
+
+#define dyousei_izumi_tate_sceneCollisionHeader_001FDC "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_sceneCollisionHeader_001FDC"
+static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneCollisionHeader_001FDC[] = dyousei_izumi_tate_sceneCollisionHeader_001FDC;
+
+
 #endif // INDOORS_YOUSEI_IZUMI_TATE_SCENE_H
diff --git a/soh/assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_room_0.h b/soh/assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_room_0.h
index 20d3a8a22..85f92f582 100644
--- a/soh/assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_room_0.h
+++ b/soh/assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_room_0.h
@@ -3,28 +3,28 @@
 
 #include "align_asset_macro.h"
 
-#define dyousei_izumi_yoko_room_0DL_002B88 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0DL_002B88"
+#define dyousei_izumi_yoko_room_0DL_002B88 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0DL_002B88"
 static const ALIGN_ASSET(2) char yousei_izumi_yoko_room_0DL_002B88[] = dyousei_izumi_yoko_room_0DL_002B88;
 
-#define dyousei_izumi_yoko_room_0DL_003FF8 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0DL_003FF8"
+#define dyousei_izumi_yoko_room_0DL_003FF8 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0DL_003FF8"
 static const ALIGN_ASSET(2) char yousei_izumi_yoko_room_0DL_003FF8[] = dyousei_izumi_yoko_room_0DL_003FF8;
 
-#define dyousei_izumi_yoko_room_0Set_0000D0DL_002B88 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_0000D0DL_002B88"
+#define dyousei_izumi_yoko_room_0Set_0000D0DL_002B88 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_0000D0DL_002B88"
 static const ALIGN_ASSET(2) char yousei_izumi_yoko_room_0Set_0000D0DL_002B88[] = dyousei_izumi_yoko_room_0Set_0000D0DL_002B88;
 
-#define dyousei_izumi_yoko_room_0Set_0000D0DL_003FF8 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_0000D0DL_003FF8"
+#define dyousei_izumi_yoko_room_0Set_0000D0DL_003FF8 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_0000D0DL_003FF8"
 static const ALIGN_ASSET(2) char yousei_izumi_yoko_room_0Set_0000D0DL_003FF8[] = dyousei_izumi_yoko_room_0Set_0000D0DL_003FF8;
 
-#define dyousei_izumi_yoko_room_0Set_000170DL_002B88 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_000170DL_002B88"
+#define dyousei_izumi_yoko_room_0Set_000170DL_002B88 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_000170DL_002B88"
 static const ALIGN_ASSET(2) char yousei_izumi_yoko_room_0Set_000170DL_002B88[] = dyousei_izumi_yoko_room_0Set_000170DL_002B88;
 
-#define dyousei_izumi_yoko_room_0Set_000170DL_003FF8 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_000170DL_003FF8"
+#define dyousei_izumi_yoko_room_0Set_000170DL_003FF8 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_000170DL_003FF8"
 static const ALIGN_ASSET(2) char yousei_izumi_yoko_room_0Set_000170DL_003FF8[] = dyousei_izumi_yoko_room_0Set_000170DL_003FF8;
 
-#define dyousei_izumi_yoko_room_0Set_000210DL_002B88 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_000210DL_002B88"
+#define dyousei_izumi_yoko_room_0Set_000210DL_002B88 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_000210DL_002B88"
 static const ALIGN_ASSET(2) char yousei_izumi_yoko_room_0Set_000210DL_002B88[] = dyousei_izumi_yoko_room_0Set_000210DL_002B88;
 
-#define dyousei_izumi_yoko_room_0Set_000210DL_003FF8 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_000210DL_003FF8"
+#define dyousei_izumi_yoko_room_0Set_000210DL_003FF8 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_room_0Set_000210DL_003FF8"
 static const ALIGN_ASSET(2) char yousei_izumi_yoko_room_0Set_000210DL_003FF8[] = dyousei_izumi_yoko_room_0Set_000210DL_003FF8;
 
 
diff --git a/soh/assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_scene.h b/soh/assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_scene.h
index f18210e14..528dae6b7 100644
--- a/soh/assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_scene.h
+++ b/soh/assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_scene.h
@@ -3,62 +3,62 @@
 
 #include "align_asset_macro.h"
 
-#define dgGreatFairyFaroresWindCs "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/gGreatFairyFaroresWindCs"
-static const ALIGN_ASSET(2) char gGreatFairyFaroresWindCs[] = dgGreatFairyFaroresWindCs;
-
-#define dgGreatFairyDinsFireCs "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/gGreatFairyDinsFireCs"
-static const ALIGN_ASSET(2) char gGreatFairyDinsFireCs[] = dgGreatFairyDinsFireCs;
-
-#define dgGreatFairyNayrusLoveCs "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/gGreatFairyNayrusLoveCs"
-static const ALIGN_ASSET(2) char gGreatFairyNayrusLoveCs[] = dgGreatFairyNayrusLoveCs;
-
-#define dyousei_izumi_yoko_sceneCollisionHeader_0039A8 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneCollisionHeader_0039A8"
-static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneCollisionHeader_0039A8[] = dyousei_izumi_yoko_sceneCollisionHeader_0039A8;
-
-#define dyousei_izumi_yoko_sceneTex_00C5A0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_00C5A0"
-static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_00C5A0[] = dyousei_izumi_yoko_sceneTex_00C5A0;
-
-#define dyousei_izumi_yoko_sceneTex_0085A0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0085A0"
-static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0085A0[] = dyousei_izumi_yoko_sceneTex_0085A0;
-
-#define dyousei_izumi_yoko_sceneTex_0075A0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0075A0"
-static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0075A0[] = dyousei_izumi_yoko_sceneTex_0075A0;
-
-#define dyousei_izumi_yoko_sceneTex_0065A0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0065A0"
-static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0065A0[] = dyousei_izumi_yoko_sceneTex_0065A0;
-
-#define dyousei_izumi_yoko_sceneTex_0045A0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0045A0"
-static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0045A0[] = dyousei_izumi_yoko_sceneTex_0045A0;
-
-#define dyousei_izumi_yoko_sceneTex_009DA0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_009DA0"
-static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_009DA0[] = dyousei_izumi_yoko_sceneTex_009DA0;
-
-#define dyousei_izumi_yoko_sceneTex_00BDA0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_00BDA0"
-static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_00BDA0[] = dyousei_izumi_yoko_sceneTex_00BDA0;
-
-#define dyousei_izumi_yoko_sceneTex_0095A0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0095A0"
-static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0095A0[] = dyousei_izumi_yoko_sceneTex_0095A0;
-
-#define dyousei_izumi_yoko_sceneTex_004DA0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_004DA0"
-static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_004DA0[] = dyousei_izumi_yoko_sceneTex_004DA0;
-
-#define dyousei_izumi_yoko_sceneTex_003DA0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_003DA0"
+#define dyousei_izumi_yoko_sceneTex_003DA0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_003DA0"
 static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_003DA0[] = dyousei_izumi_yoko_sceneTex_003DA0;
 
-#define dyousei_izumi_yoko_sceneTex_00ADA0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_00ADA0"
-static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_00ADA0[] = dyousei_izumi_yoko_sceneTex_00ADA0;
+#define dyousei_izumi_yoko_sceneTex_0045A0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0045A0"
+static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0045A0[] = dyousei_izumi_yoko_sceneTex_0045A0;
 
-#define dyousei_izumi_yoko_sceneTex_00B5A0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_00B5A0"
-static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_00B5A0[] = dyousei_izumi_yoko_sceneTex_00B5A0;
+#define dyousei_izumi_yoko_sceneTex_004DA0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_004DA0"
+static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_004DA0[] = dyousei_izumi_yoko_sceneTex_004DA0;
 
-#define dyousei_izumi_yoko_sceneTex_0055A0 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0055A0"
+#define dyousei_izumi_yoko_sceneTex_0055A0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0055A0"
 static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0055A0[] = dyousei_izumi_yoko_sceneTex_0055A0;
 
-#define dyousei_izumi_yoko_sceneCollisionHeader_0039A8 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneCollisionHeader_0039A8"
+#define dyousei_izumi_yoko_sceneTex_0065A0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0065A0"
+static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0065A0[] = dyousei_izumi_yoko_sceneTex_0065A0;
 
-#define dyousei_izumi_yoko_sceneCollisionHeader_0039A8 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneCollisionHeader_0039A8"
+#define dyousei_izumi_yoko_sceneTex_0075A0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0075A0"
+static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0075A0[] = dyousei_izumi_yoko_sceneTex_0075A0;
 
-#define dyousei_izumi_yoko_sceneCollisionHeader_0039A8 "__OTR__scenes/nonmq/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneCollisionHeader_0039A8"
+#define dyousei_izumi_yoko_sceneTex_0085A0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0085A0"
+static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0085A0[] = dyousei_izumi_yoko_sceneTex_0085A0;
+
+#define dyousei_izumi_yoko_sceneTex_0095A0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_0095A0"
+static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_0095A0[] = dyousei_izumi_yoko_sceneTex_0095A0;
+
+#define dyousei_izumi_yoko_sceneTex_009DA0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_009DA0"
+static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_009DA0[] = dyousei_izumi_yoko_sceneTex_009DA0;
+
+#define dyousei_izumi_yoko_sceneTex_00ADA0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_00ADA0"
+static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_00ADA0[] = dyousei_izumi_yoko_sceneTex_00ADA0;
+
+#define dyousei_izumi_yoko_sceneTex_00B5A0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_00B5A0"
+static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_00B5A0[] = dyousei_izumi_yoko_sceneTex_00B5A0;
+
+#define dyousei_izumi_yoko_sceneTex_00BDA0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_00BDA0"
+static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_00BDA0[] = dyousei_izumi_yoko_sceneTex_00BDA0;
+
+#define dyousei_izumi_yoko_sceneTex_00C5A0 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneTex_00C5A0"
+static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneTex_00C5A0[] = dyousei_izumi_yoko_sceneTex_00C5A0;
+
+#define dgGreatFairyFaroresWindCs "__OTR__scenes/shared/yousei_izumi_yoko_scene/gGreatFairyFaroresWindCs"
+static const ALIGN_ASSET(2) char gGreatFairyFaroresWindCs[] = dgGreatFairyFaroresWindCs;
+
+#define dgGreatFairyDinsFireCs "__OTR__scenes/shared/yousei_izumi_yoko_scene/gGreatFairyDinsFireCs"
+static const ALIGN_ASSET(2) char gGreatFairyDinsFireCs[] = dgGreatFairyDinsFireCs;
+
+#define dgGreatFairyNayrusLoveCs "__OTR__scenes/shared/yousei_izumi_yoko_scene/gGreatFairyNayrusLoveCs"
+static const ALIGN_ASSET(2) char gGreatFairyNayrusLoveCs[] = dgGreatFairyNayrusLoveCs;
+
+#define dyousei_izumi_yoko_sceneCollisionHeader_0039A8 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneCollisionHeader_0039A8"
+static const ALIGN_ASSET(2) char yousei_izumi_yoko_sceneCollisionHeader_0039A8[] = dyousei_izumi_yoko_sceneCollisionHeader_0039A8;
+
+#define dyousei_izumi_yoko_sceneCollisionHeader_0039A8 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneCollisionHeader_0039A8"
+
+#define dyousei_izumi_yoko_sceneCollisionHeader_0039A8 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneCollisionHeader_0039A8"
+
+#define dyousei_izumi_yoko_sceneCollisionHeader_0039A8 "__OTR__scenes/shared/yousei_izumi_yoko_scene/yousei_izumi_yoko_sceneCollisionHeader_0039A8"
 
 
 #endif // INDOORS_YOUSEI_IZUMI_YOKO_SCENE_H
diff --git a/soh/assets/scenes/misc/enrui/enrui_room_0.h b/soh/assets/scenes/misc/enrui/enrui_room_0.h
index b34bbecaa..f12a2143f 100644
--- a/soh/assets/scenes/misc/enrui/enrui_room_0.h
+++ b/soh/assets/scenes/misc/enrui/enrui_room_0.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define denrui_room_0DL_000338 "__OTR__scenes/nonmq/enrui_scene/enrui_room_0DL_000338"
+#define denrui_room_0DL_000338 "__OTR__scenes/shared/enrui_scene/enrui_room_0DL_000338"
 static const ALIGN_ASSET(2) char enrui_room_0DL_000338[] = denrui_room_0DL_000338;
 
 
diff --git a/soh/assets/scenes/misc/enrui/enrui_scene.h b/soh/assets/scenes/misc/enrui/enrui_scene.h
index ed6ac652f..4146c34bb 100644
--- a/soh/assets/scenes/misc/enrui/enrui_scene.h
+++ b/soh/assets/scenes/misc/enrui/enrui_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define denrui_sceneCollisionHeader_0003B4 "__OTR__scenes/nonmq/enrui_scene/enrui_sceneCollisionHeader_0003B4"
+#define denrui_sceneCollisionHeader_0003B4 "__OTR__scenes/shared/enrui_scene/enrui_sceneCollisionHeader_0003B4"
 static const ALIGN_ASSET(2) char enrui_sceneCollisionHeader_0003B4[] = denrui_sceneCollisionHeader_0003B4;
 
 
diff --git a/soh/assets/scenes/misc/entra_n/entra_n_room_0.h b/soh/assets/scenes/misc/entra_n/entra_n_room_0.h
index 8646b3cd9..1e69fcdde 100644
--- a/soh/assets/scenes/misc/entra_n/entra_n_room_0.h
+++ b/soh/assets/scenes/misc/entra_n/entra_n_room_0.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dentra_n_room_0DL_000348 "__OTR__scenes/nonmq/entra_n_scene/entra_n_room_0DL_000348"
+#define dentra_n_room_0DL_000348 "__OTR__scenes/shared/entra_n_scene/entra_n_room_0DL_000348"
 static const ALIGN_ASSET(2) char entra_n_room_0DL_000348[] = dentra_n_room_0DL_000348;
 
 
diff --git a/soh/assets/scenes/misc/entra_n/entra_n_scene.h b/soh/assets/scenes/misc/entra_n/entra_n_scene.h
index 611784121..594e5e5eb 100644
--- a/soh/assets/scenes/misc/entra_n/entra_n_scene.h
+++ b/soh/assets/scenes/misc/entra_n/entra_n_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dentra_n_sceneCollisionHeader_0003F8 "__OTR__scenes/nonmq/entra_n_scene/entra_n_sceneCollisionHeader_0003F8"
+#define dentra_n_sceneCollisionHeader_0003F8 "__OTR__scenes/shared/entra_n_scene/entra_n_sceneCollisionHeader_0003F8"
 static const ALIGN_ASSET(2) char entra_n_sceneCollisionHeader_0003F8[] = dentra_n_sceneCollisionHeader_0003F8;
 
 
diff --git a/soh/assets/scenes/misc/hakaana/hakaana_room_0.h b/soh/assets/scenes/misc/hakaana/hakaana_room_0.h
index 8dcb6c1a8..252e3f8a7 100644
--- a/soh/assets/scenes/misc/hakaana/hakaana_room_0.h
+++ b/soh/assets/scenes/misc/hakaana/hakaana_room_0.h
@@ -3,41 +3,41 @@
 
 #include "align_asset_macro.h"
 
-#define dhakaana_room_0DL_002620 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0DL_002620"
-static const ALIGN_ASSET(2) char hakaana_room_0DL_002620[] = dhakaana_room_0DL_002620;
-
-#define dhakaana_room_0Tex_005E58 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0Tex_005E58"
-static const ALIGN_ASSET(2) char hakaana_room_0Tex_005E58[] = dhakaana_room_0Tex_005E58;
-
-#define dhakaana_room_0Tex_002658 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0Tex_002658"
+#define dhakaana_room_0Tex_002658 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0Tex_002658"
 static const ALIGN_ASSET(2) char hakaana_room_0Tex_002658[] = dhakaana_room_0Tex_002658;
 
-#define dhakaana_room_0Tex_005658 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0Tex_005658"
-static const ALIGN_ASSET(2) char hakaana_room_0Tex_005658[] = dhakaana_room_0Tex_005658;
-
-#define dhakaana_room_0Tex_003E58 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0Tex_003E58"
-static const ALIGN_ASSET(2) char hakaana_room_0Tex_003E58[] = dhakaana_room_0Tex_003E58;
-
-#define dhakaana_room_0Tex_004E58 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0Tex_004E58"
-static const ALIGN_ASSET(2) char hakaana_room_0Tex_004E58[] = dhakaana_room_0Tex_004E58;
-
-#define dhakaana_room_0Tex_004658 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0Tex_004658"
-static const ALIGN_ASSET(2) char hakaana_room_0Tex_004658[] = dhakaana_room_0Tex_004658;
-
-#define dhakaana_room_0Tex_002E58 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0Tex_002E58"
+#define dhakaana_room_0Tex_002E58 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0Tex_002E58"
 static const ALIGN_ASSET(2) char hakaana_room_0Tex_002E58[] = dhakaana_room_0Tex_002E58;
 
-#define dhakaana_room_0Tex_003658 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0Tex_003658"
-static const ALIGN_ASSET(2) char hakaana_room_0Tex_003658[] = dhakaana_room_0Tex_003658;
-
-#define dhakaana_room_0Tex_003258 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0Tex_003258"
+#define dhakaana_room_0Tex_003258 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0Tex_003258"
 static const ALIGN_ASSET(2) char hakaana_room_0Tex_003258[] = dhakaana_room_0Tex_003258;
 
-#define dhakaana_room_0DL_0068B8 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0DL_0068B8"
-static const ALIGN_ASSET(2) char hakaana_room_0DL_0068B8[] = dhakaana_room_0DL_0068B8;
+#define dhakaana_room_0Tex_003658 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0Tex_003658"
+static const ALIGN_ASSET(2) char hakaana_room_0Tex_003658[] = dhakaana_room_0Tex_003658;
 
-#define dhakaana_room_0Tex_0068C8 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0Tex_0068C8"
+#define dhakaana_room_0Tex_003E58 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0Tex_003E58"
+static const ALIGN_ASSET(2) char hakaana_room_0Tex_003E58[] = dhakaana_room_0Tex_003E58;
+
+#define dhakaana_room_0Tex_004658 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0Tex_004658"
+static const ALIGN_ASSET(2) char hakaana_room_0Tex_004658[] = dhakaana_room_0Tex_004658;
+
+#define dhakaana_room_0Tex_004E58 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0Tex_004E58"
+static const ALIGN_ASSET(2) char hakaana_room_0Tex_004E58[] = dhakaana_room_0Tex_004E58;
+
+#define dhakaana_room_0Tex_005658 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0Tex_005658"
+static const ALIGN_ASSET(2) char hakaana_room_0Tex_005658[] = dhakaana_room_0Tex_005658;
+
+#define dhakaana_room_0Tex_005E58 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0Tex_005E58"
+static const ALIGN_ASSET(2) char hakaana_room_0Tex_005E58[] = dhakaana_room_0Tex_005E58;
+
+#define dhakaana_room_0Tex_0068C8 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0Tex_0068C8"
 static const ALIGN_ASSET(2) char hakaana_room_0Tex_0068C8[] = dhakaana_room_0Tex_0068C8;
 
+#define dhakaana_room_0DL_002620 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0DL_002620"
+static const ALIGN_ASSET(2) char hakaana_room_0DL_002620[] = dhakaana_room_0DL_002620;
+
+#define dhakaana_room_0DL_0068B8 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0DL_0068B8"
+static const ALIGN_ASSET(2) char hakaana_room_0DL_0068B8[] = dhakaana_room_0DL_0068B8;
+
 
 #endif // MISC_HAKAANA_ROOM_0_H
diff --git a/soh/assets/scenes/misc/hakaana/hakaana_scene.h b/soh/assets/scenes/misc/hakaana/hakaana_scene.h
index 3bd09805b..01348d8f2 100644
--- a/soh/assets/scenes/misc/hakaana/hakaana_scene.h
+++ b/soh/assets/scenes/misc/hakaana/hakaana_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dhakaana_sceneCollisionHeader_000A60 "__OTR__scenes/nonmq/hakaana_scene/hakaana_sceneCollisionHeader_000A60"
+#define dhakaana_sceneCollisionHeader_000A60 "__OTR__scenes/shared/hakaana_scene/hakaana_sceneCollisionHeader_000A60"
 static const ALIGN_ASSET(2) char hakaana_sceneCollisionHeader_000A60[] = dhakaana_sceneCollisionHeader_000A60;
 
 
diff --git a/soh/assets/scenes/misc/hakaana2/hakaana2_room_0.h b/soh/assets/scenes/misc/hakaana2/hakaana2_room_0.h
index ad9347b0f..991f00c52 100644
--- a/soh/assets/scenes/misc/hakaana2/hakaana2_room_0.h
+++ b/soh/assets/scenes/misc/hakaana2/hakaana2_room_0.h
@@ -3,10 +3,10 @@
 
 #include "align_asset_macro.h"
 
-#define dhakaana2_room_0DL_005DD8 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_room_0DL_005DD8"
+#define dhakaana2_room_0DL_005DD8 "__OTR__scenes/shared/hakaana2_scene/hakaana2_room_0DL_005DD8"
 static const ALIGN_ASSET(2) char hakaana2_room_0DL_005DD8[] = dhakaana2_room_0DL_005DD8;
 
-#define dhakaana2_room_0DL_0067F8 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_room_0DL_0067F8"
+#define dhakaana2_room_0DL_0067F8 "__OTR__scenes/shared/hakaana2_scene/hakaana2_room_0DL_0067F8"
 static const ALIGN_ASSET(2) char hakaana2_room_0DL_0067F8[] = dhakaana2_room_0DL_0067F8;
 
 
diff --git a/soh/assets/scenes/misc/hakaana2/hakaana2_scene.h b/soh/assets/scenes/misc/hakaana2/hakaana2_scene.h
index 8edaef403..25fae993e 100644
--- a/soh/assets/scenes/misc/hakaana2/hakaana2_scene.h
+++ b/soh/assets/scenes/misc/hakaana2/hakaana2_scene.h
@@ -3,61 +3,62 @@
 
 #include "align_asset_macro.h"
 
-#define dhakaana2_sceneCollisionHeader_003058 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneCollisionHeader_003058"
-static const ALIGN_ASSET(2) char hakaana2_sceneCollisionHeader_003058[] = dhakaana2_sceneCollisionHeader_003058;
-
-#define dhakaana2_sceneTex_00A890 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_00A890"
-static const ALIGN_ASSET(2) char hakaana2_sceneTex_00A890[] = dhakaana2_sceneTex_00A890;
-
-#define dhakaana2_sceneTex_00C890 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_00C890"
-static const ALIGN_ASSET(2) char hakaana2_sceneTex_00C890[] = dhakaana2_sceneTex_00C890;
-
-#define dhakaana2_sceneTex_009890 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_009890"
-static const ALIGN_ASSET(2) char hakaana2_sceneTex_009890[] = dhakaana2_sceneTex_009890;
-
-#define dhakaana2_sceneTex_007090 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_007090"
-static const ALIGN_ASSET(2) char hakaana2_sceneTex_007090[] = dhakaana2_sceneTex_007090;
-
-#define dhakaana2_sceneTex_00A090 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_00A090"
-static const ALIGN_ASSET(2) char hakaana2_sceneTex_00A090[] = dhakaana2_sceneTex_00A090;
-
-#define dhakaana2_sceneTex_009090 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_009090"
-static const ALIGN_ASSET(2) char hakaana2_sceneTex_009090[] = dhakaana2_sceneTex_009090;
-
-#define dhakaana2_sceneTex_00C090 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_00C090"
-static const ALIGN_ASSET(2) char hakaana2_sceneTex_00C090[] = dhakaana2_sceneTex_00C090;
-
-#define dhakaana2_sceneTex_005890 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_005890"
-static const ALIGN_ASSET(2) char hakaana2_sceneTex_005890[] = dhakaana2_sceneTex_005890;
-
-#define dhakaana2_sceneTex_004890 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_004890"
-static const ALIGN_ASSET(2) char hakaana2_sceneTex_004890[] = dhakaana2_sceneTex_004890;
-
-#define dhakaana2_sceneTex_006090 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_006090"
-static const ALIGN_ASSET(2) char hakaana2_sceneTex_006090[] = dhakaana2_sceneTex_006090;
-
-#define dhakaana2_sceneTex_005090 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_005090"
-static const ALIGN_ASSET(2) char hakaana2_sceneTex_005090[] = dhakaana2_sceneTex_005090;
-
-#define dhakaana2_sceneTex_003090 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_003090"
+#define dhakaana2_sceneTex_003090 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_003090"
 static const ALIGN_ASSET(2) char hakaana2_sceneTex_003090[] = dhakaana2_sceneTex_003090;
 
-#define dhakaana2_sceneTex_004490 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_004490"
-static const ALIGN_ASSET(2) char hakaana2_sceneTex_004490[] = dhakaana2_sceneTex_004490;
-
-#define dhakaana2_sceneTex_003890 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_003890"
+#define dhakaana2_sceneTex_003890 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_003890"
 static const ALIGN_ASSET(2) char hakaana2_sceneTex_003890[] = dhakaana2_sceneTex_003890;
 
-#define dhakaana2_sceneTex_004090 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_004090"
+#define dhakaana2_sceneTex_004090 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_004090"
 static const ALIGN_ASSET(2) char hakaana2_sceneTex_004090[] = dhakaana2_sceneTex_004090;
 
-#define dhakaana2_sceneTex_00B890 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_00B890"
-static const ALIGN_ASSET(2) char hakaana2_sceneTex_00B890[] = dhakaana2_sceneTex_00B890;
+#define dhakaana2_sceneTex_004490 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_004490"
+static const ALIGN_ASSET(2) char hakaana2_sceneTex_004490[] = dhakaana2_sceneTex_004490;
 
-#define dhakaana2_sceneTex_006890 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_006890"
+#define dhakaana2_sceneTex_004890 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_004890"
+static const ALIGN_ASSET(2) char hakaana2_sceneTex_004890[] = dhakaana2_sceneTex_004890;
+
+#define dhakaana2_sceneTex_005090 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_005090"
+static const ALIGN_ASSET(2) char hakaana2_sceneTex_005090[] = dhakaana2_sceneTex_005090;
+
+#define dhakaana2_sceneTex_005890 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_005890"
+static const ALIGN_ASSET(2) char hakaana2_sceneTex_005890[] = dhakaana2_sceneTex_005890;
+
+#define dhakaana2_sceneTex_006090 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_006090"
+static const ALIGN_ASSET(2) char hakaana2_sceneTex_006090[] = dhakaana2_sceneTex_006090;
+
+#define dhakaana2_sceneTex_006890 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_006890"
 static const ALIGN_ASSET(2) char hakaana2_sceneTex_006890[] = dhakaana2_sceneTex_006890;
 
-#define dhakaana2_sceneTex_008090 "__OTR__scenes/nonmq/hakaana2_scene/hakaana2_sceneTex_008090"
+#define dhakaana2_sceneTex_007090 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_007090"
+static const ALIGN_ASSET(2) char hakaana2_sceneTex_007090[] = dhakaana2_sceneTex_007090;
+
+#define dhakaana2_sceneTex_008090 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_008090"
 static const ALIGN_ASSET(2) char hakaana2_sceneTex_008090[] = dhakaana2_sceneTex_008090;
 
+#define dhakaana2_sceneTex_009090 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_009090"
+static const ALIGN_ASSET(2) char hakaana2_sceneTex_009090[] = dhakaana2_sceneTex_009090;
+
+#define dhakaana2_sceneTex_009890 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_009890"
+static const ALIGN_ASSET(2) char hakaana2_sceneTex_009890[] = dhakaana2_sceneTex_009890;
+
+#define dhakaana2_sceneTex_00A090 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_00A090"
+static const ALIGN_ASSET(2) char hakaana2_sceneTex_00A090[] = dhakaana2_sceneTex_00A090;
+
+#define dhakaana2_sceneTex_00A890 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_00A890"
+static const ALIGN_ASSET(2) char hakaana2_sceneTex_00A890[] = dhakaana2_sceneTex_00A890;
+
+#define dhakaana2_sceneTex_00B890 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_00B890"
+static const ALIGN_ASSET(2) char hakaana2_sceneTex_00B890[] = dhakaana2_sceneTex_00B890;
+
+#define dhakaana2_sceneTex_00C090 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_00C090"
+static const ALIGN_ASSET(2) char hakaana2_sceneTex_00C090[] = dhakaana2_sceneTex_00C090;
+
+#define dhakaana2_sceneTex_00C890 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneTex_00C890"
+static const ALIGN_ASSET(2) char hakaana2_sceneTex_00C890[] = dhakaana2_sceneTex_00C890;
+
+#define dhakaana2_sceneCollisionHeader_003058 "__OTR__scenes/shared/hakaana2_scene/hakaana2_sceneCollisionHeader_003058"
+static const ALIGN_ASSET(2) char hakaana2_sceneCollisionHeader_003058[] = dhakaana2_sceneCollisionHeader_003058;
+
+
 #endif // MISC_HAKAANA2_SCENE_H
diff --git a/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_0.h b/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_0.h
index c254c0e65..ba1230912 100644
--- a/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_0.h
+++ b/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_0.h
@@ -3,43 +3,43 @@
 
 #include "align_asset_macro.h"
 
-#define dhakaana_ouke_room_0DL_004F00 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_0DL_004F00"
-static const ALIGN_ASSET(2) char hakaana_ouke_room_0DL_004F00[] = dhakaana_ouke_room_0DL_004F00;
-
-#define dhakaana_ouke_room_0Tex_006F30 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_0Tex_006F30"
-static const ALIGN_ASSET(2) char hakaana_ouke_room_0Tex_006F30[] = dhakaana_ouke_room_0Tex_006F30;
-
-#define dhakaana_ouke_room_0Tex_006730 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_0Tex_006730"
-static const ALIGN_ASSET(2) char hakaana_ouke_room_0Tex_006730[] = dhakaana_ouke_room_0Tex_006730;
-
-#define dhakaana_ouke_room_0Tex_005730 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_0Tex_005730"
-static const ALIGN_ASSET(2) char hakaana_ouke_room_0Tex_005730[] = dhakaana_ouke_room_0Tex_005730;
-
-#define dhakaana_ouke_room_0Tex_004F30 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_0Tex_004F30"
+#define dhakaana_ouke_room_0Tex_004F30 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_0Tex_004F30"
 static const ALIGN_ASSET(2) char hakaana_ouke_room_0Tex_004F30[] = dhakaana_ouke_room_0Tex_004F30;
 
-#define dhakaana_ouke_room_0DL_007FD8 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_0DL_007FD8"
-static const ALIGN_ASSET(2) char hakaana_ouke_room_0DL_007FD8[] = dhakaana_ouke_room_0DL_007FD8;
+#define dhakaana_ouke_room_0Tex_005730 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_0Tex_005730"
+static const ALIGN_ASSET(2) char hakaana_ouke_room_0Tex_005730[] = dhakaana_ouke_room_0Tex_005730;
 
-#define dhakaana_ouke_room_0Tex_0097F8 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_0Tex_0097F8"
-static const ALIGN_ASSET(2) char hakaana_ouke_room_0Tex_0097F8[] = dhakaana_ouke_room_0Tex_0097F8;
+#define dhakaana_ouke_room_0Tex_006730 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_0Tex_006730"
+static const ALIGN_ASSET(2) char hakaana_ouke_room_0Tex_006730[] = dhakaana_ouke_room_0Tex_006730;
 
-#define dhakaana_ouke_room_0Tex_007FF8 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_0Tex_007FF8"
+#define dhakaana_ouke_room_0Tex_006F30 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_0Tex_006F30"
+static const ALIGN_ASSET(2) char hakaana_ouke_room_0Tex_006F30[] = dhakaana_ouke_room_0Tex_006F30;
+
+#define dhakaana_ouke_room_0Tex_007FF8 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_0Tex_007FF8"
 static const ALIGN_ASSET(2) char hakaana_ouke_room_0Tex_007FF8[] = dhakaana_ouke_room_0Tex_007FF8;
 
-#define dhakaana_ouke_room_0Tex_008FF8 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_0Tex_008FF8"
+#define dhakaana_ouke_room_0Tex_008FF8 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_0Tex_008FF8"
 static const ALIGN_ASSET(2) char hakaana_ouke_room_0Tex_008FF8[] = dhakaana_ouke_room_0Tex_008FF8;
 
-#define dhakaana_ouke_room_0Set_000130DL_004F00 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_0Set_000130DL_004F00"
+#define dhakaana_ouke_room_0Tex_0097F8 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_0Tex_0097F8"
+static const ALIGN_ASSET(2) char hakaana_ouke_room_0Tex_0097F8[] = dhakaana_ouke_room_0Tex_0097F8;
+
+#define dhakaana_ouke_room_0DL_004F00 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_0DL_004F00"
+static const ALIGN_ASSET(2) char hakaana_ouke_room_0DL_004F00[] = dhakaana_ouke_room_0DL_004F00;
+
+#define dhakaana_ouke_room_0DL_007FD8 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_0DL_007FD8"
+static const ALIGN_ASSET(2) char hakaana_ouke_room_0DL_007FD8[] = dhakaana_ouke_room_0DL_007FD8;
+
+#define dhakaana_ouke_room_0Set_000130DL_004F00 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_0Set_000130DL_004F00"
 static const ALIGN_ASSET(2) char hakaana_ouke_room_0Set_000130DL_004F00[] = dhakaana_ouke_room_0Set_000130DL_004F00;
 
-#define dhakaana_ouke_room_0Set_000130DL_007FD8 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_0Set_000130DL_007FD8"
+#define dhakaana_ouke_room_0Set_000130DL_007FD8 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_0Set_000130DL_007FD8"
 static const ALIGN_ASSET(2) char hakaana_ouke_room_0Set_000130DL_007FD8[] = dhakaana_ouke_room_0Set_000130DL_007FD8;
 
-#define dhakaana_ouke_room_0Set_0001B0DL_004F00 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_0Set_0001B0DL_004F00"
+#define dhakaana_ouke_room_0Set_0001B0DL_004F00 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_0Set_0001B0DL_004F00"
 static const ALIGN_ASSET(2) char hakaana_ouke_room_0Set_0001B0DL_004F00[] = dhakaana_ouke_room_0Set_0001B0DL_004F00;
 
-#define dhakaana_ouke_room_0Set_0001B0DL_007FD8 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_0Set_0001B0DL_007FD8"
+#define dhakaana_ouke_room_0Set_0001B0DL_007FD8 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_0Set_0001B0DL_007FD8"
 static const ALIGN_ASSET(2) char hakaana_ouke_room_0Set_0001B0DL_007FD8[] = dhakaana_ouke_room_0Set_0001B0DL_007FD8;
 
 
diff --git a/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_1.h b/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_1.h
index 6a02b4a89..d7df82c0c 100644
--- a/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_1.h
+++ b/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_1.h
@@ -3,31 +3,31 @@
 
 #include "align_asset_macro.h"
 
-#define dhakaana_ouke_room_1DL_001FA0 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_1DL_001FA0"
-static const ALIGN_ASSET(2) char hakaana_ouke_room_1DL_001FA0[] = dhakaana_ouke_room_1DL_001FA0;
-
-#define dhakaana_ouke_room_1Tex_001FC8 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_1Tex_001FC8"
+#define dhakaana_ouke_room_1Tex_001FC8 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_1Tex_001FC8"
 static const ALIGN_ASSET(2) char hakaana_ouke_room_1Tex_001FC8[] = dhakaana_ouke_room_1Tex_001FC8;
 
-#define dhakaana_ouke_room_1Tex_0027C8 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_1Tex_0027C8"
+#define dhakaana_ouke_room_1Tex_0027C8 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_1Tex_0027C8"
 static const ALIGN_ASSET(2) char hakaana_ouke_room_1Tex_0027C8[] = dhakaana_ouke_room_1Tex_0027C8;
 
-#define dhakaana_ouke_room_1DL_003FF0 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_1DL_003FF0"
-static const ALIGN_ASSET(2) char hakaana_ouke_room_1DL_003FF0[] = dhakaana_ouke_room_1DL_003FF0;
-
-#define dhakaana_ouke_room_1Tex_004000 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_1Tex_004000"
+#define dhakaana_ouke_room_1Tex_004000 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_1Tex_004000"
 static const ALIGN_ASSET(2) char hakaana_ouke_room_1Tex_004000[] = dhakaana_ouke_room_1Tex_004000;
 
-#define dhakaana_ouke_room_1Set_0000C0DL_001FA0 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_1Set_0000C0DL_001FA0"
+#define dhakaana_ouke_room_1DL_001FA0 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_1DL_001FA0"
+static const ALIGN_ASSET(2) char hakaana_ouke_room_1DL_001FA0[] = dhakaana_ouke_room_1DL_001FA0;
+
+#define dhakaana_ouke_room_1DL_003FF0 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_1DL_003FF0"
+static const ALIGN_ASSET(2) char hakaana_ouke_room_1DL_003FF0[] = dhakaana_ouke_room_1DL_003FF0;
+
+#define dhakaana_ouke_room_1Set_0000C0DL_001FA0 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_1Set_0000C0DL_001FA0"
 static const ALIGN_ASSET(2) char hakaana_ouke_room_1Set_0000C0DL_001FA0[] = dhakaana_ouke_room_1Set_0000C0DL_001FA0;
 
-#define dhakaana_ouke_room_1Set_0000C0DL_003FF0 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_1Set_0000C0DL_003FF0"
+#define dhakaana_ouke_room_1Set_0000C0DL_003FF0 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_1Set_0000C0DL_003FF0"
 static const ALIGN_ASSET(2) char hakaana_ouke_room_1Set_0000C0DL_003FF0[] = dhakaana_ouke_room_1Set_0000C0DL_003FF0;
 
-#define dhakaana_ouke_room_1Set_000100DL_001FA0 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_1Set_000100DL_001FA0"
+#define dhakaana_ouke_room_1Set_000100DL_001FA0 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_1Set_000100DL_001FA0"
 static const ALIGN_ASSET(2) char hakaana_ouke_room_1Set_000100DL_001FA0[] = dhakaana_ouke_room_1Set_000100DL_001FA0;
 
-#define dhakaana_ouke_room_1Set_000100DL_003FF0 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_1Set_000100DL_003FF0"
+#define dhakaana_ouke_room_1Set_000100DL_003FF0 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_1Set_000100DL_003FF0"
 static const ALIGN_ASSET(2) char hakaana_ouke_room_1Set_000100DL_003FF0[] = dhakaana_ouke_room_1Set_000100DL_003FF0;
 
 
diff --git a/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_2.h b/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_2.h
index 73f461be5..cd4f6b917 100644
--- a/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_2.h
+++ b/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_2.h
@@ -3,40 +3,40 @@
 
 #include "align_asset_macro.h"
 
-#define dhakaana_ouke_room_2DL_002738 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_2DL_002738"
-static const ALIGN_ASSET(2) char hakaana_ouke_room_2DL_002738[] = dhakaana_ouke_room_2DL_002738;
-
-#define dhakaana_ouke_room_2Tex_003F78 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_2Tex_003F78"
-static const ALIGN_ASSET(2) char hakaana_ouke_room_2Tex_003F78[] = dhakaana_ouke_room_2Tex_003F78;
-
-#define dhakaana_ouke_room_2Tex_004778 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_2Tex_004778"
-static const ALIGN_ASSET(2) char hakaana_ouke_room_2Tex_004778[] = dhakaana_ouke_room_2Tex_004778;
-
-#define dhakaana_ouke_room_2Tex_002778 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_2Tex_002778"
+#define dhakaana_ouke_room_2Tex_002778 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_2Tex_002778"
 static const ALIGN_ASSET(2) char hakaana_ouke_room_2Tex_002778[] = dhakaana_ouke_room_2Tex_002778;
 
-#define dhakaana_ouke_room_2Tex_003778 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_2Tex_003778"
-static const ALIGN_ASSET(2) char hakaana_ouke_room_2Tex_003778[] = dhakaana_ouke_room_2Tex_003778;
-
-#define dhakaana_ouke_room_2Tex_002F78 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_2Tex_002F78"
+#define dhakaana_ouke_room_2Tex_002F78 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_2Tex_002F78"
 static const ALIGN_ASSET(2) char hakaana_ouke_room_2Tex_002F78[] = dhakaana_ouke_room_2Tex_002F78;
 
-#define dhakaana_ouke_room_2DL_0050F8 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_2DL_0050F8"
-static const ALIGN_ASSET(2) char hakaana_ouke_room_2DL_0050F8[] = dhakaana_ouke_room_2DL_0050F8;
+#define dhakaana_ouke_room_2Tex_003778 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_2Tex_003778"
+static const ALIGN_ASSET(2) char hakaana_ouke_room_2Tex_003778[] = dhakaana_ouke_room_2Tex_003778;
 
-#define dhakaana_ouke_room_2Tex_005108 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_2Tex_005108"
+#define dhakaana_ouke_room_2Tex_003F78 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_2Tex_003F78"
+static const ALIGN_ASSET(2) char hakaana_ouke_room_2Tex_003F78[] = dhakaana_ouke_room_2Tex_003F78;
+
+#define dhakaana_ouke_room_2Tex_004778 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_2Tex_004778"
+static const ALIGN_ASSET(2) char hakaana_ouke_room_2Tex_004778[] = dhakaana_ouke_room_2Tex_004778;
+
+#define dhakaana_ouke_room_2Tex_005108 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_2Tex_005108"
 static const ALIGN_ASSET(2) char hakaana_ouke_room_2Tex_005108[] = dhakaana_ouke_room_2Tex_005108;
 
-#define dhakaana_ouke_room_2Set_0000C0DL_002738 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_2Set_0000C0DL_002738"
+#define dhakaana_ouke_room_2DL_002738 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_2DL_002738"
+static const ALIGN_ASSET(2) char hakaana_ouke_room_2DL_002738[] = dhakaana_ouke_room_2DL_002738;
+
+#define dhakaana_ouke_room_2DL_0050F8 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_2DL_0050F8"
+static const ALIGN_ASSET(2) char hakaana_ouke_room_2DL_0050F8[] = dhakaana_ouke_room_2DL_0050F8;
+
+#define dhakaana_ouke_room_2Set_0000C0DL_002738 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_2Set_0000C0DL_002738"
 static const ALIGN_ASSET(2) char hakaana_ouke_room_2Set_0000C0DL_002738[] = dhakaana_ouke_room_2Set_0000C0DL_002738;
 
-#define dhakaana_ouke_room_2Set_0000C0DL_0050F8 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_2Set_0000C0DL_0050F8"
+#define dhakaana_ouke_room_2Set_0000C0DL_0050F8 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_2Set_0000C0DL_0050F8"
 static const ALIGN_ASSET(2) char hakaana_ouke_room_2Set_0000C0DL_0050F8[] = dhakaana_ouke_room_2Set_0000C0DL_0050F8;
 
-#define dhakaana_ouke_room_2Set_000140DL_002738 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_2Set_000140DL_002738"
+#define dhakaana_ouke_room_2Set_000140DL_002738 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_2Set_000140DL_002738"
 static const ALIGN_ASSET(2) char hakaana_ouke_room_2Set_000140DL_002738[] = dhakaana_ouke_room_2Set_000140DL_002738;
 
-#define dhakaana_ouke_room_2Set_000140DL_0050F8 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_2Set_000140DL_0050F8"
+#define dhakaana_ouke_room_2Set_000140DL_0050F8 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_2Set_000140DL_0050F8"
 static const ALIGN_ASSET(2) char hakaana_ouke_room_2Set_000140DL_0050F8[] = dhakaana_ouke_room_2Set_000140DL_0050F8;
 
 
diff --git a/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_scene.h b/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_scene.h
index 5c791a6c0..3ea0d7d5f 100644
--- a/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_scene.h
+++ b/soh/assets/scenes/misc/hakaana_ouke/hakaana_ouke_scene.h
@@ -3,33 +3,33 @@
 
 #include "align_asset_macro.h"
 
-#define dgSunSongGraveSunSongTeachCs "__OTR__scenes/nonmq/hakaana_ouke_scene/gSunSongGraveSunSongTeachCs"
-static const ALIGN_ASSET(2) char gSunSongGraveSunSongTeachCs[] = dgSunSongGraveSunSongTeachCs;
-
-#define dgSunSongGraveSunSongTeachPart2Cs "__OTR__scenes/nonmq/hakaana_ouke_scene/gSunSongGraveSunSongTeachPart2Cs"
-static const ALIGN_ASSET(2) char gSunSongGraveSunSongTeachPart2Cs[] = dgSunSongGraveSunSongTeachPart2Cs;
-
-#define dhakaana_ouke_sceneCollisionHeader_002250 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_sceneCollisionHeader_002250"
-static const ALIGN_ASSET(2) char hakaana_ouke_sceneCollisionHeader_002250[] = dhakaana_ouke_sceneCollisionHeader_002250;
-
-#define dhakaana_ouke_sceneTex_0042E0 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_sceneTex_0042E0"
-static const ALIGN_ASSET(2) char hakaana_ouke_sceneTex_0042E0[] = dhakaana_ouke_sceneTex_0042E0;
-
-#define dhakaana_ouke_sceneTex_003AE0 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_sceneTex_003AE0"
-static const ALIGN_ASSET(2) char hakaana_ouke_sceneTex_003AE0[] = dhakaana_ouke_sceneTex_003AE0;
-
-#define dhakaana_ouke_sceneTex_002EE0 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_sceneTex_002EE0"
-static const ALIGN_ASSET(2) char hakaana_ouke_sceneTex_002EE0[] = dhakaana_ouke_sceneTex_002EE0;
-
-#define dhakaana_ouke_sceneTex_0032E0 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_sceneTex_0032E0"
-static const ALIGN_ASSET(2) char hakaana_ouke_sceneTex_0032E0[] = dhakaana_ouke_sceneTex_0032E0;
-
-#define dhakaana_ouke_sceneTex_002AE0 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_sceneTex_002AE0"
+#define dhakaana_ouke_sceneTex_002AE0 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_sceneTex_002AE0"
 static const ALIGN_ASSET(2) char hakaana_ouke_sceneTex_002AE0[] = dhakaana_ouke_sceneTex_002AE0;
 
-#define dhakaana_ouke_sceneCollisionHeader_002250 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_sceneCollisionHeader_002250"
+#define dhakaana_ouke_sceneTex_002EE0 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_sceneTex_002EE0"
+static const ALIGN_ASSET(2) char hakaana_ouke_sceneTex_002EE0[] = dhakaana_ouke_sceneTex_002EE0;
 
-#define dhakaana_ouke_sceneCollisionHeader_002250 "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_sceneCollisionHeader_002250"
+#define dhakaana_ouke_sceneTex_0032E0 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_sceneTex_0032E0"
+static const ALIGN_ASSET(2) char hakaana_ouke_sceneTex_0032E0[] = dhakaana_ouke_sceneTex_0032E0;
+
+#define dhakaana_ouke_sceneTex_003AE0 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_sceneTex_003AE0"
+static const ALIGN_ASSET(2) char hakaana_ouke_sceneTex_003AE0[] = dhakaana_ouke_sceneTex_003AE0;
+
+#define dhakaana_ouke_sceneTex_0042E0 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_sceneTex_0042E0"
+static const ALIGN_ASSET(2) char hakaana_ouke_sceneTex_0042E0[] = dhakaana_ouke_sceneTex_0042E0;
+
+#define dgSunSongGraveSunSongTeachCs "__OTR__scenes/shared/hakaana_ouke_scene/gSunSongGraveSunSongTeachCs"
+static const ALIGN_ASSET(2) char gSunSongGraveSunSongTeachCs[] = dgSunSongGraveSunSongTeachCs;
+
+#define dgSunSongGraveSunSongTeachPart2Cs "__OTR__scenes/shared/hakaana_ouke_scene/gSunSongGraveSunSongTeachPart2Cs"
+static const ALIGN_ASSET(2) char gSunSongGraveSunSongTeachPart2Cs[] = dgSunSongGraveSunSongTeachPart2Cs;
+
+#define dhakaana_ouke_sceneCollisionHeader_002250 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_sceneCollisionHeader_002250"
+static const ALIGN_ASSET(2) char hakaana_ouke_sceneCollisionHeader_002250[] = dhakaana_ouke_sceneCollisionHeader_002250;
+
+#define dhakaana_ouke_sceneCollisionHeader_002250 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_sceneCollisionHeader_002250"
+
+#define dhakaana_ouke_sceneCollisionHeader_002250 "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_sceneCollisionHeader_002250"
 
 
 #endif // MISC_HAKAANA_OUKE_SCENE_H
diff --git a/soh/assets/scenes/misc/hiral_demo/hiral_demo_room_0.h b/soh/assets/scenes/misc/hiral_demo/hiral_demo_room_0.h
index a0ccc89c3..badd377e5 100644
--- a/soh/assets/scenes/misc/hiral_demo/hiral_demo_room_0.h
+++ b/soh/assets/scenes/misc/hiral_demo/hiral_demo_room_0.h
@@ -3,34 +3,34 @@
 
 #include "align_asset_macro.h"
 
-#define dhiral_demo_room_0DL_000630 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_room_0DL_000630"
+#define dhiral_demo_room_0DL_000630 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_room_0DL_000630"
 static const ALIGN_ASSET(2) char hiral_demo_room_0DL_000630[] = dhiral_demo_room_0DL_000630;
 
-#define dhiral_demo_room_0Set_0001E0DL_000630 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_room_0Set_0001E0DL_000630"
+#define dhiral_demo_room_0Set_0001E0DL_000630 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_room_0Set_0001E0DL_000630"
 static const ALIGN_ASSET(2) char hiral_demo_room_0Set_0001E0DL_000630[] = dhiral_demo_room_0Set_0001E0DL_000630;
 
-#define dhiral_demo_room_0Set_000270DL_000630 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_room_0Set_000270DL_000630"
+#define dhiral_demo_room_0Set_000270DL_000630 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_room_0Set_000270DL_000630"
 static const ALIGN_ASSET(2) char hiral_demo_room_0Set_000270DL_000630[] = dhiral_demo_room_0Set_000270DL_000630;
 
-#define dhiral_demo_room_0Set_0002E0DL_000630 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_room_0Set_0002E0DL_000630"
+#define dhiral_demo_room_0Set_0002E0DL_000630 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_room_0Set_0002E0DL_000630"
 static const ALIGN_ASSET(2) char hiral_demo_room_0Set_0002E0DL_000630[] = dhiral_demo_room_0Set_0002E0DL_000630;
 
-#define dhiral_demo_room_0Set_000380DL_000630 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_room_0Set_000380DL_000630"
+#define dhiral_demo_room_0Set_000380DL_000630 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_room_0Set_000380DL_000630"
 static const ALIGN_ASSET(2) char hiral_demo_room_0Set_000380DL_000630[] = dhiral_demo_room_0Set_000380DL_000630;
 
-#define dhiral_demo_room_0Set_0003E0DL_000630 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_room_0Set_0003E0DL_000630"
+#define dhiral_demo_room_0Set_0003E0DL_000630 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_room_0Set_0003E0DL_000630"
 static const ALIGN_ASSET(2) char hiral_demo_room_0Set_0003E0DL_000630[] = dhiral_demo_room_0Set_0003E0DL_000630;
 
-#define dhiral_demo_room_0Set_000450DL_000630 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_room_0Set_000450DL_000630"
+#define dhiral_demo_room_0Set_000450DL_000630 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_room_0Set_000450DL_000630"
 static const ALIGN_ASSET(2) char hiral_demo_room_0Set_000450DL_000630[] = dhiral_demo_room_0Set_000450DL_000630;
 
-#define dhiral_demo_room_0Set_0004C0DL_000630 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_room_0Set_0004C0DL_000630"
+#define dhiral_demo_room_0Set_0004C0DL_000630 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_room_0Set_0004C0DL_000630"
 static const ALIGN_ASSET(2) char hiral_demo_room_0Set_0004C0DL_000630[] = dhiral_demo_room_0Set_0004C0DL_000630;
 
-#define dhiral_demo_room_0Set_000530DL_000630 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_room_0Set_000530DL_000630"
+#define dhiral_demo_room_0Set_000530DL_000630 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_room_0Set_000530DL_000630"
 static const ALIGN_ASSET(2) char hiral_demo_room_0Set_000530DL_000630[] = dhiral_demo_room_0Set_000530DL_000630;
 
-#define dhiral_demo_room_0Set_0005D0DL_000630 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_room_0Set_0005D0DL_000630"
+#define dhiral_demo_room_0Set_0005D0DL_000630 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_room_0Set_0005D0DL_000630"
 static const ALIGN_ASSET(2) char hiral_demo_room_0Set_0005D0DL_000630[] = dhiral_demo_room_0Set_0005D0DL_000630;
 
 
diff --git a/soh/assets/scenes/misc/hiral_demo/hiral_demo_scene.h b/soh/assets/scenes/misc/hiral_demo/hiral_demo_scene.h
index 3c10c20bc..cbe9ec2a7 100644
--- a/soh/assets/scenes/misc/hiral_demo/hiral_demo_scene.h
+++ b/soh/assets/scenes/misc/hiral_demo/hiral_demo_scene.h
@@ -3,26 +3,26 @@
 
 #include "align_asset_macro.h"
 
-#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548"
+#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548"
 static const ALIGN_ASSET(2) char hiral_demo_sceneCollisionHeader_003548[] = dhiral_demo_sceneCollisionHeader_003548;
 
-#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548"
+#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548"
 
-#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548"
+#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548"
 
-#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548"
+#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548"
 
-#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548"
+#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548"
 
-#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548"
+#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548"
 
-#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548"
+#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548"
 
-#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548"
+#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548"
 
-#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548"
+#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548"
 
-#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/nonmq/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548"
+#define dhiral_demo_sceneCollisionHeader_003548 "__OTR__scenes/shared/hiral_demo_scene/hiral_demo_sceneCollisionHeader_003548"
 
 
 #endif // MISC_HIRAL_DEMO_SCENE_H
diff --git a/soh/assets/scenes/misc/kakariko3/kakariko3_room_0.h b/soh/assets/scenes/misc/kakariko3/kakariko3_room_0.h
index 5fcf29417..d69d171ff 100644
--- a/soh/assets/scenes/misc/kakariko3/kakariko3_room_0.h
+++ b/soh/assets/scenes/misc/kakariko3/kakariko3_room_0.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dkakariko3_room_0DL_004D20 "__OTR__scenes/nonmq/kakariko3_scene/kakariko3_room_0DL_004D20"
+#define dkakariko3_room_0DL_004D20 "__OTR__scenes/shared/kakariko3_scene/kakariko3_room_0DL_004D20"
 static const ALIGN_ASSET(2) char kakariko3_room_0DL_004D20[] = dkakariko3_room_0DL_004D20;
 
 
diff --git a/soh/assets/scenes/misc/kakariko3/kakariko3_scene.h b/soh/assets/scenes/misc/kakariko3/kakariko3_scene.h
index 9a8f07f3c..36acc9207 100644
--- a/soh/assets/scenes/misc/kakariko3/kakariko3_scene.h
+++ b/soh/assets/scenes/misc/kakariko3/kakariko3_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dkakariko3_sceneCollisionHeader_000808 "__OTR__scenes/nonmq/kakariko3_scene/kakariko3_sceneCollisionHeader_000808"
+#define dkakariko3_sceneCollisionHeader_000808 "__OTR__scenes/shared/kakariko3_scene/kakariko3_sceneCollisionHeader_000808"
 static const ALIGN_ASSET(2) char kakariko3_sceneCollisionHeader_000808[] = dkakariko3_sceneCollisionHeader_000808;
 
 
diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_0.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_0.h
index 8a867b685..d743fffe3 100644
--- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_0.h
+++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_0.h
@@ -3,52 +3,52 @@
 
 #include "align_asset_macro.h"
 
-#define dkakusiana_room_0DL_0064A0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_0DL_0064A0"
-static const ALIGN_ASSET(2) char kakusiana_room_0DL_0064A0[] = dkakusiana_room_0DL_0064A0;
-
-#define dkakusiana_room_0DL_0021C0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_0DL_0021C0"
-static const ALIGN_ASSET(2) char kakusiana_room_0DL_0021C0[] = dkakusiana_room_0DL_0021C0;
-
-#define dkakusiana_room_0DL_0069F0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_0DL_0069F0"
-static const ALIGN_ASSET(2) char kakusiana_room_0DL_0069F0[] = dkakusiana_room_0DL_0069F0;
-
-#define dkakusiana_room_0DL_000E58 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_0DL_000E58"
-static const ALIGN_ASSET(2) char kakusiana_room_0DL_000E58[] = dkakusiana_room_0DL_000E58;
-
-#define dkakusiana_room_0Tex_005AA0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_0Tex_005AA0"
-static const ALIGN_ASSET(2) char kakusiana_room_0Tex_005AA0[] = dkakusiana_room_0Tex_005AA0;
-
-#define dkakusiana_room_0DL_0066A8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_0DL_0066A8"
-static const ALIGN_ASSET(2) char kakusiana_room_0DL_0066A8[] = dkakusiana_room_0DL_0066A8;
-
-#define dkakusiana_room_0DL_001DC8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_0DL_001DC8"
-static const ALIGN_ASSET(2) char kakusiana_room_0DL_001DC8[] = dkakusiana_room_0DL_001DC8;
-
-#define dkakusiana_room_0Tex_0042A0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_0Tex_0042A0"
-static const ALIGN_ASSET(2) char kakusiana_room_0Tex_0042A0[] = dkakusiana_room_0Tex_0042A0;
-
-#define dkakusiana_room_0Tex_0032A0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_0Tex_0032A0"
-static const ALIGN_ASSET(2) char kakusiana_room_0Tex_0032A0[] = dkakusiana_room_0Tex_0032A0;
-
-#define dkakusiana_room_0Tex_0022A0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_0Tex_0022A0"
+#define dkakusiana_room_0Tex_0022A0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_0Tex_0022A0"
 static const ALIGN_ASSET(2) char kakusiana_room_0Tex_0022A0[] = dkakusiana_room_0Tex_0022A0;
 
-#define dkakusiana_room_0DL_0007D0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_0DL_0007D0"
-static const ALIGN_ASSET(2) char kakusiana_room_0DL_0007D0[] = dkakusiana_room_0DL_0007D0;
+#define dkakusiana_room_0Tex_0032A0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_0Tex_0032A0"
+static const ALIGN_ASSET(2) char kakusiana_room_0Tex_0032A0[] = dkakusiana_room_0Tex_0032A0;
 
-#define dkakusiana_room_0Tex_004AA0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_0Tex_004AA0"
+#define dkakusiana_room_0Tex_0042A0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_0Tex_0042A0"
+static const ALIGN_ASSET(2) char kakusiana_room_0Tex_0042A0[] = dkakusiana_room_0Tex_0042A0;
+
+#define dkakusiana_room_0Tex_004AA0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_0Tex_004AA0"
 static const ALIGN_ASSET(2) char kakusiana_room_0Tex_004AA0[] = dkakusiana_room_0Tex_004AA0;
 
-#define dkakusiana_room_0DL_006838 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_0DL_006838"
-static const ALIGN_ASSET(2) char kakusiana_room_0DL_006838[] = dkakusiana_room_0DL_006838;
+#define dkakusiana_room_0Tex_005AA0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_0Tex_005AA0"
+static const ALIGN_ASSET(2) char kakusiana_room_0Tex_005AA0[] = dkakusiana_room_0Tex_005AA0;
 
-#define dkakusiana_room_0Tex_006AA0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_0Tex_006AA0"
+#define dkakusiana_room_0Tex_006AA0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_0Tex_006AA0"
 static const ALIGN_ASSET(2) char kakusiana_room_0Tex_006AA0[] = dkakusiana_room_0Tex_006AA0;
 
-#define dkakusiana_room_0DL_001600 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_0DL_001600"
+#define dkakusiana_room_0DL_0064A0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_0DL_0064A0"
+static const ALIGN_ASSET(2) char kakusiana_room_0DL_0064A0[] = dkakusiana_room_0DL_0064A0;
+
+#define dkakusiana_room_0DL_0021C0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_0DL_0021C0"
+static const ALIGN_ASSET(2) char kakusiana_room_0DL_0021C0[] = dkakusiana_room_0DL_0021C0;
+
+#define dkakusiana_room_0DL_0069F0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_0DL_0069F0"
+static const ALIGN_ASSET(2) char kakusiana_room_0DL_0069F0[] = dkakusiana_room_0DL_0069F0;
+
+#define dkakusiana_room_0DL_000E58 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_0DL_000E58"
+static const ALIGN_ASSET(2) char kakusiana_room_0DL_000E58[] = dkakusiana_room_0DL_000E58;
+
+#define dkakusiana_room_0DL_0066A8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_0DL_0066A8"
+static const ALIGN_ASSET(2) char kakusiana_room_0DL_0066A8[] = dkakusiana_room_0DL_0066A8;
+
+#define dkakusiana_room_0DL_001DC8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_0DL_001DC8"
+static const ALIGN_ASSET(2) char kakusiana_room_0DL_001DC8[] = dkakusiana_room_0DL_001DC8;
+
+#define dkakusiana_room_0DL_0007D0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_0DL_0007D0"
+static const ALIGN_ASSET(2) char kakusiana_room_0DL_0007D0[] = dkakusiana_room_0DL_0007D0;
+
+#define dkakusiana_room_0DL_006838 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_0DL_006838"
+static const ALIGN_ASSET(2) char kakusiana_room_0DL_006838[] = dkakusiana_room_0DL_006838;
+
+#define dkakusiana_room_0DL_001600 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_0DL_001600"
 static const ALIGN_ASSET(2) char kakusiana_room_0DL_001600[] = dkakusiana_room_0DL_001600;
 
-#define dkakusiana_room_0DL_0013B8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_0DL_0013B8"
+#define dkakusiana_room_0DL_0013B8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_0DL_0013B8"
 static const ALIGN_ASSET(2) char kakusiana_room_0DL_0013B8[] = dkakusiana_room_0DL_0013B8;
 
 
diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_1.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_1.h
index e6fedee9f..66b31f787 100644
--- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_1.h
+++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_1.h
@@ -3,43 +3,43 @@
 
 #include "align_asset_macro.h"
 
-#define dkakusiana_room_1DL_004420 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_1DL_004420"
-static const ALIGN_ASSET(2) char kakusiana_room_1DL_004420[] = dkakusiana_room_1DL_004420;
-
-#define dkakusiana_room_1DL_001280 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_1DL_001280"
-static const ALIGN_ASSET(2) char kakusiana_room_1DL_001280[] = dkakusiana_room_1DL_001280;
-
-#define dkakusiana_room_1Tex_003218 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_1Tex_003218"
-static const ALIGN_ASSET(2) char kakusiana_room_1Tex_003218[] = dkakusiana_room_1Tex_003218;
-
-#define dkakusiana_room_1DL_004870 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_1DL_004870"
-static const ALIGN_ASSET(2) char kakusiana_room_1DL_004870[] = dkakusiana_room_1DL_004870;
-
-#define dkakusiana_room_1Tex_004990 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_1Tex_004990"
-static const ALIGN_ASSET(2) char kakusiana_room_1Tex_004990[] = dkakusiana_room_1Tex_004990;
-
-#define dkakusiana_room_1DL_0006E0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_1DL_0006E0"
-static const ALIGN_ASSET(2) char kakusiana_room_1DL_0006E0[] = dkakusiana_room_1DL_0006E0;
-
-#define dkakusiana_room_1Tex_001A18 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_1Tex_001A18"
+#define dkakusiana_room_1Tex_001A18 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_1Tex_001A18"
 static const ALIGN_ASSET(2) char kakusiana_room_1Tex_001A18[] = dkakusiana_room_1Tex_001A18;
 
-#define dkakusiana_room_1DL_0016F8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_1DL_0016F8"
-static const ALIGN_ASSET(2) char kakusiana_room_1DL_0016F8[] = dkakusiana_room_1DL_0016F8;
-
-#define dkakusiana_room_1Tex_002A18 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_1Tex_002A18"
+#define dkakusiana_room_1Tex_002A18 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_1Tex_002A18"
 static const ALIGN_ASSET(2) char kakusiana_room_1Tex_002A18[] = dkakusiana_room_1Tex_002A18;
 
-#define dkakusiana_room_1DL_001560 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_1DL_001560"
+#define dkakusiana_room_1Tex_003218 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_1Tex_003218"
+static const ALIGN_ASSET(2) char kakusiana_room_1Tex_003218[] = dkakusiana_room_1Tex_003218;
+
+#define dkakusiana_room_1Tex_004990 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_1Tex_004990"
+static const ALIGN_ASSET(2) char kakusiana_room_1Tex_004990[] = dkakusiana_room_1Tex_004990;
+
+#define dkakusiana_room_1DL_004420 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_1DL_004420"
+static const ALIGN_ASSET(2) char kakusiana_room_1DL_004420[] = dkakusiana_room_1DL_004420;
+
+#define dkakusiana_room_1DL_001280 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_1DL_001280"
+static const ALIGN_ASSET(2) char kakusiana_room_1DL_001280[] = dkakusiana_room_1DL_001280;
+
+#define dkakusiana_room_1DL_004870 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_1DL_004870"
+static const ALIGN_ASSET(2) char kakusiana_room_1DL_004870[] = dkakusiana_room_1DL_004870;
+
+#define dkakusiana_room_1DL_0006E0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_1DL_0006E0"
+static const ALIGN_ASSET(2) char kakusiana_room_1DL_0006E0[] = dkakusiana_room_1DL_0006E0;
+
+#define dkakusiana_room_1DL_0016F8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_1DL_0016F8"
+static const ALIGN_ASSET(2) char kakusiana_room_1DL_0016F8[] = dkakusiana_room_1DL_0016F8;
+
+#define dkakusiana_room_1DL_001560 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_1DL_001560"
 static const ALIGN_ASSET(2) char kakusiana_room_1DL_001560[] = dkakusiana_room_1DL_001560;
 
-#define dkakusiana_room_1DL_001938 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_1DL_001938"
+#define dkakusiana_room_1DL_001938 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_1DL_001938"
 static const ALIGN_ASSET(2) char kakusiana_room_1DL_001938[] = dkakusiana_room_1DL_001938;
 
-#define dkakusiana_room_1DL_0045E8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_1DL_0045E8"
+#define dkakusiana_room_1DL_0045E8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_1DL_0045E8"
 static const ALIGN_ASSET(2) char kakusiana_room_1DL_0045E8[] = dkakusiana_room_1DL_0045E8;
 
-#define dkakusiana_room_1DL_000BE8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_1DL_000BE8"
+#define dkakusiana_room_1DL_000BE8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_1DL_000BE8"
 static const ALIGN_ASSET(2) char kakusiana_room_1DL_000BE8[] = dkakusiana_room_1DL_000BE8;
 
 
diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_10.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_10.h
index 7aa366fa9..267c3c805 100644
--- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_10.h
+++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_10.h
@@ -3,50 +3,50 @@
 
 #include "align_asset_macro.h"
 
-#define dkakusiana_room_10DL_004DE0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_10DL_004DE0"
-static const ALIGN_ASSET(2) char kakusiana_room_10DL_004DE0[] = dkakusiana_room_10DL_004DE0;
-
-#define dkakusiana_room_10DL_001330 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_10DL_001330"
-static const ALIGN_ASSET(2) char kakusiana_room_10DL_001330[] = dkakusiana_room_10DL_001330;
-
-#define dkakusiana_room_10Tex_0017E0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_10Tex_0017E0"
+#define dkakusiana_room_10Tex_0017E0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_10Tex_0017E0"
 static const ALIGN_ASSET(2) char kakusiana_room_10Tex_0017E0[] = dkakusiana_room_10Tex_0017E0;
 
-#define dkakusiana_room_10Tex_0027E0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_10Tex_0027E0"
-static const ALIGN_ASSET(2) char kakusiana_room_10Tex_0027E0[] = dkakusiana_room_10Tex_0027E0;
-
-#define dkakusiana_room_10DL_001088 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_10DL_001088"
-static const ALIGN_ASSET(2) char kakusiana_room_10DL_001088[] = dkakusiana_room_10DL_001088;
-
-#define dkakusiana_room_10Tex_003BE0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_10Tex_003BE0"
-static const ALIGN_ASSET(2) char kakusiana_room_10Tex_003BE0[] = dkakusiana_room_10Tex_003BE0;
-
-#define dkakusiana_room_10DL_004FB8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_10DL_004FB8"
-static const ALIGN_ASSET(2) char kakusiana_room_10DL_004FB8[] = dkakusiana_room_10DL_004FB8;
-
-#define dkakusiana_room_10Tex_005228 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_10Tex_005228"
-static const ALIGN_ASSET(2) char kakusiana_room_10Tex_005228[] = dkakusiana_room_10Tex_005228;
-
-#define dkakusiana_room_10DL_001538 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_10DL_001538"
-static const ALIGN_ASSET(2) char kakusiana_room_10DL_001538[] = dkakusiana_room_10DL_001538;
-
-#define dkakusiana_room_10DL_001700 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_10DL_001700"
-static const ALIGN_ASSET(2) char kakusiana_room_10DL_001700[] = dkakusiana_room_10DL_001700;
-
-#define dkakusiana_room_10DL_005180 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_10DL_005180"
-static const ALIGN_ASSET(2) char kakusiana_room_10DL_005180[] = dkakusiana_room_10DL_005180;
-
-#define dkakusiana_room_10DL_000D18 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_10DL_000D18"
-static const ALIGN_ASSET(2) char kakusiana_room_10DL_000D18[] = dkakusiana_room_10DL_000D18;
-
-#define dkakusiana_room_10Tex_001FE0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_10Tex_001FE0"
+#define dkakusiana_room_10Tex_001FE0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_10Tex_001FE0"
 static const ALIGN_ASSET(2) char kakusiana_room_10Tex_001FE0[] = dkakusiana_room_10Tex_001FE0;
 
-#define dkakusiana_room_10DL_000700 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_10DL_000700"
-static const ALIGN_ASSET(2) char kakusiana_room_10DL_000700[] = dkakusiana_room_10DL_000700;
+#define dkakusiana_room_10Tex_0027E0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_10Tex_0027E0"
+static const ALIGN_ASSET(2) char kakusiana_room_10Tex_0027E0[] = dkakusiana_room_10Tex_0027E0;
 
-#define dkakusiana_room_10Tex_002BE0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_10Tex_002BE0"
+#define dkakusiana_room_10Tex_002BE0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_10Tex_002BE0"
 static const ALIGN_ASSET(2) char kakusiana_room_10Tex_002BE0[] = dkakusiana_room_10Tex_002BE0;
 
+#define dkakusiana_room_10Tex_003BE0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_10Tex_003BE0"
+static const ALIGN_ASSET(2) char kakusiana_room_10Tex_003BE0[] = dkakusiana_room_10Tex_003BE0;
+
+#define dkakusiana_room_10Tex_005228 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_10Tex_005228"
+static const ALIGN_ASSET(2) char kakusiana_room_10Tex_005228[] = dkakusiana_room_10Tex_005228;
+
+#define dkakusiana_room_10DL_004DE0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_10DL_004DE0"
+static const ALIGN_ASSET(2) char kakusiana_room_10DL_004DE0[] = dkakusiana_room_10DL_004DE0;
+
+#define dkakusiana_room_10DL_001330 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_10DL_001330"
+static const ALIGN_ASSET(2) char kakusiana_room_10DL_001330[] = dkakusiana_room_10DL_001330;
+
+#define dkakusiana_room_10DL_001088 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_10DL_001088"
+static const ALIGN_ASSET(2) char kakusiana_room_10DL_001088[] = dkakusiana_room_10DL_001088;
+
+#define dkakusiana_room_10DL_004FB8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_10DL_004FB8"
+static const ALIGN_ASSET(2) char kakusiana_room_10DL_004FB8[] = dkakusiana_room_10DL_004FB8;
+
+#define dkakusiana_room_10DL_001538 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_10DL_001538"
+static const ALIGN_ASSET(2) char kakusiana_room_10DL_001538[] = dkakusiana_room_10DL_001538;
+
+#define dkakusiana_room_10DL_001700 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_10DL_001700"
+static const ALIGN_ASSET(2) char kakusiana_room_10DL_001700[] = dkakusiana_room_10DL_001700;
+
+#define dkakusiana_room_10DL_005180 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_10DL_005180"
+static const ALIGN_ASSET(2) char kakusiana_room_10DL_005180[] = dkakusiana_room_10DL_005180;
+
+#define dkakusiana_room_10DL_000D18 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_10DL_000D18"
+static const ALIGN_ASSET(2) char kakusiana_room_10DL_000D18[] = dkakusiana_room_10DL_000D18;
+
+#define dkakusiana_room_10DL_000700 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_10DL_000700"
+static const ALIGN_ASSET(2) char kakusiana_room_10DL_000700[] = dkakusiana_room_10DL_000700;
+
 
 #endif // MISC_KAKUSIANA_ROOM_10_H
diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_11.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_11.h
index dee4a680e..1b33c8b71 100644
--- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_11.h
+++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_11.h
@@ -3,53 +3,53 @@
 
 #include "align_asset_macro.h"
 
-#define dkakusiana_room_11DL_008250 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_11DL_008250"
-static const ALIGN_ASSET(2) char kakusiana_room_11DL_008250[] = dkakusiana_room_11DL_008250;
-
-#define dkakusiana_room_11DL_0006D0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_11DL_0006D0"
-static const ALIGN_ASSET(2) char kakusiana_room_11DL_0006D0[] = dkakusiana_room_11DL_0006D0;
-
-#define dkakusiana_room_11Tex_005048 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_11Tex_005048"
-static const ALIGN_ASSET(2) char kakusiana_room_11Tex_005048[] = dkakusiana_room_11Tex_005048;
-
-#define dkakusiana_room_11Tex_002848 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_11Tex_002848"
+#define dkakusiana_room_11Tex_002848 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_11Tex_002848"
 static const ALIGN_ASSET(2) char kakusiana_room_11Tex_002848[] = dkakusiana_room_11Tex_002848;
 
-#define dkakusiana_room_11DL_000340 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_11DL_000340"
-static const ALIGN_ASSET(2) char kakusiana_room_11DL_000340[] = dkakusiana_room_11DL_000340;
+#define dkakusiana_room_11Tex_003048 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_11Tex_003048"
+static const ALIGN_ASSET(2) char kakusiana_room_11Tex_003048[] = dkakusiana_room_11Tex_003048;
 
-#define dkakusiana_room_11DL_0023E8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_11DL_0023E8"
-static const ALIGN_ASSET(2) char kakusiana_room_11DL_0023E8[] = dkakusiana_room_11DL_0023E8;
-
-#define dkakusiana_room_11Tex_006848 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_11Tex_006848"
-static const ALIGN_ASSET(2) char kakusiana_room_11Tex_006848[] = dkakusiana_room_11Tex_006848;
-
-#define dkakusiana_room_11Tex_005848 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_11Tex_005848"
-static const ALIGN_ASSET(2) char kakusiana_room_11Tex_005848[] = dkakusiana_room_11Tex_005848;
-
-#define dkakusiana_room_11Tex_007848 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_11Tex_007848"
-static const ALIGN_ASSET(2) char kakusiana_room_11Tex_007848[] = dkakusiana_room_11Tex_007848;
-
-#define dkakusiana_room_11DL_0085C0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_11DL_0085C0"
-static const ALIGN_ASSET(2) char kakusiana_room_11DL_0085C0[] = dkakusiana_room_11DL_0085C0;
-
-#define dkakusiana_room_11DL_001430 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_11DL_001430"
-static const ALIGN_ASSET(2) char kakusiana_room_11DL_001430[] = dkakusiana_room_11DL_001430;
-
-#define dkakusiana_room_11DL_008418 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_11DL_008418"
-static const ALIGN_ASSET(2) char kakusiana_room_11DL_008418[] = dkakusiana_room_11DL_008418;
-
-#define dkakusiana_room_11DL_001728 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_11DL_001728"
-static const ALIGN_ASSET(2) char kakusiana_room_11DL_001728[] = dkakusiana_room_11DL_001728;
-
-#define dkakusiana_room_11DL_001068 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_11DL_001068"
-static const ALIGN_ASSET(2) char kakusiana_room_11DL_001068[] = dkakusiana_room_11DL_001068;
-
-#define dkakusiana_room_11Tex_004048 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_11Tex_004048"
+#define dkakusiana_room_11Tex_004048 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_11Tex_004048"
 static const ALIGN_ASSET(2) char kakusiana_room_11Tex_004048[] = dkakusiana_room_11Tex_004048;
 
-#define dkakusiana_room_11Tex_003048 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_11Tex_003048"
-static const ALIGN_ASSET(2) char kakusiana_room_11Tex_003048[] = dkakusiana_room_11Tex_003048;
+#define dkakusiana_room_11Tex_005048 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_11Tex_005048"
+static const ALIGN_ASSET(2) char kakusiana_room_11Tex_005048[] = dkakusiana_room_11Tex_005048;
+
+#define dkakusiana_room_11Tex_005848 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_11Tex_005848"
+static const ALIGN_ASSET(2) char kakusiana_room_11Tex_005848[] = dkakusiana_room_11Tex_005848;
+
+#define dkakusiana_room_11Tex_006848 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_11Tex_006848"
+static const ALIGN_ASSET(2) char kakusiana_room_11Tex_006848[] = dkakusiana_room_11Tex_006848;
+
+#define dkakusiana_room_11Tex_007848 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_11Tex_007848"
+static const ALIGN_ASSET(2) char kakusiana_room_11Tex_007848[] = dkakusiana_room_11Tex_007848;
+
+#define dkakusiana_room_11DL_008250 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_11DL_008250"
+static const ALIGN_ASSET(2) char kakusiana_room_11DL_008250[] = dkakusiana_room_11DL_008250;
+
+#define dkakusiana_room_11DL_0006D0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_11DL_0006D0"
+static const ALIGN_ASSET(2) char kakusiana_room_11DL_0006D0[] = dkakusiana_room_11DL_0006D0;
+
+#define dkakusiana_room_11DL_000340 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_11DL_000340"
+static const ALIGN_ASSET(2) char kakusiana_room_11DL_000340[] = dkakusiana_room_11DL_000340;
+
+#define dkakusiana_room_11DL_0023E8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_11DL_0023E8"
+static const ALIGN_ASSET(2) char kakusiana_room_11DL_0023E8[] = dkakusiana_room_11DL_0023E8;
+
+#define dkakusiana_room_11DL_0085C0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_11DL_0085C0"
+static const ALIGN_ASSET(2) char kakusiana_room_11DL_0085C0[] = dkakusiana_room_11DL_0085C0;
+
+#define dkakusiana_room_11DL_001430 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_11DL_001430"
+static const ALIGN_ASSET(2) char kakusiana_room_11DL_001430[] = dkakusiana_room_11DL_001430;
+
+#define dkakusiana_room_11DL_008418 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_11DL_008418"
+static const ALIGN_ASSET(2) char kakusiana_room_11DL_008418[] = dkakusiana_room_11DL_008418;
+
+#define dkakusiana_room_11DL_001728 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_11DL_001728"
+static const ALIGN_ASSET(2) char kakusiana_room_11DL_001728[] = dkakusiana_room_11DL_001728;
+
+#define dkakusiana_room_11DL_001068 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_11DL_001068"
+static const ALIGN_ASSET(2) char kakusiana_room_11DL_001068[] = dkakusiana_room_11DL_001068;
 
 
 #endif // MISC_KAKUSIANA_ROOM_11_H
diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_12.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_12.h
index c69ea90bd..9c30a8148 100644
--- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_12.h
+++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_12.h
@@ -3,53 +3,53 @@
 
 #include "align_asset_macro.h"
 
-#define dkakusiana_room_12DL_0079F0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12DL_0079F0"
-static const ALIGN_ASSET(2) char kakusiana_room_12DL_0079F0[] = dkakusiana_room_12DL_0079F0;
-
-#define dkakusiana_room_12DL_0004A0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12DL_0004A0"
-static const ALIGN_ASSET(2) char kakusiana_room_12DL_0004A0[] = dkakusiana_room_12DL_0004A0;
-
-#define dkakusiana_room_12Tex_0047F0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12Tex_0047F0"
-static const ALIGN_ASSET(2) char kakusiana_room_12Tex_0047F0[] = dkakusiana_room_12Tex_0047F0;
-
-#define dkakusiana_room_12Tex_001FF0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12Tex_001FF0"
+#define dkakusiana_room_12Tex_001FF0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12Tex_001FF0"
 static const ALIGN_ASSET(2) char kakusiana_room_12Tex_001FF0[] = dkakusiana_room_12Tex_001FF0;
 
-#define dkakusiana_room_12DL_000270 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12DL_000270"
-static const ALIGN_ASSET(2) char kakusiana_room_12DL_000270[] = dkakusiana_room_12DL_000270;
+#define dkakusiana_room_12Tex_0027F0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12Tex_0027F0"
+static const ALIGN_ASSET(2) char kakusiana_room_12Tex_0027F0[] = dkakusiana_room_12Tex_0027F0;
 
-#define dkakusiana_room_12DL_001C28 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12DL_001C28"
-static const ALIGN_ASSET(2) char kakusiana_room_12DL_001C28[] = dkakusiana_room_12DL_001C28;
-
-#define dkakusiana_room_12Tex_004FF0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12Tex_004FF0"
-static const ALIGN_ASSET(2) char kakusiana_room_12Tex_004FF0[] = dkakusiana_room_12Tex_004FF0;
-
-#define dkakusiana_room_12Tex_005FF0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12Tex_005FF0"
-static const ALIGN_ASSET(2) char kakusiana_room_12Tex_005FF0[] = dkakusiana_room_12Tex_005FF0;
-
-#define dkakusiana_room_12Tex_006FF0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12Tex_006FF0"
-static const ALIGN_ASSET(2) char kakusiana_room_12Tex_006FF0[] = dkakusiana_room_12Tex_006FF0;
-
-#define dkakusiana_room_12DL_007D60 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12DL_007D60"
-static const ALIGN_ASSET(2) char kakusiana_room_12DL_007D60[] = dkakusiana_room_12DL_007D60;
-
-#define dkakusiana_room_12DL_000ED0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12DL_000ED0"
-static const ALIGN_ASSET(2) char kakusiana_room_12DL_000ED0[] = dkakusiana_room_12DL_000ED0;
-
-#define dkakusiana_room_12DL_007BB8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12DL_007BB8"
-static const ALIGN_ASSET(2) char kakusiana_room_12DL_007BB8[] = dkakusiana_room_12DL_007BB8;
-
-#define dkakusiana_room_12DL_0011C8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12DL_0011C8"
-static const ALIGN_ASSET(2) char kakusiana_room_12DL_0011C8[] = dkakusiana_room_12DL_0011C8;
-
-#define dkakusiana_room_12DL_000BA8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12DL_000BA8"
-static const ALIGN_ASSET(2) char kakusiana_room_12DL_000BA8[] = dkakusiana_room_12DL_000BA8;
-
-#define dkakusiana_room_12Tex_0037F0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12Tex_0037F0"
+#define dkakusiana_room_12Tex_0037F0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12Tex_0037F0"
 static const ALIGN_ASSET(2) char kakusiana_room_12Tex_0037F0[] = dkakusiana_room_12Tex_0037F0;
 
-#define dkakusiana_room_12Tex_0027F0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_12Tex_0027F0"
-static const ALIGN_ASSET(2) char kakusiana_room_12Tex_0027F0[] = dkakusiana_room_12Tex_0027F0;
+#define dkakusiana_room_12Tex_0047F0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12Tex_0047F0"
+static const ALIGN_ASSET(2) char kakusiana_room_12Tex_0047F0[] = dkakusiana_room_12Tex_0047F0;
+
+#define dkakusiana_room_12Tex_004FF0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12Tex_004FF0"
+static const ALIGN_ASSET(2) char kakusiana_room_12Tex_004FF0[] = dkakusiana_room_12Tex_004FF0;
+
+#define dkakusiana_room_12Tex_005FF0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12Tex_005FF0"
+static const ALIGN_ASSET(2) char kakusiana_room_12Tex_005FF0[] = dkakusiana_room_12Tex_005FF0;
+
+#define dkakusiana_room_12Tex_006FF0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12Tex_006FF0"
+static const ALIGN_ASSET(2) char kakusiana_room_12Tex_006FF0[] = dkakusiana_room_12Tex_006FF0;
+
+#define dkakusiana_room_12DL_0079F0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12DL_0079F0"
+static const ALIGN_ASSET(2) char kakusiana_room_12DL_0079F0[] = dkakusiana_room_12DL_0079F0;
+
+#define dkakusiana_room_12DL_0004A0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12DL_0004A0"
+static const ALIGN_ASSET(2) char kakusiana_room_12DL_0004A0[] = dkakusiana_room_12DL_0004A0;
+
+#define dkakusiana_room_12DL_000270 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12DL_000270"
+static const ALIGN_ASSET(2) char kakusiana_room_12DL_000270[] = dkakusiana_room_12DL_000270;
+
+#define dkakusiana_room_12DL_001C28 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12DL_001C28"
+static const ALIGN_ASSET(2) char kakusiana_room_12DL_001C28[] = dkakusiana_room_12DL_001C28;
+
+#define dkakusiana_room_12DL_007D60 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12DL_007D60"
+static const ALIGN_ASSET(2) char kakusiana_room_12DL_007D60[] = dkakusiana_room_12DL_007D60;
+
+#define dkakusiana_room_12DL_000ED0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12DL_000ED0"
+static const ALIGN_ASSET(2) char kakusiana_room_12DL_000ED0[] = dkakusiana_room_12DL_000ED0;
+
+#define dkakusiana_room_12DL_007BB8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12DL_007BB8"
+static const ALIGN_ASSET(2) char kakusiana_room_12DL_007BB8[] = dkakusiana_room_12DL_007BB8;
+
+#define dkakusiana_room_12DL_0011C8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12DL_0011C8"
+static const ALIGN_ASSET(2) char kakusiana_room_12DL_0011C8[] = dkakusiana_room_12DL_0011C8;
+
+#define dkakusiana_room_12DL_000BA8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_12DL_000BA8"
+static const ALIGN_ASSET(2) char kakusiana_room_12DL_000BA8[] = dkakusiana_room_12DL_000BA8;
 
 
 #endif // MISC_KAKUSIANA_ROOM_12_H
diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_13.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_13.h
index 780ac7437..ed41508c3 100644
--- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_13.h
+++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_13.h
@@ -3,47 +3,47 @@
 
 #include "align_asset_macro.h"
 
-#define dkakusiana_room_13DL_004350 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13DL_004350"
-static const ALIGN_ASSET(2) char kakusiana_room_13DL_004350[] = dkakusiana_room_13DL_004350;
-
-#define dkakusiana_room_13DL_000FF8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13DL_000FF8"
-static const ALIGN_ASSET(2) char kakusiana_room_13DL_000FF8[] = dkakusiana_room_13DL_000FF8;
-
-#define dkakusiana_room_13Tex_003950 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13Tex_003950"
-static const ALIGN_ASSET(2) char kakusiana_room_13Tex_003950[] = dkakusiana_room_13Tex_003950;
-
-#define dkakusiana_room_13DL_004C50 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13DL_004C50"
-static const ALIGN_ASSET(2) char kakusiana_room_13DL_004C50[] = dkakusiana_room_13DL_004C50;
-
-#define dkakusiana_room_13Tex_005EC8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13Tex_005EC8"
-static const ALIGN_ASSET(2) char kakusiana_room_13Tex_005EC8[] = dkakusiana_room_13Tex_005EC8;
-
-#define dkakusiana_room_13Tex_004EC8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13Tex_004EC8"
-static const ALIGN_ASSET(2) char kakusiana_room_13Tex_004EC8[] = dkakusiana_room_13Tex_004EC8;
-
-#define dkakusiana_room_13DL_001208 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13DL_001208"
-static const ALIGN_ASSET(2) char kakusiana_room_13DL_001208[] = dkakusiana_room_13DL_001208;
-
-#define dkakusiana_room_13DL_0013D0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13DL_0013D0"
-static const ALIGN_ASSET(2) char kakusiana_room_13DL_0013D0[] = dkakusiana_room_13DL_0013D0;
-
-#define dkakusiana_room_13DL_004518 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13DL_004518"
-static const ALIGN_ASSET(2) char kakusiana_room_13DL_004518[] = dkakusiana_room_13DL_004518;
-
-#define dkakusiana_room_13DL_000C08 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13DL_000C08"
-static const ALIGN_ASSET(2) char kakusiana_room_13DL_000C08[] = dkakusiana_room_13DL_000C08;
-
-#define dkakusiana_room_13Tex_001950 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13Tex_001950"
+#define dkakusiana_room_13Tex_001950 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13Tex_001950"
 static const ALIGN_ASSET(2) char kakusiana_room_13Tex_001950[] = dkakusiana_room_13Tex_001950;
 
-#define dkakusiana_room_13DL_0006F0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13DL_0006F0"
+#define dkakusiana_room_13Tex_002950 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13Tex_002950"
+static const ALIGN_ASSET(2) char kakusiana_room_13Tex_002950[] = dkakusiana_room_13Tex_002950;
+
+#define dkakusiana_room_13Tex_003950 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13Tex_003950"
+static const ALIGN_ASSET(2) char kakusiana_room_13Tex_003950[] = dkakusiana_room_13Tex_003950;
+
+#define dkakusiana_room_13Tex_004EC8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13Tex_004EC8"
+static const ALIGN_ASSET(2) char kakusiana_room_13Tex_004EC8[] = dkakusiana_room_13Tex_004EC8;
+
+#define dkakusiana_room_13Tex_005EC8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13Tex_005EC8"
+static const ALIGN_ASSET(2) char kakusiana_room_13Tex_005EC8[] = dkakusiana_room_13Tex_005EC8;
+
+#define dkakusiana_room_13DL_004350 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13DL_004350"
+static const ALIGN_ASSET(2) char kakusiana_room_13DL_004350[] = dkakusiana_room_13DL_004350;
+
+#define dkakusiana_room_13DL_000FF8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13DL_000FF8"
+static const ALIGN_ASSET(2) char kakusiana_room_13DL_000FF8[] = dkakusiana_room_13DL_000FF8;
+
+#define dkakusiana_room_13DL_004C50 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13DL_004C50"
+static const ALIGN_ASSET(2) char kakusiana_room_13DL_004C50[] = dkakusiana_room_13DL_004C50;
+
+#define dkakusiana_room_13DL_001208 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13DL_001208"
+static const ALIGN_ASSET(2) char kakusiana_room_13DL_001208[] = dkakusiana_room_13DL_001208;
+
+#define dkakusiana_room_13DL_0013D0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13DL_0013D0"
+static const ALIGN_ASSET(2) char kakusiana_room_13DL_0013D0[] = dkakusiana_room_13DL_0013D0;
+
+#define dkakusiana_room_13DL_004518 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13DL_004518"
+static const ALIGN_ASSET(2) char kakusiana_room_13DL_004518[] = dkakusiana_room_13DL_004518;
+
+#define dkakusiana_room_13DL_000C08 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13DL_000C08"
+static const ALIGN_ASSET(2) char kakusiana_room_13DL_000C08[] = dkakusiana_room_13DL_000C08;
+
+#define dkakusiana_room_13DL_0006F0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13DL_0006F0"
 static const ALIGN_ASSET(2) char kakusiana_room_13DL_0006F0[] = dkakusiana_room_13DL_0006F0;
 
-#define dkakusiana_room_13DL_0017B8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13DL_0017B8"
+#define dkakusiana_room_13DL_0017B8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_13DL_0017B8"
 static const ALIGN_ASSET(2) char kakusiana_room_13DL_0017B8[] = dkakusiana_room_13DL_0017B8;
 
-#define dkakusiana_room_13Tex_002950 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_13Tex_002950"
-static const ALIGN_ASSET(2) char kakusiana_room_13Tex_002950[] = dkakusiana_room_13Tex_002950;
-
 
 #endif // MISC_KAKUSIANA_ROOM_13_H
diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_2.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_2.h
index f03a320f5..621fac263 100644
--- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_2.h
+++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_2.h
@@ -3,29 +3,29 @@
 
 #include "align_asset_macro.h"
 
-#define dkakusiana_room_2DL_002650 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_2DL_002650"
-static const ALIGN_ASSET(2) char kakusiana_room_2DL_002650[] = dkakusiana_room_2DL_002650;
+#define dkakusiana_room_2Tex_001448 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_2Tex_001448"
+static const ALIGN_ASSET(2) char kakusiana_room_2Tex_001448[] = dkakusiana_room_2Tex_001448;
 
-#define dkakusiana_room_2DL_000F70 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_2DL_000F70"
-static const ALIGN_ASSET(2) char kakusiana_room_2DL_000F70[] = dkakusiana_room_2DL_000F70;
-
-#define dkakusiana_room_2Tex_001C48 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_2Tex_001C48"
+#define dkakusiana_room_2Tex_001C48 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_2Tex_001C48"
 static const ALIGN_ASSET(2) char kakusiana_room_2Tex_001C48[] = dkakusiana_room_2Tex_001C48;
 
-#define dkakusiana_room_2DL_0011B0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_2DL_0011B0"
+#define dkakusiana_room_2DL_002650 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_2DL_002650"
+static const ALIGN_ASSET(2) char kakusiana_room_2DL_002650[] = dkakusiana_room_2DL_002650;
+
+#define dkakusiana_room_2DL_000F70 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_2DL_000F70"
+static const ALIGN_ASSET(2) char kakusiana_room_2DL_000F70[] = dkakusiana_room_2DL_000F70;
+
+#define dkakusiana_room_2DL_0011B0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_2DL_0011B0"
 static const ALIGN_ASSET(2) char kakusiana_room_2DL_0011B0[] = dkakusiana_room_2DL_0011B0;
 
-#define dkakusiana_room_2DL_001378 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_2DL_001378"
+#define dkakusiana_room_2DL_001378 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_2DL_001378"
 static const ALIGN_ASSET(2) char kakusiana_room_2DL_001378[] = dkakusiana_room_2DL_001378;
 
-#define dkakusiana_room_2DL_002818 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_2DL_002818"
+#define dkakusiana_room_2DL_002818 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_2DL_002818"
 static const ALIGN_ASSET(2) char kakusiana_room_2DL_002818[] = dkakusiana_room_2DL_002818;
 
-#define dkakusiana_room_2DL_000A20 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_2DL_000A20"
+#define dkakusiana_room_2DL_000A20 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_2DL_000A20"
 static const ALIGN_ASSET(2) char kakusiana_room_2DL_000A20[] = dkakusiana_room_2DL_000A20;
 
-#define dkakusiana_room_2Tex_001448 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_2Tex_001448"
-static const ALIGN_ASSET(2) char kakusiana_room_2Tex_001448[] = dkakusiana_room_2Tex_001448;
-
 
 #endif // MISC_KAKUSIANA_ROOM_2_H
diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_3.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_3.h
index 4ce489cb3..752d7c0d3 100644
--- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_3.h
+++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_3.h
@@ -3,41 +3,41 @@
 
 #include "align_asset_macro.h"
 
-#define dkakusiana_room_3DL_003A20 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3DL_003A20"
-static const ALIGN_ASSET(2) char kakusiana_room_3DL_003A20[] = dkakusiana_room_3DL_003A20;
+#define dkakusiana_room_3Tex_001818 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3Tex_001818"
+static const ALIGN_ASSET(2) char kakusiana_room_3Tex_001818[] = dkakusiana_room_3Tex_001818;
 
-#define dkakusiana_room_3DL_0012A0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3DL_0012A0"
-static const ALIGN_ASSET(2) char kakusiana_room_3DL_0012A0[] = dkakusiana_room_3DL_0012A0;
-
-#define dkakusiana_room_3Tex_002818 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3Tex_002818"
+#define dkakusiana_room_3Tex_002818 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3Tex_002818"
 static const ALIGN_ASSET(2) char kakusiana_room_3Tex_002818[] = dkakusiana_room_3Tex_002818;
 
-#define dkakusiana_room_3DL_004008 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3DL_004008"
-static const ALIGN_ASSET(2) char kakusiana_room_3DL_004008[] = dkakusiana_room_3DL_004008;
-
-#define dkakusiana_room_3Tex_004130 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3Tex_004130"
+#define dkakusiana_room_3Tex_004130 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3Tex_004130"
 static const ALIGN_ASSET(2) char kakusiana_room_3Tex_004130[] = dkakusiana_room_3Tex_004130;
 
-#define dkakusiana_room_3DL_003BC8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3DL_003BC8"
-static const ALIGN_ASSET(2) char kakusiana_room_3DL_003BC8[] = dkakusiana_room_3DL_003BC8;
-
-#define dkakusiana_room_3Tex_004930 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3Tex_004930"
+#define dkakusiana_room_3Tex_004930 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3Tex_004930"
 static const ALIGN_ASSET(2) char kakusiana_room_3Tex_004930[] = dkakusiana_room_3Tex_004930;
 
-#define dkakusiana_room_3DL_001580 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3DL_001580"
+#define dkakusiana_room_3DL_003A20 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3DL_003A20"
+static const ALIGN_ASSET(2) char kakusiana_room_3DL_003A20[] = dkakusiana_room_3DL_003A20;
+
+#define dkakusiana_room_3DL_0012A0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3DL_0012A0"
+static const ALIGN_ASSET(2) char kakusiana_room_3DL_0012A0[] = dkakusiana_room_3DL_0012A0;
+
+#define dkakusiana_room_3DL_004008 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3DL_004008"
+static const ALIGN_ASSET(2) char kakusiana_room_3DL_004008[] = dkakusiana_room_3DL_004008;
+
+#define dkakusiana_room_3DL_003BC8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3DL_003BC8"
+static const ALIGN_ASSET(2) char kakusiana_room_3DL_003BC8[] = dkakusiana_room_3DL_003BC8;
+
+#define dkakusiana_room_3DL_001580 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3DL_001580"
 static const ALIGN_ASSET(2) char kakusiana_room_3DL_001580[] = dkakusiana_room_3DL_001580;
 
-#define dkakusiana_room_3DL_001748 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3DL_001748"
+#define dkakusiana_room_3DL_001748 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3DL_001748"
 static const ALIGN_ASSET(2) char kakusiana_room_3DL_001748[] = dkakusiana_room_3DL_001748;
 
-#define dkakusiana_room_3DL_003D80 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3DL_003D80"
+#define dkakusiana_room_3DL_003D80 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3DL_003D80"
 static const ALIGN_ASSET(2) char kakusiana_room_3DL_003D80[] = dkakusiana_room_3DL_003D80;
 
-#define dkakusiana_room_3DL_000AF0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3DL_000AF0"
+#define dkakusiana_room_3DL_000AF0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_3DL_000AF0"
 static const ALIGN_ASSET(2) char kakusiana_room_3DL_000AF0[] = dkakusiana_room_3DL_000AF0;
 
-#define dkakusiana_room_3Tex_001818 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_3Tex_001818"
-static const ALIGN_ASSET(2) char kakusiana_room_3Tex_001818[] = dkakusiana_room_3Tex_001818;
-
 
 #endif // MISC_KAKUSIANA_ROOM_3_H
diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_4.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_4.h
index 914535494..e2cc3703b 100644
--- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_4.h
+++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_4.h
@@ -3,47 +3,47 @@
 
 #include "align_asset_macro.h"
 
-#define dkakusiana_room_4DL_004B40 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4DL_004B40"
-static const ALIGN_ASSET(2) char kakusiana_room_4DL_004B40[] = dkakusiana_room_4DL_004B40;
-
-#define dkakusiana_room_4DL_001420 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4DL_001420"
-static const ALIGN_ASSET(2) char kakusiana_room_4DL_001420[] = dkakusiana_room_4DL_001420;
-
-#define dkakusiana_room_4Tex_004138 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4Tex_004138"
-static const ALIGN_ASSET(2) char kakusiana_room_4Tex_004138[] = dkakusiana_room_4Tex_004138;
-
-#define dkakusiana_room_4DL_005690 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4DL_005690"
-static const ALIGN_ASSET(2) char kakusiana_room_4DL_005690[] = dkakusiana_room_4DL_005690;
-
-#define dkakusiana_room_4Tex_006958 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4Tex_006958"
-static const ALIGN_ASSET(2) char kakusiana_room_4Tex_006958[] = dkakusiana_room_4Tex_006958;
-
-#define dkakusiana_room_4Tex_005958 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4Tex_005958"
-static const ALIGN_ASSET(2) char kakusiana_room_4Tex_005958[] = dkakusiana_room_4Tex_005958;
-
-#define dkakusiana_room_4DL_001660 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4DL_001660"
-static const ALIGN_ASSET(2) char kakusiana_room_4DL_001660[] = dkakusiana_room_4DL_001660;
-
-#define dkakusiana_room_4DL_001828 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4DL_001828"
-static const ALIGN_ASSET(2) char kakusiana_room_4DL_001828[] = dkakusiana_room_4DL_001828;
-
-#define dkakusiana_room_4DL_004D08 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4DL_004D08"
-static const ALIGN_ASSET(2) char kakusiana_room_4DL_004D08[] = dkakusiana_room_4DL_004D08;
-
-#define dkakusiana_room_4DL_000FF8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4DL_000FF8"
-static const ALIGN_ASSET(2) char kakusiana_room_4DL_000FF8[] = dkakusiana_room_4DL_000FF8;
-
-#define dkakusiana_room_4DL_000BB0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4DL_000BB0"
-static const ALIGN_ASSET(2) char kakusiana_room_4DL_000BB0[] = dkakusiana_room_4DL_000BB0;
-
-#define dkakusiana_room_4Tex_002138 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4Tex_002138"
+#define dkakusiana_room_4Tex_002138 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4Tex_002138"
 static const ALIGN_ASSET(2) char kakusiana_room_4Tex_002138[] = dkakusiana_room_4Tex_002138;
 
-#define dkakusiana_room_4DL_001F10 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4DL_001F10"
-static const ALIGN_ASSET(2) char kakusiana_room_4DL_001F10[] = dkakusiana_room_4DL_001F10;
-
-#define dkakusiana_room_4Tex_003138 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_4Tex_003138"
+#define dkakusiana_room_4Tex_003138 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4Tex_003138"
 static const ALIGN_ASSET(2) char kakusiana_room_4Tex_003138[] = dkakusiana_room_4Tex_003138;
 
+#define dkakusiana_room_4Tex_004138 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4Tex_004138"
+static const ALIGN_ASSET(2) char kakusiana_room_4Tex_004138[] = dkakusiana_room_4Tex_004138;
+
+#define dkakusiana_room_4Tex_005958 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4Tex_005958"
+static const ALIGN_ASSET(2) char kakusiana_room_4Tex_005958[] = dkakusiana_room_4Tex_005958;
+
+#define dkakusiana_room_4Tex_006958 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4Tex_006958"
+static const ALIGN_ASSET(2) char kakusiana_room_4Tex_006958[] = dkakusiana_room_4Tex_006958;
+
+#define dkakusiana_room_4DL_004B40 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4DL_004B40"
+static const ALIGN_ASSET(2) char kakusiana_room_4DL_004B40[] = dkakusiana_room_4DL_004B40;
+
+#define dkakusiana_room_4DL_001420 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4DL_001420"
+static const ALIGN_ASSET(2) char kakusiana_room_4DL_001420[] = dkakusiana_room_4DL_001420;
+
+#define dkakusiana_room_4DL_005690 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4DL_005690"
+static const ALIGN_ASSET(2) char kakusiana_room_4DL_005690[] = dkakusiana_room_4DL_005690;
+
+#define dkakusiana_room_4DL_001660 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4DL_001660"
+static const ALIGN_ASSET(2) char kakusiana_room_4DL_001660[] = dkakusiana_room_4DL_001660;
+
+#define dkakusiana_room_4DL_001828 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4DL_001828"
+static const ALIGN_ASSET(2) char kakusiana_room_4DL_001828[] = dkakusiana_room_4DL_001828;
+
+#define dkakusiana_room_4DL_004D08 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4DL_004D08"
+static const ALIGN_ASSET(2) char kakusiana_room_4DL_004D08[] = dkakusiana_room_4DL_004D08;
+
+#define dkakusiana_room_4DL_000FF8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4DL_000FF8"
+static const ALIGN_ASSET(2) char kakusiana_room_4DL_000FF8[] = dkakusiana_room_4DL_000FF8;
+
+#define dkakusiana_room_4DL_000BB0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4DL_000BB0"
+static const ALIGN_ASSET(2) char kakusiana_room_4DL_000BB0[] = dkakusiana_room_4DL_000BB0;
+
+#define dkakusiana_room_4DL_001F10 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_4DL_001F10"
+static const ALIGN_ASSET(2) char kakusiana_room_4DL_001F10[] = dkakusiana_room_4DL_001F10;
+
 
 #endif // MISC_KAKUSIANA_ROOM_4_H
diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_5.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_5.h
index 74961eeef..e00cd10da 100644
--- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_5.h
+++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_5.h
@@ -3,38 +3,38 @@
 
 #include "align_asset_macro.h"
 
-#define dkakusiana_room_5DL_003A90 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_5DL_003A90"
-static const ALIGN_ASSET(2) char kakusiana_room_5DL_003A90[] = dkakusiana_room_5DL_003A90;
-
-#define dkakusiana_room_5DL_001320 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_5DL_001320"
-static const ALIGN_ASSET(2) char kakusiana_room_5DL_001320[] = dkakusiana_room_5DL_001320;
-
-#define dkakusiana_room_5Tex_001888 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_5Tex_001888"
+#define dkakusiana_room_5Tex_001888 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_5Tex_001888"
 static const ALIGN_ASSET(2) char kakusiana_room_5Tex_001888[] = dkakusiana_room_5Tex_001888;
 
-#define dkakusiana_room_5DL_003C68 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_5DL_003C68"
-static const ALIGN_ASSET(2) char kakusiana_room_5DL_003C68[] = dkakusiana_room_5DL_003C68;
+#define dkakusiana_room_5Tex_002888 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_5Tex_002888"
+static const ALIGN_ASSET(2) char kakusiana_room_5Tex_002888[] = dkakusiana_room_5Tex_002888;
 
-#define dkakusiana_room_5Tex_003ED8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_5Tex_003ED8"
+#define dkakusiana_room_5Tex_003ED8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_5Tex_003ED8"
 static const ALIGN_ASSET(2) char kakusiana_room_5Tex_003ED8[] = dkakusiana_room_5Tex_003ED8;
 
-#define dkakusiana_room_5DL_0015E8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_5DL_0015E8"
+#define dkakusiana_room_5DL_003A90 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_5DL_003A90"
+static const ALIGN_ASSET(2) char kakusiana_room_5DL_003A90[] = dkakusiana_room_5DL_003A90;
+
+#define dkakusiana_room_5DL_001320 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_5DL_001320"
+static const ALIGN_ASSET(2) char kakusiana_room_5DL_001320[] = dkakusiana_room_5DL_001320;
+
+#define dkakusiana_room_5DL_003C68 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_5DL_003C68"
+static const ALIGN_ASSET(2) char kakusiana_room_5DL_003C68[] = dkakusiana_room_5DL_003C68;
+
+#define dkakusiana_room_5DL_0015E8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_5DL_0015E8"
 static const ALIGN_ASSET(2) char kakusiana_room_5DL_0015E8[] = dkakusiana_room_5DL_0015E8;
 
-#define dkakusiana_room_5DL_0017B0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_5DL_0017B0"
+#define dkakusiana_room_5DL_0017B0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_5DL_0017B0"
 static const ALIGN_ASSET(2) char kakusiana_room_5DL_0017B0[] = dkakusiana_room_5DL_0017B0;
 
-#define dkakusiana_room_5DL_003E30 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_5DL_003E30"
+#define dkakusiana_room_5DL_003E30 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_5DL_003E30"
 static const ALIGN_ASSET(2) char kakusiana_room_5DL_003E30[] = dkakusiana_room_5DL_003E30;
 
-#define dkakusiana_room_5DL_000CD8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_5DL_000CD8"
+#define dkakusiana_room_5DL_000CD8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_5DL_000CD8"
 static const ALIGN_ASSET(2) char kakusiana_room_5DL_000CD8[] = dkakusiana_room_5DL_000CD8;
 
-#define dkakusiana_room_5DL_0007D0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_5DL_0007D0"
+#define dkakusiana_room_5DL_0007D0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_5DL_0007D0"
 static const ALIGN_ASSET(2) char kakusiana_room_5DL_0007D0[] = dkakusiana_room_5DL_0007D0;
 
-#define dkakusiana_room_5Tex_002888 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_5Tex_002888"
-static const ALIGN_ASSET(2) char kakusiana_room_5Tex_002888[] = dkakusiana_room_5Tex_002888;
-
 
 #endif // MISC_KAKUSIANA_ROOM_5_H
diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_6.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_6.h
index 100b9f7a9..68e4c06d0 100644
--- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_6.h
+++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_6.h
@@ -3,44 +3,44 @@
 
 #include "align_asset_macro.h"
 
-#define dkakusiana_room_6DL_0055E0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6DL_0055E0"
-static const ALIGN_ASSET(2) char kakusiana_room_6DL_0055E0[] = dkakusiana_room_6DL_0055E0;
+#define dkakusiana_room_6Tex_0022E0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6Tex_0022E0"
+static const ALIGN_ASSET(2) char kakusiana_room_6Tex_0022E0[] = dkakusiana_room_6Tex_0022E0;
 
-#define dkakusiana_room_6DL_000A98 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6DL_000A98"
-static const ALIGN_ASSET(2) char kakusiana_room_6DL_000A98[] = dkakusiana_room_6DL_000A98;
-
-#define dkakusiana_room_6Tex_0032E0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6Tex_0032E0"
+#define dkakusiana_room_6Tex_0032E0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6Tex_0032E0"
 static const ALIGN_ASSET(2) char kakusiana_room_6Tex_0032E0[] = dkakusiana_room_6Tex_0032E0;
 
-#define dkakusiana_room_6DL_001D78 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6DL_001D78"
-static const ALIGN_ASSET(2) char kakusiana_room_6DL_001D78[] = dkakusiana_room_6DL_001D78;
-
-#define dkakusiana_room_6Tex_004AE0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6Tex_004AE0"
-static const ALIGN_ASSET(2) char kakusiana_room_6Tex_004AE0[] = dkakusiana_room_6Tex_004AE0;
-
-#define dkakusiana_room_6Tex_003AE0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6Tex_003AE0"
+#define dkakusiana_room_6Tex_003AE0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6Tex_003AE0"
 static const ALIGN_ASSET(2) char kakusiana_room_6Tex_003AE0[] = dkakusiana_room_6Tex_003AE0;
 
-#define dkakusiana_room_6DL_005810 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6DL_005810"
+#define dkakusiana_room_6Tex_004AE0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6Tex_004AE0"
+static const ALIGN_ASSET(2) char kakusiana_room_6Tex_004AE0[] = dkakusiana_room_6Tex_004AE0;
+
+#define dkakusiana_room_6DL_0055E0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6DL_0055E0"
+static const ALIGN_ASSET(2) char kakusiana_room_6DL_0055E0[] = dkakusiana_room_6DL_0055E0;
+
+#define dkakusiana_room_6DL_000A98 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6DL_000A98"
+static const ALIGN_ASSET(2) char kakusiana_room_6DL_000A98[] = dkakusiana_room_6DL_000A98;
+
+#define dkakusiana_room_6DL_001D78 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6DL_001D78"
+static const ALIGN_ASSET(2) char kakusiana_room_6DL_001D78[] = dkakusiana_room_6DL_001D78;
+
+#define dkakusiana_room_6DL_005810 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6DL_005810"
 static const ALIGN_ASSET(2) char kakusiana_room_6DL_005810[] = dkakusiana_room_6DL_005810;
 
-#define dkakusiana_room_6DL_001190 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6DL_001190"
+#define dkakusiana_room_6DL_001190 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6DL_001190"
 static const ALIGN_ASSET(2) char kakusiana_room_6DL_001190[] = dkakusiana_room_6DL_001190;
 
-#define dkakusiana_room_6DL_002200 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6DL_002200"
+#define dkakusiana_room_6DL_002200 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6DL_002200"
 static const ALIGN_ASSET(2) char kakusiana_room_6DL_002200[] = dkakusiana_room_6DL_002200;
 
-#define dkakusiana_room_6DL_0059C0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6DL_0059C0"
+#define dkakusiana_room_6DL_0059C0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6DL_0059C0"
 static const ALIGN_ASSET(2) char kakusiana_room_6DL_0059C0[] = dkakusiana_room_6DL_0059C0;
 
-#define dkakusiana_room_6DL_000F48 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6DL_000F48"
+#define dkakusiana_room_6DL_000F48 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6DL_000F48"
 static const ALIGN_ASSET(2) char kakusiana_room_6DL_000F48[] = dkakusiana_room_6DL_000F48;
 
-#define dkakusiana_room_6DL_0006B0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6DL_0006B0"
+#define dkakusiana_room_6DL_0006B0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_6DL_0006B0"
 static const ALIGN_ASSET(2) char kakusiana_room_6DL_0006B0[] = dkakusiana_room_6DL_0006B0;
 
-#define dkakusiana_room_6Tex_0022E0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_6Tex_0022E0"
-static const ALIGN_ASSET(2) char kakusiana_room_6Tex_0022E0[] = dkakusiana_room_6Tex_0022E0;
-
 
 #endif // MISC_KAKUSIANA_ROOM_6_H
diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_7.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_7.h
index 2f7ad9f56..af5a194f5 100644
--- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_7.h
+++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_7.h
@@ -3,41 +3,41 @@
 
 #include "align_asset_macro.h"
 
-#define dkakusiana_room_7DL_003D60 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7DL_003D60"
-static const ALIGN_ASSET(2) char kakusiana_room_7DL_003D60[] = dkakusiana_room_7DL_003D60;
+#define dkakusiana_room_7Tex_001D60 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7Tex_001D60"
+static const ALIGN_ASSET(2) char kakusiana_room_7Tex_001D60[] = dkakusiana_room_7Tex_001D60;
 
-#define dkakusiana_room_7DL_0006C8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7DL_0006C8"
-static const ALIGN_ASSET(2) char kakusiana_room_7DL_0006C8[] = dkakusiana_room_7DL_0006C8;
-
-#define dkakusiana_room_7Tex_002B60 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7Tex_002B60"
-static const ALIGN_ASSET(2) char kakusiana_room_7Tex_002B60[] = dkakusiana_room_7Tex_002B60;
-
-#define dkakusiana_room_7Tex_002160 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7Tex_002160"
+#define dkakusiana_room_7Tex_002160 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7Tex_002160"
 static const ALIGN_ASSET(2) char kakusiana_room_7Tex_002160[] = dkakusiana_room_7Tex_002160;
 
-#define dkakusiana_room_7DL_000960 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7DL_000960"
-static const ALIGN_ASSET(2) char kakusiana_room_7DL_000960[] = dkakusiana_room_7DL_000960;
-
-#define dkakusiana_room_7DL_000B28 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7DL_000B28"
-static const ALIGN_ASSET(2) char kakusiana_room_7DL_000B28[] = dkakusiana_room_7DL_000B28;
-
-#define dkakusiana_room_7DL_003F28 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7DL_003F28"
-static const ALIGN_ASSET(2) char kakusiana_room_7DL_003F28[] = dkakusiana_room_7DL_003F28;
-
-#define dkakusiana_room_7DL_000290 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7DL_000290"
-static const ALIGN_ASSET(2) char kakusiana_room_7DL_000290[] = dkakusiana_room_7DL_000290;
-
-#define dkakusiana_room_7DL_0015C0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7DL_0015C0"
-static const ALIGN_ASSET(2) char kakusiana_room_7DL_0015C0[] = dkakusiana_room_7DL_0015C0;
-
-#define dkakusiana_room_7Tex_002960 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7Tex_002960"
+#define dkakusiana_room_7Tex_002960 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7Tex_002960"
 static const ALIGN_ASSET(2) char kakusiana_room_7Tex_002960[] = dkakusiana_room_7Tex_002960;
 
-#define dkakusiana_room_7DL_001B88 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7DL_001B88"
-static const ALIGN_ASSET(2) char kakusiana_room_7DL_001B88[] = dkakusiana_room_7DL_001B88;
+#define dkakusiana_room_7Tex_002B60 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7Tex_002B60"
+static const ALIGN_ASSET(2) char kakusiana_room_7Tex_002B60[] = dkakusiana_room_7Tex_002B60;
 
-#define dkakusiana_room_7Tex_001D60 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_7Tex_001D60"
-static const ALIGN_ASSET(2) char kakusiana_room_7Tex_001D60[] = dkakusiana_room_7Tex_001D60;
+#define dkakusiana_room_7DL_003D60 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7DL_003D60"
+static const ALIGN_ASSET(2) char kakusiana_room_7DL_003D60[] = dkakusiana_room_7DL_003D60;
+
+#define dkakusiana_room_7DL_0006C8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7DL_0006C8"
+static const ALIGN_ASSET(2) char kakusiana_room_7DL_0006C8[] = dkakusiana_room_7DL_0006C8;
+
+#define dkakusiana_room_7DL_000960 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7DL_000960"
+static const ALIGN_ASSET(2) char kakusiana_room_7DL_000960[] = dkakusiana_room_7DL_000960;
+
+#define dkakusiana_room_7DL_000B28 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7DL_000B28"
+static const ALIGN_ASSET(2) char kakusiana_room_7DL_000B28[] = dkakusiana_room_7DL_000B28;
+
+#define dkakusiana_room_7DL_003F28 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7DL_003F28"
+static const ALIGN_ASSET(2) char kakusiana_room_7DL_003F28[] = dkakusiana_room_7DL_003F28;
+
+#define dkakusiana_room_7DL_000290 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7DL_000290"
+static const ALIGN_ASSET(2) char kakusiana_room_7DL_000290[] = dkakusiana_room_7DL_000290;
+
+#define dkakusiana_room_7DL_0015C0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7DL_0015C0"
+static const ALIGN_ASSET(2) char kakusiana_room_7DL_0015C0[] = dkakusiana_room_7DL_0015C0;
+
+#define dkakusiana_room_7DL_001B88 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_7DL_001B88"
+static const ALIGN_ASSET(2) char kakusiana_room_7DL_001B88[] = dkakusiana_room_7DL_001B88;
 
 
 #endif // MISC_KAKUSIANA_ROOM_7_H
diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_8.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_8.h
index 14325312f..78362fa3b 100644
--- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_8.h
+++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_8.h
@@ -3,32 +3,32 @@
 
 #include "align_asset_macro.h"
 
-#define dkakusiana_room_8DL_0033C0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_8DL_0033C0"
-static const ALIGN_ASSET(2) char kakusiana_room_8DL_0033C0[] = dkakusiana_room_8DL_0033C0;
+#define dkakusiana_room_8Tex_0019C0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_8Tex_0019C0"
+static const ALIGN_ASSET(2) char kakusiana_room_8Tex_0019C0[] = dkakusiana_room_8Tex_0019C0;
 
-#define dkakusiana_room_8DL_0014B8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_8DL_0014B8"
-static const ALIGN_ASSET(2) char kakusiana_room_8DL_0014B8[] = dkakusiana_room_8DL_0014B8;
-
-#define dkakusiana_room_8Tex_0029C0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_8Tex_0029C0"
+#define dkakusiana_room_8Tex_0029C0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_8Tex_0029C0"
 static const ALIGN_ASSET(2) char kakusiana_room_8Tex_0029C0[] = dkakusiana_room_8Tex_0029C0;
 
-#define dkakusiana_room_8DL_001720 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_8DL_001720"
+#define dkakusiana_room_8DL_0033C0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_8DL_0033C0"
+static const ALIGN_ASSET(2) char kakusiana_room_8DL_0033C0[] = dkakusiana_room_8DL_0033C0;
+
+#define dkakusiana_room_8DL_0014B8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_8DL_0014B8"
+static const ALIGN_ASSET(2) char kakusiana_room_8DL_0014B8[] = dkakusiana_room_8DL_0014B8;
+
+#define dkakusiana_room_8DL_001720 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_8DL_001720"
 static const ALIGN_ASSET(2) char kakusiana_room_8DL_001720[] = dkakusiana_room_8DL_001720;
 
-#define dkakusiana_room_8DL_0018E8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_8DL_0018E8"
+#define dkakusiana_room_8DL_0018E8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_8DL_0018E8"
 static const ALIGN_ASSET(2) char kakusiana_room_8DL_0018E8[] = dkakusiana_room_8DL_0018E8;
 
-#define dkakusiana_room_8DL_003588 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_8DL_003588"
+#define dkakusiana_room_8DL_003588 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_8DL_003588"
 static const ALIGN_ASSET(2) char kakusiana_room_8DL_003588[] = dkakusiana_room_8DL_003588;
 
-#define dkakusiana_room_8DL_001048 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_8DL_001048"
+#define dkakusiana_room_8DL_001048 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_8DL_001048"
 static const ALIGN_ASSET(2) char kakusiana_room_8DL_001048[] = dkakusiana_room_8DL_001048;
 
-#define dkakusiana_room_8DL_000B20 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_8DL_000B20"
+#define dkakusiana_room_8DL_000B20 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_8DL_000B20"
 static const ALIGN_ASSET(2) char kakusiana_room_8DL_000B20[] = dkakusiana_room_8DL_000B20;
 
-#define dkakusiana_room_8Tex_0019C0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_8Tex_0019C0"
-static const ALIGN_ASSET(2) char kakusiana_room_8Tex_0019C0[] = dkakusiana_room_8Tex_0019C0;
-
 
 #endif // MISC_KAKUSIANA_ROOM_8_H
diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_room_9.h b/soh/assets/scenes/misc/kakusiana/kakusiana_room_9.h
index 088fd8dfa..0196fc23b 100644
--- a/soh/assets/scenes/misc/kakusiana/kakusiana_room_9.h
+++ b/soh/assets/scenes/misc/kakusiana/kakusiana_room_9.h
@@ -3,44 +3,44 @@
 
 #include "align_asset_macro.h"
 
-#define dkakusiana_room_9DL_005640 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9DL_005640"
-static const ALIGN_ASSET(2) char kakusiana_room_9DL_005640[] = dkakusiana_room_9DL_005640;
+#define dkakusiana_room_9Tex_002340 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9Tex_002340"
+static const ALIGN_ASSET(2) char kakusiana_room_9Tex_002340[] = dkakusiana_room_9Tex_002340;
 
-#define dkakusiana_room_9DL_000AC8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9DL_000AC8"
-static const ALIGN_ASSET(2) char kakusiana_room_9DL_000AC8[] = dkakusiana_room_9DL_000AC8;
-
-#define dkakusiana_room_9Tex_003340 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9Tex_003340"
+#define dkakusiana_room_9Tex_003340 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9Tex_003340"
 static const ALIGN_ASSET(2) char kakusiana_room_9Tex_003340[] = dkakusiana_room_9Tex_003340;
 
-#define dkakusiana_room_9DL_001DD0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9DL_001DD0"
-static const ALIGN_ASSET(2) char kakusiana_room_9DL_001DD0[] = dkakusiana_room_9DL_001DD0;
-
-#define dkakusiana_room_9Tex_004B40 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9Tex_004B40"
-static const ALIGN_ASSET(2) char kakusiana_room_9Tex_004B40[] = dkakusiana_room_9Tex_004B40;
-
-#define dkakusiana_room_9Tex_003B40 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9Tex_003B40"
+#define dkakusiana_room_9Tex_003B40 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9Tex_003B40"
 static const ALIGN_ASSET(2) char kakusiana_room_9Tex_003B40[] = dkakusiana_room_9Tex_003B40;
 
-#define dkakusiana_room_9DL_005870 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9DL_005870"
+#define dkakusiana_room_9Tex_004B40 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9Tex_004B40"
+static const ALIGN_ASSET(2) char kakusiana_room_9Tex_004B40[] = dkakusiana_room_9Tex_004B40;
+
+#define dkakusiana_room_9DL_005640 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9DL_005640"
+static const ALIGN_ASSET(2) char kakusiana_room_9DL_005640[] = dkakusiana_room_9DL_005640;
+
+#define dkakusiana_room_9DL_000AC8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9DL_000AC8"
+static const ALIGN_ASSET(2) char kakusiana_room_9DL_000AC8[] = dkakusiana_room_9DL_000AC8;
+
+#define dkakusiana_room_9DL_001DD0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9DL_001DD0"
+static const ALIGN_ASSET(2) char kakusiana_room_9DL_001DD0[] = dkakusiana_room_9DL_001DD0;
+
+#define dkakusiana_room_9DL_005870 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9DL_005870"
 static const ALIGN_ASSET(2) char kakusiana_room_9DL_005870[] = dkakusiana_room_9DL_005870;
 
-#define dkakusiana_room_9DL_0011C8 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9DL_0011C8"
+#define dkakusiana_room_9DL_0011C8 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9DL_0011C8"
 static const ALIGN_ASSET(2) char kakusiana_room_9DL_0011C8[] = dkakusiana_room_9DL_0011C8;
 
-#define dkakusiana_room_9DL_002260 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9DL_002260"
+#define dkakusiana_room_9DL_002260 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9DL_002260"
 static const ALIGN_ASSET(2) char kakusiana_room_9DL_002260[] = dkakusiana_room_9DL_002260;
 
-#define dkakusiana_room_9DL_005A20 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9DL_005A20"
+#define dkakusiana_room_9DL_005A20 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9DL_005A20"
 static const ALIGN_ASSET(2) char kakusiana_room_9DL_005A20[] = dkakusiana_room_9DL_005A20;
 
-#define dkakusiana_room_9DL_000F80 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9DL_000F80"
+#define dkakusiana_room_9DL_000F80 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9DL_000F80"
 static const ALIGN_ASSET(2) char kakusiana_room_9DL_000F80[] = dkakusiana_room_9DL_000F80;
 
-#define dkakusiana_room_9DL_0006E0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9DL_0006E0"
+#define dkakusiana_room_9DL_0006E0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_room_9DL_0006E0"
 static const ALIGN_ASSET(2) char kakusiana_room_9DL_0006E0[] = dkakusiana_room_9DL_0006E0;
 
-#define dkakusiana_room_9Tex_002340 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_room_9Tex_002340"
-static const ALIGN_ASSET(2) char kakusiana_room_9Tex_002340[] = dkakusiana_room_9Tex_002340;
-
 
 #endif // MISC_KAKUSIANA_ROOM_9_H
diff --git a/soh/assets/scenes/misc/kakusiana/kakusiana_scene.h b/soh/assets/scenes/misc/kakusiana/kakusiana_scene.h
index 2f6012fb8..09c3ba321 100644
--- a/soh/assets/scenes/misc/kakusiana/kakusiana_scene.h
+++ b/soh/assets/scenes/misc/kakusiana/kakusiana_scene.h
@@ -3,16 +3,17 @@
 
 #include "align_asset_macro.h"
 
-#define dkakusiana_sceneCollisionHeader_00B7F0 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_sceneCollisionHeader_00B7F0"
-static const ALIGN_ASSET(2) char kakusiana_sceneCollisionHeader_00B7F0[] = dkakusiana_sceneCollisionHeader_00B7F0;
-
-#define dkakusiana_sceneTex_00C020 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_sceneTex_00C020"
-static const ALIGN_ASSET(2) char kakusiana_sceneTex_00C020[] = dkakusiana_sceneTex_00C020;
-
-#define dkakusiana_sceneTex_00B820 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_sceneTex_00B820"
+#define dkakusiana_sceneTex_00B820 "__OTR__scenes/shared/kakusiana_scene/kakusiana_sceneTex_00B820"
 static const ALIGN_ASSET(2) char kakusiana_sceneTex_00B820[] = dkakusiana_sceneTex_00B820;
 
-#define dkakusiana_sceneTex_00D020 "__OTR__scenes/nonmq/kakusiana_scene/kakusiana_sceneTex_00D020"
+#define dkakusiana_sceneTex_00C020 "__OTR__scenes/shared/kakusiana_scene/kakusiana_sceneTex_00C020"
+static const ALIGN_ASSET(2) char kakusiana_sceneTex_00C020[] = dkakusiana_sceneTex_00C020;
+
+#define dkakusiana_sceneTex_00D020 "__OTR__scenes/shared/kakusiana_scene/kakusiana_sceneTex_00D020"
 static const ALIGN_ASSET(2) char kakusiana_sceneTex_00D020[] = dkakusiana_sceneTex_00D020;
 
+#define dkakusiana_sceneCollisionHeader_00B7F0 "__OTR__scenes/shared/kakusiana_scene/kakusiana_sceneCollisionHeader_00B7F0"
+static const ALIGN_ASSET(2) char kakusiana_sceneCollisionHeader_00B7F0[] = dkakusiana_sceneCollisionHeader_00B7F0;
+
+
 #endif // MISC_KAKUSIANA_SCENE_H
diff --git a/soh/assets/scenes/misc/kinsuta/kinsuta_room_0.h b/soh/assets/scenes/misc/kinsuta/kinsuta_room_0.h
index cbe5c6663..4f82f4aed 100644
--- a/soh/assets/scenes/misc/kinsuta/kinsuta_room_0.h
+++ b/soh/assets/scenes/misc/kinsuta/kinsuta_room_0.h
@@ -3,73 +3,73 @@
 
 #include "align_asset_macro.h"
 
-#define dgKinsutaDL_0030B0 "__OTR__scenes/nonmq/kinsuta_scene/gKinsutaDL_0030B0"
-static const ALIGN_ASSET(2) char gKinsutaDL_0030B0[] = dgKinsutaDL_0030B0;
-
-#define dgKinsutaDL_00B088 "__OTR__scenes/nonmq/kinsuta_scene/gKinsutaDL_00B088"
-static const ALIGN_ASSET(2) char gKinsutaDL_00B088[] = dgKinsutaDL_00B088;
-
-#define dkinsuta_room_0DL_002BC8 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0DL_002BC8"
-static const ALIGN_ASSET(2) char kinsuta_room_0DL_002BC8[] = dkinsuta_room_0DL_002BC8;
-
-#define dkinsuta_room_0Tex_009D10 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0Tex_009D10"
-static const ALIGN_ASSET(2) char kinsuta_room_0Tex_009D10[] = dkinsuta_room_0Tex_009D10;
-
-#define dkinsuta_room_0Tex_008D10 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0Tex_008D10"
-static const ALIGN_ASSET(2) char kinsuta_room_0Tex_008D10[] = dkinsuta_room_0Tex_008D10;
-
-#define dkinsuta_room_0Tex_006910 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0Tex_006910"
-static const ALIGN_ASSET(2) char kinsuta_room_0Tex_006910[] = dkinsuta_room_0Tex_006910;
-
-#define dkinsuta_room_0DL_000CF0 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0DL_000CF0"
-static const ALIGN_ASSET(2) char kinsuta_room_0DL_000CF0[] = dkinsuta_room_0DL_000CF0;
-
-#define dkinsuta_room_0DL_0013E8 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0DL_0013E8"
-static const ALIGN_ASSET(2) char kinsuta_room_0DL_0013E8[] = dkinsuta_room_0DL_0013E8;
-
-#define dkinsuta_room_0Tex_003110 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0Tex_003110"
+#define dkinsuta_room_0Tex_003110 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0Tex_003110"
 static const ALIGN_ASSET(2) char kinsuta_room_0Tex_003110[] = dkinsuta_room_0Tex_003110;
 
-#define dkinsuta_room_0TLUT_0030F0 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0TLUT_0030F0"
-static const ALIGN_ASSET(2) char kinsuta_room_0TLUT_0030F0[] = dkinsuta_room_0TLUT_0030F0;
-
-#define dkinsuta_room_0DL_0002E0 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0DL_0002E0"
-static const ALIGN_ASSET(2) char kinsuta_room_0DL_0002E0[] = dkinsuta_room_0DL_0002E0;
-
-#define dkinsuta_room_0Tex_008910 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0Tex_008910"
-static const ALIGN_ASSET(2) char kinsuta_room_0Tex_008910[] = dkinsuta_room_0Tex_008910;
-
-#define dkinsuta_room_0DL_00ACE0 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0DL_00ACE0"
-static const ALIGN_ASSET(2) char kinsuta_room_0DL_00ACE0[] = dkinsuta_room_0DL_00ACE0;
-
-#define dkinsuta_room_0Tex_00D098 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0Tex_00D098"
-static const ALIGN_ASSET(2) char kinsuta_room_0Tex_00D098[] = dkinsuta_room_0Tex_00D098;
-
-#define dkinsuta_room_0Tex_00C098 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0Tex_00C098"
-static const ALIGN_ASSET(2) char kinsuta_room_0Tex_00C098[] = dkinsuta_room_0Tex_00C098;
-
-#define dkinsuta_room_0Tex_00B098 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0Tex_00B098"
-static const ALIGN_ASSET(2) char kinsuta_room_0Tex_00B098[] = dkinsuta_room_0Tex_00B098;
-
-#define dkinsuta_room_0DL_001B38 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0DL_001B38"
-static const ALIGN_ASSET(2) char kinsuta_room_0DL_001B38[] = dkinsuta_room_0DL_001B38;
-
-#define dkinsuta_room_0Tex_005910 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0Tex_005910"
-static const ALIGN_ASSET(2) char kinsuta_room_0Tex_005910[] = dkinsuta_room_0Tex_005910;
-
-#define dkinsuta_room_0Tex_004910 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0Tex_004910"
-static const ALIGN_ASSET(2) char kinsuta_room_0Tex_004910[] = dkinsuta_room_0Tex_004910;
-
-#define dkinsuta_room_0Tex_003910 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0Tex_003910"
+#define dkinsuta_room_0Tex_003910 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0Tex_003910"
 static const ALIGN_ASSET(2) char kinsuta_room_0Tex_003910[] = dkinsuta_room_0Tex_003910;
 
-#define dkinsuta_room_0DL_002FD8 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0DL_002FD8"
-static const ALIGN_ASSET(2) char kinsuta_room_0DL_002FD8[] = dkinsuta_room_0DL_002FD8;
+#define dkinsuta_room_0Tex_004910 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0Tex_004910"
+static const ALIGN_ASSET(2) char kinsuta_room_0Tex_004910[] = dkinsuta_room_0Tex_004910;
 
-#define dkinsuta_room_0Tex_007910 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0Tex_007910"
+#define dkinsuta_room_0Tex_005910 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0Tex_005910"
+static const ALIGN_ASSET(2) char kinsuta_room_0Tex_005910[] = dkinsuta_room_0Tex_005910;
+
+#define dkinsuta_room_0Tex_006910 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0Tex_006910"
+static const ALIGN_ASSET(2) char kinsuta_room_0Tex_006910[] = dkinsuta_room_0Tex_006910;
+
+#define dkinsuta_room_0Tex_007910 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0Tex_007910"
 static const ALIGN_ASSET(2) char kinsuta_room_0Tex_007910[] = dkinsuta_room_0Tex_007910;
 
-#define dkinsuta_room_0DL_001F78 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_room_0DL_001F78"
+#define dkinsuta_room_0Tex_008910 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0Tex_008910"
+static const ALIGN_ASSET(2) char kinsuta_room_0Tex_008910[] = dkinsuta_room_0Tex_008910;
+
+#define dkinsuta_room_0Tex_008D10 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0Tex_008D10"
+static const ALIGN_ASSET(2) char kinsuta_room_0Tex_008D10[] = dkinsuta_room_0Tex_008D10;
+
+#define dkinsuta_room_0Tex_009D10 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0Tex_009D10"
+static const ALIGN_ASSET(2) char kinsuta_room_0Tex_009D10[] = dkinsuta_room_0Tex_009D10;
+
+#define dkinsuta_room_0Tex_00B098 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0Tex_00B098"
+static const ALIGN_ASSET(2) char kinsuta_room_0Tex_00B098[] = dkinsuta_room_0Tex_00B098;
+
+#define dkinsuta_room_0Tex_00C098 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0Tex_00C098"
+static const ALIGN_ASSET(2) char kinsuta_room_0Tex_00C098[] = dkinsuta_room_0Tex_00C098;
+
+#define dkinsuta_room_0Tex_00D098 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0Tex_00D098"
+static const ALIGN_ASSET(2) char kinsuta_room_0Tex_00D098[] = dkinsuta_room_0Tex_00D098;
+
+#define dkinsuta_room_0TLUT_0030F0 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0TLUT_0030F0"
+static const ALIGN_ASSET(2) char kinsuta_room_0TLUT_0030F0[] = dkinsuta_room_0TLUT_0030F0;
+
+#define dgKinsutaDL_0030B0 "__OTR__scenes/shared/kinsuta_scene/gKinsutaDL_0030B0"
+static const ALIGN_ASSET(2) char gKinsutaDL_0030B0[] = dgKinsutaDL_0030B0;
+
+#define dgKinsutaDL_00B088 "__OTR__scenes/shared/kinsuta_scene/gKinsutaDL_00B088"
+static const ALIGN_ASSET(2) char gKinsutaDL_00B088[] = dgKinsutaDL_00B088;
+
+#define dkinsuta_room_0DL_002BC8 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0DL_002BC8"
+static const ALIGN_ASSET(2) char kinsuta_room_0DL_002BC8[] = dkinsuta_room_0DL_002BC8;
+
+#define dkinsuta_room_0DL_000CF0 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0DL_000CF0"
+static const ALIGN_ASSET(2) char kinsuta_room_0DL_000CF0[] = dkinsuta_room_0DL_000CF0;
+
+#define dkinsuta_room_0DL_0013E8 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0DL_0013E8"
+static const ALIGN_ASSET(2) char kinsuta_room_0DL_0013E8[] = dkinsuta_room_0DL_0013E8;
+
+#define dkinsuta_room_0DL_0002E0 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0DL_0002E0"
+static const ALIGN_ASSET(2) char kinsuta_room_0DL_0002E0[] = dkinsuta_room_0DL_0002E0;
+
+#define dkinsuta_room_0DL_00ACE0 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0DL_00ACE0"
+static const ALIGN_ASSET(2) char kinsuta_room_0DL_00ACE0[] = dkinsuta_room_0DL_00ACE0;
+
+#define dkinsuta_room_0DL_001B38 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0DL_001B38"
+static const ALIGN_ASSET(2) char kinsuta_room_0DL_001B38[] = dkinsuta_room_0DL_001B38;
+
+#define dkinsuta_room_0DL_002FD8 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0DL_002FD8"
+static const ALIGN_ASSET(2) char kinsuta_room_0DL_002FD8[] = dkinsuta_room_0DL_002FD8;
+
+#define dkinsuta_room_0DL_001F78 "__OTR__scenes/shared/kinsuta_scene/kinsuta_room_0DL_001F78"
 static const ALIGN_ASSET(2) char kinsuta_room_0DL_001F78[] = dkinsuta_room_0DL_001F78;
 
 
diff --git a/soh/assets/scenes/misc/kinsuta/kinsuta_scene.h b/soh/assets/scenes/misc/kinsuta/kinsuta_scene.h
index bbdca758c..e6399d910 100644
--- a/soh/assets/scenes/misc/kinsuta/kinsuta_scene.h
+++ b/soh/assets/scenes/misc/kinsuta/kinsuta_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dkinsuta_sceneCollisionHeader_0015E4 "__OTR__scenes/nonmq/kinsuta_scene/kinsuta_sceneCollisionHeader_0015E4"
+#define dkinsuta_sceneCollisionHeader_0015E4 "__OTR__scenes/shared/kinsuta_scene/kinsuta_sceneCollisionHeader_0015E4"
 static const ALIGN_ASSET(2) char kinsuta_sceneCollisionHeader_0015E4[] = dkinsuta_sceneCollisionHeader_0015E4;
 
 
diff --git a/soh/assets/scenes/misc/market_alley/market_alley_room_0.h b/soh/assets/scenes/misc/market_alley/market_alley_room_0.h
index 4ba06910d..7fbb750c9 100644
--- a/soh/assets/scenes/misc/market_alley/market_alley_room_0.h
+++ b/soh/assets/scenes/misc/market_alley/market_alley_room_0.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dmarket_alley_room_0DL_075688 "__OTR__scenes/nonmq/market_alley_scene/market_alley_room_0DL_075688"
+#define dmarket_alley_room_0DL_075688 "__OTR__scenes/shared/market_alley_scene/market_alley_room_0DL_075688"
 static const ALIGN_ASSET(2) char market_alley_room_0DL_075688[] = dmarket_alley_room_0DL_075688;
 
 
diff --git a/soh/assets/scenes/misc/market_alley/market_alley_scene.h b/soh/assets/scenes/misc/market_alley/market_alley_scene.h
index 161022752..2d1fa0063 100644
--- a/soh/assets/scenes/misc/market_alley/market_alley_scene.h
+++ b/soh/assets/scenes/misc/market_alley/market_alley_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dmarket_alley_sceneCollisionHeader_001218 "__OTR__scenes/nonmq/market_alley_scene/market_alley_sceneCollisionHeader_001218"
+#define dmarket_alley_sceneCollisionHeader_001218 "__OTR__scenes/shared/market_alley_scene/market_alley_sceneCollisionHeader_001218"
 static const ALIGN_ASSET(2) char market_alley_sceneCollisionHeader_001218[] = dmarket_alley_sceneCollisionHeader_001218;
 
 
diff --git a/soh/assets/scenes/misc/market_alley_n/market_alley_n_room_0.h b/soh/assets/scenes/misc/market_alley_n/market_alley_n_room_0.h
index 00e40edfb..2913ad34b 100644
--- a/soh/assets/scenes/misc/market_alley_n/market_alley_n_room_0.h
+++ b/soh/assets/scenes/misc/market_alley_n/market_alley_n_room_0.h
@@ -3,10 +3,10 @@
 
 #include "align_asset_macro.h"
 
-#define dmarket_alley_n_room_0DL_075678 "__OTR__scenes/nonmq/market_alley_n_scene/market_alley_n_room_0DL_075678"
+#define dmarket_alley_n_room_0DL_075678 "__OTR__scenes/shared/market_alley_n_scene/market_alley_n_room_0DL_075678"
 static const ALIGN_ASSET(2) char market_alley_n_room_0DL_075678[] = dmarket_alley_n_room_0DL_075678;
 
-#define dmarket_alley_n_room_0DL_0756E0 "__OTR__scenes/nonmq/market_alley_n_scene/market_alley_n_room_0DL_0756E0"
+#define dmarket_alley_n_room_0DL_0756E0 "__OTR__scenes/shared/market_alley_n_scene/market_alley_n_room_0DL_0756E0"
 static const ALIGN_ASSET(2) char market_alley_n_room_0DL_0756E0[] = dmarket_alley_n_room_0DL_0756E0;
 
 
diff --git a/soh/assets/scenes/misc/market_alley_n/market_alley_n_scene.h b/soh/assets/scenes/misc/market_alley_n/market_alley_n_scene.h
index 9970570aa..43c0b61a6 100644
--- a/soh/assets/scenes/misc/market_alley_n/market_alley_n_scene.h
+++ b/soh/assets/scenes/misc/market_alley_n/market_alley_n_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dmarket_alley_n_sceneCollisionHeader_0012C0 "__OTR__scenes/nonmq/market_alley_n_scene/market_alley_n_sceneCollisionHeader_0012C0"
+#define dmarket_alley_n_sceneCollisionHeader_0012C0 "__OTR__scenes/shared/market_alley_n_scene/market_alley_n_sceneCollisionHeader_0012C0"
 static const ALIGN_ASSET(2) char market_alley_n_sceneCollisionHeader_0012C0[] = dmarket_alley_n_sceneCollisionHeader_0012C0;
 
 
diff --git a/soh/assets/scenes/misc/market_day/market_day_room_0.h b/soh/assets/scenes/misc/market_day/market_day_room_0.h
index e14f8afc5..958874451 100644
--- a/soh/assets/scenes/misc/market_day/market_day_room_0.h
+++ b/soh/assets/scenes/misc/market_day/market_day_room_0.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dmarket_day_room_0DL_0057D8 "__OTR__scenes/nonmq/market_day_scene/market_day_room_0DL_0057D8"
+#define dmarket_day_room_0DL_0057D8 "__OTR__scenes/shared/market_day_scene/market_day_room_0DL_0057D8"
 static const ALIGN_ASSET(2) char market_day_room_0DL_0057D8[] = dmarket_day_room_0DL_0057D8;
 
 
diff --git a/soh/assets/scenes/misc/market_day/market_day_scene.h b/soh/assets/scenes/misc/market_day/market_day_scene.h
index 8ffdbc87a..29349aa1e 100644
--- a/soh/assets/scenes/misc/market_day/market_day_scene.h
+++ b/soh/assets/scenes/misc/market_day/market_day_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dmarket_day_sceneCollisionHeader_002640 "__OTR__scenes/nonmq/market_day_scene/market_day_sceneCollisionHeader_002640"
+#define dmarket_day_sceneCollisionHeader_002640 "__OTR__scenes/shared/market_day_scene/market_day_sceneCollisionHeader_002640"
 static const ALIGN_ASSET(2) char market_day_sceneCollisionHeader_002640[] = dmarket_day_sceneCollisionHeader_002640;
 
 
diff --git a/soh/assets/scenes/misc/market_night/market_night_room_0.h b/soh/assets/scenes/misc/market_night/market_night_room_0.h
index e43f72027..e564e9880 100644
--- a/soh/assets/scenes/misc/market_night/market_night_room_0.h
+++ b/soh/assets/scenes/misc/market_night/market_night_room_0.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dmarket_night_room_0DL_005708 "__OTR__scenes/nonmq/market_night_scene/market_night_room_0DL_005708"
+#define dmarket_night_room_0DL_005708 "__OTR__scenes/shared/market_night_scene/market_night_room_0DL_005708"
 static const ALIGN_ASSET(2) char market_night_room_0DL_005708[] = dmarket_night_room_0DL_005708;
 
 
diff --git a/soh/assets/scenes/misc/market_night/market_night_scene.h b/soh/assets/scenes/misc/market_night/market_night_scene.h
index 6ad9157a7..4ddc59865 100644
--- a/soh/assets/scenes/misc/market_night/market_night_scene.h
+++ b/soh/assets/scenes/misc/market_night/market_night_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dmarket_night_sceneCollisionHeader_0025F8 "__OTR__scenes/nonmq/market_night_scene/market_night_sceneCollisionHeader_0025F8"
+#define dmarket_night_sceneCollisionHeader_0025F8 "__OTR__scenes/shared/market_night_scene/market_night_sceneCollisionHeader_0025F8"
 static const ALIGN_ASSET(2) char market_night_sceneCollisionHeader_0025F8[] = dmarket_night_sceneCollisionHeader_0025F8;
 
 
diff --git a/soh/assets/scenes/misc/market_ruins/market_ruins_room_0.h b/soh/assets/scenes/misc/market_ruins/market_ruins_room_0.h
index 0ba874a26..d73e66afd 100644
--- a/soh/assets/scenes/misc/market_ruins/market_ruins_room_0.h
+++ b/soh/assets/scenes/misc/market_ruins/market_ruins_room_0.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dmarket_ruins_room_0DL_0027B0 "__OTR__scenes/nonmq/market_ruins_scene/market_ruins_room_0DL_0027B0"
+#define dmarket_ruins_room_0DL_0027B0 "__OTR__scenes/shared/market_ruins_scene/market_ruins_room_0DL_0027B0"
 static const ALIGN_ASSET(2) char market_ruins_room_0DL_0027B0[] = dmarket_ruins_room_0DL_0027B0;
 
 
diff --git a/soh/assets/scenes/misc/market_ruins/market_ruins_scene.h b/soh/assets/scenes/misc/market_ruins/market_ruins_scene.h
index 0d475a584..ba7210027 100644
--- a/soh/assets/scenes/misc/market_ruins/market_ruins_scene.h
+++ b/soh/assets/scenes/misc/market_ruins/market_ruins_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dmarket_ruins_sceneCollisionHeader_0015F8 "__OTR__scenes/nonmq/market_ruins_scene/market_ruins_sceneCollisionHeader_0015F8"
+#define dmarket_ruins_sceneCollisionHeader_0015F8 "__OTR__scenes/shared/market_ruins_scene/market_ruins_sceneCollisionHeader_0015F8"
 static const ALIGN_ASSET(2) char market_ruins_sceneCollisionHeader_0015F8[] = dmarket_ruins_sceneCollisionHeader_0015F8;
 
 
diff --git a/soh/assets/scenes/misc/shrine/shrine_room_0.h b/soh/assets/scenes/misc/shrine/shrine_room_0.h
index fd3ca932b..3dd6b9070 100644
--- a/soh/assets/scenes/misc/shrine/shrine_room_0.h
+++ b/soh/assets/scenes/misc/shrine/shrine_room_0.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dshrine_room_0DL_007AE0 "__OTR__scenes/nonmq/shrine_scene/shrine_room_0DL_007AE0"
+#define dshrine_room_0DL_007AE0 "__OTR__scenes/shared/shrine_scene/shrine_room_0DL_007AE0"
 static const ALIGN_ASSET(2) char shrine_room_0DL_007AE0[] = dshrine_room_0DL_007AE0;
 
 
diff --git a/soh/assets/scenes/misc/shrine/shrine_scene.h b/soh/assets/scenes/misc/shrine/shrine_scene.h
index bd9dc02d4..658d77d1b 100644
--- a/soh/assets/scenes/misc/shrine/shrine_scene.h
+++ b/soh/assets/scenes/misc/shrine/shrine_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dshrine_sceneCollisionHeader_0014AC "__OTR__scenes/nonmq/shrine_scene/shrine_sceneCollisionHeader_0014AC"
+#define dshrine_sceneCollisionHeader_0014AC "__OTR__scenes/shared/shrine_scene/shrine_sceneCollisionHeader_0014AC"
 static const ALIGN_ASSET(2) char shrine_sceneCollisionHeader_0014AC[] = dshrine_sceneCollisionHeader_0014AC;
 
 
diff --git a/soh/assets/scenes/misc/shrine_n/shrine_n_room_0.h b/soh/assets/scenes/misc/shrine_n/shrine_n_room_0.h
index e0503d5f5..1968bfc4b 100644
--- a/soh/assets/scenes/misc/shrine_n/shrine_n_room_0.h
+++ b/soh/assets/scenes/misc/shrine_n/shrine_n_room_0.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dshrine_n_room_0DL_007B00 "__OTR__scenes/nonmq/shrine_n_scene/shrine_n_room_0DL_007B00"
+#define dshrine_n_room_0DL_007B00 "__OTR__scenes/shared/shrine_n_scene/shrine_n_room_0DL_007B00"
 static const ALIGN_ASSET(2) char shrine_n_room_0DL_007B00[] = dshrine_n_room_0DL_007B00;
 
 
diff --git a/soh/assets/scenes/misc/shrine_n/shrine_n_scene.h b/soh/assets/scenes/misc/shrine_n/shrine_n_scene.h
index d7fd0dd1e..a093a2586 100644
--- a/soh/assets/scenes/misc/shrine_n/shrine_n_scene.h
+++ b/soh/assets/scenes/misc/shrine_n/shrine_n_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dshrine_n_sceneCollisionHeader_0014D4 "__OTR__scenes/nonmq/shrine_n_scene/shrine_n_sceneCollisionHeader_0014D4"
+#define dshrine_n_sceneCollisionHeader_0014D4 "__OTR__scenes/shared/shrine_n_scene/shrine_n_sceneCollisionHeader_0014D4"
 static const ALIGN_ASSET(2) char shrine_n_sceneCollisionHeader_0014D4[] = dshrine_n_sceneCollisionHeader_0014D4;
 
 
diff --git a/soh/assets/scenes/misc/shrine_r/shrine_r_room_0.h b/soh/assets/scenes/misc/shrine_r/shrine_r_room_0.h
index c70d0d3b2..028e602eb 100644
--- a/soh/assets/scenes/misc/shrine_r/shrine_r_room_0.h
+++ b/soh/assets/scenes/misc/shrine_r/shrine_r_room_0.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dshrine_r_room_0DL_007AE0 "__OTR__scenes/nonmq/shrine_r_scene/shrine_r_room_0DL_007AE0"
+#define dshrine_r_room_0DL_007AE0 "__OTR__scenes/shared/shrine_r_scene/shrine_r_room_0DL_007AE0"
 static const ALIGN_ASSET(2) char shrine_r_room_0DL_007AE0[] = dshrine_r_room_0DL_007AE0;
 
 
diff --git a/soh/assets/scenes/misc/shrine_r/shrine_r_scene.h b/soh/assets/scenes/misc/shrine_r/shrine_r_scene.h
index 70faee9ee..aba84bd9f 100644
--- a/soh/assets/scenes/misc/shrine_r/shrine_r_scene.h
+++ b/soh/assets/scenes/misc/shrine_r/shrine_r_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dshrine_r_sceneCollisionHeader_00145C "__OTR__scenes/nonmq/shrine_r_scene/shrine_r_sceneCollisionHeader_00145C"
+#define dshrine_r_sceneCollisionHeader_00145C "__OTR__scenes/shared/shrine_r_scene/shrine_r_sceneCollisionHeader_00145C"
 static const ALIGN_ASSET(2) char shrine_r_sceneCollisionHeader_00145C[] = dshrine_r_sceneCollisionHeader_00145C;
 
 
diff --git a/soh/assets/scenes/misc/turibori/turibori_room_0.h b/soh/assets/scenes/misc/turibori/turibori_room_0.h
index d9e764478..bad57b5e0 100644
--- a/soh/assets/scenes/misc/turibori/turibori_room_0.h
+++ b/soh/assets/scenes/misc/turibori/turibori_room_0.h
@@ -3,10 +3,10 @@
 
 #include "align_asset_macro.h"
 
-#define dturibori_room_0DL_0056F8 "__OTR__scenes/nonmq/turibori_scene/turibori_room_0DL_0056F8"
+#define dturibori_room_0DL_0056F8 "__OTR__scenes/shared/turibori_scene/turibori_room_0DL_0056F8"
 static const ALIGN_ASSET(2) char turibori_room_0DL_0056F8[] = dturibori_room_0DL_0056F8;
 
-#define dturibori_room_0DL_006740 "__OTR__scenes/nonmq/turibori_scene/turibori_room_0DL_006740"
+#define dturibori_room_0DL_006740 "__OTR__scenes/shared/turibori_scene/turibori_room_0DL_006740"
 static const ALIGN_ASSET(2) char turibori_room_0DL_006740[] = dturibori_room_0DL_006740;
 
 
diff --git a/soh/assets/scenes/misc/turibori/turibori_scene.h b/soh/assets/scenes/misc/turibori/turibori_scene.h
index 156ed9c2f..93d2cb245 100644
--- a/soh/assets/scenes/misc/turibori/turibori_scene.h
+++ b/soh/assets/scenes/misc/turibori/turibori_scene.h
@@ -3,88 +3,89 @@
 
 #include "align_asset_macro.h"
 
-#define dturibori_sceneCollisionHeader_001CAC "__OTR__scenes/nonmq/turibori_scene/turibori_sceneCollisionHeader_001CAC"
-static const ALIGN_ASSET(2) char turibori_sceneCollisionHeader_001CAC[] = dturibori_sceneCollisionHeader_001CAC;
-
-#define dturibori_sceneTex_0094E0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_0094E0"
-static const ALIGN_ASSET(2) char turibori_sceneTex_0094E0[] = dturibori_sceneTex_0094E0;
-
-#define dturibori_sceneTex_0104E0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_0104E0"
-static const ALIGN_ASSET(2) char turibori_sceneTex_0104E0[] = dturibori_sceneTex_0104E0;
-
-#define dturibori_sceneTex_00CCE0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_00CCE0"
-static const ALIGN_ASSET(2) char turibori_sceneTex_00CCE0[] = dturibori_sceneTex_00CCE0;
-
-#define dturibori_sceneTex_004CE0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_004CE0"
-static const ALIGN_ASSET(2) char turibori_sceneTex_004CE0[] = dturibori_sceneTex_004CE0;
-
-#define dturibori_sceneTex_004DE0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_004DE0"
-static const ALIGN_ASSET(2) char turibori_sceneTex_004DE0[] = dturibori_sceneTex_004DE0;
-
-#define dturibori_sceneTex_007FE0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_007FE0"
-static const ALIGN_ASSET(2) char turibori_sceneTex_007FE0[] = dturibori_sceneTex_007FE0;
-
-#define dturibori_sceneTex_009CE0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_009CE0"
-static const ALIGN_ASSET(2) char turibori_sceneTex_009CE0[] = dturibori_sceneTex_009CE0;
-
-#define dturibori_sceneTex_0081E0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_0081E0"
-static const ALIGN_ASSET(2) char turibori_sceneTex_0081E0[] = dturibori_sceneTex_0081E0;
-
-#define dturibori_sceneTex_0059E0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_0059E0"
-static const ALIGN_ASSET(2) char turibori_sceneTex_0059E0[] = dturibori_sceneTex_0059E0;
-
-#define dturibori_sceneTex_00ACE0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_00ACE0"
-static const ALIGN_ASSET(2) char turibori_sceneTex_00ACE0[] = dturibori_sceneTex_00ACE0;
-
-#define dturibori_sceneTex_00FCE0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_00FCE0"
-static const ALIGN_ASSET(2) char turibori_sceneTex_00FCE0[] = dturibori_sceneTex_00FCE0;
-
-#define dturibori_sceneTex_006BE0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_006BE0"
-static const ALIGN_ASSET(2) char turibori_sceneTex_006BE0[] = dturibori_sceneTex_006BE0;
-
-#define dturibori_sceneTex_001CE0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_001CE0"
+#define dturibori_sceneTex_001CE0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_001CE0"
 static const ALIGN_ASSET(2) char turibori_sceneTex_001CE0[] = dturibori_sceneTex_001CE0;
 
-#define dturibori_sceneTex_0116E0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_0116E0"
-static const ALIGN_ASSET(2) char turibori_sceneTex_0116E0[] = dturibori_sceneTex_0116E0;
-
-#define dturibori_sceneTex_00ECE0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_00ECE0"
-static const ALIGN_ASSET(2) char turibori_sceneTex_00ECE0[] = dturibori_sceneTex_00ECE0;
-
-#define dturibori_sceneTex_0114E0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_0114E0"
-static const ALIGN_ASSET(2) char turibori_sceneTex_0114E0[] = dturibori_sceneTex_0114E0;
-
-#define dturibori_sceneTex_003CE0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_003CE0"
-static const ALIGN_ASSET(2) char turibori_sceneTex_003CE0[] = dturibori_sceneTex_003CE0;
-
-#define dturibori_sceneTex_002CE0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_002CE0"
+#define dturibori_sceneTex_002CE0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_002CE0"
 static const ALIGN_ASSET(2) char turibori_sceneTex_002CE0[] = dturibori_sceneTex_002CE0;
 
-#define dturibori_sceneTex_00DCE0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_00DCE0"
-static const ALIGN_ASSET(2) char turibori_sceneTex_00DCE0[] = dturibori_sceneTex_00DCE0;
+#define dturibori_sceneTex_003CE0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_003CE0"
+static const ALIGN_ASSET(2) char turibori_sceneTex_003CE0[] = dturibori_sceneTex_003CE0;
 
-#define dturibori_sceneTex_00BCE0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_00BCE0"
-static const ALIGN_ASSET(2) char turibori_sceneTex_00BCE0[] = dturibori_sceneTex_00BCE0;
+#define dturibori_sceneTex_004CE0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_004CE0"
+static const ALIGN_ASSET(2) char turibori_sceneTex_004CE0[] = dturibori_sceneTex_004CE0;
 
-#define dturibori_sceneTex_00F4E0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_00F4E0"
-static const ALIGN_ASSET(2) char turibori_sceneTex_00F4E0[] = dturibori_sceneTex_00F4E0;
+#define dturibori_sceneTex_004DE0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_004DE0"
+static const ALIGN_ASSET(2) char turibori_sceneTex_004DE0[] = dturibori_sceneTex_004DE0;
 
-#define dturibori_sceneTex_0069E0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_0069E0"
-static const ALIGN_ASSET(2) char turibori_sceneTex_0069E0[] = dturibori_sceneTex_0069E0;
-
-#define dturibori_sceneTex_0051E0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_0051E0"
+#define dturibori_sceneTex_0051E0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_0051E0"
 static const ALIGN_ASSET(2) char turibori_sceneTex_0051E0[] = dturibori_sceneTex_0051E0;
 
-#define dturibori_sceneTex_007BE0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_007BE0"
+#define dturibori_sceneTex_0059E0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_0059E0"
+static const ALIGN_ASSET(2) char turibori_sceneTex_0059E0[] = dturibori_sceneTex_0059E0;
+
+#define dturibori_sceneTex_0069E0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_0069E0"
+static const ALIGN_ASSET(2) char turibori_sceneTex_0069E0[] = dturibori_sceneTex_0069E0;
+
+#define dturibori_sceneTex_006BE0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_006BE0"
+static const ALIGN_ASSET(2) char turibori_sceneTex_006BE0[] = dturibori_sceneTex_006BE0;
+
+#define dturibori_sceneTex_007BE0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_007BE0"
 static const ALIGN_ASSET(2) char turibori_sceneTex_007BE0[] = dturibori_sceneTex_007BE0;
 
-#define dturibori_sceneTex_0091E0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_0091E0"
+#define dturibori_sceneTex_007FE0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_007FE0"
+static const ALIGN_ASSET(2) char turibori_sceneTex_007FE0[] = dturibori_sceneTex_007FE0;
+
+#define dturibori_sceneTex_0081E0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_0081E0"
+static const ALIGN_ASSET(2) char turibori_sceneTex_0081E0[] = dturibori_sceneTex_0081E0;
+
+#define dturibori_sceneTex_0091E0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_0091E0"
 static const ALIGN_ASSET(2) char turibori_sceneTex_0091E0[] = dturibori_sceneTex_0091E0;
 
-#define dturibori_sceneTex_0092E0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_0092E0"
+#define dturibori_sceneTex_0092E0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_0092E0"
 static const ALIGN_ASSET(2) char turibori_sceneTex_0092E0[] = dturibori_sceneTex_0092E0;
 
-#define dturibori_sceneTex_00E4E0 "__OTR__scenes/nonmq/turibori_scene/turibori_sceneTex_00E4E0"
+#define dturibori_sceneTex_0094E0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_0094E0"
+static const ALIGN_ASSET(2) char turibori_sceneTex_0094E0[] = dturibori_sceneTex_0094E0;
+
+#define dturibori_sceneTex_009CE0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_009CE0"
+static const ALIGN_ASSET(2) char turibori_sceneTex_009CE0[] = dturibori_sceneTex_009CE0;
+
+#define dturibori_sceneTex_00ACE0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_00ACE0"
+static const ALIGN_ASSET(2) char turibori_sceneTex_00ACE0[] = dturibori_sceneTex_00ACE0;
+
+#define dturibori_sceneTex_00BCE0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_00BCE0"
+static const ALIGN_ASSET(2) char turibori_sceneTex_00BCE0[] = dturibori_sceneTex_00BCE0;
+
+#define dturibori_sceneTex_00CCE0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_00CCE0"
+static const ALIGN_ASSET(2) char turibori_sceneTex_00CCE0[] = dturibori_sceneTex_00CCE0;
+
+#define dturibori_sceneTex_00DCE0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_00DCE0"
+static const ALIGN_ASSET(2) char turibori_sceneTex_00DCE0[] = dturibori_sceneTex_00DCE0;
+
+#define dturibori_sceneTex_00E4E0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_00E4E0"
 static const ALIGN_ASSET(2) char turibori_sceneTex_00E4E0[] = dturibori_sceneTex_00E4E0;
 
+#define dturibori_sceneTex_00ECE0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_00ECE0"
+static const ALIGN_ASSET(2) char turibori_sceneTex_00ECE0[] = dturibori_sceneTex_00ECE0;
+
+#define dturibori_sceneTex_00F4E0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_00F4E0"
+static const ALIGN_ASSET(2) char turibori_sceneTex_00F4E0[] = dturibori_sceneTex_00F4E0;
+
+#define dturibori_sceneTex_00FCE0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_00FCE0"
+static const ALIGN_ASSET(2) char turibori_sceneTex_00FCE0[] = dturibori_sceneTex_00FCE0;
+
+#define dturibori_sceneTex_0104E0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_0104E0"
+static const ALIGN_ASSET(2) char turibori_sceneTex_0104E0[] = dturibori_sceneTex_0104E0;
+
+#define dturibori_sceneTex_0114E0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_0114E0"
+static const ALIGN_ASSET(2) char turibori_sceneTex_0114E0[] = dturibori_sceneTex_0114E0;
+
+#define dturibori_sceneTex_0116E0 "__OTR__scenes/shared/turibori_scene/turibori_sceneTex_0116E0"
+static const ALIGN_ASSET(2) char turibori_sceneTex_0116E0[] = dturibori_sceneTex_0116E0;
+
+#define dturibori_sceneCollisionHeader_001CAC "__OTR__scenes/shared/turibori_scene/turibori_sceneCollisionHeader_001CAC"
+static const ALIGN_ASSET(2) char turibori_sceneCollisionHeader_001CAC[] = dturibori_sceneCollisionHeader_001CAC;
+
+
 #endif // MISC_TURIBORI_SCENE_H
diff --git a/soh/assets/scenes/overworld/entra/entra_room_0.h b/soh/assets/scenes/overworld/entra/entra_room_0.h
index 257d35e86..cca9f69c7 100644
--- a/soh/assets/scenes/overworld/entra/entra_room_0.h
+++ b/soh/assets/scenes/overworld/entra/entra_room_0.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dentra_room_0DL_000348 "__OTR__scenes/nonmq/entra_scene/entra_room_0DL_000348"
+#define dentra_room_0DL_000348 "__OTR__scenes/shared/entra_scene/entra_room_0DL_000348"
 static const ALIGN_ASSET(2) char entra_room_0DL_000348[] = dentra_room_0DL_000348;
 
 
diff --git a/soh/assets/scenes/overworld/entra/entra_scene.h b/soh/assets/scenes/overworld/entra/entra_scene.h
index 7ebc1f8ed..1d1ec1a0c 100644
--- a/soh/assets/scenes/overworld/entra/entra_scene.h
+++ b/soh/assets/scenes/overworld/entra/entra_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dentra_sceneCollisionHeader_0003B4 "__OTR__scenes/nonmq/entra_scene/entra_sceneCollisionHeader_0003B4"
+#define dentra_sceneCollisionHeader_0003B4 "__OTR__scenes/shared/entra_scene/entra_sceneCollisionHeader_0003B4"
 static const ALIGN_ASSET(2) char entra_sceneCollisionHeader_0003B4[] = dentra_sceneCollisionHeader_0003B4;
 
 
diff --git a/soh/assets/scenes/overworld/souko/souko_room_0.h b/soh/assets/scenes/overworld/souko/souko_room_0.h
index 252d0c920..df6a2adb9 100644
--- a/soh/assets/scenes/overworld/souko/souko_room_0.h
+++ b/soh/assets/scenes/overworld/souko/souko_room_0.h
@@ -3,61 +3,61 @@
 
 #include "align_asset_macro.h"
 
-#define dsouko_room_0DL_001E30 "__OTR__scenes/nonmq/souko_scene/souko_room_0DL_001E30"
-static const ALIGN_ASSET(2) char souko_room_0DL_001E30[] = dsouko_room_0DL_001E30;
-
-#define dsouko_room_0Tex_0064F8 "__OTR__scenes/nonmq/souko_scene/souko_room_0Tex_0064F8"
-static const ALIGN_ASSET(2) char souko_room_0Tex_0064F8[] = dsouko_room_0Tex_0064F8;
-
-#define dsouko_room_0DL_003950 "__OTR__scenes/nonmq/souko_scene/souko_room_0DL_003950"
-static const ALIGN_ASSET(2) char souko_room_0DL_003950[] = dsouko_room_0DL_003950;
-
-#define dsouko_room_0Tex_006CF8 "__OTR__scenes/nonmq/souko_scene/souko_room_0Tex_006CF8"
-static const ALIGN_ASSET(2) char souko_room_0Tex_006CF8[] = dsouko_room_0Tex_006CF8;
-
-#define dsouko_room_0Tex_0070F8 "__OTR__scenes/nonmq/souko_scene/souko_room_0Tex_0070F8"
-static const ALIGN_ASSET(2) char souko_room_0Tex_0070F8[] = dsouko_room_0Tex_0070F8;
-
-#define dsouko_room_0DL_009440 "__OTR__scenes/nonmq/souko_scene/souko_room_0DL_009440"
-static const ALIGN_ASSET(2) char souko_room_0DL_009440[] = dsouko_room_0DL_009440;
-
-#define dsouko_room_0DL_000FE0 "__OTR__scenes/nonmq/souko_scene/souko_room_0DL_000FE0"
-static const ALIGN_ASSET(2) char souko_room_0DL_000FE0[] = dsouko_room_0DL_000FE0;
-
-#define dsouko_room_0Tex_0090F8 "__OTR__scenes/nonmq/souko_scene/souko_room_0Tex_0090F8"
-static const ALIGN_ASSET(2) char souko_room_0Tex_0090F8[] = dsouko_room_0Tex_0090F8;
-
-#define dsouko_room_0DL_0016C0 "__OTR__scenes/nonmq/souko_scene/souko_room_0DL_0016C0"
-static const ALIGN_ASSET(2) char souko_room_0DL_0016C0[] = dsouko_room_0DL_0016C0;
-
-#define dsouko_room_0DL_004A40 "__OTR__scenes/nonmq/souko_scene/souko_room_0DL_004A40"
-static const ALIGN_ASSET(2) char souko_room_0DL_004A40[] = dsouko_room_0DL_004A40;
-
-#define dsouko_room_0Tex_005CF8 "__OTR__scenes/nonmq/souko_scene/souko_room_0Tex_005CF8"
-static const ALIGN_ASSET(2) char souko_room_0Tex_005CF8[] = dsouko_room_0Tex_005CF8;
-
-#define dsouko_room_0DL_001908 "__OTR__scenes/nonmq/souko_scene/souko_room_0DL_001908"
-static const ALIGN_ASSET(2) char souko_room_0DL_001908[] = dsouko_room_0DL_001908;
-
-#define dsouko_room_0DL_0052A0 "__OTR__scenes/nonmq/souko_scene/souko_room_0DL_0052A0"
-static const ALIGN_ASSET(2) char souko_room_0DL_0052A0[] = dsouko_room_0DL_0052A0;
-
-#define dsouko_room_0DL_0008B0 "__OTR__scenes/nonmq/souko_scene/souko_room_0DL_0008B0"
-static const ALIGN_ASSET(2) char souko_room_0DL_0008B0[] = dsouko_room_0DL_0008B0;
-
-#define dsouko_room_0Tex_0054F8 "__OTR__scenes/nonmq/souko_scene/souko_room_0Tex_0054F8"
+#define dsouko_room_0Tex_0054F8 "__OTR__scenes/shared/souko_scene/souko_room_0Tex_0054F8"
 static const ALIGN_ASSET(2) char souko_room_0Tex_0054F8[] = dsouko_room_0Tex_0054F8;
 
-#define dsouko_room_0DL_002480 "__OTR__scenes/nonmq/souko_scene/souko_room_0DL_002480"
-static const ALIGN_ASSET(2) char souko_room_0DL_002480[] = dsouko_room_0DL_002480;
+#define dsouko_room_0Tex_005CF8 "__OTR__scenes/shared/souko_scene/souko_room_0Tex_005CF8"
+static const ALIGN_ASSET(2) char souko_room_0Tex_005CF8[] = dsouko_room_0Tex_005CF8;
 
-#define dsouko_room_0Tex_0080F8 "__OTR__scenes/nonmq/souko_scene/souko_room_0Tex_0080F8"
-static const ALIGN_ASSET(2) char souko_room_0Tex_0080F8[] = dsouko_room_0Tex_0080F8;
+#define dsouko_room_0Tex_0064F8 "__OTR__scenes/shared/souko_scene/souko_room_0Tex_0064F8"
+static const ALIGN_ASSET(2) char souko_room_0Tex_0064F8[] = dsouko_room_0Tex_0064F8;
 
-#define dsouko_room_0Tex_0078F8 "__OTR__scenes/nonmq/souko_scene/souko_room_0Tex_0078F8"
+#define dsouko_room_0Tex_006CF8 "__OTR__scenes/shared/souko_scene/souko_room_0Tex_006CF8"
+static const ALIGN_ASSET(2) char souko_room_0Tex_006CF8[] = dsouko_room_0Tex_006CF8;
+
+#define dsouko_room_0Tex_0070F8 "__OTR__scenes/shared/souko_scene/souko_room_0Tex_0070F8"
+static const ALIGN_ASSET(2) char souko_room_0Tex_0070F8[] = dsouko_room_0Tex_0070F8;
+
+#define dsouko_room_0Tex_0078F8 "__OTR__scenes/shared/souko_scene/souko_room_0Tex_0078F8"
 static const ALIGN_ASSET(2) char souko_room_0Tex_0078F8[] = dsouko_room_0Tex_0078F8;
 
-#define dsouko_room_0DL_000C58 "__OTR__scenes/nonmq/souko_scene/souko_room_0DL_000C58"
+#define dsouko_room_0Tex_0080F8 "__OTR__scenes/shared/souko_scene/souko_room_0Tex_0080F8"
+static const ALIGN_ASSET(2) char souko_room_0Tex_0080F8[] = dsouko_room_0Tex_0080F8;
+
+#define dsouko_room_0Tex_0090F8 "__OTR__scenes/shared/souko_scene/souko_room_0Tex_0090F8"
+static const ALIGN_ASSET(2) char souko_room_0Tex_0090F8[] = dsouko_room_0Tex_0090F8;
+
+#define dsouko_room_0DL_001E30 "__OTR__scenes/shared/souko_scene/souko_room_0DL_001E30"
+static const ALIGN_ASSET(2) char souko_room_0DL_001E30[] = dsouko_room_0DL_001E30;
+
+#define dsouko_room_0DL_003950 "__OTR__scenes/shared/souko_scene/souko_room_0DL_003950"
+static const ALIGN_ASSET(2) char souko_room_0DL_003950[] = dsouko_room_0DL_003950;
+
+#define dsouko_room_0DL_009440 "__OTR__scenes/shared/souko_scene/souko_room_0DL_009440"
+static const ALIGN_ASSET(2) char souko_room_0DL_009440[] = dsouko_room_0DL_009440;
+
+#define dsouko_room_0DL_000FE0 "__OTR__scenes/shared/souko_scene/souko_room_0DL_000FE0"
+static const ALIGN_ASSET(2) char souko_room_0DL_000FE0[] = dsouko_room_0DL_000FE0;
+
+#define dsouko_room_0DL_0016C0 "__OTR__scenes/shared/souko_scene/souko_room_0DL_0016C0"
+static const ALIGN_ASSET(2) char souko_room_0DL_0016C0[] = dsouko_room_0DL_0016C0;
+
+#define dsouko_room_0DL_004A40 "__OTR__scenes/shared/souko_scene/souko_room_0DL_004A40"
+static const ALIGN_ASSET(2) char souko_room_0DL_004A40[] = dsouko_room_0DL_004A40;
+
+#define dsouko_room_0DL_001908 "__OTR__scenes/shared/souko_scene/souko_room_0DL_001908"
+static const ALIGN_ASSET(2) char souko_room_0DL_001908[] = dsouko_room_0DL_001908;
+
+#define dsouko_room_0DL_0052A0 "__OTR__scenes/shared/souko_scene/souko_room_0DL_0052A0"
+static const ALIGN_ASSET(2) char souko_room_0DL_0052A0[] = dsouko_room_0DL_0052A0;
+
+#define dsouko_room_0DL_0008B0 "__OTR__scenes/shared/souko_scene/souko_room_0DL_0008B0"
+static const ALIGN_ASSET(2) char souko_room_0DL_0008B0[] = dsouko_room_0DL_0008B0;
+
+#define dsouko_room_0DL_002480 "__OTR__scenes/shared/souko_scene/souko_room_0DL_002480"
+static const ALIGN_ASSET(2) char souko_room_0DL_002480[] = dsouko_room_0DL_002480;
+
+#define dsouko_room_0DL_000C58 "__OTR__scenes/shared/souko_scene/souko_room_0DL_000C58"
 static const ALIGN_ASSET(2) char souko_room_0DL_000C58[] = dsouko_room_0DL_000C58;
 
 
diff --git a/soh/assets/scenes/overworld/souko/souko_room_1.h b/soh/assets/scenes/overworld/souko/souko_room_1.h
index 8ac7d1eba..8f527d119 100644
--- a/soh/assets/scenes/overworld/souko/souko_room_1.h
+++ b/soh/assets/scenes/overworld/souko/souko_room_1.h
@@ -3,76 +3,76 @@
 
 #include "align_asset_macro.h"
 
-#define dsouko_room_1DL_003A00 "__OTR__scenes/nonmq/souko_scene/souko_room_1DL_003A00"
-static const ALIGN_ASSET(2) char souko_room_1DL_003A00[] = dsouko_room_1DL_003A00;
-
-#define dsouko_room_1Tex_005918 "__OTR__scenes/nonmq/souko_scene/souko_room_1Tex_005918"
-static const ALIGN_ASSET(2) char souko_room_1Tex_005918[] = dsouko_room_1Tex_005918;
-
-#define dsouko_room_1Tex_007118 "__OTR__scenes/nonmq/souko_scene/souko_room_1Tex_007118"
-static const ALIGN_ASSET(2) char souko_room_1Tex_007118[] = dsouko_room_1Tex_007118;
-
-#define dsouko_room_1DL_009B08 "__OTR__scenes/nonmq/souko_scene/souko_room_1DL_009B08"
-static const ALIGN_ASSET(2) char souko_room_1DL_009B08[] = dsouko_room_1DL_009B08;
-
-#define dsouko_room_1Tex_009F28 "__OTR__scenes/nonmq/souko_scene/souko_room_1Tex_009F28"
-static const ALIGN_ASSET(2) char souko_room_1Tex_009F28[] = dsouko_room_1Tex_009F28;
-
-#define dsouko_room_1DL_0040C8 "__OTR__scenes/nonmq/souko_scene/souko_room_1DL_0040C8"
-static const ALIGN_ASSET(2) char souko_room_1DL_0040C8[] = dsouko_room_1DL_0040C8;
-
-#define dsouko_room_1DL_009DC0 "__OTR__scenes/nonmq/souko_scene/souko_room_1DL_009DC0"
-static const ALIGN_ASSET(2) char souko_room_1DL_009DC0[] = dsouko_room_1DL_009DC0;
-
-#define dsouko_room_1DL_001288 "__OTR__scenes/nonmq/souko_scene/souko_room_1DL_001288"
-static const ALIGN_ASSET(2) char souko_room_1DL_001288[] = dsouko_room_1DL_001288;
-
-#define dsouko_room_1DL_001DF0 "__OTR__scenes/nonmq/souko_scene/souko_room_1DL_001DF0"
-static const ALIGN_ASSET(2) char souko_room_1DL_001DF0[] = dsouko_room_1DL_001DF0;
-
-#define dsouko_room_1DL_004F50 "__OTR__scenes/nonmq/souko_scene/souko_room_1DL_004F50"
-static const ALIGN_ASSET(2) char souko_room_1DL_004F50[] = dsouko_room_1DL_004F50;
-
-#define dsouko_room_1DL_0022B0 "__OTR__scenes/nonmq/souko_scene/souko_room_1DL_0022B0"
-static const ALIGN_ASSET(2) char souko_room_1DL_0022B0[] = dsouko_room_1DL_0022B0;
-
-#define dsouko_room_1Tex_006118 "__OTR__scenes/nonmq/souko_scene/souko_room_1Tex_006118"
-static const ALIGN_ASSET(2) char souko_room_1Tex_006118[] = dsouko_room_1Tex_006118;
-
-#define dsouko_room_1DL_0097E0 "__OTR__scenes/nonmq/souko_scene/souko_room_1DL_0097E0"
-static const ALIGN_ASSET(2) char souko_room_1DL_0097E0[] = dsouko_room_1DL_0097E0;
-
-#define dsouko_room_1Tex_00A128 "__OTR__scenes/nonmq/souko_scene/souko_room_1Tex_00A128"
-static const ALIGN_ASSET(2) char souko_room_1Tex_00A128[] = dsouko_room_1Tex_00A128;
-
-#define dsouko_room_1Tex_00A228 "__OTR__scenes/nonmq/souko_scene/souko_room_1Tex_00A228"
-static const ALIGN_ASSET(2) char souko_room_1Tex_00A228[] = dsouko_room_1Tex_00A228;
-
-#define dsouko_room_1DL_002590 "__OTR__scenes/nonmq/souko_scene/souko_room_1DL_002590"
-static const ALIGN_ASSET(2) char souko_room_1DL_002590[] = dsouko_room_1DL_002590;
-
-#define dsouko_room_1DL_004790 "__OTR__scenes/nonmq/souko_scene/souko_room_1DL_004790"
-static const ALIGN_ASSET(2) char souko_room_1DL_004790[] = dsouko_room_1DL_004790;
-
-#define dsouko_room_1Tex_008D18 "__OTR__scenes/nonmq/souko_scene/souko_room_1Tex_008D18"
-static const ALIGN_ASSET(2) char souko_room_1Tex_008D18[] = dsouko_room_1Tex_008D18;
-
-#define dsouko_room_1DL_000890 "__OTR__scenes/nonmq/souko_scene/souko_room_1DL_000890"
-static const ALIGN_ASSET(2) char souko_room_1DL_000890[] = dsouko_room_1DL_000890;
-
-#define dsouko_room_1Tex_005118 "__OTR__scenes/nonmq/souko_scene/souko_room_1Tex_005118"
+#define dsouko_room_1Tex_005118 "__OTR__scenes/shared/souko_scene/souko_room_1Tex_005118"
 static const ALIGN_ASSET(2) char souko_room_1Tex_005118[] = dsouko_room_1Tex_005118;
 
-#define dsouko_room_1DL_0029C8 "__OTR__scenes/nonmq/souko_scene/souko_room_1DL_0029C8"
-static const ALIGN_ASSET(2) char souko_room_1DL_0029C8[] = dsouko_room_1DL_0029C8;
+#define dsouko_room_1Tex_005918 "__OTR__scenes/shared/souko_scene/souko_room_1Tex_005918"
+static const ALIGN_ASSET(2) char souko_room_1Tex_005918[] = dsouko_room_1Tex_005918;
 
-#define dsouko_room_1Tex_007D18 "__OTR__scenes/nonmq/souko_scene/souko_room_1Tex_007D18"
-static const ALIGN_ASSET(2) char souko_room_1Tex_007D18[] = dsouko_room_1Tex_007D18;
+#define dsouko_room_1Tex_006118 "__OTR__scenes/shared/souko_scene/souko_room_1Tex_006118"
+static const ALIGN_ASSET(2) char souko_room_1Tex_006118[] = dsouko_room_1Tex_006118;
 
-#define dsouko_room_1Tex_007518 "__OTR__scenes/nonmq/souko_scene/souko_room_1Tex_007518"
+#define dsouko_room_1Tex_007118 "__OTR__scenes/shared/souko_scene/souko_room_1Tex_007118"
+static const ALIGN_ASSET(2) char souko_room_1Tex_007118[] = dsouko_room_1Tex_007118;
+
+#define dsouko_room_1Tex_007518 "__OTR__scenes/shared/souko_scene/souko_room_1Tex_007518"
 static const ALIGN_ASSET(2) char souko_room_1Tex_007518[] = dsouko_room_1Tex_007518;
 
-#define dsouko_room_1DL_000FB8 "__OTR__scenes/nonmq/souko_scene/souko_room_1DL_000FB8"
+#define dsouko_room_1Tex_007D18 "__OTR__scenes/shared/souko_scene/souko_room_1Tex_007D18"
+static const ALIGN_ASSET(2) char souko_room_1Tex_007D18[] = dsouko_room_1Tex_007D18;
+
+#define dsouko_room_1Tex_008D18 "__OTR__scenes/shared/souko_scene/souko_room_1Tex_008D18"
+static const ALIGN_ASSET(2) char souko_room_1Tex_008D18[] = dsouko_room_1Tex_008D18;
+
+#define dsouko_room_1Tex_009F28 "__OTR__scenes/shared/souko_scene/souko_room_1Tex_009F28"
+static const ALIGN_ASSET(2) char souko_room_1Tex_009F28[] = dsouko_room_1Tex_009F28;
+
+#define dsouko_room_1Tex_00A128 "__OTR__scenes/shared/souko_scene/souko_room_1Tex_00A128"
+static const ALIGN_ASSET(2) char souko_room_1Tex_00A128[] = dsouko_room_1Tex_00A128;
+
+#define dsouko_room_1Tex_00A228 "__OTR__scenes/shared/souko_scene/souko_room_1Tex_00A228"
+static const ALIGN_ASSET(2) char souko_room_1Tex_00A228[] = dsouko_room_1Tex_00A228;
+
+#define dsouko_room_1DL_003A00 "__OTR__scenes/shared/souko_scene/souko_room_1DL_003A00"
+static const ALIGN_ASSET(2) char souko_room_1DL_003A00[] = dsouko_room_1DL_003A00;
+
+#define dsouko_room_1DL_009B08 "__OTR__scenes/shared/souko_scene/souko_room_1DL_009B08"
+static const ALIGN_ASSET(2) char souko_room_1DL_009B08[] = dsouko_room_1DL_009B08;
+
+#define dsouko_room_1DL_0040C8 "__OTR__scenes/shared/souko_scene/souko_room_1DL_0040C8"
+static const ALIGN_ASSET(2) char souko_room_1DL_0040C8[] = dsouko_room_1DL_0040C8;
+
+#define dsouko_room_1DL_009DC0 "__OTR__scenes/shared/souko_scene/souko_room_1DL_009DC0"
+static const ALIGN_ASSET(2) char souko_room_1DL_009DC0[] = dsouko_room_1DL_009DC0;
+
+#define dsouko_room_1DL_001288 "__OTR__scenes/shared/souko_scene/souko_room_1DL_001288"
+static const ALIGN_ASSET(2) char souko_room_1DL_001288[] = dsouko_room_1DL_001288;
+
+#define dsouko_room_1DL_001DF0 "__OTR__scenes/shared/souko_scene/souko_room_1DL_001DF0"
+static const ALIGN_ASSET(2) char souko_room_1DL_001DF0[] = dsouko_room_1DL_001DF0;
+
+#define dsouko_room_1DL_004F50 "__OTR__scenes/shared/souko_scene/souko_room_1DL_004F50"
+static const ALIGN_ASSET(2) char souko_room_1DL_004F50[] = dsouko_room_1DL_004F50;
+
+#define dsouko_room_1DL_0022B0 "__OTR__scenes/shared/souko_scene/souko_room_1DL_0022B0"
+static const ALIGN_ASSET(2) char souko_room_1DL_0022B0[] = dsouko_room_1DL_0022B0;
+
+#define dsouko_room_1DL_0097E0 "__OTR__scenes/shared/souko_scene/souko_room_1DL_0097E0"
+static const ALIGN_ASSET(2) char souko_room_1DL_0097E0[] = dsouko_room_1DL_0097E0;
+
+#define dsouko_room_1DL_002590 "__OTR__scenes/shared/souko_scene/souko_room_1DL_002590"
+static const ALIGN_ASSET(2) char souko_room_1DL_002590[] = dsouko_room_1DL_002590;
+
+#define dsouko_room_1DL_004790 "__OTR__scenes/shared/souko_scene/souko_room_1DL_004790"
+static const ALIGN_ASSET(2) char souko_room_1DL_004790[] = dsouko_room_1DL_004790;
+
+#define dsouko_room_1DL_000890 "__OTR__scenes/shared/souko_scene/souko_room_1DL_000890"
+static const ALIGN_ASSET(2) char souko_room_1DL_000890[] = dsouko_room_1DL_000890;
+
+#define dsouko_room_1DL_0029C8 "__OTR__scenes/shared/souko_scene/souko_room_1DL_0029C8"
+static const ALIGN_ASSET(2) char souko_room_1DL_0029C8[] = dsouko_room_1DL_0029C8;
+
+#define dsouko_room_1DL_000FB8 "__OTR__scenes/shared/souko_scene/souko_room_1DL_000FB8"
 static const ALIGN_ASSET(2) char souko_room_1DL_000FB8[] = dsouko_room_1DL_000FB8;
 
 
diff --git a/soh/assets/scenes/overworld/souko/souko_room_2.h b/soh/assets/scenes/overworld/souko/souko_room_2.h
index 5c33d1ea9..905a5ef0e 100644
--- a/soh/assets/scenes/overworld/souko/souko_room_2.h
+++ b/soh/assets/scenes/overworld/souko/souko_room_2.h
@@ -3,49 +3,49 @@
 
 #include "align_asset_macro.h"
 
-#define dsouko_room_2DL_007C20 "__OTR__scenes/nonmq/souko_scene/souko_room_2DL_007C20"
-static const ALIGN_ASSET(2) char souko_room_2DL_007C20[] = dsouko_room_2DL_007C20;
-
-#define dsouko_room_2DL_0009D0 "__OTR__scenes/nonmq/souko_scene/souko_room_2DL_0009D0"
-static const ALIGN_ASSET(2) char souko_room_2DL_0009D0[] = dsouko_room_2DL_0009D0;
-
-#define dsouko_room_2DL_0030F8 "__OTR__scenes/nonmq/souko_scene/souko_room_2DL_0030F8"
-static const ALIGN_ASSET(2) char souko_room_2DL_0030F8[] = dsouko_room_2DL_0030F8;
-
-#define dsouko_room_2Tex_0062E0 "__OTR__scenes/nonmq/souko_scene/souko_room_2Tex_0062E0"
-static const ALIGN_ASSET(2) char souko_room_2Tex_0062E0[] = dsouko_room_2Tex_0062E0;
-
-#define dsouko_room_2Tex_005AE0 "__OTR__scenes/nonmq/souko_scene/souko_room_2Tex_005AE0"
-static const ALIGN_ASSET(2) char souko_room_2Tex_005AE0[] = dsouko_room_2Tex_005AE0;
-
-#define dsouko_room_2Tex_0052E0 "__OTR__scenes/nonmq/souko_scene/souko_room_2Tex_0052E0"
-static const ALIGN_ASSET(2) char souko_room_2Tex_0052E0[] = dsouko_room_2Tex_0052E0;
-
-#define dsouko_room_2Tex_006AE0 "__OTR__scenes/nonmq/souko_scene/souko_room_2Tex_006AE0"
-static const ALIGN_ASSET(2) char souko_room_2Tex_006AE0[] = dsouko_room_2Tex_006AE0;
-
-#define dsouko_room_2Tex_004EE0 "__OTR__scenes/nonmq/souko_scene/souko_room_2Tex_004EE0"
+#define dsouko_room_2Tex_004EE0 "__OTR__scenes/shared/souko_scene/souko_room_2Tex_004EE0"
 static const ALIGN_ASSET(2) char souko_room_2Tex_004EE0[] = dsouko_room_2Tex_004EE0;
 
-#define dsouko_room_2DL_007E90 "__OTR__scenes/nonmq/souko_scene/souko_room_2DL_007E90"
-static const ALIGN_ASSET(2) char souko_room_2DL_007E90[] = dsouko_room_2DL_007E90;
+#define dsouko_room_2Tex_0052E0 "__OTR__scenes/shared/souko_scene/souko_room_2Tex_0052E0"
+static const ALIGN_ASSET(2) char souko_room_2Tex_0052E0[] = dsouko_room_2Tex_0052E0;
 
-#define dsouko_room_2Tex_007F78 "__OTR__scenes/nonmq/souko_scene/souko_room_2Tex_007F78"
+#define dsouko_room_2Tex_005AE0 "__OTR__scenes/shared/souko_scene/souko_room_2Tex_005AE0"
+static const ALIGN_ASSET(2) char souko_room_2Tex_005AE0[] = dsouko_room_2Tex_005AE0;
+
+#define dsouko_room_2Tex_0062E0 "__OTR__scenes/shared/souko_scene/souko_room_2Tex_0062E0"
+static const ALIGN_ASSET(2) char souko_room_2Tex_0062E0[] = dsouko_room_2Tex_0062E0;
+
+#define dsouko_room_2Tex_006AE0 "__OTR__scenes/shared/souko_scene/souko_room_2Tex_006AE0"
+static const ALIGN_ASSET(2) char souko_room_2Tex_006AE0[] = dsouko_room_2Tex_006AE0;
+
+#define dsouko_room_2Tex_007F78 "__OTR__scenes/shared/souko_scene/souko_room_2Tex_007F78"
 static const ALIGN_ASSET(2) char souko_room_2Tex_007F78[] = dsouko_room_2Tex_007F78;
 
-#define dsouko_room_2DL_0044C8 "__OTR__scenes/nonmq/souko_scene/souko_room_2DL_0044C8"
+#define dsouko_room_2DL_007C20 "__OTR__scenes/shared/souko_scene/souko_room_2DL_007C20"
+static const ALIGN_ASSET(2) char souko_room_2DL_007C20[] = dsouko_room_2DL_007C20;
+
+#define dsouko_room_2DL_0009D0 "__OTR__scenes/shared/souko_scene/souko_room_2DL_0009D0"
+static const ALIGN_ASSET(2) char souko_room_2DL_0009D0[] = dsouko_room_2DL_0009D0;
+
+#define dsouko_room_2DL_0030F8 "__OTR__scenes/shared/souko_scene/souko_room_2DL_0030F8"
+static const ALIGN_ASSET(2) char souko_room_2DL_0030F8[] = dsouko_room_2DL_0030F8;
+
+#define dsouko_room_2DL_007E90 "__OTR__scenes/shared/souko_scene/souko_room_2DL_007E90"
+static const ALIGN_ASSET(2) char souko_room_2DL_007E90[] = dsouko_room_2DL_007E90;
+
+#define dsouko_room_2DL_0044C8 "__OTR__scenes/shared/souko_scene/souko_room_2DL_0044C8"
 static const ALIGN_ASSET(2) char souko_room_2DL_0044C8[] = dsouko_room_2DL_0044C8;
 
-#define dsouko_room_2DL_004B10 "__OTR__scenes/nonmq/souko_scene/souko_room_2DL_004B10"
+#define dsouko_room_2DL_004B10 "__OTR__scenes/shared/souko_scene/souko_room_2DL_004B10"
 static const ALIGN_ASSET(2) char souko_room_2DL_004B10[] = dsouko_room_2DL_004B10;
 
-#define dsouko_room_2DL_0002B0 "__OTR__scenes/nonmq/souko_scene/souko_room_2DL_0002B0"
+#define dsouko_room_2DL_0002B0 "__OTR__scenes/shared/souko_scene/souko_room_2DL_0002B0"
 static const ALIGN_ASSET(2) char souko_room_2DL_0002B0[] = dsouko_room_2DL_0002B0;
 
-#define dsouko_room_2DL_0015E0 "__OTR__scenes/nonmq/souko_scene/souko_room_2DL_0015E0"
+#define dsouko_room_2DL_0015E0 "__OTR__scenes/shared/souko_scene/souko_room_2DL_0015E0"
 static const ALIGN_ASSET(2) char souko_room_2DL_0015E0[] = dsouko_room_2DL_0015E0;
 
-#define dsouko_room_2DL_000EF8 "__OTR__scenes/nonmq/souko_scene/souko_room_2DL_000EF8"
+#define dsouko_room_2DL_000EF8 "__OTR__scenes/shared/souko_scene/souko_room_2DL_000EF8"
 static const ALIGN_ASSET(2) char souko_room_2DL_000EF8[] = dsouko_room_2DL_000EF8;
 
 
diff --git a/soh/assets/scenes/overworld/souko/souko_scene.h b/soh/assets/scenes/overworld/souko/souko_scene.h
index 8dfad318a..db7092836 100644
--- a/soh/assets/scenes/overworld/souko/souko_scene.h
+++ b/soh/assets/scenes/overworld/souko/souko_scene.h
@@ -3,25 +3,26 @@
 
 #include "align_asset_macro.h"
 
-#define dgLonLonHouseDayEntranceTex "__OTR__scenes/nonmq/souko_scene/gLonLonHouseDayEntranceTex"
-static const ALIGN_ASSET(2) char gLonLonHouseDayEntranceTex[] = dgLonLonHouseDayEntranceTex;
-
-#define dgLonLonHouseNightEntranceTex "__OTR__scenes/nonmq/souko_scene/gLonLonHouseNightEntranceTex"
-static const ALIGN_ASSET(2) char gLonLonHouseNightEntranceTex[] = dgLonLonHouseNightEntranceTex;
-
-#define dsouko_sceneCollisionHeader_0043E0 "__OTR__scenes/nonmq/souko_scene/souko_sceneCollisionHeader_0043E0"
-static const ALIGN_ASSET(2) char souko_sceneCollisionHeader_0043E0[] = dsouko_sceneCollisionHeader_0043E0;
-
-#define dsouko_sceneTex_005C10 "__OTR__scenes/nonmq/souko_scene/souko_sceneTex_005C10"
-static const ALIGN_ASSET(2) char souko_sceneTex_005C10[] = dsouko_sceneTex_005C10;
-
-#define dsouko_sceneTex_004C10 "__OTR__scenes/nonmq/souko_scene/souko_sceneTex_004C10"
-static const ALIGN_ASSET(2) char souko_sceneTex_004C10[] = dsouko_sceneTex_004C10;
-
-#define dsouko_sceneTex_004410 "__OTR__scenes/nonmq/souko_scene/souko_sceneTex_004410"
+#define dsouko_sceneTex_004410 "__OTR__scenes/shared/souko_scene/souko_sceneTex_004410"
 static const ALIGN_ASSET(2) char souko_sceneTex_004410[] = dsouko_sceneTex_004410;
 
-#define dsouko_sceneTex_005410 "__OTR__scenes/nonmq/souko_scene/souko_sceneTex_005410"
+#define dsouko_sceneTex_004C10 "__OTR__scenes/shared/souko_scene/souko_sceneTex_004C10"
+static const ALIGN_ASSET(2) char souko_sceneTex_004C10[] = dsouko_sceneTex_004C10;
+
+#define dsouko_sceneTex_005410 "__OTR__scenes/shared/souko_scene/souko_sceneTex_005410"
 static const ALIGN_ASSET(2) char souko_sceneTex_005410[] = dsouko_sceneTex_005410;
 
+#define dsouko_sceneTex_005C10 "__OTR__scenes/shared/souko_scene/souko_sceneTex_005C10"
+static const ALIGN_ASSET(2) char souko_sceneTex_005C10[] = dsouko_sceneTex_005C10;
+
+#define dgLonLonHouseDayEntranceTex "__OTR__scenes/shared/souko_scene/gLonLonHouseDayEntranceTex"
+static const ALIGN_ASSET(2) char gLonLonHouseDayEntranceTex[] = dgLonLonHouseDayEntranceTex;
+
+#define dgLonLonHouseNightEntranceTex "__OTR__scenes/shared/souko_scene/gLonLonHouseNightEntranceTex"
+static const ALIGN_ASSET(2) char gLonLonHouseNightEntranceTex[] = dgLonLonHouseNightEntranceTex;
+
+#define dsouko_sceneCollisionHeader_0043E0 "__OTR__scenes/shared/souko_scene/souko_sceneCollisionHeader_0043E0"
+static const ALIGN_ASSET(2) char souko_sceneCollisionHeader_0043E0[] = dsouko_sceneCollisionHeader_0043E0;
+
+
 #endif // OVERWORLD_SOUKO_SCENE_H
diff --git a/soh/assets/scenes/overworld/spot00/spot00_room_0.h b/soh/assets/scenes/overworld/spot00/spot00_room_0.h
index 619c13111..26af6bc4c 100644
--- a/soh/assets/scenes/overworld/spot00/spot00_room_0.h
+++ b/soh/assets/scenes/overworld/spot00/spot00_room_0.h
@@ -3,1339 +3,1339 @@
 
 #include "align_asset_macro.h"
 
-#define dspot00_room_0DL_013250 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_013250"
+#define dspot00_room_0DL_013250 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_013250"
 static const ALIGN_ASSET(2) char spot00_room_0DL_013250[] = dspot00_room_0DL_013250;
 
-#define dspot00_room_0DL_0139A8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_0139A8"
+#define dspot00_room_0DL_0139A8 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_0139A8"
 static const ALIGN_ASSET(2) char spot00_room_0DL_0139A8[] = dspot00_room_0DL_0139A8;
 
-#define dspot00_room_0DL_0143C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_0143C8"
+#define dspot00_room_0DL_0143C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_0143C8"
 static const ALIGN_ASSET(2) char spot00_room_0DL_0143C8[] = dspot00_room_0DL_0143C8;
 
-#define dspot00_room_0DL_015100 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_015100"
+#define dspot00_room_0DL_015100 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_015100"
 static const ALIGN_ASSET(2) char spot00_room_0DL_015100[] = dspot00_room_0DL_015100;
 
-#define dspot00_room_0DL_014E28 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_014E28"
+#define dspot00_room_0DL_014E28 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_014E28"
 static const ALIGN_ASSET(2) char spot00_room_0DL_014E28[] = dspot00_room_0DL_014E28;
 
-#define dspot00_room_0DL_008448 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_008448"
+#define dspot00_room_0DL_008448 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_008448"
 static const ALIGN_ASSET(2) char spot00_room_0DL_008448[] = dspot00_room_0DL_008448;
 
-#define dspot00_room_0DL_012C38 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_012C38"
+#define dspot00_room_0DL_012C38 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_012C38"
 static const ALIGN_ASSET(2) char spot00_room_0DL_012C38[] = dspot00_room_0DL_012C38;
 
-#define dspot00_room_0DL_012E18 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_012E18"
+#define dspot00_room_0DL_012E18 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_012E18"
 static const ALIGN_ASSET(2) char spot00_room_0DL_012E18[] = dspot00_room_0DL_012E18;
 
-#define dspot00_room_0DL_002790 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_002790"
+#define dspot00_room_0DL_002790 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_002790"
 static const ALIGN_ASSET(2) char spot00_room_0DL_002790[] = dspot00_room_0DL_002790;
 
-#define dspot00_room_0DL_003338 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_003338"
+#define dspot00_room_0DL_003338 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_003338"
 static const ALIGN_ASSET(2) char spot00_room_0DL_003338[] = dspot00_room_0DL_003338;
 
-#define dspot00_room_0DL_003ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_003ED0"
+#define dspot00_room_0DL_003ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_003ED0"
 static const ALIGN_ASSET(2) char spot00_room_0DL_003ED0[] = dspot00_room_0DL_003ED0;
 
-#define dspot00_room_0DL_005030 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_005030"
+#define dspot00_room_0DL_005030 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_005030"
 static const ALIGN_ASSET(2) char spot00_room_0DL_005030[] = dspot00_room_0DL_005030;
 
-#define dspot00_room_0DL_005850 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_005850"
+#define dspot00_room_0DL_005850 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_005850"
 static const ALIGN_ASSET(2) char spot00_room_0DL_005850[] = dspot00_room_0DL_005850;
 
-#define dspot00_room_0DL_005BC0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_005BC0"
+#define dspot00_room_0DL_005BC0 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_005BC0"
 static const ALIGN_ASSET(2) char spot00_room_0DL_005BC0[] = dspot00_room_0DL_005BC0;
 
-#define dspot00_room_0DL_005E78 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_005E78"
+#define dspot00_room_0DL_005E78 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_005E78"
 static const ALIGN_ASSET(2) char spot00_room_0DL_005E78[] = dspot00_room_0DL_005E78;
 
-#define dspot00_room_0DL_0067C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_0067C8"
+#define dspot00_room_0DL_0067C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_0067C8"
 static const ALIGN_ASSET(2) char spot00_room_0DL_0067C8[] = dspot00_room_0DL_0067C8;
 
-#define dspot00_room_0DL_006ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_006ED0"
+#define dspot00_room_0DL_006ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_006ED0"
 static const ALIGN_ASSET(2) char spot00_room_0DL_006ED0[] = dspot00_room_0DL_006ED0;
 
-#define dspot00_room_0DL_007230 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_007230"
+#define dspot00_room_0DL_007230 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_007230"
 static const ALIGN_ASSET(2) char spot00_room_0DL_007230[] = dspot00_room_0DL_007230;
 
-#define dspot00_room_0DL_008ED8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_008ED8"
+#define dspot00_room_0DL_008ED8 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_008ED8"
 static const ALIGN_ASSET(2) char spot00_room_0DL_008ED8[] = dspot00_room_0DL_008ED8;
 
-#define dspot00_room_0DL_0093A0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_0093A0"
+#define dspot00_room_0DL_0093A0 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_0093A0"
 static const ALIGN_ASSET(2) char spot00_room_0DL_0093A0[] = dspot00_room_0DL_0093A0;
 
-#define dspot00_room_0DL_009D10 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_009D10"
+#define dspot00_room_0DL_009D10 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_009D10"
 static const ALIGN_ASSET(2) char spot00_room_0DL_009D10[] = dspot00_room_0DL_009D10;
 
-#define dspot00_room_0DL_00AD00 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_00AD00"
+#define dspot00_room_0DL_00AD00 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_00AD00"
 static const ALIGN_ASSET(2) char spot00_room_0DL_00AD00[] = dspot00_room_0DL_00AD00;
 
-#define dspot00_room_0DL_00B520 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_00B520"
+#define dspot00_room_0DL_00B520 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_00B520"
 static const ALIGN_ASSET(2) char spot00_room_0DL_00B520[] = dspot00_room_0DL_00B520;
 
-#define dspot00_room_0DL_00B8B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_00B8B0"
+#define dspot00_room_0DL_00B8B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_00B8B0"
 static const ALIGN_ASSET(2) char spot00_room_0DL_00B8B0[] = dspot00_room_0DL_00B8B0;
 
-#define dspot00_room_0DL_00BD20 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_00BD20"
+#define dspot00_room_0DL_00BD20 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_00BD20"
 static const ALIGN_ASSET(2) char spot00_room_0DL_00BD20[] = dspot00_room_0DL_00BD20;
 
-#define dspot00_room_0DL_00CEB8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_00CEB8"
+#define dspot00_room_0DL_00CEB8 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_00CEB8"
 static const ALIGN_ASSET(2) char spot00_room_0DL_00CEB8[] = dspot00_room_0DL_00CEB8;
 
-#define dspot00_room_0DL_00D980 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_00D980"
+#define dspot00_room_0DL_00D980 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_00D980"
 static const ALIGN_ASSET(2) char spot00_room_0DL_00D980[] = dspot00_room_0DL_00D980;
 
-#define dspot00_room_0DL_00DD70 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_00DD70"
+#define dspot00_room_0DL_00DD70 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_00DD70"
 static const ALIGN_ASSET(2) char spot00_room_0DL_00DD70[] = dspot00_room_0DL_00DD70;
 
-#define dspot00_room_0DL_00DFA8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_00DFA8"
+#define dspot00_room_0DL_00DFA8 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_00DFA8"
 static const ALIGN_ASSET(2) char spot00_room_0DL_00DFA8[] = dspot00_room_0DL_00DFA8;
 
-#define dspot00_room_0DL_00E7B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_00E7B0"
+#define dspot00_room_0DL_00E7B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_00E7B0"
 static const ALIGN_ASSET(2) char spot00_room_0DL_00E7B0[] = dspot00_room_0DL_00E7B0;
 
-#define dspot00_room_0DL_00F3F8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_00F3F8"
+#define dspot00_room_0DL_00F3F8 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_00F3F8"
 static const ALIGN_ASSET(2) char spot00_room_0DL_00F3F8[] = dspot00_room_0DL_00F3F8;
 
-#define dspot00_room_0DL_00FB50 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_00FB50"
+#define dspot00_room_0DL_00FB50 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_00FB50"
 static const ALIGN_ASSET(2) char spot00_room_0DL_00FB50[] = dspot00_room_0DL_00FB50;
 
-#define dspot00_room_0DL_00FE98 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_00FE98"
+#define dspot00_room_0DL_00FE98 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_00FE98"
 static const ALIGN_ASSET(2) char spot00_room_0DL_00FE98[] = dspot00_room_0DL_00FE98;
 
-#define dspot00_room_0DL_0127B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_0127B8"
+#define dspot00_room_0DL_0127B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_0127B8"
 static const ALIGN_ASSET(2) char spot00_room_0DL_0127B8[] = dspot00_room_0DL_0127B8;
 
-#define dspot00_room_0DL_00E328 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_00E328"
+#define dspot00_room_0DL_00E328 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_00E328"
 static const ALIGN_ASSET(2) char spot00_room_0DL_00E328[] = dspot00_room_0DL_00E328;
 
-#define dspot00_room_0DL_0112B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_0112B8"
+#define dspot00_room_0DL_0112B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_0112B8"
 static const ALIGN_ASSET(2) char spot00_room_0DL_0112B8[] = dspot00_room_0DL_0112B8;
 
-#define dspot00_room_0DL_0121D0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_0121D0"
+#define dspot00_room_0DL_0121D0 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_0121D0"
 static const ALIGN_ASSET(2) char spot00_room_0DL_0121D0[] = dspot00_room_0DL_0121D0;
 
-#define dspot00_room_0DL_012B20 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0DL_012B20"
+#define dspot00_room_0DL_012B20 "__OTR__scenes/shared/spot00_scene/spot00_room_0DL_012B20"
 static const ALIGN_ASSET(2) char spot00_room_0DL_012B20[] = dspot00_room_0DL_012B20;
 
-#define dspot00_room_0Set_000C50DL_013250 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_013250"
+#define dspot00_room_0Set_000C50DL_013250 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_013250"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_013250[] = dspot00_room_0Set_000C50DL_013250;
 
-#define dspot00_room_0Set_000C50DL_0139A8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_0139A8"
+#define dspot00_room_0Set_000C50DL_0139A8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_0139A8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_0139A8[] = dspot00_room_0Set_000C50DL_0139A8;
 
-#define dspot00_room_0Set_000C50DL_0143C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_0143C8"
+#define dspot00_room_0Set_000C50DL_0143C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_0143C8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_0143C8[] = dspot00_room_0Set_000C50DL_0143C8;
 
-#define dspot00_room_0Set_000C50DL_015100 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_015100"
+#define dspot00_room_0Set_000C50DL_015100 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_015100"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_015100[] = dspot00_room_0Set_000C50DL_015100;
 
-#define dspot00_room_0Set_000C50DL_014E28 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_014E28"
+#define dspot00_room_0Set_000C50DL_014E28 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_014E28"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_014E28[] = dspot00_room_0Set_000C50DL_014E28;
 
-#define dspot00_room_0Set_000C50DL_008448 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_008448"
+#define dspot00_room_0Set_000C50DL_008448 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_008448"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_008448[] = dspot00_room_0Set_000C50DL_008448;
 
-#define dspot00_room_0Set_000C50DL_012C38 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_012C38"
+#define dspot00_room_0Set_000C50DL_012C38 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_012C38"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_012C38[] = dspot00_room_0Set_000C50DL_012C38;
 
-#define dspot00_room_0Set_000C50DL_012E18 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_012E18"
+#define dspot00_room_0Set_000C50DL_012E18 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_012E18"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_012E18[] = dspot00_room_0Set_000C50DL_012E18;
 
-#define dspot00_room_0Set_000C50DL_002790 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_002790"
+#define dspot00_room_0Set_000C50DL_002790 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_002790"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_002790[] = dspot00_room_0Set_000C50DL_002790;
 
-#define dspot00_room_0Set_000C50DL_003338 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_003338"
+#define dspot00_room_0Set_000C50DL_003338 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_003338"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_003338[] = dspot00_room_0Set_000C50DL_003338;
 
-#define dspot00_room_0Set_000C50DL_003ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_003ED0"
+#define dspot00_room_0Set_000C50DL_003ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_003ED0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_003ED0[] = dspot00_room_0Set_000C50DL_003ED0;
 
-#define dspot00_room_0Set_000C50DL_005030 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_005030"
+#define dspot00_room_0Set_000C50DL_005030 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_005030"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_005030[] = dspot00_room_0Set_000C50DL_005030;
 
-#define dspot00_room_0Set_000C50DL_005850 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_005850"
+#define dspot00_room_0Set_000C50DL_005850 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_005850"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_005850[] = dspot00_room_0Set_000C50DL_005850;
 
-#define dspot00_room_0Set_000C50DL_005BC0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_005BC0"
+#define dspot00_room_0Set_000C50DL_005BC0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_005BC0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_005BC0[] = dspot00_room_0Set_000C50DL_005BC0;
 
-#define dspot00_room_0Set_000C50DL_005E78 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_005E78"
+#define dspot00_room_0Set_000C50DL_005E78 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_005E78"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_005E78[] = dspot00_room_0Set_000C50DL_005E78;
 
-#define dspot00_room_0Set_000C50DL_0067C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_0067C8"
+#define dspot00_room_0Set_000C50DL_0067C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_0067C8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_0067C8[] = dspot00_room_0Set_000C50DL_0067C8;
 
-#define dspot00_room_0Set_000C50DL_006ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_006ED0"
+#define dspot00_room_0Set_000C50DL_006ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_006ED0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_006ED0[] = dspot00_room_0Set_000C50DL_006ED0;
 
-#define dspot00_room_0Set_000C50DL_007230 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_007230"
+#define dspot00_room_0Set_000C50DL_007230 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_007230"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_007230[] = dspot00_room_0Set_000C50DL_007230;
 
-#define dspot00_room_0Set_000C50DL_008ED8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_008ED8"
+#define dspot00_room_0Set_000C50DL_008ED8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_008ED8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_008ED8[] = dspot00_room_0Set_000C50DL_008ED8;
 
-#define dspot00_room_0Set_000C50DL_0093A0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_0093A0"
+#define dspot00_room_0Set_000C50DL_0093A0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_0093A0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_0093A0[] = dspot00_room_0Set_000C50DL_0093A0;
 
-#define dspot00_room_0Set_000C50DL_009D10 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_009D10"
+#define dspot00_room_0Set_000C50DL_009D10 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_009D10"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_009D10[] = dspot00_room_0Set_000C50DL_009D10;
 
-#define dspot00_room_0Set_000C50DL_00AD00 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_00AD00"
+#define dspot00_room_0Set_000C50DL_00AD00 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_00AD00"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_00AD00[] = dspot00_room_0Set_000C50DL_00AD00;
 
-#define dspot00_room_0Set_000C50DL_00B520 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_00B520"
+#define dspot00_room_0Set_000C50DL_00B520 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_00B520"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_00B520[] = dspot00_room_0Set_000C50DL_00B520;
 
-#define dspot00_room_0Set_000C50DL_00B8B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_00B8B0"
+#define dspot00_room_0Set_000C50DL_00B8B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_00B8B0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_00B8B0[] = dspot00_room_0Set_000C50DL_00B8B0;
 
-#define dspot00_room_0Set_000C50DL_00BD20 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_00BD20"
+#define dspot00_room_0Set_000C50DL_00BD20 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_00BD20"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_00BD20[] = dspot00_room_0Set_000C50DL_00BD20;
 
-#define dspot00_room_0Set_000C50DL_00CEB8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_00CEB8"
+#define dspot00_room_0Set_000C50DL_00CEB8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_00CEB8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_00CEB8[] = dspot00_room_0Set_000C50DL_00CEB8;
 
-#define dspot00_room_0Set_000C50DL_00D980 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_00D980"
+#define dspot00_room_0Set_000C50DL_00D980 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_00D980"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_00D980[] = dspot00_room_0Set_000C50DL_00D980;
 
-#define dspot00_room_0Set_000C50DL_00DD70 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_00DD70"
+#define dspot00_room_0Set_000C50DL_00DD70 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_00DD70"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_00DD70[] = dspot00_room_0Set_000C50DL_00DD70;
 
-#define dspot00_room_0Set_000C50DL_00DFA8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_00DFA8"
+#define dspot00_room_0Set_000C50DL_00DFA8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_00DFA8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_00DFA8[] = dspot00_room_0Set_000C50DL_00DFA8;
 
-#define dspot00_room_0Set_000C50DL_00E7B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_00E7B0"
+#define dspot00_room_0Set_000C50DL_00E7B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_00E7B0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_00E7B0[] = dspot00_room_0Set_000C50DL_00E7B0;
 
-#define dspot00_room_0Set_000C50DL_00F3F8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_00F3F8"
+#define dspot00_room_0Set_000C50DL_00F3F8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_00F3F8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_00F3F8[] = dspot00_room_0Set_000C50DL_00F3F8;
 
-#define dspot00_room_0Set_000C50DL_00FB50 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_00FB50"
+#define dspot00_room_0Set_000C50DL_00FB50 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_00FB50"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_00FB50[] = dspot00_room_0Set_000C50DL_00FB50;
 
-#define dspot00_room_0Set_000C50DL_00FE98 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_00FE98"
+#define dspot00_room_0Set_000C50DL_00FE98 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_00FE98"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_00FE98[] = dspot00_room_0Set_000C50DL_00FE98;
 
-#define dspot00_room_0Set_000C50DL_0127B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_0127B8"
+#define dspot00_room_0Set_000C50DL_0127B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_0127B8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_0127B8[] = dspot00_room_0Set_000C50DL_0127B8;
 
-#define dspot00_room_0Set_000C50DL_00E328 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_00E328"
+#define dspot00_room_0Set_000C50DL_00E328 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_00E328"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_00E328[] = dspot00_room_0Set_000C50DL_00E328;
 
-#define dspot00_room_0Set_000C50DL_0112B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_0112B8"
+#define dspot00_room_0Set_000C50DL_0112B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_0112B8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_0112B8[] = dspot00_room_0Set_000C50DL_0112B8;
 
-#define dspot00_room_0Set_000C50DL_0121D0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000C50DL_0121D0"
+#define dspot00_room_0Set_000C50DL_0121D0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000C50DL_0121D0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000C50DL_0121D0[] = dspot00_room_0Set_000C50DL_0121D0;
 
-#define dspot00_room_0Set_000770DL_013250 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_013250"
+#define dspot00_room_0Set_000770DL_013250 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_013250"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_013250[] = dspot00_room_0Set_000770DL_013250;
 
-#define dspot00_room_0Set_000770DL_0139A8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_0139A8"
+#define dspot00_room_0Set_000770DL_0139A8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_0139A8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_0139A8[] = dspot00_room_0Set_000770DL_0139A8;
 
-#define dspot00_room_0Set_000770DL_0143C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_0143C8"
+#define dspot00_room_0Set_000770DL_0143C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_0143C8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_0143C8[] = dspot00_room_0Set_000770DL_0143C8;
 
-#define dspot00_room_0Set_000770DL_015100 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_015100"
+#define dspot00_room_0Set_000770DL_015100 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_015100"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_015100[] = dspot00_room_0Set_000770DL_015100;
 
-#define dspot00_room_0Set_000770DL_014E28 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_014E28"
+#define dspot00_room_0Set_000770DL_014E28 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_014E28"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_014E28[] = dspot00_room_0Set_000770DL_014E28;
 
-#define dspot00_room_0Set_000770DL_008448 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_008448"
+#define dspot00_room_0Set_000770DL_008448 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_008448"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_008448[] = dspot00_room_0Set_000770DL_008448;
 
-#define dspot00_room_0Set_000770DL_012C38 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_012C38"
+#define dspot00_room_0Set_000770DL_012C38 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_012C38"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_012C38[] = dspot00_room_0Set_000770DL_012C38;
 
-#define dspot00_room_0Set_000770DL_012E18 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_012E18"
+#define dspot00_room_0Set_000770DL_012E18 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_012E18"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_012E18[] = dspot00_room_0Set_000770DL_012E18;
 
-#define dspot00_room_0Set_000770DL_002790 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_002790"
+#define dspot00_room_0Set_000770DL_002790 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_002790"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_002790[] = dspot00_room_0Set_000770DL_002790;
 
-#define dspot00_room_0Set_000770DL_003338 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_003338"
+#define dspot00_room_0Set_000770DL_003338 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_003338"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_003338[] = dspot00_room_0Set_000770DL_003338;
 
-#define dspot00_room_0Set_000770DL_003ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_003ED0"
+#define dspot00_room_0Set_000770DL_003ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_003ED0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_003ED0[] = dspot00_room_0Set_000770DL_003ED0;
 
-#define dspot00_room_0Set_000770DL_005030 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_005030"
+#define dspot00_room_0Set_000770DL_005030 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_005030"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_005030[] = dspot00_room_0Set_000770DL_005030;
 
-#define dspot00_room_0Set_000770DL_005850 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_005850"
+#define dspot00_room_0Set_000770DL_005850 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_005850"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_005850[] = dspot00_room_0Set_000770DL_005850;
 
-#define dspot00_room_0Set_000770DL_005BC0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_005BC0"
+#define dspot00_room_0Set_000770DL_005BC0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_005BC0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_005BC0[] = dspot00_room_0Set_000770DL_005BC0;
 
-#define dspot00_room_0Set_000770DL_005E78 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_005E78"
+#define dspot00_room_0Set_000770DL_005E78 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_005E78"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_005E78[] = dspot00_room_0Set_000770DL_005E78;
 
-#define dspot00_room_0Set_000770DL_0067C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_0067C8"
+#define dspot00_room_0Set_000770DL_0067C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_0067C8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_0067C8[] = dspot00_room_0Set_000770DL_0067C8;
 
-#define dspot00_room_0Set_000770DL_006ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_006ED0"
+#define dspot00_room_0Set_000770DL_006ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_006ED0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_006ED0[] = dspot00_room_0Set_000770DL_006ED0;
 
-#define dspot00_room_0Set_000770DL_007230 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_007230"
+#define dspot00_room_0Set_000770DL_007230 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_007230"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_007230[] = dspot00_room_0Set_000770DL_007230;
 
-#define dspot00_room_0Set_000770DL_008ED8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_008ED8"
+#define dspot00_room_0Set_000770DL_008ED8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_008ED8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_008ED8[] = dspot00_room_0Set_000770DL_008ED8;
 
-#define dspot00_room_0Set_000770DL_0093A0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_0093A0"
+#define dspot00_room_0Set_000770DL_0093A0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_0093A0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_0093A0[] = dspot00_room_0Set_000770DL_0093A0;
 
-#define dspot00_room_0Set_000770DL_009D10 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_009D10"
+#define dspot00_room_0Set_000770DL_009D10 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_009D10"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_009D10[] = dspot00_room_0Set_000770DL_009D10;
 
-#define dspot00_room_0Set_000770DL_00AD00 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_00AD00"
+#define dspot00_room_0Set_000770DL_00AD00 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_00AD00"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_00AD00[] = dspot00_room_0Set_000770DL_00AD00;
 
-#define dspot00_room_0Set_000770DL_00B520 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_00B520"
+#define dspot00_room_0Set_000770DL_00B520 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_00B520"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_00B520[] = dspot00_room_0Set_000770DL_00B520;
 
-#define dspot00_room_0Set_000770DL_00B8B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_00B8B0"
+#define dspot00_room_0Set_000770DL_00B8B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_00B8B0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_00B8B0[] = dspot00_room_0Set_000770DL_00B8B0;
 
-#define dspot00_room_0Set_000770DL_00BD20 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_00BD20"
+#define dspot00_room_0Set_000770DL_00BD20 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_00BD20"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_00BD20[] = dspot00_room_0Set_000770DL_00BD20;
 
-#define dspot00_room_0Set_000770DL_00CEB8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_00CEB8"
+#define dspot00_room_0Set_000770DL_00CEB8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_00CEB8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_00CEB8[] = dspot00_room_0Set_000770DL_00CEB8;
 
-#define dspot00_room_0Set_000770DL_00D980 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_00D980"
+#define dspot00_room_0Set_000770DL_00D980 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_00D980"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_00D980[] = dspot00_room_0Set_000770DL_00D980;
 
-#define dspot00_room_0Set_000770DL_00DD70 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_00DD70"
+#define dspot00_room_0Set_000770DL_00DD70 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_00DD70"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_00DD70[] = dspot00_room_0Set_000770DL_00DD70;
 
-#define dspot00_room_0Set_000770DL_00DFA8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_00DFA8"
+#define dspot00_room_0Set_000770DL_00DFA8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_00DFA8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_00DFA8[] = dspot00_room_0Set_000770DL_00DFA8;
 
-#define dspot00_room_0Set_000770DL_00E7B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_00E7B0"
+#define dspot00_room_0Set_000770DL_00E7B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_00E7B0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_00E7B0[] = dspot00_room_0Set_000770DL_00E7B0;
 
-#define dspot00_room_0Set_000770DL_00F3F8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_00F3F8"
+#define dspot00_room_0Set_000770DL_00F3F8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_00F3F8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_00F3F8[] = dspot00_room_0Set_000770DL_00F3F8;
 
-#define dspot00_room_0Set_000770DL_00FB50 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_00FB50"
+#define dspot00_room_0Set_000770DL_00FB50 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_00FB50"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_00FB50[] = dspot00_room_0Set_000770DL_00FB50;
 
-#define dspot00_room_0Set_000770DL_00FE98 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_00FE98"
+#define dspot00_room_0Set_000770DL_00FE98 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_00FE98"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_00FE98[] = dspot00_room_0Set_000770DL_00FE98;
 
-#define dspot00_room_0Set_000770DL_0127B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_0127B8"
+#define dspot00_room_0Set_000770DL_0127B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_0127B8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_0127B8[] = dspot00_room_0Set_000770DL_0127B8;
 
-#define dspot00_room_0Set_000770DL_00E328 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_00E328"
+#define dspot00_room_0Set_000770DL_00E328 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_00E328"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_00E328[] = dspot00_room_0Set_000770DL_00E328;
 
-#define dspot00_room_0Set_000770DL_0112B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_0112B8"
+#define dspot00_room_0Set_000770DL_0112B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_0112B8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_0112B8[] = dspot00_room_0Set_000770DL_0112B8;
 
-#define dspot00_room_0Set_000770DL_0121D0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_000770DL_0121D0"
+#define dspot00_room_0Set_000770DL_0121D0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_000770DL_0121D0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_000770DL_0121D0[] = dspot00_room_0Set_000770DL_0121D0;
 
-#define dspot00_room_0Set_001120DL_013250 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_013250"
+#define dspot00_room_0Set_001120DL_013250 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_013250"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_013250[] = dspot00_room_0Set_001120DL_013250;
 
-#define dspot00_room_0Set_001120DL_0139A8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_0139A8"
+#define dspot00_room_0Set_001120DL_0139A8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_0139A8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_0139A8[] = dspot00_room_0Set_001120DL_0139A8;
 
-#define dspot00_room_0Set_001120DL_0143C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_0143C8"
+#define dspot00_room_0Set_001120DL_0143C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_0143C8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_0143C8[] = dspot00_room_0Set_001120DL_0143C8;
 
-#define dspot00_room_0Set_001120DL_015100 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_015100"
+#define dspot00_room_0Set_001120DL_015100 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_015100"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_015100[] = dspot00_room_0Set_001120DL_015100;
 
-#define dspot00_room_0Set_001120DL_014E28 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_014E28"
+#define dspot00_room_0Set_001120DL_014E28 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_014E28"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_014E28[] = dspot00_room_0Set_001120DL_014E28;
 
-#define dspot00_room_0Set_001120DL_008448 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_008448"
+#define dspot00_room_0Set_001120DL_008448 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_008448"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_008448[] = dspot00_room_0Set_001120DL_008448;
 
-#define dspot00_room_0Set_001120DL_012C38 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_012C38"
+#define dspot00_room_0Set_001120DL_012C38 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_012C38"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_012C38[] = dspot00_room_0Set_001120DL_012C38;
 
-#define dspot00_room_0Set_001120DL_012E18 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_012E18"
+#define dspot00_room_0Set_001120DL_012E18 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_012E18"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_012E18[] = dspot00_room_0Set_001120DL_012E18;
 
-#define dspot00_room_0Set_001120DL_002790 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_002790"
+#define dspot00_room_0Set_001120DL_002790 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_002790"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_002790[] = dspot00_room_0Set_001120DL_002790;
 
-#define dspot00_room_0Set_001120DL_003338 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_003338"
+#define dspot00_room_0Set_001120DL_003338 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_003338"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_003338[] = dspot00_room_0Set_001120DL_003338;
 
-#define dspot00_room_0Set_001120DL_003ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_003ED0"
+#define dspot00_room_0Set_001120DL_003ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_003ED0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_003ED0[] = dspot00_room_0Set_001120DL_003ED0;
 
-#define dspot00_room_0Set_001120DL_005030 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_005030"
+#define dspot00_room_0Set_001120DL_005030 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_005030"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_005030[] = dspot00_room_0Set_001120DL_005030;
 
-#define dspot00_room_0Set_001120DL_005850 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_005850"
+#define dspot00_room_0Set_001120DL_005850 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_005850"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_005850[] = dspot00_room_0Set_001120DL_005850;
 
-#define dspot00_room_0Set_001120DL_005BC0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_005BC0"
+#define dspot00_room_0Set_001120DL_005BC0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_005BC0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_005BC0[] = dspot00_room_0Set_001120DL_005BC0;
 
-#define dspot00_room_0Set_001120DL_005E78 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_005E78"
+#define dspot00_room_0Set_001120DL_005E78 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_005E78"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_005E78[] = dspot00_room_0Set_001120DL_005E78;
 
-#define dspot00_room_0Set_001120DL_0067C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_0067C8"
+#define dspot00_room_0Set_001120DL_0067C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_0067C8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_0067C8[] = dspot00_room_0Set_001120DL_0067C8;
 
-#define dspot00_room_0Set_001120DL_006ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_006ED0"
+#define dspot00_room_0Set_001120DL_006ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_006ED0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_006ED0[] = dspot00_room_0Set_001120DL_006ED0;
 
-#define dspot00_room_0Set_001120DL_007230 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_007230"
+#define dspot00_room_0Set_001120DL_007230 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_007230"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_007230[] = dspot00_room_0Set_001120DL_007230;
 
-#define dspot00_room_0Set_001120DL_008ED8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_008ED8"
+#define dspot00_room_0Set_001120DL_008ED8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_008ED8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_008ED8[] = dspot00_room_0Set_001120DL_008ED8;
 
-#define dspot00_room_0Set_001120DL_0093A0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_0093A0"
+#define dspot00_room_0Set_001120DL_0093A0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_0093A0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_0093A0[] = dspot00_room_0Set_001120DL_0093A0;
 
-#define dspot00_room_0Set_001120DL_009D10 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_009D10"
+#define dspot00_room_0Set_001120DL_009D10 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_009D10"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_009D10[] = dspot00_room_0Set_001120DL_009D10;
 
-#define dspot00_room_0Set_001120DL_00AD00 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_00AD00"
+#define dspot00_room_0Set_001120DL_00AD00 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_00AD00"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_00AD00[] = dspot00_room_0Set_001120DL_00AD00;
 
-#define dspot00_room_0Set_001120DL_00B520 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_00B520"
+#define dspot00_room_0Set_001120DL_00B520 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_00B520"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_00B520[] = dspot00_room_0Set_001120DL_00B520;
 
-#define dspot00_room_0Set_001120DL_00B8B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_00B8B0"
+#define dspot00_room_0Set_001120DL_00B8B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_00B8B0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_00B8B0[] = dspot00_room_0Set_001120DL_00B8B0;
 
-#define dspot00_room_0Set_001120DL_00BD20 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_00BD20"
+#define dspot00_room_0Set_001120DL_00BD20 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_00BD20"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_00BD20[] = dspot00_room_0Set_001120DL_00BD20;
 
-#define dspot00_room_0Set_001120DL_00CEB8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_00CEB8"
+#define dspot00_room_0Set_001120DL_00CEB8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_00CEB8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_00CEB8[] = dspot00_room_0Set_001120DL_00CEB8;
 
-#define dspot00_room_0Set_001120DL_00D980 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_00D980"
+#define dspot00_room_0Set_001120DL_00D980 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_00D980"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_00D980[] = dspot00_room_0Set_001120DL_00D980;
 
-#define dspot00_room_0Set_001120DL_00DD70 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_00DD70"
+#define dspot00_room_0Set_001120DL_00DD70 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_00DD70"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_00DD70[] = dspot00_room_0Set_001120DL_00DD70;
 
-#define dspot00_room_0Set_001120DL_00DFA8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_00DFA8"
+#define dspot00_room_0Set_001120DL_00DFA8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_00DFA8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_00DFA8[] = dspot00_room_0Set_001120DL_00DFA8;
 
-#define dspot00_room_0Set_001120DL_00E7B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_00E7B0"
+#define dspot00_room_0Set_001120DL_00E7B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_00E7B0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_00E7B0[] = dspot00_room_0Set_001120DL_00E7B0;
 
-#define dspot00_room_0Set_001120DL_00F3F8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_00F3F8"
+#define dspot00_room_0Set_001120DL_00F3F8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_00F3F8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_00F3F8[] = dspot00_room_0Set_001120DL_00F3F8;
 
-#define dspot00_room_0Set_001120DL_00FB50 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_00FB50"
+#define dspot00_room_0Set_001120DL_00FB50 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_00FB50"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_00FB50[] = dspot00_room_0Set_001120DL_00FB50;
 
-#define dspot00_room_0Set_001120DL_00FE98 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_00FE98"
+#define dspot00_room_0Set_001120DL_00FE98 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_00FE98"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_00FE98[] = dspot00_room_0Set_001120DL_00FE98;
 
-#define dspot00_room_0Set_001120DL_0127B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_0127B8"
+#define dspot00_room_0Set_001120DL_0127B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_0127B8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_0127B8[] = dspot00_room_0Set_001120DL_0127B8;
 
-#define dspot00_room_0Set_001120DL_00E328 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_00E328"
+#define dspot00_room_0Set_001120DL_00E328 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_00E328"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_00E328[] = dspot00_room_0Set_001120DL_00E328;
 
-#define dspot00_room_0Set_001120DL_0112B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_0112B8"
+#define dspot00_room_0Set_001120DL_0112B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_0112B8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_0112B8[] = dspot00_room_0Set_001120DL_0112B8;
 
-#define dspot00_room_0Set_001120DL_0121D0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001120DL_0121D0"
+#define dspot00_room_0Set_001120DL_0121D0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001120DL_0121D0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001120DL_0121D0[] = dspot00_room_0Set_001120DL_0121D0;
 
-#define dspot00_room_0Set_0011F0DL_013250 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_013250"
+#define dspot00_room_0Set_0011F0DL_013250 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_013250"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_013250[] = dspot00_room_0Set_0011F0DL_013250;
 
-#define dspot00_room_0Set_0011F0DL_0139A8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_0139A8"
+#define dspot00_room_0Set_0011F0DL_0139A8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_0139A8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_0139A8[] = dspot00_room_0Set_0011F0DL_0139A8;
 
-#define dspot00_room_0Set_0011F0DL_0143C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_0143C8"
+#define dspot00_room_0Set_0011F0DL_0143C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_0143C8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_0143C8[] = dspot00_room_0Set_0011F0DL_0143C8;
 
-#define dspot00_room_0Set_0011F0DL_015100 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_015100"
+#define dspot00_room_0Set_0011F0DL_015100 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_015100"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_015100[] = dspot00_room_0Set_0011F0DL_015100;
 
-#define dspot00_room_0Set_0011F0DL_014E28 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_014E28"
+#define dspot00_room_0Set_0011F0DL_014E28 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_014E28"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_014E28[] = dspot00_room_0Set_0011F0DL_014E28;
 
-#define dspot00_room_0Set_0011F0DL_008448 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_008448"
+#define dspot00_room_0Set_0011F0DL_008448 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_008448"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_008448[] = dspot00_room_0Set_0011F0DL_008448;
 
-#define dspot00_room_0Set_0011F0DL_012C38 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_012C38"
+#define dspot00_room_0Set_0011F0DL_012C38 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_012C38"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_012C38[] = dspot00_room_0Set_0011F0DL_012C38;
 
-#define dspot00_room_0Set_0011F0DL_012E18 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_012E18"
+#define dspot00_room_0Set_0011F0DL_012E18 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_012E18"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_012E18[] = dspot00_room_0Set_0011F0DL_012E18;
 
-#define dspot00_room_0Set_0011F0DL_002790 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_002790"
+#define dspot00_room_0Set_0011F0DL_002790 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_002790"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_002790[] = dspot00_room_0Set_0011F0DL_002790;
 
-#define dspot00_room_0Set_0011F0DL_003338 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_003338"
+#define dspot00_room_0Set_0011F0DL_003338 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_003338"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_003338[] = dspot00_room_0Set_0011F0DL_003338;
 
-#define dspot00_room_0Set_0011F0DL_003ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_003ED0"
+#define dspot00_room_0Set_0011F0DL_003ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_003ED0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_003ED0[] = dspot00_room_0Set_0011F0DL_003ED0;
 
-#define dspot00_room_0Set_0011F0DL_005030 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_005030"
+#define dspot00_room_0Set_0011F0DL_005030 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_005030"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_005030[] = dspot00_room_0Set_0011F0DL_005030;
 
-#define dspot00_room_0Set_0011F0DL_005850 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_005850"
+#define dspot00_room_0Set_0011F0DL_005850 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_005850"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_005850[] = dspot00_room_0Set_0011F0DL_005850;
 
-#define dspot00_room_0Set_0011F0DL_005BC0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_005BC0"
+#define dspot00_room_0Set_0011F0DL_005BC0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_005BC0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_005BC0[] = dspot00_room_0Set_0011F0DL_005BC0;
 
-#define dspot00_room_0Set_0011F0DL_005E78 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_005E78"
+#define dspot00_room_0Set_0011F0DL_005E78 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_005E78"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_005E78[] = dspot00_room_0Set_0011F0DL_005E78;
 
-#define dspot00_room_0Set_0011F0DL_0067C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_0067C8"
+#define dspot00_room_0Set_0011F0DL_0067C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_0067C8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_0067C8[] = dspot00_room_0Set_0011F0DL_0067C8;
 
-#define dspot00_room_0Set_0011F0DL_006ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_006ED0"
+#define dspot00_room_0Set_0011F0DL_006ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_006ED0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_006ED0[] = dspot00_room_0Set_0011F0DL_006ED0;
 
-#define dspot00_room_0Set_0011F0DL_007230 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_007230"
+#define dspot00_room_0Set_0011F0DL_007230 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_007230"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_007230[] = dspot00_room_0Set_0011F0DL_007230;
 
-#define dspot00_room_0Set_0011F0DL_008ED8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_008ED8"
+#define dspot00_room_0Set_0011F0DL_008ED8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_008ED8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_008ED8[] = dspot00_room_0Set_0011F0DL_008ED8;
 
-#define dspot00_room_0Set_0011F0DL_0093A0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_0093A0"
+#define dspot00_room_0Set_0011F0DL_0093A0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_0093A0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_0093A0[] = dspot00_room_0Set_0011F0DL_0093A0;
 
-#define dspot00_room_0Set_0011F0DL_009D10 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_009D10"
+#define dspot00_room_0Set_0011F0DL_009D10 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_009D10"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_009D10[] = dspot00_room_0Set_0011F0DL_009D10;
 
-#define dspot00_room_0Set_0011F0DL_00AD00 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_00AD00"
+#define dspot00_room_0Set_0011F0DL_00AD00 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_00AD00"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_00AD00[] = dspot00_room_0Set_0011F0DL_00AD00;
 
-#define dspot00_room_0Set_0011F0DL_00B520 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_00B520"
+#define dspot00_room_0Set_0011F0DL_00B520 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_00B520"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_00B520[] = dspot00_room_0Set_0011F0DL_00B520;
 
-#define dspot00_room_0Set_0011F0DL_00B8B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_00B8B0"
+#define dspot00_room_0Set_0011F0DL_00B8B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_00B8B0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_00B8B0[] = dspot00_room_0Set_0011F0DL_00B8B0;
 
-#define dspot00_room_0Set_0011F0DL_00BD20 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_00BD20"
+#define dspot00_room_0Set_0011F0DL_00BD20 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_00BD20"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_00BD20[] = dspot00_room_0Set_0011F0DL_00BD20;
 
-#define dspot00_room_0Set_0011F0DL_00CEB8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_00CEB8"
+#define dspot00_room_0Set_0011F0DL_00CEB8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_00CEB8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_00CEB8[] = dspot00_room_0Set_0011F0DL_00CEB8;
 
-#define dspot00_room_0Set_0011F0DL_00D980 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_00D980"
+#define dspot00_room_0Set_0011F0DL_00D980 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_00D980"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_00D980[] = dspot00_room_0Set_0011F0DL_00D980;
 
-#define dspot00_room_0Set_0011F0DL_00DD70 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_00DD70"
+#define dspot00_room_0Set_0011F0DL_00DD70 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_00DD70"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_00DD70[] = dspot00_room_0Set_0011F0DL_00DD70;
 
-#define dspot00_room_0Set_0011F0DL_00DFA8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_00DFA8"
+#define dspot00_room_0Set_0011F0DL_00DFA8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_00DFA8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_00DFA8[] = dspot00_room_0Set_0011F0DL_00DFA8;
 
-#define dspot00_room_0Set_0011F0DL_00E7B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_00E7B0"
+#define dspot00_room_0Set_0011F0DL_00E7B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_00E7B0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_00E7B0[] = dspot00_room_0Set_0011F0DL_00E7B0;
 
-#define dspot00_room_0Set_0011F0DL_00F3F8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_00F3F8"
+#define dspot00_room_0Set_0011F0DL_00F3F8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_00F3F8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_00F3F8[] = dspot00_room_0Set_0011F0DL_00F3F8;
 
-#define dspot00_room_0Set_0011F0DL_00FB50 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_00FB50"
+#define dspot00_room_0Set_0011F0DL_00FB50 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_00FB50"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_00FB50[] = dspot00_room_0Set_0011F0DL_00FB50;
 
-#define dspot00_room_0Set_0011F0DL_00FE98 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_00FE98"
+#define dspot00_room_0Set_0011F0DL_00FE98 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_00FE98"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_00FE98[] = dspot00_room_0Set_0011F0DL_00FE98;
 
-#define dspot00_room_0Set_0011F0DL_0127B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_0127B8"
+#define dspot00_room_0Set_0011F0DL_0127B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_0127B8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_0127B8[] = dspot00_room_0Set_0011F0DL_0127B8;
 
-#define dspot00_room_0Set_0011F0DL_00E328 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_00E328"
+#define dspot00_room_0Set_0011F0DL_00E328 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_00E328"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_00E328[] = dspot00_room_0Set_0011F0DL_00E328;
 
-#define dspot00_room_0Set_0011F0DL_0112B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_0112B8"
+#define dspot00_room_0Set_0011F0DL_0112B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_0112B8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_0112B8[] = dspot00_room_0Set_0011F0DL_0112B8;
 
-#define dspot00_room_0Set_0011F0DL_0121D0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0011F0DL_0121D0"
+#define dspot00_room_0Set_0011F0DL_0121D0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0011F0DL_0121D0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0011F0DL_0121D0[] = dspot00_room_0Set_0011F0DL_0121D0;
 
-#define dspot00_room_0Set_0012C0DL_013250 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_013250"
+#define dspot00_room_0Set_0012C0DL_013250 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_013250"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_013250[] = dspot00_room_0Set_0012C0DL_013250;
 
-#define dspot00_room_0Set_0012C0DL_0139A8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_0139A8"
+#define dspot00_room_0Set_0012C0DL_0139A8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_0139A8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_0139A8[] = dspot00_room_0Set_0012C0DL_0139A8;
 
-#define dspot00_room_0Set_0012C0DL_0143C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_0143C8"
+#define dspot00_room_0Set_0012C0DL_0143C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_0143C8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_0143C8[] = dspot00_room_0Set_0012C0DL_0143C8;
 
-#define dspot00_room_0Set_0012C0DL_015100 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_015100"
+#define dspot00_room_0Set_0012C0DL_015100 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_015100"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_015100[] = dspot00_room_0Set_0012C0DL_015100;
 
-#define dspot00_room_0Set_0012C0DL_014E28 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_014E28"
+#define dspot00_room_0Set_0012C0DL_014E28 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_014E28"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_014E28[] = dspot00_room_0Set_0012C0DL_014E28;
 
-#define dspot00_room_0Set_0012C0DL_008448 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_008448"
+#define dspot00_room_0Set_0012C0DL_008448 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_008448"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_008448[] = dspot00_room_0Set_0012C0DL_008448;
 
-#define dspot00_room_0Set_0012C0DL_012C38 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_012C38"
+#define dspot00_room_0Set_0012C0DL_012C38 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_012C38"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_012C38[] = dspot00_room_0Set_0012C0DL_012C38;
 
-#define dspot00_room_0Set_0012C0DL_012E18 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_012E18"
+#define dspot00_room_0Set_0012C0DL_012E18 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_012E18"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_012E18[] = dspot00_room_0Set_0012C0DL_012E18;
 
-#define dspot00_room_0Set_0012C0DL_002790 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_002790"
+#define dspot00_room_0Set_0012C0DL_002790 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_002790"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_002790[] = dspot00_room_0Set_0012C0DL_002790;
 
-#define dspot00_room_0Set_0012C0DL_003338 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_003338"
+#define dspot00_room_0Set_0012C0DL_003338 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_003338"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_003338[] = dspot00_room_0Set_0012C0DL_003338;
 
-#define dspot00_room_0Set_0012C0DL_003ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_003ED0"
+#define dspot00_room_0Set_0012C0DL_003ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_003ED0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_003ED0[] = dspot00_room_0Set_0012C0DL_003ED0;
 
-#define dspot00_room_0Set_0012C0DL_005030 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_005030"
+#define dspot00_room_0Set_0012C0DL_005030 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_005030"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_005030[] = dspot00_room_0Set_0012C0DL_005030;
 
-#define dspot00_room_0Set_0012C0DL_005850 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_005850"
+#define dspot00_room_0Set_0012C0DL_005850 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_005850"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_005850[] = dspot00_room_0Set_0012C0DL_005850;
 
-#define dspot00_room_0Set_0012C0DL_005BC0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_005BC0"
+#define dspot00_room_0Set_0012C0DL_005BC0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_005BC0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_005BC0[] = dspot00_room_0Set_0012C0DL_005BC0;
 
-#define dspot00_room_0Set_0012C0DL_005E78 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_005E78"
+#define dspot00_room_0Set_0012C0DL_005E78 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_005E78"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_005E78[] = dspot00_room_0Set_0012C0DL_005E78;
 
-#define dspot00_room_0Set_0012C0DL_0067C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_0067C8"
+#define dspot00_room_0Set_0012C0DL_0067C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_0067C8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_0067C8[] = dspot00_room_0Set_0012C0DL_0067C8;
 
-#define dspot00_room_0Set_0012C0DL_006ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_006ED0"
+#define dspot00_room_0Set_0012C0DL_006ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_006ED0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_006ED0[] = dspot00_room_0Set_0012C0DL_006ED0;
 
-#define dspot00_room_0Set_0012C0DL_007230 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_007230"
+#define dspot00_room_0Set_0012C0DL_007230 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_007230"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_007230[] = dspot00_room_0Set_0012C0DL_007230;
 
-#define dspot00_room_0Set_0012C0DL_008ED8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_008ED8"
+#define dspot00_room_0Set_0012C0DL_008ED8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_008ED8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_008ED8[] = dspot00_room_0Set_0012C0DL_008ED8;
 
-#define dspot00_room_0Set_0012C0DL_0093A0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_0093A0"
+#define dspot00_room_0Set_0012C0DL_0093A0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_0093A0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_0093A0[] = dspot00_room_0Set_0012C0DL_0093A0;
 
-#define dspot00_room_0Set_0012C0DL_009D10 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_009D10"
+#define dspot00_room_0Set_0012C0DL_009D10 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_009D10"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_009D10[] = dspot00_room_0Set_0012C0DL_009D10;
 
-#define dspot00_room_0Set_0012C0DL_00AD00 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_00AD00"
+#define dspot00_room_0Set_0012C0DL_00AD00 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_00AD00"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_00AD00[] = dspot00_room_0Set_0012C0DL_00AD00;
 
-#define dspot00_room_0Set_0012C0DL_00B520 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_00B520"
+#define dspot00_room_0Set_0012C0DL_00B520 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_00B520"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_00B520[] = dspot00_room_0Set_0012C0DL_00B520;
 
-#define dspot00_room_0Set_0012C0DL_00B8B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_00B8B0"
+#define dspot00_room_0Set_0012C0DL_00B8B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_00B8B0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_00B8B0[] = dspot00_room_0Set_0012C0DL_00B8B0;
 
-#define dspot00_room_0Set_0012C0DL_00BD20 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_00BD20"
+#define dspot00_room_0Set_0012C0DL_00BD20 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_00BD20"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_00BD20[] = dspot00_room_0Set_0012C0DL_00BD20;
 
-#define dspot00_room_0Set_0012C0DL_00CEB8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_00CEB8"
+#define dspot00_room_0Set_0012C0DL_00CEB8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_00CEB8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_00CEB8[] = dspot00_room_0Set_0012C0DL_00CEB8;
 
-#define dspot00_room_0Set_0012C0DL_00D980 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_00D980"
+#define dspot00_room_0Set_0012C0DL_00D980 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_00D980"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_00D980[] = dspot00_room_0Set_0012C0DL_00D980;
 
-#define dspot00_room_0Set_0012C0DL_00DD70 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_00DD70"
+#define dspot00_room_0Set_0012C0DL_00DD70 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_00DD70"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_00DD70[] = dspot00_room_0Set_0012C0DL_00DD70;
 
-#define dspot00_room_0Set_0012C0DL_00DFA8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_00DFA8"
+#define dspot00_room_0Set_0012C0DL_00DFA8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_00DFA8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_00DFA8[] = dspot00_room_0Set_0012C0DL_00DFA8;
 
-#define dspot00_room_0Set_0012C0DL_00E7B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_00E7B0"
+#define dspot00_room_0Set_0012C0DL_00E7B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_00E7B0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_00E7B0[] = dspot00_room_0Set_0012C0DL_00E7B0;
 
-#define dspot00_room_0Set_0012C0DL_00F3F8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_00F3F8"
+#define dspot00_room_0Set_0012C0DL_00F3F8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_00F3F8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_00F3F8[] = dspot00_room_0Set_0012C0DL_00F3F8;
 
-#define dspot00_room_0Set_0012C0DL_00FB50 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_00FB50"
+#define dspot00_room_0Set_0012C0DL_00FB50 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_00FB50"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_00FB50[] = dspot00_room_0Set_0012C0DL_00FB50;
 
-#define dspot00_room_0Set_0012C0DL_00FE98 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_00FE98"
+#define dspot00_room_0Set_0012C0DL_00FE98 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_00FE98"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_00FE98[] = dspot00_room_0Set_0012C0DL_00FE98;
 
-#define dspot00_room_0Set_0012C0DL_0127B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_0127B8"
+#define dspot00_room_0Set_0012C0DL_0127B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_0127B8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_0127B8[] = dspot00_room_0Set_0012C0DL_0127B8;
 
-#define dspot00_room_0Set_0012C0DL_00E328 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_00E328"
+#define dspot00_room_0Set_0012C0DL_00E328 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_00E328"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_00E328[] = dspot00_room_0Set_0012C0DL_00E328;
 
-#define dspot00_room_0Set_0012C0DL_0112B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_0112B8"
+#define dspot00_room_0Set_0012C0DL_0112B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_0112B8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_0112B8[] = dspot00_room_0Set_0012C0DL_0112B8;
 
-#define dspot00_room_0Set_0012C0DL_0121D0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0012C0DL_0121D0"
+#define dspot00_room_0Set_0012C0DL_0121D0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0012C0DL_0121D0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0012C0DL_0121D0[] = dspot00_room_0Set_0012C0DL_0121D0;
 
-#define dspot00_room_0Set_001360DL_013250 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_013250"
+#define dspot00_room_0Set_001360DL_013250 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_013250"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_013250[] = dspot00_room_0Set_001360DL_013250;
 
-#define dspot00_room_0Set_001360DL_0139A8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_0139A8"
+#define dspot00_room_0Set_001360DL_0139A8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_0139A8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_0139A8[] = dspot00_room_0Set_001360DL_0139A8;
 
-#define dspot00_room_0Set_001360DL_0143C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_0143C8"
+#define dspot00_room_0Set_001360DL_0143C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_0143C8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_0143C8[] = dspot00_room_0Set_001360DL_0143C8;
 
-#define dspot00_room_0Set_001360DL_015100 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_015100"
+#define dspot00_room_0Set_001360DL_015100 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_015100"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_015100[] = dspot00_room_0Set_001360DL_015100;
 
-#define dspot00_room_0Set_001360DL_014E28 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_014E28"
+#define dspot00_room_0Set_001360DL_014E28 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_014E28"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_014E28[] = dspot00_room_0Set_001360DL_014E28;
 
-#define dspot00_room_0Set_001360DL_008448 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_008448"
+#define dspot00_room_0Set_001360DL_008448 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_008448"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_008448[] = dspot00_room_0Set_001360DL_008448;
 
-#define dspot00_room_0Set_001360DL_012C38 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_012C38"
+#define dspot00_room_0Set_001360DL_012C38 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_012C38"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_012C38[] = dspot00_room_0Set_001360DL_012C38;
 
-#define dspot00_room_0Set_001360DL_012E18 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_012E18"
+#define dspot00_room_0Set_001360DL_012E18 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_012E18"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_012E18[] = dspot00_room_0Set_001360DL_012E18;
 
-#define dspot00_room_0Set_001360DL_002790 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_002790"
+#define dspot00_room_0Set_001360DL_002790 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_002790"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_002790[] = dspot00_room_0Set_001360DL_002790;
 
-#define dspot00_room_0Set_001360DL_003338 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_003338"
+#define dspot00_room_0Set_001360DL_003338 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_003338"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_003338[] = dspot00_room_0Set_001360DL_003338;
 
-#define dspot00_room_0Set_001360DL_003ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_003ED0"
+#define dspot00_room_0Set_001360DL_003ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_003ED0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_003ED0[] = dspot00_room_0Set_001360DL_003ED0;
 
-#define dspot00_room_0Set_001360DL_005030 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_005030"
+#define dspot00_room_0Set_001360DL_005030 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_005030"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_005030[] = dspot00_room_0Set_001360DL_005030;
 
-#define dspot00_room_0Set_001360DL_005850 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_005850"
+#define dspot00_room_0Set_001360DL_005850 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_005850"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_005850[] = dspot00_room_0Set_001360DL_005850;
 
-#define dspot00_room_0Set_001360DL_005BC0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_005BC0"
+#define dspot00_room_0Set_001360DL_005BC0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_005BC0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_005BC0[] = dspot00_room_0Set_001360DL_005BC0;
 
-#define dspot00_room_0Set_001360DL_005E78 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_005E78"
+#define dspot00_room_0Set_001360DL_005E78 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_005E78"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_005E78[] = dspot00_room_0Set_001360DL_005E78;
 
-#define dspot00_room_0Set_001360DL_0067C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_0067C8"
+#define dspot00_room_0Set_001360DL_0067C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_0067C8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_0067C8[] = dspot00_room_0Set_001360DL_0067C8;
 
-#define dspot00_room_0Set_001360DL_006ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_006ED0"
+#define dspot00_room_0Set_001360DL_006ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_006ED0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_006ED0[] = dspot00_room_0Set_001360DL_006ED0;
 
-#define dspot00_room_0Set_001360DL_007230 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_007230"
+#define dspot00_room_0Set_001360DL_007230 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_007230"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_007230[] = dspot00_room_0Set_001360DL_007230;
 
-#define dspot00_room_0Set_001360DL_008ED8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_008ED8"
+#define dspot00_room_0Set_001360DL_008ED8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_008ED8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_008ED8[] = dspot00_room_0Set_001360DL_008ED8;
 
-#define dspot00_room_0Set_001360DL_0093A0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_0093A0"
+#define dspot00_room_0Set_001360DL_0093A0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_0093A0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_0093A0[] = dspot00_room_0Set_001360DL_0093A0;
 
-#define dspot00_room_0Set_001360DL_009D10 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_009D10"
+#define dspot00_room_0Set_001360DL_009D10 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_009D10"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_009D10[] = dspot00_room_0Set_001360DL_009D10;
 
-#define dspot00_room_0Set_001360DL_00AD00 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_00AD00"
+#define dspot00_room_0Set_001360DL_00AD00 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_00AD00"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_00AD00[] = dspot00_room_0Set_001360DL_00AD00;
 
-#define dspot00_room_0Set_001360DL_00B520 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_00B520"
+#define dspot00_room_0Set_001360DL_00B520 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_00B520"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_00B520[] = dspot00_room_0Set_001360DL_00B520;
 
-#define dspot00_room_0Set_001360DL_00B8B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_00B8B0"
+#define dspot00_room_0Set_001360DL_00B8B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_00B8B0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_00B8B0[] = dspot00_room_0Set_001360DL_00B8B0;
 
-#define dspot00_room_0Set_001360DL_00BD20 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_00BD20"
+#define dspot00_room_0Set_001360DL_00BD20 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_00BD20"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_00BD20[] = dspot00_room_0Set_001360DL_00BD20;
 
-#define dspot00_room_0Set_001360DL_00CEB8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_00CEB8"
+#define dspot00_room_0Set_001360DL_00CEB8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_00CEB8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_00CEB8[] = dspot00_room_0Set_001360DL_00CEB8;
 
-#define dspot00_room_0Set_001360DL_00D980 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_00D980"
+#define dspot00_room_0Set_001360DL_00D980 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_00D980"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_00D980[] = dspot00_room_0Set_001360DL_00D980;
 
-#define dspot00_room_0Set_001360DL_00DD70 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_00DD70"
+#define dspot00_room_0Set_001360DL_00DD70 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_00DD70"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_00DD70[] = dspot00_room_0Set_001360DL_00DD70;
 
-#define dspot00_room_0Set_001360DL_00DFA8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_00DFA8"
+#define dspot00_room_0Set_001360DL_00DFA8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_00DFA8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_00DFA8[] = dspot00_room_0Set_001360DL_00DFA8;
 
-#define dspot00_room_0Set_001360DL_00E7B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_00E7B0"
+#define dspot00_room_0Set_001360DL_00E7B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_00E7B0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_00E7B0[] = dspot00_room_0Set_001360DL_00E7B0;
 
-#define dspot00_room_0Set_001360DL_00F3F8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_00F3F8"
+#define dspot00_room_0Set_001360DL_00F3F8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_00F3F8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_00F3F8[] = dspot00_room_0Set_001360DL_00F3F8;
 
-#define dspot00_room_0Set_001360DL_00FB50 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_00FB50"
+#define dspot00_room_0Set_001360DL_00FB50 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_00FB50"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_00FB50[] = dspot00_room_0Set_001360DL_00FB50;
 
-#define dspot00_room_0Set_001360DL_00FE98 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_00FE98"
+#define dspot00_room_0Set_001360DL_00FE98 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_00FE98"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_00FE98[] = dspot00_room_0Set_001360DL_00FE98;
 
-#define dspot00_room_0Set_001360DL_0127B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_0127B8"
+#define dspot00_room_0Set_001360DL_0127B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_0127B8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_0127B8[] = dspot00_room_0Set_001360DL_0127B8;
 
-#define dspot00_room_0Set_001360DL_00E328 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_00E328"
+#define dspot00_room_0Set_001360DL_00E328 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_00E328"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_00E328[] = dspot00_room_0Set_001360DL_00E328;
 
-#define dspot00_room_0Set_001360DL_0112B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_0112B8"
+#define dspot00_room_0Set_001360DL_0112B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_0112B8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_0112B8[] = dspot00_room_0Set_001360DL_0112B8;
 
-#define dspot00_room_0Set_001360DL_0121D0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001360DL_0121D0"
+#define dspot00_room_0Set_001360DL_0121D0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001360DL_0121D0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001360DL_0121D0[] = dspot00_room_0Set_001360DL_0121D0;
 
-#define dspot00_room_0Set_001570DL_013250 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_013250"
+#define dspot00_room_0Set_001570DL_013250 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_013250"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_013250[] = dspot00_room_0Set_001570DL_013250;
 
-#define dspot00_room_0Set_001570DL_0139A8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_0139A8"
+#define dspot00_room_0Set_001570DL_0139A8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_0139A8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_0139A8[] = dspot00_room_0Set_001570DL_0139A8;
 
-#define dspot00_room_0Set_001570DL_0143C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_0143C8"
+#define dspot00_room_0Set_001570DL_0143C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_0143C8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_0143C8[] = dspot00_room_0Set_001570DL_0143C8;
 
-#define dspot00_room_0Set_001570DL_015100 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_015100"
+#define dspot00_room_0Set_001570DL_015100 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_015100"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_015100[] = dspot00_room_0Set_001570DL_015100;
 
-#define dspot00_room_0Set_001570DL_014E28 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_014E28"
+#define dspot00_room_0Set_001570DL_014E28 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_014E28"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_014E28[] = dspot00_room_0Set_001570DL_014E28;
 
-#define dspot00_room_0Set_001570DL_008448 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_008448"
+#define dspot00_room_0Set_001570DL_008448 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_008448"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_008448[] = dspot00_room_0Set_001570DL_008448;
 
-#define dspot00_room_0Set_001570DL_012C38 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_012C38"
+#define dspot00_room_0Set_001570DL_012C38 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_012C38"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_012C38[] = dspot00_room_0Set_001570DL_012C38;
 
-#define dspot00_room_0Set_001570DL_012E18 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_012E18"
+#define dspot00_room_0Set_001570DL_012E18 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_012E18"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_012E18[] = dspot00_room_0Set_001570DL_012E18;
 
-#define dspot00_room_0Set_001570DL_002790 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_002790"
+#define dspot00_room_0Set_001570DL_002790 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_002790"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_002790[] = dspot00_room_0Set_001570DL_002790;
 
-#define dspot00_room_0Set_001570DL_003338 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_003338"
+#define dspot00_room_0Set_001570DL_003338 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_003338"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_003338[] = dspot00_room_0Set_001570DL_003338;
 
-#define dspot00_room_0Set_001570DL_003ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_003ED0"
+#define dspot00_room_0Set_001570DL_003ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_003ED0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_003ED0[] = dspot00_room_0Set_001570DL_003ED0;
 
-#define dspot00_room_0Set_001570DL_005030 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_005030"
+#define dspot00_room_0Set_001570DL_005030 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_005030"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_005030[] = dspot00_room_0Set_001570DL_005030;
 
-#define dspot00_room_0Set_001570DL_005850 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_005850"
+#define dspot00_room_0Set_001570DL_005850 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_005850"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_005850[] = dspot00_room_0Set_001570DL_005850;
 
-#define dspot00_room_0Set_001570DL_005BC0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_005BC0"
+#define dspot00_room_0Set_001570DL_005BC0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_005BC0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_005BC0[] = dspot00_room_0Set_001570DL_005BC0;
 
-#define dspot00_room_0Set_001570DL_005E78 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_005E78"
+#define dspot00_room_0Set_001570DL_005E78 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_005E78"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_005E78[] = dspot00_room_0Set_001570DL_005E78;
 
-#define dspot00_room_0Set_001570DL_0067C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_0067C8"
+#define dspot00_room_0Set_001570DL_0067C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_0067C8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_0067C8[] = dspot00_room_0Set_001570DL_0067C8;
 
-#define dspot00_room_0Set_001570DL_006ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_006ED0"
+#define dspot00_room_0Set_001570DL_006ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_006ED0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_006ED0[] = dspot00_room_0Set_001570DL_006ED0;
 
-#define dspot00_room_0Set_001570DL_007230 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_007230"
+#define dspot00_room_0Set_001570DL_007230 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_007230"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_007230[] = dspot00_room_0Set_001570DL_007230;
 
-#define dspot00_room_0Set_001570DL_008ED8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_008ED8"
+#define dspot00_room_0Set_001570DL_008ED8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_008ED8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_008ED8[] = dspot00_room_0Set_001570DL_008ED8;
 
-#define dspot00_room_0Set_001570DL_0093A0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_0093A0"
+#define dspot00_room_0Set_001570DL_0093A0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_0093A0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_0093A0[] = dspot00_room_0Set_001570DL_0093A0;
 
-#define dspot00_room_0Set_001570DL_009D10 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_009D10"
+#define dspot00_room_0Set_001570DL_009D10 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_009D10"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_009D10[] = dspot00_room_0Set_001570DL_009D10;
 
-#define dspot00_room_0Set_001570DL_00AD00 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_00AD00"
+#define dspot00_room_0Set_001570DL_00AD00 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_00AD00"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_00AD00[] = dspot00_room_0Set_001570DL_00AD00;
 
-#define dspot00_room_0Set_001570DL_00B520 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_00B520"
+#define dspot00_room_0Set_001570DL_00B520 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_00B520"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_00B520[] = dspot00_room_0Set_001570DL_00B520;
 
-#define dspot00_room_0Set_001570DL_00B8B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_00B8B0"
+#define dspot00_room_0Set_001570DL_00B8B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_00B8B0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_00B8B0[] = dspot00_room_0Set_001570DL_00B8B0;
 
-#define dspot00_room_0Set_001570DL_00BD20 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_00BD20"
+#define dspot00_room_0Set_001570DL_00BD20 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_00BD20"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_00BD20[] = dspot00_room_0Set_001570DL_00BD20;
 
-#define dspot00_room_0Set_001570DL_00CEB8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_00CEB8"
+#define dspot00_room_0Set_001570DL_00CEB8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_00CEB8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_00CEB8[] = dspot00_room_0Set_001570DL_00CEB8;
 
-#define dspot00_room_0Set_001570DL_00D980 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_00D980"
+#define dspot00_room_0Set_001570DL_00D980 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_00D980"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_00D980[] = dspot00_room_0Set_001570DL_00D980;
 
-#define dspot00_room_0Set_001570DL_00DD70 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_00DD70"
+#define dspot00_room_0Set_001570DL_00DD70 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_00DD70"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_00DD70[] = dspot00_room_0Set_001570DL_00DD70;
 
-#define dspot00_room_0Set_001570DL_00DFA8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_00DFA8"
+#define dspot00_room_0Set_001570DL_00DFA8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_00DFA8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_00DFA8[] = dspot00_room_0Set_001570DL_00DFA8;
 
-#define dspot00_room_0Set_001570DL_00E7B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_00E7B0"
+#define dspot00_room_0Set_001570DL_00E7B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_00E7B0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_00E7B0[] = dspot00_room_0Set_001570DL_00E7B0;
 
-#define dspot00_room_0Set_001570DL_00F3F8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_00F3F8"
+#define dspot00_room_0Set_001570DL_00F3F8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_00F3F8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_00F3F8[] = dspot00_room_0Set_001570DL_00F3F8;
 
-#define dspot00_room_0Set_001570DL_00FB50 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_00FB50"
+#define dspot00_room_0Set_001570DL_00FB50 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_00FB50"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_00FB50[] = dspot00_room_0Set_001570DL_00FB50;
 
-#define dspot00_room_0Set_001570DL_00FE98 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_00FE98"
+#define dspot00_room_0Set_001570DL_00FE98 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_00FE98"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_00FE98[] = dspot00_room_0Set_001570DL_00FE98;
 
-#define dspot00_room_0Set_001570DL_0127B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_0127B8"
+#define dspot00_room_0Set_001570DL_0127B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_0127B8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_0127B8[] = dspot00_room_0Set_001570DL_0127B8;
 
-#define dspot00_room_0Set_001570DL_00E328 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_00E328"
+#define dspot00_room_0Set_001570DL_00E328 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_00E328"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_00E328[] = dspot00_room_0Set_001570DL_00E328;
 
-#define dspot00_room_0Set_001570DL_0112B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_0112B8"
+#define dspot00_room_0Set_001570DL_0112B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_0112B8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_0112B8[] = dspot00_room_0Set_001570DL_0112B8;
 
-#define dspot00_room_0Set_001570DL_0121D0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001570DL_0121D0"
+#define dspot00_room_0Set_001570DL_0121D0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001570DL_0121D0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001570DL_0121D0[] = dspot00_room_0Set_001570DL_0121D0;
 
-#define dspot00_room_0Set_0018D0DL_013250 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_013250"
+#define dspot00_room_0Set_0018D0DL_013250 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_013250"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_013250[] = dspot00_room_0Set_0018D0DL_013250;
 
-#define dspot00_room_0Set_0018D0DL_0139A8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_0139A8"
+#define dspot00_room_0Set_0018D0DL_0139A8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_0139A8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_0139A8[] = dspot00_room_0Set_0018D0DL_0139A8;
 
-#define dspot00_room_0Set_0018D0DL_0143C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_0143C8"
+#define dspot00_room_0Set_0018D0DL_0143C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_0143C8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_0143C8[] = dspot00_room_0Set_0018D0DL_0143C8;
 
-#define dspot00_room_0Set_0018D0DL_015100 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_015100"
+#define dspot00_room_0Set_0018D0DL_015100 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_015100"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_015100[] = dspot00_room_0Set_0018D0DL_015100;
 
-#define dspot00_room_0Set_0018D0DL_014E28 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_014E28"
+#define dspot00_room_0Set_0018D0DL_014E28 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_014E28"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_014E28[] = dspot00_room_0Set_0018D0DL_014E28;
 
-#define dspot00_room_0Set_0018D0DL_008448 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_008448"
+#define dspot00_room_0Set_0018D0DL_008448 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_008448"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_008448[] = dspot00_room_0Set_0018D0DL_008448;
 
-#define dspot00_room_0Set_0018D0DL_012C38 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_012C38"
+#define dspot00_room_0Set_0018D0DL_012C38 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_012C38"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_012C38[] = dspot00_room_0Set_0018D0DL_012C38;
 
-#define dspot00_room_0Set_0018D0DL_012E18 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_012E18"
+#define dspot00_room_0Set_0018D0DL_012E18 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_012E18"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_012E18[] = dspot00_room_0Set_0018D0DL_012E18;
 
-#define dspot00_room_0Set_0018D0DL_002790 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_002790"
+#define dspot00_room_0Set_0018D0DL_002790 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_002790"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_002790[] = dspot00_room_0Set_0018D0DL_002790;
 
-#define dspot00_room_0Set_0018D0DL_003338 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_003338"
+#define dspot00_room_0Set_0018D0DL_003338 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_003338"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_003338[] = dspot00_room_0Set_0018D0DL_003338;
 
-#define dspot00_room_0Set_0018D0DL_003ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_003ED0"
+#define dspot00_room_0Set_0018D0DL_003ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_003ED0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_003ED0[] = dspot00_room_0Set_0018D0DL_003ED0;
 
-#define dspot00_room_0Set_0018D0DL_005030 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_005030"
+#define dspot00_room_0Set_0018D0DL_005030 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_005030"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_005030[] = dspot00_room_0Set_0018D0DL_005030;
 
-#define dspot00_room_0Set_0018D0DL_005850 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_005850"
+#define dspot00_room_0Set_0018D0DL_005850 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_005850"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_005850[] = dspot00_room_0Set_0018D0DL_005850;
 
-#define dspot00_room_0Set_0018D0DL_005BC0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_005BC0"
+#define dspot00_room_0Set_0018D0DL_005BC0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_005BC0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_005BC0[] = dspot00_room_0Set_0018D0DL_005BC0;
 
-#define dspot00_room_0Set_0018D0DL_005E78 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_005E78"
+#define dspot00_room_0Set_0018D0DL_005E78 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_005E78"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_005E78[] = dspot00_room_0Set_0018D0DL_005E78;
 
-#define dspot00_room_0Set_0018D0DL_0067C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_0067C8"
+#define dspot00_room_0Set_0018D0DL_0067C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_0067C8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_0067C8[] = dspot00_room_0Set_0018D0DL_0067C8;
 
-#define dspot00_room_0Set_0018D0DL_006ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_006ED0"
+#define dspot00_room_0Set_0018D0DL_006ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_006ED0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_006ED0[] = dspot00_room_0Set_0018D0DL_006ED0;
 
-#define dspot00_room_0Set_0018D0DL_007230 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_007230"
+#define dspot00_room_0Set_0018D0DL_007230 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_007230"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_007230[] = dspot00_room_0Set_0018D0DL_007230;
 
-#define dspot00_room_0Set_0018D0DL_008ED8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_008ED8"
+#define dspot00_room_0Set_0018D0DL_008ED8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_008ED8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_008ED8[] = dspot00_room_0Set_0018D0DL_008ED8;
 
-#define dspot00_room_0Set_0018D0DL_0093A0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_0093A0"
+#define dspot00_room_0Set_0018D0DL_0093A0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_0093A0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_0093A0[] = dspot00_room_0Set_0018D0DL_0093A0;
 
-#define dspot00_room_0Set_0018D0DL_009D10 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_009D10"
+#define dspot00_room_0Set_0018D0DL_009D10 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_009D10"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_009D10[] = dspot00_room_0Set_0018D0DL_009D10;
 
-#define dspot00_room_0Set_0018D0DL_00AD00 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_00AD00"
+#define dspot00_room_0Set_0018D0DL_00AD00 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_00AD00"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_00AD00[] = dspot00_room_0Set_0018D0DL_00AD00;
 
-#define dspot00_room_0Set_0018D0DL_00B520 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_00B520"
+#define dspot00_room_0Set_0018D0DL_00B520 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_00B520"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_00B520[] = dspot00_room_0Set_0018D0DL_00B520;
 
-#define dspot00_room_0Set_0018D0DL_00B8B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_00B8B0"
+#define dspot00_room_0Set_0018D0DL_00B8B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_00B8B0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_00B8B0[] = dspot00_room_0Set_0018D0DL_00B8B0;
 
-#define dspot00_room_0Set_0018D0DL_00BD20 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_00BD20"
+#define dspot00_room_0Set_0018D0DL_00BD20 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_00BD20"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_00BD20[] = dspot00_room_0Set_0018D0DL_00BD20;
 
-#define dspot00_room_0Set_0018D0DL_00CEB8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_00CEB8"
+#define dspot00_room_0Set_0018D0DL_00CEB8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_00CEB8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_00CEB8[] = dspot00_room_0Set_0018D0DL_00CEB8;
 
-#define dspot00_room_0Set_0018D0DL_00D980 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_00D980"
+#define dspot00_room_0Set_0018D0DL_00D980 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_00D980"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_00D980[] = dspot00_room_0Set_0018D0DL_00D980;
 
-#define dspot00_room_0Set_0018D0DL_00DD70 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_00DD70"
+#define dspot00_room_0Set_0018D0DL_00DD70 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_00DD70"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_00DD70[] = dspot00_room_0Set_0018D0DL_00DD70;
 
-#define dspot00_room_0Set_0018D0DL_00DFA8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_00DFA8"
+#define dspot00_room_0Set_0018D0DL_00DFA8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_00DFA8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_00DFA8[] = dspot00_room_0Set_0018D0DL_00DFA8;
 
-#define dspot00_room_0Set_0018D0DL_00E7B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_00E7B0"
+#define dspot00_room_0Set_0018D0DL_00E7B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_00E7B0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_00E7B0[] = dspot00_room_0Set_0018D0DL_00E7B0;
 
-#define dspot00_room_0Set_0018D0DL_00F3F8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_00F3F8"
+#define dspot00_room_0Set_0018D0DL_00F3F8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_00F3F8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_00F3F8[] = dspot00_room_0Set_0018D0DL_00F3F8;
 
-#define dspot00_room_0Set_0018D0DL_00FB50 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_00FB50"
+#define dspot00_room_0Set_0018D0DL_00FB50 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_00FB50"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_00FB50[] = dspot00_room_0Set_0018D0DL_00FB50;
 
-#define dspot00_room_0Set_0018D0DL_00FE98 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_00FE98"
+#define dspot00_room_0Set_0018D0DL_00FE98 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_00FE98"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_00FE98[] = dspot00_room_0Set_0018D0DL_00FE98;
 
-#define dspot00_room_0Set_0018D0DL_0127B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_0127B8"
+#define dspot00_room_0Set_0018D0DL_0127B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_0127B8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_0127B8[] = dspot00_room_0Set_0018D0DL_0127B8;
 
-#define dspot00_room_0Set_0018D0DL_00E328 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_00E328"
+#define dspot00_room_0Set_0018D0DL_00E328 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_00E328"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_00E328[] = dspot00_room_0Set_0018D0DL_00E328;
 
-#define dspot00_room_0Set_0018D0DL_0112B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_0112B8"
+#define dspot00_room_0Set_0018D0DL_0112B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_0112B8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_0112B8[] = dspot00_room_0Set_0018D0DL_0112B8;
 
-#define dspot00_room_0Set_0018D0DL_0121D0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_0018D0DL_0121D0"
+#define dspot00_room_0Set_0018D0DL_0121D0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_0018D0DL_0121D0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_0018D0DL_0121D0[] = dspot00_room_0Set_0018D0DL_0121D0;
 
-#define dspot00_room_0Set_001920DL_013250 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_013250"
+#define dspot00_room_0Set_001920DL_013250 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_013250"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_013250[] = dspot00_room_0Set_001920DL_013250;
 
-#define dspot00_room_0Set_001920DL_0139A8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_0139A8"
+#define dspot00_room_0Set_001920DL_0139A8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_0139A8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_0139A8[] = dspot00_room_0Set_001920DL_0139A8;
 
-#define dspot00_room_0Set_001920DL_0143C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_0143C8"
+#define dspot00_room_0Set_001920DL_0143C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_0143C8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_0143C8[] = dspot00_room_0Set_001920DL_0143C8;
 
-#define dspot00_room_0Set_001920DL_015100 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_015100"
+#define dspot00_room_0Set_001920DL_015100 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_015100"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_015100[] = dspot00_room_0Set_001920DL_015100;
 
-#define dspot00_room_0Set_001920DL_014E28 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_014E28"
+#define dspot00_room_0Set_001920DL_014E28 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_014E28"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_014E28[] = dspot00_room_0Set_001920DL_014E28;
 
-#define dspot00_room_0Set_001920DL_008448 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_008448"
+#define dspot00_room_0Set_001920DL_008448 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_008448"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_008448[] = dspot00_room_0Set_001920DL_008448;
 
-#define dspot00_room_0Set_001920DL_012C38 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_012C38"
+#define dspot00_room_0Set_001920DL_012C38 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_012C38"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_012C38[] = dspot00_room_0Set_001920DL_012C38;
 
-#define dspot00_room_0Set_001920DL_012E18 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_012E18"
+#define dspot00_room_0Set_001920DL_012E18 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_012E18"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_012E18[] = dspot00_room_0Set_001920DL_012E18;
 
-#define dspot00_room_0Set_001920DL_002790 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_002790"
+#define dspot00_room_0Set_001920DL_002790 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_002790"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_002790[] = dspot00_room_0Set_001920DL_002790;
 
-#define dspot00_room_0Set_001920DL_003338 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_003338"
+#define dspot00_room_0Set_001920DL_003338 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_003338"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_003338[] = dspot00_room_0Set_001920DL_003338;
 
-#define dspot00_room_0Set_001920DL_003ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_003ED0"
+#define dspot00_room_0Set_001920DL_003ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_003ED0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_003ED0[] = dspot00_room_0Set_001920DL_003ED0;
 
-#define dspot00_room_0Set_001920DL_005030 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_005030"
+#define dspot00_room_0Set_001920DL_005030 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_005030"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_005030[] = dspot00_room_0Set_001920DL_005030;
 
-#define dspot00_room_0Set_001920DL_005850 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_005850"
+#define dspot00_room_0Set_001920DL_005850 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_005850"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_005850[] = dspot00_room_0Set_001920DL_005850;
 
-#define dspot00_room_0Set_001920DL_005BC0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_005BC0"
+#define dspot00_room_0Set_001920DL_005BC0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_005BC0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_005BC0[] = dspot00_room_0Set_001920DL_005BC0;
 
-#define dspot00_room_0Set_001920DL_005E78 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_005E78"
+#define dspot00_room_0Set_001920DL_005E78 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_005E78"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_005E78[] = dspot00_room_0Set_001920DL_005E78;
 
-#define dspot00_room_0Set_001920DL_0067C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_0067C8"
+#define dspot00_room_0Set_001920DL_0067C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_0067C8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_0067C8[] = dspot00_room_0Set_001920DL_0067C8;
 
-#define dspot00_room_0Set_001920DL_006ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_006ED0"
+#define dspot00_room_0Set_001920DL_006ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_006ED0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_006ED0[] = dspot00_room_0Set_001920DL_006ED0;
 
-#define dspot00_room_0Set_001920DL_007230 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_007230"
+#define dspot00_room_0Set_001920DL_007230 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_007230"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_007230[] = dspot00_room_0Set_001920DL_007230;
 
-#define dspot00_room_0Set_001920DL_008ED8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_008ED8"
+#define dspot00_room_0Set_001920DL_008ED8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_008ED8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_008ED8[] = dspot00_room_0Set_001920DL_008ED8;
 
-#define dspot00_room_0Set_001920DL_0093A0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_0093A0"
+#define dspot00_room_0Set_001920DL_0093A0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_0093A0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_0093A0[] = dspot00_room_0Set_001920DL_0093A0;
 
-#define dspot00_room_0Set_001920DL_009D10 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_009D10"
+#define dspot00_room_0Set_001920DL_009D10 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_009D10"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_009D10[] = dspot00_room_0Set_001920DL_009D10;
 
-#define dspot00_room_0Set_001920DL_00AD00 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_00AD00"
+#define dspot00_room_0Set_001920DL_00AD00 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_00AD00"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_00AD00[] = dspot00_room_0Set_001920DL_00AD00;
 
-#define dspot00_room_0Set_001920DL_00B520 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_00B520"
+#define dspot00_room_0Set_001920DL_00B520 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_00B520"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_00B520[] = dspot00_room_0Set_001920DL_00B520;
 
-#define dspot00_room_0Set_001920DL_00B8B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_00B8B0"
+#define dspot00_room_0Set_001920DL_00B8B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_00B8B0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_00B8B0[] = dspot00_room_0Set_001920DL_00B8B0;
 
-#define dspot00_room_0Set_001920DL_00BD20 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_00BD20"
+#define dspot00_room_0Set_001920DL_00BD20 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_00BD20"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_00BD20[] = dspot00_room_0Set_001920DL_00BD20;
 
-#define dspot00_room_0Set_001920DL_00CEB8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_00CEB8"
+#define dspot00_room_0Set_001920DL_00CEB8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_00CEB8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_00CEB8[] = dspot00_room_0Set_001920DL_00CEB8;
 
-#define dspot00_room_0Set_001920DL_00D980 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_00D980"
+#define dspot00_room_0Set_001920DL_00D980 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_00D980"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_00D980[] = dspot00_room_0Set_001920DL_00D980;
 
-#define dspot00_room_0Set_001920DL_00DD70 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_00DD70"
+#define dspot00_room_0Set_001920DL_00DD70 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_00DD70"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_00DD70[] = dspot00_room_0Set_001920DL_00DD70;
 
-#define dspot00_room_0Set_001920DL_00DFA8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_00DFA8"
+#define dspot00_room_0Set_001920DL_00DFA8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_00DFA8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_00DFA8[] = dspot00_room_0Set_001920DL_00DFA8;
 
-#define dspot00_room_0Set_001920DL_00E7B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_00E7B0"
+#define dspot00_room_0Set_001920DL_00E7B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_00E7B0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_00E7B0[] = dspot00_room_0Set_001920DL_00E7B0;
 
-#define dspot00_room_0Set_001920DL_00F3F8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_00F3F8"
+#define dspot00_room_0Set_001920DL_00F3F8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_00F3F8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_00F3F8[] = dspot00_room_0Set_001920DL_00F3F8;
 
-#define dspot00_room_0Set_001920DL_00FB50 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_00FB50"
+#define dspot00_room_0Set_001920DL_00FB50 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_00FB50"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_00FB50[] = dspot00_room_0Set_001920DL_00FB50;
 
-#define dspot00_room_0Set_001920DL_00FE98 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_00FE98"
+#define dspot00_room_0Set_001920DL_00FE98 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_00FE98"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_00FE98[] = dspot00_room_0Set_001920DL_00FE98;
 
-#define dspot00_room_0Set_001920DL_0127B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_0127B8"
+#define dspot00_room_0Set_001920DL_0127B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_0127B8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_0127B8[] = dspot00_room_0Set_001920DL_0127B8;
 
-#define dspot00_room_0Set_001920DL_00E328 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_00E328"
+#define dspot00_room_0Set_001920DL_00E328 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_00E328"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_00E328[] = dspot00_room_0Set_001920DL_00E328;
 
-#define dspot00_room_0Set_001920DL_0112B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_0112B8"
+#define dspot00_room_0Set_001920DL_0112B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_0112B8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_0112B8[] = dspot00_room_0Set_001920DL_0112B8;
 
-#define dspot00_room_0Set_001920DL_0121D0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001920DL_0121D0"
+#define dspot00_room_0Set_001920DL_0121D0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001920DL_0121D0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001920DL_0121D0[] = dspot00_room_0Set_001920DL_0121D0;
 
-#define dspot00_room_0Set_001C80DL_013250 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_013250"
+#define dspot00_room_0Set_001C80DL_013250 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_013250"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_013250[] = dspot00_room_0Set_001C80DL_013250;
 
-#define dspot00_room_0Set_001C80DL_0139A8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_0139A8"
+#define dspot00_room_0Set_001C80DL_0139A8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_0139A8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_0139A8[] = dspot00_room_0Set_001C80DL_0139A8;
 
-#define dspot00_room_0Set_001C80DL_0143C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_0143C8"
+#define dspot00_room_0Set_001C80DL_0143C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_0143C8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_0143C8[] = dspot00_room_0Set_001C80DL_0143C8;
 
-#define dspot00_room_0Set_001C80DL_015100 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_015100"
+#define dspot00_room_0Set_001C80DL_015100 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_015100"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_015100[] = dspot00_room_0Set_001C80DL_015100;
 
-#define dspot00_room_0Set_001C80DL_014E28 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_014E28"
+#define dspot00_room_0Set_001C80DL_014E28 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_014E28"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_014E28[] = dspot00_room_0Set_001C80DL_014E28;
 
-#define dspot00_room_0Set_001C80DL_008448 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_008448"
+#define dspot00_room_0Set_001C80DL_008448 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_008448"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_008448[] = dspot00_room_0Set_001C80DL_008448;
 
-#define dspot00_room_0Set_001C80DL_012C38 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_012C38"
+#define dspot00_room_0Set_001C80DL_012C38 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_012C38"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_012C38[] = dspot00_room_0Set_001C80DL_012C38;
 
-#define dspot00_room_0Set_001C80DL_012E18 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_012E18"
+#define dspot00_room_0Set_001C80DL_012E18 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_012E18"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_012E18[] = dspot00_room_0Set_001C80DL_012E18;
 
-#define dspot00_room_0Set_001C80DL_002790 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_002790"
+#define dspot00_room_0Set_001C80DL_002790 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_002790"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_002790[] = dspot00_room_0Set_001C80DL_002790;
 
-#define dspot00_room_0Set_001C80DL_003338 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_003338"
+#define dspot00_room_0Set_001C80DL_003338 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_003338"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_003338[] = dspot00_room_0Set_001C80DL_003338;
 
-#define dspot00_room_0Set_001C80DL_003ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_003ED0"
+#define dspot00_room_0Set_001C80DL_003ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_003ED0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_003ED0[] = dspot00_room_0Set_001C80DL_003ED0;
 
-#define dspot00_room_0Set_001C80DL_005030 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_005030"
+#define dspot00_room_0Set_001C80DL_005030 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_005030"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_005030[] = dspot00_room_0Set_001C80DL_005030;
 
-#define dspot00_room_0Set_001C80DL_005850 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_005850"
+#define dspot00_room_0Set_001C80DL_005850 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_005850"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_005850[] = dspot00_room_0Set_001C80DL_005850;
 
-#define dspot00_room_0Set_001C80DL_005BC0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_005BC0"
+#define dspot00_room_0Set_001C80DL_005BC0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_005BC0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_005BC0[] = dspot00_room_0Set_001C80DL_005BC0;
 
-#define dspot00_room_0Set_001C80DL_005E78 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_005E78"
+#define dspot00_room_0Set_001C80DL_005E78 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_005E78"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_005E78[] = dspot00_room_0Set_001C80DL_005E78;
 
-#define dspot00_room_0Set_001C80DL_0067C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_0067C8"
+#define dspot00_room_0Set_001C80DL_0067C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_0067C8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_0067C8[] = dspot00_room_0Set_001C80DL_0067C8;
 
-#define dspot00_room_0Set_001C80DL_006ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_006ED0"
+#define dspot00_room_0Set_001C80DL_006ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_006ED0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_006ED0[] = dspot00_room_0Set_001C80DL_006ED0;
 
-#define dspot00_room_0Set_001C80DL_007230 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_007230"
+#define dspot00_room_0Set_001C80DL_007230 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_007230"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_007230[] = dspot00_room_0Set_001C80DL_007230;
 
-#define dspot00_room_0Set_001C80DL_008ED8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_008ED8"
+#define dspot00_room_0Set_001C80DL_008ED8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_008ED8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_008ED8[] = dspot00_room_0Set_001C80DL_008ED8;
 
-#define dspot00_room_0Set_001C80DL_0093A0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_0093A0"
+#define dspot00_room_0Set_001C80DL_0093A0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_0093A0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_0093A0[] = dspot00_room_0Set_001C80DL_0093A0;
 
-#define dspot00_room_0Set_001C80DL_009D10 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_009D10"
+#define dspot00_room_0Set_001C80DL_009D10 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_009D10"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_009D10[] = dspot00_room_0Set_001C80DL_009D10;
 
-#define dspot00_room_0Set_001C80DL_00AD00 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_00AD00"
+#define dspot00_room_0Set_001C80DL_00AD00 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_00AD00"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_00AD00[] = dspot00_room_0Set_001C80DL_00AD00;
 
-#define dspot00_room_0Set_001C80DL_00B520 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_00B520"
+#define dspot00_room_0Set_001C80DL_00B520 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_00B520"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_00B520[] = dspot00_room_0Set_001C80DL_00B520;
 
-#define dspot00_room_0Set_001C80DL_00B8B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_00B8B0"
+#define dspot00_room_0Set_001C80DL_00B8B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_00B8B0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_00B8B0[] = dspot00_room_0Set_001C80DL_00B8B0;
 
-#define dspot00_room_0Set_001C80DL_00BD20 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_00BD20"
+#define dspot00_room_0Set_001C80DL_00BD20 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_00BD20"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_00BD20[] = dspot00_room_0Set_001C80DL_00BD20;
 
-#define dspot00_room_0Set_001C80DL_00CEB8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_00CEB8"
+#define dspot00_room_0Set_001C80DL_00CEB8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_00CEB8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_00CEB8[] = dspot00_room_0Set_001C80DL_00CEB8;
 
-#define dspot00_room_0Set_001C80DL_00D980 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_00D980"
+#define dspot00_room_0Set_001C80DL_00D980 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_00D980"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_00D980[] = dspot00_room_0Set_001C80DL_00D980;
 
-#define dspot00_room_0Set_001C80DL_00DD70 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_00DD70"
+#define dspot00_room_0Set_001C80DL_00DD70 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_00DD70"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_00DD70[] = dspot00_room_0Set_001C80DL_00DD70;
 
-#define dspot00_room_0Set_001C80DL_00DFA8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_00DFA8"
+#define dspot00_room_0Set_001C80DL_00DFA8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_00DFA8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_00DFA8[] = dspot00_room_0Set_001C80DL_00DFA8;
 
-#define dspot00_room_0Set_001C80DL_00E7B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_00E7B0"
+#define dspot00_room_0Set_001C80DL_00E7B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_00E7B0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_00E7B0[] = dspot00_room_0Set_001C80DL_00E7B0;
 
-#define dspot00_room_0Set_001C80DL_00F3F8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_00F3F8"
+#define dspot00_room_0Set_001C80DL_00F3F8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_00F3F8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_00F3F8[] = dspot00_room_0Set_001C80DL_00F3F8;
 
-#define dspot00_room_0Set_001C80DL_00FB50 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_00FB50"
+#define dspot00_room_0Set_001C80DL_00FB50 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_00FB50"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_00FB50[] = dspot00_room_0Set_001C80DL_00FB50;
 
-#define dspot00_room_0Set_001C80DL_00FE98 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_00FE98"
+#define dspot00_room_0Set_001C80DL_00FE98 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_00FE98"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_00FE98[] = dspot00_room_0Set_001C80DL_00FE98;
 
-#define dspot00_room_0Set_001C80DL_0127B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_0127B8"
+#define dspot00_room_0Set_001C80DL_0127B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_0127B8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_0127B8[] = dspot00_room_0Set_001C80DL_0127B8;
 
-#define dspot00_room_0Set_001C80DL_00E328 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_00E328"
+#define dspot00_room_0Set_001C80DL_00E328 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_00E328"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_00E328[] = dspot00_room_0Set_001C80DL_00E328;
 
-#define dspot00_room_0Set_001C80DL_0112B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_0112B8"
+#define dspot00_room_0Set_001C80DL_0112B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_0112B8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_0112B8[] = dspot00_room_0Set_001C80DL_0112B8;
 
-#define dspot00_room_0Set_001C80DL_0121D0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001C80DL_0121D0"
+#define dspot00_room_0Set_001C80DL_0121D0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001C80DL_0121D0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001C80DL_0121D0[] = dspot00_room_0Set_001C80DL_0121D0;
 
-#define dspot00_room_0Set_001CF0DL_013250 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_013250"
+#define dspot00_room_0Set_001CF0DL_013250 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_013250"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_013250[] = dspot00_room_0Set_001CF0DL_013250;
 
-#define dspot00_room_0Set_001CF0DL_0139A8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_0139A8"
+#define dspot00_room_0Set_001CF0DL_0139A8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_0139A8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_0139A8[] = dspot00_room_0Set_001CF0DL_0139A8;
 
-#define dspot00_room_0Set_001CF0DL_0143C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_0143C8"
+#define dspot00_room_0Set_001CF0DL_0143C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_0143C8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_0143C8[] = dspot00_room_0Set_001CF0DL_0143C8;
 
-#define dspot00_room_0Set_001CF0DL_015100 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_015100"
+#define dspot00_room_0Set_001CF0DL_015100 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_015100"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_015100[] = dspot00_room_0Set_001CF0DL_015100;
 
-#define dspot00_room_0Set_001CF0DL_014E28 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_014E28"
+#define dspot00_room_0Set_001CF0DL_014E28 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_014E28"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_014E28[] = dspot00_room_0Set_001CF0DL_014E28;
 
-#define dspot00_room_0Set_001CF0DL_008448 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_008448"
+#define dspot00_room_0Set_001CF0DL_008448 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_008448"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_008448[] = dspot00_room_0Set_001CF0DL_008448;
 
-#define dspot00_room_0Set_001CF0DL_012C38 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_012C38"
+#define dspot00_room_0Set_001CF0DL_012C38 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_012C38"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_012C38[] = dspot00_room_0Set_001CF0DL_012C38;
 
-#define dspot00_room_0Set_001CF0DL_012E18 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_012E18"
+#define dspot00_room_0Set_001CF0DL_012E18 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_012E18"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_012E18[] = dspot00_room_0Set_001CF0DL_012E18;
 
-#define dspot00_room_0Set_001CF0DL_002790 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_002790"
+#define dspot00_room_0Set_001CF0DL_002790 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_002790"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_002790[] = dspot00_room_0Set_001CF0DL_002790;
 
-#define dspot00_room_0Set_001CF0DL_003338 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_003338"
+#define dspot00_room_0Set_001CF0DL_003338 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_003338"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_003338[] = dspot00_room_0Set_001CF0DL_003338;
 
-#define dspot00_room_0Set_001CF0DL_003ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_003ED0"
+#define dspot00_room_0Set_001CF0DL_003ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_003ED0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_003ED0[] = dspot00_room_0Set_001CF0DL_003ED0;
 
-#define dspot00_room_0Set_001CF0DL_005030 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_005030"
+#define dspot00_room_0Set_001CF0DL_005030 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_005030"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_005030[] = dspot00_room_0Set_001CF0DL_005030;
 
-#define dspot00_room_0Set_001CF0DL_005850 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_005850"
+#define dspot00_room_0Set_001CF0DL_005850 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_005850"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_005850[] = dspot00_room_0Set_001CF0DL_005850;
 
-#define dspot00_room_0Set_001CF0DL_005BC0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_005BC0"
+#define dspot00_room_0Set_001CF0DL_005BC0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_005BC0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_005BC0[] = dspot00_room_0Set_001CF0DL_005BC0;
 
-#define dspot00_room_0Set_001CF0DL_005E78 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_005E78"
+#define dspot00_room_0Set_001CF0DL_005E78 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_005E78"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_005E78[] = dspot00_room_0Set_001CF0DL_005E78;
 
-#define dspot00_room_0Set_001CF0DL_0067C8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_0067C8"
+#define dspot00_room_0Set_001CF0DL_0067C8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_0067C8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_0067C8[] = dspot00_room_0Set_001CF0DL_0067C8;
 
-#define dspot00_room_0Set_001CF0DL_006ED0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_006ED0"
+#define dspot00_room_0Set_001CF0DL_006ED0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_006ED0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_006ED0[] = dspot00_room_0Set_001CF0DL_006ED0;
 
-#define dspot00_room_0Set_001CF0DL_007230 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_007230"
+#define dspot00_room_0Set_001CF0DL_007230 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_007230"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_007230[] = dspot00_room_0Set_001CF0DL_007230;
 
-#define dspot00_room_0Set_001CF0DL_008ED8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_008ED8"
+#define dspot00_room_0Set_001CF0DL_008ED8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_008ED8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_008ED8[] = dspot00_room_0Set_001CF0DL_008ED8;
 
-#define dspot00_room_0Set_001CF0DL_0093A0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_0093A0"
+#define dspot00_room_0Set_001CF0DL_0093A0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_0093A0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_0093A0[] = dspot00_room_0Set_001CF0DL_0093A0;
 
-#define dspot00_room_0Set_001CF0DL_009D10 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_009D10"
+#define dspot00_room_0Set_001CF0DL_009D10 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_009D10"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_009D10[] = dspot00_room_0Set_001CF0DL_009D10;
 
-#define dspot00_room_0Set_001CF0DL_00AD00 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_00AD00"
+#define dspot00_room_0Set_001CF0DL_00AD00 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_00AD00"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_00AD00[] = dspot00_room_0Set_001CF0DL_00AD00;
 
-#define dspot00_room_0Set_001CF0DL_00B520 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_00B520"
+#define dspot00_room_0Set_001CF0DL_00B520 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_00B520"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_00B520[] = dspot00_room_0Set_001CF0DL_00B520;
 
-#define dspot00_room_0Set_001CF0DL_00B8B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_00B8B0"
+#define dspot00_room_0Set_001CF0DL_00B8B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_00B8B0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_00B8B0[] = dspot00_room_0Set_001CF0DL_00B8B0;
 
-#define dspot00_room_0Set_001CF0DL_00BD20 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_00BD20"
+#define dspot00_room_0Set_001CF0DL_00BD20 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_00BD20"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_00BD20[] = dspot00_room_0Set_001CF0DL_00BD20;
 
-#define dspot00_room_0Set_001CF0DL_00CEB8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_00CEB8"
+#define dspot00_room_0Set_001CF0DL_00CEB8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_00CEB8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_00CEB8[] = dspot00_room_0Set_001CF0DL_00CEB8;
 
-#define dspot00_room_0Set_001CF0DL_00D980 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_00D980"
+#define dspot00_room_0Set_001CF0DL_00D980 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_00D980"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_00D980[] = dspot00_room_0Set_001CF0DL_00D980;
 
-#define dspot00_room_0Set_001CF0DL_00DD70 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_00DD70"
+#define dspot00_room_0Set_001CF0DL_00DD70 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_00DD70"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_00DD70[] = dspot00_room_0Set_001CF0DL_00DD70;
 
-#define dspot00_room_0Set_001CF0DL_00DFA8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_00DFA8"
+#define dspot00_room_0Set_001CF0DL_00DFA8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_00DFA8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_00DFA8[] = dspot00_room_0Set_001CF0DL_00DFA8;
 
-#define dspot00_room_0Set_001CF0DL_00E7B0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_00E7B0"
+#define dspot00_room_0Set_001CF0DL_00E7B0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_00E7B0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_00E7B0[] = dspot00_room_0Set_001CF0DL_00E7B0;
 
-#define dspot00_room_0Set_001CF0DL_00F3F8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_00F3F8"
+#define dspot00_room_0Set_001CF0DL_00F3F8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_00F3F8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_00F3F8[] = dspot00_room_0Set_001CF0DL_00F3F8;
 
-#define dspot00_room_0Set_001CF0DL_00FB50 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_00FB50"
+#define dspot00_room_0Set_001CF0DL_00FB50 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_00FB50"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_00FB50[] = dspot00_room_0Set_001CF0DL_00FB50;
 
-#define dspot00_room_0Set_001CF0DL_00FE98 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_00FE98"
+#define dspot00_room_0Set_001CF0DL_00FE98 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_00FE98"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_00FE98[] = dspot00_room_0Set_001CF0DL_00FE98;
 
-#define dspot00_room_0Set_001CF0DL_0127B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_0127B8"
+#define dspot00_room_0Set_001CF0DL_0127B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_0127B8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_0127B8[] = dspot00_room_0Set_001CF0DL_0127B8;
 
-#define dspot00_room_0Set_001CF0DL_00E328 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_00E328"
+#define dspot00_room_0Set_001CF0DL_00E328 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_00E328"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_00E328[] = dspot00_room_0Set_001CF0DL_00E328;
 
-#define dspot00_room_0Set_001CF0DL_0112B8 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_0112B8"
+#define dspot00_room_0Set_001CF0DL_0112B8 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_0112B8"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_0112B8[] = dspot00_room_0Set_001CF0DL_0112B8;
 
-#define dspot00_room_0Set_001CF0DL_0121D0 "__OTR__scenes/nonmq/spot00_scene/spot00_room_0Set_001CF0DL_0121D0"
+#define dspot00_room_0Set_001CF0DL_0121D0 "__OTR__scenes/shared/spot00_scene/spot00_room_0Set_001CF0DL_0121D0"
 static const ALIGN_ASSET(2) char spot00_room_0Set_001CF0DL_0121D0[] = dspot00_room_0Set_001CF0DL_0121D0;
 
 
diff --git a/soh/assets/scenes/overworld/spot00/spot00_scene.h b/soh/assets/scenes/overworld/spot00/spot00_scene.h
index 406a18176..97976e0e7 100644
--- a/soh/assets/scenes/overworld/spot00/spot00_scene.h
+++ b/soh/assets/scenes/overworld/spot00/spot00_scene.h
@@ -3,207 +3,207 @@
 
 #include "align_asset_macro.h"
 
-#define dgHyruleFieldGetOoTCs "__OTR__scenes/nonmq/spot00_scene/gHyruleFieldGetOoTCs"
-static const ALIGN_ASSET(2) char gHyruleFieldGetOoTCs[] = dgHyruleFieldGetOoTCs;
-
-#define dgHyruleFieldZeldaSongOfTimeCs "__OTR__scenes/nonmq/spot00_scene/gHyruleFieldZeldaSongOfTimeCs"
-static const ALIGN_ASSET(2) char gHyruleFieldZeldaSongOfTimeCs[] = dgHyruleFieldZeldaSongOfTimeCs;
-
-#define dgHyruleFieldEastEponaJumpCs "__OTR__scenes/nonmq/spot00_scene/gHyruleFieldEastEponaJumpCs"
-static const ALIGN_ASSET(2) char gHyruleFieldEastEponaJumpCs[] = dgHyruleFieldEastEponaJumpCs;
-
-#define dgHyruleFieldIntroCs "__OTR__scenes/nonmq/spot00_scene/gHyruleFieldIntroCs"
-static const ALIGN_ASSET(2) char gHyruleFieldIntroCs[] = dgHyruleFieldIntroCs;
-
-#define dgHyruleFieldSouthEponaJumpCs "__OTR__scenes/nonmq/spot00_scene/gHyruleFieldSouthEponaJumpCs"
-static const ALIGN_ASSET(2) char gHyruleFieldSouthEponaJumpCs[] = dgHyruleFieldSouthEponaJumpCs;
-
-#define dgHyruleFieldWestEponaJumpCs "__OTR__scenes/nonmq/spot00_scene/gHyruleFieldWestEponaJumpCs"
-static const ALIGN_ASSET(2) char gHyruleFieldWestEponaJumpCs[] = dgHyruleFieldWestEponaJumpCs;
-
-#define dgHyruleFieldGateEponaJumpCs "__OTR__scenes/nonmq/spot00_scene/gHyruleFieldGateEponaJumpCs"
-static const ALIGN_ASSET(2) char gHyruleFieldGateEponaJumpCs[] = dgHyruleFieldGateEponaJumpCs;
-
-#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneCollisionHeader_008464"
-static const ALIGN_ASSET(2) char spot00_sceneCollisionHeader_008464[] = dspot00_sceneCollisionHeader_008464;
-
-#define dspot00_scene_Tex_02A198 "__OTR__scenes/nonmq/spot00_scene/spot00_scene_Tex_02A198"
-static const ALIGN_ASSET(2) char spot00_scene_Tex_02A198[] = dspot00_scene_Tex_02A198;
-
-#define dspot00_sceneTex_025018 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_025018"
-static const ALIGN_ASSET(2) char spot00_sceneTex_025018[] = dspot00_sceneTex_025018;
-
-#define dspot00_sceneTex_023818 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_023818"
-static const ALIGN_ASSET(2) char spot00_sceneTex_023818[] = dspot00_sceneTex_023818;
-
-#define dspot00_sceneTex_024018 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_024018"
-static const ALIGN_ASSET(2) char spot00_sceneTex_024018[] = dspot00_sceneTex_024018;
-
-#define dspot00_sceneTex_022018 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_022018"
-static const ALIGN_ASSET(2) char spot00_sceneTex_022018[] = dspot00_sceneTex_022018;
-
-#define dspot00_sceneTex_020818 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_020818"
-static const ALIGN_ASSET(2) char spot00_sceneTex_020818[] = dspot00_sceneTex_020818;
-
-#define dspot00_sceneTex_024818 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_024818"
-static const ALIGN_ASSET(2) char spot00_sceneTex_024818[] = dspot00_sceneTex_024818;
-
-#define dspot00_sceneTLUT_013D70 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTLUT_013D70"
-static const ALIGN_ASSET(2) char spot00_sceneTLUT_013D70[] = dspot00_sceneTLUT_013D70;
-
-#define dspot00_sceneTex_016698 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_016698"
-static const ALIGN_ASSET(2) char spot00_sceneTex_016698[] = dspot00_sceneTex_016698;
-
-#define dspot00_sceneTex_01BD98 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_01BD98"
-static const ALIGN_ASSET(2) char spot00_sceneTex_01BD98[] = dspot00_sceneTex_01BD98;
-
-#define dspot00_sceneTex_025818 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_025818"
-static const ALIGN_ASSET(2) char spot00_sceneTex_025818[] = dspot00_sceneTex_025818;
-
-#define dspot00_sceneTex_01BB98 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_01BB98"
-static const ALIGN_ASSET(2) char spot00_sceneTex_01BB98[] = dspot00_sceneTex_01BB98;
-
-#define dspot00_sceneTex_029F98 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_029F98"
-static const ALIGN_ASSET(2) char spot00_sceneTex_029F98[] = dspot00_sceneTex_029F98;
-
-#define dspot00_sceneTex_01F618 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_01F618"
-static const ALIGN_ASSET(2) char spot00_sceneTex_01F618[] = dspot00_sceneTex_01F618;
-
-#define dspot00_sceneTex_019398 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_019398"
-static const ALIGN_ASSET(2) char spot00_sceneTex_019398[] = dspot00_sceneTex_019398;
-
-#define dspot00_sceneTex_01F598 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_01F598"
-static const ALIGN_ASSET(2) char spot00_sceneTex_01F598[] = dspot00_sceneTex_01F598;
-
-#define dspot00_sceneTex_01F198 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_01F198"
-static const ALIGN_ASSET(2) char spot00_sceneTex_01F198[] = dspot00_sceneTex_01F198;
-
-#define dspot00_sceneTex_01E998 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_01E998"
-static const ALIGN_ASSET(2) char spot00_sceneTex_01E998[] = dspot00_sceneTex_01E998;
-
-#define dspot00_sceneTex_01AB98 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_01AB98"
-static const ALIGN_ASSET(2) char spot00_sceneTex_01AB98[] = dspot00_sceneTex_01AB98;
-
-#define dspot00_sceneTex_01B398 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_01B398"
-static const ALIGN_ASSET(2) char spot00_sceneTex_01B398[] = dspot00_sceneTex_01B398;
-
-#define dspot00_sceneTex_01D998 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_01D998"
-static const ALIGN_ASSET(2) char spot00_sceneTex_01D998[] = dspot00_sceneTex_01D998;
-
-#define dspot00_sceneTex_028198 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_028198"
-static const ALIGN_ASSET(2) char spot00_sceneTex_028198[] = dspot00_sceneTex_028198;
-
-#define dspot00_sceneTex_029598 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_029598"
-static const ALIGN_ASSET(2) char spot00_sceneTex_029598[] = dspot00_sceneTex_029598;
-
-#define dspot00_sceneTex_023018 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_023018"
-static const ALIGN_ASSET(2) char spot00_sceneTex_023018[] = dspot00_sceneTex_023018;
-
-#define dspot00_sceneTex_022818 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_022818"
-static const ALIGN_ASSET(2) char spot00_sceneTex_022818[] = dspot00_sceneTex_022818;
-
-#define dspot00_sceneTex_01C198 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_01C198"
-static const ALIGN_ASSET(2) char spot00_sceneTex_01C198[] = dspot00_sceneTex_01C198;
-
-#define dspot00_sceneTex_026898 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_026898"
-static const ALIGN_ASSET(2) char spot00_sceneTex_026898[] = dspot00_sceneTex_026898;
-
-#define dspot00_sceneTex_016A98 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_016A98"
-static const ALIGN_ASSET(2) char spot00_sceneTex_016A98[] = dspot00_sceneTex_016A98;
-
-#define dspot00_sceneTex_01D198 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_01D198"
-static const ALIGN_ASSET(2) char spot00_sceneTex_01D198[] = dspot00_sceneTex_01D198;
-
-#define dspot00_sceneTex_029D98 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_029D98"
-static const ALIGN_ASSET(2) char spot00_sceneTex_029D98[] = dspot00_sceneTex_029D98;
-
-#define dspot00_sceneTex_019B98 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_019B98"
-static const ALIGN_ASSET(2) char spot00_sceneTex_019B98[] = dspot00_sceneTex_019B98;
-
-#define dspot00_sceneTex_013D98 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_013D98"
+#define dspot00_sceneTex_013D98 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_013D98"
 static const ALIGN_ASSET(2) char spot00_sceneTex_013D98[] = dspot00_sceneTex_013D98;
 
-#define dspot00_sceneTex_018B98 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_018B98"
-static const ALIGN_ASSET(2) char spot00_sceneTex_018B98[] = dspot00_sceneTex_018B98;
-
-#define dspot00_sceneTex_017B98 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_017B98"
-static const ALIGN_ASSET(2) char spot00_sceneTex_017B98[] = dspot00_sceneTex_017B98;
-
-#define dspot00_sceneTex_016B98 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_016B98"
-static const ALIGN_ASSET(2) char spot00_sceneTex_016B98[] = dspot00_sceneTex_016B98;
-
-#define dspot00_sceneTex_015E98 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_015E98"
-static const ALIGN_ASSET(2) char spot00_sceneTex_015E98[] = dspot00_sceneTex_015E98;
-
-#define dspot00_sceneTex_015D98 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_015D98"
-static const ALIGN_ASSET(2) char spot00_sceneTex_015D98[] = dspot00_sceneTex_015D98;
-
-#define dspot00_sceneTex_017398 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_017398"
-static const ALIGN_ASSET(2) char spot00_sceneTex_017398[] = dspot00_sceneTex_017398;
-
-#define dspot00_sceneTex_021818 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_021818"
-static const ALIGN_ASSET(2) char spot00_sceneTex_021818[] = dspot00_sceneTex_021818;
-
-#define dspot00_sceneTex_026098 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_026098"
-static const ALIGN_ASSET(2) char spot00_sceneTex_026098[] = dspot00_sceneTex_026098;
-
-#define dspot00_sceneTex_025898 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_025898"
-static const ALIGN_ASSET(2) char spot00_sceneTex_025898[] = dspot00_sceneTex_025898;
-
-#define dspot00_sceneTex_021018 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_021018"
-static const ALIGN_ASSET(2) char spot00_sceneTex_021018[] = dspot00_sceneTex_021018;
-
-#define dspot00_sceneTex_01C998 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_01C998"
-static const ALIGN_ASSET(2) char spot00_sceneTex_01C998[] = dspot00_sceneTex_01C998;
-
-#define dspot00_sceneTex_014998 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_014998"
-static const ALIGN_ASSET(2) char spot00_sceneTex_014998[] = dspot00_sceneTex_014998;
-
-#define dspot00_sceneTex_014598 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_014598"
+#define dspot00_sceneTex_014598 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_014598"
 static const ALIGN_ASSET(2) char spot00_sceneTex_014598[] = dspot00_sceneTex_014598;
 
-#define dspot00_sceneTex_020018 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_020018"
-static const ALIGN_ASSET(2) char spot00_sceneTex_020018[] = dspot00_sceneTex_020018;
+#define dspot00_sceneTex_014998 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_014998"
+static const ALIGN_ASSET(2) char spot00_sceneTex_014998[] = dspot00_sceneTex_014998;
 
-#define dspot00_sceneTex_01F818 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_01F818"
-static const ALIGN_ASSET(2) char spot00_sceneTex_01F818[] = dspot00_sceneTex_01F818;
-
-#define dspot00_sceneTex_027D98 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_027D98"
-static const ALIGN_ASSET(2) char spot00_sceneTex_027D98[] = dspot00_sceneTex_027D98;
-
-#define dspot00_sceneTex_027998 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_027998"
-static const ALIGN_ASSET(2) char spot00_sceneTex_027998[] = dspot00_sceneTex_027998;
-
-#define dspot00_sceneTex_028598 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_028598"
-static const ALIGN_ASSET(2) char spot00_sceneTex_028598[] = dspot00_sceneTex_028598;
-
-#define dspot00_sceneTex_014D98 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_014D98"
+#define dspot00_sceneTex_014D98 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_014D98"
 static const ALIGN_ASSET(2) char spot00_sceneTex_014D98[] = dspot00_sceneTex_014D98;
 
-#define dspot00_sceneTex_026998 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneTex_026998"
+#define dspot00_sceneTex_015D98 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_015D98"
+static const ALIGN_ASSET(2) char spot00_sceneTex_015D98[] = dspot00_sceneTex_015D98;
+
+#define dspot00_sceneTex_015E98 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_015E98"
+static const ALIGN_ASSET(2) char spot00_sceneTex_015E98[] = dspot00_sceneTex_015E98;
+
+#define dspot00_sceneTex_016698 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_016698"
+static const ALIGN_ASSET(2) char spot00_sceneTex_016698[] = dspot00_sceneTex_016698;
+
+#define dspot00_sceneTex_016A98 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_016A98"
+static const ALIGN_ASSET(2) char spot00_sceneTex_016A98[] = dspot00_sceneTex_016A98;
+
+#define dspot00_sceneTex_016B98 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_016B98"
+static const ALIGN_ASSET(2) char spot00_sceneTex_016B98[] = dspot00_sceneTex_016B98;
+
+#define dspot00_sceneTex_017398 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_017398"
+static const ALIGN_ASSET(2) char spot00_sceneTex_017398[] = dspot00_sceneTex_017398;
+
+#define dspot00_sceneTex_017B98 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_017B98"
+static const ALIGN_ASSET(2) char spot00_sceneTex_017B98[] = dspot00_sceneTex_017B98;
+
+#define dspot00_sceneTex_018B98 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_018B98"
+static const ALIGN_ASSET(2) char spot00_sceneTex_018B98[] = dspot00_sceneTex_018B98;
+
+#define dspot00_sceneTex_019398 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_019398"
+static const ALIGN_ASSET(2) char spot00_sceneTex_019398[] = dspot00_sceneTex_019398;
+
+#define dspot00_sceneTex_019B98 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_019B98"
+static const ALIGN_ASSET(2) char spot00_sceneTex_019B98[] = dspot00_sceneTex_019B98;
+
+#define dspot00_sceneTex_01AB98 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_01AB98"
+static const ALIGN_ASSET(2) char spot00_sceneTex_01AB98[] = dspot00_sceneTex_01AB98;
+
+#define dspot00_sceneTex_01B398 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_01B398"
+static const ALIGN_ASSET(2) char spot00_sceneTex_01B398[] = dspot00_sceneTex_01B398;
+
+#define dspot00_sceneTex_01BB98 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_01BB98"
+static const ALIGN_ASSET(2) char spot00_sceneTex_01BB98[] = dspot00_sceneTex_01BB98;
+
+#define dspot00_sceneTex_01BD98 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_01BD98"
+static const ALIGN_ASSET(2) char spot00_sceneTex_01BD98[] = dspot00_sceneTex_01BD98;
+
+#define dspot00_sceneTex_01C198 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_01C198"
+static const ALIGN_ASSET(2) char spot00_sceneTex_01C198[] = dspot00_sceneTex_01C198;
+
+#define dspot00_sceneTex_01C998 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_01C998"
+static const ALIGN_ASSET(2) char spot00_sceneTex_01C998[] = dspot00_sceneTex_01C998;
+
+#define dspot00_sceneTex_01D198 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_01D198"
+static const ALIGN_ASSET(2) char spot00_sceneTex_01D198[] = dspot00_sceneTex_01D198;
+
+#define dspot00_sceneTex_01D998 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_01D998"
+static const ALIGN_ASSET(2) char spot00_sceneTex_01D998[] = dspot00_sceneTex_01D998;
+
+#define dspot00_sceneTex_01E998 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_01E998"
+static const ALIGN_ASSET(2) char spot00_sceneTex_01E998[] = dspot00_sceneTex_01E998;
+
+#define dspot00_sceneTex_01F198 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_01F198"
+static const ALIGN_ASSET(2) char spot00_sceneTex_01F198[] = dspot00_sceneTex_01F198;
+
+#define dspot00_sceneTex_01F598 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_01F598"
+static const ALIGN_ASSET(2) char spot00_sceneTex_01F598[] = dspot00_sceneTex_01F598;
+
+#define dspot00_sceneTex_01F618 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_01F618"
+static const ALIGN_ASSET(2) char spot00_sceneTex_01F618[] = dspot00_sceneTex_01F618;
+
+#define dspot00_sceneTex_01F818 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_01F818"
+static const ALIGN_ASSET(2) char spot00_sceneTex_01F818[] = dspot00_sceneTex_01F818;
+
+#define dspot00_sceneTex_020018 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_020018"
+static const ALIGN_ASSET(2) char spot00_sceneTex_020018[] = dspot00_sceneTex_020018;
+
+#define dspot00_sceneTex_020818 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_020818"
+static const ALIGN_ASSET(2) char spot00_sceneTex_020818[] = dspot00_sceneTex_020818;
+
+#define dspot00_sceneTex_021018 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_021018"
+static const ALIGN_ASSET(2) char spot00_sceneTex_021018[] = dspot00_sceneTex_021018;
+
+#define dspot00_sceneTex_021818 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_021818"
+static const ALIGN_ASSET(2) char spot00_sceneTex_021818[] = dspot00_sceneTex_021818;
+
+#define dspot00_sceneTex_022018 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_022018"
+static const ALIGN_ASSET(2) char spot00_sceneTex_022018[] = dspot00_sceneTex_022018;
+
+#define dspot00_sceneTex_022818 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_022818"
+static const ALIGN_ASSET(2) char spot00_sceneTex_022818[] = dspot00_sceneTex_022818;
+
+#define dspot00_sceneTex_023018 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_023018"
+static const ALIGN_ASSET(2) char spot00_sceneTex_023018[] = dspot00_sceneTex_023018;
+
+#define dspot00_sceneTex_023818 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_023818"
+static const ALIGN_ASSET(2) char spot00_sceneTex_023818[] = dspot00_sceneTex_023818;
+
+#define dspot00_sceneTex_024018 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_024018"
+static const ALIGN_ASSET(2) char spot00_sceneTex_024018[] = dspot00_sceneTex_024018;
+
+#define dspot00_sceneTex_024818 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_024818"
+static const ALIGN_ASSET(2) char spot00_sceneTex_024818[] = dspot00_sceneTex_024818;
+
+#define dspot00_sceneTex_025018 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_025018"
+static const ALIGN_ASSET(2) char spot00_sceneTex_025018[] = dspot00_sceneTex_025018;
+
+#define dspot00_sceneTex_025818 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_025818"
+static const ALIGN_ASSET(2) char spot00_sceneTex_025818[] = dspot00_sceneTex_025818;
+
+#define dspot00_sceneTex_025898 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_025898"
+static const ALIGN_ASSET(2) char spot00_sceneTex_025898[] = dspot00_sceneTex_025898;
+
+#define dspot00_sceneTex_026098 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_026098"
+static const ALIGN_ASSET(2) char spot00_sceneTex_026098[] = dspot00_sceneTex_026098;
+
+#define dspot00_sceneTex_026898 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_026898"
+static const ALIGN_ASSET(2) char spot00_sceneTex_026898[] = dspot00_sceneTex_026898;
+
+#define dspot00_sceneTex_026998 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_026998"
 static const ALIGN_ASSET(2) char spot00_sceneTex_026998[] = dspot00_sceneTex_026998;
 
-#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneCollisionHeader_008464"
+#define dspot00_sceneTex_027998 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_027998"
+static const ALIGN_ASSET(2) char spot00_sceneTex_027998[] = dspot00_sceneTex_027998;
 
-#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneCollisionHeader_008464"
+#define dspot00_sceneTex_027D98 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_027D98"
+static const ALIGN_ASSET(2) char spot00_sceneTex_027D98[] = dspot00_sceneTex_027D98;
 
-#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneCollisionHeader_008464"
+#define dspot00_sceneTex_028198 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_028198"
+static const ALIGN_ASSET(2) char spot00_sceneTex_028198[] = dspot00_sceneTex_028198;
 
-#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneCollisionHeader_008464"
+#define dspot00_sceneTex_028598 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_028598"
+static const ALIGN_ASSET(2) char spot00_sceneTex_028598[] = dspot00_sceneTex_028598;
 
-#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneCollisionHeader_008464"
+#define dspot00_sceneTex_029598 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_029598"
+static const ALIGN_ASSET(2) char spot00_sceneTex_029598[] = dspot00_sceneTex_029598;
 
-#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneCollisionHeader_008464"
+#define dspot00_sceneTex_029D98 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_029D98"
+static const ALIGN_ASSET(2) char spot00_sceneTex_029D98[] = dspot00_sceneTex_029D98;
 
-#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneCollisionHeader_008464"
+#define dspot00_sceneTex_029F98 "__OTR__scenes/shared/spot00_scene/spot00_sceneTex_029F98"
+static const ALIGN_ASSET(2) char spot00_sceneTex_029F98[] = dspot00_sceneTex_029F98;
 
-#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneCollisionHeader_008464"
+#define dspot00_sceneTLUT_013D70 "__OTR__scenes/shared/spot00_scene/spot00_sceneTLUT_013D70"
+static const ALIGN_ASSET(2) char spot00_sceneTLUT_013D70[] = dspot00_sceneTLUT_013D70;
 
-#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneCollisionHeader_008464"
+#define dgHyruleFieldGetOoTCs "__OTR__scenes/shared/spot00_scene/gHyruleFieldGetOoTCs"
+static const ALIGN_ASSET(2) char gHyruleFieldGetOoTCs[] = dgHyruleFieldGetOoTCs;
 
-#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneCollisionHeader_008464"
+#define dgHyruleFieldZeldaSongOfTimeCs "__OTR__scenes/shared/spot00_scene/gHyruleFieldZeldaSongOfTimeCs"
+static const ALIGN_ASSET(2) char gHyruleFieldZeldaSongOfTimeCs[] = dgHyruleFieldZeldaSongOfTimeCs;
 
-#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/nonmq/spot00_scene/spot00_sceneCollisionHeader_008464"
+#define dgHyruleFieldEastEponaJumpCs "__OTR__scenes/shared/spot00_scene/gHyruleFieldEastEponaJumpCs"
+static const ALIGN_ASSET(2) char gHyruleFieldEastEponaJumpCs[] = dgHyruleFieldEastEponaJumpCs;
+
+#define dgHyruleFieldIntroCs "__OTR__scenes/shared/spot00_scene/gHyruleFieldIntroCs"
+static const ALIGN_ASSET(2) char gHyruleFieldIntroCs[] = dgHyruleFieldIntroCs;
+
+#define dgHyruleFieldSouthEponaJumpCs "__OTR__scenes/shared/spot00_scene/gHyruleFieldSouthEponaJumpCs"
+static const ALIGN_ASSET(2) char gHyruleFieldSouthEponaJumpCs[] = dgHyruleFieldSouthEponaJumpCs;
+
+#define dgHyruleFieldWestEponaJumpCs "__OTR__scenes/shared/spot00_scene/gHyruleFieldWestEponaJumpCs"
+static const ALIGN_ASSET(2) char gHyruleFieldWestEponaJumpCs[] = dgHyruleFieldWestEponaJumpCs;
+
+#define dgHyruleFieldGateEponaJumpCs "__OTR__scenes/shared/spot00_scene/gHyruleFieldGateEponaJumpCs"
+static const ALIGN_ASSET(2) char gHyruleFieldGateEponaJumpCs[] = dgHyruleFieldGateEponaJumpCs;
+
+#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/shared/spot00_scene/spot00_sceneCollisionHeader_008464"
+static const ALIGN_ASSET(2) char spot00_sceneCollisionHeader_008464[] = dspot00_sceneCollisionHeader_008464;
+
+#define dspot00_scene_Tex_02A198 "__OTR__scenes/shared/spot00_scene/spot00_scene_Tex_02A198"
+static const ALIGN_ASSET(2) char spot00_scene_Tex_02A198[] = dspot00_scene_Tex_02A198;
+
+#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/shared/spot00_scene/spot00_sceneCollisionHeader_008464"
+
+#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/shared/spot00_scene/spot00_sceneCollisionHeader_008464"
+
+#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/shared/spot00_scene/spot00_sceneCollisionHeader_008464"
+
+#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/shared/spot00_scene/spot00_sceneCollisionHeader_008464"
+
+#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/shared/spot00_scene/spot00_sceneCollisionHeader_008464"
+
+#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/shared/spot00_scene/spot00_sceneCollisionHeader_008464"
+
+#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/shared/spot00_scene/spot00_sceneCollisionHeader_008464"
+
+#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/shared/spot00_scene/spot00_sceneCollisionHeader_008464"
+
+#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/shared/spot00_scene/spot00_sceneCollisionHeader_008464"
+
+#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/shared/spot00_scene/spot00_sceneCollisionHeader_008464"
+
+#define dspot00_sceneCollisionHeader_008464 "__OTR__scenes/shared/spot00_scene/spot00_sceneCollisionHeader_008464"
 
 
 #endif // OVERWORLD_SPOT00_SCENE_H
diff --git a/soh/assets/scenes/overworld/spot01/spot01_room_0.h b/soh/assets/scenes/overworld/spot01/spot01_room_0.h
index bc0e45593..c4a1563ec 100644
--- a/soh/assets/scenes/overworld/spot01/spot01_room_0.h
+++ b/soh/assets/scenes/overworld/spot01/spot01_room_0.h
@@ -3,547 +3,547 @@
 
 #include "align_asset_macro.h"
 
-#define dgSpot01DL_009E38 "__OTR__scenes/nonmq/spot01_scene/gSpot01DL_009E38"
+#define dgSpot01DL_009E38 "__OTR__scenes/shared/spot01_scene/gSpot01DL_009E38"
 static const ALIGN_ASSET(2) char gSpot01DL_009E38[] = dgSpot01DL_009E38;
 
-#define dspot01_room_0DL_005E48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_005E48"
+#define dspot01_room_0DL_005E48 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_005E48"
 static const ALIGN_ASSET(2) char spot01_room_0DL_005E48[] = dspot01_room_0DL_005E48;
 
-#define dspot01_room_0DL_0024E8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_0024E8"
+#define dspot01_room_0DL_0024E8 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_0024E8"
 static const ALIGN_ASSET(2) char spot01_room_0DL_0024E8[] = dspot01_room_0DL_0024E8;
 
-#define dspot01_room_0DL_001F20 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_001F20"
+#define dspot01_room_0DL_001F20 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_001F20"
 static const ALIGN_ASSET(2) char spot01_room_0DL_001F20[] = dspot01_room_0DL_001F20;
 
-#define dspot01_room_0DL_006758 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_006758"
+#define dspot01_room_0DL_006758 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_006758"
 static const ALIGN_ASSET(2) char spot01_room_0DL_006758[] = dspot01_room_0DL_006758;
 
-#define dspot01_room_0DL_006B18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_006B18"
+#define dspot01_room_0DL_006B18 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_006B18"
 static const ALIGN_ASSET(2) char spot01_room_0DL_006B18[] = dspot01_room_0DL_006B18;
 
-#define dspot01_room_0DL_006EC0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_006EC0"
+#define dspot01_room_0DL_006EC0 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_006EC0"
 static const ALIGN_ASSET(2) char spot01_room_0DL_006EC0[] = dspot01_room_0DL_006EC0;
 
-#define dspot01_room_0DL_007418 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_007418"
+#define dspot01_room_0DL_007418 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_007418"
 static const ALIGN_ASSET(2) char spot01_room_0DL_007418[] = dspot01_room_0DL_007418;
 
-#define dspot01_room_0DL_007888 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_007888"
+#define dspot01_room_0DL_007888 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_007888"
 static const ALIGN_ASSET(2) char spot01_room_0DL_007888[] = dspot01_room_0DL_007888;
 
-#define dspot01_room_0DL_007C18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_007C18"
+#define dspot01_room_0DL_007C18 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_007C18"
 static const ALIGN_ASSET(2) char spot01_room_0DL_007C18[] = dspot01_room_0DL_007C18;
 
-#define dspot01_room_0DL_0086F0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_0086F0"
+#define dspot01_room_0DL_0086F0 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_0086F0"
 static const ALIGN_ASSET(2) char spot01_room_0DL_0086F0[] = dspot01_room_0DL_0086F0;
 
-#define dspot01_room_0DL_003B48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_003B48"
+#define dspot01_room_0DL_003B48 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_003B48"
 static const ALIGN_ASSET(2) char spot01_room_0DL_003B48[] = dspot01_room_0DL_003B48;
 
-#define dspot01_room_0DL_009108 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_009108"
+#define dspot01_room_0DL_009108 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_009108"
 static const ALIGN_ASSET(2) char spot01_room_0DL_009108[] = dspot01_room_0DL_009108;
 
-#define dspot01_room_0DL_004DB0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_004DB0"
+#define dspot01_room_0DL_004DB0 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_004DB0"
 static const ALIGN_ASSET(2) char spot01_room_0DL_004DB0[] = dspot01_room_0DL_004DB0;
 
-#define dspot01_room_0DL_004420 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_004420"
+#define dspot01_room_0DL_004420 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_004420"
 static const ALIGN_ASSET(2) char spot01_room_0DL_004420[] = dspot01_room_0DL_004420;
 
-#define dspot01_room_0DL_0048C8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_0048C8"
+#define dspot01_room_0DL_0048C8 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_0048C8"
 static const ALIGN_ASSET(2) char spot01_room_0DL_0048C8[] = dspot01_room_0DL_0048C8;
 
-#define dspot01_room_0DL_005AD0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_005AD0"
+#define dspot01_room_0DL_005AD0 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_005AD0"
 static const ALIGN_ASSET(2) char spot01_room_0DL_005AD0[] = dspot01_room_0DL_005AD0;
 
-#define dspot01_room_0DL_008EC8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_008EC8"
+#define dspot01_room_0DL_008EC8 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_008EC8"
 static const ALIGN_ASSET(2) char spot01_room_0DL_008EC8[] = dspot01_room_0DL_008EC8;
 
-#define dspot01_room_0DL_009A70 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_009A70"
+#define dspot01_room_0DL_009A70 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_009A70"
 static const ALIGN_ASSET(2) char spot01_room_0DL_009A70[] = dspot01_room_0DL_009A70;
 
-#define dspot01_room_0DL_005680 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_005680"
+#define dspot01_room_0DL_005680 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_005680"
 static const ALIGN_ASSET(2) char spot01_room_0DL_005680[] = dspot01_room_0DL_005680;
 
-#define dspot01_room_0DL_0063A0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0DL_0063A0"
+#define dspot01_room_0DL_0063A0 "__OTR__scenes/shared/spot01_scene/spot01_room_0DL_0063A0"
 static const ALIGN_ASSET(2) char spot01_room_0DL_0063A0[] = dspot01_room_0DL_0063A0;
 
-#define dspot01_room_0Set_000C40DL_005E48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_005E48"
+#define dspot01_room_0Set_000C40DL_005E48 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_005E48"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_005E48[] = dspot01_room_0Set_000C40DL_005E48;
 
-#define dspot01_room_0Set_000C40DL_0024E8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_0024E8"
+#define dspot01_room_0Set_000C40DL_0024E8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_0024E8"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_0024E8[] = dspot01_room_0Set_000C40DL_0024E8;
 
-#define dspot01_room_0Set_000C40DL_001F20 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_001F20"
+#define dspot01_room_0Set_000C40DL_001F20 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_001F20"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_001F20[] = dspot01_room_0Set_000C40DL_001F20;
 
-#define dspot01_room_0Set_000C40DL_006758 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_006758"
+#define dspot01_room_0Set_000C40DL_006758 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_006758"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_006758[] = dspot01_room_0Set_000C40DL_006758;
 
-#define dspot01_room_0Set_000C40DL_006B18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_006B18"
+#define dspot01_room_0Set_000C40DL_006B18 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_006B18"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_006B18[] = dspot01_room_0Set_000C40DL_006B18;
 
-#define dspot01_room_0Set_000C40DL_006EC0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_006EC0"
+#define dspot01_room_0Set_000C40DL_006EC0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_006EC0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_006EC0[] = dspot01_room_0Set_000C40DL_006EC0;
 
-#define dspot01_room_0Set_000C40DL_007418 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_007418"
+#define dspot01_room_0Set_000C40DL_007418 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_007418"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_007418[] = dspot01_room_0Set_000C40DL_007418;
 
-#define dspot01_room_0Set_000C40DL_007888 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_007888"
+#define dspot01_room_0Set_000C40DL_007888 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_007888"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_007888[] = dspot01_room_0Set_000C40DL_007888;
 
-#define dspot01_room_0Set_000C40DL_007C18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_007C18"
+#define dspot01_room_0Set_000C40DL_007C18 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_007C18"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_007C18[] = dspot01_room_0Set_000C40DL_007C18;
 
-#define dspot01_room_0Set_000C40DL_0086F0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_0086F0"
+#define dspot01_room_0Set_000C40DL_0086F0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_0086F0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_0086F0[] = dspot01_room_0Set_000C40DL_0086F0;
 
-#define dspot01_room_0Set_000C40DL_003B48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_003B48"
+#define dspot01_room_0Set_000C40DL_003B48 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_003B48"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_003B48[] = dspot01_room_0Set_000C40DL_003B48;
 
-#define dspot01_room_0Set_000C40DL_009108 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_009108"
+#define dspot01_room_0Set_000C40DL_009108 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_009108"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_009108[] = dspot01_room_0Set_000C40DL_009108;
 
-#define dspot01_room_0Set_000C40DL_004DB0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_004DB0"
+#define dspot01_room_0Set_000C40DL_004DB0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_004DB0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_004DB0[] = dspot01_room_0Set_000C40DL_004DB0;
 
-#define dspot01_room_0Set_000C40DL_004420 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_004420"
+#define dspot01_room_0Set_000C40DL_004420 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_004420"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_004420[] = dspot01_room_0Set_000C40DL_004420;
 
-#define dspot01_room_0Set_000C40DL_0048C8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_0048C8"
+#define dspot01_room_0Set_000C40DL_0048C8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_0048C8"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_0048C8[] = dspot01_room_0Set_000C40DL_0048C8;
 
-#define dspot01_room_0Set_000C40DL_005AD0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_005AD0"
+#define dspot01_room_0Set_000C40DL_005AD0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_005AD0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_005AD0[] = dspot01_room_0Set_000C40DL_005AD0;
 
-#define dspot01_room_0Set_000C40DL_008EC8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_008EC8"
+#define dspot01_room_0Set_000C40DL_008EC8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_008EC8"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_008EC8[] = dspot01_room_0Set_000C40DL_008EC8;
 
-#define dspot01_room_0Set_000C40DL_009A70 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_009A70"
+#define dspot01_room_0Set_000C40DL_009A70 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_009A70"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_009A70[] = dspot01_room_0Set_000C40DL_009A70;
 
-#define dspot01_room_0Set_000C40DL_005680 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_005680"
+#define dspot01_room_0Set_000C40DL_005680 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_005680"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_005680[] = dspot01_room_0Set_000C40DL_005680;
 
-#define dspot01_room_0Set_000C40DL_0063A0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000C40DL_0063A0"
+#define dspot01_room_0Set_000C40DL_0063A0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000C40DL_0063A0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000C40DL_0063A0[] = dspot01_room_0Set_000C40DL_0063A0;
 
-#define dspot01_room_0Set_000570DL_005E48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_005E48"
+#define dspot01_room_0Set_000570DL_005E48 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_005E48"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_005E48[] = dspot01_room_0Set_000570DL_005E48;
 
-#define dspot01_room_0Set_000570DL_0024E8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_0024E8"
+#define dspot01_room_0Set_000570DL_0024E8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_0024E8"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_0024E8[] = dspot01_room_0Set_000570DL_0024E8;
 
-#define dspot01_room_0Set_000570DL_001F20 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_001F20"
+#define dspot01_room_0Set_000570DL_001F20 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_001F20"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_001F20[] = dspot01_room_0Set_000570DL_001F20;
 
-#define dspot01_room_0Set_000570DL_006758 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_006758"
+#define dspot01_room_0Set_000570DL_006758 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_006758"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_006758[] = dspot01_room_0Set_000570DL_006758;
 
-#define dspot01_room_0Set_000570DL_006B18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_006B18"
+#define dspot01_room_0Set_000570DL_006B18 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_006B18"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_006B18[] = dspot01_room_0Set_000570DL_006B18;
 
-#define dspot01_room_0Set_000570DL_006EC0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_006EC0"
+#define dspot01_room_0Set_000570DL_006EC0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_006EC0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_006EC0[] = dspot01_room_0Set_000570DL_006EC0;
 
-#define dspot01_room_0Set_000570DL_007418 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_007418"
+#define dspot01_room_0Set_000570DL_007418 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_007418"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_007418[] = dspot01_room_0Set_000570DL_007418;
 
-#define dspot01_room_0Set_000570DL_007888 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_007888"
+#define dspot01_room_0Set_000570DL_007888 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_007888"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_007888[] = dspot01_room_0Set_000570DL_007888;
 
-#define dspot01_room_0Set_000570DL_007C18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_007C18"
+#define dspot01_room_0Set_000570DL_007C18 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_007C18"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_007C18[] = dspot01_room_0Set_000570DL_007C18;
 
-#define dspot01_room_0Set_000570DL_0086F0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_0086F0"
+#define dspot01_room_0Set_000570DL_0086F0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_0086F0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_0086F0[] = dspot01_room_0Set_000570DL_0086F0;
 
-#define dspot01_room_0Set_000570DL_003B48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_003B48"
+#define dspot01_room_0Set_000570DL_003B48 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_003B48"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_003B48[] = dspot01_room_0Set_000570DL_003B48;
 
-#define dspot01_room_0Set_000570DL_009108 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_009108"
+#define dspot01_room_0Set_000570DL_009108 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_009108"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_009108[] = dspot01_room_0Set_000570DL_009108;
 
-#define dspot01_room_0Set_000570DL_004DB0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_004DB0"
+#define dspot01_room_0Set_000570DL_004DB0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_004DB0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_004DB0[] = dspot01_room_0Set_000570DL_004DB0;
 
-#define dspot01_room_0Set_000570DL_004420 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_004420"
+#define dspot01_room_0Set_000570DL_004420 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_004420"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_004420[] = dspot01_room_0Set_000570DL_004420;
 
-#define dspot01_room_0Set_000570DL_0048C8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_0048C8"
+#define dspot01_room_0Set_000570DL_0048C8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_0048C8"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_0048C8[] = dspot01_room_0Set_000570DL_0048C8;
 
-#define dspot01_room_0Set_000570DL_005AD0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_005AD0"
+#define dspot01_room_0Set_000570DL_005AD0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_005AD0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_005AD0[] = dspot01_room_0Set_000570DL_005AD0;
 
-#define dspot01_room_0Set_000570DL_008EC8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_008EC8"
+#define dspot01_room_0Set_000570DL_008EC8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_008EC8"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_008EC8[] = dspot01_room_0Set_000570DL_008EC8;
 
-#define dspot01_room_0Set_000570DL_009A70 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_009A70"
+#define dspot01_room_0Set_000570DL_009A70 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_009A70"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_009A70[] = dspot01_room_0Set_000570DL_009A70;
 
-#define dspot01_room_0Set_000570DL_005680 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_005680"
+#define dspot01_room_0Set_000570DL_005680 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_005680"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_005680[] = dspot01_room_0Set_000570DL_005680;
 
-#define dspot01_room_0Set_000570DL_0063A0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000570DL_0063A0"
+#define dspot01_room_0Set_000570DL_0063A0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000570DL_0063A0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000570DL_0063A0[] = dspot01_room_0Set_000570DL_0063A0;
 
-#define dspot01_room_0Set_000900DL_005E48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_005E48"
+#define dspot01_room_0Set_000900DL_005E48 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_005E48"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_005E48[] = dspot01_room_0Set_000900DL_005E48;
 
-#define dspot01_room_0Set_000900DL_0024E8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_0024E8"
+#define dspot01_room_0Set_000900DL_0024E8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_0024E8"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_0024E8[] = dspot01_room_0Set_000900DL_0024E8;
 
-#define dspot01_room_0Set_000900DL_001F20 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_001F20"
+#define dspot01_room_0Set_000900DL_001F20 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_001F20"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_001F20[] = dspot01_room_0Set_000900DL_001F20;
 
-#define dspot01_room_0Set_000900DL_006758 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_006758"
+#define dspot01_room_0Set_000900DL_006758 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_006758"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_006758[] = dspot01_room_0Set_000900DL_006758;
 
-#define dspot01_room_0Set_000900DL_006B18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_006B18"
+#define dspot01_room_0Set_000900DL_006B18 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_006B18"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_006B18[] = dspot01_room_0Set_000900DL_006B18;
 
-#define dspot01_room_0Set_000900DL_006EC0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_006EC0"
+#define dspot01_room_0Set_000900DL_006EC0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_006EC0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_006EC0[] = dspot01_room_0Set_000900DL_006EC0;
 
-#define dspot01_room_0Set_000900DL_007418 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_007418"
+#define dspot01_room_0Set_000900DL_007418 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_007418"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_007418[] = dspot01_room_0Set_000900DL_007418;
 
-#define dspot01_room_0Set_000900DL_007888 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_007888"
+#define dspot01_room_0Set_000900DL_007888 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_007888"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_007888[] = dspot01_room_0Set_000900DL_007888;
 
-#define dspot01_room_0Set_000900DL_007C18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_007C18"
+#define dspot01_room_0Set_000900DL_007C18 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_007C18"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_007C18[] = dspot01_room_0Set_000900DL_007C18;
 
-#define dspot01_room_0Set_000900DL_0086F0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_0086F0"
+#define dspot01_room_0Set_000900DL_0086F0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_0086F0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_0086F0[] = dspot01_room_0Set_000900DL_0086F0;
 
-#define dspot01_room_0Set_000900DL_003B48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_003B48"
+#define dspot01_room_0Set_000900DL_003B48 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_003B48"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_003B48[] = dspot01_room_0Set_000900DL_003B48;
 
-#define dspot01_room_0Set_000900DL_009108 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_009108"
+#define dspot01_room_0Set_000900DL_009108 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_009108"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_009108[] = dspot01_room_0Set_000900DL_009108;
 
-#define dspot01_room_0Set_000900DL_004DB0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_004DB0"
+#define dspot01_room_0Set_000900DL_004DB0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_004DB0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_004DB0[] = dspot01_room_0Set_000900DL_004DB0;
 
-#define dspot01_room_0Set_000900DL_004420 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_004420"
+#define dspot01_room_0Set_000900DL_004420 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_004420"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_004420[] = dspot01_room_0Set_000900DL_004420;
 
-#define dspot01_room_0Set_000900DL_0048C8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_0048C8"
+#define dspot01_room_0Set_000900DL_0048C8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_0048C8"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_0048C8[] = dspot01_room_0Set_000900DL_0048C8;
 
-#define dspot01_room_0Set_000900DL_005AD0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_005AD0"
+#define dspot01_room_0Set_000900DL_005AD0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_005AD0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_005AD0[] = dspot01_room_0Set_000900DL_005AD0;
 
-#define dspot01_room_0Set_000900DL_008EC8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_008EC8"
+#define dspot01_room_0Set_000900DL_008EC8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_008EC8"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_008EC8[] = dspot01_room_0Set_000900DL_008EC8;
 
-#define dspot01_room_0Set_000900DL_009A70 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_009A70"
+#define dspot01_room_0Set_000900DL_009A70 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_009A70"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_009A70[] = dspot01_room_0Set_000900DL_009A70;
 
-#define dspot01_room_0Set_000900DL_005680 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_005680"
+#define dspot01_room_0Set_000900DL_005680 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_005680"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_005680[] = dspot01_room_0Set_000900DL_005680;
 
-#define dspot01_room_0Set_000900DL_0063A0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000900DL_0063A0"
+#define dspot01_room_0Set_000900DL_0063A0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000900DL_0063A0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000900DL_0063A0[] = dspot01_room_0Set_000900DL_0063A0;
 
-#define dspot01_room_0Set_000FC0DL_005E48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_005E48"
+#define dspot01_room_0Set_000FC0DL_005E48 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_005E48"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_005E48[] = dspot01_room_0Set_000FC0DL_005E48;
 
-#define dspot01_room_0Set_000FC0DL_0024E8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_0024E8"
+#define dspot01_room_0Set_000FC0DL_0024E8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_0024E8"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_0024E8[] = dspot01_room_0Set_000FC0DL_0024E8;
 
-#define dspot01_room_0Set_000FC0DL_001F20 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_001F20"
+#define dspot01_room_0Set_000FC0DL_001F20 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_001F20"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_001F20[] = dspot01_room_0Set_000FC0DL_001F20;
 
-#define dspot01_room_0Set_000FC0DL_006758 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_006758"
+#define dspot01_room_0Set_000FC0DL_006758 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_006758"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_006758[] = dspot01_room_0Set_000FC0DL_006758;
 
-#define dspot01_room_0Set_000FC0DL_006B18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_006B18"
+#define dspot01_room_0Set_000FC0DL_006B18 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_006B18"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_006B18[] = dspot01_room_0Set_000FC0DL_006B18;
 
-#define dspot01_room_0Set_000FC0DL_006EC0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_006EC0"
+#define dspot01_room_0Set_000FC0DL_006EC0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_006EC0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_006EC0[] = dspot01_room_0Set_000FC0DL_006EC0;
 
-#define dspot01_room_0Set_000FC0DL_007418 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_007418"
+#define dspot01_room_0Set_000FC0DL_007418 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_007418"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_007418[] = dspot01_room_0Set_000FC0DL_007418;
 
-#define dspot01_room_0Set_000FC0DL_007888 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_007888"
+#define dspot01_room_0Set_000FC0DL_007888 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_007888"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_007888[] = dspot01_room_0Set_000FC0DL_007888;
 
-#define dspot01_room_0Set_000FC0DL_007C18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_007C18"
+#define dspot01_room_0Set_000FC0DL_007C18 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_007C18"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_007C18[] = dspot01_room_0Set_000FC0DL_007C18;
 
-#define dspot01_room_0Set_000FC0DL_0086F0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_0086F0"
+#define dspot01_room_0Set_000FC0DL_0086F0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_0086F0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_0086F0[] = dspot01_room_0Set_000FC0DL_0086F0;
 
-#define dspot01_room_0Set_000FC0DL_003B48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_003B48"
+#define dspot01_room_0Set_000FC0DL_003B48 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_003B48"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_003B48[] = dspot01_room_0Set_000FC0DL_003B48;
 
-#define dspot01_room_0Set_000FC0DL_009108 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_009108"
+#define dspot01_room_0Set_000FC0DL_009108 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_009108"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_009108[] = dspot01_room_0Set_000FC0DL_009108;
 
-#define dspot01_room_0Set_000FC0DL_004DB0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_004DB0"
+#define dspot01_room_0Set_000FC0DL_004DB0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_004DB0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_004DB0[] = dspot01_room_0Set_000FC0DL_004DB0;
 
-#define dspot01_room_0Set_000FC0DL_004420 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_004420"
+#define dspot01_room_0Set_000FC0DL_004420 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_004420"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_004420[] = dspot01_room_0Set_000FC0DL_004420;
 
-#define dspot01_room_0Set_000FC0DL_0048C8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_0048C8"
+#define dspot01_room_0Set_000FC0DL_0048C8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_0048C8"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_0048C8[] = dspot01_room_0Set_000FC0DL_0048C8;
 
-#define dspot01_room_0Set_000FC0DL_005AD0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_005AD0"
+#define dspot01_room_0Set_000FC0DL_005AD0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_005AD0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_005AD0[] = dspot01_room_0Set_000FC0DL_005AD0;
 
-#define dspot01_room_0Set_000FC0DL_008EC8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_008EC8"
+#define dspot01_room_0Set_000FC0DL_008EC8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_008EC8"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_008EC8[] = dspot01_room_0Set_000FC0DL_008EC8;
 
-#define dspot01_room_0Set_000FC0DL_009A70 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_009A70"
+#define dspot01_room_0Set_000FC0DL_009A70 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_009A70"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_009A70[] = dspot01_room_0Set_000FC0DL_009A70;
 
-#define dspot01_room_0Set_000FC0DL_005680 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_005680"
+#define dspot01_room_0Set_000FC0DL_005680 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_005680"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_005680[] = dspot01_room_0Set_000FC0DL_005680;
 
-#define dspot01_room_0Set_000FC0DL_0063A0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_000FC0DL_0063A0"
+#define dspot01_room_0Set_000FC0DL_0063A0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_000FC0DL_0063A0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_000FC0DL_0063A0[] = dspot01_room_0Set_000FC0DL_0063A0;
 
-#define dspot01_room_0Set_0011F0DL_005E48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_005E48"
+#define dspot01_room_0Set_0011F0DL_005E48 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_005E48"
 static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_005E48[] = dspot01_room_0Set_0011F0DL_005E48;
 
-#define dspot01_room_0Set_0011F0DL_0024E8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_0024E8"
+#define dspot01_room_0Set_0011F0DL_0024E8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_0024E8"
 static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_0024E8[] = dspot01_room_0Set_0011F0DL_0024E8;
 
-#define dspot01_room_0Set_0011F0DL_001F20 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_001F20"
+#define dspot01_room_0Set_0011F0DL_001F20 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_001F20"
 static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_001F20[] = dspot01_room_0Set_0011F0DL_001F20;
 
-#define dspot01_room_0Set_0011F0DL_006758 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_006758"
+#define dspot01_room_0Set_0011F0DL_006758 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_006758"
 static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_006758[] = dspot01_room_0Set_0011F0DL_006758;
 
-#define dspot01_room_0Set_0011F0DL_006B18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_006B18"
+#define dspot01_room_0Set_0011F0DL_006B18 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_006B18"
 static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_006B18[] = dspot01_room_0Set_0011F0DL_006B18;
 
-#define dspot01_room_0Set_0011F0DL_006EC0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_006EC0"
+#define dspot01_room_0Set_0011F0DL_006EC0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_006EC0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_006EC0[] = dspot01_room_0Set_0011F0DL_006EC0;
 
-#define dspot01_room_0Set_0011F0DL_007418 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_007418"
+#define dspot01_room_0Set_0011F0DL_007418 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_007418"
 static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_007418[] = dspot01_room_0Set_0011F0DL_007418;
 
-#define dspot01_room_0Set_0011F0DL_007888 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_007888"
+#define dspot01_room_0Set_0011F0DL_007888 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_007888"
 static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_007888[] = dspot01_room_0Set_0011F0DL_007888;
 
-#define dspot01_room_0Set_0011F0DL_007C18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_007C18"
+#define dspot01_room_0Set_0011F0DL_007C18 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_007C18"
 static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_007C18[] = dspot01_room_0Set_0011F0DL_007C18;
 
-#define dspot01_room_0Set_0011F0DL_0086F0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_0086F0"
+#define dspot01_room_0Set_0011F0DL_0086F0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_0086F0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_0086F0[] = dspot01_room_0Set_0011F0DL_0086F0;
 
-#define dspot01_room_0Set_0011F0DL_003B48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_003B48"
+#define dspot01_room_0Set_0011F0DL_003B48 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_003B48"
 static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_003B48[] = dspot01_room_0Set_0011F0DL_003B48;
 
-#define dspot01_room_0Set_0011F0DL_009108 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_009108"
+#define dspot01_room_0Set_0011F0DL_009108 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_009108"
 static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_009108[] = dspot01_room_0Set_0011F0DL_009108;
 
-#define dspot01_room_0Set_0011F0DL_004DB0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_004DB0"
+#define dspot01_room_0Set_0011F0DL_004DB0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_004DB0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_004DB0[] = dspot01_room_0Set_0011F0DL_004DB0;
 
-#define dspot01_room_0Set_0011F0DL_004420 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_004420"
+#define dspot01_room_0Set_0011F0DL_004420 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_004420"
 static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_004420[] = dspot01_room_0Set_0011F0DL_004420;
 
-#define dspot01_room_0Set_0011F0DL_0048C8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_0048C8"
+#define dspot01_room_0Set_0011F0DL_0048C8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_0048C8"
 static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_0048C8[] = dspot01_room_0Set_0011F0DL_0048C8;
 
-#define dspot01_room_0Set_0011F0DL_005AD0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_005AD0"
+#define dspot01_room_0Set_0011F0DL_005AD0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_005AD0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_005AD0[] = dspot01_room_0Set_0011F0DL_005AD0;
 
-#define dspot01_room_0Set_0011F0DL_008EC8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_008EC8"
+#define dspot01_room_0Set_0011F0DL_008EC8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_008EC8"
 static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_008EC8[] = dspot01_room_0Set_0011F0DL_008EC8;
 
-#define dspot01_room_0Set_0011F0DL_009A70 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_009A70"
+#define dspot01_room_0Set_0011F0DL_009A70 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_009A70"
 static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_009A70[] = dspot01_room_0Set_0011F0DL_009A70;
 
-#define dspot01_room_0Set_0011F0DL_005680 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_005680"
+#define dspot01_room_0Set_0011F0DL_005680 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_005680"
 static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_005680[] = dspot01_room_0Set_0011F0DL_005680;
 
-#define dspot01_room_0Set_0011F0DL_0063A0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_0011F0DL_0063A0"
+#define dspot01_room_0Set_0011F0DL_0063A0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_0011F0DL_0063A0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_0011F0DL_0063A0[] = dspot01_room_0Set_0011F0DL_0063A0;
 
-#define dspot01_room_0Set_001390DL_005E48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_005E48"
+#define dspot01_room_0Set_001390DL_005E48 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_005E48"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_005E48[] = dspot01_room_0Set_001390DL_005E48;
 
-#define dspot01_room_0Set_001390DL_0024E8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_0024E8"
+#define dspot01_room_0Set_001390DL_0024E8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_0024E8"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_0024E8[] = dspot01_room_0Set_001390DL_0024E8;
 
-#define dspot01_room_0Set_001390DL_001F20 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_001F20"
+#define dspot01_room_0Set_001390DL_001F20 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_001F20"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_001F20[] = dspot01_room_0Set_001390DL_001F20;
 
-#define dspot01_room_0Set_001390DL_006758 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_006758"
+#define dspot01_room_0Set_001390DL_006758 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_006758"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_006758[] = dspot01_room_0Set_001390DL_006758;
 
-#define dspot01_room_0Set_001390DL_006B18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_006B18"
+#define dspot01_room_0Set_001390DL_006B18 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_006B18"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_006B18[] = dspot01_room_0Set_001390DL_006B18;
 
-#define dspot01_room_0Set_001390DL_006EC0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_006EC0"
+#define dspot01_room_0Set_001390DL_006EC0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_006EC0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_006EC0[] = dspot01_room_0Set_001390DL_006EC0;
 
-#define dspot01_room_0Set_001390DL_007418 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_007418"
+#define dspot01_room_0Set_001390DL_007418 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_007418"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_007418[] = dspot01_room_0Set_001390DL_007418;
 
-#define dspot01_room_0Set_001390DL_007888 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_007888"
+#define dspot01_room_0Set_001390DL_007888 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_007888"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_007888[] = dspot01_room_0Set_001390DL_007888;
 
-#define dspot01_room_0Set_001390DL_007C18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_007C18"
+#define dspot01_room_0Set_001390DL_007C18 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_007C18"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_007C18[] = dspot01_room_0Set_001390DL_007C18;
 
-#define dspot01_room_0Set_001390DL_0086F0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_0086F0"
+#define dspot01_room_0Set_001390DL_0086F0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_0086F0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_0086F0[] = dspot01_room_0Set_001390DL_0086F0;
 
-#define dspot01_room_0Set_001390DL_003B48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_003B48"
+#define dspot01_room_0Set_001390DL_003B48 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_003B48"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_003B48[] = dspot01_room_0Set_001390DL_003B48;
 
-#define dspot01_room_0Set_001390DL_009108 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_009108"
+#define dspot01_room_0Set_001390DL_009108 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_009108"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_009108[] = dspot01_room_0Set_001390DL_009108;
 
-#define dspot01_room_0Set_001390DL_004DB0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_004DB0"
+#define dspot01_room_0Set_001390DL_004DB0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_004DB0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_004DB0[] = dspot01_room_0Set_001390DL_004DB0;
 
-#define dspot01_room_0Set_001390DL_004420 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_004420"
+#define dspot01_room_0Set_001390DL_004420 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_004420"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_004420[] = dspot01_room_0Set_001390DL_004420;
 
-#define dspot01_room_0Set_001390DL_0048C8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_0048C8"
+#define dspot01_room_0Set_001390DL_0048C8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_0048C8"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_0048C8[] = dspot01_room_0Set_001390DL_0048C8;
 
-#define dspot01_room_0Set_001390DL_005AD0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_005AD0"
+#define dspot01_room_0Set_001390DL_005AD0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_005AD0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_005AD0[] = dspot01_room_0Set_001390DL_005AD0;
 
-#define dspot01_room_0Set_001390DL_008EC8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_008EC8"
+#define dspot01_room_0Set_001390DL_008EC8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_008EC8"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_008EC8[] = dspot01_room_0Set_001390DL_008EC8;
 
-#define dspot01_room_0Set_001390DL_009A70 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_009A70"
+#define dspot01_room_0Set_001390DL_009A70 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_009A70"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_009A70[] = dspot01_room_0Set_001390DL_009A70;
 
-#define dspot01_room_0Set_001390DL_005680 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_005680"
+#define dspot01_room_0Set_001390DL_005680 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_005680"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_005680[] = dspot01_room_0Set_001390DL_005680;
 
-#define dspot01_room_0Set_001390DL_0063A0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001390DL_0063A0"
+#define dspot01_room_0Set_001390DL_0063A0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001390DL_0063A0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001390DL_0063A0[] = dspot01_room_0Set_001390DL_0063A0;
 
-#define dspot01_room_0Set_001480DL_005E48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_005E48"
+#define dspot01_room_0Set_001480DL_005E48 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_005E48"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_005E48[] = dspot01_room_0Set_001480DL_005E48;
 
-#define dspot01_room_0Set_001480DL_0024E8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_0024E8"
+#define dspot01_room_0Set_001480DL_0024E8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_0024E8"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_0024E8[] = dspot01_room_0Set_001480DL_0024E8;
 
-#define dspot01_room_0Set_001480DL_001F20 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_001F20"
+#define dspot01_room_0Set_001480DL_001F20 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_001F20"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_001F20[] = dspot01_room_0Set_001480DL_001F20;
 
-#define dspot01_room_0Set_001480DL_006758 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_006758"
+#define dspot01_room_0Set_001480DL_006758 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_006758"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_006758[] = dspot01_room_0Set_001480DL_006758;
 
-#define dspot01_room_0Set_001480DL_006B18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_006B18"
+#define dspot01_room_0Set_001480DL_006B18 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_006B18"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_006B18[] = dspot01_room_0Set_001480DL_006B18;
 
-#define dspot01_room_0Set_001480DL_006EC0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_006EC0"
+#define dspot01_room_0Set_001480DL_006EC0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_006EC0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_006EC0[] = dspot01_room_0Set_001480DL_006EC0;
 
-#define dspot01_room_0Set_001480DL_007418 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_007418"
+#define dspot01_room_0Set_001480DL_007418 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_007418"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_007418[] = dspot01_room_0Set_001480DL_007418;
 
-#define dspot01_room_0Set_001480DL_007888 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_007888"
+#define dspot01_room_0Set_001480DL_007888 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_007888"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_007888[] = dspot01_room_0Set_001480DL_007888;
 
-#define dspot01_room_0Set_001480DL_007C18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_007C18"
+#define dspot01_room_0Set_001480DL_007C18 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_007C18"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_007C18[] = dspot01_room_0Set_001480DL_007C18;
 
-#define dspot01_room_0Set_001480DL_0086F0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_0086F0"
+#define dspot01_room_0Set_001480DL_0086F0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_0086F0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_0086F0[] = dspot01_room_0Set_001480DL_0086F0;
 
-#define dspot01_room_0Set_001480DL_003B48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_003B48"
+#define dspot01_room_0Set_001480DL_003B48 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_003B48"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_003B48[] = dspot01_room_0Set_001480DL_003B48;
 
-#define dspot01_room_0Set_001480DL_009108 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_009108"
+#define dspot01_room_0Set_001480DL_009108 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_009108"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_009108[] = dspot01_room_0Set_001480DL_009108;
 
-#define dspot01_room_0Set_001480DL_004DB0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_004DB0"
+#define dspot01_room_0Set_001480DL_004DB0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_004DB0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_004DB0[] = dspot01_room_0Set_001480DL_004DB0;
 
-#define dspot01_room_0Set_001480DL_004420 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_004420"
+#define dspot01_room_0Set_001480DL_004420 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_004420"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_004420[] = dspot01_room_0Set_001480DL_004420;
 
-#define dspot01_room_0Set_001480DL_0048C8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_0048C8"
+#define dspot01_room_0Set_001480DL_0048C8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_0048C8"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_0048C8[] = dspot01_room_0Set_001480DL_0048C8;
 
-#define dspot01_room_0Set_001480DL_005AD0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_005AD0"
+#define dspot01_room_0Set_001480DL_005AD0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_005AD0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_005AD0[] = dspot01_room_0Set_001480DL_005AD0;
 
-#define dspot01_room_0Set_001480DL_008EC8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_008EC8"
+#define dspot01_room_0Set_001480DL_008EC8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_008EC8"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_008EC8[] = dspot01_room_0Set_001480DL_008EC8;
 
-#define dspot01_room_0Set_001480DL_009A70 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_009A70"
+#define dspot01_room_0Set_001480DL_009A70 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_009A70"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_009A70[] = dspot01_room_0Set_001480DL_009A70;
 
-#define dspot01_room_0Set_001480DL_005680 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_005680"
+#define dspot01_room_0Set_001480DL_005680 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_005680"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_005680[] = dspot01_room_0Set_001480DL_005680;
 
-#define dspot01_room_0Set_001480DL_0063A0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001480DL_0063A0"
+#define dspot01_room_0Set_001480DL_0063A0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001480DL_0063A0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001480DL_0063A0[] = dspot01_room_0Set_001480DL_0063A0;
 
-#define dspot01_room_0Set_001630DL_005E48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_005E48"
+#define dspot01_room_0Set_001630DL_005E48 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_005E48"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_005E48[] = dspot01_room_0Set_001630DL_005E48;
 
-#define dspot01_room_0Set_001630DL_0024E8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_0024E8"
+#define dspot01_room_0Set_001630DL_0024E8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_0024E8"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_0024E8[] = dspot01_room_0Set_001630DL_0024E8;
 
-#define dspot01_room_0Set_001630DL_001F20 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_001F20"
+#define dspot01_room_0Set_001630DL_001F20 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_001F20"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_001F20[] = dspot01_room_0Set_001630DL_001F20;
 
-#define dspot01_room_0Set_001630DL_006758 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_006758"
+#define dspot01_room_0Set_001630DL_006758 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_006758"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_006758[] = dspot01_room_0Set_001630DL_006758;
 
-#define dspot01_room_0Set_001630DL_006B18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_006B18"
+#define dspot01_room_0Set_001630DL_006B18 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_006B18"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_006B18[] = dspot01_room_0Set_001630DL_006B18;
 
-#define dspot01_room_0Set_001630DL_006EC0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_006EC0"
+#define dspot01_room_0Set_001630DL_006EC0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_006EC0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_006EC0[] = dspot01_room_0Set_001630DL_006EC0;
 
-#define dspot01_room_0Set_001630DL_007418 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_007418"
+#define dspot01_room_0Set_001630DL_007418 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_007418"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_007418[] = dspot01_room_0Set_001630DL_007418;
 
-#define dspot01_room_0Set_001630DL_007888 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_007888"
+#define dspot01_room_0Set_001630DL_007888 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_007888"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_007888[] = dspot01_room_0Set_001630DL_007888;
 
-#define dspot01_room_0Set_001630DL_007C18 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_007C18"
+#define dspot01_room_0Set_001630DL_007C18 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_007C18"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_007C18[] = dspot01_room_0Set_001630DL_007C18;
 
-#define dspot01_room_0Set_001630DL_0086F0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_0086F0"
+#define dspot01_room_0Set_001630DL_0086F0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_0086F0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_0086F0[] = dspot01_room_0Set_001630DL_0086F0;
 
-#define dspot01_room_0Set_001630DL_003B48 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_003B48"
+#define dspot01_room_0Set_001630DL_003B48 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_003B48"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_003B48[] = dspot01_room_0Set_001630DL_003B48;
 
-#define dspot01_room_0Set_001630DL_009108 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_009108"
+#define dspot01_room_0Set_001630DL_009108 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_009108"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_009108[] = dspot01_room_0Set_001630DL_009108;
 
-#define dspot01_room_0Set_001630DL_004DB0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_004DB0"
+#define dspot01_room_0Set_001630DL_004DB0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_004DB0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_004DB0[] = dspot01_room_0Set_001630DL_004DB0;
 
-#define dspot01_room_0Set_001630DL_004420 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_004420"
+#define dspot01_room_0Set_001630DL_004420 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_004420"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_004420[] = dspot01_room_0Set_001630DL_004420;
 
-#define dspot01_room_0Set_001630DL_0048C8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_0048C8"
+#define dspot01_room_0Set_001630DL_0048C8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_0048C8"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_0048C8[] = dspot01_room_0Set_001630DL_0048C8;
 
-#define dspot01_room_0Set_001630DL_005AD0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_005AD0"
+#define dspot01_room_0Set_001630DL_005AD0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_005AD0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_005AD0[] = dspot01_room_0Set_001630DL_005AD0;
 
-#define dspot01_room_0Set_001630DL_008EC8 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_008EC8"
+#define dspot01_room_0Set_001630DL_008EC8 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_008EC8"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_008EC8[] = dspot01_room_0Set_001630DL_008EC8;
 
-#define dspot01_room_0Set_001630DL_009A70 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_009A70"
+#define dspot01_room_0Set_001630DL_009A70 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_009A70"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_009A70[] = dspot01_room_0Set_001630DL_009A70;
 
-#define dspot01_room_0Set_001630DL_005680 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_005680"
+#define dspot01_room_0Set_001630DL_005680 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_005680"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_005680[] = dspot01_room_0Set_001630DL_005680;
 
-#define dspot01_room_0Set_001630DL_0063A0 "__OTR__scenes/nonmq/spot01_scene/spot01_room_0Set_001630DL_0063A0"
+#define dspot01_room_0Set_001630DL_0063A0 "__OTR__scenes/shared/spot01_scene/spot01_room_0Set_001630DL_0063A0"
 static const ALIGN_ASSET(2) char spot01_room_0Set_001630DL_0063A0[] = dspot01_room_0Set_001630DL_0063A0;
 
 
diff --git a/soh/assets/scenes/overworld/spot01/spot01_scene.h b/soh/assets/scenes/overworld/spot01/spot01_scene.h
index cb85b2f94..658387028 100644
--- a/soh/assets/scenes/overworld/spot01/spot01_scene.h
+++ b/soh/assets/scenes/overworld/spot01/spot01_scene.h
@@ -3,147 +3,147 @@
 
 #include "align_asset_macro.h"
 
-#define dgKakarikoVillageIntroCs "__OTR__scenes/nonmq/spot01_scene/gKakarikoVillageIntroCs"
-static const ALIGN_ASSET(2) char gKakarikoVillageIntroCs[] = dgKakarikoVillageIntroCs;
-
-#define dgKakarikoVillageDayWindowTex "__OTR__scenes/nonmq/spot01_scene/gKakarikoVillageDayWindowTex"
-static const ALIGN_ASSET(2) char gKakarikoVillageDayWindowTex[] = dgKakarikoVillageDayWindowTex;
-
-#define dgKakarikoVillageNightWindowTex "__OTR__scenes/nonmq/spot01_scene/gKakarikoVillageNightWindowTex"
-static const ALIGN_ASSET(2) char gKakarikoVillageNightWindowTex[] = dgKakarikoVillageNightWindowTex;
-
-#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/nonmq/spot01_scene/spot01_sceneCollisionHeader_004A1C"
-static const ALIGN_ASSET(2) char spot01_sceneCollisionHeader_004A1C[] = dspot01_sceneCollisionHeader_004A1C;
-
-#define dspot01_sceneTex_013B50 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_013B50"
-static const ALIGN_ASSET(2) char spot01_sceneTex_013B50[] = dspot01_sceneTex_013B50;
-
-#define dspot01_sceneTex_012B50 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_012B50"
-static const ALIGN_ASSET(2) char spot01_sceneTex_012B50[] = dspot01_sceneTex_012B50;
-
-#define dspot01_sceneTex_00AA50 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_00AA50"
+#define dspot01_sceneTex_00AA50 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_00AA50"
 static const ALIGN_ASSET(2) char spot01_sceneTex_00AA50[] = dspot01_sceneTex_00AA50;
 
-#define dspot01_sceneTex_018B50 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_018B50"
-static const ALIGN_ASSET(2) char spot01_sceneTex_018B50[] = dspot01_sceneTex_018B50;
-
-#define dspot01_sceneTex_019350 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_019350"
-static const ALIGN_ASSET(2) char spot01_sceneTex_019350[] = dspot01_sceneTex_019350;
-
-#define dspot01_sceneTex_01B750 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_01B750"
-static const ALIGN_ASSET(2) char spot01_sceneTex_01B750[] = dspot01_sceneTex_01B750;
-
-#define dspot01_sceneTex_017B50 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_017B50"
-static const ALIGN_ASSET(2) char spot01_sceneTex_017B50[] = dspot01_sceneTex_017B50;
-
-#define dspot01_sceneTLUT_00A870 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTLUT_00A870"
-static const ALIGN_ASSET(2) char spot01_sceneTLUT_00A870[] = dspot01_sceneTLUT_00A870;
-
-#define dspot01_sceneTex_00E550 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_00E550"
-static const ALIGN_ASSET(2) char spot01_sceneTex_00E550[] = dspot01_sceneTex_00E550;
-
-#define dspot01_sceneTex_00CD50 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_00CD50"
-static const ALIGN_ASSET(2) char spot01_sceneTex_00CD50[] = dspot01_sceneTex_00CD50;
-
-#define dspot01_sceneTex_012950 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_012950"
-static const ALIGN_ASSET(2) char spot01_sceneTex_012950[] = dspot01_sceneTex_012950;
-
-#define dspot01_sceneTex_01BF50 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_01BF50"
-static const ALIGN_ASSET(2) char spot01_sceneTex_01BF50[] = dspot01_sceneTex_01BF50;
-
-#define dspot01_sceneTex_00BF50 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_00BF50"
-static const ALIGN_ASSET(2) char spot01_sceneTex_00BF50[] = dspot01_sceneTex_00BF50;
-
-#define dspot01_sceneTex_00C950 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_00C950"
-static const ALIGN_ASSET(2) char spot01_sceneTex_00C950[] = dspot01_sceneTex_00C950;
-
-#define dspot01_sceneTex_014F50 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_014F50"
-static const ALIGN_ASSET(2) char spot01_sceneTex_014F50[] = dspot01_sceneTex_014F50;
-
-#define dspot01_sceneTex_014B50 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_014B50"
-static const ALIGN_ASSET(2) char spot01_sceneTex_014B50[] = dspot01_sceneTex_014B50;
-
-#define dspot01_sceneTex_00B750 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_00B750"
-static const ALIGN_ASSET(2) char spot01_sceneTex_00B750[] = dspot01_sceneTex_00B750;
-
-#define dspot01_sceneTex_019B50 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_019B50"
-static const ALIGN_ASSET(2) char spot01_sceneTex_019B50[] = dspot01_sceneTex_019B50;
-
-#define dspot01_sceneTex_00C750 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_00C750"
-static const ALIGN_ASSET(2) char spot01_sceneTex_00C750[] = dspot01_sceneTex_00C750;
-
-#define dspot01_sceneTex_014750 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_014750"
-static const ALIGN_ASSET(2) char spot01_sceneTex_014750[] = dspot01_sceneTex_014750;
-
-#define dspot01_sceneTex_014350 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_014350"
-static const ALIGN_ASSET(2) char spot01_sceneTex_014350[] = dspot01_sceneTex_014350;
-
-#define dspot01_sceneTex_015350 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_015350"
-static const ALIGN_ASSET(2) char spot01_sceneTex_015350[] = dspot01_sceneTex_015350;
-
-#define dspot01_sceneTex_01AF50 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_01AF50"
-static const ALIGN_ASSET(2) char spot01_sceneTex_01AF50[] = dspot01_sceneTex_01AF50;
-
-#define dspot01_sceneTex_00ED50 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_00ED50"
-static const ALIGN_ASSET(2) char spot01_sceneTex_00ED50[] = dspot01_sceneTex_00ED50;
-
-#define dspot01_sceneTLUT_00AA28 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTLUT_00AA28"
-static const ALIGN_ASSET(2) char spot01_sceneTLUT_00AA28[] = dspot01_sceneTLUT_00AA28;
-
-#define dspot01_sceneTex_00D550 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_00D550"
-static const ALIGN_ASSET(2) char spot01_sceneTex_00D550[] = dspot01_sceneTex_00D550;
-
-#define dspot01_sceneTex_00DD50 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_00DD50"
-static const ALIGN_ASSET(2) char spot01_sceneTex_00DD50[] = dspot01_sceneTex_00DD50;
-
-#define dspot01_sceneTex_011950 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_011950"
-static const ALIGN_ASSET(2) char spot01_sceneTex_011950[] = dspot01_sceneTex_011950;
-
-#define dspot01_sceneTex_01A750 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_01A750"
-static const ALIGN_ASSET(2) char spot01_sceneTex_01A750[] = dspot01_sceneTex_01A750;
-
-#define dspot01_sceneTex_019F50 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_019F50"
-static const ALIGN_ASSET(2) char spot01_sceneTex_019F50[] = dspot01_sceneTex_019F50;
-
-#define dspot01_sceneTex_018350 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_018350"
-static const ALIGN_ASSET(2) char spot01_sceneTex_018350[] = dspot01_sceneTex_018350;
-
-#define dspot01_sceneTex_00BB50 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_00BB50"
-static const ALIGN_ASSET(2) char spot01_sceneTex_00BB50[] = dspot01_sceneTex_00BB50;
-
-#define dspot01_sceneTex_010950 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_010950"
-static const ALIGN_ASSET(2) char spot01_sceneTex_010950[] = dspot01_sceneTex_010950;
-
-#define dspot01_sceneTex_010150 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_010150"
-static const ALIGN_ASSET(2) char spot01_sceneTex_010150[] = dspot01_sceneTex_010150;
-
-#define dspot01_sceneTex_00F950 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_00F950"
-static const ALIGN_ASSET(2) char spot01_sceneTex_00F950[] = dspot01_sceneTex_00F950;
-
-#define dspot01_sceneTex_00F550 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_00F550"
-static const ALIGN_ASSET(2) char spot01_sceneTex_00F550[] = dspot01_sceneTex_00F550;
-
-#define dspot01_sceneTex_00B350 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_00B350"
-static const ALIGN_ASSET(2) char spot01_sceneTex_00B350[] = dspot01_sceneTex_00B350;
-
-#define dspot01_sceneTex_00B250 "__OTR__scenes/nonmq/spot01_scene/spot01_sceneTex_00B250"
+#define dspot01_sceneTex_00B250 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_00B250"
 static const ALIGN_ASSET(2) char spot01_sceneTex_00B250[] = dspot01_sceneTex_00B250;
 
-#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/nonmq/spot01_scene/spot01_sceneCollisionHeader_004A1C"
+#define dspot01_sceneTex_00B350 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_00B350"
+static const ALIGN_ASSET(2) char spot01_sceneTex_00B350[] = dspot01_sceneTex_00B350;
 
-#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/nonmq/spot01_scene/spot01_sceneCollisionHeader_004A1C"
+#define dspot01_sceneTex_00B750 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_00B750"
+static const ALIGN_ASSET(2) char spot01_sceneTex_00B750[] = dspot01_sceneTex_00B750;
 
-#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/nonmq/spot01_scene/spot01_sceneCollisionHeader_004A1C"
+#define dspot01_sceneTex_00BB50 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_00BB50"
+static const ALIGN_ASSET(2) char spot01_sceneTex_00BB50[] = dspot01_sceneTex_00BB50;
 
-#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/nonmq/spot01_scene/spot01_sceneCollisionHeader_004A1C"
+#define dspot01_sceneTex_00BF50 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_00BF50"
+static const ALIGN_ASSET(2) char spot01_sceneTex_00BF50[] = dspot01_sceneTex_00BF50;
 
-#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/nonmq/spot01_scene/spot01_sceneCollisionHeader_004A1C"
+#define dspot01_sceneTex_00C750 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_00C750"
+static const ALIGN_ASSET(2) char spot01_sceneTex_00C750[] = dspot01_sceneTex_00C750;
 
-#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/nonmq/spot01_scene/spot01_sceneCollisionHeader_004A1C"
+#define dspot01_sceneTex_00C950 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_00C950"
+static const ALIGN_ASSET(2) char spot01_sceneTex_00C950[] = dspot01_sceneTex_00C950;
 
-#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/nonmq/spot01_scene/spot01_sceneCollisionHeader_004A1C"
+#define dspot01_sceneTex_00CD50 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_00CD50"
+static const ALIGN_ASSET(2) char spot01_sceneTex_00CD50[] = dspot01_sceneTex_00CD50;
 
-#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/nonmq/spot01_scene/spot01_sceneCollisionHeader_004A1C"
+#define dspot01_sceneTex_00D550 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_00D550"
+static const ALIGN_ASSET(2) char spot01_sceneTex_00D550[] = dspot01_sceneTex_00D550;
+
+#define dspot01_sceneTex_00DD50 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_00DD50"
+static const ALIGN_ASSET(2) char spot01_sceneTex_00DD50[] = dspot01_sceneTex_00DD50;
+
+#define dspot01_sceneTex_00E550 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_00E550"
+static const ALIGN_ASSET(2) char spot01_sceneTex_00E550[] = dspot01_sceneTex_00E550;
+
+#define dspot01_sceneTex_00ED50 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_00ED50"
+static const ALIGN_ASSET(2) char spot01_sceneTex_00ED50[] = dspot01_sceneTex_00ED50;
+
+#define dspot01_sceneTex_00F550 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_00F550"
+static const ALIGN_ASSET(2) char spot01_sceneTex_00F550[] = dspot01_sceneTex_00F550;
+
+#define dspot01_sceneTex_00F950 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_00F950"
+static const ALIGN_ASSET(2) char spot01_sceneTex_00F950[] = dspot01_sceneTex_00F950;
+
+#define dspot01_sceneTex_010150 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_010150"
+static const ALIGN_ASSET(2) char spot01_sceneTex_010150[] = dspot01_sceneTex_010150;
+
+#define dspot01_sceneTex_010950 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_010950"
+static const ALIGN_ASSET(2) char spot01_sceneTex_010950[] = dspot01_sceneTex_010950;
+
+#define dspot01_sceneTex_011950 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_011950"
+static const ALIGN_ASSET(2) char spot01_sceneTex_011950[] = dspot01_sceneTex_011950;
+
+#define dspot01_sceneTex_012950 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_012950"
+static const ALIGN_ASSET(2) char spot01_sceneTex_012950[] = dspot01_sceneTex_012950;
+
+#define dspot01_sceneTex_012B50 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_012B50"
+static const ALIGN_ASSET(2) char spot01_sceneTex_012B50[] = dspot01_sceneTex_012B50;
+
+#define dspot01_sceneTex_013B50 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_013B50"
+static const ALIGN_ASSET(2) char spot01_sceneTex_013B50[] = dspot01_sceneTex_013B50;
+
+#define dspot01_sceneTex_014350 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_014350"
+static const ALIGN_ASSET(2) char spot01_sceneTex_014350[] = dspot01_sceneTex_014350;
+
+#define dspot01_sceneTex_014750 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_014750"
+static const ALIGN_ASSET(2) char spot01_sceneTex_014750[] = dspot01_sceneTex_014750;
+
+#define dspot01_sceneTex_014B50 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_014B50"
+static const ALIGN_ASSET(2) char spot01_sceneTex_014B50[] = dspot01_sceneTex_014B50;
+
+#define dspot01_sceneTex_014F50 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_014F50"
+static const ALIGN_ASSET(2) char spot01_sceneTex_014F50[] = dspot01_sceneTex_014F50;
+
+#define dspot01_sceneTex_015350 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_015350"
+static const ALIGN_ASSET(2) char spot01_sceneTex_015350[] = dspot01_sceneTex_015350;
+
+#define dspot01_sceneTex_017B50 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_017B50"
+static const ALIGN_ASSET(2) char spot01_sceneTex_017B50[] = dspot01_sceneTex_017B50;
+
+#define dspot01_sceneTex_018350 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_018350"
+static const ALIGN_ASSET(2) char spot01_sceneTex_018350[] = dspot01_sceneTex_018350;
+
+#define dspot01_sceneTex_018B50 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_018B50"
+static const ALIGN_ASSET(2) char spot01_sceneTex_018B50[] = dspot01_sceneTex_018B50;
+
+#define dspot01_sceneTex_019350 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_019350"
+static const ALIGN_ASSET(2) char spot01_sceneTex_019350[] = dspot01_sceneTex_019350;
+
+#define dspot01_sceneTex_019B50 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_019B50"
+static const ALIGN_ASSET(2) char spot01_sceneTex_019B50[] = dspot01_sceneTex_019B50;
+
+#define dspot01_sceneTex_019F50 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_019F50"
+static const ALIGN_ASSET(2) char spot01_sceneTex_019F50[] = dspot01_sceneTex_019F50;
+
+#define dspot01_sceneTex_01A750 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_01A750"
+static const ALIGN_ASSET(2) char spot01_sceneTex_01A750[] = dspot01_sceneTex_01A750;
+
+#define dspot01_sceneTex_01AF50 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_01AF50"
+static const ALIGN_ASSET(2) char spot01_sceneTex_01AF50[] = dspot01_sceneTex_01AF50;
+
+#define dspot01_sceneTex_01B750 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_01B750"
+static const ALIGN_ASSET(2) char spot01_sceneTex_01B750[] = dspot01_sceneTex_01B750;
+
+#define dspot01_sceneTex_01BF50 "__OTR__scenes/shared/spot01_scene/spot01_sceneTex_01BF50"
+static const ALIGN_ASSET(2) char spot01_sceneTex_01BF50[] = dspot01_sceneTex_01BF50;
+
+#define dspot01_sceneTLUT_00A870 "__OTR__scenes/shared/spot01_scene/spot01_sceneTLUT_00A870"
+static const ALIGN_ASSET(2) char spot01_sceneTLUT_00A870[] = dspot01_sceneTLUT_00A870;
+
+#define dspot01_sceneTLUT_00AA28 "__OTR__scenes/shared/spot01_scene/spot01_sceneTLUT_00AA28"
+static const ALIGN_ASSET(2) char spot01_sceneTLUT_00AA28[] = dspot01_sceneTLUT_00AA28;
+
+#define dgKakarikoVillageIntroCs "__OTR__scenes/shared/spot01_scene/gKakarikoVillageIntroCs"
+static const ALIGN_ASSET(2) char gKakarikoVillageIntroCs[] = dgKakarikoVillageIntroCs;
+
+#define dgKakarikoVillageDayWindowTex "__OTR__scenes/shared/spot01_scene/gKakarikoVillageDayWindowTex"
+static const ALIGN_ASSET(2) char gKakarikoVillageDayWindowTex[] = dgKakarikoVillageDayWindowTex;
+
+#define dgKakarikoVillageNightWindowTex "__OTR__scenes/shared/spot01_scene/gKakarikoVillageNightWindowTex"
+static const ALIGN_ASSET(2) char gKakarikoVillageNightWindowTex[] = dgKakarikoVillageNightWindowTex;
+
+#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/shared/spot01_scene/spot01_sceneCollisionHeader_004A1C"
+static const ALIGN_ASSET(2) char spot01_sceneCollisionHeader_004A1C[] = dspot01_sceneCollisionHeader_004A1C;
+
+#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/shared/spot01_scene/spot01_sceneCollisionHeader_004A1C"
+
+#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/shared/spot01_scene/spot01_sceneCollisionHeader_004A1C"
+
+#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/shared/spot01_scene/spot01_sceneCollisionHeader_004A1C"
+
+#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/shared/spot01_scene/spot01_sceneCollisionHeader_004A1C"
+
+#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/shared/spot01_scene/spot01_sceneCollisionHeader_004A1C"
+
+#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/shared/spot01_scene/spot01_sceneCollisionHeader_004A1C"
+
+#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/shared/spot01_scene/spot01_sceneCollisionHeader_004A1C"
+
+#define dspot01_sceneCollisionHeader_004A1C "__OTR__scenes/shared/spot01_scene/spot01_sceneCollisionHeader_004A1C"
 
 
 #endif // OVERWORLD_SPOT01_SCENE_H
diff --git a/soh/assets/scenes/overworld/spot02/spot02_room_0.h b/soh/assets/scenes/overworld/spot02/spot02_room_0.h
index 138c85057..9cfc90a0b 100644
--- a/soh/assets/scenes/overworld/spot02/spot02_room_0.h
+++ b/soh/assets/scenes/overworld/spot02/spot02_room_0.h
@@ -3,169 +3,169 @@
 
 #include "align_asset_macro.h"
 
-#define dgSpot02DL_0026D0 "__OTR__scenes/nonmq/spot02_scene/gSpot02DL_0026D0"
+#define dgSpot02DL_0026D0 "__OTR__scenes/shared/spot02_scene/gSpot02DL_0026D0"
 static const ALIGN_ASSET(2) char gSpot02DL_0026D0[] = dgSpot02DL_0026D0;
 
-#define dspot02_room_0DL_0025E0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0DL_0025E0"
+#define dspot02_room_0DL_0025E0 "__OTR__scenes/shared/spot02_scene/spot02_room_0DL_0025E0"
 static const ALIGN_ASSET(2) char spot02_room_0DL_0025E0[] = dspot02_room_0DL_0025E0;
 
-#define dspot02_room_0DL_001AB0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0DL_001AB0"
+#define dspot02_room_0DL_001AB0 "__OTR__scenes/shared/spot02_scene/spot02_room_0DL_001AB0"
 static const ALIGN_ASSET(2) char spot02_room_0DL_001AB0[] = dspot02_room_0DL_001AB0;
 
-#define dspot02_room_0DL_001D18 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0DL_001D18"
+#define dspot02_room_0DL_001D18 "__OTR__scenes/shared/spot02_scene/spot02_room_0DL_001D18"
 static const ALIGN_ASSET(2) char spot02_room_0DL_001D18[] = dspot02_room_0DL_001D18;
 
-#define dspot02_room_0DL_001480 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0DL_001480"
+#define dspot02_room_0DL_001480 "__OTR__scenes/shared/spot02_scene/spot02_room_0DL_001480"
 static const ALIGN_ASSET(2) char spot02_room_0DL_001480[] = dspot02_room_0DL_001480;
 
-#define dspot02_room_0DL_000D70 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0DL_000D70"
+#define dspot02_room_0DL_000D70 "__OTR__scenes/shared/spot02_scene/spot02_room_0DL_000D70"
 static const ALIGN_ASSET(2) char spot02_room_0DL_000D70[] = dspot02_room_0DL_000D70;
 
-#define dspot02_room_0DL_002230 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0DL_002230"
+#define dspot02_room_0DL_002230 "__OTR__scenes/shared/spot02_scene/spot02_room_0DL_002230"
 static const ALIGN_ASSET(2) char spot02_room_0DL_002230[] = dspot02_room_0DL_002230;
 
-#define dspot02_room_0DL_002030 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0DL_002030"
+#define dspot02_room_0DL_002030 "__OTR__scenes/shared/spot02_scene/spot02_room_0DL_002030"
 static const ALIGN_ASSET(2) char spot02_room_0DL_002030[] = dspot02_room_0DL_002030;
 
-#define dspot02_room_0DL_000AB0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0DL_000AB0"
+#define dspot02_room_0DL_000AB0 "__OTR__scenes/shared/spot02_scene/spot02_room_0DL_000AB0"
 static const ALIGN_ASSET(2) char spot02_room_0DL_000AB0[] = dspot02_room_0DL_000AB0;
 
-#define dspot02_room_0DL_001170 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0DL_001170"
+#define dspot02_room_0DL_001170 "__OTR__scenes/shared/spot02_scene/spot02_room_0DL_001170"
 static const ALIGN_ASSET(2) char spot02_room_0DL_001170[] = dspot02_room_0DL_001170;
 
-#define dspot02_room_0Set_000650DL_0025E0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000650DL_0025E0"
+#define dspot02_room_0Set_000650DL_0025E0 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000650DL_0025E0"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000650DL_0025E0[] = dspot02_room_0Set_000650DL_0025E0;
 
-#define dspot02_room_0Set_000650DL_001AB0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000650DL_001AB0"
+#define dspot02_room_0Set_000650DL_001AB0 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000650DL_001AB0"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000650DL_001AB0[] = dspot02_room_0Set_000650DL_001AB0;
 
-#define dspot02_room_0Set_000650DL_001D18 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000650DL_001D18"
+#define dspot02_room_0Set_000650DL_001D18 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000650DL_001D18"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000650DL_001D18[] = dspot02_room_0Set_000650DL_001D18;
 
-#define dspot02_room_0Set_000650DL_001480 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000650DL_001480"
+#define dspot02_room_0Set_000650DL_001480 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000650DL_001480"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000650DL_001480[] = dspot02_room_0Set_000650DL_001480;
 
-#define dspot02_room_0Set_000650DL_000D70 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000650DL_000D70"
+#define dspot02_room_0Set_000650DL_000D70 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000650DL_000D70"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000650DL_000D70[] = dspot02_room_0Set_000650DL_000D70;
 
-#define dspot02_room_0Set_000650DL_002230 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000650DL_002230"
+#define dspot02_room_0Set_000650DL_002230 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000650DL_002230"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000650DL_002230[] = dspot02_room_0Set_000650DL_002230;
 
-#define dspot02_room_0Set_000650DL_002030 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000650DL_002030"
+#define dspot02_room_0Set_000650DL_002030 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000650DL_002030"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000650DL_002030[] = dspot02_room_0Set_000650DL_002030;
 
-#define dspot02_room_0Set_000650DL_000AB0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000650DL_000AB0"
+#define dspot02_room_0Set_000650DL_000AB0 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000650DL_000AB0"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000650DL_000AB0[] = dspot02_room_0Set_000650DL_000AB0;
 
-#define dspot02_room_0Set_000650DL_001170 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000650DL_001170"
+#define dspot02_room_0Set_000650DL_001170 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000650DL_001170"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000650DL_001170[] = dspot02_room_0Set_000650DL_001170;
 
-#define dspot02_room_0Set_000290DL_0025E0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000290DL_0025E0"
+#define dspot02_room_0Set_000290DL_0025E0 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000290DL_0025E0"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000290DL_0025E0[] = dspot02_room_0Set_000290DL_0025E0;
 
-#define dspot02_room_0Set_000290DL_001AB0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000290DL_001AB0"
+#define dspot02_room_0Set_000290DL_001AB0 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000290DL_001AB0"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000290DL_001AB0[] = dspot02_room_0Set_000290DL_001AB0;
 
-#define dspot02_room_0Set_000290DL_001D18 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000290DL_001D18"
+#define dspot02_room_0Set_000290DL_001D18 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000290DL_001D18"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000290DL_001D18[] = dspot02_room_0Set_000290DL_001D18;
 
-#define dspot02_room_0Set_000290DL_001480 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000290DL_001480"
+#define dspot02_room_0Set_000290DL_001480 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000290DL_001480"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000290DL_001480[] = dspot02_room_0Set_000290DL_001480;
 
-#define dspot02_room_0Set_000290DL_000D70 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000290DL_000D70"
+#define dspot02_room_0Set_000290DL_000D70 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000290DL_000D70"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000290DL_000D70[] = dspot02_room_0Set_000290DL_000D70;
 
-#define dspot02_room_0Set_000290DL_002230 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000290DL_002230"
+#define dspot02_room_0Set_000290DL_002230 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000290DL_002230"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000290DL_002230[] = dspot02_room_0Set_000290DL_002230;
 
-#define dspot02_room_0Set_000290DL_002030 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000290DL_002030"
+#define dspot02_room_0Set_000290DL_002030 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000290DL_002030"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000290DL_002030[] = dspot02_room_0Set_000290DL_002030;
 
-#define dspot02_room_0Set_000290DL_000AB0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000290DL_000AB0"
+#define dspot02_room_0Set_000290DL_000AB0 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000290DL_000AB0"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000290DL_000AB0[] = dspot02_room_0Set_000290DL_000AB0;
 
-#define dspot02_room_0Set_000290DL_001170 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000290DL_001170"
+#define dspot02_room_0Set_000290DL_001170 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000290DL_001170"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000290DL_001170[] = dspot02_room_0Set_000290DL_001170;
 
-#define dspot02_room_0Set_000470DL_0025E0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000470DL_0025E0"
+#define dspot02_room_0Set_000470DL_0025E0 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000470DL_0025E0"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000470DL_0025E0[] = dspot02_room_0Set_000470DL_0025E0;
 
-#define dspot02_room_0Set_000470DL_001AB0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000470DL_001AB0"
+#define dspot02_room_0Set_000470DL_001AB0 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000470DL_001AB0"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000470DL_001AB0[] = dspot02_room_0Set_000470DL_001AB0;
 
-#define dspot02_room_0Set_000470DL_001D18 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000470DL_001D18"
+#define dspot02_room_0Set_000470DL_001D18 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000470DL_001D18"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000470DL_001D18[] = dspot02_room_0Set_000470DL_001D18;
 
-#define dspot02_room_0Set_000470DL_001480 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000470DL_001480"
+#define dspot02_room_0Set_000470DL_001480 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000470DL_001480"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000470DL_001480[] = dspot02_room_0Set_000470DL_001480;
 
-#define dspot02_room_0Set_000470DL_000D70 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000470DL_000D70"
+#define dspot02_room_0Set_000470DL_000D70 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000470DL_000D70"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000470DL_000D70[] = dspot02_room_0Set_000470DL_000D70;
 
-#define dspot02_room_0Set_000470DL_002230 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000470DL_002230"
+#define dspot02_room_0Set_000470DL_002230 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000470DL_002230"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000470DL_002230[] = dspot02_room_0Set_000470DL_002230;
 
-#define dspot02_room_0Set_000470DL_002030 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000470DL_002030"
+#define dspot02_room_0Set_000470DL_002030 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000470DL_002030"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000470DL_002030[] = dspot02_room_0Set_000470DL_002030;
 
-#define dspot02_room_0Set_000470DL_000AB0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000470DL_000AB0"
+#define dspot02_room_0Set_000470DL_000AB0 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000470DL_000AB0"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000470DL_000AB0[] = dspot02_room_0Set_000470DL_000AB0;
 
-#define dspot02_room_0Set_000470DL_001170 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000470DL_001170"
+#define dspot02_room_0Set_000470DL_001170 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000470DL_001170"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000470DL_001170[] = dspot02_room_0Set_000470DL_001170;
 
-#define dspot02_room_0Set_000830DL_0025E0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000830DL_0025E0"
+#define dspot02_room_0Set_000830DL_0025E0 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000830DL_0025E0"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000830DL_0025E0[] = dspot02_room_0Set_000830DL_0025E0;
 
-#define dspot02_room_0Set_000830DL_001AB0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000830DL_001AB0"
+#define dspot02_room_0Set_000830DL_001AB0 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000830DL_001AB0"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000830DL_001AB0[] = dspot02_room_0Set_000830DL_001AB0;
 
-#define dspot02_room_0Set_000830DL_001D18 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000830DL_001D18"
+#define dspot02_room_0Set_000830DL_001D18 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000830DL_001D18"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000830DL_001D18[] = dspot02_room_0Set_000830DL_001D18;
 
-#define dspot02_room_0Set_000830DL_001480 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000830DL_001480"
+#define dspot02_room_0Set_000830DL_001480 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000830DL_001480"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000830DL_001480[] = dspot02_room_0Set_000830DL_001480;
 
-#define dspot02_room_0Set_000830DL_000D70 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000830DL_000D70"
+#define dspot02_room_0Set_000830DL_000D70 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000830DL_000D70"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000830DL_000D70[] = dspot02_room_0Set_000830DL_000D70;
 
-#define dspot02_room_0Set_000830DL_002230 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000830DL_002230"
+#define dspot02_room_0Set_000830DL_002230 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000830DL_002230"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000830DL_002230[] = dspot02_room_0Set_000830DL_002230;
 
-#define dspot02_room_0Set_000830DL_002030 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000830DL_002030"
+#define dspot02_room_0Set_000830DL_002030 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000830DL_002030"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000830DL_002030[] = dspot02_room_0Set_000830DL_002030;
 
-#define dspot02_room_0Set_000830DL_000AB0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000830DL_000AB0"
+#define dspot02_room_0Set_000830DL_000AB0 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000830DL_000AB0"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000830DL_000AB0[] = dspot02_room_0Set_000830DL_000AB0;
 
-#define dspot02_room_0Set_000830DL_001170 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000830DL_001170"
+#define dspot02_room_0Set_000830DL_001170 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000830DL_001170"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000830DL_001170[] = dspot02_room_0Set_000830DL_001170;
 
-#define dspot02_room_0Set_000900DL_0025E0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000900DL_0025E0"
+#define dspot02_room_0Set_000900DL_0025E0 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000900DL_0025E0"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000900DL_0025E0[] = dspot02_room_0Set_000900DL_0025E0;
 
-#define dspot02_room_0Set_000900DL_001AB0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000900DL_001AB0"
+#define dspot02_room_0Set_000900DL_001AB0 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000900DL_001AB0"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000900DL_001AB0[] = dspot02_room_0Set_000900DL_001AB0;
 
-#define dspot02_room_0Set_000900DL_001D18 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000900DL_001D18"
+#define dspot02_room_0Set_000900DL_001D18 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000900DL_001D18"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000900DL_001D18[] = dspot02_room_0Set_000900DL_001D18;
 
-#define dspot02_room_0Set_000900DL_001480 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000900DL_001480"
+#define dspot02_room_0Set_000900DL_001480 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000900DL_001480"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000900DL_001480[] = dspot02_room_0Set_000900DL_001480;
 
-#define dspot02_room_0Set_000900DL_000D70 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000900DL_000D70"
+#define dspot02_room_0Set_000900DL_000D70 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000900DL_000D70"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000900DL_000D70[] = dspot02_room_0Set_000900DL_000D70;
 
-#define dspot02_room_0Set_000900DL_002230 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000900DL_002230"
+#define dspot02_room_0Set_000900DL_002230 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000900DL_002230"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000900DL_002230[] = dspot02_room_0Set_000900DL_002230;
 
-#define dspot02_room_0Set_000900DL_002030 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000900DL_002030"
+#define dspot02_room_0Set_000900DL_002030 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000900DL_002030"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000900DL_002030[] = dspot02_room_0Set_000900DL_002030;
 
-#define dspot02_room_0Set_000900DL_000AB0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000900DL_000AB0"
+#define dspot02_room_0Set_000900DL_000AB0 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000900DL_000AB0"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000900DL_000AB0[] = dspot02_room_0Set_000900DL_000AB0;
 
-#define dspot02_room_0Set_000900DL_001170 "__OTR__scenes/nonmq/spot02_scene/spot02_room_0Set_000900DL_001170"
+#define dspot02_room_0Set_000900DL_001170 "__OTR__scenes/shared/spot02_scene/spot02_room_0Set_000900DL_001170"
 static const ALIGN_ASSET(2) char spot02_room_0Set_000900DL_001170[] = dspot02_room_0Set_000900DL_001170;
 
 
diff --git a/soh/assets/scenes/overworld/spot02/spot02_room_1.h b/soh/assets/scenes/overworld/spot02/spot02_room_1.h
index 76f7763cf..4f5ac445d 100644
--- a/soh/assets/scenes/overworld/spot02/spot02_room_1.h
+++ b/soh/assets/scenes/overworld/spot02/spot02_room_1.h
@@ -3,526 +3,526 @@
 
 #include "align_asset_macro.h"
 
-#define dspot02_room_1DL_0071A8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_0071A8"
-static const ALIGN_ASSET(2) char spot02_room_1DL_0071A8[] = dspot02_room_1DL_0071A8;
-
-#define dspot02_room_1Tex_016D08 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_016D08"
-static const ALIGN_ASSET(2) char spot02_room_1Tex_016D08[] = dspot02_room_1Tex_016D08;
-
-#define dspot02_room_1DL_001F20 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_001F20"
-static const ALIGN_ASSET(2) char spot02_room_1DL_001F20[] = dspot02_room_1DL_001F20;
-
-#define dspot02_room_1Tex_014508 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_014508"
-static const ALIGN_ASSET(2) char spot02_room_1Tex_014508[] = dspot02_room_1Tex_014508;
-
-#define dspot02_room_1TLUT_008EE0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1TLUT_008EE0"
-static const ALIGN_ASSET(2) char spot02_room_1TLUT_008EE0[] = dspot02_room_1TLUT_008EE0;
-
-#define dspot02_room_1Tex_013508 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_013508"
-static const ALIGN_ASSET(2) char spot02_room_1Tex_013508[] = dspot02_room_1Tex_013508;
-
-#define dspot02_room_1Tex_014D08 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_014D08"
-static const ALIGN_ASSET(2) char spot02_room_1Tex_014D08[] = dspot02_room_1Tex_014D08;
-
-#define dspot02_room_1Tex_012D08 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_012D08"
-static const ALIGN_ASSET(2) char spot02_room_1Tex_012D08[] = dspot02_room_1Tex_012D08;
-
-#define dspot02_room_1Tex_012508 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_012508"
-static const ALIGN_ASSET(2) char spot02_room_1Tex_012508[] = dspot02_room_1Tex_012508;
-
-#define dspot02_room_1DL_005A68 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_005A68"
-static const ALIGN_ASSET(2) char spot02_room_1DL_005A68[] = dspot02_room_1DL_005A68;
-
-#define dspot02_room_1Tex_00CD08 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_00CD08"
-static const ALIGN_ASSET(2) char spot02_room_1Tex_00CD08[] = dspot02_room_1Tex_00CD08;
-
-#define dspot02_room_1DL_01A358 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_01A358"
-static const ALIGN_ASSET(2) char spot02_room_1DL_01A358[] = dspot02_room_1DL_01A358;
-
-#define dspot02_room_1Tex_01B690 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_01B690"
-static const ALIGN_ASSET(2) char spot02_room_1Tex_01B690[] = dspot02_room_1Tex_01B690;
-
-#define dspot02_room_1DL_003068 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_003068"
-static const ALIGN_ASSET(2) char spot02_room_1DL_003068[] = dspot02_room_1DL_003068;
-
-#define dspot02_room_1Tex_008F08 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_008F08"
+#define dspot02_room_1Tex_008F08 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_008F08"
 static const ALIGN_ASSET(2) char spot02_room_1Tex_008F08[] = dspot02_room_1Tex_008F08;
 
-#define dspot02_room_1Tex_010D08 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_010D08"
-static const ALIGN_ASSET(2) char spot02_room_1Tex_010D08[] = dspot02_room_1Tex_010D08;
-
-#define dspot02_room_1Tex_00E108 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_00E108"
-static const ALIGN_ASSET(2) char spot02_room_1Tex_00E108[] = dspot02_room_1Tex_00E108;
-
-#define dspot02_room_1Tex_010B08 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_010B08"
-static const ALIGN_ASSET(2) char spot02_room_1Tex_010B08[] = dspot02_room_1Tex_010B08;
-
-#define dspot02_room_1Tex_00F308 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_00F308"
-static const ALIGN_ASSET(2) char spot02_room_1Tex_00F308[] = dspot02_room_1Tex_00F308;
-
-#define dspot02_room_1Tex_00EB08 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_00EB08"
-static const ALIGN_ASSET(2) char spot02_room_1Tex_00EB08[] = dspot02_room_1Tex_00EB08;
-
-#define dspot02_room_1Tex_010308 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_010308"
-static const ALIGN_ASSET(2) char spot02_room_1Tex_010308[] = dspot02_room_1Tex_010308;
-
-#define dspot02_room_1Tex_009708 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_009708"
+#define dspot02_room_1Tex_009708 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_009708"
 static const ALIGN_ASSET(2) char spot02_room_1Tex_009708[] = dspot02_room_1Tex_009708;
 
-#define dspot02_room_1DL_007770 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_007770"
-static const ALIGN_ASSET(2) char spot02_room_1DL_007770[] = dspot02_room_1DL_007770;
-
-#define dspot02_room_1Tex_00C108 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_00C108"
-static const ALIGN_ASSET(2) char spot02_room_1Tex_00C108[] = dspot02_room_1Tex_00C108;
-
-#define dspot02_room_1Tex_009908 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_009908"
+#define dspot02_room_1Tex_009908 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_009908"
 static const ALIGN_ASSET(2) char spot02_room_1Tex_009908[] = dspot02_room_1Tex_009908;
 
-#define dspot02_room_1DL_01A508 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_01A508"
-static const ALIGN_ASSET(2) char spot02_room_1DL_01A508[] = dspot02_room_1DL_01A508;
-
-#define dspot02_room_1Tex_01D790 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_01D790"
-static const ALIGN_ASSET(2) char spot02_room_1Tex_01D790[] = dspot02_room_1Tex_01D790;
-
-#define dspot02_room_1DL_0065B0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_0065B0"
-static const ALIGN_ASSET(2) char spot02_room_1DL_0065B0[] = dspot02_room_1DL_0065B0;
-
-#define dspot02_room_1Tex_018988 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_018988"
-static const ALIGN_ASSET(2) char spot02_room_1Tex_018988[] = dspot02_room_1Tex_018988;
-
-#define dspot02_room_1Tex_017588 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_017588"
-static const ALIGN_ASSET(2) char spot02_room_1Tex_017588[] = dspot02_room_1Tex_017588;
-
-#define dspot02_room_1DL_0040F0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_0040F0"
-static const ALIGN_ASSET(2) char spot02_room_1DL_0040F0[] = dspot02_room_1DL_0040F0;
-
-#define dspot02_room_1DL_003F20 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_003F20"
-static const ALIGN_ASSET(2) char spot02_room_1DL_003F20[] = dspot02_room_1DL_003F20;
-
-#define dspot02_room_1Tex_011508 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_011508"
-static const ALIGN_ASSET(2) char spot02_room_1Tex_011508[] = dspot02_room_1Tex_011508;
-
-#define dspot02_room_1DL_006F78 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_006F78"
-static const ALIGN_ASSET(2) char spot02_room_1DL_006F78[] = dspot02_room_1DL_006F78;
-
-#define dspot02_room_1Tex_00B108 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_00B108"
-static const ALIGN_ASSET(2) char spot02_room_1Tex_00B108[] = dspot02_room_1Tex_00B108;
-
-#define dspot02_room_1DL_003BC0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_003BC0"
-static const ALIGN_ASSET(2) char spot02_room_1DL_003BC0[] = dspot02_room_1DL_003BC0;
-
-#define dspot02_room_1Tex_016D88 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_016D88"
-static const ALIGN_ASSET(2) char spot02_room_1Tex_016D88[] = dspot02_room_1Tex_016D88;
-
-#define dspot02_room_1Tex_00E308 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_00E308"
-static const ALIGN_ASSET(2) char spot02_room_1Tex_00E308[] = dspot02_room_1Tex_00E308;
-
-#define dspot02_room_1DL_008DE8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_008DE8"
-static const ALIGN_ASSET(2) char spot02_room_1DL_008DE8[] = dspot02_room_1DL_008DE8;
-
-#define dspot02_room_1DL_01B618 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_01B618"
-static const ALIGN_ASSET(2) char spot02_room_1DL_01B618[] = dspot02_room_1DL_01B618;
-
-#define dspot02_room_1DL_019F60 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_019F60"
-static const ALIGN_ASSET(2) char spot02_room_1DL_019F60[] = dspot02_room_1DL_019F60;
-
-#define dspot02_room_1Tex_01C790 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_01C790"
-static const ALIGN_ASSET(2) char spot02_room_1Tex_01C790[] = dspot02_room_1Tex_01C790;
-
-#define dspot02_room_1DL_007460 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_007460"
-static const ALIGN_ASSET(2) char spot02_room_1DL_007460[] = dspot02_room_1DL_007460;
-
-#define dspot02_room_1Tex_00A908 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_00A908"
+#define dspot02_room_1Tex_00A908 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_00A908"
 static const ALIGN_ASSET(2) char spot02_room_1Tex_00A908[] = dspot02_room_1Tex_00A908;
 
-#define dspot02_room_1DL_0042A8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_0042A8"
-static const ALIGN_ASSET(2) char spot02_room_1DL_0042A8[] = dspot02_room_1DL_0042A8;
+#define dspot02_room_1Tex_00B108 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_00B108"
+static const ALIGN_ASSET(2) char spot02_room_1Tex_00B108[] = dspot02_room_1Tex_00B108;
 
-#define dspot02_room_1DL_01AA80 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_01AA80"
-static const ALIGN_ASSET(2) char spot02_room_1DL_01AA80[] = dspot02_room_1DL_01AA80;
+#define dspot02_room_1Tex_00C108 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_00C108"
+static const ALIGN_ASSET(2) char spot02_room_1Tex_00C108[] = dspot02_room_1Tex_00C108;
 
-#define dspot02_room_1Tex_01C290 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_01C290"
-static const ALIGN_ASSET(2) char spot02_room_1Tex_01C290[] = dspot02_room_1Tex_01C290;
-
-#define dspot02_room_1Tex_01BE90 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_01BE90"
-static const ALIGN_ASSET(2) char spot02_room_1Tex_01BE90[] = dspot02_room_1Tex_01BE90;
-
-#define dspot02_room_1DL_005250 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_005250"
-static const ALIGN_ASSET(2) char spot02_room_1DL_005250[] = dspot02_room_1DL_005250;
-
-#define dspot02_room_1Tex_00DD08 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_00DD08"
-static const ALIGN_ASSET(2) char spot02_room_1Tex_00DD08[] = dspot02_room_1Tex_00DD08;
-
-#define dspot02_room_1DL_01B178 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_01B178"
-static const ALIGN_ASSET(2) char spot02_room_1DL_01B178[] = dspot02_room_1DL_01B178;
-
-#define dspot02_room_1Tex_01C690 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_01C690"
-static const ALIGN_ASSET(2) char spot02_room_1Tex_01C690[] = dspot02_room_1Tex_01C690;
-
-#define dspot02_room_1DL_005730 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_005730"
-static const ALIGN_ASSET(2) char spot02_room_1DL_005730[] = dspot02_room_1DL_005730;
-
-#define dspot02_room_1Tex_015D08 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_015D08"
-static const ALIGN_ASSET(2) char spot02_room_1Tex_015D08[] = dspot02_room_1Tex_015D08;
-
-#define dspot02_room_1DL_006C48 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_006C48"
-static const ALIGN_ASSET(2) char spot02_room_1DL_006C48[] = dspot02_room_1DL_006C48;
-
-#define dspot02_room_1Tex_00C508 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_00C508"
+#define dspot02_room_1Tex_00C508 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_00C508"
 static const ALIGN_ASSET(2) char spot02_room_1Tex_00C508[] = dspot02_room_1Tex_00C508;
 
-#define dspot02_room_1TLUT_008EB8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1TLUT_008EB8"
-static const ALIGN_ASSET(2) char spot02_room_1TLUT_008EB8[] = dspot02_room_1TLUT_008EB8;
+#define dspot02_room_1Tex_00CD08 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_00CD08"
+static const ALIGN_ASSET(2) char spot02_room_1Tex_00CD08[] = dspot02_room_1Tex_00CD08;
 
-#define dspot02_room_1DL_007990 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1DL_007990"
-static const ALIGN_ASSET(2) char spot02_room_1DL_007990[] = dspot02_room_1DL_007990;
+#define dspot02_room_1Tex_00DD08 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_00DD08"
+static const ALIGN_ASSET(2) char spot02_room_1Tex_00DD08[] = dspot02_room_1Tex_00DD08;
 
-#define dspot02_room_1Tex_017988 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Tex_017988"
+#define dspot02_room_1Tex_00E108 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_00E108"
+static const ALIGN_ASSET(2) char spot02_room_1Tex_00E108[] = dspot02_room_1Tex_00E108;
+
+#define dspot02_room_1Tex_00E308 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_00E308"
+static const ALIGN_ASSET(2) char spot02_room_1Tex_00E308[] = dspot02_room_1Tex_00E308;
+
+#define dspot02_room_1Tex_00EB08 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_00EB08"
+static const ALIGN_ASSET(2) char spot02_room_1Tex_00EB08[] = dspot02_room_1Tex_00EB08;
+
+#define dspot02_room_1Tex_00F308 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_00F308"
+static const ALIGN_ASSET(2) char spot02_room_1Tex_00F308[] = dspot02_room_1Tex_00F308;
+
+#define dspot02_room_1Tex_010308 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_010308"
+static const ALIGN_ASSET(2) char spot02_room_1Tex_010308[] = dspot02_room_1Tex_010308;
+
+#define dspot02_room_1Tex_010B08 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_010B08"
+static const ALIGN_ASSET(2) char spot02_room_1Tex_010B08[] = dspot02_room_1Tex_010B08;
+
+#define dspot02_room_1Tex_010D08 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_010D08"
+static const ALIGN_ASSET(2) char spot02_room_1Tex_010D08[] = dspot02_room_1Tex_010D08;
+
+#define dspot02_room_1Tex_011508 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_011508"
+static const ALIGN_ASSET(2) char spot02_room_1Tex_011508[] = dspot02_room_1Tex_011508;
+
+#define dspot02_room_1Tex_012508 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_012508"
+static const ALIGN_ASSET(2) char spot02_room_1Tex_012508[] = dspot02_room_1Tex_012508;
+
+#define dspot02_room_1Tex_012D08 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_012D08"
+static const ALIGN_ASSET(2) char spot02_room_1Tex_012D08[] = dspot02_room_1Tex_012D08;
+
+#define dspot02_room_1Tex_013508 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_013508"
+static const ALIGN_ASSET(2) char spot02_room_1Tex_013508[] = dspot02_room_1Tex_013508;
+
+#define dspot02_room_1Tex_014508 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_014508"
+static const ALIGN_ASSET(2) char spot02_room_1Tex_014508[] = dspot02_room_1Tex_014508;
+
+#define dspot02_room_1Tex_014D08 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_014D08"
+static const ALIGN_ASSET(2) char spot02_room_1Tex_014D08[] = dspot02_room_1Tex_014D08;
+
+#define dspot02_room_1Tex_015D08 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_015D08"
+static const ALIGN_ASSET(2) char spot02_room_1Tex_015D08[] = dspot02_room_1Tex_015D08;
+
+#define dspot02_room_1Tex_016D08 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_016D08"
+static const ALIGN_ASSET(2) char spot02_room_1Tex_016D08[] = dspot02_room_1Tex_016D08;
+
+#define dspot02_room_1Tex_016D88 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_016D88"
+static const ALIGN_ASSET(2) char spot02_room_1Tex_016D88[] = dspot02_room_1Tex_016D88;
+
+#define dspot02_room_1Tex_017588 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_017588"
+static const ALIGN_ASSET(2) char spot02_room_1Tex_017588[] = dspot02_room_1Tex_017588;
+
+#define dspot02_room_1Tex_017988 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_017988"
 static const ALIGN_ASSET(2) char spot02_room_1Tex_017988[] = dspot02_room_1Tex_017988;
 
-#define dspot02_room_1Set_000C70DL_0071A8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_0071A8"
+#define dspot02_room_1Tex_018988 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_018988"
+static const ALIGN_ASSET(2) char spot02_room_1Tex_018988[] = dspot02_room_1Tex_018988;
+
+#define dspot02_room_1Tex_01B690 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_01B690"
+static const ALIGN_ASSET(2) char spot02_room_1Tex_01B690[] = dspot02_room_1Tex_01B690;
+
+#define dspot02_room_1Tex_01BE90 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_01BE90"
+static const ALIGN_ASSET(2) char spot02_room_1Tex_01BE90[] = dspot02_room_1Tex_01BE90;
+
+#define dspot02_room_1Tex_01C290 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_01C290"
+static const ALIGN_ASSET(2) char spot02_room_1Tex_01C290[] = dspot02_room_1Tex_01C290;
+
+#define dspot02_room_1Tex_01C690 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_01C690"
+static const ALIGN_ASSET(2) char spot02_room_1Tex_01C690[] = dspot02_room_1Tex_01C690;
+
+#define dspot02_room_1Tex_01C790 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_01C790"
+static const ALIGN_ASSET(2) char spot02_room_1Tex_01C790[] = dspot02_room_1Tex_01C790;
+
+#define dspot02_room_1Tex_01D790 "__OTR__scenes/shared/spot02_scene/spot02_room_1Tex_01D790"
+static const ALIGN_ASSET(2) char spot02_room_1Tex_01D790[] = dspot02_room_1Tex_01D790;
+
+#define dspot02_room_1TLUT_008EB8 "__OTR__scenes/shared/spot02_scene/spot02_room_1TLUT_008EB8"
+static const ALIGN_ASSET(2) char spot02_room_1TLUT_008EB8[] = dspot02_room_1TLUT_008EB8;
+
+#define dspot02_room_1TLUT_008EE0 "__OTR__scenes/shared/spot02_scene/spot02_room_1TLUT_008EE0"
+static const ALIGN_ASSET(2) char spot02_room_1TLUT_008EE0[] = dspot02_room_1TLUT_008EE0;
+
+#define dspot02_room_1DL_0071A8 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_0071A8"
+static const ALIGN_ASSET(2) char spot02_room_1DL_0071A8[] = dspot02_room_1DL_0071A8;
+
+#define dspot02_room_1DL_001F20 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_001F20"
+static const ALIGN_ASSET(2) char spot02_room_1DL_001F20[] = dspot02_room_1DL_001F20;
+
+#define dspot02_room_1DL_005A68 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_005A68"
+static const ALIGN_ASSET(2) char spot02_room_1DL_005A68[] = dspot02_room_1DL_005A68;
+
+#define dspot02_room_1DL_01A358 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_01A358"
+static const ALIGN_ASSET(2) char spot02_room_1DL_01A358[] = dspot02_room_1DL_01A358;
+
+#define dspot02_room_1DL_003068 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_003068"
+static const ALIGN_ASSET(2) char spot02_room_1DL_003068[] = dspot02_room_1DL_003068;
+
+#define dspot02_room_1DL_007770 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_007770"
+static const ALIGN_ASSET(2) char spot02_room_1DL_007770[] = dspot02_room_1DL_007770;
+
+#define dspot02_room_1DL_01A508 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_01A508"
+static const ALIGN_ASSET(2) char spot02_room_1DL_01A508[] = dspot02_room_1DL_01A508;
+
+#define dspot02_room_1DL_0065B0 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_0065B0"
+static const ALIGN_ASSET(2) char spot02_room_1DL_0065B0[] = dspot02_room_1DL_0065B0;
+
+#define dspot02_room_1DL_0040F0 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_0040F0"
+static const ALIGN_ASSET(2) char spot02_room_1DL_0040F0[] = dspot02_room_1DL_0040F0;
+
+#define dspot02_room_1DL_003F20 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_003F20"
+static const ALIGN_ASSET(2) char spot02_room_1DL_003F20[] = dspot02_room_1DL_003F20;
+
+#define dspot02_room_1DL_006F78 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_006F78"
+static const ALIGN_ASSET(2) char spot02_room_1DL_006F78[] = dspot02_room_1DL_006F78;
+
+#define dspot02_room_1DL_003BC0 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_003BC0"
+static const ALIGN_ASSET(2) char spot02_room_1DL_003BC0[] = dspot02_room_1DL_003BC0;
+
+#define dspot02_room_1DL_008DE8 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_008DE8"
+static const ALIGN_ASSET(2) char spot02_room_1DL_008DE8[] = dspot02_room_1DL_008DE8;
+
+#define dspot02_room_1DL_01B618 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_01B618"
+static const ALIGN_ASSET(2) char spot02_room_1DL_01B618[] = dspot02_room_1DL_01B618;
+
+#define dspot02_room_1DL_019F60 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_019F60"
+static const ALIGN_ASSET(2) char spot02_room_1DL_019F60[] = dspot02_room_1DL_019F60;
+
+#define dspot02_room_1DL_007460 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_007460"
+static const ALIGN_ASSET(2) char spot02_room_1DL_007460[] = dspot02_room_1DL_007460;
+
+#define dspot02_room_1DL_0042A8 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_0042A8"
+static const ALIGN_ASSET(2) char spot02_room_1DL_0042A8[] = dspot02_room_1DL_0042A8;
+
+#define dspot02_room_1DL_01AA80 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_01AA80"
+static const ALIGN_ASSET(2) char spot02_room_1DL_01AA80[] = dspot02_room_1DL_01AA80;
+
+#define dspot02_room_1DL_005250 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_005250"
+static const ALIGN_ASSET(2) char spot02_room_1DL_005250[] = dspot02_room_1DL_005250;
+
+#define dspot02_room_1DL_01B178 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_01B178"
+static const ALIGN_ASSET(2) char spot02_room_1DL_01B178[] = dspot02_room_1DL_01B178;
+
+#define dspot02_room_1DL_005730 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_005730"
+static const ALIGN_ASSET(2) char spot02_room_1DL_005730[] = dspot02_room_1DL_005730;
+
+#define dspot02_room_1DL_006C48 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_006C48"
+static const ALIGN_ASSET(2) char spot02_room_1DL_006C48[] = dspot02_room_1DL_006C48;
+
+#define dspot02_room_1DL_007990 "__OTR__scenes/shared/spot02_scene/spot02_room_1DL_007990"
+static const ALIGN_ASSET(2) char spot02_room_1DL_007990[] = dspot02_room_1DL_007990;
+
+#define dspot02_room_1Set_000C70DL_0071A8 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_0071A8"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_0071A8[] = dspot02_room_1Set_000C70DL_0071A8;
 
-#define dspot02_room_1Set_000C70DL_001F20 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_001F20"
+#define dspot02_room_1Set_000C70DL_001F20 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_001F20"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_001F20[] = dspot02_room_1Set_000C70DL_001F20;
 
-#define dspot02_room_1Set_000C70DL_005A68 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_005A68"
+#define dspot02_room_1Set_000C70DL_005A68 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_005A68"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_005A68[] = dspot02_room_1Set_000C70DL_005A68;
 
-#define dspot02_room_1Set_000C70DL_01A358 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_01A358"
+#define dspot02_room_1Set_000C70DL_01A358 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_01A358"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_01A358[] = dspot02_room_1Set_000C70DL_01A358;
 
-#define dspot02_room_1Set_000C70DL_003068 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_003068"
+#define dspot02_room_1Set_000C70DL_003068 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_003068"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_003068[] = dspot02_room_1Set_000C70DL_003068;
 
-#define dspot02_room_1Set_000C70DL_007770 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_007770"
+#define dspot02_room_1Set_000C70DL_007770 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_007770"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_007770[] = dspot02_room_1Set_000C70DL_007770;
 
-#define dspot02_room_1Set_000C70DL_01A508 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_01A508"
+#define dspot02_room_1Set_000C70DL_01A508 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_01A508"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_01A508[] = dspot02_room_1Set_000C70DL_01A508;
 
-#define dspot02_room_1Set_000C70DL_0065B0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_0065B0"
+#define dspot02_room_1Set_000C70DL_0065B0 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_0065B0"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_0065B0[] = dspot02_room_1Set_000C70DL_0065B0;
 
-#define dspot02_room_1Set_000C70DL_0040F0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_0040F0"
+#define dspot02_room_1Set_000C70DL_0040F0 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_0040F0"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_0040F0[] = dspot02_room_1Set_000C70DL_0040F0;
 
-#define dspot02_room_1Set_000C70DL_003F20 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_003F20"
+#define dspot02_room_1Set_000C70DL_003F20 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_003F20"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_003F20[] = dspot02_room_1Set_000C70DL_003F20;
 
-#define dspot02_room_1Set_000C70DL_006F78 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_006F78"
+#define dspot02_room_1Set_000C70DL_006F78 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_006F78"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_006F78[] = dspot02_room_1Set_000C70DL_006F78;
 
-#define dspot02_room_1Set_000C70DL_003BC0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_003BC0"
+#define dspot02_room_1Set_000C70DL_003BC0 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_003BC0"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_003BC0[] = dspot02_room_1Set_000C70DL_003BC0;
 
-#define dspot02_room_1Set_000C70DL_008DE8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_008DE8"
+#define dspot02_room_1Set_000C70DL_008DE8 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_008DE8"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_008DE8[] = dspot02_room_1Set_000C70DL_008DE8;
 
-#define dspot02_room_1Set_000C70DL_01B618 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_01B618"
+#define dspot02_room_1Set_000C70DL_01B618 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_01B618"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_01B618[] = dspot02_room_1Set_000C70DL_01B618;
 
-#define dspot02_room_1Set_000C70DL_019F60 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_019F60"
+#define dspot02_room_1Set_000C70DL_019F60 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_019F60"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_019F60[] = dspot02_room_1Set_000C70DL_019F60;
 
-#define dspot02_room_1Set_000C70DL_007460 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_007460"
+#define dspot02_room_1Set_000C70DL_007460 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_007460"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_007460[] = dspot02_room_1Set_000C70DL_007460;
 
-#define dspot02_room_1Set_000C70DL_0042A8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_0042A8"
+#define dspot02_room_1Set_000C70DL_0042A8 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_0042A8"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_0042A8[] = dspot02_room_1Set_000C70DL_0042A8;
 
-#define dspot02_room_1Set_000C70DL_01AA80 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_01AA80"
+#define dspot02_room_1Set_000C70DL_01AA80 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_01AA80"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_01AA80[] = dspot02_room_1Set_000C70DL_01AA80;
 
-#define dspot02_room_1Set_000C70DL_005250 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_005250"
+#define dspot02_room_1Set_000C70DL_005250 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_005250"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_005250[] = dspot02_room_1Set_000C70DL_005250;
 
-#define dspot02_room_1Set_000C70DL_01B178 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_01B178"
+#define dspot02_room_1Set_000C70DL_01B178 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_01B178"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_01B178[] = dspot02_room_1Set_000C70DL_01B178;
 
-#define dspot02_room_1Set_000C70DL_005730 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_005730"
+#define dspot02_room_1Set_000C70DL_005730 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_005730"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_005730[] = dspot02_room_1Set_000C70DL_005730;
 
-#define dspot02_room_1Set_000C70DL_006C48 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_006C48"
+#define dspot02_room_1Set_000C70DL_006C48 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_006C48"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_006C48[] = dspot02_room_1Set_000C70DL_006C48;
 
-#define dspot02_room_1Set_000C70DL_007990 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000C70DL_007990"
+#define dspot02_room_1Set_000C70DL_007990 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000C70DL_007990"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000C70DL_007990[] = dspot02_room_1Set_000C70DL_007990;
 
-#define dspot02_room_1Set_000490DL_0071A8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_0071A8"
+#define dspot02_room_1Set_000490DL_0071A8 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_0071A8"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_0071A8[] = dspot02_room_1Set_000490DL_0071A8;
 
-#define dspot02_room_1Set_000490DL_001F20 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_001F20"
+#define dspot02_room_1Set_000490DL_001F20 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_001F20"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_001F20[] = dspot02_room_1Set_000490DL_001F20;
 
-#define dspot02_room_1Set_000490DL_005A68 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_005A68"
+#define dspot02_room_1Set_000490DL_005A68 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_005A68"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_005A68[] = dspot02_room_1Set_000490DL_005A68;
 
-#define dspot02_room_1Set_000490DL_01A358 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_01A358"
+#define dspot02_room_1Set_000490DL_01A358 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_01A358"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_01A358[] = dspot02_room_1Set_000490DL_01A358;
 
-#define dspot02_room_1Set_000490DL_003068 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_003068"
+#define dspot02_room_1Set_000490DL_003068 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_003068"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_003068[] = dspot02_room_1Set_000490DL_003068;
 
-#define dspot02_room_1Set_000490DL_007770 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_007770"
+#define dspot02_room_1Set_000490DL_007770 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_007770"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_007770[] = dspot02_room_1Set_000490DL_007770;
 
-#define dspot02_room_1Set_000490DL_01A508 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_01A508"
+#define dspot02_room_1Set_000490DL_01A508 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_01A508"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_01A508[] = dspot02_room_1Set_000490DL_01A508;
 
-#define dspot02_room_1Set_000490DL_0065B0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_0065B0"
+#define dspot02_room_1Set_000490DL_0065B0 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_0065B0"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_0065B0[] = dspot02_room_1Set_000490DL_0065B0;
 
-#define dspot02_room_1Set_000490DL_0040F0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_0040F0"
+#define dspot02_room_1Set_000490DL_0040F0 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_0040F0"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_0040F0[] = dspot02_room_1Set_000490DL_0040F0;
 
-#define dspot02_room_1Set_000490DL_003F20 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_003F20"
+#define dspot02_room_1Set_000490DL_003F20 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_003F20"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_003F20[] = dspot02_room_1Set_000490DL_003F20;
 
-#define dspot02_room_1Set_000490DL_006F78 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_006F78"
+#define dspot02_room_1Set_000490DL_006F78 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_006F78"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_006F78[] = dspot02_room_1Set_000490DL_006F78;
 
-#define dspot02_room_1Set_000490DL_003BC0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_003BC0"
+#define dspot02_room_1Set_000490DL_003BC0 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_003BC0"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_003BC0[] = dspot02_room_1Set_000490DL_003BC0;
 
-#define dspot02_room_1Set_000490DL_008DE8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_008DE8"
+#define dspot02_room_1Set_000490DL_008DE8 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_008DE8"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_008DE8[] = dspot02_room_1Set_000490DL_008DE8;
 
-#define dspot02_room_1Set_000490DL_01B618 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_01B618"
+#define dspot02_room_1Set_000490DL_01B618 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_01B618"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_01B618[] = dspot02_room_1Set_000490DL_01B618;
 
-#define dspot02_room_1Set_000490DL_019F60 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_019F60"
+#define dspot02_room_1Set_000490DL_019F60 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_019F60"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_019F60[] = dspot02_room_1Set_000490DL_019F60;
 
-#define dspot02_room_1Set_000490DL_007460 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_007460"
+#define dspot02_room_1Set_000490DL_007460 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_007460"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_007460[] = dspot02_room_1Set_000490DL_007460;
 
-#define dspot02_room_1Set_000490DL_0042A8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_0042A8"
+#define dspot02_room_1Set_000490DL_0042A8 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_0042A8"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_0042A8[] = dspot02_room_1Set_000490DL_0042A8;
 
-#define dspot02_room_1Set_000490DL_01AA80 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_01AA80"
+#define dspot02_room_1Set_000490DL_01AA80 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_01AA80"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_01AA80[] = dspot02_room_1Set_000490DL_01AA80;
 
-#define dspot02_room_1Set_000490DL_005250 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_005250"
+#define dspot02_room_1Set_000490DL_005250 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_005250"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_005250[] = dspot02_room_1Set_000490DL_005250;
 
-#define dspot02_room_1Set_000490DL_01B178 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_01B178"
+#define dspot02_room_1Set_000490DL_01B178 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_01B178"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_01B178[] = dspot02_room_1Set_000490DL_01B178;
 
-#define dspot02_room_1Set_000490DL_005730 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_005730"
+#define dspot02_room_1Set_000490DL_005730 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_005730"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_005730[] = dspot02_room_1Set_000490DL_005730;
 
-#define dspot02_room_1Set_000490DL_006C48 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_006C48"
+#define dspot02_room_1Set_000490DL_006C48 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_006C48"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_006C48[] = dspot02_room_1Set_000490DL_006C48;
 
-#define dspot02_room_1Set_000490DL_007990 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000490DL_007990"
+#define dspot02_room_1Set_000490DL_007990 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000490DL_007990"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000490DL_007990[] = dspot02_room_1Set_000490DL_007990;
 
-#define dspot02_room_1Set_000880DL_0071A8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_0071A8"
+#define dspot02_room_1Set_000880DL_0071A8 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_0071A8"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_0071A8[] = dspot02_room_1Set_000880DL_0071A8;
 
-#define dspot02_room_1Set_000880DL_001F20 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_001F20"
+#define dspot02_room_1Set_000880DL_001F20 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_001F20"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_001F20[] = dspot02_room_1Set_000880DL_001F20;
 
-#define dspot02_room_1Set_000880DL_005A68 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_005A68"
+#define dspot02_room_1Set_000880DL_005A68 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_005A68"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_005A68[] = dspot02_room_1Set_000880DL_005A68;
 
-#define dspot02_room_1Set_000880DL_01A358 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_01A358"
+#define dspot02_room_1Set_000880DL_01A358 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_01A358"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_01A358[] = dspot02_room_1Set_000880DL_01A358;
 
-#define dspot02_room_1Set_000880DL_003068 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_003068"
+#define dspot02_room_1Set_000880DL_003068 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_003068"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_003068[] = dspot02_room_1Set_000880DL_003068;
 
-#define dspot02_room_1Set_000880DL_007770 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_007770"
+#define dspot02_room_1Set_000880DL_007770 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_007770"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_007770[] = dspot02_room_1Set_000880DL_007770;
 
-#define dspot02_room_1Set_000880DL_01A508 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_01A508"
+#define dspot02_room_1Set_000880DL_01A508 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_01A508"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_01A508[] = dspot02_room_1Set_000880DL_01A508;
 
-#define dspot02_room_1Set_000880DL_0065B0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_0065B0"
+#define dspot02_room_1Set_000880DL_0065B0 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_0065B0"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_0065B0[] = dspot02_room_1Set_000880DL_0065B0;
 
-#define dspot02_room_1Set_000880DL_0040F0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_0040F0"
+#define dspot02_room_1Set_000880DL_0040F0 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_0040F0"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_0040F0[] = dspot02_room_1Set_000880DL_0040F0;
 
-#define dspot02_room_1Set_000880DL_003F20 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_003F20"
+#define dspot02_room_1Set_000880DL_003F20 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_003F20"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_003F20[] = dspot02_room_1Set_000880DL_003F20;
 
-#define dspot02_room_1Set_000880DL_006F78 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_006F78"
+#define dspot02_room_1Set_000880DL_006F78 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_006F78"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_006F78[] = dspot02_room_1Set_000880DL_006F78;
 
-#define dspot02_room_1Set_000880DL_003BC0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_003BC0"
+#define dspot02_room_1Set_000880DL_003BC0 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_003BC0"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_003BC0[] = dspot02_room_1Set_000880DL_003BC0;
 
-#define dspot02_room_1Set_000880DL_008DE8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_008DE8"
+#define dspot02_room_1Set_000880DL_008DE8 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_008DE8"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_008DE8[] = dspot02_room_1Set_000880DL_008DE8;
 
-#define dspot02_room_1Set_000880DL_01B618 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_01B618"
+#define dspot02_room_1Set_000880DL_01B618 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_01B618"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_01B618[] = dspot02_room_1Set_000880DL_01B618;
 
-#define dspot02_room_1Set_000880DL_019F60 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_019F60"
+#define dspot02_room_1Set_000880DL_019F60 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_019F60"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_019F60[] = dspot02_room_1Set_000880DL_019F60;
 
-#define dspot02_room_1Set_000880DL_007460 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_007460"
+#define dspot02_room_1Set_000880DL_007460 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_007460"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_007460[] = dspot02_room_1Set_000880DL_007460;
 
-#define dspot02_room_1Set_000880DL_0042A8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_0042A8"
+#define dspot02_room_1Set_000880DL_0042A8 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_0042A8"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_0042A8[] = dspot02_room_1Set_000880DL_0042A8;
 
-#define dspot02_room_1Set_000880DL_01AA80 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_01AA80"
+#define dspot02_room_1Set_000880DL_01AA80 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_01AA80"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_01AA80[] = dspot02_room_1Set_000880DL_01AA80;
 
-#define dspot02_room_1Set_000880DL_005250 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_005250"
+#define dspot02_room_1Set_000880DL_005250 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_005250"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_005250[] = dspot02_room_1Set_000880DL_005250;
 
-#define dspot02_room_1Set_000880DL_01B178 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_01B178"
+#define dspot02_room_1Set_000880DL_01B178 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_01B178"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_01B178[] = dspot02_room_1Set_000880DL_01B178;
 
-#define dspot02_room_1Set_000880DL_005730 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_005730"
+#define dspot02_room_1Set_000880DL_005730 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_005730"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_005730[] = dspot02_room_1Set_000880DL_005730;
 
-#define dspot02_room_1Set_000880DL_006C48 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_006C48"
+#define dspot02_room_1Set_000880DL_006C48 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_006C48"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_006C48[] = dspot02_room_1Set_000880DL_006C48;
 
-#define dspot02_room_1Set_000880DL_007990 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_000880DL_007990"
+#define dspot02_room_1Set_000880DL_007990 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_000880DL_007990"
 static const ALIGN_ASSET(2) char spot02_room_1Set_000880DL_007990[] = dspot02_room_1Set_000880DL_007990;
 
-#define dspot02_room_1Set_001010DL_0071A8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_0071A8"
+#define dspot02_room_1Set_001010DL_0071A8 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_0071A8"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_0071A8[] = dspot02_room_1Set_001010DL_0071A8;
 
-#define dspot02_room_1Set_001010DL_001F20 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_001F20"
+#define dspot02_room_1Set_001010DL_001F20 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_001F20"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_001F20[] = dspot02_room_1Set_001010DL_001F20;
 
-#define dspot02_room_1Set_001010DL_005A68 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_005A68"
+#define dspot02_room_1Set_001010DL_005A68 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_005A68"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_005A68[] = dspot02_room_1Set_001010DL_005A68;
 
-#define dspot02_room_1Set_001010DL_01A358 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_01A358"
+#define dspot02_room_1Set_001010DL_01A358 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_01A358"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_01A358[] = dspot02_room_1Set_001010DL_01A358;
 
-#define dspot02_room_1Set_001010DL_003068 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_003068"
+#define dspot02_room_1Set_001010DL_003068 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_003068"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_003068[] = dspot02_room_1Set_001010DL_003068;
 
-#define dspot02_room_1Set_001010DL_007770 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_007770"
+#define dspot02_room_1Set_001010DL_007770 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_007770"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_007770[] = dspot02_room_1Set_001010DL_007770;
 
-#define dspot02_room_1Set_001010DL_01A508 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_01A508"
+#define dspot02_room_1Set_001010DL_01A508 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_01A508"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_01A508[] = dspot02_room_1Set_001010DL_01A508;
 
-#define dspot02_room_1Set_001010DL_0065B0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_0065B0"
+#define dspot02_room_1Set_001010DL_0065B0 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_0065B0"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_0065B0[] = dspot02_room_1Set_001010DL_0065B0;
 
-#define dspot02_room_1Set_001010DL_0040F0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_0040F0"
+#define dspot02_room_1Set_001010DL_0040F0 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_0040F0"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_0040F0[] = dspot02_room_1Set_001010DL_0040F0;
 
-#define dspot02_room_1Set_001010DL_003F20 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_003F20"
+#define dspot02_room_1Set_001010DL_003F20 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_003F20"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_003F20[] = dspot02_room_1Set_001010DL_003F20;
 
-#define dspot02_room_1Set_001010DL_006F78 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_006F78"
+#define dspot02_room_1Set_001010DL_006F78 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_006F78"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_006F78[] = dspot02_room_1Set_001010DL_006F78;
 
-#define dspot02_room_1Set_001010DL_003BC0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_003BC0"
+#define dspot02_room_1Set_001010DL_003BC0 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_003BC0"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_003BC0[] = dspot02_room_1Set_001010DL_003BC0;
 
-#define dspot02_room_1Set_001010DL_008DE8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_008DE8"
+#define dspot02_room_1Set_001010DL_008DE8 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_008DE8"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_008DE8[] = dspot02_room_1Set_001010DL_008DE8;
 
-#define dspot02_room_1Set_001010DL_01B618 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_01B618"
+#define dspot02_room_1Set_001010DL_01B618 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_01B618"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_01B618[] = dspot02_room_1Set_001010DL_01B618;
 
-#define dspot02_room_1Set_001010DL_019F60 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_019F60"
+#define dspot02_room_1Set_001010DL_019F60 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_019F60"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_019F60[] = dspot02_room_1Set_001010DL_019F60;
 
-#define dspot02_room_1Set_001010DL_007460 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_007460"
+#define dspot02_room_1Set_001010DL_007460 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_007460"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_007460[] = dspot02_room_1Set_001010DL_007460;
 
-#define dspot02_room_1Set_001010DL_0042A8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_0042A8"
+#define dspot02_room_1Set_001010DL_0042A8 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_0042A8"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_0042A8[] = dspot02_room_1Set_001010DL_0042A8;
 
-#define dspot02_room_1Set_001010DL_01AA80 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_01AA80"
+#define dspot02_room_1Set_001010DL_01AA80 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_01AA80"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_01AA80[] = dspot02_room_1Set_001010DL_01AA80;
 
-#define dspot02_room_1Set_001010DL_005250 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_005250"
+#define dspot02_room_1Set_001010DL_005250 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_005250"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_005250[] = dspot02_room_1Set_001010DL_005250;
 
-#define dspot02_room_1Set_001010DL_01B178 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_01B178"
+#define dspot02_room_1Set_001010DL_01B178 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_01B178"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_01B178[] = dspot02_room_1Set_001010DL_01B178;
 
-#define dspot02_room_1Set_001010DL_005730 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_005730"
+#define dspot02_room_1Set_001010DL_005730 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_005730"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_005730[] = dspot02_room_1Set_001010DL_005730;
 
-#define dspot02_room_1Set_001010DL_006C48 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_006C48"
+#define dspot02_room_1Set_001010DL_006C48 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_006C48"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_006C48[] = dspot02_room_1Set_001010DL_006C48;
 
-#define dspot02_room_1Set_001010DL_007990 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001010DL_007990"
+#define dspot02_room_1Set_001010DL_007990 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001010DL_007990"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001010DL_007990[] = dspot02_room_1Set_001010DL_007990;
 
-#define dspot02_room_1Set_001260DL_0071A8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_0071A8"
+#define dspot02_room_1Set_001260DL_0071A8 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_0071A8"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_0071A8[] = dspot02_room_1Set_001260DL_0071A8;
 
-#define dspot02_room_1Set_001260DL_001F20 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_001F20"
+#define dspot02_room_1Set_001260DL_001F20 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_001F20"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_001F20[] = dspot02_room_1Set_001260DL_001F20;
 
-#define dspot02_room_1Set_001260DL_005A68 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_005A68"
+#define dspot02_room_1Set_001260DL_005A68 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_005A68"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_005A68[] = dspot02_room_1Set_001260DL_005A68;
 
-#define dspot02_room_1Set_001260DL_01A358 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_01A358"
+#define dspot02_room_1Set_001260DL_01A358 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_01A358"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_01A358[] = dspot02_room_1Set_001260DL_01A358;
 
-#define dspot02_room_1Set_001260DL_003068 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_003068"
+#define dspot02_room_1Set_001260DL_003068 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_003068"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_003068[] = dspot02_room_1Set_001260DL_003068;
 
-#define dspot02_room_1Set_001260DL_007770 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_007770"
+#define dspot02_room_1Set_001260DL_007770 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_007770"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_007770[] = dspot02_room_1Set_001260DL_007770;
 
-#define dspot02_room_1Set_001260DL_01A508 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_01A508"
+#define dspot02_room_1Set_001260DL_01A508 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_01A508"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_01A508[] = dspot02_room_1Set_001260DL_01A508;
 
-#define dspot02_room_1Set_001260DL_0065B0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_0065B0"
+#define dspot02_room_1Set_001260DL_0065B0 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_0065B0"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_0065B0[] = dspot02_room_1Set_001260DL_0065B0;
 
-#define dspot02_room_1Set_001260DL_0040F0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_0040F0"
+#define dspot02_room_1Set_001260DL_0040F0 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_0040F0"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_0040F0[] = dspot02_room_1Set_001260DL_0040F0;
 
-#define dspot02_room_1Set_001260DL_003F20 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_003F20"
+#define dspot02_room_1Set_001260DL_003F20 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_003F20"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_003F20[] = dspot02_room_1Set_001260DL_003F20;
 
-#define dspot02_room_1Set_001260DL_006F78 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_006F78"
+#define dspot02_room_1Set_001260DL_006F78 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_006F78"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_006F78[] = dspot02_room_1Set_001260DL_006F78;
 
-#define dspot02_room_1Set_001260DL_003BC0 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_003BC0"
+#define dspot02_room_1Set_001260DL_003BC0 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_003BC0"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_003BC0[] = dspot02_room_1Set_001260DL_003BC0;
 
-#define dspot02_room_1Set_001260DL_008DE8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_008DE8"
+#define dspot02_room_1Set_001260DL_008DE8 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_008DE8"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_008DE8[] = dspot02_room_1Set_001260DL_008DE8;
 
-#define dspot02_room_1Set_001260DL_01B618 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_01B618"
+#define dspot02_room_1Set_001260DL_01B618 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_01B618"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_01B618[] = dspot02_room_1Set_001260DL_01B618;
 
-#define dspot02_room_1Set_001260DL_019F60 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_019F60"
+#define dspot02_room_1Set_001260DL_019F60 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_019F60"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_019F60[] = dspot02_room_1Set_001260DL_019F60;
 
-#define dspot02_room_1Set_001260DL_007460 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_007460"
+#define dspot02_room_1Set_001260DL_007460 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_007460"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_007460[] = dspot02_room_1Set_001260DL_007460;
 
-#define dspot02_room_1Set_001260DL_0042A8 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_0042A8"
+#define dspot02_room_1Set_001260DL_0042A8 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_0042A8"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_0042A8[] = dspot02_room_1Set_001260DL_0042A8;
 
-#define dspot02_room_1Set_001260DL_01AA80 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_01AA80"
+#define dspot02_room_1Set_001260DL_01AA80 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_01AA80"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_01AA80[] = dspot02_room_1Set_001260DL_01AA80;
 
-#define dspot02_room_1Set_001260DL_005250 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_005250"
+#define dspot02_room_1Set_001260DL_005250 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_005250"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_005250[] = dspot02_room_1Set_001260DL_005250;
 
-#define dspot02_room_1Set_001260DL_01B178 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_01B178"
+#define dspot02_room_1Set_001260DL_01B178 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_01B178"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_01B178[] = dspot02_room_1Set_001260DL_01B178;
 
-#define dspot02_room_1Set_001260DL_005730 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_005730"
+#define dspot02_room_1Set_001260DL_005730 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_005730"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_005730[] = dspot02_room_1Set_001260DL_005730;
 
-#define dspot02_room_1Set_001260DL_006C48 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_006C48"
+#define dspot02_room_1Set_001260DL_006C48 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_006C48"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_006C48[] = dspot02_room_1Set_001260DL_006C48;
 
-#define dspot02_room_1Set_001260DL_007990 "__OTR__scenes/nonmq/spot02_scene/spot02_room_1Set_001260DL_007990"
+#define dspot02_room_1Set_001260DL_007990 "__OTR__scenes/shared/spot02_scene/spot02_room_1Set_001260DL_007990"
 static const ALIGN_ASSET(2) char spot02_room_1Set_001260DL_007990[] = dspot02_room_1Set_001260DL_007990;
 
 
diff --git a/soh/assets/scenes/overworld/spot02/spot02_scene.h b/soh/assets/scenes/overworld/spot02/spot02_scene.h
index 47ce5c69a..2835db8fc 100644
--- a/soh/assets/scenes/overworld/spot02/spot02_scene.h
+++ b/soh/assets/scenes/overworld/spot02/spot02_scene.h
@@ -3,60 +3,60 @@
 
 #include "align_asset_macro.h"
 
-#define dspot02_sceneCollisionHeader_003C54 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneCollisionHeader_003C54"
-static const ALIGN_ASSET(2) char spot02_sceneCollisionHeader_003C54[] = dspot02_sceneCollisionHeader_003C54;
-
-#define dspot02_scene_Cs_003C80 "__OTR__scenes/nonmq/spot02_scene/spot02_scene_Cs_003C80"
-static const ALIGN_ASSET(2) char spot02_scene_Cs_003C80[] = dspot02_scene_Cs_003C80;
-
-#define dspot02_scene_Cs_005020 "__OTR__scenes/nonmq/spot02_scene/spot02_scene_Cs_005020"
-static const ALIGN_ASSET(2) char spot02_scene_Cs_005020[] = dspot02_scene_Cs_005020;
-
-#define dgGraveyardIntroCs "__OTR__scenes/nonmq/spot02_scene/gGraveyardIntroCs"
-static const ALIGN_ASSET(2) char gGraveyardIntroCs[] = dgGraveyardIntroCs;
-
-#define dspot02_sceneTex_009E80 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneTex_009E80"
-static const ALIGN_ASSET(2) char spot02_sceneTex_009E80[] = dspot02_sceneTex_009E80;
-
-#define dspot02_sceneTex_007E80 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneTex_007E80"
-static const ALIGN_ASSET(2) char spot02_sceneTex_007E80[] = dspot02_sceneTex_007E80;
-
-#define dspot02_sceneTex_007280 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneTex_007280"
+#define dspot02_sceneTex_007280 "__OTR__scenes/shared/spot02_scene/spot02_sceneTex_007280"
 static const ALIGN_ASSET(2) char spot02_sceneTex_007280[] = dspot02_sceneTex_007280;
 
-#define dspot02_sceneTex_007A80 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneTex_007A80"
+#define dspot02_sceneTex_007A80 "__OTR__scenes/shared/spot02_scene/spot02_sceneTex_007A80"
 static const ALIGN_ASSET(2) char spot02_sceneTex_007A80[] = dspot02_sceneTex_007A80;
 
-#define dspot02_sceneTex_00B080 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneTex_00B080"
-static const ALIGN_ASSET(2) char spot02_sceneTex_00B080[] = dspot02_sceneTex_00B080;
+#define dspot02_sceneTex_007E80 "__OTR__scenes/shared/spot02_scene/spot02_sceneTex_007E80"
+static const ALIGN_ASSET(2) char spot02_sceneTex_007E80[] = dspot02_sceneTex_007E80;
 
-#define dspot02_sceneTex_00AE80 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneTex_00AE80"
-static const ALIGN_ASSET(2) char spot02_sceneTex_00AE80[] = dspot02_sceneTex_00AE80;
-
-#define dspot02_sceneTex_008E80 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneTex_008E80"
-static const ALIGN_ASSET(2) char spot02_sceneTex_008E80[] = dspot02_sceneTex_008E80;
-
-#define dspot02_sceneTex_008680 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneTex_008680"
+#define dspot02_sceneTex_008680 "__OTR__scenes/shared/spot02_scene/spot02_sceneTex_008680"
 static const ALIGN_ASSET(2) char spot02_sceneTex_008680[] = dspot02_sceneTex_008680;
 
-#define dspot02_sceneTex_00A280 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneTex_00A280"
+#define dspot02_sceneTex_008E80 "__OTR__scenes/shared/spot02_scene/spot02_sceneTex_008E80"
+static const ALIGN_ASSET(2) char spot02_sceneTex_008E80[] = dspot02_sceneTex_008E80;
+
+#define dspot02_sceneTex_009E80 "__OTR__scenes/shared/spot02_scene/spot02_sceneTex_009E80"
+static const ALIGN_ASSET(2) char spot02_sceneTex_009E80[] = dspot02_sceneTex_009E80;
+
+#define dspot02_sceneTex_00A280 "__OTR__scenes/shared/spot02_scene/spot02_sceneTex_00A280"
 static const ALIGN_ASSET(2) char spot02_sceneTex_00A280[] = dspot02_sceneTex_00A280;
 
-#define dspot02_sceneTex_00AA80 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneTex_00AA80"
+#define dspot02_sceneTex_00AA80 "__OTR__scenes/shared/spot02_scene/spot02_sceneTex_00AA80"
 static const ALIGN_ASSET(2) char spot02_sceneTex_00AA80[] = dspot02_sceneTex_00AA80;
 
-#define dspot02_sceneTex_00B880 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneTex_00B880"
+#define dspot02_sceneTex_00AE80 "__OTR__scenes/shared/spot02_scene/spot02_sceneTex_00AE80"
+static const ALIGN_ASSET(2) char spot02_sceneTex_00AE80[] = dspot02_sceneTex_00AE80;
+
+#define dspot02_sceneTex_00B080 "__OTR__scenes/shared/spot02_scene/spot02_sceneTex_00B080"
+static const ALIGN_ASSET(2) char spot02_sceneTex_00B080[] = dspot02_sceneTex_00B080;
+
+#define dspot02_sceneTex_00B880 "__OTR__scenes/shared/spot02_scene/spot02_sceneTex_00B880"
 static const ALIGN_ASSET(2) char spot02_sceneTex_00B880[] = dspot02_sceneTex_00B880;
 
-#define dspot02_sceneCollisionHeader_003C54 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneCollisionHeader_003C54"
+#define dspot02_sceneCollisionHeader_003C54 "__OTR__scenes/shared/spot02_scene/spot02_sceneCollisionHeader_003C54"
+static const ALIGN_ASSET(2) char spot02_sceneCollisionHeader_003C54[] = dspot02_sceneCollisionHeader_003C54;
 
-#define dspot02_sceneCollisionHeader_003C54 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneCollisionHeader_003C54"
+#define dspot02_scene_Cs_003C80 "__OTR__scenes/shared/spot02_scene/spot02_scene_Cs_003C80"
+static const ALIGN_ASSET(2) char spot02_scene_Cs_003C80[] = dspot02_scene_Cs_003C80;
 
-#define dspot02_sceneCollisionHeader_003C54 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneCollisionHeader_003C54"
+#define dspot02_scene_Cs_005020 "__OTR__scenes/shared/spot02_scene/spot02_scene_Cs_005020"
+static const ALIGN_ASSET(2) char spot02_scene_Cs_005020[] = dspot02_scene_Cs_005020;
 
-#define dspot02_sceneCollisionHeader_003C54 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneCollisionHeader_003C54"
+#define dgGraveyardIntroCs "__OTR__scenes/shared/spot02_scene/gGraveyardIntroCs"
+static const ALIGN_ASSET(2) char gGraveyardIntroCs[] = dgGraveyardIntroCs;
 
-#define dspot02_sceneCollisionHeader_003C54 "__OTR__scenes/nonmq/spot02_scene/spot02_sceneCollisionHeader_003C54"
+#define dspot02_sceneCollisionHeader_003C54 "__OTR__scenes/shared/spot02_scene/spot02_sceneCollisionHeader_003C54"
+
+#define dspot02_sceneCollisionHeader_003C54 "__OTR__scenes/shared/spot02_scene/spot02_sceneCollisionHeader_003C54"
+
+#define dspot02_sceneCollisionHeader_003C54 "__OTR__scenes/shared/spot02_scene/spot02_sceneCollisionHeader_003C54"
+
+#define dspot02_sceneCollisionHeader_003C54 "__OTR__scenes/shared/spot02_scene/spot02_sceneCollisionHeader_003C54"
+
+#define dspot02_sceneCollisionHeader_003C54 "__OTR__scenes/shared/spot02_scene/spot02_sceneCollisionHeader_003C54"
 
 
 #endif // OVERWORLD_SPOT02_SCENE_H
diff --git a/soh/assets/scenes/overworld/spot03/spot03_room_0.h b/soh/assets/scenes/overworld/spot03/spot03_room_0.h
index e8d8bd6db..53d18f416 100644
--- a/soh/assets/scenes/overworld/spot03/spot03_room_0.h
+++ b/soh/assets/scenes/overworld/spot03/spot03_room_0.h
@@ -3,109 +3,109 @@
 
 #include "align_asset_macro.h"
 
-#define dspot03_room_0DL_009660 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0DL_009660"
-static const ALIGN_ASSET(2) char spot03_room_0DL_009660[] = dspot03_room_0DL_009660;
-
-#define dspot03_room_0DL_001460 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0DL_001460"
-static const ALIGN_ASSET(2) char spot03_room_0DL_001460[] = dspot03_room_0DL_001460;
-
-#define dspot03_room_0DL_00C4B0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0DL_00C4B0"
-static const ALIGN_ASSET(2) char spot03_room_0DL_00C4B0[] = dspot03_room_0DL_00C4B0;
-
-#define dspot03_room_0Tex_00D180 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Tex_00D180"
-static const ALIGN_ASSET(2) char spot03_room_0Tex_00D180[] = dspot03_room_0Tex_00D180;
-
-#define dspot03_room_0DL_008248 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0DL_008248"
-static const ALIGN_ASSET(2) char spot03_room_0DL_008248[] = dspot03_room_0DL_008248;
-
-#define dspot03_room_0Tex_00A3B0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Tex_00A3B0"
-static const ALIGN_ASSET(2) char spot03_room_0Tex_00A3B0[] = dspot03_room_0Tex_00A3B0;
-
-#define dspot03_room_0DL_007A80 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0DL_007A80"
-static const ALIGN_ASSET(2) char spot03_room_0DL_007A80[] = dspot03_room_0DL_007A80;
-
-#define dspot03_room_0Tex_00ABB0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Tex_00ABB0"
-static const ALIGN_ASSET(2) char spot03_room_0Tex_00ABB0[] = dspot03_room_0Tex_00ABB0;
-
-#define dspot03_room_0Tex_00BBB0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Tex_00BBB0"
-static const ALIGN_ASSET(2) char spot03_room_0Tex_00BBB0[] = dspot03_room_0Tex_00BBB0;
-
-#define dspot03_room_0DL_0022F0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0DL_0022F0"
-static const ALIGN_ASSET(2) char spot03_room_0DL_0022F0[] = dspot03_room_0DL_0022F0;
-
-#define dspot03_room_0Tex_0097B0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Tex_0097B0"
+#define dspot03_room_0Tex_0097B0 "__OTR__scenes/shared/spot03_scene/spot03_room_0Tex_0097B0"
 static const ALIGN_ASSET(2) char spot03_room_0Tex_0097B0[] = dspot03_room_0Tex_0097B0;
 
-#define dspot03_room_0DL_003298 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0DL_003298"
-static const ALIGN_ASSET(2) char spot03_room_0DL_003298[] = dspot03_room_0DL_003298;
-
-#define dspot03_room_0Tex_009BB0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Tex_009BB0"
+#define dspot03_room_0Tex_009BB0 "__OTR__scenes/shared/spot03_scene/spot03_room_0Tex_009BB0"
 static const ALIGN_ASSET(2) char spot03_room_0Tex_009BB0[] = dspot03_room_0Tex_009BB0;
 
-#define dspot03_room_0DL_004658 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0DL_004658"
-static const ALIGN_ASSET(2) char spot03_room_0DL_004658[] = dspot03_room_0DL_004658;
+#define dspot03_room_0Tex_00A3B0 "__OTR__scenes/shared/spot03_scene/spot03_room_0Tex_00A3B0"
+static const ALIGN_ASSET(2) char spot03_room_0Tex_00A3B0[] = dspot03_room_0Tex_00A3B0;
 
-#define dspot03_room_0DL_0054D8 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0DL_0054D8"
-static const ALIGN_ASSET(2) char spot03_room_0DL_0054D8[] = dspot03_room_0DL_0054D8;
+#define dspot03_room_0Tex_00ABB0 "__OTR__scenes/shared/spot03_scene/spot03_room_0Tex_00ABB0"
+static const ALIGN_ASSET(2) char spot03_room_0Tex_00ABB0[] = dspot03_room_0Tex_00ABB0;
 
-#define dspot03_room_0DL_006508 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0DL_006508"
-static const ALIGN_ASSET(2) char spot03_room_0DL_006508[] = dspot03_room_0DL_006508;
+#define dspot03_room_0Tex_00BBB0 "__OTR__scenes/shared/spot03_scene/spot03_room_0Tex_00BBB0"
+static const ALIGN_ASSET(2) char spot03_room_0Tex_00BBB0[] = dspot03_room_0Tex_00BBB0;
 
-#define dspot03_room_0DL_007478 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0DL_007478"
-static const ALIGN_ASSET(2) char spot03_room_0DL_007478[] = dspot03_room_0DL_007478;
-
-#define dspot03_room_0DL_008B88 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0DL_008B88"
-static const ALIGN_ASSET(2) char spot03_room_0DL_008B88[] = dspot03_room_0DL_008B88;
-
-#define dspot03_room_0Tex_00BFB0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Tex_00BFB0"
+#define dspot03_room_0Tex_00BFB0 "__OTR__scenes/shared/spot03_scene/spot03_room_0Tex_00BFB0"
 static const ALIGN_ASSET(2) char spot03_room_0Tex_00BFB0[] = dspot03_room_0Tex_00BFB0;
 
-#define dspot03_room_0DL_009330 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0DL_009330"
+#define dspot03_room_0Tex_00D180 "__OTR__scenes/shared/spot03_scene/spot03_room_0Tex_00D180"
+static const ALIGN_ASSET(2) char spot03_room_0Tex_00D180[] = dspot03_room_0Tex_00D180;
+
+#define dspot03_room_0DL_009660 "__OTR__scenes/shared/spot03_scene/spot03_room_0DL_009660"
+static const ALIGN_ASSET(2) char spot03_room_0DL_009660[] = dspot03_room_0DL_009660;
+
+#define dspot03_room_0DL_001460 "__OTR__scenes/shared/spot03_scene/spot03_room_0DL_001460"
+static const ALIGN_ASSET(2) char spot03_room_0DL_001460[] = dspot03_room_0DL_001460;
+
+#define dspot03_room_0DL_00C4B0 "__OTR__scenes/shared/spot03_scene/spot03_room_0DL_00C4B0"
+static const ALIGN_ASSET(2) char spot03_room_0DL_00C4B0[] = dspot03_room_0DL_00C4B0;
+
+#define dspot03_room_0DL_008248 "__OTR__scenes/shared/spot03_scene/spot03_room_0DL_008248"
+static const ALIGN_ASSET(2) char spot03_room_0DL_008248[] = dspot03_room_0DL_008248;
+
+#define dspot03_room_0DL_007A80 "__OTR__scenes/shared/spot03_scene/spot03_room_0DL_007A80"
+static const ALIGN_ASSET(2) char spot03_room_0DL_007A80[] = dspot03_room_0DL_007A80;
+
+#define dspot03_room_0DL_0022F0 "__OTR__scenes/shared/spot03_scene/spot03_room_0DL_0022F0"
+static const ALIGN_ASSET(2) char spot03_room_0DL_0022F0[] = dspot03_room_0DL_0022F0;
+
+#define dspot03_room_0DL_003298 "__OTR__scenes/shared/spot03_scene/spot03_room_0DL_003298"
+static const ALIGN_ASSET(2) char spot03_room_0DL_003298[] = dspot03_room_0DL_003298;
+
+#define dspot03_room_0DL_004658 "__OTR__scenes/shared/spot03_scene/spot03_room_0DL_004658"
+static const ALIGN_ASSET(2) char spot03_room_0DL_004658[] = dspot03_room_0DL_004658;
+
+#define dspot03_room_0DL_0054D8 "__OTR__scenes/shared/spot03_scene/spot03_room_0DL_0054D8"
+static const ALIGN_ASSET(2) char spot03_room_0DL_0054D8[] = dspot03_room_0DL_0054D8;
+
+#define dspot03_room_0DL_006508 "__OTR__scenes/shared/spot03_scene/spot03_room_0DL_006508"
+static const ALIGN_ASSET(2) char spot03_room_0DL_006508[] = dspot03_room_0DL_006508;
+
+#define dspot03_room_0DL_007478 "__OTR__scenes/shared/spot03_scene/spot03_room_0DL_007478"
+static const ALIGN_ASSET(2) char spot03_room_0DL_007478[] = dspot03_room_0DL_007478;
+
+#define dspot03_room_0DL_008B88 "__OTR__scenes/shared/spot03_scene/spot03_room_0DL_008B88"
+static const ALIGN_ASSET(2) char spot03_room_0DL_008B88[] = dspot03_room_0DL_008B88;
+
+#define dspot03_room_0DL_009330 "__OTR__scenes/shared/spot03_scene/spot03_room_0DL_009330"
 static const ALIGN_ASSET(2) char spot03_room_0DL_009330[] = dspot03_room_0DL_009330;
 
-#define dspot03_room_0DL_00CEB0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0DL_00CEB0"
+#define dspot03_room_0DL_00CEB0 "__OTR__scenes/shared/spot03_scene/spot03_room_0DL_00CEB0"
 static const ALIGN_ASSET(2) char spot03_room_0DL_00CEB0[] = dspot03_room_0DL_00CEB0;
 
-#define dspot03_room_0Set_000580DL_009660 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Set_000580DL_009660"
+#define dspot03_room_0Set_000580DL_009660 "__OTR__scenes/shared/spot03_scene/spot03_room_0Set_000580DL_009660"
 static const ALIGN_ASSET(2) char spot03_room_0Set_000580DL_009660[] = dspot03_room_0Set_000580DL_009660;
 
-#define dspot03_room_0Set_000580DL_001460 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Set_000580DL_001460"
+#define dspot03_room_0Set_000580DL_001460 "__OTR__scenes/shared/spot03_scene/spot03_room_0Set_000580DL_001460"
 static const ALIGN_ASSET(2) char spot03_room_0Set_000580DL_001460[] = dspot03_room_0Set_000580DL_001460;
 
-#define dspot03_room_0Set_000580DL_00C4B0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Set_000580DL_00C4B0"
+#define dspot03_room_0Set_000580DL_00C4B0 "__OTR__scenes/shared/spot03_scene/spot03_room_0Set_000580DL_00C4B0"
 static const ALIGN_ASSET(2) char spot03_room_0Set_000580DL_00C4B0[] = dspot03_room_0Set_000580DL_00C4B0;
 
-#define dspot03_room_0Set_000580DL_008248 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Set_000580DL_008248"
+#define dspot03_room_0Set_000580DL_008248 "__OTR__scenes/shared/spot03_scene/spot03_room_0Set_000580DL_008248"
 static const ALIGN_ASSET(2) char spot03_room_0Set_000580DL_008248[] = dspot03_room_0Set_000580DL_008248;
 
-#define dspot03_room_0Set_000580DL_007A80 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Set_000580DL_007A80"
+#define dspot03_room_0Set_000580DL_007A80 "__OTR__scenes/shared/spot03_scene/spot03_room_0Set_000580DL_007A80"
 static const ALIGN_ASSET(2) char spot03_room_0Set_000580DL_007A80[] = dspot03_room_0Set_000580DL_007A80;
 
-#define dspot03_room_0Set_000580DL_0022F0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Set_000580DL_0022F0"
+#define dspot03_room_0Set_000580DL_0022F0 "__OTR__scenes/shared/spot03_scene/spot03_room_0Set_000580DL_0022F0"
 static const ALIGN_ASSET(2) char spot03_room_0Set_000580DL_0022F0[] = dspot03_room_0Set_000580DL_0022F0;
 
-#define dspot03_room_0Set_000580DL_003298 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Set_000580DL_003298"
+#define dspot03_room_0Set_000580DL_003298 "__OTR__scenes/shared/spot03_scene/spot03_room_0Set_000580DL_003298"
 static const ALIGN_ASSET(2) char spot03_room_0Set_000580DL_003298[] = dspot03_room_0Set_000580DL_003298;
 
-#define dspot03_room_0Set_000580DL_004658 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Set_000580DL_004658"
+#define dspot03_room_0Set_000580DL_004658 "__OTR__scenes/shared/spot03_scene/spot03_room_0Set_000580DL_004658"
 static const ALIGN_ASSET(2) char spot03_room_0Set_000580DL_004658[] = dspot03_room_0Set_000580DL_004658;
 
-#define dspot03_room_0Set_000580DL_0054D8 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Set_000580DL_0054D8"
+#define dspot03_room_0Set_000580DL_0054D8 "__OTR__scenes/shared/spot03_scene/spot03_room_0Set_000580DL_0054D8"
 static const ALIGN_ASSET(2) char spot03_room_0Set_000580DL_0054D8[] = dspot03_room_0Set_000580DL_0054D8;
 
-#define dspot03_room_0Set_000580DL_006508 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Set_000580DL_006508"
+#define dspot03_room_0Set_000580DL_006508 "__OTR__scenes/shared/spot03_scene/spot03_room_0Set_000580DL_006508"
 static const ALIGN_ASSET(2) char spot03_room_0Set_000580DL_006508[] = dspot03_room_0Set_000580DL_006508;
 
-#define dspot03_room_0Set_000580DL_007478 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Set_000580DL_007478"
+#define dspot03_room_0Set_000580DL_007478 "__OTR__scenes/shared/spot03_scene/spot03_room_0Set_000580DL_007478"
 static const ALIGN_ASSET(2) char spot03_room_0Set_000580DL_007478[] = dspot03_room_0Set_000580DL_007478;
 
-#define dspot03_room_0Set_000580DL_008B88 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Set_000580DL_008B88"
+#define dspot03_room_0Set_000580DL_008B88 "__OTR__scenes/shared/spot03_scene/spot03_room_0Set_000580DL_008B88"
 static const ALIGN_ASSET(2) char spot03_room_0Set_000580DL_008B88[] = dspot03_room_0Set_000580DL_008B88;
 
-#define dspot03_room_0Set_000580DL_009330 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Set_000580DL_009330"
+#define dspot03_room_0Set_000580DL_009330 "__OTR__scenes/shared/spot03_scene/spot03_room_0Set_000580DL_009330"
 static const ALIGN_ASSET(2) char spot03_room_0Set_000580DL_009330[] = dspot03_room_0Set_000580DL_009330;
 
-#define dspot03_room_0Set_000580DL_00CEB0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_0Set_000580DL_00CEB0"
+#define dspot03_room_0Set_000580DL_00CEB0 "__OTR__scenes/shared/spot03_scene/spot03_room_0Set_000580DL_00CEB0"
 static const ALIGN_ASSET(2) char spot03_room_0Set_000580DL_00CEB0[] = dspot03_room_0Set_000580DL_00CEB0;
 
 
diff --git a/soh/assets/scenes/overworld/spot03/spot03_room_1.h b/soh/assets/scenes/overworld/spot03/spot03_room_1.h
index 4d5a1cfe8..c5b4367d1 100644
--- a/soh/assets/scenes/overworld/spot03/spot03_room_1.h
+++ b/soh/assets/scenes/overworld/spot03/spot03_room_1.h
@@ -3,88 +3,88 @@
 
 #include "align_asset_macro.h"
 
-#define dgSpot03DL_0074E8 "__OTR__scenes/nonmq/spot03_scene/gSpot03DL_0074E8"
-static const ALIGN_ASSET(2) char gSpot03DL_0074E8[] = dgSpot03DL_0074E8;
-
-#define dspot03_room_1DL_004F98 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1DL_004F98"
-static const ALIGN_ASSET(2) char spot03_room_1DL_004F98[] = dspot03_room_1DL_004F98;
-
-#define dspot03_room_1DL_000750 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1DL_000750"
-static const ALIGN_ASSET(2) char spot03_room_1DL_000750[] = dspot03_room_1DL_000750;
-
-#define dspot03_room_1DL_001078 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1DL_001078"
-static const ALIGN_ASSET(2) char spot03_room_1DL_001078[] = dspot03_room_1DL_001078;
-
-#define dspot03_room_1DL_001AA8 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1DL_001AA8"
-static const ALIGN_ASSET(2) char spot03_room_1DL_001AA8[] = dspot03_room_1DL_001AA8;
-
-#define dspot03_room_1DL_003658 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1DL_003658"
-static const ALIGN_ASSET(2) char spot03_room_1DL_003658[] = dspot03_room_1DL_003658;
-
-#define dspot03_room_1DL_0023E0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1DL_0023E0"
-static const ALIGN_ASSET(2) char spot03_room_1DL_0023E0[] = dspot03_room_1DL_0023E0;
-
-#define dspot03_room_1Tex_0058D8 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1Tex_0058D8"
-static const ALIGN_ASSET(2) char spot03_room_1Tex_0058D8[] = dspot03_room_1Tex_0058D8;
-
-#define dspot03_room_1Tex_0050D8 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1Tex_0050D8"
+#define dspot03_room_1Tex_0050D8 "__OTR__scenes/shared/spot03_scene/spot03_room_1Tex_0050D8"
 static const ALIGN_ASSET(2) char spot03_room_1Tex_0050D8[] = dspot03_room_1Tex_0050D8;
 
-#define dspot03_room_1Tex_0062D8 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1Tex_0062D8"
-static const ALIGN_ASSET(2) char spot03_room_1Tex_0062D8[] = dspot03_room_1Tex_0062D8;
+#define dspot03_room_1Tex_0058D8 "__OTR__scenes/shared/spot03_scene/spot03_room_1Tex_0058D8"
+static const ALIGN_ASSET(2) char spot03_room_1Tex_0058D8[] = dspot03_room_1Tex_0058D8;
 
-#define dspot03_room_1DL_0043D0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1DL_0043D0"
-static const ALIGN_ASSET(2) char spot03_room_1DL_0043D0[] = dspot03_room_1DL_0043D0;
-
-#define dspot03_room_1DL_002CB0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1DL_002CB0"
-static const ALIGN_ASSET(2) char spot03_room_1DL_002CB0[] = dspot03_room_1DL_002CB0;
-
-#define dspot03_room_1Tex_005ED8 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1Tex_005ED8"
-static const ALIGN_ASSET(2) char spot03_room_1Tex_005ED8[] = dspot03_room_1Tex_005ED8;
-
-#define dspot03_room_1Tex_005CD8 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1Tex_005CD8"
+#define dspot03_room_1Tex_005CD8 "__OTR__scenes/shared/spot03_scene/spot03_room_1Tex_005CD8"
 static const ALIGN_ASSET(2) char spot03_room_1Tex_005CD8[] = dspot03_room_1Tex_005CD8;
 
-#define dspot03_room_1DL_0047C0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1DL_0047C0"
+#define dspot03_room_1Tex_005ED8 "__OTR__scenes/shared/spot03_scene/spot03_room_1Tex_005ED8"
+static const ALIGN_ASSET(2) char spot03_room_1Tex_005ED8[] = dspot03_room_1Tex_005ED8;
+
+#define dspot03_room_1Tex_0062D8 "__OTR__scenes/shared/spot03_scene/spot03_room_1Tex_0062D8"
+static const ALIGN_ASSET(2) char spot03_room_1Tex_0062D8[] = dspot03_room_1Tex_0062D8;
+
+#define dgSpot03DL_0074E8 "__OTR__scenes/shared/spot03_scene/gSpot03DL_0074E8"
+static const ALIGN_ASSET(2) char gSpot03DL_0074E8[] = dgSpot03DL_0074E8;
+
+#define dspot03_room_1DL_004F98 "__OTR__scenes/shared/spot03_scene/spot03_room_1DL_004F98"
+static const ALIGN_ASSET(2) char spot03_room_1DL_004F98[] = dspot03_room_1DL_004F98;
+
+#define dspot03_room_1DL_000750 "__OTR__scenes/shared/spot03_scene/spot03_room_1DL_000750"
+static const ALIGN_ASSET(2) char spot03_room_1DL_000750[] = dspot03_room_1DL_000750;
+
+#define dspot03_room_1DL_001078 "__OTR__scenes/shared/spot03_scene/spot03_room_1DL_001078"
+static const ALIGN_ASSET(2) char spot03_room_1DL_001078[] = dspot03_room_1DL_001078;
+
+#define dspot03_room_1DL_001AA8 "__OTR__scenes/shared/spot03_scene/spot03_room_1DL_001AA8"
+static const ALIGN_ASSET(2) char spot03_room_1DL_001AA8[] = dspot03_room_1DL_001AA8;
+
+#define dspot03_room_1DL_003658 "__OTR__scenes/shared/spot03_scene/spot03_room_1DL_003658"
+static const ALIGN_ASSET(2) char spot03_room_1DL_003658[] = dspot03_room_1DL_003658;
+
+#define dspot03_room_1DL_0023E0 "__OTR__scenes/shared/spot03_scene/spot03_room_1DL_0023E0"
+static const ALIGN_ASSET(2) char spot03_room_1DL_0023E0[] = dspot03_room_1DL_0023E0;
+
+#define dspot03_room_1DL_0043D0 "__OTR__scenes/shared/spot03_scene/spot03_room_1DL_0043D0"
+static const ALIGN_ASSET(2) char spot03_room_1DL_0043D0[] = dspot03_room_1DL_0043D0;
+
+#define dspot03_room_1DL_002CB0 "__OTR__scenes/shared/spot03_scene/spot03_room_1DL_002CB0"
+static const ALIGN_ASSET(2) char spot03_room_1DL_002CB0[] = dspot03_room_1DL_002CB0;
+
+#define dspot03_room_1DL_0047C0 "__OTR__scenes/shared/spot03_scene/spot03_room_1DL_0047C0"
 static const ALIGN_ASSET(2) char spot03_room_1DL_0047C0[] = dspot03_room_1DL_0047C0;
 
-#define dspot03_room_1DL_004C88 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1DL_004C88"
+#define dspot03_room_1DL_004C88 "__OTR__scenes/shared/spot03_scene/spot03_room_1DL_004C88"
 static const ALIGN_ASSET(2) char spot03_room_1DL_004C88[] = dspot03_room_1DL_004C88;
 
-#define dspot03_room_1DL_007210 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1DL_007210"
+#define dspot03_room_1DL_007210 "__OTR__scenes/shared/spot03_scene/spot03_room_1DL_007210"
 static const ALIGN_ASSET(2) char spot03_room_1DL_007210[] = dspot03_room_1DL_007210;
 
-#define dspot03_room_1Set_0001E0DL_004F98 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1Set_0001E0DL_004F98"
+#define dspot03_room_1Set_0001E0DL_004F98 "__OTR__scenes/shared/spot03_scene/spot03_room_1Set_0001E0DL_004F98"
 static const ALIGN_ASSET(2) char spot03_room_1Set_0001E0DL_004F98[] = dspot03_room_1Set_0001E0DL_004F98;
 
-#define dspot03_room_1Set_0001E0DL_000750 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1Set_0001E0DL_000750"
+#define dspot03_room_1Set_0001E0DL_000750 "__OTR__scenes/shared/spot03_scene/spot03_room_1Set_0001E0DL_000750"
 static const ALIGN_ASSET(2) char spot03_room_1Set_0001E0DL_000750[] = dspot03_room_1Set_0001E0DL_000750;
 
-#define dspot03_room_1Set_0001E0DL_001078 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1Set_0001E0DL_001078"
+#define dspot03_room_1Set_0001E0DL_001078 "__OTR__scenes/shared/spot03_scene/spot03_room_1Set_0001E0DL_001078"
 static const ALIGN_ASSET(2) char spot03_room_1Set_0001E0DL_001078[] = dspot03_room_1Set_0001E0DL_001078;
 
-#define dspot03_room_1Set_0001E0DL_001AA8 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1Set_0001E0DL_001AA8"
+#define dspot03_room_1Set_0001E0DL_001AA8 "__OTR__scenes/shared/spot03_scene/spot03_room_1Set_0001E0DL_001AA8"
 static const ALIGN_ASSET(2) char spot03_room_1Set_0001E0DL_001AA8[] = dspot03_room_1Set_0001E0DL_001AA8;
 
-#define dspot03_room_1Set_0001E0DL_003658 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1Set_0001E0DL_003658"
+#define dspot03_room_1Set_0001E0DL_003658 "__OTR__scenes/shared/spot03_scene/spot03_room_1Set_0001E0DL_003658"
 static const ALIGN_ASSET(2) char spot03_room_1Set_0001E0DL_003658[] = dspot03_room_1Set_0001E0DL_003658;
 
-#define dspot03_room_1Set_0001E0DL_0023E0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1Set_0001E0DL_0023E0"
+#define dspot03_room_1Set_0001E0DL_0023E0 "__OTR__scenes/shared/spot03_scene/spot03_room_1Set_0001E0DL_0023E0"
 static const ALIGN_ASSET(2) char spot03_room_1Set_0001E0DL_0023E0[] = dspot03_room_1Set_0001E0DL_0023E0;
 
-#define dspot03_room_1Set_0001E0DL_0043D0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1Set_0001E0DL_0043D0"
+#define dspot03_room_1Set_0001E0DL_0043D0 "__OTR__scenes/shared/spot03_scene/spot03_room_1Set_0001E0DL_0043D0"
 static const ALIGN_ASSET(2) char spot03_room_1Set_0001E0DL_0043D0[] = dspot03_room_1Set_0001E0DL_0043D0;
 
-#define dspot03_room_1Set_0001E0DL_002CB0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1Set_0001E0DL_002CB0"
+#define dspot03_room_1Set_0001E0DL_002CB0 "__OTR__scenes/shared/spot03_scene/spot03_room_1Set_0001E0DL_002CB0"
 static const ALIGN_ASSET(2) char spot03_room_1Set_0001E0DL_002CB0[] = dspot03_room_1Set_0001E0DL_002CB0;
 
-#define dspot03_room_1Set_0001E0DL_0047C0 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1Set_0001E0DL_0047C0"
+#define dspot03_room_1Set_0001E0DL_0047C0 "__OTR__scenes/shared/spot03_scene/spot03_room_1Set_0001E0DL_0047C0"
 static const ALIGN_ASSET(2) char spot03_room_1Set_0001E0DL_0047C0[] = dspot03_room_1Set_0001E0DL_0047C0;
 
-#define dspot03_room_1Set_0001E0DL_004C88 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1Set_0001E0DL_004C88"
+#define dspot03_room_1Set_0001E0DL_004C88 "__OTR__scenes/shared/spot03_scene/spot03_room_1Set_0001E0DL_004C88"
 static const ALIGN_ASSET(2) char spot03_room_1Set_0001E0DL_004C88[] = dspot03_room_1Set_0001E0DL_004C88;
 
-#define dspot03_room_1Set_0001E0DL_007210 "__OTR__scenes/nonmq/spot03_scene/spot03_room_1Set_0001E0DL_007210"
+#define dspot03_room_1Set_0001E0DL_007210 "__OTR__scenes/shared/spot03_scene/spot03_room_1Set_0001E0DL_007210"
 static const ALIGN_ASSET(2) char spot03_room_1Set_0001E0DL_007210[] = dspot03_room_1Set_0001E0DL_007210;
 
 
diff --git a/soh/assets/scenes/overworld/spot03/spot03_scene.h b/soh/assets/scenes/overworld/spot03/spot03_scene.h
index 477894324..8e7060047 100644
--- a/soh/assets/scenes/overworld/spot03/spot03_scene.h
+++ b/soh/assets/scenes/overworld/spot03/spot03_scene.h
@@ -3,52 +3,52 @@
 
 #include "align_asset_macro.h"
 
-#define dspot03_sceneCollisionHeader_006580 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneCollisionHeader_006580"
-static const ALIGN_ASSET(2) char spot03_sceneCollisionHeader_006580[] = dspot03_sceneCollisionHeader_006580;
-
-#define dspot03_sceneTex_007D58 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneTex_007D58"
-static const ALIGN_ASSET(2) char spot03_sceneTex_007D58[] = dspot03_sceneTex_007D58;
-
-#define dspot03_sceneTex_00A558 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneTex_00A558"
-static const ALIGN_ASSET(2) char spot03_sceneTex_00A558[] = dspot03_sceneTex_00A558;
-
-#define dspot03_sceneTex_009D58 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneTex_009D58"
-static const ALIGN_ASSET(2) char spot03_sceneTex_009D58[] = dspot03_sceneTex_009D58;
-
-#define dspot03_sceneTex_006D58 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneTex_006D58"
+#define dspot03_sceneTex_006D58 "__OTR__scenes/shared/spot03_scene/spot03_sceneTex_006D58"
 static const ALIGN_ASSET(2) char spot03_sceneTex_006D58[] = dspot03_sceneTex_006D58;
 
-#define dspot03_sceneTLUT_006920 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneTLUT_006920"
-static const ALIGN_ASSET(2) char spot03_sceneTLUT_006920[] = dspot03_sceneTLUT_006920;
-
-#define dspot03_sceneTLUT_006B28 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneTLUT_006B28"
-static const ALIGN_ASSET(2) char spot03_sceneTLUT_006B28[] = dspot03_sceneTLUT_006B28;
-
-#define dspot03_sceneTex_00AD58 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneTex_00AD58"
-static const ALIGN_ASSET(2) char spot03_sceneTex_00AD58[] = dspot03_sceneTex_00AD58;
-
-#define dspot03_sceneTex_008558 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneTex_008558"
-static const ALIGN_ASSET(2) char spot03_sceneTex_008558[] = dspot03_sceneTex_008558;
-
-#define dspot03_sceneTex_009558 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneTex_009558"
-static const ALIGN_ASSET(2) char spot03_sceneTex_009558[] = dspot03_sceneTex_009558;
-
-#define dspot03_sceneTLUT_006D30 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneTLUT_006D30"
-static const ALIGN_ASSET(2) char spot03_sceneTLUT_006D30[] = dspot03_sceneTLUT_006D30;
-
-#define dspot03_sceneTex_007958 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneTex_007958"
-static const ALIGN_ASSET(2) char spot03_sceneTex_007958[] = dspot03_sceneTex_007958;
-
-#define dspot03_sceneTex_007158 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneTex_007158"
+#define dspot03_sceneTex_007158 "__OTR__scenes/shared/spot03_scene/spot03_sceneTex_007158"
 static const ALIGN_ASSET(2) char spot03_sceneTex_007158[] = dspot03_sceneTex_007158;
 
-#define dspot03_sceneTex_007558 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneTex_007558"
+#define dspot03_sceneTex_007558 "__OTR__scenes/shared/spot03_scene/spot03_sceneTex_007558"
 static const ALIGN_ASSET(2) char spot03_sceneTex_007558[] = dspot03_sceneTex_007558;
 
-#define dspot03_sceneTex_008D58 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneTex_008D58"
+#define dspot03_sceneTex_007958 "__OTR__scenes/shared/spot03_scene/spot03_sceneTex_007958"
+static const ALIGN_ASSET(2) char spot03_sceneTex_007958[] = dspot03_sceneTex_007958;
+
+#define dspot03_sceneTex_007D58 "__OTR__scenes/shared/spot03_scene/spot03_sceneTex_007D58"
+static const ALIGN_ASSET(2) char spot03_sceneTex_007D58[] = dspot03_sceneTex_007D58;
+
+#define dspot03_sceneTex_008558 "__OTR__scenes/shared/spot03_scene/spot03_sceneTex_008558"
+static const ALIGN_ASSET(2) char spot03_sceneTex_008558[] = dspot03_sceneTex_008558;
+
+#define dspot03_sceneTex_008D58 "__OTR__scenes/shared/spot03_scene/spot03_sceneTex_008D58"
 static const ALIGN_ASSET(2) char spot03_sceneTex_008D58[] = dspot03_sceneTex_008D58;
 
-#define dspot03_sceneCollisionHeader_006580 "__OTR__scenes/nonmq/spot03_scene/spot03_sceneCollisionHeader_006580"
+#define dspot03_sceneTex_009558 "__OTR__scenes/shared/spot03_scene/spot03_sceneTex_009558"
+static const ALIGN_ASSET(2) char spot03_sceneTex_009558[] = dspot03_sceneTex_009558;
+
+#define dspot03_sceneTex_009D58 "__OTR__scenes/shared/spot03_scene/spot03_sceneTex_009D58"
+static const ALIGN_ASSET(2) char spot03_sceneTex_009D58[] = dspot03_sceneTex_009D58;
+
+#define dspot03_sceneTex_00A558 "__OTR__scenes/shared/spot03_scene/spot03_sceneTex_00A558"
+static const ALIGN_ASSET(2) char spot03_sceneTex_00A558[] = dspot03_sceneTex_00A558;
+
+#define dspot03_sceneTex_00AD58 "__OTR__scenes/shared/spot03_scene/spot03_sceneTex_00AD58"
+static const ALIGN_ASSET(2) char spot03_sceneTex_00AD58[] = dspot03_sceneTex_00AD58;
+
+#define dspot03_sceneTLUT_006920 "__OTR__scenes/shared/spot03_scene/spot03_sceneTLUT_006920"
+static const ALIGN_ASSET(2) char spot03_sceneTLUT_006920[] = dspot03_sceneTLUT_006920;
+
+#define dspot03_sceneTLUT_006B28 "__OTR__scenes/shared/spot03_scene/spot03_sceneTLUT_006B28"
+static const ALIGN_ASSET(2) char spot03_sceneTLUT_006B28[] = dspot03_sceneTLUT_006B28;
+
+#define dspot03_sceneTLUT_006D30 "__OTR__scenes/shared/spot03_scene/spot03_sceneTLUT_006D30"
+static const ALIGN_ASSET(2) char spot03_sceneTLUT_006D30[] = dspot03_sceneTLUT_006D30;
+
+#define dspot03_sceneCollisionHeader_006580 "__OTR__scenes/shared/spot03_scene/spot03_sceneCollisionHeader_006580"
+static const ALIGN_ASSET(2) char spot03_sceneCollisionHeader_006580[] = dspot03_sceneCollisionHeader_006580;
+
+#define dspot03_sceneCollisionHeader_006580 "__OTR__scenes/shared/spot03_scene/spot03_sceneCollisionHeader_006580"
 
 
 #endif // OVERWORLD_SPOT03_SCENE_H
diff --git a/soh/assets/scenes/overworld/spot04/spot04_room_0.h b/soh/assets/scenes/overworld/spot04/spot04_room_0.h
index a457f0932..316b0fa6a 100644
--- a/soh/assets/scenes/overworld/spot04/spot04_room_0.h
+++ b/soh/assets/scenes/overworld/spot04/spot04_room_0.h
@@ -3,940 +3,940 @@
 
 #include "align_asset_macro.h"
 
-#define dspot04_room_0DL_008ED8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_008ED8"
-static const ALIGN_ASSET(2) char spot04_room_0DL_008ED8[] = dspot04_room_0DL_008ED8;
-
-#define dspot04_room_0Tex_013F08 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_013F08"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_013F08[] = dspot04_room_0Tex_013F08;
-
-#define dspot04_room_0Tex_011D08 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_011D08"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_011D08[] = dspot04_room_0Tex_011D08;
-
-#define dspot04_room_0Tex_015B08 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_015B08"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_015B08[] = dspot04_room_0Tex_015B08;
-
-#define dspot04_room_0DL_0187F0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_0187F0"
-static const ALIGN_ASSET(2) char spot04_room_0DL_0187F0[] = dspot04_room_0DL_0187F0;
-
-#define dspot04_room_0Tex_01A290 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_01A290"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_01A290[] = dspot04_room_0Tex_01A290;
-
-#define dspot04_room_0DL_007A20 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_007A20"
-static const ALIGN_ASSET(2) char spot04_room_0DL_007A20[] = dspot04_room_0DL_007A20;
-
-#define dspot04_room_0Tex_00FD08 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_00FD08"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_00FD08[] = dspot04_room_0Tex_00FD08;
-
-#define dspot04_room_0Tex_00F508 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_00F508"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_00F508[] = dspot04_room_0Tex_00F508;
-
-#define dspot04_room_0Tex_00F108 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_00F108"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_00F108[] = dspot04_room_0Tex_00F108;
-
-#define dspot04_room_0Tex_010D08 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_010D08"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_010D08[] = dspot04_room_0Tex_010D08;
-
-#define dspot04_room_0Tex_00E108 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_00E108"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_00E108[] = dspot04_room_0Tex_00E108;
-
-#define dspot04_room_0Tex_00BF08 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_00BF08"
+#define dspot04_room_0Tex_00BF08 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_00BF08"
 static const ALIGN_ASSET(2) char spot04_room_0Tex_00BF08[] = dspot04_room_0Tex_00BF08;
 
-#define dspot04_room_0Tex_00E908 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_00E908"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_00E908[] = dspot04_room_0Tex_00E908;
-
-#define dspot04_room_0DL_018490 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_018490"
-static const ALIGN_ASSET(2) char spot04_room_0DL_018490[] = dspot04_room_0DL_018490;
-
-#define dspot04_room_0Tex_01A490 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_01A490"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_01A490[] = dspot04_room_0Tex_01A490;
-
-#define dspot04_room_0Tex_01AE90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_01AE90"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_01AE90[] = dspot04_room_0Tex_01AE90;
-
-#define dspot04_room_0Tex_01AC90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_01AC90"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_01AC90[] = dspot04_room_0Tex_01AC90;
-
-#define dspot04_room_0DL_008638 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_008638"
-static const ALIGN_ASSET(2) char spot04_room_0DL_008638[] = dspot04_room_0DL_008638;
-
-#define dspot04_room_0Tex_016908 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_016908"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_016908[] = dspot04_room_0Tex_016908;
-
-#define dspot04_room_0DL_00A080 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_00A080"
-static const ALIGN_ASSET(2) char spot04_room_0DL_00A080[] = dspot04_room_0DL_00A080;
-
-#define dspot04_room_0DL_017BD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_017BD0"
-static const ALIGN_ASSET(2) char spot04_room_0DL_017BD0[] = dspot04_room_0DL_017BD0;
-
-#define dspot04_room_0Tex_018A90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_018A90"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_018A90[] = dspot04_room_0Tex_018A90;
-
-#define dspot04_room_0DL_004860 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_004860"
-static const ALIGN_ASSET(2) char spot04_room_0DL_004860[] = dspot04_room_0DL_004860;
-
-#define dspot04_room_0DL_018048 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_018048"
-static const ALIGN_ASSET(2) char spot04_room_0DL_018048[] = dspot04_room_0DL_018048;
-
-#define dspot04_room_0Tex_019A90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_019A90"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_019A90[] = dspot04_room_0Tex_019A90;
-
-#define dspot04_room_0Tex_019290 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_019290"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_019290[] = dspot04_room_0Tex_019290;
-
-#define dspot04_room_0DL_00AE90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_00AE90"
-static const ALIGN_ASSET(2) char spot04_room_0DL_00AE90[] = dspot04_room_0DL_00AE90;
-
-#define dspot04_room_0DL_002A10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_002A10"
-static const ALIGN_ASSET(2) char spot04_room_0DL_002A10[] = dspot04_room_0DL_002A10;
-
-#define dspot04_room_0Tex_013108 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_013108"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_013108[] = dspot04_room_0Tex_013108;
-
-#define dspot04_room_0Tex_012F08 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_012F08"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_012F08[] = dspot04_room_0Tex_012F08;
-
-#define dspot04_room_0DL_005A80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_005A80"
-static const ALIGN_ASSET(2) char spot04_room_0DL_005A80[] = dspot04_room_0DL_005A80;
-
-#define dspot04_room_0Tex_015308 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_015308"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_015308[] = dspot04_room_0Tex_015308;
-
-#define dspot04_room_0Tex_014B08 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_014B08"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_014B08[] = dspot04_room_0Tex_014B08;
-
-#define dspot04_room_0DL_00B280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_00B280"
-static const ALIGN_ASSET(2) char spot04_room_0DL_00B280[] = dspot04_room_0DL_00B280;
-
-#define dspot04_room_0Tex_017108 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_017108"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_017108[] = dspot04_room_0Tex_017108;
-
-#define dspot04_room_0Tex_00D908 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_00D908"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_00D908[] = dspot04_room_0Tex_00D908;
-
-#define dspot04_room_0DL_00B8F8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_00B8F8"
-static const ALIGN_ASSET(2) char spot04_room_0DL_00B8F8[] = dspot04_room_0DL_00B8F8;
-
-#define dspot04_room_0Tex_016D08 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_016D08"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_016D08[] = dspot04_room_0Tex_016D08;
-
-#define dspot04_room_0Tex_013308 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_013308"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_013308[] = dspot04_room_0Tex_013308;
-
-#define dspot04_room_0DL_0189A8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_0189A8"
-static const ALIGN_ASSET(2) char spot04_room_0DL_0189A8[] = dspot04_room_0DL_0189A8;
-
-#define dspot04_room_0Tex_01B090 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_01B090"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_01B090[] = dspot04_room_0Tex_01B090;
-
-#define dspot04_room_0DL_00BD98 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_00BD98"
-static const ALIGN_ASSET(2) char spot04_room_0DL_00BD98[] = dspot04_room_0DL_00BD98;
-
-#define dspot04_room_0Tex_011F08 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_011F08"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_011F08[] = dspot04_room_0Tex_011F08;
-
-#define dspot04_room_0DL_006280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_006280"
-static const ALIGN_ASSET(2) char spot04_room_0DL_006280[] = dspot04_room_0DL_006280;
-
-#define dspot04_room_0Tex_00CF08 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_00CF08"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_00CF08[] = dspot04_room_0Tex_00CF08;
-
-#define dspot04_room_0DL_006C10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_006C10"
-static const ALIGN_ASSET(2) char spot04_room_0DL_006C10[] = dspot04_room_0DL_006C10;
-
-#define dspot04_room_0Tex_00D408 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_00D408"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_00D408[] = dspot04_room_0Tex_00D408;
-
-#define dspot04_room_0Tex_00D308 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_00D308"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_00D308[] = dspot04_room_0Tex_00D308;
-
-#define dspot04_room_0Tex_015D08 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_015D08"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_015D08[] = dspot04_room_0Tex_015D08;
-
-#define dspot04_room_0DL_009740 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_009740"
-static const ALIGN_ASSET(2) char spot04_room_0DL_009740[] = dspot04_room_0DL_009740;
-
-#define dspot04_room_0Tex_016508 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_016508"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_016508[] = dspot04_room_0Tex_016508;
-
-#define dspot04_room_0DL_00A808 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_00A808"
-static const ALIGN_ASSET(2) char spot04_room_0DL_00A808[] = dspot04_room_0DL_00A808;
-
-#define dspot04_room_0Tex_016108 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_016108"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_016108[] = dspot04_room_0Tex_016108;
-
-#define dspot04_room_0Tex_00D508 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_00D508"
-static const ALIGN_ASSET(2) char spot04_room_0Tex_00D508[] = dspot04_room_0Tex_00D508;
-
-#define dspot04_room_0DL_0055C0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0DL_0055C0"
-static const ALIGN_ASSET(2) char spot04_room_0DL_0055C0[] = dspot04_room_0DL_0055C0;
-
-#define dspot04_room_0Tex_00C708 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_00C708"
+#define dspot04_room_0Tex_00C708 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_00C708"
 static const ALIGN_ASSET(2) char spot04_room_0Tex_00C708[] = dspot04_room_0Tex_00C708;
 
-#define dspot04_room_0Tex_00CB08 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_00CB08"
+#define dspot04_room_0Tex_00CB08 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_00CB08"
 static const ALIGN_ASSET(2) char spot04_room_0Tex_00CB08[] = dspot04_room_0Tex_00CB08;
 
-#define dspot04_room_0Tex_013708 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_013708"
+#define dspot04_room_0Tex_00CF08 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_00CF08"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_00CF08[] = dspot04_room_0Tex_00CF08;
+
+#define dspot04_room_0Tex_00D308 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_00D308"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_00D308[] = dspot04_room_0Tex_00D308;
+
+#define dspot04_room_0Tex_00D408 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_00D408"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_00D408[] = dspot04_room_0Tex_00D408;
+
+#define dspot04_room_0Tex_00D508 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_00D508"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_00D508[] = dspot04_room_0Tex_00D508;
+
+#define dspot04_room_0Tex_00D908 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_00D908"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_00D908[] = dspot04_room_0Tex_00D908;
+
+#define dspot04_room_0Tex_00E108 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_00E108"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_00E108[] = dspot04_room_0Tex_00E108;
+
+#define dspot04_room_0Tex_00E908 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_00E908"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_00E908[] = dspot04_room_0Tex_00E908;
+
+#define dspot04_room_0Tex_00F108 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_00F108"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_00F108[] = dspot04_room_0Tex_00F108;
+
+#define dspot04_room_0Tex_00F508 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_00F508"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_00F508[] = dspot04_room_0Tex_00F508;
+
+#define dspot04_room_0Tex_00FD08 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_00FD08"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_00FD08[] = dspot04_room_0Tex_00FD08;
+
+#define dspot04_room_0Tex_010D08 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_010D08"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_010D08[] = dspot04_room_0Tex_010D08;
+
+#define dspot04_room_0Tex_011D08 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_011D08"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_011D08[] = dspot04_room_0Tex_011D08;
+
+#define dspot04_room_0Tex_011F08 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_011F08"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_011F08[] = dspot04_room_0Tex_011F08;
+
+#define dspot04_room_0Tex_012F08 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_012F08"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_012F08[] = dspot04_room_0Tex_012F08;
+
+#define dspot04_room_0Tex_013108 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_013108"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_013108[] = dspot04_room_0Tex_013108;
+
+#define dspot04_room_0Tex_013308 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_013308"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_013308[] = dspot04_room_0Tex_013308;
+
+#define dspot04_room_0Tex_013708 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_013708"
 static const ALIGN_ASSET(2) char spot04_room_0Tex_013708[] = dspot04_room_0Tex_013708;
 
-#define dspot04_room_0Tex_014308 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Tex_014308"
+#define dspot04_room_0Tex_013F08 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_013F08"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_013F08[] = dspot04_room_0Tex_013F08;
+
+#define dspot04_room_0Tex_014308 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_014308"
 static const ALIGN_ASSET(2) char spot04_room_0Tex_014308[] = dspot04_room_0Tex_014308;
 
-#define dspot04_room_0Set_0006B0DL_008ED8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_008ED8"
+#define dspot04_room_0Tex_014B08 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_014B08"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_014B08[] = dspot04_room_0Tex_014B08;
+
+#define dspot04_room_0Tex_015308 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_015308"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_015308[] = dspot04_room_0Tex_015308;
+
+#define dspot04_room_0Tex_015B08 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_015B08"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_015B08[] = dspot04_room_0Tex_015B08;
+
+#define dspot04_room_0Tex_015D08 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_015D08"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_015D08[] = dspot04_room_0Tex_015D08;
+
+#define dspot04_room_0Tex_016108 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_016108"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_016108[] = dspot04_room_0Tex_016108;
+
+#define dspot04_room_0Tex_016508 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_016508"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_016508[] = dspot04_room_0Tex_016508;
+
+#define dspot04_room_0Tex_016908 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_016908"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_016908[] = dspot04_room_0Tex_016908;
+
+#define dspot04_room_0Tex_016D08 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_016D08"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_016D08[] = dspot04_room_0Tex_016D08;
+
+#define dspot04_room_0Tex_017108 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_017108"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_017108[] = dspot04_room_0Tex_017108;
+
+#define dspot04_room_0Tex_018A90 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_018A90"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_018A90[] = dspot04_room_0Tex_018A90;
+
+#define dspot04_room_0Tex_019290 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_019290"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_019290[] = dspot04_room_0Tex_019290;
+
+#define dspot04_room_0Tex_019A90 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_019A90"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_019A90[] = dspot04_room_0Tex_019A90;
+
+#define dspot04_room_0Tex_01A290 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_01A290"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_01A290[] = dspot04_room_0Tex_01A290;
+
+#define dspot04_room_0Tex_01A490 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_01A490"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_01A490[] = dspot04_room_0Tex_01A490;
+
+#define dspot04_room_0Tex_01AC90 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_01AC90"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_01AC90[] = dspot04_room_0Tex_01AC90;
+
+#define dspot04_room_0Tex_01AE90 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_01AE90"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_01AE90[] = dspot04_room_0Tex_01AE90;
+
+#define dspot04_room_0Tex_01B090 "__OTR__scenes/shared/spot04_scene/spot04_room_0Tex_01B090"
+static const ALIGN_ASSET(2) char spot04_room_0Tex_01B090[] = dspot04_room_0Tex_01B090;
+
+#define dspot04_room_0DL_008ED8 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_008ED8"
+static const ALIGN_ASSET(2) char spot04_room_0DL_008ED8[] = dspot04_room_0DL_008ED8;
+
+#define dspot04_room_0DL_0187F0 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_0187F0"
+static const ALIGN_ASSET(2) char spot04_room_0DL_0187F0[] = dspot04_room_0DL_0187F0;
+
+#define dspot04_room_0DL_007A20 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_007A20"
+static const ALIGN_ASSET(2) char spot04_room_0DL_007A20[] = dspot04_room_0DL_007A20;
+
+#define dspot04_room_0DL_018490 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_018490"
+static const ALIGN_ASSET(2) char spot04_room_0DL_018490[] = dspot04_room_0DL_018490;
+
+#define dspot04_room_0DL_008638 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_008638"
+static const ALIGN_ASSET(2) char spot04_room_0DL_008638[] = dspot04_room_0DL_008638;
+
+#define dspot04_room_0DL_00A080 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_00A080"
+static const ALIGN_ASSET(2) char spot04_room_0DL_00A080[] = dspot04_room_0DL_00A080;
+
+#define dspot04_room_0DL_017BD0 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_017BD0"
+static const ALIGN_ASSET(2) char spot04_room_0DL_017BD0[] = dspot04_room_0DL_017BD0;
+
+#define dspot04_room_0DL_004860 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_004860"
+static const ALIGN_ASSET(2) char spot04_room_0DL_004860[] = dspot04_room_0DL_004860;
+
+#define dspot04_room_0DL_018048 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_018048"
+static const ALIGN_ASSET(2) char spot04_room_0DL_018048[] = dspot04_room_0DL_018048;
+
+#define dspot04_room_0DL_00AE90 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_00AE90"
+static const ALIGN_ASSET(2) char spot04_room_0DL_00AE90[] = dspot04_room_0DL_00AE90;
+
+#define dspot04_room_0DL_002A10 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_002A10"
+static const ALIGN_ASSET(2) char spot04_room_0DL_002A10[] = dspot04_room_0DL_002A10;
+
+#define dspot04_room_0DL_005A80 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_005A80"
+static const ALIGN_ASSET(2) char spot04_room_0DL_005A80[] = dspot04_room_0DL_005A80;
+
+#define dspot04_room_0DL_00B280 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_00B280"
+static const ALIGN_ASSET(2) char spot04_room_0DL_00B280[] = dspot04_room_0DL_00B280;
+
+#define dspot04_room_0DL_00B8F8 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_00B8F8"
+static const ALIGN_ASSET(2) char spot04_room_0DL_00B8F8[] = dspot04_room_0DL_00B8F8;
+
+#define dspot04_room_0DL_0189A8 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_0189A8"
+static const ALIGN_ASSET(2) char spot04_room_0DL_0189A8[] = dspot04_room_0DL_0189A8;
+
+#define dspot04_room_0DL_00BD98 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_00BD98"
+static const ALIGN_ASSET(2) char spot04_room_0DL_00BD98[] = dspot04_room_0DL_00BD98;
+
+#define dspot04_room_0DL_006280 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_006280"
+static const ALIGN_ASSET(2) char spot04_room_0DL_006280[] = dspot04_room_0DL_006280;
+
+#define dspot04_room_0DL_006C10 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_006C10"
+static const ALIGN_ASSET(2) char spot04_room_0DL_006C10[] = dspot04_room_0DL_006C10;
+
+#define dspot04_room_0DL_009740 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_009740"
+static const ALIGN_ASSET(2) char spot04_room_0DL_009740[] = dspot04_room_0DL_009740;
+
+#define dspot04_room_0DL_00A808 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_00A808"
+static const ALIGN_ASSET(2) char spot04_room_0DL_00A808[] = dspot04_room_0DL_00A808;
+
+#define dspot04_room_0DL_0055C0 "__OTR__scenes/shared/spot04_scene/spot04_room_0DL_0055C0"
+static const ALIGN_ASSET(2) char spot04_room_0DL_0055C0[] = dspot04_room_0DL_0055C0;
+
+#define dspot04_room_0Set_0006B0DL_008ED8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_008ED8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_008ED8[] = dspot04_room_0Set_0006B0DL_008ED8;
 
-#define dspot04_room_0Set_0006B0DL_0187F0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_0187F0"
+#define dspot04_room_0Set_0006B0DL_0187F0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_0187F0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_0187F0[] = dspot04_room_0Set_0006B0DL_0187F0;
 
-#define dspot04_room_0Set_0006B0DL_007A20 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_007A20"
+#define dspot04_room_0Set_0006B0DL_007A20 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_007A20"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_007A20[] = dspot04_room_0Set_0006B0DL_007A20;
 
-#define dspot04_room_0Set_0006B0DL_018490 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_018490"
+#define dspot04_room_0Set_0006B0DL_018490 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_018490"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_018490[] = dspot04_room_0Set_0006B0DL_018490;
 
-#define dspot04_room_0Set_0006B0DL_008638 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_008638"
+#define dspot04_room_0Set_0006B0DL_008638 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_008638"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_008638[] = dspot04_room_0Set_0006B0DL_008638;
 
-#define dspot04_room_0Set_0006B0DL_00A080 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_00A080"
+#define dspot04_room_0Set_0006B0DL_00A080 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_00A080"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_00A080[] = dspot04_room_0Set_0006B0DL_00A080;
 
-#define dspot04_room_0Set_0006B0DL_017BD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_017BD0"
+#define dspot04_room_0Set_0006B0DL_017BD0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_017BD0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_017BD0[] = dspot04_room_0Set_0006B0DL_017BD0;
 
-#define dspot04_room_0Set_0006B0DL_004860 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_004860"
+#define dspot04_room_0Set_0006B0DL_004860 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_004860"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_004860[] = dspot04_room_0Set_0006B0DL_004860;
 
-#define dspot04_room_0Set_0006B0DL_018048 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_018048"
+#define dspot04_room_0Set_0006B0DL_018048 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_018048"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_018048[] = dspot04_room_0Set_0006B0DL_018048;
 
-#define dspot04_room_0Set_0006B0DL_00AE90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_00AE90"
+#define dspot04_room_0Set_0006B0DL_00AE90 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_00AE90"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_00AE90[] = dspot04_room_0Set_0006B0DL_00AE90;
 
-#define dspot04_room_0Set_0006B0DL_002A10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_002A10"
+#define dspot04_room_0Set_0006B0DL_002A10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_002A10"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_002A10[] = dspot04_room_0Set_0006B0DL_002A10;
 
-#define dspot04_room_0Set_0006B0DL_005A80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_005A80"
+#define dspot04_room_0Set_0006B0DL_005A80 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_005A80"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_005A80[] = dspot04_room_0Set_0006B0DL_005A80;
 
-#define dspot04_room_0Set_0006B0DL_00B280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_00B280"
+#define dspot04_room_0Set_0006B0DL_00B280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_00B280"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_00B280[] = dspot04_room_0Set_0006B0DL_00B280;
 
-#define dspot04_room_0Set_0006B0DL_00B8F8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_00B8F8"
+#define dspot04_room_0Set_0006B0DL_00B8F8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_00B8F8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_00B8F8[] = dspot04_room_0Set_0006B0DL_00B8F8;
 
-#define dspot04_room_0Set_0006B0DL_0189A8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_0189A8"
+#define dspot04_room_0Set_0006B0DL_0189A8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_0189A8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_0189A8[] = dspot04_room_0Set_0006B0DL_0189A8;
 
-#define dspot04_room_0Set_0006B0DL_00BD98 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_00BD98"
+#define dspot04_room_0Set_0006B0DL_00BD98 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_00BD98"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_00BD98[] = dspot04_room_0Set_0006B0DL_00BD98;
 
-#define dspot04_room_0Set_0006B0DL_006280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_006280"
+#define dspot04_room_0Set_0006B0DL_006280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_006280"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_006280[] = dspot04_room_0Set_0006B0DL_006280;
 
-#define dspot04_room_0Set_0006B0DL_006C10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_006C10"
+#define dspot04_room_0Set_0006B0DL_006C10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_006C10"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_006C10[] = dspot04_room_0Set_0006B0DL_006C10;
 
-#define dspot04_room_0Set_0006B0DL_009740 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_009740"
+#define dspot04_room_0Set_0006B0DL_009740 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_009740"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_009740[] = dspot04_room_0Set_0006B0DL_009740;
 
-#define dspot04_room_0Set_0006B0DL_00A808 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_00A808"
+#define dspot04_room_0Set_0006B0DL_00A808 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_00A808"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_00A808[] = dspot04_room_0Set_0006B0DL_00A808;
 
-#define dspot04_room_0Set_0006B0DL_0055C0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0006B0DL_0055C0"
+#define dspot04_room_0Set_0006B0DL_0055C0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0006B0DL_0055C0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0006B0DL_0055C0[] = dspot04_room_0Set_0006B0DL_0055C0;
 
-#define dspot04_room_0Set_000940DL_008ED8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_008ED8"
+#define dspot04_room_0Set_000940DL_008ED8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_008ED8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_008ED8[] = dspot04_room_0Set_000940DL_008ED8;
 
-#define dspot04_room_0Set_000940DL_0187F0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_0187F0"
+#define dspot04_room_0Set_000940DL_0187F0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_0187F0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_0187F0[] = dspot04_room_0Set_000940DL_0187F0;
 
-#define dspot04_room_0Set_000940DL_007A20 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_007A20"
+#define dspot04_room_0Set_000940DL_007A20 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_007A20"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_007A20[] = dspot04_room_0Set_000940DL_007A20;
 
-#define dspot04_room_0Set_000940DL_018490 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_018490"
+#define dspot04_room_0Set_000940DL_018490 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_018490"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_018490[] = dspot04_room_0Set_000940DL_018490;
 
-#define dspot04_room_0Set_000940DL_008638 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_008638"
+#define dspot04_room_0Set_000940DL_008638 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_008638"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_008638[] = dspot04_room_0Set_000940DL_008638;
 
-#define dspot04_room_0Set_000940DL_00A080 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_00A080"
+#define dspot04_room_0Set_000940DL_00A080 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_00A080"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_00A080[] = dspot04_room_0Set_000940DL_00A080;
 
-#define dspot04_room_0Set_000940DL_017BD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_017BD0"
+#define dspot04_room_0Set_000940DL_017BD0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_017BD0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_017BD0[] = dspot04_room_0Set_000940DL_017BD0;
 
-#define dspot04_room_0Set_000940DL_004860 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_004860"
+#define dspot04_room_0Set_000940DL_004860 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_004860"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_004860[] = dspot04_room_0Set_000940DL_004860;
 
-#define dspot04_room_0Set_000940DL_018048 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_018048"
+#define dspot04_room_0Set_000940DL_018048 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_018048"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_018048[] = dspot04_room_0Set_000940DL_018048;
 
-#define dspot04_room_0Set_000940DL_00AE90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_00AE90"
+#define dspot04_room_0Set_000940DL_00AE90 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_00AE90"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_00AE90[] = dspot04_room_0Set_000940DL_00AE90;
 
-#define dspot04_room_0Set_000940DL_002A10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_002A10"
+#define dspot04_room_0Set_000940DL_002A10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_002A10"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_002A10[] = dspot04_room_0Set_000940DL_002A10;
 
-#define dspot04_room_0Set_000940DL_005A80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_005A80"
+#define dspot04_room_0Set_000940DL_005A80 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_005A80"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_005A80[] = dspot04_room_0Set_000940DL_005A80;
 
-#define dspot04_room_0Set_000940DL_00B280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_00B280"
+#define dspot04_room_0Set_000940DL_00B280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_00B280"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_00B280[] = dspot04_room_0Set_000940DL_00B280;
 
-#define dspot04_room_0Set_000940DL_00B8F8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_00B8F8"
+#define dspot04_room_0Set_000940DL_00B8F8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_00B8F8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_00B8F8[] = dspot04_room_0Set_000940DL_00B8F8;
 
-#define dspot04_room_0Set_000940DL_0189A8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_0189A8"
+#define dspot04_room_0Set_000940DL_0189A8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_0189A8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_0189A8[] = dspot04_room_0Set_000940DL_0189A8;
 
-#define dspot04_room_0Set_000940DL_00BD98 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_00BD98"
+#define dspot04_room_0Set_000940DL_00BD98 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_00BD98"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_00BD98[] = dspot04_room_0Set_000940DL_00BD98;
 
-#define dspot04_room_0Set_000940DL_006280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_006280"
+#define dspot04_room_0Set_000940DL_006280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_006280"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_006280[] = dspot04_room_0Set_000940DL_006280;
 
-#define dspot04_room_0Set_000940DL_006C10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_006C10"
+#define dspot04_room_0Set_000940DL_006C10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_006C10"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_006C10[] = dspot04_room_0Set_000940DL_006C10;
 
-#define dspot04_room_0Set_000940DL_009740 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_009740"
+#define dspot04_room_0Set_000940DL_009740 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_009740"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_009740[] = dspot04_room_0Set_000940DL_009740;
 
-#define dspot04_room_0Set_000940DL_00A808 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_00A808"
+#define dspot04_room_0Set_000940DL_00A808 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_00A808"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_00A808[] = dspot04_room_0Set_000940DL_00A808;
 
-#define dspot04_room_0Set_000940DL_0055C0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000940DL_0055C0"
+#define dspot04_room_0Set_000940DL_0055C0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000940DL_0055C0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000940DL_0055C0[] = dspot04_room_0Set_000940DL_0055C0;
 
-#define dspot04_room_0Set_000BA0DL_008ED8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_008ED8"
+#define dspot04_room_0Set_000BA0DL_008ED8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_008ED8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_008ED8[] = dspot04_room_0Set_000BA0DL_008ED8;
 
-#define dspot04_room_0Set_000BA0DL_0187F0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_0187F0"
+#define dspot04_room_0Set_000BA0DL_0187F0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_0187F0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_0187F0[] = dspot04_room_0Set_000BA0DL_0187F0;
 
-#define dspot04_room_0Set_000BA0DL_007A20 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_007A20"
+#define dspot04_room_0Set_000BA0DL_007A20 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_007A20"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_007A20[] = dspot04_room_0Set_000BA0DL_007A20;
 
-#define dspot04_room_0Set_000BA0DL_018490 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_018490"
+#define dspot04_room_0Set_000BA0DL_018490 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_018490"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_018490[] = dspot04_room_0Set_000BA0DL_018490;
 
-#define dspot04_room_0Set_000BA0DL_008638 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_008638"
+#define dspot04_room_0Set_000BA0DL_008638 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_008638"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_008638[] = dspot04_room_0Set_000BA0DL_008638;
 
-#define dspot04_room_0Set_000BA0DL_00A080 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_00A080"
+#define dspot04_room_0Set_000BA0DL_00A080 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_00A080"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_00A080[] = dspot04_room_0Set_000BA0DL_00A080;
 
-#define dspot04_room_0Set_000BA0DL_017BD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_017BD0"
+#define dspot04_room_0Set_000BA0DL_017BD0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_017BD0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_017BD0[] = dspot04_room_0Set_000BA0DL_017BD0;
 
-#define dspot04_room_0Set_000BA0DL_004860 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_004860"
+#define dspot04_room_0Set_000BA0DL_004860 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_004860"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_004860[] = dspot04_room_0Set_000BA0DL_004860;
 
-#define dspot04_room_0Set_000BA0DL_018048 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_018048"
+#define dspot04_room_0Set_000BA0DL_018048 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_018048"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_018048[] = dspot04_room_0Set_000BA0DL_018048;
 
-#define dspot04_room_0Set_000BA0DL_00AE90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_00AE90"
+#define dspot04_room_0Set_000BA0DL_00AE90 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_00AE90"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_00AE90[] = dspot04_room_0Set_000BA0DL_00AE90;
 
-#define dspot04_room_0Set_000BA0DL_002A10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_002A10"
+#define dspot04_room_0Set_000BA0DL_002A10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_002A10"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_002A10[] = dspot04_room_0Set_000BA0DL_002A10;
 
-#define dspot04_room_0Set_000BA0DL_005A80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_005A80"
+#define dspot04_room_0Set_000BA0DL_005A80 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_005A80"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_005A80[] = dspot04_room_0Set_000BA0DL_005A80;
 
-#define dspot04_room_0Set_000BA0DL_00B280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_00B280"
+#define dspot04_room_0Set_000BA0DL_00B280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_00B280"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_00B280[] = dspot04_room_0Set_000BA0DL_00B280;
 
-#define dspot04_room_0Set_000BA0DL_00B8F8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_00B8F8"
+#define dspot04_room_0Set_000BA0DL_00B8F8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_00B8F8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_00B8F8[] = dspot04_room_0Set_000BA0DL_00B8F8;
 
-#define dspot04_room_0Set_000BA0DL_0189A8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_0189A8"
+#define dspot04_room_0Set_000BA0DL_0189A8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_0189A8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_0189A8[] = dspot04_room_0Set_000BA0DL_0189A8;
 
-#define dspot04_room_0Set_000BA0DL_00BD98 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_00BD98"
+#define dspot04_room_0Set_000BA0DL_00BD98 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_00BD98"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_00BD98[] = dspot04_room_0Set_000BA0DL_00BD98;
 
-#define dspot04_room_0Set_000BA0DL_006280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_006280"
+#define dspot04_room_0Set_000BA0DL_006280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_006280"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_006280[] = dspot04_room_0Set_000BA0DL_006280;
 
-#define dspot04_room_0Set_000BA0DL_006C10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_006C10"
+#define dspot04_room_0Set_000BA0DL_006C10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_006C10"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_006C10[] = dspot04_room_0Set_000BA0DL_006C10;
 
-#define dspot04_room_0Set_000BA0DL_009740 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_009740"
+#define dspot04_room_0Set_000BA0DL_009740 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_009740"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_009740[] = dspot04_room_0Set_000BA0DL_009740;
 
-#define dspot04_room_0Set_000BA0DL_00A808 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_00A808"
+#define dspot04_room_0Set_000BA0DL_00A808 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_00A808"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_00A808[] = dspot04_room_0Set_000BA0DL_00A808;
 
-#define dspot04_room_0Set_000BA0DL_0055C0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BA0DL_0055C0"
+#define dspot04_room_0Set_000BA0DL_0055C0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BA0DL_0055C0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BA0DL_0055C0[] = dspot04_room_0Set_000BA0DL_0055C0;
 
-#define dspot04_room_0Set_000BD0DL_008ED8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_008ED8"
+#define dspot04_room_0Set_000BD0DL_008ED8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_008ED8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_008ED8[] = dspot04_room_0Set_000BD0DL_008ED8;
 
-#define dspot04_room_0Set_000BD0DL_0187F0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_0187F0"
+#define dspot04_room_0Set_000BD0DL_0187F0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_0187F0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_0187F0[] = dspot04_room_0Set_000BD0DL_0187F0;
 
-#define dspot04_room_0Set_000BD0DL_007A20 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_007A20"
+#define dspot04_room_0Set_000BD0DL_007A20 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_007A20"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_007A20[] = dspot04_room_0Set_000BD0DL_007A20;
 
-#define dspot04_room_0Set_000BD0DL_018490 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_018490"
+#define dspot04_room_0Set_000BD0DL_018490 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_018490"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_018490[] = dspot04_room_0Set_000BD0DL_018490;
 
-#define dspot04_room_0Set_000BD0DL_008638 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_008638"
+#define dspot04_room_0Set_000BD0DL_008638 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_008638"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_008638[] = dspot04_room_0Set_000BD0DL_008638;
 
-#define dspot04_room_0Set_000BD0DL_00A080 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_00A080"
+#define dspot04_room_0Set_000BD0DL_00A080 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_00A080"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_00A080[] = dspot04_room_0Set_000BD0DL_00A080;
 
-#define dspot04_room_0Set_000BD0DL_017BD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_017BD0"
+#define dspot04_room_0Set_000BD0DL_017BD0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_017BD0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_017BD0[] = dspot04_room_0Set_000BD0DL_017BD0;
 
-#define dspot04_room_0Set_000BD0DL_004860 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_004860"
+#define dspot04_room_0Set_000BD0DL_004860 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_004860"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_004860[] = dspot04_room_0Set_000BD0DL_004860;
 
-#define dspot04_room_0Set_000BD0DL_018048 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_018048"
+#define dspot04_room_0Set_000BD0DL_018048 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_018048"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_018048[] = dspot04_room_0Set_000BD0DL_018048;
 
-#define dspot04_room_0Set_000BD0DL_00AE90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_00AE90"
+#define dspot04_room_0Set_000BD0DL_00AE90 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_00AE90"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_00AE90[] = dspot04_room_0Set_000BD0DL_00AE90;
 
-#define dspot04_room_0Set_000BD0DL_002A10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_002A10"
+#define dspot04_room_0Set_000BD0DL_002A10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_002A10"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_002A10[] = dspot04_room_0Set_000BD0DL_002A10;
 
-#define dspot04_room_0Set_000BD0DL_005A80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_005A80"
+#define dspot04_room_0Set_000BD0DL_005A80 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_005A80"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_005A80[] = dspot04_room_0Set_000BD0DL_005A80;
 
-#define dspot04_room_0Set_000BD0DL_00B280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_00B280"
+#define dspot04_room_0Set_000BD0DL_00B280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_00B280"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_00B280[] = dspot04_room_0Set_000BD0DL_00B280;
 
-#define dspot04_room_0Set_000BD0DL_00B8F8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_00B8F8"
+#define dspot04_room_0Set_000BD0DL_00B8F8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_00B8F8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_00B8F8[] = dspot04_room_0Set_000BD0DL_00B8F8;
 
-#define dspot04_room_0Set_000BD0DL_0189A8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_0189A8"
+#define dspot04_room_0Set_000BD0DL_0189A8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_0189A8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_0189A8[] = dspot04_room_0Set_000BD0DL_0189A8;
 
-#define dspot04_room_0Set_000BD0DL_00BD98 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_00BD98"
+#define dspot04_room_0Set_000BD0DL_00BD98 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_00BD98"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_00BD98[] = dspot04_room_0Set_000BD0DL_00BD98;
 
-#define dspot04_room_0Set_000BD0DL_006280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_006280"
+#define dspot04_room_0Set_000BD0DL_006280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_006280"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_006280[] = dspot04_room_0Set_000BD0DL_006280;
 
-#define dspot04_room_0Set_000BD0DL_006C10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_006C10"
+#define dspot04_room_0Set_000BD0DL_006C10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_006C10"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_006C10[] = dspot04_room_0Set_000BD0DL_006C10;
 
-#define dspot04_room_0Set_000BD0DL_009740 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_009740"
+#define dspot04_room_0Set_000BD0DL_009740 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_009740"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_009740[] = dspot04_room_0Set_000BD0DL_009740;
 
-#define dspot04_room_0Set_000BD0DL_00A808 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_00A808"
+#define dspot04_room_0Set_000BD0DL_00A808 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_00A808"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_00A808[] = dspot04_room_0Set_000BD0DL_00A808;
 
-#define dspot04_room_0Set_000BD0DL_0055C0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000BD0DL_0055C0"
+#define dspot04_room_0Set_000BD0DL_0055C0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000BD0DL_0055C0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000BD0DL_0055C0[] = dspot04_room_0Set_000BD0DL_0055C0;
 
-#define dspot04_room_0Set_000C00DL_008ED8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_008ED8"
+#define dspot04_room_0Set_000C00DL_008ED8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_008ED8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_008ED8[] = dspot04_room_0Set_000C00DL_008ED8;
 
-#define dspot04_room_0Set_000C00DL_0187F0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_0187F0"
+#define dspot04_room_0Set_000C00DL_0187F0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_0187F0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_0187F0[] = dspot04_room_0Set_000C00DL_0187F0;
 
-#define dspot04_room_0Set_000C00DL_007A20 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_007A20"
+#define dspot04_room_0Set_000C00DL_007A20 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_007A20"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_007A20[] = dspot04_room_0Set_000C00DL_007A20;
 
-#define dspot04_room_0Set_000C00DL_018490 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_018490"
+#define dspot04_room_0Set_000C00DL_018490 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_018490"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_018490[] = dspot04_room_0Set_000C00DL_018490;
 
-#define dspot04_room_0Set_000C00DL_008638 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_008638"
+#define dspot04_room_0Set_000C00DL_008638 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_008638"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_008638[] = dspot04_room_0Set_000C00DL_008638;
 
-#define dspot04_room_0Set_000C00DL_00A080 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_00A080"
+#define dspot04_room_0Set_000C00DL_00A080 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_00A080"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_00A080[] = dspot04_room_0Set_000C00DL_00A080;
 
-#define dspot04_room_0Set_000C00DL_017BD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_017BD0"
+#define dspot04_room_0Set_000C00DL_017BD0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_017BD0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_017BD0[] = dspot04_room_0Set_000C00DL_017BD0;
 
-#define dspot04_room_0Set_000C00DL_004860 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_004860"
+#define dspot04_room_0Set_000C00DL_004860 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_004860"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_004860[] = dspot04_room_0Set_000C00DL_004860;
 
-#define dspot04_room_0Set_000C00DL_018048 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_018048"
+#define dspot04_room_0Set_000C00DL_018048 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_018048"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_018048[] = dspot04_room_0Set_000C00DL_018048;
 
-#define dspot04_room_0Set_000C00DL_00AE90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_00AE90"
+#define dspot04_room_0Set_000C00DL_00AE90 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_00AE90"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_00AE90[] = dspot04_room_0Set_000C00DL_00AE90;
 
-#define dspot04_room_0Set_000C00DL_002A10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_002A10"
+#define dspot04_room_0Set_000C00DL_002A10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_002A10"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_002A10[] = dspot04_room_0Set_000C00DL_002A10;
 
-#define dspot04_room_0Set_000C00DL_005A80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_005A80"
+#define dspot04_room_0Set_000C00DL_005A80 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_005A80"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_005A80[] = dspot04_room_0Set_000C00DL_005A80;
 
-#define dspot04_room_0Set_000C00DL_00B280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_00B280"
+#define dspot04_room_0Set_000C00DL_00B280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_00B280"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_00B280[] = dspot04_room_0Set_000C00DL_00B280;
 
-#define dspot04_room_0Set_000C00DL_00B8F8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_00B8F8"
+#define dspot04_room_0Set_000C00DL_00B8F8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_00B8F8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_00B8F8[] = dspot04_room_0Set_000C00DL_00B8F8;
 
-#define dspot04_room_0Set_000C00DL_0189A8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_0189A8"
+#define dspot04_room_0Set_000C00DL_0189A8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_0189A8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_0189A8[] = dspot04_room_0Set_000C00DL_0189A8;
 
-#define dspot04_room_0Set_000C00DL_00BD98 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_00BD98"
+#define dspot04_room_0Set_000C00DL_00BD98 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_00BD98"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_00BD98[] = dspot04_room_0Set_000C00DL_00BD98;
 
-#define dspot04_room_0Set_000C00DL_006280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_006280"
+#define dspot04_room_0Set_000C00DL_006280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_006280"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_006280[] = dspot04_room_0Set_000C00DL_006280;
 
-#define dspot04_room_0Set_000C00DL_006C10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_006C10"
+#define dspot04_room_0Set_000C00DL_006C10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_006C10"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_006C10[] = dspot04_room_0Set_000C00DL_006C10;
 
-#define dspot04_room_0Set_000C00DL_009740 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_009740"
+#define dspot04_room_0Set_000C00DL_009740 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_009740"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_009740[] = dspot04_room_0Set_000C00DL_009740;
 
-#define dspot04_room_0Set_000C00DL_00A808 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_00A808"
+#define dspot04_room_0Set_000C00DL_00A808 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_00A808"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_00A808[] = dspot04_room_0Set_000C00DL_00A808;
 
-#define dspot04_room_0Set_000C00DL_0055C0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C00DL_0055C0"
+#define dspot04_room_0Set_000C00DL_0055C0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C00DL_0055C0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C00DL_0055C0[] = dspot04_room_0Set_000C00DL_0055C0;
 
-#define dspot04_room_0Set_000C30DL_008ED8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_008ED8"
+#define dspot04_room_0Set_000C30DL_008ED8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_008ED8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_008ED8[] = dspot04_room_0Set_000C30DL_008ED8;
 
-#define dspot04_room_0Set_000C30DL_0187F0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_0187F0"
+#define dspot04_room_0Set_000C30DL_0187F0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_0187F0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_0187F0[] = dspot04_room_0Set_000C30DL_0187F0;
 
-#define dspot04_room_0Set_000C30DL_007A20 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_007A20"
+#define dspot04_room_0Set_000C30DL_007A20 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_007A20"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_007A20[] = dspot04_room_0Set_000C30DL_007A20;
 
-#define dspot04_room_0Set_000C30DL_018490 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_018490"
+#define dspot04_room_0Set_000C30DL_018490 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_018490"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_018490[] = dspot04_room_0Set_000C30DL_018490;
 
-#define dspot04_room_0Set_000C30DL_008638 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_008638"
+#define dspot04_room_0Set_000C30DL_008638 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_008638"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_008638[] = dspot04_room_0Set_000C30DL_008638;
 
-#define dspot04_room_0Set_000C30DL_00A080 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_00A080"
+#define dspot04_room_0Set_000C30DL_00A080 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_00A080"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_00A080[] = dspot04_room_0Set_000C30DL_00A080;
 
-#define dspot04_room_0Set_000C30DL_017BD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_017BD0"
+#define dspot04_room_0Set_000C30DL_017BD0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_017BD0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_017BD0[] = dspot04_room_0Set_000C30DL_017BD0;
 
-#define dspot04_room_0Set_000C30DL_004860 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_004860"
+#define dspot04_room_0Set_000C30DL_004860 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_004860"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_004860[] = dspot04_room_0Set_000C30DL_004860;
 
-#define dspot04_room_0Set_000C30DL_018048 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_018048"
+#define dspot04_room_0Set_000C30DL_018048 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_018048"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_018048[] = dspot04_room_0Set_000C30DL_018048;
 
-#define dspot04_room_0Set_000C30DL_00AE90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_00AE90"
+#define dspot04_room_0Set_000C30DL_00AE90 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_00AE90"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_00AE90[] = dspot04_room_0Set_000C30DL_00AE90;
 
-#define dspot04_room_0Set_000C30DL_002A10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_002A10"
+#define dspot04_room_0Set_000C30DL_002A10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_002A10"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_002A10[] = dspot04_room_0Set_000C30DL_002A10;
 
-#define dspot04_room_0Set_000C30DL_005A80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_005A80"
+#define dspot04_room_0Set_000C30DL_005A80 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_005A80"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_005A80[] = dspot04_room_0Set_000C30DL_005A80;
 
-#define dspot04_room_0Set_000C30DL_00B280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_00B280"
+#define dspot04_room_0Set_000C30DL_00B280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_00B280"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_00B280[] = dspot04_room_0Set_000C30DL_00B280;
 
-#define dspot04_room_0Set_000C30DL_00B8F8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_00B8F8"
+#define dspot04_room_0Set_000C30DL_00B8F8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_00B8F8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_00B8F8[] = dspot04_room_0Set_000C30DL_00B8F8;
 
-#define dspot04_room_0Set_000C30DL_0189A8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_0189A8"
+#define dspot04_room_0Set_000C30DL_0189A8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_0189A8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_0189A8[] = dspot04_room_0Set_000C30DL_0189A8;
 
-#define dspot04_room_0Set_000C30DL_00BD98 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_00BD98"
+#define dspot04_room_0Set_000C30DL_00BD98 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_00BD98"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_00BD98[] = dspot04_room_0Set_000C30DL_00BD98;
 
-#define dspot04_room_0Set_000C30DL_006280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_006280"
+#define dspot04_room_0Set_000C30DL_006280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_006280"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_006280[] = dspot04_room_0Set_000C30DL_006280;
 
-#define dspot04_room_0Set_000C30DL_006C10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_006C10"
+#define dspot04_room_0Set_000C30DL_006C10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_006C10"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_006C10[] = dspot04_room_0Set_000C30DL_006C10;
 
-#define dspot04_room_0Set_000C30DL_009740 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_009740"
+#define dspot04_room_0Set_000C30DL_009740 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_009740"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_009740[] = dspot04_room_0Set_000C30DL_009740;
 
-#define dspot04_room_0Set_000C30DL_00A808 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_00A808"
+#define dspot04_room_0Set_000C30DL_00A808 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_00A808"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_00A808[] = dspot04_room_0Set_000C30DL_00A808;
 
-#define dspot04_room_0Set_000C30DL_0055C0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000C30DL_0055C0"
+#define dspot04_room_0Set_000C30DL_0055C0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000C30DL_0055C0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000C30DL_0055C0[] = dspot04_room_0Set_000C30DL_0055C0;
 
-#define dspot04_room_0Set_000E60DL_008ED8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_008ED8"
+#define dspot04_room_0Set_000E60DL_008ED8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_008ED8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_008ED8[] = dspot04_room_0Set_000E60DL_008ED8;
 
-#define dspot04_room_0Set_000E60DL_0187F0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_0187F0"
+#define dspot04_room_0Set_000E60DL_0187F0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_0187F0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_0187F0[] = dspot04_room_0Set_000E60DL_0187F0;
 
-#define dspot04_room_0Set_000E60DL_007A20 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_007A20"
+#define dspot04_room_0Set_000E60DL_007A20 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_007A20"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_007A20[] = dspot04_room_0Set_000E60DL_007A20;
 
-#define dspot04_room_0Set_000E60DL_018490 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_018490"
+#define dspot04_room_0Set_000E60DL_018490 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_018490"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_018490[] = dspot04_room_0Set_000E60DL_018490;
 
-#define dspot04_room_0Set_000E60DL_008638 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_008638"
+#define dspot04_room_0Set_000E60DL_008638 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_008638"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_008638[] = dspot04_room_0Set_000E60DL_008638;
 
-#define dspot04_room_0Set_000E60DL_00A080 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_00A080"
+#define dspot04_room_0Set_000E60DL_00A080 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_00A080"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_00A080[] = dspot04_room_0Set_000E60DL_00A080;
 
-#define dspot04_room_0Set_000E60DL_017BD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_017BD0"
+#define dspot04_room_0Set_000E60DL_017BD0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_017BD0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_017BD0[] = dspot04_room_0Set_000E60DL_017BD0;
 
-#define dspot04_room_0Set_000E60DL_004860 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_004860"
+#define dspot04_room_0Set_000E60DL_004860 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_004860"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_004860[] = dspot04_room_0Set_000E60DL_004860;
 
-#define dspot04_room_0Set_000E60DL_018048 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_018048"
+#define dspot04_room_0Set_000E60DL_018048 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_018048"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_018048[] = dspot04_room_0Set_000E60DL_018048;
 
-#define dspot04_room_0Set_000E60DL_00AE90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_00AE90"
+#define dspot04_room_0Set_000E60DL_00AE90 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_00AE90"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_00AE90[] = dspot04_room_0Set_000E60DL_00AE90;
 
-#define dspot04_room_0Set_000E60DL_002A10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_002A10"
+#define dspot04_room_0Set_000E60DL_002A10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_002A10"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_002A10[] = dspot04_room_0Set_000E60DL_002A10;
 
-#define dspot04_room_0Set_000E60DL_005A80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_005A80"
+#define dspot04_room_0Set_000E60DL_005A80 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_005A80"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_005A80[] = dspot04_room_0Set_000E60DL_005A80;
 
-#define dspot04_room_0Set_000E60DL_00B280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_00B280"
+#define dspot04_room_0Set_000E60DL_00B280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_00B280"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_00B280[] = dspot04_room_0Set_000E60DL_00B280;
 
-#define dspot04_room_0Set_000E60DL_00B8F8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_00B8F8"
+#define dspot04_room_0Set_000E60DL_00B8F8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_00B8F8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_00B8F8[] = dspot04_room_0Set_000E60DL_00B8F8;
 
-#define dspot04_room_0Set_000E60DL_0189A8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_0189A8"
+#define dspot04_room_0Set_000E60DL_0189A8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_0189A8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_0189A8[] = dspot04_room_0Set_000E60DL_0189A8;
 
-#define dspot04_room_0Set_000E60DL_00BD98 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_00BD98"
+#define dspot04_room_0Set_000E60DL_00BD98 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_00BD98"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_00BD98[] = dspot04_room_0Set_000E60DL_00BD98;
 
-#define dspot04_room_0Set_000E60DL_006280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_006280"
+#define dspot04_room_0Set_000E60DL_006280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_006280"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_006280[] = dspot04_room_0Set_000E60DL_006280;
 
-#define dspot04_room_0Set_000E60DL_006C10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_006C10"
+#define dspot04_room_0Set_000E60DL_006C10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_006C10"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_006C10[] = dspot04_room_0Set_000E60DL_006C10;
 
-#define dspot04_room_0Set_000E60DL_009740 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_009740"
+#define dspot04_room_0Set_000E60DL_009740 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_009740"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_009740[] = dspot04_room_0Set_000E60DL_009740;
 
-#define dspot04_room_0Set_000E60DL_00A808 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_00A808"
+#define dspot04_room_0Set_000E60DL_00A808 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_00A808"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_00A808[] = dspot04_room_0Set_000E60DL_00A808;
 
-#define dspot04_room_0Set_000E60DL_0055C0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000E60DL_0055C0"
+#define dspot04_room_0Set_000E60DL_0055C0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000E60DL_0055C0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000E60DL_0055C0[] = dspot04_room_0Set_000E60DL_0055C0;
 
-#define dspot04_room_0Set_000ED0DL_008ED8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_008ED8"
+#define dspot04_room_0Set_000ED0DL_008ED8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_008ED8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_008ED8[] = dspot04_room_0Set_000ED0DL_008ED8;
 
-#define dspot04_room_0Set_000ED0DL_0187F0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_0187F0"
+#define dspot04_room_0Set_000ED0DL_0187F0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_0187F0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_0187F0[] = dspot04_room_0Set_000ED0DL_0187F0;
 
-#define dspot04_room_0Set_000ED0DL_007A20 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_007A20"
+#define dspot04_room_0Set_000ED0DL_007A20 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_007A20"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_007A20[] = dspot04_room_0Set_000ED0DL_007A20;
 
-#define dspot04_room_0Set_000ED0DL_018490 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_018490"
+#define dspot04_room_0Set_000ED0DL_018490 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_018490"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_018490[] = dspot04_room_0Set_000ED0DL_018490;
 
-#define dspot04_room_0Set_000ED0DL_008638 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_008638"
+#define dspot04_room_0Set_000ED0DL_008638 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_008638"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_008638[] = dspot04_room_0Set_000ED0DL_008638;
 
-#define dspot04_room_0Set_000ED0DL_00A080 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_00A080"
+#define dspot04_room_0Set_000ED0DL_00A080 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_00A080"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_00A080[] = dspot04_room_0Set_000ED0DL_00A080;
 
-#define dspot04_room_0Set_000ED0DL_017BD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_017BD0"
+#define dspot04_room_0Set_000ED0DL_017BD0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_017BD0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_017BD0[] = dspot04_room_0Set_000ED0DL_017BD0;
 
-#define dspot04_room_0Set_000ED0DL_004860 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_004860"
+#define dspot04_room_0Set_000ED0DL_004860 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_004860"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_004860[] = dspot04_room_0Set_000ED0DL_004860;
 
-#define dspot04_room_0Set_000ED0DL_018048 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_018048"
+#define dspot04_room_0Set_000ED0DL_018048 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_018048"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_018048[] = dspot04_room_0Set_000ED0DL_018048;
 
-#define dspot04_room_0Set_000ED0DL_00AE90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_00AE90"
+#define dspot04_room_0Set_000ED0DL_00AE90 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_00AE90"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_00AE90[] = dspot04_room_0Set_000ED0DL_00AE90;
 
-#define dspot04_room_0Set_000ED0DL_002A10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_002A10"
+#define dspot04_room_0Set_000ED0DL_002A10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_002A10"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_002A10[] = dspot04_room_0Set_000ED0DL_002A10;
 
-#define dspot04_room_0Set_000ED0DL_005A80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_005A80"
+#define dspot04_room_0Set_000ED0DL_005A80 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_005A80"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_005A80[] = dspot04_room_0Set_000ED0DL_005A80;
 
-#define dspot04_room_0Set_000ED0DL_00B280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_00B280"
+#define dspot04_room_0Set_000ED0DL_00B280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_00B280"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_00B280[] = dspot04_room_0Set_000ED0DL_00B280;
 
-#define dspot04_room_0Set_000ED0DL_00B8F8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_00B8F8"
+#define dspot04_room_0Set_000ED0DL_00B8F8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_00B8F8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_00B8F8[] = dspot04_room_0Set_000ED0DL_00B8F8;
 
-#define dspot04_room_0Set_000ED0DL_0189A8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_0189A8"
+#define dspot04_room_0Set_000ED0DL_0189A8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_0189A8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_0189A8[] = dspot04_room_0Set_000ED0DL_0189A8;
 
-#define dspot04_room_0Set_000ED0DL_00BD98 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_00BD98"
+#define dspot04_room_0Set_000ED0DL_00BD98 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_00BD98"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_00BD98[] = dspot04_room_0Set_000ED0DL_00BD98;
 
-#define dspot04_room_0Set_000ED0DL_006280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_006280"
+#define dspot04_room_0Set_000ED0DL_006280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_006280"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_006280[] = dspot04_room_0Set_000ED0DL_006280;
 
-#define dspot04_room_0Set_000ED0DL_006C10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_006C10"
+#define dspot04_room_0Set_000ED0DL_006C10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_006C10"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_006C10[] = dspot04_room_0Set_000ED0DL_006C10;
 
-#define dspot04_room_0Set_000ED0DL_009740 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_009740"
+#define dspot04_room_0Set_000ED0DL_009740 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_009740"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_009740[] = dspot04_room_0Set_000ED0DL_009740;
 
-#define dspot04_room_0Set_000ED0DL_00A808 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_00A808"
+#define dspot04_room_0Set_000ED0DL_00A808 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_00A808"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_00A808[] = dspot04_room_0Set_000ED0DL_00A808;
 
-#define dspot04_room_0Set_000ED0DL_0055C0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000ED0DL_0055C0"
+#define dspot04_room_0Set_000ED0DL_0055C0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000ED0DL_0055C0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000ED0DL_0055C0[] = dspot04_room_0Set_000ED0DL_0055C0;
 
-#define dspot04_room_0Set_000F40DL_008ED8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_008ED8"
+#define dspot04_room_0Set_000F40DL_008ED8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_008ED8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_008ED8[] = dspot04_room_0Set_000F40DL_008ED8;
 
-#define dspot04_room_0Set_000F40DL_0187F0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_0187F0"
+#define dspot04_room_0Set_000F40DL_0187F0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_0187F0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_0187F0[] = dspot04_room_0Set_000F40DL_0187F0;
 
-#define dspot04_room_0Set_000F40DL_007A20 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_007A20"
+#define dspot04_room_0Set_000F40DL_007A20 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_007A20"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_007A20[] = dspot04_room_0Set_000F40DL_007A20;
 
-#define dspot04_room_0Set_000F40DL_018490 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_018490"
+#define dspot04_room_0Set_000F40DL_018490 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_018490"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_018490[] = dspot04_room_0Set_000F40DL_018490;
 
-#define dspot04_room_0Set_000F40DL_008638 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_008638"
+#define dspot04_room_0Set_000F40DL_008638 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_008638"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_008638[] = dspot04_room_0Set_000F40DL_008638;
 
-#define dspot04_room_0Set_000F40DL_00A080 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_00A080"
+#define dspot04_room_0Set_000F40DL_00A080 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_00A080"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_00A080[] = dspot04_room_0Set_000F40DL_00A080;
 
-#define dspot04_room_0Set_000F40DL_017BD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_017BD0"
+#define dspot04_room_0Set_000F40DL_017BD0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_017BD0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_017BD0[] = dspot04_room_0Set_000F40DL_017BD0;
 
-#define dspot04_room_0Set_000F40DL_004860 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_004860"
+#define dspot04_room_0Set_000F40DL_004860 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_004860"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_004860[] = dspot04_room_0Set_000F40DL_004860;
 
-#define dspot04_room_0Set_000F40DL_018048 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_018048"
+#define dspot04_room_0Set_000F40DL_018048 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_018048"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_018048[] = dspot04_room_0Set_000F40DL_018048;
 
-#define dspot04_room_0Set_000F40DL_00AE90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_00AE90"
+#define dspot04_room_0Set_000F40DL_00AE90 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_00AE90"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_00AE90[] = dspot04_room_0Set_000F40DL_00AE90;
 
-#define dspot04_room_0Set_000F40DL_002A10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_002A10"
+#define dspot04_room_0Set_000F40DL_002A10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_002A10"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_002A10[] = dspot04_room_0Set_000F40DL_002A10;
 
-#define dspot04_room_0Set_000F40DL_005A80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_005A80"
+#define dspot04_room_0Set_000F40DL_005A80 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_005A80"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_005A80[] = dspot04_room_0Set_000F40DL_005A80;
 
-#define dspot04_room_0Set_000F40DL_00B280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_00B280"
+#define dspot04_room_0Set_000F40DL_00B280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_00B280"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_00B280[] = dspot04_room_0Set_000F40DL_00B280;
 
-#define dspot04_room_0Set_000F40DL_00B8F8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_00B8F8"
+#define dspot04_room_0Set_000F40DL_00B8F8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_00B8F8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_00B8F8[] = dspot04_room_0Set_000F40DL_00B8F8;
 
-#define dspot04_room_0Set_000F40DL_0189A8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_0189A8"
+#define dspot04_room_0Set_000F40DL_0189A8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_0189A8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_0189A8[] = dspot04_room_0Set_000F40DL_0189A8;
 
-#define dspot04_room_0Set_000F40DL_00BD98 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_00BD98"
+#define dspot04_room_0Set_000F40DL_00BD98 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_00BD98"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_00BD98[] = dspot04_room_0Set_000F40DL_00BD98;
 
-#define dspot04_room_0Set_000F40DL_006280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_006280"
+#define dspot04_room_0Set_000F40DL_006280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_006280"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_006280[] = dspot04_room_0Set_000F40DL_006280;
 
-#define dspot04_room_0Set_000F40DL_006C10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_006C10"
+#define dspot04_room_0Set_000F40DL_006C10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_006C10"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_006C10[] = dspot04_room_0Set_000F40DL_006C10;
 
-#define dspot04_room_0Set_000F40DL_009740 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_009740"
+#define dspot04_room_0Set_000F40DL_009740 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_009740"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_009740[] = dspot04_room_0Set_000F40DL_009740;
 
-#define dspot04_room_0Set_000F40DL_00A808 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_00A808"
+#define dspot04_room_0Set_000F40DL_00A808 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_00A808"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_00A808[] = dspot04_room_0Set_000F40DL_00A808;
 
-#define dspot04_room_0Set_000F40DL_0055C0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F40DL_0055C0"
+#define dspot04_room_0Set_000F40DL_0055C0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F40DL_0055C0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F40DL_0055C0[] = dspot04_room_0Set_000F40DL_0055C0;
 
-#define dspot04_room_0Set_000F80DL_008ED8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_008ED8"
+#define dspot04_room_0Set_000F80DL_008ED8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_008ED8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_008ED8[] = dspot04_room_0Set_000F80DL_008ED8;
 
-#define dspot04_room_0Set_000F80DL_0187F0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_0187F0"
+#define dspot04_room_0Set_000F80DL_0187F0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_0187F0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_0187F0[] = dspot04_room_0Set_000F80DL_0187F0;
 
-#define dspot04_room_0Set_000F80DL_007A20 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_007A20"
+#define dspot04_room_0Set_000F80DL_007A20 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_007A20"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_007A20[] = dspot04_room_0Set_000F80DL_007A20;
 
-#define dspot04_room_0Set_000F80DL_018490 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_018490"
+#define dspot04_room_0Set_000F80DL_018490 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_018490"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_018490[] = dspot04_room_0Set_000F80DL_018490;
 
-#define dspot04_room_0Set_000F80DL_008638 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_008638"
+#define dspot04_room_0Set_000F80DL_008638 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_008638"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_008638[] = dspot04_room_0Set_000F80DL_008638;
 
-#define dspot04_room_0Set_000F80DL_00A080 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_00A080"
+#define dspot04_room_0Set_000F80DL_00A080 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_00A080"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_00A080[] = dspot04_room_0Set_000F80DL_00A080;
 
-#define dspot04_room_0Set_000F80DL_017BD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_017BD0"
+#define dspot04_room_0Set_000F80DL_017BD0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_017BD0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_017BD0[] = dspot04_room_0Set_000F80DL_017BD0;
 
-#define dspot04_room_0Set_000F80DL_004860 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_004860"
+#define dspot04_room_0Set_000F80DL_004860 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_004860"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_004860[] = dspot04_room_0Set_000F80DL_004860;
 
-#define dspot04_room_0Set_000F80DL_018048 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_018048"
+#define dspot04_room_0Set_000F80DL_018048 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_018048"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_018048[] = dspot04_room_0Set_000F80DL_018048;
 
-#define dspot04_room_0Set_000F80DL_00AE90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_00AE90"
+#define dspot04_room_0Set_000F80DL_00AE90 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_00AE90"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_00AE90[] = dspot04_room_0Set_000F80DL_00AE90;
 
-#define dspot04_room_0Set_000F80DL_002A10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_002A10"
+#define dspot04_room_0Set_000F80DL_002A10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_002A10"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_002A10[] = dspot04_room_0Set_000F80DL_002A10;
 
-#define dspot04_room_0Set_000F80DL_005A80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_005A80"
+#define dspot04_room_0Set_000F80DL_005A80 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_005A80"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_005A80[] = dspot04_room_0Set_000F80DL_005A80;
 
-#define dspot04_room_0Set_000F80DL_00B280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_00B280"
+#define dspot04_room_0Set_000F80DL_00B280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_00B280"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_00B280[] = dspot04_room_0Set_000F80DL_00B280;
 
-#define dspot04_room_0Set_000F80DL_00B8F8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_00B8F8"
+#define dspot04_room_0Set_000F80DL_00B8F8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_00B8F8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_00B8F8[] = dspot04_room_0Set_000F80DL_00B8F8;
 
-#define dspot04_room_0Set_000F80DL_0189A8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_0189A8"
+#define dspot04_room_0Set_000F80DL_0189A8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_0189A8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_0189A8[] = dspot04_room_0Set_000F80DL_0189A8;
 
-#define dspot04_room_0Set_000F80DL_00BD98 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_00BD98"
+#define dspot04_room_0Set_000F80DL_00BD98 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_00BD98"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_00BD98[] = dspot04_room_0Set_000F80DL_00BD98;
 
-#define dspot04_room_0Set_000F80DL_006280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_006280"
+#define dspot04_room_0Set_000F80DL_006280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_006280"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_006280[] = dspot04_room_0Set_000F80DL_006280;
 
-#define dspot04_room_0Set_000F80DL_006C10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_006C10"
+#define dspot04_room_0Set_000F80DL_006C10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_006C10"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_006C10[] = dspot04_room_0Set_000F80DL_006C10;
 
-#define dspot04_room_0Set_000F80DL_009740 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_009740"
+#define dspot04_room_0Set_000F80DL_009740 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_009740"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_009740[] = dspot04_room_0Set_000F80DL_009740;
 
-#define dspot04_room_0Set_000F80DL_00A808 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_00A808"
+#define dspot04_room_0Set_000F80DL_00A808 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_00A808"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_00A808[] = dspot04_room_0Set_000F80DL_00A808;
 
-#define dspot04_room_0Set_000F80DL_0055C0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_000F80DL_0055C0"
+#define dspot04_room_0Set_000F80DL_0055C0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_000F80DL_0055C0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_000F80DL_0055C0[] = dspot04_room_0Set_000F80DL_0055C0;
 
-#define dspot04_room_0Set_0011F0DL_008ED8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_008ED8"
+#define dspot04_room_0Set_0011F0DL_008ED8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_008ED8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_008ED8[] = dspot04_room_0Set_0011F0DL_008ED8;
 
-#define dspot04_room_0Set_0011F0DL_0187F0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_0187F0"
+#define dspot04_room_0Set_0011F0DL_0187F0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_0187F0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_0187F0[] = dspot04_room_0Set_0011F0DL_0187F0;
 
-#define dspot04_room_0Set_0011F0DL_007A20 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_007A20"
+#define dspot04_room_0Set_0011F0DL_007A20 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_007A20"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_007A20[] = dspot04_room_0Set_0011F0DL_007A20;
 
-#define dspot04_room_0Set_0011F0DL_018490 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_018490"
+#define dspot04_room_0Set_0011F0DL_018490 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_018490"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_018490[] = dspot04_room_0Set_0011F0DL_018490;
 
-#define dspot04_room_0Set_0011F0DL_008638 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_008638"
+#define dspot04_room_0Set_0011F0DL_008638 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_008638"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_008638[] = dspot04_room_0Set_0011F0DL_008638;
 
-#define dspot04_room_0Set_0011F0DL_00A080 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_00A080"
+#define dspot04_room_0Set_0011F0DL_00A080 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_00A080"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_00A080[] = dspot04_room_0Set_0011F0DL_00A080;
 
-#define dspot04_room_0Set_0011F0DL_017BD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_017BD0"
+#define dspot04_room_0Set_0011F0DL_017BD0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_017BD0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_017BD0[] = dspot04_room_0Set_0011F0DL_017BD0;
 
-#define dspot04_room_0Set_0011F0DL_004860 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_004860"
+#define dspot04_room_0Set_0011F0DL_004860 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_004860"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_004860[] = dspot04_room_0Set_0011F0DL_004860;
 
-#define dspot04_room_0Set_0011F0DL_018048 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_018048"
+#define dspot04_room_0Set_0011F0DL_018048 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_018048"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_018048[] = dspot04_room_0Set_0011F0DL_018048;
 
-#define dspot04_room_0Set_0011F0DL_00AE90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_00AE90"
+#define dspot04_room_0Set_0011F0DL_00AE90 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_00AE90"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_00AE90[] = dspot04_room_0Set_0011F0DL_00AE90;
 
-#define dspot04_room_0Set_0011F0DL_002A10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_002A10"
+#define dspot04_room_0Set_0011F0DL_002A10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_002A10"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_002A10[] = dspot04_room_0Set_0011F0DL_002A10;
 
-#define dspot04_room_0Set_0011F0DL_005A80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_005A80"
+#define dspot04_room_0Set_0011F0DL_005A80 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_005A80"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_005A80[] = dspot04_room_0Set_0011F0DL_005A80;
 
-#define dspot04_room_0Set_0011F0DL_00B280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_00B280"
+#define dspot04_room_0Set_0011F0DL_00B280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_00B280"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_00B280[] = dspot04_room_0Set_0011F0DL_00B280;
 
-#define dspot04_room_0Set_0011F0DL_00B8F8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_00B8F8"
+#define dspot04_room_0Set_0011F0DL_00B8F8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_00B8F8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_00B8F8[] = dspot04_room_0Set_0011F0DL_00B8F8;
 
-#define dspot04_room_0Set_0011F0DL_0189A8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_0189A8"
+#define dspot04_room_0Set_0011F0DL_0189A8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_0189A8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_0189A8[] = dspot04_room_0Set_0011F0DL_0189A8;
 
-#define dspot04_room_0Set_0011F0DL_00BD98 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_00BD98"
+#define dspot04_room_0Set_0011F0DL_00BD98 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_00BD98"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_00BD98[] = dspot04_room_0Set_0011F0DL_00BD98;
 
-#define dspot04_room_0Set_0011F0DL_006280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_006280"
+#define dspot04_room_0Set_0011F0DL_006280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_006280"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_006280[] = dspot04_room_0Set_0011F0DL_006280;
 
-#define dspot04_room_0Set_0011F0DL_006C10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_006C10"
+#define dspot04_room_0Set_0011F0DL_006C10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_006C10"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_006C10[] = dspot04_room_0Set_0011F0DL_006C10;
 
-#define dspot04_room_0Set_0011F0DL_009740 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_009740"
+#define dspot04_room_0Set_0011F0DL_009740 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_009740"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_009740[] = dspot04_room_0Set_0011F0DL_009740;
 
-#define dspot04_room_0Set_0011F0DL_00A808 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_00A808"
+#define dspot04_room_0Set_0011F0DL_00A808 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_00A808"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_00A808[] = dspot04_room_0Set_0011F0DL_00A808;
 
-#define dspot04_room_0Set_0011F0DL_0055C0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_0011F0DL_0055C0"
+#define dspot04_room_0Set_0011F0DL_0055C0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_0011F0DL_0055C0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_0011F0DL_0055C0[] = dspot04_room_0Set_0011F0DL_0055C0;
 
-#define dspot04_room_0Set_001240DL_008ED8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_008ED8"
+#define dspot04_room_0Set_001240DL_008ED8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_008ED8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_008ED8[] = dspot04_room_0Set_001240DL_008ED8;
 
-#define dspot04_room_0Set_001240DL_0187F0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_0187F0"
+#define dspot04_room_0Set_001240DL_0187F0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_0187F0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_0187F0[] = dspot04_room_0Set_001240DL_0187F0;
 
-#define dspot04_room_0Set_001240DL_007A20 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_007A20"
+#define dspot04_room_0Set_001240DL_007A20 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_007A20"
 static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_007A20[] = dspot04_room_0Set_001240DL_007A20;
 
-#define dspot04_room_0Set_001240DL_018490 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_018490"
+#define dspot04_room_0Set_001240DL_018490 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_018490"
 static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_018490[] = dspot04_room_0Set_001240DL_018490;
 
-#define dspot04_room_0Set_001240DL_008638 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_008638"
+#define dspot04_room_0Set_001240DL_008638 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_008638"
 static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_008638[] = dspot04_room_0Set_001240DL_008638;
 
-#define dspot04_room_0Set_001240DL_00A080 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_00A080"
+#define dspot04_room_0Set_001240DL_00A080 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_00A080"
 static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_00A080[] = dspot04_room_0Set_001240DL_00A080;
 
-#define dspot04_room_0Set_001240DL_017BD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_017BD0"
+#define dspot04_room_0Set_001240DL_017BD0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_017BD0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_017BD0[] = dspot04_room_0Set_001240DL_017BD0;
 
-#define dspot04_room_0Set_001240DL_004860 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_004860"
+#define dspot04_room_0Set_001240DL_004860 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_004860"
 static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_004860[] = dspot04_room_0Set_001240DL_004860;
 
-#define dspot04_room_0Set_001240DL_018048 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_018048"
+#define dspot04_room_0Set_001240DL_018048 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_018048"
 static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_018048[] = dspot04_room_0Set_001240DL_018048;
 
-#define dspot04_room_0Set_001240DL_00AE90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_00AE90"
+#define dspot04_room_0Set_001240DL_00AE90 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_00AE90"
 static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_00AE90[] = dspot04_room_0Set_001240DL_00AE90;
 
-#define dspot04_room_0Set_001240DL_002A10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_002A10"
+#define dspot04_room_0Set_001240DL_002A10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_002A10"
 static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_002A10[] = dspot04_room_0Set_001240DL_002A10;
 
-#define dspot04_room_0Set_001240DL_005A80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_005A80"
+#define dspot04_room_0Set_001240DL_005A80 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_005A80"
 static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_005A80[] = dspot04_room_0Set_001240DL_005A80;
 
-#define dspot04_room_0Set_001240DL_00B280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_00B280"
+#define dspot04_room_0Set_001240DL_00B280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_00B280"
 static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_00B280[] = dspot04_room_0Set_001240DL_00B280;
 
-#define dspot04_room_0Set_001240DL_00B8F8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_00B8F8"
+#define dspot04_room_0Set_001240DL_00B8F8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_00B8F8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_00B8F8[] = dspot04_room_0Set_001240DL_00B8F8;
 
-#define dspot04_room_0Set_001240DL_0189A8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_0189A8"
+#define dspot04_room_0Set_001240DL_0189A8 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_0189A8"
 static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_0189A8[] = dspot04_room_0Set_001240DL_0189A8;
 
-#define dspot04_room_0Set_001240DL_00BD98 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_00BD98"
+#define dspot04_room_0Set_001240DL_00BD98 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_00BD98"
 static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_00BD98[] = dspot04_room_0Set_001240DL_00BD98;
 
-#define dspot04_room_0Set_001240DL_006280 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_006280"
+#define dspot04_room_0Set_001240DL_006280 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_006280"
 static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_006280[] = dspot04_room_0Set_001240DL_006280;
 
-#define dspot04_room_0Set_001240DL_006C10 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_006C10"
+#define dspot04_room_0Set_001240DL_006C10 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_006C10"
 static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_006C10[] = dspot04_room_0Set_001240DL_006C10;
 
-#define dspot04_room_0Set_001240DL_009740 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_009740"
+#define dspot04_room_0Set_001240DL_009740 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_009740"
 static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_009740[] = dspot04_room_0Set_001240DL_009740;
 
-#define dspot04_room_0Set_001240DL_00A808 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_00A808"
+#define dspot04_room_0Set_001240DL_00A808 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_00A808"
 static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_00A808[] = dspot04_room_0Set_001240DL_00A808;
 
-#define dspot04_room_0Set_001240DL_0055C0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_0Set_001240DL_0055C0"
+#define dspot04_room_0Set_001240DL_0055C0 "__OTR__scenes/shared/spot04_scene/spot04_room_0Set_001240DL_0055C0"
 static const ALIGN_ASSET(2) char spot04_room_0Set_001240DL_0055C0[] = dspot04_room_0Set_001240DL_0055C0;
 
 
diff --git a/soh/assets/scenes/overworld/spot04/spot04_room_1.h b/soh/assets/scenes/overworld/spot04/spot04_room_1.h
index 098b2c293..4f0c0e633 100644
--- a/soh/assets/scenes/overworld/spot04/spot04_room_1.h
+++ b/soh/assets/scenes/overworld/spot04/spot04_room_1.h
@@ -3,220 +3,220 @@
 
 #include "align_asset_macro.h"
 
-#define dspot04_room_1DL_0018D0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1DL_0018D0"
-static const ALIGN_ASSET(2) char spot04_room_1DL_0018D0[] = dspot04_room_1DL_0018D0;
-
-#define dspot04_room_1Tex_0056A8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Tex_0056A8"
-static const ALIGN_ASSET(2) char spot04_room_1Tex_0056A8[] = dspot04_room_1Tex_0056A8;
-
-#define dspot04_room_1DL_007810 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1DL_007810"
-static const ALIGN_ASSET(2) char spot04_room_1DL_007810[] = dspot04_room_1DL_007810;
-
-#define dspot04_room_1Tex_007D78 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Tex_007D78"
-static const ALIGN_ASSET(2) char spot04_room_1Tex_007D78[] = dspot04_room_1Tex_007D78;
-
-#define dspot04_room_1DL_004D48 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1DL_004D48"
-static const ALIGN_ASSET(2) char spot04_room_1DL_004D48[] = dspot04_room_1DL_004D48;
-
-#define dspot04_room_1DL_004218 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1DL_004218"
-static const ALIGN_ASSET(2) char spot04_room_1DL_004218[] = dspot04_room_1DL_004218;
-
-#define dspot04_room_1Tex_004EA8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Tex_004EA8"
+#define dspot04_room_1Tex_004EA8 "__OTR__scenes/shared/spot04_scene/spot04_room_1Tex_004EA8"
 static const ALIGN_ASSET(2) char spot04_room_1Tex_004EA8[] = dspot04_room_1Tex_004EA8;
 
-#define dspot04_room_1Tex_0052A8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Tex_0052A8"
+#define dspot04_room_1Tex_0052A8 "__OTR__scenes/shared/spot04_scene/spot04_room_1Tex_0052A8"
 static const ALIGN_ASSET(2) char spot04_room_1Tex_0052A8[] = dspot04_room_1Tex_0052A8;
 
-#define dspot04_room_1Tex_0066A8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Tex_0066A8"
+#define dspot04_room_1Tex_0056A8 "__OTR__scenes/shared/spot04_scene/spot04_room_1Tex_0056A8"
+static const ALIGN_ASSET(2) char spot04_room_1Tex_0056A8[] = dspot04_room_1Tex_0056A8;
+
+#define dspot04_room_1Tex_0066A8 "__OTR__scenes/shared/spot04_scene/spot04_room_1Tex_0066A8"
 static const ALIGN_ASSET(2) char spot04_room_1Tex_0066A8[] = dspot04_room_1Tex_0066A8;
 
-#define dspot04_room_1Tex_006EA8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Tex_006EA8"
+#define dspot04_room_1Tex_006EA8 "__OTR__scenes/shared/spot04_scene/spot04_room_1Tex_006EA8"
 static const ALIGN_ASSET(2) char spot04_room_1Tex_006EA8[] = dspot04_room_1Tex_006EA8;
 
-#define dspot04_room_1DL_007A90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1DL_007A90"
-static const ALIGN_ASSET(2) char spot04_room_1DL_007A90[] = dspot04_room_1DL_007A90;
-
-#define dspot04_room_1Tex_007B78 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Tex_007B78"
+#define dspot04_room_1Tex_007B78 "__OTR__scenes/shared/spot04_scene/spot04_room_1Tex_007B78"
 static const ALIGN_ASSET(2) char spot04_room_1Tex_007B78[] = dspot04_room_1Tex_007B78;
 
-#define dspot04_room_1Set_000160DL_0018D0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000160DL_0018D0"
+#define dspot04_room_1Tex_007D78 "__OTR__scenes/shared/spot04_scene/spot04_room_1Tex_007D78"
+static const ALIGN_ASSET(2) char spot04_room_1Tex_007D78[] = dspot04_room_1Tex_007D78;
+
+#define dspot04_room_1DL_0018D0 "__OTR__scenes/shared/spot04_scene/spot04_room_1DL_0018D0"
+static const ALIGN_ASSET(2) char spot04_room_1DL_0018D0[] = dspot04_room_1DL_0018D0;
+
+#define dspot04_room_1DL_007810 "__OTR__scenes/shared/spot04_scene/spot04_room_1DL_007810"
+static const ALIGN_ASSET(2) char spot04_room_1DL_007810[] = dspot04_room_1DL_007810;
+
+#define dspot04_room_1DL_004D48 "__OTR__scenes/shared/spot04_scene/spot04_room_1DL_004D48"
+static const ALIGN_ASSET(2) char spot04_room_1DL_004D48[] = dspot04_room_1DL_004D48;
+
+#define dspot04_room_1DL_004218 "__OTR__scenes/shared/spot04_scene/spot04_room_1DL_004218"
+static const ALIGN_ASSET(2) char spot04_room_1DL_004218[] = dspot04_room_1DL_004218;
+
+#define dspot04_room_1DL_007A90 "__OTR__scenes/shared/spot04_scene/spot04_room_1DL_007A90"
+static const ALIGN_ASSET(2) char spot04_room_1DL_007A90[] = dspot04_room_1DL_007A90;
+
+#define dspot04_room_1Set_000160DL_0018D0 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000160DL_0018D0"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000160DL_0018D0[] = dspot04_room_1Set_000160DL_0018D0;
 
-#define dspot04_room_1Set_000160DL_007810 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000160DL_007810"
+#define dspot04_room_1Set_000160DL_007810 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000160DL_007810"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000160DL_007810[] = dspot04_room_1Set_000160DL_007810;
 
-#define dspot04_room_1Set_000160DL_004D48 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000160DL_004D48"
+#define dspot04_room_1Set_000160DL_004D48 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000160DL_004D48"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000160DL_004D48[] = dspot04_room_1Set_000160DL_004D48;
 
-#define dspot04_room_1Set_000160DL_004218 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000160DL_004218"
+#define dspot04_room_1Set_000160DL_004218 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000160DL_004218"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000160DL_004218[] = dspot04_room_1Set_000160DL_004218;
 
-#define dspot04_room_1Set_000160DL_007A90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000160DL_007A90"
+#define dspot04_room_1Set_000160DL_007A90 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000160DL_007A90"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000160DL_007A90[] = dspot04_room_1Set_000160DL_007A90;
 
-#define dspot04_room_1Set_000250DL_0018D0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000250DL_0018D0"
+#define dspot04_room_1Set_000250DL_0018D0 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000250DL_0018D0"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000250DL_0018D0[] = dspot04_room_1Set_000250DL_0018D0;
 
-#define dspot04_room_1Set_000250DL_007810 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000250DL_007810"
+#define dspot04_room_1Set_000250DL_007810 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000250DL_007810"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000250DL_007810[] = dspot04_room_1Set_000250DL_007810;
 
-#define dspot04_room_1Set_000250DL_004D48 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000250DL_004D48"
+#define dspot04_room_1Set_000250DL_004D48 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000250DL_004D48"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000250DL_004D48[] = dspot04_room_1Set_000250DL_004D48;
 
-#define dspot04_room_1Set_000250DL_004218 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000250DL_004218"
+#define dspot04_room_1Set_000250DL_004218 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000250DL_004218"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000250DL_004218[] = dspot04_room_1Set_000250DL_004218;
 
-#define dspot04_room_1Set_000250DL_007A90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000250DL_007A90"
+#define dspot04_room_1Set_000250DL_007A90 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000250DL_007A90"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000250DL_007A90[] = dspot04_room_1Set_000250DL_007A90;
 
-#define dspot04_room_1Set_0002F0DL_0018D0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_0002F0DL_0018D0"
+#define dspot04_room_1Set_0002F0DL_0018D0 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_0002F0DL_0018D0"
 static const ALIGN_ASSET(2) char spot04_room_1Set_0002F0DL_0018D0[] = dspot04_room_1Set_0002F0DL_0018D0;
 
-#define dspot04_room_1Set_0002F0DL_007810 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_0002F0DL_007810"
+#define dspot04_room_1Set_0002F0DL_007810 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_0002F0DL_007810"
 static const ALIGN_ASSET(2) char spot04_room_1Set_0002F0DL_007810[] = dspot04_room_1Set_0002F0DL_007810;
 
-#define dspot04_room_1Set_0002F0DL_004D48 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_0002F0DL_004D48"
+#define dspot04_room_1Set_0002F0DL_004D48 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_0002F0DL_004D48"
 static const ALIGN_ASSET(2) char spot04_room_1Set_0002F0DL_004D48[] = dspot04_room_1Set_0002F0DL_004D48;
 
-#define dspot04_room_1Set_0002F0DL_004218 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_0002F0DL_004218"
+#define dspot04_room_1Set_0002F0DL_004218 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_0002F0DL_004218"
 static const ALIGN_ASSET(2) char spot04_room_1Set_0002F0DL_004218[] = dspot04_room_1Set_0002F0DL_004218;
 
-#define dspot04_room_1Set_0002F0DL_007A90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_0002F0DL_007A90"
+#define dspot04_room_1Set_0002F0DL_007A90 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_0002F0DL_007A90"
 static const ALIGN_ASSET(2) char spot04_room_1Set_0002F0DL_007A90[] = dspot04_room_1Set_0002F0DL_007A90;
 
-#define dspot04_room_1Set_000370DL_0018D0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000370DL_0018D0"
+#define dspot04_room_1Set_000370DL_0018D0 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000370DL_0018D0"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000370DL_0018D0[] = dspot04_room_1Set_000370DL_0018D0;
 
-#define dspot04_room_1Set_000370DL_007810 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000370DL_007810"
+#define dspot04_room_1Set_000370DL_007810 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000370DL_007810"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000370DL_007810[] = dspot04_room_1Set_000370DL_007810;
 
-#define dspot04_room_1Set_000370DL_004D48 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000370DL_004D48"
+#define dspot04_room_1Set_000370DL_004D48 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000370DL_004D48"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000370DL_004D48[] = dspot04_room_1Set_000370DL_004D48;
 
-#define dspot04_room_1Set_000370DL_004218 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000370DL_004218"
+#define dspot04_room_1Set_000370DL_004218 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000370DL_004218"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000370DL_004218[] = dspot04_room_1Set_000370DL_004218;
 
-#define dspot04_room_1Set_000370DL_007A90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000370DL_007A90"
+#define dspot04_room_1Set_000370DL_007A90 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000370DL_007A90"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000370DL_007A90[] = dspot04_room_1Set_000370DL_007A90;
 
-#define dspot04_room_1Set_000400DL_0018D0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000400DL_0018D0"
+#define dspot04_room_1Set_000400DL_0018D0 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000400DL_0018D0"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000400DL_0018D0[] = dspot04_room_1Set_000400DL_0018D0;
 
-#define dspot04_room_1Set_000400DL_007810 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000400DL_007810"
+#define dspot04_room_1Set_000400DL_007810 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000400DL_007810"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000400DL_007810[] = dspot04_room_1Set_000400DL_007810;
 
-#define dspot04_room_1Set_000400DL_004D48 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000400DL_004D48"
+#define dspot04_room_1Set_000400DL_004D48 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000400DL_004D48"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000400DL_004D48[] = dspot04_room_1Set_000400DL_004D48;
 
-#define dspot04_room_1Set_000400DL_004218 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000400DL_004218"
+#define dspot04_room_1Set_000400DL_004218 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000400DL_004218"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000400DL_004218[] = dspot04_room_1Set_000400DL_004218;
 
-#define dspot04_room_1Set_000400DL_007A90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000400DL_007A90"
+#define dspot04_room_1Set_000400DL_007A90 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000400DL_007A90"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000400DL_007A90[] = dspot04_room_1Set_000400DL_007A90;
 
-#define dspot04_room_1Set_0004A0DL_0018D0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_0004A0DL_0018D0"
+#define dspot04_room_1Set_0004A0DL_0018D0 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_0004A0DL_0018D0"
 static const ALIGN_ASSET(2) char spot04_room_1Set_0004A0DL_0018D0[] = dspot04_room_1Set_0004A0DL_0018D0;
 
-#define dspot04_room_1Set_0004A0DL_007810 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_0004A0DL_007810"
+#define dspot04_room_1Set_0004A0DL_007810 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_0004A0DL_007810"
 static const ALIGN_ASSET(2) char spot04_room_1Set_0004A0DL_007810[] = dspot04_room_1Set_0004A0DL_007810;
 
-#define dspot04_room_1Set_0004A0DL_004D48 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_0004A0DL_004D48"
+#define dspot04_room_1Set_0004A0DL_004D48 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_0004A0DL_004D48"
 static const ALIGN_ASSET(2) char spot04_room_1Set_0004A0DL_004D48[] = dspot04_room_1Set_0004A0DL_004D48;
 
-#define dspot04_room_1Set_0004A0DL_004218 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_0004A0DL_004218"
+#define dspot04_room_1Set_0004A0DL_004218 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_0004A0DL_004218"
 static const ALIGN_ASSET(2) char spot04_room_1Set_0004A0DL_004218[] = dspot04_room_1Set_0004A0DL_004218;
 
-#define dspot04_room_1Set_0004A0DL_007A90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_0004A0DL_007A90"
+#define dspot04_room_1Set_0004A0DL_007A90 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_0004A0DL_007A90"
 static const ALIGN_ASSET(2) char spot04_room_1Set_0004A0DL_007A90[] = dspot04_room_1Set_0004A0DL_007A90;
 
-#define dspot04_room_1Set_000510DL_0018D0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000510DL_0018D0"
+#define dspot04_room_1Set_000510DL_0018D0 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000510DL_0018D0"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000510DL_0018D0[] = dspot04_room_1Set_000510DL_0018D0;
 
-#define dspot04_room_1Set_000510DL_007810 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000510DL_007810"
+#define dspot04_room_1Set_000510DL_007810 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000510DL_007810"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000510DL_007810[] = dspot04_room_1Set_000510DL_007810;
 
-#define dspot04_room_1Set_000510DL_004D48 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000510DL_004D48"
+#define dspot04_room_1Set_000510DL_004D48 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000510DL_004D48"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000510DL_004D48[] = dspot04_room_1Set_000510DL_004D48;
 
-#define dspot04_room_1Set_000510DL_004218 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000510DL_004218"
+#define dspot04_room_1Set_000510DL_004218 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000510DL_004218"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000510DL_004218[] = dspot04_room_1Set_000510DL_004218;
 
-#define dspot04_room_1Set_000510DL_007A90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000510DL_007A90"
+#define dspot04_room_1Set_000510DL_007A90 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000510DL_007A90"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000510DL_007A90[] = dspot04_room_1Set_000510DL_007A90;
 
-#define dspot04_room_1Set_000640DL_0018D0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000640DL_0018D0"
+#define dspot04_room_1Set_000640DL_0018D0 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000640DL_0018D0"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000640DL_0018D0[] = dspot04_room_1Set_000640DL_0018D0;
 
-#define dspot04_room_1Set_000640DL_007810 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000640DL_007810"
+#define dspot04_room_1Set_000640DL_007810 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000640DL_007810"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000640DL_007810[] = dspot04_room_1Set_000640DL_007810;
 
-#define dspot04_room_1Set_000640DL_004D48 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000640DL_004D48"
+#define dspot04_room_1Set_000640DL_004D48 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000640DL_004D48"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000640DL_004D48[] = dspot04_room_1Set_000640DL_004D48;
 
-#define dspot04_room_1Set_000640DL_004218 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000640DL_004218"
+#define dspot04_room_1Set_000640DL_004218 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000640DL_004218"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000640DL_004218[] = dspot04_room_1Set_000640DL_004218;
 
-#define dspot04_room_1Set_000640DL_007A90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000640DL_007A90"
+#define dspot04_room_1Set_000640DL_007A90 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000640DL_007A90"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000640DL_007A90[] = dspot04_room_1Set_000640DL_007A90;
 
-#define dspot04_room_1Set_000770DL_0018D0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000770DL_0018D0"
+#define dspot04_room_1Set_000770DL_0018D0 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000770DL_0018D0"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000770DL_0018D0[] = dspot04_room_1Set_000770DL_0018D0;
 
-#define dspot04_room_1Set_000770DL_007810 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000770DL_007810"
+#define dspot04_room_1Set_000770DL_007810 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000770DL_007810"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000770DL_007810[] = dspot04_room_1Set_000770DL_007810;
 
-#define dspot04_room_1Set_000770DL_004D48 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000770DL_004D48"
+#define dspot04_room_1Set_000770DL_004D48 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000770DL_004D48"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000770DL_004D48[] = dspot04_room_1Set_000770DL_004D48;
 
-#define dspot04_room_1Set_000770DL_004218 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000770DL_004218"
+#define dspot04_room_1Set_000770DL_004218 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000770DL_004218"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000770DL_004218[] = dspot04_room_1Set_000770DL_004218;
 
-#define dspot04_room_1Set_000770DL_007A90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000770DL_007A90"
+#define dspot04_room_1Set_000770DL_007A90 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000770DL_007A90"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000770DL_007A90[] = dspot04_room_1Set_000770DL_007A90;
 
-#define dspot04_room_1Set_000800DL_0018D0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000800DL_0018D0"
+#define dspot04_room_1Set_000800DL_0018D0 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000800DL_0018D0"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000800DL_0018D0[] = dspot04_room_1Set_000800DL_0018D0;
 
-#define dspot04_room_1Set_000800DL_007810 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000800DL_007810"
+#define dspot04_room_1Set_000800DL_007810 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000800DL_007810"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000800DL_007810[] = dspot04_room_1Set_000800DL_007810;
 
-#define dspot04_room_1Set_000800DL_004D48 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000800DL_004D48"
+#define dspot04_room_1Set_000800DL_004D48 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000800DL_004D48"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000800DL_004D48[] = dspot04_room_1Set_000800DL_004D48;
 
-#define dspot04_room_1Set_000800DL_004218 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000800DL_004218"
+#define dspot04_room_1Set_000800DL_004218 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000800DL_004218"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000800DL_004218[] = dspot04_room_1Set_000800DL_004218;
 
-#define dspot04_room_1Set_000800DL_007A90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000800DL_007A90"
+#define dspot04_room_1Set_000800DL_007A90 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000800DL_007A90"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000800DL_007A90[] = dspot04_room_1Set_000800DL_007A90;
 
-#define dspot04_room_1Set_000860DL_0018D0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000860DL_0018D0"
+#define dspot04_room_1Set_000860DL_0018D0 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000860DL_0018D0"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000860DL_0018D0[] = dspot04_room_1Set_000860DL_0018D0;
 
-#define dspot04_room_1Set_000860DL_007810 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000860DL_007810"
+#define dspot04_room_1Set_000860DL_007810 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000860DL_007810"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000860DL_007810[] = dspot04_room_1Set_000860DL_007810;
 
-#define dspot04_room_1Set_000860DL_004D48 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000860DL_004D48"
+#define dspot04_room_1Set_000860DL_004D48 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000860DL_004D48"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000860DL_004D48[] = dspot04_room_1Set_000860DL_004D48;
 
-#define dspot04_room_1Set_000860DL_004218 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000860DL_004218"
+#define dspot04_room_1Set_000860DL_004218 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000860DL_004218"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000860DL_004218[] = dspot04_room_1Set_000860DL_004218;
 
-#define dspot04_room_1Set_000860DL_007A90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000860DL_007A90"
+#define dspot04_room_1Set_000860DL_007A90 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000860DL_007A90"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000860DL_007A90[] = dspot04_room_1Set_000860DL_007A90;
 
-#define dspot04_room_1Set_000900DL_0018D0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000900DL_0018D0"
+#define dspot04_room_1Set_000900DL_0018D0 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000900DL_0018D0"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000900DL_0018D0[] = dspot04_room_1Set_000900DL_0018D0;
 
-#define dspot04_room_1Set_000900DL_007810 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000900DL_007810"
+#define dspot04_room_1Set_000900DL_007810 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000900DL_007810"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000900DL_007810[] = dspot04_room_1Set_000900DL_007810;
 
-#define dspot04_room_1Set_000900DL_004D48 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000900DL_004D48"
+#define dspot04_room_1Set_000900DL_004D48 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000900DL_004D48"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000900DL_004D48[] = dspot04_room_1Set_000900DL_004D48;
 
-#define dspot04_room_1Set_000900DL_004218 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000900DL_004218"
+#define dspot04_room_1Set_000900DL_004218 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000900DL_004218"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000900DL_004218[] = dspot04_room_1Set_000900DL_004218;
 
-#define dspot04_room_1Set_000900DL_007A90 "__OTR__scenes/nonmq/spot04_scene/spot04_room_1Set_000900DL_007A90"
+#define dspot04_room_1Set_000900DL_007A90 "__OTR__scenes/shared/spot04_scene/spot04_room_1Set_000900DL_007A90"
 static const ALIGN_ASSET(2) char spot04_room_1Set_000900DL_007A90[] = dspot04_room_1Set_000900DL_007A90;
 
 
diff --git a/soh/assets/scenes/overworld/spot04/spot04_room_2.h b/soh/assets/scenes/overworld/spot04/spot04_room_2.h
index e7f76b047..c3185dc3e 100644
--- a/soh/assets/scenes/overworld/spot04/spot04_room_2.h
+++ b/soh/assets/scenes/overworld/spot04/spot04_room_2.h
@@ -3,343 +3,343 @@
 
 #include "align_asset_macro.h"
 
-#define dgSpot04DL_002BB8 "__OTR__scenes/nonmq/spot04_scene/gSpot04DL_002BB8"
-static const ALIGN_ASSET(2) char gSpot04DL_002BB8[] = dgSpot04DL_002BB8;
-
-#define dgSpot04DL_005058 "__OTR__scenes/nonmq/spot04_scene/gSpot04DL_005058"
-static const ALIGN_ASSET(2) char gSpot04DL_005058[] = dgSpot04DL_005058;
-
-#define dspot04_room_2DL_000840 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2DL_000840"
-static const ALIGN_ASSET(2) char spot04_room_2DL_000840[] = dspot04_room_2DL_000840;
-
-#define dspot04_room_2DL_004F80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2DL_004F80"
-static const ALIGN_ASSET(2) char spot04_room_2DL_004F80[] = dspot04_room_2DL_004F80;
-
-#define dspot04_room_2DL_001AC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2DL_001AC0"
-static const ALIGN_ASSET(2) char spot04_room_2DL_001AC0[] = dspot04_room_2DL_001AC0;
-
-#define dspot04_room_2DL_001378 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2DL_001378"
-static const ALIGN_ASSET(2) char spot04_room_2DL_001378[] = dspot04_room_2DL_001378;
-
-#define dspot04_room_2Tex_002BF8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Tex_002BF8"
+#define dspot04_room_2Tex_002BF8 "__OTR__scenes/shared/spot04_scene/spot04_room_2Tex_002BF8"
 static const ALIGN_ASSET(2) char spot04_room_2Tex_002BF8[] = dspot04_room_2Tex_002BF8;
 
-#define dspot04_room_2Tex_002DF8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Tex_002DF8"
+#define dspot04_room_2Tex_002DF8 "__OTR__scenes/shared/spot04_scene/spot04_room_2Tex_002DF8"
 static const ALIGN_ASSET(2) char spot04_room_2Tex_002DF8[] = dspot04_room_2Tex_002DF8;
 
-#define dspot04_room_2DL_002730 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2DL_002730"
-static const ALIGN_ASSET(2) char spot04_room_2DL_002730[] = dspot04_room_2DL_002730;
-
-#define dspot04_room_2Tex_0033F8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Tex_0033F8"
-static const ALIGN_ASSET(2) char spot04_room_2Tex_0033F8[] = dspot04_room_2Tex_0033F8;
-
-#define dspot04_room_2Tex_003BF8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Tex_003BF8"
-static const ALIGN_ASSET(2) char spot04_room_2Tex_003BF8[] = dspot04_room_2Tex_003BF8;
-
-#define dspot04_room_2DL_002AD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2DL_002AD0"
-static const ALIGN_ASSET(2) char spot04_room_2DL_002AD0[] = dspot04_room_2DL_002AD0;
-
-#define dspot04_room_2Tex_0045F8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Tex_0045F8"
-static const ALIGN_ASSET(2) char spot04_room_2Tex_0045F8[] = dspot04_room_2Tex_0045F8;
-
-#define dspot04_room_2DL_001EC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2DL_001EC0"
-static const ALIGN_ASSET(2) char spot04_room_2DL_001EC0[] = dspot04_room_2DL_001EC0;
-
-#define dspot04_room_2Tex_0043F8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Tex_0043F8"
-static const ALIGN_ASSET(2) char spot04_room_2Tex_0043F8[] = dspot04_room_2Tex_0043F8;
-
-#define dspot04_room_2DL_002338 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2DL_002338"
-static const ALIGN_ASSET(2) char spot04_room_2DL_002338[] = dspot04_room_2DL_002338;
-
-#define dspot04_room_2Tex_002FF8 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Tex_002FF8"
+#define dspot04_room_2Tex_002FF8 "__OTR__scenes/shared/spot04_scene/spot04_room_2Tex_002FF8"
 static const ALIGN_ASSET(2) char spot04_room_2Tex_002FF8[] = dspot04_room_2Tex_002FF8;
 
-#define dspot04_room_2Set_0001D0DL_000840 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0001D0DL_000840"
+#define dspot04_room_2Tex_0033F8 "__OTR__scenes/shared/spot04_scene/spot04_room_2Tex_0033F8"
+static const ALIGN_ASSET(2) char spot04_room_2Tex_0033F8[] = dspot04_room_2Tex_0033F8;
+
+#define dspot04_room_2Tex_003BF8 "__OTR__scenes/shared/spot04_scene/spot04_room_2Tex_003BF8"
+static const ALIGN_ASSET(2) char spot04_room_2Tex_003BF8[] = dspot04_room_2Tex_003BF8;
+
+#define dspot04_room_2Tex_0043F8 "__OTR__scenes/shared/spot04_scene/spot04_room_2Tex_0043F8"
+static const ALIGN_ASSET(2) char spot04_room_2Tex_0043F8[] = dspot04_room_2Tex_0043F8;
+
+#define dspot04_room_2Tex_0045F8 "__OTR__scenes/shared/spot04_scene/spot04_room_2Tex_0045F8"
+static const ALIGN_ASSET(2) char spot04_room_2Tex_0045F8[] = dspot04_room_2Tex_0045F8;
+
+#define dgSpot04DL_002BB8 "__OTR__scenes/shared/spot04_scene/gSpot04DL_002BB8"
+static const ALIGN_ASSET(2) char gSpot04DL_002BB8[] = dgSpot04DL_002BB8;
+
+#define dgSpot04DL_005058 "__OTR__scenes/shared/spot04_scene/gSpot04DL_005058"
+static const ALIGN_ASSET(2) char gSpot04DL_005058[] = dgSpot04DL_005058;
+
+#define dspot04_room_2DL_000840 "__OTR__scenes/shared/spot04_scene/spot04_room_2DL_000840"
+static const ALIGN_ASSET(2) char spot04_room_2DL_000840[] = dspot04_room_2DL_000840;
+
+#define dspot04_room_2DL_004F80 "__OTR__scenes/shared/spot04_scene/spot04_room_2DL_004F80"
+static const ALIGN_ASSET(2) char spot04_room_2DL_004F80[] = dspot04_room_2DL_004F80;
+
+#define dspot04_room_2DL_001AC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2DL_001AC0"
+static const ALIGN_ASSET(2) char spot04_room_2DL_001AC0[] = dspot04_room_2DL_001AC0;
+
+#define dspot04_room_2DL_001378 "__OTR__scenes/shared/spot04_scene/spot04_room_2DL_001378"
+static const ALIGN_ASSET(2) char spot04_room_2DL_001378[] = dspot04_room_2DL_001378;
+
+#define dspot04_room_2DL_002730 "__OTR__scenes/shared/spot04_scene/spot04_room_2DL_002730"
+static const ALIGN_ASSET(2) char spot04_room_2DL_002730[] = dspot04_room_2DL_002730;
+
+#define dspot04_room_2DL_002AD0 "__OTR__scenes/shared/spot04_scene/spot04_room_2DL_002AD0"
+static const ALIGN_ASSET(2) char spot04_room_2DL_002AD0[] = dspot04_room_2DL_002AD0;
+
+#define dspot04_room_2DL_001EC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2DL_001EC0"
+static const ALIGN_ASSET(2) char spot04_room_2DL_001EC0[] = dspot04_room_2DL_001EC0;
+
+#define dspot04_room_2DL_002338 "__OTR__scenes/shared/spot04_scene/spot04_room_2DL_002338"
+static const ALIGN_ASSET(2) char spot04_room_2DL_002338[] = dspot04_room_2DL_002338;
+
+#define dspot04_room_2Set_0001D0DL_000840 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0001D0DL_000840"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0001D0DL_000840[] = dspot04_room_2Set_0001D0DL_000840;
 
-#define dspot04_room_2Set_0001D0DL_004F80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0001D0DL_004F80"
+#define dspot04_room_2Set_0001D0DL_004F80 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0001D0DL_004F80"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0001D0DL_004F80[] = dspot04_room_2Set_0001D0DL_004F80;
 
-#define dspot04_room_2Set_0001D0DL_001AC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0001D0DL_001AC0"
+#define dspot04_room_2Set_0001D0DL_001AC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0001D0DL_001AC0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0001D0DL_001AC0[] = dspot04_room_2Set_0001D0DL_001AC0;
 
-#define dspot04_room_2Set_0001D0DL_001378 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0001D0DL_001378"
+#define dspot04_room_2Set_0001D0DL_001378 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0001D0DL_001378"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0001D0DL_001378[] = dspot04_room_2Set_0001D0DL_001378;
 
-#define dspot04_room_2Set_0001D0DL_002730 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0001D0DL_002730"
+#define dspot04_room_2Set_0001D0DL_002730 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0001D0DL_002730"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0001D0DL_002730[] = dspot04_room_2Set_0001D0DL_002730;
 
-#define dspot04_room_2Set_0001D0DL_002AD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0001D0DL_002AD0"
+#define dspot04_room_2Set_0001D0DL_002AD0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0001D0DL_002AD0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0001D0DL_002AD0[] = dspot04_room_2Set_0001D0DL_002AD0;
 
-#define dspot04_room_2Set_0001D0DL_001EC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0001D0DL_001EC0"
+#define dspot04_room_2Set_0001D0DL_001EC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0001D0DL_001EC0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0001D0DL_001EC0[] = dspot04_room_2Set_0001D0DL_001EC0;
 
-#define dspot04_room_2Set_0001D0DL_002338 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0001D0DL_002338"
+#define dspot04_room_2Set_0001D0DL_002338 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0001D0DL_002338"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0001D0DL_002338[] = dspot04_room_2Set_0001D0DL_002338;
 
-#define dspot04_room_2Set_000200DL_000840 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000200DL_000840"
+#define dspot04_room_2Set_000200DL_000840 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000200DL_000840"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000200DL_000840[] = dspot04_room_2Set_000200DL_000840;
 
-#define dspot04_room_2Set_000200DL_004F80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000200DL_004F80"
+#define dspot04_room_2Set_000200DL_004F80 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000200DL_004F80"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000200DL_004F80[] = dspot04_room_2Set_000200DL_004F80;
 
-#define dspot04_room_2Set_000200DL_001AC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000200DL_001AC0"
+#define dspot04_room_2Set_000200DL_001AC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000200DL_001AC0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000200DL_001AC0[] = dspot04_room_2Set_000200DL_001AC0;
 
-#define dspot04_room_2Set_000200DL_001378 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000200DL_001378"
+#define dspot04_room_2Set_000200DL_001378 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000200DL_001378"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000200DL_001378[] = dspot04_room_2Set_000200DL_001378;
 
-#define dspot04_room_2Set_000200DL_002730 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000200DL_002730"
+#define dspot04_room_2Set_000200DL_002730 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000200DL_002730"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000200DL_002730[] = dspot04_room_2Set_000200DL_002730;
 
-#define dspot04_room_2Set_000200DL_002AD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000200DL_002AD0"
+#define dspot04_room_2Set_000200DL_002AD0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000200DL_002AD0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000200DL_002AD0[] = dspot04_room_2Set_000200DL_002AD0;
 
-#define dspot04_room_2Set_000200DL_001EC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000200DL_001EC0"
+#define dspot04_room_2Set_000200DL_001EC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000200DL_001EC0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000200DL_001EC0[] = dspot04_room_2Set_000200DL_001EC0;
 
-#define dspot04_room_2Set_000200DL_002338 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000200DL_002338"
+#define dspot04_room_2Set_000200DL_002338 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000200DL_002338"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000200DL_002338[] = dspot04_room_2Set_000200DL_002338;
 
-#define dspot04_room_2Set_000230DL_000840 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000230DL_000840"
+#define dspot04_room_2Set_000230DL_000840 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000230DL_000840"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000230DL_000840[] = dspot04_room_2Set_000230DL_000840;
 
-#define dspot04_room_2Set_000230DL_004F80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000230DL_004F80"
+#define dspot04_room_2Set_000230DL_004F80 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000230DL_004F80"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000230DL_004F80[] = dspot04_room_2Set_000230DL_004F80;
 
-#define dspot04_room_2Set_000230DL_001AC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000230DL_001AC0"
+#define dspot04_room_2Set_000230DL_001AC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000230DL_001AC0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000230DL_001AC0[] = dspot04_room_2Set_000230DL_001AC0;
 
-#define dspot04_room_2Set_000230DL_001378 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000230DL_001378"
+#define dspot04_room_2Set_000230DL_001378 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000230DL_001378"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000230DL_001378[] = dspot04_room_2Set_000230DL_001378;
 
-#define dspot04_room_2Set_000230DL_002730 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000230DL_002730"
+#define dspot04_room_2Set_000230DL_002730 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000230DL_002730"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000230DL_002730[] = dspot04_room_2Set_000230DL_002730;
 
-#define dspot04_room_2Set_000230DL_002AD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000230DL_002AD0"
+#define dspot04_room_2Set_000230DL_002AD0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000230DL_002AD0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000230DL_002AD0[] = dspot04_room_2Set_000230DL_002AD0;
 
-#define dspot04_room_2Set_000230DL_001EC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000230DL_001EC0"
+#define dspot04_room_2Set_000230DL_001EC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000230DL_001EC0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000230DL_001EC0[] = dspot04_room_2Set_000230DL_001EC0;
 
-#define dspot04_room_2Set_000230DL_002338 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000230DL_002338"
+#define dspot04_room_2Set_000230DL_002338 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000230DL_002338"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000230DL_002338[] = dspot04_room_2Set_000230DL_002338;
 
-#define dspot04_room_2Set_000260DL_000840 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000260DL_000840"
+#define dspot04_room_2Set_000260DL_000840 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000260DL_000840"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000260DL_000840[] = dspot04_room_2Set_000260DL_000840;
 
-#define dspot04_room_2Set_000260DL_004F80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000260DL_004F80"
+#define dspot04_room_2Set_000260DL_004F80 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000260DL_004F80"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000260DL_004F80[] = dspot04_room_2Set_000260DL_004F80;
 
-#define dspot04_room_2Set_000260DL_001AC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000260DL_001AC0"
+#define dspot04_room_2Set_000260DL_001AC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000260DL_001AC0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000260DL_001AC0[] = dspot04_room_2Set_000260DL_001AC0;
 
-#define dspot04_room_2Set_000260DL_001378 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000260DL_001378"
+#define dspot04_room_2Set_000260DL_001378 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000260DL_001378"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000260DL_001378[] = dspot04_room_2Set_000260DL_001378;
 
-#define dspot04_room_2Set_000260DL_002730 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000260DL_002730"
+#define dspot04_room_2Set_000260DL_002730 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000260DL_002730"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000260DL_002730[] = dspot04_room_2Set_000260DL_002730;
 
-#define dspot04_room_2Set_000260DL_002AD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000260DL_002AD0"
+#define dspot04_room_2Set_000260DL_002AD0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000260DL_002AD0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000260DL_002AD0[] = dspot04_room_2Set_000260DL_002AD0;
 
-#define dspot04_room_2Set_000260DL_001EC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000260DL_001EC0"
+#define dspot04_room_2Set_000260DL_001EC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000260DL_001EC0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000260DL_001EC0[] = dspot04_room_2Set_000260DL_001EC0;
 
-#define dspot04_room_2Set_000260DL_002338 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000260DL_002338"
+#define dspot04_room_2Set_000260DL_002338 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000260DL_002338"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000260DL_002338[] = dspot04_room_2Set_000260DL_002338;
 
-#define dspot04_room_2Set_000290DL_000840 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000290DL_000840"
+#define dspot04_room_2Set_000290DL_000840 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000290DL_000840"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000290DL_000840[] = dspot04_room_2Set_000290DL_000840;
 
-#define dspot04_room_2Set_000290DL_004F80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000290DL_004F80"
+#define dspot04_room_2Set_000290DL_004F80 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000290DL_004F80"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000290DL_004F80[] = dspot04_room_2Set_000290DL_004F80;
 
-#define dspot04_room_2Set_000290DL_001AC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000290DL_001AC0"
+#define dspot04_room_2Set_000290DL_001AC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000290DL_001AC0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000290DL_001AC0[] = dspot04_room_2Set_000290DL_001AC0;
 
-#define dspot04_room_2Set_000290DL_001378 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000290DL_001378"
+#define dspot04_room_2Set_000290DL_001378 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000290DL_001378"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000290DL_001378[] = dspot04_room_2Set_000290DL_001378;
 
-#define dspot04_room_2Set_000290DL_002730 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000290DL_002730"
+#define dspot04_room_2Set_000290DL_002730 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000290DL_002730"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000290DL_002730[] = dspot04_room_2Set_000290DL_002730;
 
-#define dspot04_room_2Set_000290DL_002AD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000290DL_002AD0"
+#define dspot04_room_2Set_000290DL_002AD0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000290DL_002AD0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000290DL_002AD0[] = dspot04_room_2Set_000290DL_002AD0;
 
-#define dspot04_room_2Set_000290DL_001EC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000290DL_001EC0"
+#define dspot04_room_2Set_000290DL_001EC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000290DL_001EC0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000290DL_001EC0[] = dspot04_room_2Set_000290DL_001EC0;
 
-#define dspot04_room_2Set_000290DL_002338 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000290DL_002338"
+#define dspot04_room_2Set_000290DL_002338 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000290DL_002338"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000290DL_002338[] = dspot04_room_2Set_000290DL_002338;
 
-#define dspot04_room_2Set_0002C0DL_000840 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0002C0DL_000840"
+#define dspot04_room_2Set_0002C0DL_000840 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0002C0DL_000840"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0002C0DL_000840[] = dspot04_room_2Set_0002C0DL_000840;
 
-#define dspot04_room_2Set_0002C0DL_004F80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0002C0DL_004F80"
+#define dspot04_room_2Set_0002C0DL_004F80 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0002C0DL_004F80"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0002C0DL_004F80[] = dspot04_room_2Set_0002C0DL_004F80;
 
-#define dspot04_room_2Set_0002C0DL_001AC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0002C0DL_001AC0"
+#define dspot04_room_2Set_0002C0DL_001AC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0002C0DL_001AC0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0002C0DL_001AC0[] = dspot04_room_2Set_0002C0DL_001AC0;
 
-#define dspot04_room_2Set_0002C0DL_001378 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0002C0DL_001378"
+#define dspot04_room_2Set_0002C0DL_001378 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0002C0DL_001378"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0002C0DL_001378[] = dspot04_room_2Set_0002C0DL_001378;
 
-#define dspot04_room_2Set_0002C0DL_002730 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0002C0DL_002730"
+#define dspot04_room_2Set_0002C0DL_002730 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0002C0DL_002730"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0002C0DL_002730[] = dspot04_room_2Set_0002C0DL_002730;
 
-#define dspot04_room_2Set_0002C0DL_002AD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0002C0DL_002AD0"
+#define dspot04_room_2Set_0002C0DL_002AD0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0002C0DL_002AD0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0002C0DL_002AD0[] = dspot04_room_2Set_0002C0DL_002AD0;
 
-#define dspot04_room_2Set_0002C0DL_001EC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0002C0DL_001EC0"
+#define dspot04_room_2Set_0002C0DL_001EC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0002C0DL_001EC0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0002C0DL_001EC0[] = dspot04_room_2Set_0002C0DL_001EC0;
 
-#define dspot04_room_2Set_0002C0DL_002338 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0002C0DL_002338"
+#define dspot04_room_2Set_0002C0DL_002338 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0002C0DL_002338"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0002C0DL_002338[] = dspot04_room_2Set_0002C0DL_002338;
 
-#define dspot04_room_2Set_0002F0DL_000840 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0002F0DL_000840"
+#define dspot04_room_2Set_0002F0DL_000840 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0002F0DL_000840"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0002F0DL_000840[] = dspot04_room_2Set_0002F0DL_000840;
 
-#define dspot04_room_2Set_0002F0DL_004F80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0002F0DL_004F80"
+#define dspot04_room_2Set_0002F0DL_004F80 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0002F0DL_004F80"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0002F0DL_004F80[] = dspot04_room_2Set_0002F0DL_004F80;
 
-#define dspot04_room_2Set_0002F0DL_001AC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0002F0DL_001AC0"
+#define dspot04_room_2Set_0002F0DL_001AC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0002F0DL_001AC0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0002F0DL_001AC0[] = dspot04_room_2Set_0002F0DL_001AC0;
 
-#define dspot04_room_2Set_0002F0DL_001378 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0002F0DL_001378"
+#define dspot04_room_2Set_0002F0DL_001378 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0002F0DL_001378"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0002F0DL_001378[] = dspot04_room_2Set_0002F0DL_001378;
 
-#define dspot04_room_2Set_0002F0DL_002730 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0002F0DL_002730"
+#define dspot04_room_2Set_0002F0DL_002730 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0002F0DL_002730"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0002F0DL_002730[] = dspot04_room_2Set_0002F0DL_002730;
 
-#define dspot04_room_2Set_0002F0DL_002AD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0002F0DL_002AD0"
+#define dspot04_room_2Set_0002F0DL_002AD0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0002F0DL_002AD0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0002F0DL_002AD0[] = dspot04_room_2Set_0002F0DL_002AD0;
 
-#define dspot04_room_2Set_0002F0DL_001EC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0002F0DL_001EC0"
+#define dspot04_room_2Set_0002F0DL_001EC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0002F0DL_001EC0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0002F0DL_001EC0[] = dspot04_room_2Set_0002F0DL_001EC0;
 
-#define dspot04_room_2Set_0002F0DL_002338 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0002F0DL_002338"
+#define dspot04_room_2Set_0002F0DL_002338 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0002F0DL_002338"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0002F0DL_002338[] = dspot04_room_2Set_0002F0DL_002338;
 
-#define dspot04_room_2Set_000320DL_000840 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000320DL_000840"
+#define dspot04_room_2Set_000320DL_000840 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000320DL_000840"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000320DL_000840[] = dspot04_room_2Set_000320DL_000840;
 
-#define dspot04_room_2Set_000320DL_004F80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000320DL_004F80"
+#define dspot04_room_2Set_000320DL_004F80 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000320DL_004F80"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000320DL_004F80[] = dspot04_room_2Set_000320DL_004F80;
 
-#define dspot04_room_2Set_000320DL_001AC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000320DL_001AC0"
+#define dspot04_room_2Set_000320DL_001AC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000320DL_001AC0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000320DL_001AC0[] = dspot04_room_2Set_000320DL_001AC0;
 
-#define dspot04_room_2Set_000320DL_001378 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000320DL_001378"
+#define dspot04_room_2Set_000320DL_001378 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000320DL_001378"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000320DL_001378[] = dspot04_room_2Set_000320DL_001378;
 
-#define dspot04_room_2Set_000320DL_002730 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000320DL_002730"
+#define dspot04_room_2Set_000320DL_002730 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000320DL_002730"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000320DL_002730[] = dspot04_room_2Set_000320DL_002730;
 
-#define dspot04_room_2Set_000320DL_002AD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000320DL_002AD0"
+#define dspot04_room_2Set_000320DL_002AD0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000320DL_002AD0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000320DL_002AD0[] = dspot04_room_2Set_000320DL_002AD0;
 
-#define dspot04_room_2Set_000320DL_001EC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000320DL_001EC0"
+#define dspot04_room_2Set_000320DL_001EC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000320DL_001EC0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000320DL_001EC0[] = dspot04_room_2Set_000320DL_001EC0;
 
-#define dspot04_room_2Set_000320DL_002338 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000320DL_002338"
+#define dspot04_room_2Set_000320DL_002338 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000320DL_002338"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000320DL_002338[] = dspot04_room_2Set_000320DL_002338;
 
-#define dspot04_room_2Set_000350DL_000840 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000350DL_000840"
+#define dspot04_room_2Set_000350DL_000840 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000350DL_000840"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000350DL_000840[] = dspot04_room_2Set_000350DL_000840;
 
-#define dspot04_room_2Set_000350DL_004F80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000350DL_004F80"
+#define dspot04_room_2Set_000350DL_004F80 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000350DL_004F80"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000350DL_004F80[] = dspot04_room_2Set_000350DL_004F80;
 
-#define dspot04_room_2Set_000350DL_001AC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000350DL_001AC0"
+#define dspot04_room_2Set_000350DL_001AC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000350DL_001AC0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000350DL_001AC0[] = dspot04_room_2Set_000350DL_001AC0;
 
-#define dspot04_room_2Set_000350DL_001378 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000350DL_001378"
+#define dspot04_room_2Set_000350DL_001378 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000350DL_001378"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000350DL_001378[] = dspot04_room_2Set_000350DL_001378;
 
-#define dspot04_room_2Set_000350DL_002730 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000350DL_002730"
+#define dspot04_room_2Set_000350DL_002730 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000350DL_002730"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000350DL_002730[] = dspot04_room_2Set_000350DL_002730;
 
-#define dspot04_room_2Set_000350DL_002AD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000350DL_002AD0"
+#define dspot04_room_2Set_000350DL_002AD0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000350DL_002AD0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000350DL_002AD0[] = dspot04_room_2Set_000350DL_002AD0;
 
-#define dspot04_room_2Set_000350DL_001EC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000350DL_001EC0"
+#define dspot04_room_2Set_000350DL_001EC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000350DL_001EC0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000350DL_001EC0[] = dspot04_room_2Set_000350DL_001EC0;
 
-#define dspot04_room_2Set_000350DL_002338 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000350DL_002338"
+#define dspot04_room_2Set_000350DL_002338 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000350DL_002338"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000350DL_002338[] = dspot04_room_2Set_000350DL_002338;
 
-#define dspot04_room_2Set_000380DL_000840 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000380DL_000840"
+#define dspot04_room_2Set_000380DL_000840 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000380DL_000840"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000380DL_000840[] = dspot04_room_2Set_000380DL_000840;
 
-#define dspot04_room_2Set_000380DL_004F80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000380DL_004F80"
+#define dspot04_room_2Set_000380DL_004F80 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000380DL_004F80"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000380DL_004F80[] = dspot04_room_2Set_000380DL_004F80;
 
-#define dspot04_room_2Set_000380DL_001AC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000380DL_001AC0"
+#define dspot04_room_2Set_000380DL_001AC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000380DL_001AC0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000380DL_001AC0[] = dspot04_room_2Set_000380DL_001AC0;
 
-#define dspot04_room_2Set_000380DL_001378 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000380DL_001378"
+#define dspot04_room_2Set_000380DL_001378 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000380DL_001378"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000380DL_001378[] = dspot04_room_2Set_000380DL_001378;
 
-#define dspot04_room_2Set_000380DL_002730 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000380DL_002730"
+#define dspot04_room_2Set_000380DL_002730 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000380DL_002730"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000380DL_002730[] = dspot04_room_2Set_000380DL_002730;
 
-#define dspot04_room_2Set_000380DL_002AD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000380DL_002AD0"
+#define dspot04_room_2Set_000380DL_002AD0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000380DL_002AD0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000380DL_002AD0[] = dspot04_room_2Set_000380DL_002AD0;
 
-#define dspot04_room_2Set_000380DL_001EC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000380DL_001EC0"
+#define dspot04_room_2Set_000380DL_001EC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000380DL_001EC0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000380DL_001EC0[] = dspot04_room_2Set_000380DL_001EC0;
 
-#define dspot04_room_2Set_000380DL_002338 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_000380DL_002338"
+#define dspot04_room_2Set_000380DL_002338 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_000380DL_002338"
 static const ALIGN_ASSET(2) char spot04_room_2Set_000380DL_002338[] = dspot04_room_2Set_000380DL_002338;
 
-#define dspot04_room_2Set_0003B0DL_000840 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0003B0DL_000840"
+#define dspot04_room_2Set_0003B0DL_000840 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0003B0DL_000840"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0003B0DL_000840[] = dspot04_room_2Set_0003B0DL_000840;
 
-#define dspot04_room_2Set_0003B0DL_004F80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0003B0DL_004F80"
+#define dspot04_room_2Set_0003B0DL_004F80 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0003B0DL_004F80"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0003B0DL_004F80[] = dspot04_room_2Set_0003B0DL_004F80;
 
-#define dspot04_room_2Set_0003B0DL_001AC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0003B0DL_001AC0"
+#define dspot04_room_2Set_0003B0DL_001AC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0003B0DL_001AC0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0003B0DL_001AC0[] = dspot04_room_2Set_0003B0DL_001AC0;
 
-#define dspot04_room_2Set_0003B0DL_001378 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0003B0DL_001378"
+#define dspot04_room_2Set_0003B0DL_001378 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0003B0DL_001378"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0003B0DL_001378[] = dspot04_room_2Set_0003B0DL_001378;
 
-#define dspot04_room_2Set_0003B0DL_002730 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0003B0DL_002730"
+#define dspot04_room_2Set_0003B0DL_002730 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0003B0DL_002730"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0003B0DL_002730[] = dspot04_room_2Set_0003B0DL_002730;
 
-#define dspot04_room_2Set_0003B0DL_002AD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0003B0DL_002AD0"
+#define dspot04_room_2Set_0003B0DL_002AD0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0003B0DL_002AD0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0003B0DL_002AD0[] = dspot04_room_2Set_0003B0DL_002AD0;
 
-#define dspot04_room_2Set_0003B0DL_001EC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0003B0DL_001EC0"
+#define dspot04_room_2Set_0003B0DL_001EC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0003B0DL_001EC0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0003B0DL_001EC0[] = dspot04_room_2Set_0003B0DL_001EC0;
 
-#define dspot04_room_2Set_0003B0DL_002338 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0003B0DL_002338"
+#define dspot04_room_2Set_0003B0DL_002338 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0003B0DL_002338"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0003B0DL_002338[] = dspot04_room_2Set_0003B0DL_002338;
 
-#define dspot04_room_2Set_0003E0DL_000840 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0003E0DL_000840"
+#define dspot04_room_2Set_0003E0DL_000840 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0003E0DL_000840"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0003E0DL_000840[] = dspot04_room_2Set_0003E0DL_000840;
 
-#define dspot04_room_2Set_0003E0DL_004F80 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0003E0DL_004F80"
+#define dspot04_room_2Set_0003E0DL_004F80 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0003E0DL_004F80"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0003E0DL_004F80[] = dspot04_room_2Set_0003E0DL_004F80;
 
-#define dspot04_room_2Set_0003E0DL_001AC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0003E0DL_001AC0"
+#define dspot04_room_2Set_0003E0DL_001AC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0003E0DL_001AC0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0003E0DL_001AC0[] = dspot04_room_2Set_0003E0DL_001AC0;
 
-#define dspot04_room_2Set_0003E0DL_001378 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0003E0DL_001378"
+#define dspot04_room_2Set_0003E0DL_001378 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0003E0DL_001378"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0003E0DL_001378[] = dspot04_room_2Set_0003E0DL_001378;
 
-#define dspot04_room_2Set_0003E0DL_002730 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0003E0DL_002730"
+#define dspot04_room_2Set_0003E0DL_002730 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0003E0DL_002730"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0003E0DL_002730[] = dspot04_room_2Set_0003E0DL_002730;
 
-#define dspot04_room_2Set_0003E0DL_002AD0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0003E0DL_002AD0"
+#define dspot04_room_2Set_0003E0DL_002AD0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0003E0DL_002AD0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0003E0DL_002AD0[] = dspot04_room_2Set_0003E0DL_002AD0;
 
-#define dspot04_room_2Set_0003E0DL_001EC0 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0003E0DL_001EC0"
+#define dspot04_room_2Set_0003E0DL_001EC0 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0003E0DL_001EC0"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0003E0DL_001EC0[] = dspot04_room_2Set_0003E0DL_001EC0;
 
-#define dspot04_room_2Set_0003E0DL_002338 "__OTR__scenes/nonmq/spot04_scene/spot04_room_2Set_0003E0DL_002338"
+#define dspot04_room_2Set_0003E0DL_002338 "__OTR__scenes/shared/spot04_scene/spot04_room_2Set_0003E0DL_002338"
 static const ALIGN_ASSET(2) char spot04_room_2Set_0003E0DL_002338[] = dspot04_room_2Set_0003E0DL_002338;
 
 
diff --git a/soh/assets/scenes/overworld/spot04/spot04_scene.h b/soh/assets/scenes/overworld/spot04/spot04_scene.h
index 80cea7dca..46da19dd3 100644
--- a/soh/assets/scenes/overworld/spot04/spot04_scene.h
+++ b/soh/assets/scenes/overworld/spot04/spot04_scene.h
@@ -3,59 +3,59 @@
 
 #include "align_asset_macro.h"
 
-#define dgKokiriForestDekuSproutCs "__OTR__scenes/nonmq/spot04_scene/gKokiriForestDekuSproutCs"
-static const ALIGN_ASSET(2) char gKokiriForestDekuSproutCs[] = dgKokiriForestDekuSproutCs;
-
-#define dgSpot04Cs_10E20 "__OTR__scenes/nonmq/spot04_scene/gSpot04Cs_10E20"
-static const ALIGN_ASSET(2) char gSpot04Cs_10E20[] = dgSpot04Cs_10E20;
-
-#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneCollisionHeader_008918"
-static const ALIGN_ASSET(2) char spot04_sceneCollisionHeader_008918[] = dspot04_sceneCollisionHeader_008918;
-
-#define dspot04_sceneTLUT_00E010 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneTLUT_00E010"
-static const ALIGN_ASSET(2) char spot04_sceneTLUT_00E010[] = dspot04_sceneTLUT_00E010;
-
-#define dspot04_sceneTex_010618 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneTex_010618"
-static const ALIGN_ASSET(2) char spot04_sceneTex_010618[] = dspot04_sceneTex_010618;
-
-#define dspot04_sceneTex_00FE18 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneTex_00FE18"
-static const ALIGN_ASSET(2) char spot04_sceneTex_00FE18[] = dspot04_sceneTex_00FE18;
-
-#define dspot04_sceneTex_00F218 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneTex_00F218"
-static const ALIGN_ASSET(2) char spot04_sceneTex_00F218[] = dspot04_sceneTex_00F218;
-
-#define dspot04_sceneTex_00EA18 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneTex_00EA18"
-static const ALIGN_ASSET(2) char spot04_sceneTex_00EA18[] = dspot04_sceneTex_00EA18;
-
-#define dspot04_sceneTex_00E218 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneTex_00E218"
+#define dspot04_sceneTex_00E218 "__OTR__scenes/shared/spot04_scene/spot04_sceneTex_00E218"
 static const ALIGN_ASSET(2) char spot04_sceneTex_00E218[] = dspot04_sceneTex_00E218;
 
-#define dspot04_sceneTex_00FA18 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneTex_00FA18"
+#define dspot04_sceneTex_00EA18 "__OTR__scenes/shared/spot04_scene/spot04_sceneTex_00EA18"
+static const ALIGN_ASSET(2) char spot04_sceneTex_00EA18[] = dspot04_sceneTex_00EA18;
+
+#define dspot04_sceneTex_00F218 "__OTR__scenes/shared/spot04_scene/spot04_sceneTex_00F218"
+static const ALIGN_ASSET(2) char spot04_sceneTex_00F218[] = dspot04_sceneTex_00F218;
+
+#define dspot04_sceneTex_00FA18 "__OTR__scenes/shared/spot04_scene/spot04_sceneTex_00FA18"
 static const ALIGN_ASSET(2) char spot04_sceneTex_00FA18[] = dspot04_sceneTex_00FA18;
 
-#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneCollisionHeader_008918"
+#define dspot04_sceneTex_00FE18 "__OTR__scenes/shared/spot04_scene/spot04_sceneTex_00FE18"
+static const ALIGN_ASSET(2) char spot04_sceneTex_00FE18[] = dspot04_sceneTex_00FE18;
 
-#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneCollisionHeader_008918"
+#define dspot04_sceneTex_010618 "__OTR__scenes/shared/spot04_scene/spot04_sceneTex_010618"
+static const ALIGN_ASSET(2) char spot04_sceneTex_010618[] = dspot04_sceneTex_010618;
 
-#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneCollisionHeader_008918"
+#define dspot04_sceneTLUT_00E010 "__OTR__scenes/shared/spot04_scene/spot04_sceneTLUT_00E010"
+static const ALIGN_ASSET(2) char spot04_sceneTLUT_00E010[] = dspot04_sceneTLUT_00E010;
 
-#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneCollisionHeader_008918"
+#define dgKokiriForestDekuSproutCs "__OTR__scenes/shared/spot04_scene/gKokiriForestDekuSproutCs"
+static const ALIGN_ASSET(2) char gKokiriForestDekuSproutCs[] = dgKokiriForestDekuSproutCs;
 
-#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneCollisionHeader_008918"
+#define dgSpot04Cs_10E20 "__OTR__scenes/shared/spot04_scene/gSpot04Cs_10E20"
+static const ALIGN_ASSET(2) char gSpot04Cs_10E20[] = dgSpot04Cs_10E20;
 
-#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneCollisionHeader_008918"
+#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/shared/spot04_scene/spot04_sceneCollisionHeader_008918"
+static const ALIGN_ASSET(2) char spot04_sceneCollisionHeader_008918[] = dspot04_sceneCollisionHeader_008918;
 
-#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneCollisionHeader_008918"
+#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/shared/spot04_scene/spot04_sceneCollisionHeader_008918"
 
-#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneCollisionHeader_008918"
+#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/shared/spot04_scene/spot04_sceneCollisionHeader_008918"
 
-#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneCollisionHeader_008918"
+#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/shared/spot04_scene/spot04_sceneCollisionHeader_008918"
 
-#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneCollisionHeader_008918"
+#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/shared/spot04_scene/spot04_sceneCollisionHeader_008918"
 
-#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneCollisionHeader_008918"
+#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/shared/spot04_scene/spot04_sceneCollisionHeader_008918"
 
-#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/nonmq/spot04_scene/spot04_sceneCollisionHeader_008918"
+#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/shared/spot04_scene/spot04_sceneCollisionHeader_008918"
+
+#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/shared/spot04_scene/spot04_sceneCollisionHeader_008918"
+
+#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/shared/spot04_scene/spot04_sceneCollisionHeader_008918"
+
+#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/shared/spot04_scene/spot04_sceneCollisionHeader_008918"
+
+#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/shared/spot04_scene/spot04_sceneCollisionHeader_008918"
+
+#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/shared/spot04_scene/spot04_sceneCollisionHeader_008918"
+
+#define dspot04_sceneCollisionHeader_008918 "__OTR__scenes/shared/spot04_scene/spot04_sceneCollisionHeader_008918"
 
 
 #endif // OVERWORLD_SPOT04_SCENE_H
diff --git a/soh/assets/scenes/overworld/spot05/spot05_room_0.h b/soh/assets/scenes/overworld/spot05/spot05_room_0.h
index 4e1415ed2..a66341b26 100644
--- a/soh/assets/scenes/overworld/spot05/spot05_room_0.h
+++ b/soh/assets/scenes/overworld/spot05/spot05_room_0.h
@@ -3,226 +3,226 @@
 
 #include "align_asset_macro.h"
 
-#define dgSpot05DL_009A60 "__OTR__scenes/nonmq/spot05_scene/gSpot05DL_009A60"
+#define dgSpot05DL_009A60 "__OTR__scenes/shared/spot05_scene/gSpot05DL_009A60"
 static const ALIGN_ASSET(2) char gSpot05DL_009A60[] = dgSpot05DL_009A60;
 
-#define dgSpot05DL_009EE0 "__OTR__scenes/nonmq/spot05_scene/gSpot05DL_009EE0"
+#define dgSpot05DL_009EE0 "__OTR__scenes/shared/spot05_scene/gSpot05DL_009EE0"
 static const ALIGN_ASSET(2) char gSpot05DL_009EE0[] = dgSpot05DL_009EE0;
 
-#define dspot05_room_0DL_009928 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_009928"
+#define dspot05_room_0DL_009928 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_009928"
 static const ALIGN_ASSET(2) char spot05_room_0DL_009928[] = dspot05_room_0DL_009928;
 
-#define dspot05_room_0DL_005670 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_005670"
+#define dspot05_room_0DL_005670 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_005670"
 static const ALIGN_ASSET(2) char spot05_room_0DL_005670[] = dspot05_room_0DL_005670;
 
-#define dspot05_room_0DL_009BB0 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_009BB0"
+#define dspot05_room_0DL_009BB0 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_009BB0"
 static const ALIGN_ASSET(2) char spot05_room_0DL_009BB0[] = dspot05_room_0DL_009BB0;
 
-#define dspot05_room_0DL_0084C8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_0084C8"
+#define dspot05_room_0DL_0084C8 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_0084C8"
 static const ALIGN_ASSET(2) char spot05_room_0DL_0084C8[] = dspot05_room_0DL_0084C8;
 
-#define dspot05_room_0DL_0095D8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_0095D8"
+#define dspot05_room_0DL_0095D8 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_0095D8"
 static const ALIGN_ASSET(2) char spot05_room_0DL_0095D8[] = dspot05_room_0DL_0095D8;
 
-#define dspot05_room_0DL_009098 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_009098"
+#define dspot05_room_0DL_009098 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_009098"
 static const ALIGN_ASSET(2) char spot05_room_0DL_009098[] = dspot05_room_0DL_009098;
 
-#define dspot05_room_0DL_008970 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_008970"
+#define dspot05_room_0DL_008970 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_008970"
 static const ALIGN_ASSET(2) char spot05_room_0DL_008970[] = dspot05_room_0DL_008970;
 
-#define dspot05_room_0DL_0015B0 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_0015B0"
+#define dspot05_room_0DL_0015B0 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_0015B0"
 static const ALIGN_ASSET(2) char spot05_room_0DL_0015B0[] = dspot05_room_0DL_0015B0;
 
-#define dspot05_room_0DL_001CD8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_001CD8"
+#define dspot05_room_0DL_001CD8 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_001CD8"
 static const ALIGN_ASSET(2) char spot05_room_0DL_001CD8[] = dspot05_room_0DL_001CD8;
 
-#define dspot05_room_0DL_002200 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_002200"
+#define dspot05_room_0DL_002200 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_002200"
 static const ALIGN_ASSET(2) char spot05_room_0DL_002200[] = dspot05_room_0DL_002200;
 
-#define dspot05_room_0DL_0026B0 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_0026B0"
+#define dspot05_room_0DL_0026B0 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_0026B0"
 static const ALIGN_ASSET(2) char spot05_room_0DL_0026B0[] = dspot05_room_0DL_0026B0;
 
-#define dspot05_room_0DL_002BC8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_002BC8"
+#define dspot05_room_0DL_002BC8 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_002BC8"
 static const ALIGN_ASSET(2) char spot05_room_0DL_002BC8[] = dspot05_room_0DL_002BC8;
 
-#define dspot05_room_0DL_003618 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_003618"
+#define dspot05_room_0DL_003618 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_003618"
 static const ALIGN_ASSET(2) char spot05_room_0DL_003618[] = dspot05_room_0DL_003618;
 
-#define dspot05_room_0DL_003D88 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_003D88"
+#define dspot05_room_0DL_003D88 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_003D88"
 static const ALIGN_ASSET(2) char spot05_room_0DL_003D88[] = dspot05_room_0DL_003D88;
 
-#define dspot05_room_0DL_007F00 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_007F00"
+#define dspot05_room_0DL_007F00 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_007F00"
 static const ALIGN_ASSET(2) char spot05_room_0DL_007F00[] = dspot05_room_0DL_007F00;
 
-#define dspot05_room_0DL_007620 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_007620"
+#define dspot05_room_0DL_007620 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_007620"
 static const ALIGN_ASSET(2) char spot05_room_0DL_007620[] = dspot05_room_0DL_007620;
 
-#define dspot05_room_0DL_006EC8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_006EC8"
+#define dspot05_room_0DL_006EC8 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_006EC8"
 static const ALIGN_ASSET(2) char spot05_room_0DL_006EC8[] = dspot05_room_0DL_006EC8;
 
-#define dspot05_room_0DL_009DF0 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0DL_009DF0"
+#define dspot05_room_0DL_009DF0 "__OTR__scenes/shared/spot05_scene/spot05_room_0DL_009DF0"
 static const ALIGN_ASSET(2) char spot05_room_0DL_009DF0[] = dspot05_room_0DL_009DF0;
 
-#define dspot05_room_0Set_000340DL_009928 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_009928"
+#define dspot05_room_0Set_000340DL_009928 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_009928"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_009928[] = dspot05_room_0Set_000340DL_009928;
 
-#define dspot05_room_0Set_000340DL_005670 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_005670"
+#define dspot05_room_0Set_000340DL_005670 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_005670"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_005670[] = dspot05_room_0Set_000340DL_005670;
 
-#define dspot05_room_0Set_000340DL_009BB0 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_009BB0"
+#define dspot05_room_0Set_000340DL_009BB0 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_009BB0"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_009BB0[] = dspot05_room_0Set_000340DL_009BB0;
 
-#define dspot05_room_0Set_000340DL_0084C8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_0084C8"
+#define dspot05_room_0Set_000340DL_0084C8 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_0084C8"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_0084C8[] = dspot05_room_0Set_000340DL_0084C8;
 
-#define dspot05_room_0Set_000340DL_0095D8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_0095D8"
+#define dspot05_room_0Set_000340DL_0095D8 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_0095D8"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_0095D8[] = dspot05_room_0Set_000340DL_0095D8;
 
-#define dspot05_room_0Set_000340DL_009098 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_009098"
+#define dspot05_room_0Set_000340DL_009098 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_009098"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_009098[] = dspot05_room_0Set_000340DL_009098;
 
-#define dspot05_room_0Set_000340DL_008970 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_008970"
+#define dspot05_room_0Set_000340DL_008970 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_008970"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_008970[] = dspot05_room_0Set_000340DL_008970;
 
-#define dspot05_room_0Set_000340DL_0015B0 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_0015B0"
+#define dspot05_room_0Set_000340DL_0015B0 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_0015B0"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_0015B0[] = dspot05_room_0Set_000340DL_0015B0;
 
-#define dspot05_room_0Set_000340DL_001CD8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_001CD8"
+#define dspot05_room_0Set_000340DL_001CD8 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_001CD8"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_001CD8[] = dspot05_room_0Set_000340DL_001CD8;
 
-#define dspot05_room_0Set_000340DL_002200 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_002200"
+#define dspot05_room_0Set_000340DL_002200 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_002200"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_002200[] = dspot05_room_0Set_000340DL_002200;
 
-#define dspot05_room_0Set_000340DL_0026B0 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_0026B0"
+#define dspot05_room_0Set_000340DL_0026B0 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_0026B0"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_0026B0[] = dspot05_room_0Set_000340DL_0026B0;
 
-#define dspot05_room_0Set_000340DL_002BC8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_002BC8"
+#define dspot05_room_0Set_000340DL_002BC8 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_002BC8"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_002BC8[] = dspot05_room_0Set_000340DL_002BC8;
 
-#define dspot05_room_0Set_000340DL_003618 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_003618"
+#define dspot05_room_0Set_000340DL_003618 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_003618"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_003618[] = dspot05_room_0Set_000340DL_003618;
 
-#define dspot05_room_0Set_000340DL_003D88 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_003D88"
+#define dspot05_room_0Set_000340DL_003D88 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_003D88"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_003D88[] = dspot05_room_0Set_000340DL_003D88;
 
-#define dspot05_room_0Set_000340DL_007F00 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_007F00"
+#define dspot05_room_0Set_000340DL_007F00 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_007F00"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_007F00[] = dspot05_room_0Set_000340DL_007F00;
 
-#define dspot05_room_0Set_000340DL_007620 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_007620"
+#define dspot05_room_0Set_000340DL_007620 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_007620"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_007620[] = dspot05_room_0Set_000340DL_007620;
 
-#define dspot05_room_0Set_000340DL_006EC8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_006EC8"
+#define dspot05_room_0Set_000340DL_006EC8 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_006EC8"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_006EC8[] = dspot05_room_0Set_000340DL_006EC8;
 
-#define dspot05_room_0Set_000340DL_009DF0 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000340DL_009DF0"
+#define dspot05_room_0Set_000340DL_009DF0 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000340DL_009DF0"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000340DL_009DF0[] = dspot05_room_0Set_000340DL_009DF0;
 
-#define dspot05_room_0Set_000530DL_009928 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_009928"
+#define dspot05_room_0Set_000530DL_009928 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_009928"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_009928[] = dspot05_room_0Set_000530DL_009928;
 
-#define dspot05_room_0Set_000530DL_005670 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_005670"
+#define dspot05_room_0Set_000530DL_005670 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_005670"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_005670[] = dspot05_room_0Set_000530DL_005670;
 
-#define dspot05_room_0Set_000530DL_009BB0 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_009BB0"
+#define dspot05_room_0Set_000530DL_009BB0 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_009BB0"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_009BB0[] = dspot05_room_0Set_000530DL_009BB0;
 
-#define dspot05_room_0Set_000530DL_0084C8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_0084C8"
+#define dspot05_room_0Set_000530DL_0084C8 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_0084C8"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_0084C8[] = dspot05_room_0Set_000530DL_0084C8;
 
-#define dspot05_room_0Set_000530DL_0095D8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_0095D8"
+#define dspot05_room_0Set_000530DL_0095D8 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_0095D8"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_0095D8[] = dspot05_room_0Set_000530DL_0095D8;
 
-#define dspot05_room_0Set_000530DL_009098 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_009098"
+#define dspot05_room_0Set_000530DL_009098 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_009098"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_009098[] = dspot05_room_0Set_000530DL_009098;
 
-#define dspot05_room_0Set_000530DL_008970 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_008970"
+#define dspot05_room_0Set_000530DL_008970 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_008970"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_008970[] = dspot05_room_0Set_000530DL_008970;
 
-#define dspot05_room_0Set_000530DL_0015B0 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_0015B0"
+#define dspot05_room_0Set_000530DL_0015B0 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_0015B0"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_0015B0[] = dspot05_room_0Set_000530DL_0015B0;
 
-#define dspot05_room_0Set_000530DL_001CD8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_001CD8"
+#define dspot05_room_0Set_000530DL_001CD8 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_001CD8"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_001CD8[] = dspot05_room_0Set_000530DL_001CD8;
 
-#define dspot05_room_0Set_000530DL_002200 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_002200"
+#define dspot05_room_0Set_000530DL_002200 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_002200"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_002200[] = dspot05_room_0Set_000530DL_002200;
 
-#define dspot05_room_0Set_000530DL_0026B0 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_0026B0"
+#define dspot05_room_0Set_000530DL_0026B0 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_0026B0"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_0026B0[] = dspot05_room_0Set_000530DL_0026B0;
 
-#define dspot05_room_0Set_000530DL_002BC8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_002BC8"
+#define dspot05_room_0Set_000530DL_002BC8 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_002BC8"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_002BC8[] = dspot05_room_0Set_000530DL_002BC8;
 
-#define dspot05_room_0Set_000530DL_003618 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_003618"
+#define dspot05_room_0Set_000530DL_003618 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_003618"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_003618[] = dspot05_room_0Set_000530DL_003618;
 
-#define dspot05_room_0Set_000530DL_003D88 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_003D88"
+#define dspot05_room_0Set_000530DL_003D88 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_003D88"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_003D88[] = dspot05_room_0Set_000530DL_003D88;
 
-#define dspot05_room_0Set_000530DL_007F00 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_007F00"
+#define dspot05_room_0Set_000530DL_007F00 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_007F00"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_007F00[] = dspot05_room_0Set_000530DL_007F00;
 
-#define dspot05_room_0Set_000530DL_007620 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_007620"
+#define dspot05_room_0Set_000530DL_007620 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_007620"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_007620[] = dspot05_room_0Set_000530DL_007620;
 
-#define dspot05_room_0Set_000530DL_006EC8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_006EC8"
+#define dspot05_room_0Set_000530DL_006EC8 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_006EC8"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_006EC8[] = dspot05_room_0Set_000530DL_006EC8;
 
-#define dspot05_room_0Set_000530DL_009DF0 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_000530DL_009DF0"
+#define dspot05_room_0Set_000530DL_009DF0 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_000530DL_009DF0"
 static const ALIGN_ASSET(2) char spot05_room_0Set_000530DL_009DF0[] = dspot05_room_0Set_000530DL_009DF0;
 
-#define dspot05_room_0Set_0005D0DL_009928 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_009928"
+#define dspot05_room_0Set_0005D0DL_009928 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_009928"
 static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_009928[] = dspot05_room_0Set_0005D0DL_009928;
 
-#define dspot05_room_0Set_0005D0DL_005670 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_005670"
+#define dspot05_room_0Set_0005D0DL_005670 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_005670"
 static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_005670[] = dspot05_room_0Set_0005D0DL_005670;
 
-#define dspot05_room_0Set_0005D0DL_009BB0 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_009BB0"
+#define dspot05_room_0Set_0005D0DL_009BB0 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_009BB0"
 static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_009BB0[] = dspot05_room_0Set_0005D0DL_009BB0;
 
-#define dspot05_room_0Set_0005D0DL_0084C8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_0084C8"
+#define dspot05_room_0Set_0005D0DL_0084C8 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_0084C8"
 static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_0084C8[] = dspot05_room_0Set_0005D0DL_0084C8;
 
-#define dspot05_room_0Set_0005D0DL_0095D8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_0095D8"
+#define dspot05_room_0Set_0005D0DL_0095D8 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_0095D8"
 static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_0095D8[] = dspot05_room_0Set_0005D0DL_0095D8;
 
-#define dspot05_room_0Set_0005D0DL_009098 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_009098"
+#define dspot05_room_0Set_0005D0DL_009098 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_009098"
 static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_009098[] = dspot05_room_0Set_0005D0DL_009098;
 
-#define dspot05_room_0Set_0005D0DL_008970 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_008970"
+#define dspot05_room_0Set_0005D0DL_008970 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_008970"
 static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_008970[] = dspot05_room_0Set_0005D0DL_008970;
 
-#define dspot05_room_0Set_0005D0DL_0015B0 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_0015B0"
+#define dspot05_room_0Set_0005D0DL_0015B0 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_0015B0"
 static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_0015B0[] = dspot05_room_0Set_0005D0DL_0015B0;
 
-#define dspot05_room_0Set_0005D0DL_001CD8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_001CD8"
+#define dspot05_room_0Set_0005D0DL_001CD8 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_001CD8"
 static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_001CD8[] = dspot05_room_0Set_0005D0DL_001CD8;
 
-#define dspot05_room_0Set_0005D0DL_002200 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_002200"
+#define dspot05_room_0Set_0005D0DL_002200 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_002200"
 static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_002200[] = dspot05_room_0Set_0005D0DL_002200;
 
-#define dspot05_room_0Set_0005D0DL_0026B0 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_0026B0"
+#define dspot05_room_0Set_0005D0DL_0026B0 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_0026B0"
 static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_0026B0[] = dspot05_room_0Set_0005D0DL_0026B0;
 
-#define dspot05_room_0Set_0005D0DL_002BC8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_002BC8"
+#define dspot05_room_0Set_0005D0DL_002BC8 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_002BC8"
 static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_002BC8[] = dspot05_room_0Set_0005D0DL_002BC8;
 
-#define dspot05_room_0Set_0005D0DL_003618 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_003618"
+#define dspot05_room_0Set_0005D0DL_003618 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_003618"
 static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_003618[] = dspot05_room_0Set_0005D0DL_003618;
 
-#define dspot05_room_0Set_0005D0DL_003D88 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_003D88"
+#define dspot05_room_0Set_0005D0DL_003D88 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_003D88"
 static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_003D88[] = dspot05_room_0Set_0005D0DL_003D88;
 
-#define dspot05_room_0Set_0005D0DL_007F00 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_007F00"
+#define dspot05_room_0Set_0005D0DL_007F00 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_007F00"
 static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_007F00[] = dspot05_room_0Set_0005D0DL_007F00;
 
-#define dspot05_room_0Set_0005D0DL_007620 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_007620"
+#define dspot05_room_0Set_0005D0DL_007620 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_007620"
 static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_007620[] = dspot05_room_0Set_0005D0DL_007620;
 
-#define dspot05_room_0Set_0005D0DL_006EC8 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_006EC8"
+#define dspot05_room_0Set_0005D0DL_006EC8 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_006EC8"
 static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_006EC8[] = dspot05_room_0Set_0005D0DL_006EC8;
 
-#define dspot05_room_0Set_0005D0DL_009DF0 "__OTR__scenes/nonmq/spot05_scene/spot05_room_0Set_0005D0DL_009DF0"
+#define dspot05_room_0Set_0005D0DL_009DF0 "__OTR__scenes/shared/spot05_scene/spot05_room_0Set_0005D0DL_009DF0"
 static const ALIGN_ASSET(2) char spot05_room_0Set_0005D0DL_009DF0[] = dspot05_room_0Set_0005D0DL_009DF0;
 
 
diff --git a/soh/assets/scenes/overworld/spot05/spot05_scene.h b/soh/assets/scenes/overworld/spot05/spot05_scene.h
index b0aa7b0cf..b7d36a23a 100644
--- a/soh/assets/scenes/overworld/spot05/spot05_scene.h
+++ b/soh/assets/scenes/overworld/spot05/spot05_scene.h
@@ -3,101 +3,101 @@
 
 #include "align_asset_macro.h"
 
-#define dgMinuetCs "__OTR__scenes/nonmq/spot05_scene/gMinuetCs"
-static const ALIGN_ASSET(2) char gMinuetCs[] = dgMinuetCs;
-
-#define dspot05_scene_Cs_005730 "__OTR__scenes/nonmq/spot05_scene/spot05_scene_Cs_005730"
-static const ALIGN_ASSET(2) char spot05_scene_Cs_005730[] = dspot05_scene_Cs_005730;
-
-#define dspot05_sceneCollisionHeader_003F4C "__OTR__scenes/nonmq/spot05_scene/spot05_sceneCollisionHeader_003F4C"
-static const ALIGN_ASSET(2) char spot05_sceneCollisionHeader_003F4C[] = dspot05_sceneCollisionHeader_003F4C;
-
-#define dspot05_sceneTex_010B60 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_010B60"
-static const ALIGN_ASSET(2) char spot05_sceneTex_010B60[] = dspot05_sceneTex_010B60;
-
-#define dspot05_sceneTex_00E360 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_00E360"
-static const ALIGN_ASSET(2) char spot05_sceneTex_00E360[] = dspot05_sceneTex_00E360;
-
-#define dspot05_sceneTex_00D360 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_00D360"
-static const ALIGN_ASSET(2) char spot05_sceneTex_00D360[] = dspot05_sceneTex_00D360;
-
-#define dspot05_sceneTex_00A160 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_00A160"
-static const ALIGN_ASSET(2) char spot05_sceneTex_00A160[] = dspot05_sceneTex_00A160;
-
-#define dspot05_sceneTex_009160 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_009160"
-static const ALIGN_ASSET(2) char spot05_sceneTex_009160[] = dspot05_sceneTex_009160;
-
-#define dspot05_sceneTLUT_006BC0 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTLUT_006BC0"
-static const ALIGN_ASSET(2) char spot05_sceneTLUT_006BC0[] = dspot05_sceneTLUT_006BC0;
-
-#define dspot05_sceneTex_008D60 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_008D60"
-static const ALIGN_ASSET(2) char spot05_sceneTex_008D60[] = dspot05_sceneTex_008D60;
-
-#define dspot05_sceneTex_009960 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_009960"
-static const ALIGN_ASSET(2) char spot05_sceneTex_009960[] = dspot05_sceneTex_009960;
-
-#define dspot05_sceneTex_009560 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_009560"
-static const ALIGN_ASSET(2) char spot05_sceneTex_009560[] = dspot05_sceneTex_009560;
-
-#define dspot05_sceneTex_00F360 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_00F360"
-static const ALIGN_ASSET(2) char spot05_sceneTex_00F360[] = dspot05_sceneTex_00F360;
-
-#define dspot05_sceneTex_00EB60 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_00EB60"
-static const ALIGN_ASSET(2) char spot05_sceneTex_00EB60[] = dspot05_sceneTex_00EB60;
-
-#define dspot05_sceneTex_014B60 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_014B60"
-static const ALIGN_ASSET(2) char spot05_sceneTex_014B60[] = dspot05_sceneTex_014B60;
-
-#define dspot05_sceneTex_00CB60 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_00CB60"
-static const ALIGN_ASSET(2) char spot05_sceneTex_00CB60[] = dspot05_sceneTex_00CB60;
-
-#define dspot05_sceneTex_012B60 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_012B60"
-static const ALIGN_ASSET(2) char spot05_sceneTex_012B60[] = dspot05_sceneTex_012B60;
-
-#define dspot05_sceneTex_007D60 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_007D60"
-static const ALIGN_ASSET(2) char spot05_sceneTex_007D60[] = dspot05_sceneTex_007D60;
-
-#define dspot05_sceneTex_00B160 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_00B160"
-static const ALIGN_ASSET(2) char spot05_sceneTex_00B160[] = dspot05_sceneTex_00B160;
-
-#define dspot05_sceneTex_006D60 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_006D60"
+#define dspot05_sceneTex_006D60 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_006D60"
 static const ALIGN_ASSET(2) char spot05_sceneTex_006D60[] = dspot05_sceneTex_006D60;
 
-#define dspot05_sceneTex_00BB60 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_00BB60"
-static const ALIGN_ASSET(2) char spot05_sceneTex_00BB60[] = dspot05_sceneTex_00BB60;
+#define dspot05_sceneTex_007D60 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_007D60"
+static const ALIGN_ASSET(2) char spot05_sceneTex_007D60[] = dspot05_sceneTex_007D60;
 
-#define dspot05_sceneTex_00B960 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_00B960"
+#define dspot05_sceneTex_008D60 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_008D60"
+static const ALIGN_ASSET(2) char spot05_sceneTex_008D60[] = dspot05_sceneTex_008D60;
+
+#define dspot05_sceneTex_009160 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_009160"
+static const ALIGN_ASSET(2) char spot05_sceneTex_009160[] = dspot05_sceneTex_009160;
+
+#define dspot05_sceneTex_009560 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_009560"
+static const ALIGN_ASSET(2) char spot05_sceneTex_009560[] = dspot05_sceneTex_009560;
+
+#define dspot05_sceneTex_009960 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_009960"
+static const ALIGN_ASSET(2) char spot05_sceneTex_009960[] = dspot05_sceneTex_009960;
+
+#define dspot05_sceneTex_00A160 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_00A160"
+static const ALIGN_ASSET(2) char spot05_sceneTex_00A160[] = dspot05_sceneTex_00A160;
+
+#define dspot05_sceneTex_00B160 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_00B160"
+static const ALIGN_ASSET(2) char spot05_sceneTex_00B160[] = dspot05_sceneTex_00B160;
+
+#define dspot05_sceneTex_00B960 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_00B960"
 static const ALIGN_ASSET(2) char spot05_sceneTex_00B960[] = dspot05_sceneTex_00B960;
 
-#define dspot05_sceneTex_014360 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_014360"
-static const ALIGN_ASSET(2) char spot05_sceneTex_014360[] = dspot05_sceneTex_014360;
+#define dspot05_sceneTex_00BB60 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_00BB60"
+static const ALIGN_ASSET(2) char spot05_sceneTex_00BB60[] = dspot05_sceneTex_00BB60;
 
-#define dspot05_sceneTex_012360 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_012360"
-static const ALIGN_ASSET(2) char spot05_sceneTex_012360[] = dspot05_sceneTex_012360;
+#define dspot05_sceneTex_00CB60 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_00CB60"
+static const ALIGN_ASSET(2) char spot05_sceneTex_00CB60[] = dspot05_sceneTex_00CB60;
 
-#define dspot05_sceneTex_011360 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_011360"
-static const ALIGN_ASSET(2) char spot05_sceneTex_011360[] = dspot05_sceneTex_011360;
+#define dspot05_sceneTex_00D360 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_00D360"
+static const ALIGN_ASSET(2) char spot05_sceneTex_00D360[] = dspot05_sceneTex_00D360;
 
-#define dspot05_sceneTex_013B60 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_013B60"
-static const ALIGN_ASSET(2) char spot05_sceneTex_013B60[] = dspot05_sceneTex_013B60;
-
-#define dspot05_sceneTex_013360 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_013360"
-static const ALIGN_ASSET(2) char spot05_sceneTex_013360[] = dspot05_sceneTex_013360;
-
-#define dspot05_sceneTex_00DB60 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_00DB60"
+#define dspot05_sceneTex_00DB60 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_00DB60"
 static const ALIGN_ASSET(2) char spot05_sceneTex_00DB60[] = dspot05_sceneTex_00DB60;
 
-#define dspot05_sceneTex_00FB60 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_00FB60"
+#define dspot05_sceneTex_00E360 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_00E360"
+static const ALIGN_ASSET(2) char spot05_sceneTex_00E360[] = dspot05_sceneTex_00E360;
+
+#define dspot05_sceneTex_00EB60 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_00EB60"
+static const ALIGN_ASSET(2) char spot05_sceneTex_00EB60[] = dspot05_sceneTex_00EB60;
+
+#define dspot05_sceneTex_00F360 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_00F360"
+static const ALIGN_ASSET(2) char spot05_sceneTex_00F360[] = dspot05_sceneTex_00F360;
+
+#define dspot05_sceneTex_00FB60 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_00FB60"
 static const ALIGN_ASSET(2) char spot05_sceneTex_00FB60[] = dspot05_sceneTex_00FB60;
 
-#define dspot05_sceneTex_010360 "__OTR__scenes/nonmq/spot05_scene/spot05_sceneTex_010360"
+#define dspot05_sceneTex_010360 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_010360"
 static const ALIGN_ASSET(2) char spot05_sceneTex_010360[] = dspot05_sceneTex_010360;
 
-#define dspot05_sceneCollisionHeader_003F4C "__OTR__scenes/nonmq/spot05_scene/spot05_sceneCollisionHeader_003F4C"
+#define dspot05_sceneTex_010B60 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_010B60"
+static const ALIGN_ASSET(2) char spot05_sceneTex_010B60[] = dspot05_sceneTex_010B60;
 
-#define dspot05_sceneCollisionHeader_003F4C "__OTR__scenes/nonmq/spot05_scene/spot05_sceneCollisionHeader_003F4C"
+#define dspot05_sceneTex_011360 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_011360"
+static const ALIGN_ASSET(2) char spot05_sceneTex_011360[] = dspot05_sceneTex_011360;
 
-#define dspot05_sceneCollisionHeader_003F4C "__OTR__scenes/nonmq/spot05_scene/spot05_sceneCollisionHeader_003F4C"
+#define dspot05_sceneTex_012360 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_012360"
+static const ALIGN_ASSET(2) char spot05_sceneTex_012360[] = dspot05_sceneTex_012360;
+
+#define dspot05_sceneTex_012B60 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_012B60"
+static const ALIGN_ASSET(2) char spot05_sceneTex_012B60[] = dspot05_sceneTex_012B60;
+
+#define dspot05_sceneTex_013360 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_013360"
+static const ALIGN_ASSET(2) char spot05_sceneTex_013360[] = dspot05_sceneTex_013360;
+
+#define dspot05_sceneTex_013B60 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_013B60"
+static const ALIGN_ASSET(2) char spot05_sceneTex_013B60[] = dspot05_sceneTex_013B60;
+
+#define dspot05_sceneTex_014360 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_014360"
+static const ALIGN_ASSET(2) char spot05_sceneTex_014360[] = dspot05_sceneTex_014360;
+
+#define dspot05_sceneTex_014B60 "__OTR__scenes/shared/spot05_scene/spot05_sceneTex_014B60"
+static const ALIGN_ASSET(2) char spot05_sceneTex_014B60[] = dspot05_sceneTex_014B60;
+
+#define dspot05_sceneTLUT_006BC0 "__OTR__scenes/shared/spot05_scene/spot05_sceneTLUT_006BC0"
+static const ALIGN_ASSET(2) char spot05_sceneTLUT_006BC0[] = dspot05_sceneTLUT_006BC0;
+
+#define dgMinuetCs "__OTR__scenes/shared/spot05_scene/gMinuetCs"
+static const ALIGN_ASSET(2) char gMinuetCs[] = dgMinuetCs;
+
+#define dspot05_scene_Cs_005730 "__OTR__scenes/shared/spot05_scene/spot05_scene_Cs_005730"
+static const ALIGN_ASSET(2) char spot05_scene_Cs_005730[] = dspot05_scene_Cs_005730;
+
+#define dspot05_sceneCollisionHeader_003F4C "__OTR__scenes/shared/spot05_scene/spot05_sceneCollisionHeader_003F4C"
+static const ALIGN_ASSET(2) char spot05_sceneCollisionHeader_003F4C[] = dspot05_sceneCollisionHeader_003F4C;
+
+#define dspot05_sceneCollisionHeader_003F4C "__OTR__scenes/shared/spot05_scene/spot05_sceneCollisionHeader_003F4C"
+
+#define dspot05_sceneCollisionHeader_003F4C "__OTR__scenes/shared/spot05_scene/spot05_sceneCollisionHeader_003F4C"
+
+#define dspot05_sceneCollisionHeader_003F4C "__OTR__scenes/shared/spot05_scene/spot05_sceneCollisionHeader_003F4C"
 
 
 #endif // OVERWORLD_SPOT05_SCENE_H
diff --git a/soh/assets/scenes/overworld/spot06/spot06_room_0.h b/soh/assets/scenes/overworld/spot06/spot06_room_0.h
index a77e30617..b87033c66 100644
--- a/soh/assets/scenes/overworld/spot06/spot06_room_0.h
+++ b/soh/assets/scenes/overworld/spot06/spot06_room_0.h
@@ -3,226 +3,226 @@
 
 #include "align_asset_macro.h"
 
-#define dgSpot06DL_00A400 "__OTR__scenes/nonmq/spot06_scene/gSpot06DL_00A400"
+#define dgSpot06DL_00A400 "__OTR__scenes/shared/spot06_scene/gSpot06DL_00A400"
 static const ALIGN_ASSET(2) char gSpot06DL_00A400[] = dgSpot06DL_00A400;
 
-#define dgSpot06DL_00A608 "__OTR__scenes/nonmq/spot06_scene/gSpot06DL_00A608"
+#define dgSpot06DL_00A608 "__OTR__scenes/shared/spot06_scene/gSpot06DL_00A608"
 static const ALIGN_ASSET(2) char gSpot06DL_00A608[] = dgSpot06DL_00A608;
 
-#define dspot06_room_0DL_003270 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_003270"
+#define dspot06_room_0DL_003270 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_003270"
 static const ALIGN_ASSET(2) char spot06_room_0DL_003270[] = dspot06_room_0DL_003270;
 
-#define dspot06_room_0DL_001240 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_001240"
+#define dspot06_room_0DL_001240 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_001240"
 static const ALIGN_ASSET(2) char spot06_room_0DL_001240[] = dspot06_room_0DL_001240;
 
-#define dspot06_room_0DL_009CA8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_009CA8"
+#define dspot06_room_0DL_009CA8 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_009CA8"
 static const ALIGN_ASSET(2) char spot06_room_0DL_009CA8[] = dspot06_room_0DL_009CA8;
 
-#define dspot06_room_0DL_006358 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_006358"
+#define dspot06_room_0DL_006358 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_006358"
 static const ALIGN_ASSET(2) char spot06_room_0DL_006358[] = dspot06_room_0DL_006358;
 
-#define dspot06_room_0DL_006C80 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_006C80"
+#define dspot06_room_0DL_006C80 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_006C80"
 static const ALIGN_ASSET(2) char spot06_room_0DL_006C80[] = dspot06_room_0DL_006C80;
 
-#define dspot06_room_0DL_007DF8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_007DF8"
+#define dspot06_room_0DL_007DF8 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_007DF8"
 static const ALIGN_ASSET(2) char spot06_room_0DL_007DF8[] = dspot06_room_0DL_007DF8;
 
-#define dspot06_room_0DL_003EF8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_003EF8"
+#define dspot06_room_0DL_003EF8 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_003EF8"
 static const ALIGN_ASSET(2) char spot06_room_0DL_003EF8[] = dspot06_room_0DL_003EF8;
 
-#define dspot06_room_0DL_004AF0 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_004AF0"
+#define dspot06_room_0DL_004AF0 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_004AF0"
 static const ALIGN_ASSET(2) char spot06_room_0DL_004AF0[] = dspot06_room_0DL_004AF0;
 
-#define dspot06_room_0DL_004EC8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_004EC8"
+#define dspot06_room_0DL_004EC8 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_004EC8"
 static const ALIGN_ASSET(2) char spot06_room_0DL_004EC8[] = dspot06_room_0DL_004EC8;
 
-#define dspot06_room_0DL_0059C0 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_0059C0"
+#define dspot06_room_0DL_0059C0 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_0059C0"
 static const ALIGN_ASSET(2) char spot06_room_0DL_0059C0[] = dspot06_room_0DL_0059C0;
 
-#define dspot06_room_0DL_001628 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_001628"
+#define dspot06_room_0DL_001628 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_001628"
 static const ALIGN_ASSET(2) char spot06_room_0DL_001628[] = dspot06_room_0DL_001628;
 
-#define dspot06_room_0DL_002040 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_002040"
+#define dspot06_room_0DL_002040 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_002040"
 static const ALIGN_ASSET(2) char spot06_room_0DL_002040[] = dspot06_room_0DL_002040;
 
-#define dspot06_room_0DL_0098C8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_0098C8"
+#define dspot06_room_0DL_0098C8 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_0098C8"
 static const ALIGN_ASSET(2) char spot06_room_0DL_0098C8[] = dspot06_room_0DL_0098C8;
 
-#define dspot06_room_0DL_008ED0 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_008ED0"
+#define dspot06_room_0DL_008ED0 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_008ED0"
 static const ALIGN_ASSET(2) char spot06_room_0DL_008ED0[] = dspot06_room_0DL_008ED0;
 
-#define dspot06_room_0DL_008858 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_008858"
+#define dspot06_room_0DL_008858 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_008858"
 static const ALIGN_ASSET(2) char spot06_room_0DL_008858[] = dspot06_room_0DL_008858;
 
-#define dspot06_room_0DL_00A148 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_00A148"
+#define dspot06_room_0DL_00A148 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_00A148"
 static const ALIGN_ASSET(2) char spot06_room_0DL_00A148[] = dspot06_room_0DL_00A148;
 
-#define dspot06_room_0DL_009510 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_009510"
+#define dspot06_room_0DL_009510 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_009510"
 static const ALIGN_ASSET(2) char spot06_room_0DL_009510[] = dspot06_room_0DL_009510;
 
-#define dspot06_room_0DL_00A550 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0DL_00A550"
+#define dspot06_room_0DL_00A550 "__OTR__scenes/shared/spot06_scene/spot06_room_0DL_00A550"
 static const ALIGN_ASSET(2) char spot06_room_0DL_00A550[] = dspot06_room_0DL_00A550;
 
-#define dspot06_room_0Set_000520DL_003270 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_003270"
+#define dspot06_room_0Set_000520DL_003270 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_003270"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_003270[] = dspot06_room_0Set_000520DL_003270;
 
-#define dspot06_room_0Set_000520DL_001240 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_001240"
+#define dspot06_room_0Set_000520DL_001240 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_001240"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_001240[] = dspot06_room_0Set_000520DL_001240;
 
-#define dspot06_room_0Set_000520DL_009CA8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_009CA8"
+#define dspot06_room_0Set_000520DL_009CA8 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_009CA8"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_009CA8[] = dspot06_room_0Set_000520DL_009CA8;
 
-#define dspot06_room_0Set_000520DL_006358 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_006358"
+#define dspot06_room_0Set_000520DL_006358 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_006358"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_006358[] = dspot06_room_0Set_000520DL_006358;
 
-#define dspot06_room_0Set_000520DL_006C80 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_006C80"
+#define dspot06_room_0Set_000520DL_006C80 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_006C80"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_006C80[] = dspot06_room_0Set_000520DL_006C80;
 
-#define dspot06_room_0Set_000520DL_007DF8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_007DF8"
+#define dspot06_room_0Set_000520DL_007DF8 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_007DF8"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_007DF8[] = dspot06_room_0Set_000520DL_007DF8;
 
-#define dspot06_room_0Set_000520DL_003EF8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_003EF8"
+#define dspot06_room_0Set_000520DL_003EF8 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_003EF8"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_003EF8[] = dspot06_room_0Set_000520DL_003EF8;
 
-#define dspot06_room_0Set_000520DL_004AF0 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_004AF0"
+#define dspot06_room_0Set_000520DL_004AF0 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_004AF0"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_004AF0[] = dspot06_room_0Set_000520DL_004AF0;
 
-#define dspot06_room_0Set_000520DL_004EC8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_004EC8"
+#define dspot06_room_0Set_000520DL_004EC8 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_004EC8"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_004EC8[] = dspot06_room_0Set_000520DL_004EC8;
 
-#define dspot06_room_0Set_000520DL_0059C0 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_0059C0"
+#define dspot06_room_0Set_000520DL_0059C0 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_0059C0"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_0059C0[] = dspot06_room_0Set_000520DL_0059C0;
 
-#define dspot06_room_0Set_000520DL_001628 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_001628"
+#define dspot06_room_0Set_000520DL_001628 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_001628"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_001628[] = dspot06_room_0Set_000520DL_001628;
 
-#define dspot06_room_0Set_000520DL_002040 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_002040"
+#define dspot06_room_0Set_000520DL_002040 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_002040"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_002040[] = dspot06_room_0Set_000520DL_002040;
 
-#define dspot06_room_0Set_000520DL_0098C8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_0098C8"
+#define dspot06_room_0Set_000520DL_0098C8 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_0098C8"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_0098C8[] = dspot06_room_0Set_000520DL_0098C8;
 
-#define dspot06_room_0Set_000520DL_008ED0 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_008ED0"
+#define dspot06_room_0Set_000520DL_008ED0 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_008ED0"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_008ED0[] = dspot06_room_0Set_000520DL_008ED0;
 
-#define dspot06_room_0Set_000520DL_008858 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_008858"
+#define dspot06_room_0Set_000520DL_008858 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_008858"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_008858[] = dspot06_room_0Set_000520DL_008858;
 
-#define dspot06_room_0Set_000520DL_00A148 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_00A148"
+#define dspot06_room_0Set_000520DL_00A148 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_00A148"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_00A148[] = dspot06_room_0Set_000520DL_00A148;
 
-#define dspot06_room_0Set_000520DL_009510 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_009510"
+#define dspot06_room_0Set_000520DL_009510 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_009510"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_009510[] = dspot06_room_0Set_000520DL_009510;
 
-#define dspot06_room_0Set_000520DL_00A550 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000520DL_00A550"
+#define dspot06_room_0Set_000520DL_00A550 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000520DL_00A550"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000520DL_00A550[] = dspot06_room_0Set_000520DL_00A550;
 
-#define dspot06_room_0Set_000840DL_003270 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_003270"
+#define dspot06_room_0Set_000840DL_003270 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_003270"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_003270[] = dspot06_room_0Set_000840DL_003270;
 
-#define dspot06_room_0Set_000840DL_001240 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_001240"
+#define dspot06_room_0Set_000840DL_001240 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_001240"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_001240[] = dspot06_room_0Set_000840DL_001240;
 
-#define dspot06_room_0Set_000840DL_009CA8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_009CA8"
+#define dspot06_room_0Set_000840DL_009CA8 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_009CA8"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_009CA8[] = dspot06_room_0Set_000840DL_009CA8;
 
-#define dspot06_room_0Set_000840DL_006358 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_006358"
+#define dspot06_room_0Set_000840DL_006358 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_006358"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_006358[] = dspot06_room_0Set_000840DL_006358;
 
-#define dspot06_room_0Set_000840DL_006C80 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_006C80"
+#define dspot06_room_0Set_000840DL_006C80 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_006C80"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_006C80[] = dspot06_room_0Set_000840DL_006C80;
 
-#define dspot06_room_0Set_000840DL_007DF8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_007DF8"
+#define dspot06_room_0Set_000840DL_007DF8 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_007DF8"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_007DF8[] = dspot06_room_0Set_000840DL_007DF8;
 
-#define dspot06_room_0Set_000840DL_003EF8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_003EF8"
+#define dspot06_room_0Set_000840DL_003EF8 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_003EF8"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_003EF8[] = dspot06_room_0Set_000840DL_003EF8;
 
-#define dspot06_room_0Set_000840DL_004AF0 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_004AF0"
+#define dspot06_room_0Set_000840DL_004AF0 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_004AF0"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_004AF0[] = dspot06_room_0Set_000840DL_004AF0;
 
-#define dspot06_room_0Set_000840DL_004EC8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_004EC8"
+#define dspot06_room_0Set_000840DL_004EC8 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_004EC8"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_004EC8[] = dspot06_room_0Set_000840DL_004EC8;
 
-#define dspot06_room_0Set_000840DL_0059C0 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_0059C0"
+#define dspot06_room_0Set_000840DL_0059C0 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_0059C0"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_0059C0[] = dspot06_room_0Set_000840DL_0059C0;
 
-#define dspot06_room_0Set_000840DL_001628 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_001628"
+#define dspot06_room_0Set_000840DL_001628 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_001628"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_001628[] = dspot06_room_0Set_000840DL_001628;
 
-#define dspot06_room_0Set_000840DL_002040 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_002040"
+#define dspot06_room_0Set_000840DL_002040 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_002040"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_002040[] = dspot06_room_0Set_000840DL_002040;
 
-#define dspot06_room_0Set_000840DL_0098C8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_0098C8"
+#define dspot06_room_0Set_000840DL_0098C8 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_0098C8"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_0098C8[] = dspot06_room_0Set_000840DL_0098C8;
 
-#define dspot06_room_0Set_000840DL_008ED0 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_008ED0"
+#define dspot06_room_0Set_000840DL_008ED0 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_008ED0"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_008ED0[] = dspot06_room_0Set_000840DL_008ED0;
 
-#define dspot06_room_0Set_000840DL_008858 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_008858"
+#define dspot06_room_0Set_000840DL_008858 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_008858"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_008858[] = dspot06_room_0Set_000840DL_008858;
 
-#define dspot06_room_0Set_000840DL_00A148 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_00A148"
+#define dspot06_room_0Set_000840DL_00A148 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_00A148"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_00A148[] = dspot06_room_0Set_000840DL_00A148;
 
-#define dspot06_room_0Set_000840DL_009510 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_009510"
+#define dspot06_room_0Set_000840DL_009510 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_009510"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_009510[] = dspot06_room_0Set_000840DL_009510;
 
-#define dspot06_room_0Set_000840DL_00A550 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000840DL_00A550"
+#define dspot06_room_0Set_000840DL_00A550 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000840DL_00A550"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000840DL_00A550[] = dspot06_room_0Set_000840DL_00A550;
 
-#define dspot06_room_0Set_000920DL_003270 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_003270"
+#define dspot06_room_0Set_000920DL_003270 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_003270"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_003270[] = dspot06_room_0Set_000920DL_003270;
 
-#define dspot06_room_0Set_000920DL_001240 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_001240"
+#define dspot06_room_0Set_000920DL_001240 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_001240"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_001240[] = dspot06_room_0Set_000920DL_001240;
 
-#define dspot06_room_0Set_000920DL_009CA8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_009CA8"
+#define dspot06_room_0Set_000920DL_009CA8 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_009CA8"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_009CA8[] = dspot06_room_0Set_000920DL_009CA8;
 
-#define dspot06_room_0Set_000920DL_006358 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_006358"
+#define dspot06_room_0Set_000920DL_006358 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_006358"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_006358[] = dspot06_room_0Set_000920DL_006358;
 
-#define dspot06_room_0Set_000920DL_006C80 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_006C80"
+#define dspot06_room_0Set_000920DL_006C80 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_006C80"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_006C80[] = dspot06_room_0Set_000920DL_006C80;
 
-#define dspot06_room_0Set_000920DL_007DF8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_007DF8"
+#define dspot06_room_0Set_000920DL_007DF8 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_007DF8"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_007DF8[] = dspot06_room_0Set_000920DL_007DF8;
 
-#define dspot06_room_0Set_000920DL_003EF8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_003EF8"
+#define dspot06_room_0Set_000920DL_003EF8 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_003EF8"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_003EF8[] = dspot06_room_0Set_000920DL_003EF8;
 
-#define dspot06_room_0Set_000920DL_004AF0 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_004AF0"
+#define dspot06_room_0Set_000920DL_004AF0 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_004AF0"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_004AF0[] = dspot06_room_0Set_000920DL_004AF0;
 
-#define dspot06_room_0Set_000920DL_004EC8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_004EC8"
+#define dspot06_room_0Set_000920DL_004EC8 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_004EC8"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_004EC8[] = dspot06_room_0Set_000920DL_004EC8;
 
-#define dspot06_room_0Set_000920DL_0059C0 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_0059C0"
+#define dspot06_room_0Set_000920DL_0059C0 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_0059C0"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_0059C0[] = dspot06_room_0Set_000920DL_0059C0;
 
-#define dspot06_room_0Set_000920DL_001628 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_001628"
+#define dspot06_room_0Set_000920DL_001628 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_001628"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_001628[] = dspot06_room_0Set_000920DL_001628;
 
-#define dspot06_room_0Set_000920DL_002040 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_002040"
+#define dspot06_room_0Set_000920DL_002040 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_002040"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_002040[] = dspot06_room_0Set_000920DL_002040;
 
-#define dspot06_room_0Set_000920DL_0098C8 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_0098C8"
+#define dspot06_room_0Set_000920DL_0098C8 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_0098C8"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_0098C8[] = dspot06_room_0Set_000920DL_0098C8;
 
-#define dspot06_room_0Set_000920DL_008ED0 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_008ED0"
+#define dspot06_room_0Set_000920DL_008ED0 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_008ED0"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_008ED0[] = dspot06_room_0Set_000920DL_008ED0;
 
-#define dspot06_room_0Set_000920DL_008858 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_008858"
+#define dspot06_room_0Set_000920DL_008858 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_008858"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_008858[] = dspot06_room_0Set_000920DL_008858;
 
-#define dspot06_room_0Set_000920DL_00A148 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_00A148"
+#define dspot06_room_0Set_000920DL_00A148 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_00A148"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_00A148[] = dspot06_room_0Set_000920DL_00A148;
 
-#define dspot06_room_0Set_000920DL_009510 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_009510"
+#define dspot06_room_0Set_000920DL_009510 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_009510"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_009510[] = dspot06_room_0Set_000920DL_009510;
 
-#define dspot06_room_0Set_000920DL_00A550 "__OTR__scenes/nonmq/spot06_scene/spot06_room_0Set_000920DL_00A550"
+#define dspot06_room_0Set_000920DL_00A550 "__OTR__scenes/shared/spot06_scene/spot06_room_0Set_000920DL_00A550"
 static const ALIGN_ASSET(2) char spot06_room_0Set_000920DL_00A550[] = dspot06_room_0Set_000920DL_00A550;
 
 
diff --git a/soh/assets/scenes/overworld/spot06/spot06_scene.h b/soh/assets/scenes/overworld/spot06/spot06_scene.h
index 66ed29664..c83f95b23 100644
--- a/soh/assets/scenes/overworld/spot06/spot06_scene.h
+++ b/soh/assets/scenes/overworld/spot06/spot06_scene.h
@@ -3,152 +3,152 @@
 
 #include "align_asset_macro.h"
 
-#define dgLakeHyliaFireArrowsCS "__OTR__scenes/nonmq/spot06_scene/gLakeHyliaFireArrowsCS"
-static const ALIGN_ASSET(2) char gLakeHyliaFireArrowsCS[] = dgLakeHyliaFireArrowsCS;
-
-#define dgLakeHyliaOwlCs "__OTR__scenes/nonmq/spot06_scene/gLakeHyliaOwlCs"
-static const ALIGN_ASSET(2) char gLakeHyliaOwlCs[] = dgLakeHyliaOwlCs;
-
-#define dgLakeHyliaIntroCs "__OTR__scenes/nonmq/spot06_scene/gLakeHyliaIntroCs"
-static const ALIGN_ASSET(2) char gLakeHyliaIntroCs[] = dgLakeHyliaIntroCs;
-
-#define dspot06_sceneCollisionHeader_0055AC "__OTR__scenes/nonmq/spot06_scene/spot06_sceneCollisionHeader_0055AC"
-static const ALIGN_ASSET(2) char spot06_sceneCollisionHeader_0055AC[] = dspot06_sceneCollisionHeader_0055AC;
-
-#define dspot06_sceneTex_0170B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_0170B8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_0170B8[] = dspot06_sceneTex_0170B8;
-
-#define dspot06_sceneTex_010EB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_010EB8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_010EB8[] = dspot06_sceneTex_010EB8;
-
-#define dspot06_sceneTex_018CB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_018CB8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_018CB8[] = dspot06_sceneTex_018CB8;
-
-#define dspot06_sceneTex_0184B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_0184B8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_0184B8[] = dspot06_sceneTex_0184B8;
-
-#define dspot06_sceneTex_016CB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_016CB8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_016CB8[] = dspot06_sceneTex_016CB8;
-
-#define dspot06_sceneTex_00AAB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_00AAB8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_00AAB8[] = dspot06_sceneTex_00AAB8;
-
-#define dspot06_sceneTex_014CB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_014CB8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_014CB8[] = dspot06_sceneTex_014CB8;
-
-#define dspot06_sceneTex_0122B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_0122B8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_0122B8[] = dspot06_sceneTex_0122B8;
-
-#define dspot06_sceneTex_0126B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_0126B8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_0126B8[] = dspot06_sceneTex_0126B8;
-
-#define dspot06_sceneTex_011EB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_011EB8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_011EB8[] = dspot06_sceneTex_011EB8;
-
-#define dspot06_sceneTex_0130B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_0130B8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_0130B8[] = dspot06_sceneTex_0130B8;
-
-#define dspot06_sceneTex_012EB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_012EB8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_012EB8[] = dspot06_sceneTex_012EB8;
-
-#define dspot06_sceneTex_008438 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_008438"
-static const ALIGN_ASSET(2) char spot06_sceneTex_008438[] = dspot06_sceneTex_008438;
-
-#define dspot06_sceneTex_0140B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_0140B8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_0140B8[] = dspot06_sceneTex_0140B8;
-
-#define dspot06_sceneTex_01A4B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_01A4B8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_01A4B8[] = dspot06_sceneTex_01A4B8;
-
-#define dspot06_sceneTex_0178B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_0178B8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_0178B8[] = dspot06_sceneTex_0178B8;
-
-#define dspot06_sceneTex_00B6B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_00B6B8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_00B6B8[] = dspot06_sceneTex_00B6B8;
-
-#define dspot06_sceneTex_0164B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_0164B8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_0164B8[] = dspot06_sceneTex_0164B8;
-
-#define dspot06_sceneTex_0148B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_0148B8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_0148B8[] = dspot06_sceneTex_0148B8;
-
-#define dspot06_sceneTex_00FEB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_00FEB8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_00FEB8[] = dspot06_sceneTex_00FEB8;
-
-#define dspot06_sceneTex_0116B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_0116B8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_0116B8[] = dspot06_sceneTex_0116B8;
-
-#define dspot06_sceneTex_00BEB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_00BEB8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_00BEB8[] = dspot06_sceneTex_00BEB8;
-
-#define dspot06_sceneTex_017CB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_017CB8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_017CB8[] = dspot06_sceneTex_017CB8;
-
-#define dspot06_sceneTLUT_007C10 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTLUT_007C10"
-static const ALIGN_ASSET(2) char spot06_sceneTLUT_007C10[] = dspot06_sceneTLUT_007C10;
-
-#define dspot06_sceneTex_0154B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_0154B8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_0154B8[] = dspot06_sceneTex_0154B8;
-
-#define dspot06_sceneTex_015CB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_015CB8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_015CB8[] = dspot06_sceneTex_015CB8;
-
-#define dspot06_sceneTex_0194B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_0194B8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_0194B8[] = dspot06_sceneTex_0194B8;
-
-#define dspot06_sceneTex_00F4B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_00F4B8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_00F4B8[] = dspot06_sceneTex_00F4B8;
-
-#define dspot06_sceneTex_00F6B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_00F6B8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_00F6B8[] = dspot06_sceneTex_00F6B8;
-
-#define dspot06_sceneTex_00DCB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_00DCB8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_00DCB8[] = dspot06_sceneTex_00DCB8;
-
-#define dspot06_sceneTex_008038 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_008038"
-static const ALIGN_ASSET(2) char spot06_sceneTex_008038[] = dspot06_sceneTex_008038;
-
-#define dspot06_sceneTex_007C38 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_007C38"
+#define dspot06_sceneTex_007C38 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_007C38"
 static const ALIGN_ASSET(2) char spot06_sceneTex_007C38[] = dspot06_sceneTex_007C38;
 
-#define dspot06_sceneTex_01ACB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_01ACB8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_01ACB8[] = dspot06_sceneTex_01ACB8;
+#define dspot06_sceneTex_008038 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_008038"
+static const ALIGN_ASSET(2) char spot06_sceneTex_008038[] = dspot06_sceneTex_008038;
 
-#define dspot06_sceneTex_00CCB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_00CCB8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_00CCB8[] = dspot06_sceneTex_00CCB8;
+#define dspot06_sceneTex_008438 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_008438"
+static const ALIGN_ASSET(2) char spot06_sceneTex_008438[] = dspot06_sceneTex_008438;
 
-#define dspot06_sceneTex_00ECB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_00ECB8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_00ECB8[] = dspot06_sceneTex_00ECB8;
-
-#define dspot06_sceneTex_00AEB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_00AEB8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_00AEB8[] = dspot06_sceneTex_00AEB8;
-
-#define dspot06_sceneTex_0098B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_0098B8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_0098B8[] = dspot06_sceneTex_0098B8;
-
-#define dspot06_sceneTex_009AB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_009AB8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_009AB8[] = dspot06_sceneTex_009AB8;
-
-#define dspot06_sceneTex_009838 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_009838"
-static const ALIGN_ASSET(2) char spot06_sceneTex_009838[] = dspot06_sceneTex_009838;
-
-#define dspot06_sceneTex_008838 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_008838"
+#define dspot06_sceneTex_008838 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_008838"
 static const ALIGN_ASSET(2) char spot06_sceneTex_008838[] = dspot06_sceneTex_008838;
 
-#define dspot06_sceneTex_00C4B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_00C4B8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_00C4B8[] = dspot06_sceneTex_00C4B8;
+#define dspot06_sceneTex_009838 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_009838"
+static const ALIGN_ASSET(2) char spot06_sceneTex_009838[] = dspot06_sceneTex_009838;
 
-#define dspot06_sceneTex_00C2B8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_00C2B8"
-static const ALIGN_ASSET(2) char spot06_sceneTex_00C2B8[] = dspot06_sceneTex_00C2B8;
+#define dspot06_sceneTex_0098B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_0098B8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_0098B8[] = dspot06_sceneTex_0098B8;
 
-#define dspot06_sceneTex_00BAB8 "__OTR__scenes/nonmq/spot06_scene/spot06_sceneTex_00BAB8"
+#define dspot06_sceneTex_009AB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_009AB8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_009AB8[] = dspot06_sceneTex_009AB8;
+
+#define dspot06_sceneTex_00AAB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_00AAB8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_00AAB8[] = dspot06_sceneTex_00AAB8;
+
+#define dspot06_sceneTex_00AEB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_00AEB8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_00AEB8[] = dspot06_sceneTex_00AEB8;
+
+#define dspot06_sceneTex_00B6B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_00B6B8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_00B6B8[] = dspot06_sceneTex_00B6B8;
+
+#define dspot06_sceneTex_00BAB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_00BAB8"
 static const ALIGN_ASSET(2) char spot06_sceneTex_00BAB8[] = dspot06_sceneTex_00BAB8;
 
-#define dspot06_sceneCollisionHeader_0055AC "__OTR__scenes/nonmq/spot06_scene/spot06_sceneCollisionHeader_0055AC"
+#define dspot06_sceneTex_00BEB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_00BEB8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_00BEB8[] = dspot06_sceneTex_00BEB8;
 
-#define dspot06_sceneCollisionHeader_0055AC "__OTR__scenes/nonmq/spot06_scene/spot06_sceneCollisionHeader_0055AC"
+#define dspot06_sceneTex_00C2B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_00C2B8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_00C2B8[] = dspot06_sceneTex_00C2B8;
 
-#define dspot06_sceneCollisionHeader_0055AC "__OTR__scenes/nonmq/spot06_scene/spot06_sceneCollisionHeader_0055AC"
+#define dspot06_sceneTex_00C4B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_00C4B8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_00C4B8[] = dspot06_sceneTex_00C4B8;
+
+#define dspot06_sceneTex_00CCB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_00CCB8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_00CCB8[] = dspot06_sceneTex_00CCB8;
+
+#define dspot06_sceneTex_00DCB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_00DCB8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_00DCB8[] = dspot06_sceneTex_00DCB8;
+
+#define dspot06_sceneTex_00ECB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_00ECB8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_00ECB8[] = dspot06_sceneTex_00ECB8;
+
+#define dspot06_sceneTex_00F4B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_00F4B8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_00F4B8[] = dspot06_sceneTex_00F4B8;
+
+#define dspot06_sceneTex_00F6B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_00F6B8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_00F6B8[] = dspot06_sceneTex_00F6B8;
+
+#define dspot06_sceneTex_00FEB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_00FEB8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_00FEB8[] = dspot06_sceneTex_00FEB8;
+
+#define dspot06_sceneTex_010EB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_010EB8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_010EB8[] = dspot06_sceneTex_010EB8;
+
+#define dspot06_sceneTex_0116B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_0116B8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_0116B8[] = dspot06_sceneTex_0116B8;
+
+#define dspot06_sceneTex_011EB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_011EB8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_011EB8[] = dspot06_sceneTex_011EB8;
+
+#define dspot06_sceneTex_0122B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_0122B8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_0122B8[] = dspot06_sceneTex_0122B8;
+
+#define dspot06_sceneTex_0126B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_0126B8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_0126B8[] = dspot06_sceneTex_0126B8;
+
+#define dspot06_sceneTex_012EB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_012EB8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_012EB8[] = dspot06_sceneTex_012EB8;
+
+#define dspot06_sceneTex_0130B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_0130B8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_0130B8[] = dspot06_sceneTex_0130B8;
+
+#define dspot06_sceneTex_0140B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_0140B8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_0140B8[] = dspot06_sceneTex_0140B8;
+
+#define dspot06_sceneTex_0148B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_0148B8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_0148B8[] = dspot06_sceneTex_0148B8;
+
+#define dspot06_sceneTex_014CB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_014CB8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_014CB8[] = dspot06_sceneTex_014CB8;
+
+#define dspot06_sceneTex_0154B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_0154B8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_0154B8[] = dspot06_sceneTex_0154B8;
+
+#define dspot06_sceneTex_015CB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_015CB8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_015CB8[] = dspot06_sceneTex_015CB8;
+
+#define dspot06_sceneTex_0164B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_0164B8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_0164B8[] = dspot06_sceneTex_0164B8;
+
+#define dspot06_sceneTex_016CB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_016CB8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_016CB8[] = dspot06_sceneTex_016CB8;
+
+#define dspot06_sceneTex_0170B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_0170B8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_0170B8[] = dspot06_sceneTex_0170B8;
+
+#define dspot06_sceneTex_0178B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_0178B8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_0178B8[] = dspot06_sceneTex_0178B8;
+
+#define dspot06_sceneTex_017CB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_017CB8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_017CB8[] = dspot06_sceneTex_017CB8;
+
+#define dspot06_sceneTex_0184B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_0184B8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_0184B8[] = dspot06_sceneTex_0184B8;
+
+#define dspot06_sceneTex_018CB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_018CB8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_018CB8[] = dspot06_sceneTex_018CB8;
+
+#define dspot06_sceneTex_0194B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_0194B8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_0194B8[] = dspot06_sceneTex_0194B8;
+
+#define dspot06_sceneTex_01A4B8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_01A4B8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_01A4B8[] = dspot06_sceneTex_01A4B8;
+
+#define dspot06_sceneTex_01ACB8 "__OTR__scenes/shared/spot06_scene/spot06_sceneTex_01ACB8"
+static const ALIGN_ASSET(2) char spot06_sceneTex_01ACB8[] = dspot06_sceneTex_01ACB8;
+
+#define dspot06_sceneTLUT_007C10 "__OTR__scenes/shared/spot06_scene/spot06_sceneTLUT_007C10"
+static const ALIGN_ASSET(2) char spot06_sceneTLUT_007C10[] = dspot06_sceneTLUT_007C10;
+
+#define dgLakeHyliaFireArrowsCS "__OTR__scenes/shared/spot06_scene/gLakeHyliaFireArrowsCS"
+static const ALIGN_ASSET(2) char gLakeHyliaFireArrowsCS[] = dgLakeHyliaFireArrowsCS;
+
+#define dgLakeHyliaOwlCs "__OTR__scenes/shared/spot06_scene/gLakeHyliaOwlCs"
+static const ALIGN_ASSET(2) char gLakeHyliaOwlCs[] = dgLakeHyliaOwlCs;
+
+#define dgLakeHyliaIntroCs "__OTR__scenes/shared/spot06_scene/gLakeHyliaIntroCs"
+static const ALIGN_ASSET(2) char gLakeHyliaIntroCs[] = dgLakeHyliaIntroCs;
+
+#define dspot06_sceneCollisionHeader_0055AC "__OTR__scenes/shared/spot06_scene/spot06_sceneCollisionHeader_0055AC"
+static const ALIGN_ASSET(2) char spot06_sceneCollisionHeader_0055AC[] = dspot06_sceneCollisionHeader_0055AC;
+
+#define dspot06_sceneCollisionHeader_0055AC "__OTR__scenes/shared/spot06_scene/spot06_sceneCollisionHeader_0055AC"
+
+#define dspot06_sceneCollisionHeader_0055AC "__OTR__scenes/shared/spot06_scene/spot06_sceneCollisionHeader_0055AC"
+
+#define dspot06_sceneCollisionHeader_0055AC "__OTR__scenes/shared/spot06_scene/spot06_sceneCollisionHeader_0055AC"
 
 
 #endif // OVERWORLD_SPOT06_SCENE_H
diff --git a/soh/assets/scenes/overworld/spot07/spot07_room_0.h b/soh/assets/scenes/overworld/spot07/spot07_room_0.h
index 4e7dbb8c3..4aaf46121 100644
--- a/soh/assets/scenes/overworld/spot07/spot07_room_0.h
+++ b/soh/assets/scenes/overworld/spot07/spot07_room_0.h
@@ -3,130 +3,130 @@
 
 #include "align_asset_macro.h"
 
-#define dspot07_room_0DL_0034B0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0DL_0034B0"
-static const ALIGN_ASSET(2) char spot07_room_0DL_0034B0[] = dspot07_room_0DL_0034B0;
-
-#define dspot07_room_0DL_002A28 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0DL_002A28"
-static const ALIGN_ASSET(2) char spot07_room_0DL_002A28[] = dspot07_room_0DL_002A28;
-
-#define dspot07_room_0DL_002100 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0DL_002100"
-static const ALIGN_ASSET(2) char spot07_room_0DL_002100[] = dspot07_room_0DL_002100;
-
-#define dspot07_room_0DL_0004D0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0DL_0004D0"
-static const ALIGN_ASSET(2) char spot07_room_0DL_0004D0[] = dspot07_room_0DL_0004D0;
-
-#define dspot07_room_0DL_0026F0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0DL_0026F0"
-static const ALIGN_ASSET(2) char spot07_room_0DL_0026F0[] = dspot07_room_0DL_0026F0;
-
-#define dspot07_room_0DL_002E48 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0DL_002E48"
-static const ALIGN_ASSET(2) char spot07_room_0DL_002E48[] = dspot07_room_0DL_002E48;
-
-#define dspot07_room_0DL_001260 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0DL_001260"
-static const ALIGN_ASSET(2) char spot07_room_0DL_001260[] = dspot07_room_0DL_001260;
-
-#define dspot07_room_0DL_001870 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0DL_001870"
-static const ALIGN_ASSET(2) char spot07_room_0DL_001870[] = dspot07_room_0DL_001870;
-
-#define dspot07_room_0DL_0061E8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0DL_0061E8"
-static const ALIGN_ASSET(2) char spot07_room_0DL_0061E8[] = dspot07_room_0DL_0061E8;
-
-#define dspot07_room_0DL_000BA8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0DL_000BA8"
-static const ALIGN_ASSET(2) char spot07_room_0DL_000BA8[] = dspot07_room_0DL_000BA8;
-
-#define dspot07_room_0Tex_005748 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Tex_005748"
-static const ALIGN_ASSET(2) char spot07_room_0Tex_005748[] = dspot07_room_0Tex_005748;
-
-#define dspot07_room_0DL_006010 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0DL_006010"
-static const ALIGN_ASSET(2) char spot07_room_0DL_006010[] = dspot07_room_0DL_006010;
-
-#define dspot07_room_0DL_000838 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0DL_000838"
-static const ALIGN_ASSET(2) char spot07_room_0DL_000838[] = dspot07_room_0DL_000838;
-
-#define dspot07_room_0Tex_004F48 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Tex_004F48"
-static const ALIGN_ASSET(2) char spot07_room_0Tex_004F48[] = dspot07_room_0Tex_004F48;
-
-#define dspot07_room_0Tex_004748 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Tex_004748"
+#define dspot07_room_0Tex_004748 "__OTR__scenes/shared/spot07_scene/spot07_room_0Tex_004748"
 static const ALIGN_ASSET(2) char spot07_room_0Tex_004748[] = dspot07_room_0Tex_004748;
 
-#define dspot07_room_0DL_003EA8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0DL_003EA8"
+#define dspot07_room_0Tex_004F48 "__OTR__scenes/shared/spot07_scene/spot07_room_0Tex_004F48"
+static const ALIGN_ASSET(2) char spot07_room_0Tex_004F48[] = dspot07_room_0Tex_004F48;
+
+#define dspot07_room_0Tex_005748 "__OTR__scenes/shared/spot07_scene/spot07_room_0Tex_005748"
+static const ALIGN_ASSET(2) char spot07_room_0Tex_005748[] = dspot07_room_0Tex_005748;
+
+#define dspot07_room_0DL_0034B0 "__OTR__scenes/shared/spot07_scene/spot07_room_0DL_0034B0"
+static const ALIGN_ASSET(2) char spot07_room_0DL_0034B0[] = dspot07_room_0DL_0034B0;
+
+#define dspot07_room_0DL_002A28 "__OTR__scenes/shared/spot07_scene/spot07_room_0DL_002A28"
+static const ALIGN_ASSET(2) char spot07_room_0DL_002A28[] = dspot07_room_0DL_002A28;
+
+#define dspot07_room_0DL_002100 "__OTR__scenes/shared/spot07_scene/spot07_room_0DL_002100"
+static const ALIGN_ASSET(2) char spot07_room_0DL_002100[] = dspot07_room_0DL_002100;
+
+#define dspot07_room_0DL_0004D0 "__OTR__scenes/shared/spot07_scene/spot07_room_0DL_0004D0"
+static const ALIGN_ASSET(2) char spot07_room_0DL_0004D0[] = dspot07_room_0DL_0004D0;
+
+#define dspot07_room_0DL_0026F0 "__OTR__scenes/shared/spot07_scene/spot07_room_0DL_0026F0"
+static const ALIGN_ASSET(2) char spot07_room_0DL_0026F0[] = dspot07_room_0DL_0026F0;
+
+#define dspot07_room_0DL_002E48 "__OTR__scenes/shared/spot07_scene/spot07_room_0DL_002E48"
+static const ALIGN_ASSET(2) char spot07_room_0DL_002E48[] = dspot07_room_0DL_002E48;
+
+#define dspot07_room_0DL_001260 "__OTR__scenes/shared/spot07_scene/spot07_room_0DL_001260"
+static const ALIGN_ASSET(2) char spot07_room_0DL_001260[] = dspot07_room_0DL_001260;
+
+#define dspot07_room_0DL_001870 "__OTR__scenes/shared/spot07_scene/spot07_room_0DL_001870"
+static const ALIGN_ASSET(2) char spot07_room_0DL_001870[] = dspot07_room_0DL_001870;
+
+#define dspot07_room_0DL_0061E8 "__OTR__scenes/shared/spot07_scene/spot07_room_0DL_0061E8"
+static const ALIGN_ASSET(2) char spot07_room_0DL_0061E8[] = dspot07_room_0DL_0061E8;
+
+#define dspot07_room_0DL_000BA8 "__OTR__scenes/shared/spot07_scene/spot07_room_0DL_000BA8"
+static const ALIGN_ASSET(2) char spot07_room_0DL_000BA8[] = dspot07_room_0DL_000BA8;
+
+#define dspot07_room_0DL_006010 "__OTR__scenes/shared/spot07_scene/spot07_room_0DL_006010"
+static const ALIGN_ASSET(2) char spot07_room_0DL_006010[] = dspot07_room_0DL_006010;
+
+#define dspot07_room_0DL_000838 "__OTR__scenes/shared/spot07_scene/spot07_room_0DL_000838"
+static const ALIGN_ASSET(2) char spot07_room_0DL_000838[] = dspot07_room_0DL_000838;
+
+#define dspot07_room_0DL_003EA8 "__OTR__scenes/shared/spot07_scene/spot07_room_0DL_003EA8"
 static const ALIGN_ASSET(2) char spot07_room_0DL_003EA8[] = dspot07_room_0DL_003EA8;
 
-#define dspot07_room_0Set_000220DL_0034B0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000220DL_0034B0"
+#define dspot07_room_0Set_000220DL_0034B0 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000220DL_0034B0"
 static const ALIGN_ASSET(2) char spot07_room_0Set_000220DL_0034B0[] = dspot07_room_0Set_000220DL_0034B0;
 
-#define dspot07_room_0Set_000220DL_002A28 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000220DL_002A28"
+#define dspot07_room_0Set_000220DL_002A28 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000220DL_002A28"
 static const ALIGN_ASSET(2) char spot07_room_0Set_000220DL_002A28[] = dspot07_room_0Set_000220DL_002A28;
 
-#define dspot07_room_0Set_000220DL_002100 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000220DL_002100"
+#define dspot07_room_0Set_000220DL_002100 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000220DL_002100"
 static const ALIGN_ASSET(2) char spot07_room_0Set_000220DL_002100[] = dspot07_room_0Set_000220DL_002100;
 
-#define dspot07_room_0Set_000220DL_0004D0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000220DL_0004D0"
+#define dspot07_room_0Set_000220DL_0004D0 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000220DL_0004D0"
 static const ALIGN_ASSET(2) char spot07_room_0Set_000220DL_0004D0[] = dspot07_room_0Set_000220DL_0004D0;
 
-#define dspot07_room_0Set_000220DL_0026F0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000220DL_0026F0"
+#define dspot07_room_0Set_000220DL_0026F0 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000220DL_0026F0"
 static const ALIGN_ASSET(2) char spot07_room_0Set_000220DL_0026F0[] = dspot07_room_0Set_000220DL_0026F0;
 
-#define dspot07_room_0Set_000220DL_002E48 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000220DL_002E48"
+#define dspot07_room_0Set_000220DL_002E48 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000220DL_002E48"
 static const ALIGN_ASSET(2) char spot07_room_0Set_000220DL_002E48[] = dspot07_room_0Set_000220DL_002E48;
 
-#define dspot07_room_0Set_000220DL_001260 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000220DL_001260"
+#define dspot07_room_0Set_000220DL_001260 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000220DL_001260"
 static const ALIGN_ASSET(2) char spot07_room_0Set_000220DL_001260[] = dspot07_room_0Set_000220DL_001260;
 
-#define dspot07_room_0Set_000220DL_001870 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000220DL_001870"
+#define dspot07_room_0Set_000220DL_001870 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000220DL_001870"
 static const ALIGN_ASSET(2) char spot07_room_0Set_000220DL_001870[] = dspot07_room_0Set_000220DL_001870;
 
-#define dspot07_room_0Set_000220DL_0061E8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000220DL_0061E8"
+#define dspot07_room_0Set_000220DL_0061E8 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000220DL_0061E8"
 static const ALIGN_ASSET(2) char spot07_room_0Set_000220DL_0061E8[] = dspot07_room_0Set_000220DL_0061E8;
 
-#define dspot07_room_0Set_000220DL_000BA8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000220DL_000BA8"
+#define dspot07_room_0Set_000220DL_000BA8 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000220DL_000BA8"
 static const ALIGN_ASSET(2) char spot07_room_0Set_000220DL_000BA8[] = dspot07_room_0Set_000220DL_000BA8;
 
-#define dspot07_room_0Set_000220DL_006010 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000220DL_006010"
+#define dspot07_room_0Set_000220DL_006010 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000220DL_006010"
 static const ALIGN_ASSET(2) char spot07_room_0Set_000220DL_006010[] = dspot07_room_0Set_000220DL_006010;
 
-#define dspot07_room_0Set_000220DL_000838 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000220DL_000838"
+#define dspot07_room_0Set_000220DL_000838 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000220DL_000838"
 static const ALIGN_ASSET(2) char spot07_room_0Set_000220DL_000838[] = dspot07_room_0Set_000220DL_000838;
 
-#define dspot07_room_0Set_000220DL_003EA8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000220DL_003EA8"
+#define dspot07_room_0Set_000220DL_003EA8 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000220DL_003EA8"
 static const ALIGN_ASSET(2) char spot07_room_0Set_000220DL_003EA8[] = dspot07_room_0Set_000220DL_003EA8;
 
-#define dspot07_room_0Set_000300DL_0034B0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000300DL_0034B0"
+#define dspot07_room_0Set_000300DL_0034B0 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000300DL_0034B0"
 static const ALIGN_ASSET(2) char spot07_room_0Set_000300DL_0034B0[] = dspot07_room_0Set_000300DL_0034B0;
 
-#define dspot07_room_0Set_000300DL_002A28 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000300DL_002A28"
+#define dspot07_room_0Set_000300DL_002A28 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000300DL_002A28"
 static const ALIGN_ASSET(2) char spot07_room_0Set_000300DL_002A28[] = dspot07_room_0Set_000300DL_002A28;
 
-#define dspot07_room_0Set_000300DL_002100 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000300DL_002100"
+#define dspot07_room_0Set_000300DL_002100 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000300DL_002100"
 static const ALIGN_ASSET(2) char spot07_room_0Set_000300DL_002100[] = dspot07_room_0Set_000300DL_002100;
 
-#define dspot07_room_0Set_000300DL_0004D0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000300DL_0004D0"
+#define dspot07_room_0Set_000300DL_0004D0 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000300DL_0004D0"
 static const ALIGN_ASSET(2) char spot07_room_0Set_000300DL_0004D0[] = dspot07_room_0Set_000300DL_0004D0;
 
-#define dspot07_room_0Set_000300DL_0026F0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000300DL_0026F0"
+#define dspot07_room_0Set_000300DL_0026F0 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000300DL_0026F0"
 static const ALIGN_ASSET(2) char spot07_room_0Set_000300DL_0026F0[] = dspot07_room_0Set_000300DL_0026F0;
 
-#define dspot07_room_0Set_000300DL_002E48 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000300DL_002E48"
+#define dspot07_room_0Set_000300DL_002E48 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000300DL_002E48"
 static const ALIGN_ASSET(2) char spot07_room_0Set_000300DL_002E48[] = dspot07_room_0Set_000300DL_002E48;
 
-#define dspot07_room_0Set_000300DL_001260 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000300DL_001260"
+#define dspot07_room_0Set_000300DL_001260 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000300DL_001260"
 static const ALIGN_ASSET(2) char spot07_room_0Set_000300DL_001260[] = dspot07_room_0Set_000300DL_001260;
 
-#define dspot07_room_0Set_000300DL_001870 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000300DL_001870"
+#define dspot07_room_0Set_000300DL_001870 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000300DL_001870"
 static const ALIGN_ASSET(2) char spot07_room_0Set_000300DL_001870[] = dspot07_room_0Set_000300DL_001870;
 
-#define dspot07_room_0Set_000300DL_0061E8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000300DL_0061E8"
+#define dspot07_room_0Set_000300DL_0061E8 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000300DL_0061E8"
 static const ALIGN_ASSET(2) char spot07_room_0Set_000300DL_0061E8[] = dspot07_room_0Set_000300DL_0061E8;
 
-#define dspot07_room_0Set_000300DL_000BA8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000300DL_000BA8"
+#define dspot07_room_0Set_000300DL_000BA8 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000300DL_000BA8"
 static const ALIGN_ASSET(2) char spot07_room_0Set_000300DL_000BA8[] = dspot07_room_0Set_000300DL_000BA8;
 
-#define dspot07_room_0Set_000300DL_006010 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000300DL_006010"
+#define dspot07_room_0Set_000300DL_006010 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000300DL_006010"
 static const ALIGN_ASSET(2) char spot07_room_0Set_000300DL_006010[] = dspot07_room_0Set_000300DL_006010;
 
-#define dspot07_room_0Set_000300DL_000838 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000300DL_000838"
+#define dspot07_room_0Set_000300DL_000838 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000300DL_000838"
 static const ALIGN_ASSET(2) char spot07_room_0Set_000300DL_000838[] = dspot07_room_0Set_000300DL_000838;
 
-#define dspot07_room_0Set_000300DL_003EA8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_0Set_000300DL_003EA8"
+#define dspot07_room_0Set_000300DL_003EA8 "__OTR__scenes/shared/spot07_scene/spot07_room_0Set_000300DL_003EA8"
 static const ALIGN_ASSET(2) char spot07_room_0Set_000300DL_003EA8[] = dspot07_room_0Set_000300DL_003EA8;
 
 
diff --git a/soh/assets/scenes/overworld/spot07/spot07_room_1.h b/soh/assets/scenes/overworld/spot07/spot07_room_1.h
index a0b7fcb20..cabab5c7e 100644
--- a/soh/assets/scenes/overworld/spot07/spot07_room_1.h
+++ b/soh/assets/scenes/overworld/spot07/spot07_room_1.h
@@ -3,238 +3,238 @@
 
 #include "align_asset_macro.h"
 
-#define dspot07_room_1DL_004860 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_004860"
-static const ALIGN_ASSET(2) char spot07_room_1DL_004860[] = dspot07_room_1DL_004860;
-
-#define dspot07_room_1DL_001838 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_001838"
-static const ALIGN_ASSET(2) char spot07_room_1DL_001838[] = dspot07_room_1DL_001838;
-
-#define dspot07_room_1Tex_00A3D8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Tex_00A3D8"
-static const ALIGN_ASSET(2) char spot07_room_1Tex_00A3D8[] = dspot07_room_1Tex_00A3D8;
-
-#define dspot07_room_1Tex_009BD8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Tex_009BD8"
-static const ALIGN_ASSET(2) char spot07_room_1Tex_009BD8[] = dspot07_room_1Tex_009BD8;
-
-#define dspot07_room_1DL_0068E0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_0068E0"
-static const ALIGN_ASSET(2) char spot07_room_1DL_0068E0[] = dspot07_room_1DL_0068E0;
-
-#define dspot07_room_1DL_00BEC0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_00BEC0"
-static const ALIGN_ASSET(2) char spot07_room_1DL_00BEC0[] = dspot07_room_1DL_00BEC0;
-
-#define dspot07_room_1DL_00C0A0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_00C0A0"
-static const ALIGN_ASSET(2) char spot07_room_1DL_00C0A0[] = dspot07_room_1DL_00C0A0;
-
-#define dspot07_room_1DL_0038A0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_0038A0"
-static const ALIGN_ASSET(2) char spot07_room_1DL_0038A0[] = dspot07_room_1DL_0038A0;
-
-#define dspot07_room_1DL_003BE0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_003BE0"
-static const ALIGN_ASSET(2) char spot07_room_1DL_003BE0[] = dspot07_room_1DL_003BE0;
-
-#define dspot07_room_1DL_003EE0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_003EE0"
-static const ALIGN_ASSET(2) char spot07_room_1DL_003EE0[] = dspot07_room_1DL_003EE0;
-
-#define dspot07_room_1DL_004200 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_004200"
-static const ALIGN_ASSET(2) char spot07_room_1DL_004200[] = dspot07_room_1DL_004200;
-
-#define dspot07_room_1DL_004508 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_004508"
-static const ALIGN_ASSET(2) char spot07_room_1DL_004508[] = dspot07_room_1DL_004508;
-
-#define dspot07_room_1Tex_0097D8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Tex_0097D8"
-static const ALIGN_ASSET(2) char spot07_room_1Tex_0097D8[] = dspot07_room_1Tex_0097D8;
-
-#define dspot07_room_1DL_004B98 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_004B98"
-static const ALIGN_ASSET(2) char spot07_room_1DL_004B98[] = dspot07_room_1DL_004B98;
-
-#define dspot07_room_1Tex_0093D8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Tex_0093D8"
-static const ALIGN_ASSET(2) char spot07_room_1Tex_0093D8[] = dspot07_room_1Tex_0093D8;
-
-#define dspot07_room_1DL_004E70 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_004E70"
-static const ALIGN_ASSET(2) char spot07_room_1DL_004E70[] = dspot07_room_1DL_004E70;
-
-#define dspot07_room_1Tex_008FD8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Tex_008FD8"
-static const ALIGN_ASSET(2) char spot07_room_1Tex_008FD8[] = dspot07_room_1Tex_008FD8;
-
-#define dspot07_room_1DL_005160 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_005160"
-static const ALIGN_ASSET(2) char spot07_room_1DL_005160[] = dspot07_room_1DL_005160;
-
-#define dspot07_room_1DL_0053D0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_0053D0"
-static const ALIGN_ASSET(2) char spot07_room_1DL_0053D0[] = dspot07_room_1DL_0053D0;
-
-#define dspot07_room_1Tex_008BD8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Tex_008BD8"
-static const ALIGN_ASSET(2) char spot07_room_1Tex_008BD8[] = dspot07_room_1Tex_008BD8;
-
-#define dspot07_room_1DL_0035B0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_0035B0"
-static const ALIGN_ASSET(2) char spot07_room_1DL_0035B0[] = dspot07_room_1DL_0035B0;
-
-#define dspot07_room_1DL_005D08 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_005D08"
-static const ALIGN_ASSET(2) char spot07_room_1DL_005D08[] = dspot07_room_1DL_005D08;
-
-#define dspot07_room_1DL_005AB8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_005AB8"
-static const ALIGN_ASSET(2) char spot07_room_1DL_005AB8[] = dspot07_room_1DL_005AB8;
-
-#define dspot07_room_1DL_002710 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_002710"
-static const ALIGN_ASSET(2) char spot07_room_1DL_002710[] = dspot07_room_1DL_002710;
-
-#define dspot07_room_1Tex_007ED8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Tex_007ED8"
-static const ALIGN_ASSET(2) char spot07_room_1Tex_007ED8[] = dspot07_room_1Tex_007ED8;
-
-#define dspot07_room_1Tex_0076D8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Tex_0076D8"
+#define dspot07_room_1Tex_0076D8 "__OTR__scenes/shared/spot07_scene/spot07_room_1Tex_0076D8"
 static const ALIGN_ASSET(2) char spot07_room_1Tex_0076D8[] = dspot07_room_1Tex_0076D8;
 
-#define dspot07_room_1Tex_008AD8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Tex_008AD8"
-static const ALIGN_ASSET(2) char spot07_room_1Tex_008AD8[] = dspot07_room_1Tex_008AD8;
+#define dspot07_room_1Tex_007ED8 "__OTR__scenes/shared/spot07_scene/spot07_room_1Tex_007ED8"
+static const ALIGN_ASSET(2) char spot07_room_1Tex_007ED8[] = dspot07_room_1Tex_007ED8;
 
-#define dspot07_room_1Tex_0086D8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Tex_0086D8"
+#define dspot07_room_1Tex_0086D8 "__OTR__scenes/shared/spot07_scene/spot07_room_1Tex_0086D8"
 static const ALIGN_ASSET(2) char spot07_room_1Tex_0086D8[] = dspot07_room_1Tex_0086D8;
 
-#define dspot07_room_1DL_00BCE0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_00BCE0"
-static const ALIGN_ASSET(2) char spot07_room_1DL_00BCE0[] = dspot07_room_1DL_00BCE0;
+#define dspot07_room_1Tex_008AD8 "__OTR__scenes/shared/spot07_scene/spot07_room_1Tex_008AD8"
+static const ALIGN_ASSET(2) char spot07_room_1Tex_008AD8[] = dspot07_room_1Tex_008AD8;
 
-#define dspot07_room_1Tex_00C1A0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Tex_00C1A0"
-static const ALIGN_ASSET(2) char spot07_room_1Tex_00C1A0[] = dspot07_room_1Tex_00C1A0;
+#define dspot07_room_1Tex_008BD8 "__OTR__scenes/shared/spot07_scene/spot07_room_1Tex_008BD8"
+static const ALIGN_ASSET(2) char spot07_room_1Tex_008BD8[] = dspot07_room_1Tex_008BD8;
 
-#define dspot07_room_1DL_005798 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_005798"
-static const ALIGN_ASSET(2) char spot07_room_1DL_005798[] = dspot07_room_1DL_005798;
+#define dspot07_room_1Tex_008FD8 "__OTR__scenes/shared/spot07_scene/spot07_room_1Tex_008FD8"
+static const ALIGN_ASSET(2) char spot07_room_1Tex_008FD8[] = dspot07_room_1Tex_008FD8;
 
-#define dspot07_room_1DL_0012C0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_0012C0"
-static const ALIGN_ASSET(2) char spot07_room_1DL_0012C0[] = dspot07_room_1DL_0012C0;
+#define dspot07_room_1Tex_0093D8 "__OTR__scenes/shared/spot07_scene/spot07_room_1Tex_0093D8"
+static const ALIGN_ASSET(2) char spot07_room_1Tex_0093D8[] = dspot07_room_1Tex_0093D8;
 
-#define dspot07_room_1DL_007488 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1DL_007488"
-static const ALIGN_ASSET(2) char spot07_room_1DL_007488[] = dspot07_room_1DL_007488;
+#define dspot07_room_1Tex_0097D8 "__OTR__scenes/shared/spot07_scene/spot07_room_1Tex_0097D8"
+static const ALIGN_ASSET(2) char spot07_room_1Tex_0097D8[] = dspot07_room_1Tex_0097D8;
 
-#define dspot07_room_1Tex_00ABD8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Tex_00ABD8"
+#define dspot07_room_1Tex_009BD8 "__OTR__scenes/shared/spot07_scene/spot07_room_1Tex_009BD8"
+static const ALIGN_ASSET(2) char spot07_room_1Tex_009BD8[] = dspot07_room_1Tex_009BD8;
+
+#define dspot07_room_1Tex_00A3D8 "__OTR__scenes/shared/spot07_scene/spot07_room_1Tex_00A3D8"
+static const ALIGN_ASSET(2) char spot07_room_1Tex_00A3D8[] = dspot07_room_1Tex_00A3D8;
+
+#define dspot07_room_1Tex_00ABD8 "__OTR__scenes/shared/spot07_scene/spot07_room_1Tex_00ABD8"
 static const ALIGN_ASSET(2) char spot07_room_1Tex_00ABD8[] = dspot07_room_1Tex_00ABD8;
 
-#define dspot07_room_1Set_000360DL_004860 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_004860"
+#define dspot07_room_1Tex_00C1A0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Tex_00C1A0"
+static const ALIGN_ASSET(2) char spot07_room_1Tex_00C1A0[] = dspot07_room_1Tex_00C1A0;
+
+#define dspot07_room_1DL_004860 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_004860"
+static const ALIGN_ASSET(2) char spot07_room_1DL_004860[] = dspot07_room_1DL_004860;
+
+#define dspot07_room_1DL_001838 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_001838"
+static const ALIGN_ASSET(2) char spot07_room_1DL_001838[] = dspot07_room_1DL_001838;
+
+#define dspot07_room_1DL_0068E0 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_0068E0"
+static const ALIGN_ASSET(2) char spot07_room_1DL_0068E0[] = dspot07_room_1DL_0068E0;
+
+#define dspot07_room_1DL_00BEC0 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_00BEC0"
+static const ALIGN_ASSET(2) char spot07_room_1DL_00BEC0[] = dspot07_room_1DL_00BEC0;
+
+#define dspot07_room_1DL_00C0A0 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_00C0A0"
+static const ALIGN_ASSET(2) char spot07_room_1DL_00C0A0[] = dspot07_room_1DL_00C0A0;
+
+#define dspot07_room_1DL_0038A0 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_0038A0"
+static const ALIGN_ASSET(2) char spot07_room_1DL_0038A0[] = dspot07_room_1DL_0038A0;
+
+#define dspot07_room_1DL_003BE0 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_003BE0"
+static const ALIGN_ASSET(2) char spot07_room_1DL_003BE0[] = dspot07_room_1DL_003BE0;
+
+#define dspot07_room_1DL_003EE0 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_003EE0"
+static const ALIGN_ASSET(2) char spot07_room_1DL_003EE0[] = dspot07_room_1DL_003EE0;
+
+#define dspot07_room_1DL_004200 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_004200"
+static const ALIGN_ASSET(2) char spot07_room_1DL_004200[] = dspot07_room_1DL_004200;
+
+#define dspot07_room_1DL_004508 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_004508"
+static const ALIGN_ASSET(2) char spot07_room_1DL_004508[] = dspot07_room_1DL_004508;
+
+#define dspot07_room_1DL_004B98 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_004B98"
+static const ALIGN_ASSET(2) char spot07_room_1DL_004B98[] = dspot07_room_1DL_004B98;
+
+#define dspot07_room_1DL_004E70 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_004E70"
+static const ALIGN_ASSET(2) char spot07_room_1DL_004E70[] = dspot07_room_1DL_004E70;
+
+#define dspot07_room_1DL_005160 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_005160"
+static const ALIGN_ASSET(2) char spot07_room_1DL_005160[] = dspot07_room_1DL_005160;
+
+#define dspot07_room_1DL_0053D0 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_0053D0"
+static const ALIGN_ASSET(2) char spot07_room_1DL_0053D0[] = dspot07_room_1DL_0053D0;
+
+#define dspot07_room_1DL_0035B0 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_0035B0"
+static const ALIGN_ASSET(2) char spot07_room_1DL_0035B0[] = dspot07_room_1DL_0035B0;
+
+#define dspot07_room_1DL_005D08 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_005D08"
+static const ALIGN_ASSET(2) char spot07_room_1DL_005D08[] = dspot07_room_1DL_005D08;
+
+#define dspot07_room_1DL_005AB8 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_005AB8"
+static const ALIGN_ASSET(2) char spot07_room_1DL_005AB8[] = dspot07_room_1DL_005AB8;
+
+#define dspot07_room_1DL_002710 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_002710"
+static const ALIGN_ASSET(2) char spot07_room_1DL_002710[] = dspot07_room_1DL_002710;
+
+#define dspot07_room_1DL_00BCE0 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_00BCE0"
+static const ALIGN_ASSET(2) char spot07_room_1DL_00BCE0[] = dspot07_room_1DL_00BCE0;
+
+#define dspot07_room_1DL_005798 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_005798"
+static const ALIGN_ASSET(2) char spot07_room_1DL_005798[] = dspot07_room_1DL_005798;
+
+#define dspot07_room_1DL_0012C0 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_0012C0"
+static const ALIGN_ASSET(2) char spot07_room_1DL_0012C0[] = dspot07_room_1DL_0012C0;
+
+#define dspot07_room_1DL_007488 "__OTR__scenes/shared/spot07_scene/spot07_room_1DL_007488"
+static const ALIGN_ASSET(2) char spot07_room_1DL_007488[] = dspot07_room_1DL_007488;
+
+#define dspot07_room_1Set_000360DL_004860 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_004860"
 static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_004860[] = dspot07_room_1Set_000360DL_004860;
 
-#define dspot07_room_1Set_000360DL_001838 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_001838"
+#define dspot07_room_1Set_000360DL_001838 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_001838"
 static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_001838[] = dspot07_room_1Set_000360DL_001838;
 
-#define dspot07_room_1Set_000360DL_0068E0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_0068E0"
+#define dspot07_room_1Set_000360DL_0068E0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_0068E0"
 static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_0068E0[] = dspot07_room_1Set_000360DL_0068E0;
 
-#define dspot07_room_1Set_000360DL_00BEC0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_00BEC0"
+#define dspot07_room_1Set_000360DL_00BEC0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_00BEC0"
 static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_00BEC0[] = dspot07_room_1Set_000360DL_00BEC0;
 
-#define dspot07_room_1Set_000360DL_00C0A0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_00C0A0"
+#define dspot07_room_1Set_000360DL_00C0A0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_00C0A0"
 static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_00C0A0[] = dspot07_room_1Set_000360DL_00C0A0;
 
-#define dspot07_room_1Set_000360DL_0038A0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_0038A0"
+#define dspot07_room_1Set_000360DL_0038A0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_0038A0"
 static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_0038A0[] = dspot07_room_1Set_000360DL_0038A0;
 
-#define dspot07_room_1Set_000360DL_003BE0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_003BE0"
+#define dspot07_room_1Set_000360DL_003BE0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_003BE0"
 static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_003BE0[] = dspot07_room_1Set_000360DL_003BE0;
 
-#define dspot07_room_1Set_000360DL_003EE0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_003EE0"
+#define dspot07_room_1Set_000360DL_003EE0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_003EE0"
 static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_003EE0[] = dspot07_room_1Set_000360DL_003EE0;
 
-#define dspot07_room_1Set_000360DL_004200 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_004200"
+#define dspot07_room_1Set_000360DL_004200 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_004200"
 static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_004200[] = dspot07_room_1Set_000360DL_004200;
 
-#define dspot07_room_1Set_000360DL_004508 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_004508"
+#define dspot07_room_1Set_000360DL_004508 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_004508"
 static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_004508[] = dspot07_room_1Set_000360DL_004508;
 
-#define dspot07_room_1Set_000360DL_004B98 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_004B98"
+#define dspot07_room_1Set_000360DL_004B98 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_004B98"
 static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_004B98[] = dspot07_room_1Set_000360DL_004B98;
 
-#define dspot07_room_1Set_000360DL_004E70 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_004E70"
+#define dspot07_room_1Set_000360DL_004E70 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_004E70"
 static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_004E70[] = dspot07_room_1Set_000360DL_004E70;
 
-#define dspot07_room_1Set_000360DL_005160 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_005160"
+#define dspot07_room_1Set_000360DL_005160 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_005160"
 static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_005160[] = dspot07_room_1Set_000360DL_005160;
 
-#define dspot07_room_1Set_000360DL_0053D0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_0053D0"
+#define dspot07_room_1Set_000360DL_0053D0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_0053D0"
 static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_0053D0[] = dspot07_room_1Set_000360DL_0053D0;
 
-#define dspot07_room_1Set_000360DL_0035B0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_0035B0"
+#define dspot07_room_1Set_000360DL_0035B0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_0035B0"
 static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_0035B0[] = dspot07_room_1Set_000360DL_0035B0;
 
-#define dspot07_room_1Set_000360DL_005D08 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_005D08"
+#define dspot07_room_1Set_000360DL_005D08 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_005D08"
 static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_005D08[] = dspot07_room_1Set_000360DL_005D08;
 
-#define dspot07_room_1Set_000360DL_005AB8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_005AB8"
+#define dspot07_room_1Set_000360DL_005AB8 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_005AB8"
 static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_005AB8[] = dspot07_room_1Set_000360DL_005AB8;
 
-#define dspot07_room_1Set_000360DL_002710 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_002710"
+#define dspot07_room_1Set_000360DL_002710 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_002710"
 static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_002710[] = dspot07_room_1Set_000360DL_002710;
 
-#define dspot07_room_1Set_000360DL_00BCE0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_00BCE0"
+#define dspot07_room_1Set_000360DL_00BCE0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_00BCE0"
 static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_00BCE0[] = dspot07_room_1Set_000360DL_00BCE0;
 
-#define dspot07_room_1Set_000360DL_005798 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_005798"
+#define dspot07_room_1Set_000360DL_005798 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_005798"
 static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_005798[] = dspot07_room_1Set_000360DL_005798;
 
-#define dspot07_room_1Set_000360DL_0012C0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_0012C0"
+#define dspot07_room_1Set_000360DL_0012C0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_0012C0"
 static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_0012C0[] = dspot07_room_1Set_000360DL_0012C0;
 
-#define dspot07_room_1Set_000360DL_007488 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_000360DL_007488"
+#define dspot07_room_1Set_000360DL_007488 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_000360DL_007488"
 static const ALIGN_ASSET(2) char spot07_room_1Set_000360DL_007488[] = dspot07_room_1Set_000360DL_007488;
 
-#define dspot07_room_1Set_0004C0DL_004860 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_004860"
+#define dspot07_room_1Set_0004C0DL_004860 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_004860"
 static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_004860[] = dspot07_room_1Set_0004C0DL_004860;
 
-#define dspot07_room_1Set_0004C0DL_001838 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_001838"
+#define dspot07_room_1Set_0004C0DL_001838 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_001838"
 static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_001838[] = dspot07_room_1Set_0004C0DL_001838;
 
-#define dspot07_room_1Set_0004C0DL_0068E0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_0068E0"
+#define dspot07_room_1Set_0004C0DL_0068E0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_0068E0"
 static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_0068E0[] = dspot07_room_1Set_0004C0DL_0068E0;
 
-#define dspot07_room_1Set_0004C0DL_00BEC0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_00BEC0"
+#define dspot07_room_1Set_0004C0DL_00BEC0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_00BEC0"
 static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_00BEC0[] = dspot07_room_1Set_0004C0DL_00BEC0;
 
-#define dspot07_room_1Set_0004C0DL_00C0A0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_00C0A0"
+#define dspot07_room_1Set_0004C0DL_00C0A0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_00C0A0"
 static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_00C0A0[] = dspot07_room_1Set_0004C0DL_00C0A0;
 
-#define dspot07_room_1Set_0004C0DL_0038A0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_0038A0"
+#define dspot07_room_1Set_0004C0DL_0038A0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_0038A0"
 static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_0038A0[] = dspot07_room_1Set_0004C0DL_0038A0;
 
-#define dspot07_room_1Set_0004C0DL_003BE0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_003BE0"
+#define dspot07_room_1Set_0004C0DL_003BE0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_003BE0"
 static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_003BE0[] = dspot07_room_1Set_0004C0DL_003BE0;
 
-#define dspot07_room_1Set_0004C0DL_003EE0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_003EE0"
+#define dspot07_room_1Set_0004C0DL_003EE0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_003EE0"
 static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_003EE0[] = dspot07_room_1Set_0004C0DL_003EE0;
 
-#define dspot07_room_1Set_0004C0DL_004200 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_004200"
+#define dspot07_room_1Set_0004C0DL_004200 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_004200"
 static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_004200[] = dspot07_room_1Set_0004C0DL_004200;
 
-#define dspot07_room_1Set_0004C0DL_004508 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_004508"
+#define dspot07_room_1Set_0004C0DL_004508 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_004508"
 static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_004508[] = dspot07_room_1Set_0004C0DL_004508;
 
-#define dspot07_room_1Set_0004C0DL_004B98 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_004B98"
+#define dspot07_room_1Set_0004C0DL_004B98 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_004B98"
 static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_004B98[] = dspot07_room_1Set_0004C0DL_004B98;
 
-#define dspot07_room_1Set_0004C0DL_004E70 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_004E70"
+#define dspot07_room_1Set_0004C0DL_004E70 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_004E70"
 static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_004E70[] = dspot07_room_1Set_0004C0DL_004E70;
 
-#define dspot07_room_1Set_0004C0DL_005160 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_005160"
+#define dspot07_room_1Set_0004C0DL_005160 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_005160"
 static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_005160[] = dspot07_room_1Set_0004C0DL_005160;
 
-#define dspot07_room_1Set_0004C0DL_0053D0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_0053D0"
+#define dspot07_room_1Set_0004C0DL_0053D0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_0053D0"
 static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_0053D0[] = dspot07_room_1Set_0004C0DL_0053D0;
 
-#define dspot07_room_1Set_0004C0DL_0035B0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_0035B0"
+#define dspot07_room_1Set_0004C0DL_0035B0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_0035B0"
 static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_0035B0[] = dspot07_room_1Set_0004C0DL_0035B0;
 
-#define dspot07_room_1Set_0004C0DL_005D08 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_005D08"
+#define dspot07_room_1Set_0004C0DL_005D08 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_005D08"
 static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_005D08[] = dspot07_room_1Set_0004C0DL_005D08;
 
-#define dspot07_room_1Set_0004C0DL_005AB8 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_005AB8"
+#define dspot07_room_1Set_0004C0DL_005AB8 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_005AB8"
 static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_005AB8[] = dspot07_room_1Set_0004C0DL_005AB8;
 
-#define dspot07_room_1Set_0004C0DL_002710 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_002710"
+#define dspot07_room_1Set_0004C0DL_002710 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_002710"
 static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_002710[] = dspot07_room_1Set_0004C0DL_002710;
 
-#define dspot07_room_1Set_0004C0DL_00BCE0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_00BCE0"
+#define dspot07_room_1Set_0004C0DL_00BCE0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_00BCE0"
 static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_00BCE0[] = dspot07_room_1Set_0004C0DL_00BCE0;
 
-#define dspot07_room_1Set_0004C0DL_005798 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_005798"
+#define dspot07_room_1Set_0004C0DL_005798 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_005798"
 static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_005798[] = dspot07_room_1Set_0004C0DL_005798;
 
-#define dspot07_room_1Set_0004C0DL_0012C0 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_0012C0"
+#define dspot07_room_1Set_0004C0DL_0012C0 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_0012C0"
 static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_0012C0[] = dspot07_room_1Set_0004C0DL_0012C0;
 
-#define dspot07_room_1Set_0004C0DL_007488 "__OTR__scenes/nonmq/spot07_scene/spot07_room_1Set_0004C0DL_007488"
+#define dspot07_room_1Set_0004C0DL_007488 "__OTR__scenes/shared/spot07_scene/spot07_room_1Set_0004C0DL_007488"
 static const ALIGN_ASSET(2) char spot07_room_1Set_0004C0DL_007488[] = dspot07_room_1Set_0004C0DL_007488;
 
 
diff --git a/soh/assets/scenes/overworld/spot07/spot07_scene.h b/soh/assets/scenes/overworld/spot07/spot07_scene.h
index a7bdc1f78..dc5ff60f7 100644
--- a/soh/assets/scenes/overworld/spot07/spot07_scene.h
+++ b/soh/assets/scenes/overworld/spot07/spot07_scene.h
@@ -3,72 +3,72 @@
 
 #include "align_asset_macro.h"
 
-#define dgZorasDomainIntroCs "__OTR__scenes/nonmq/spot07_scene/gZorasDomainIntroCs"
-static const ALIGN_ASSET(2) char gZorasDomainIntroCs[] = dgZorasDomainIntroCs;
-
-#define dgZorasDomainDayEntranceTex "__OTR__scenes/nonmq/spot07_scene/gZorasDomainDayEntranceTex"
-static const ALIGN_ASSET(2) char gZorasDomainDayEntranceTex[] = dgZorasDomainDayEntranceTex;
-
-#define dgZorasDomainNightEntranceTex "__OTR__scenes/nonmq/spot07_scene/gZorasDomainNightEntranceTex"
-static const ALIGN_ASSET(2) char gZorasDomainNightEntranceTex[] = dgZorasDomainNightEntranceTex;
-
-#define dspot07_sceneCollisionHeader_003824 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneCollisionHeader_003824"
-static const ALIGN_ASSET(2) char spot07_sceneCollisionHeader_003824[] = dspot07_sceneCollisionHeader_003824;
-
-#define dspot07_sceneTex_009418 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTex_009418"
-static const ALIGN_ASSET(2) char spot07_sceneTex_009418[] = dspot07_sceneTex_009418;
-
-#define dspot07_sceneTex_009018 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTex_009018"
-static const ALIGN_ASSET(2) char spot07_sceneTex_009018[] = dspot07_sceneTex_009018;
-
-#define dspot07_sceneTLUT_003F70 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTLUT_003F70"
-static const ALIGN_ASSET(2) char spot07_sceneTLUT_003F70[] = dspot07_sceneTLUT_003F70;
-
-#define dspot07_sceneTex_006398 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTex_006398"
-static const ALIGN_ASSET(2) char spot07_sceneTex_006398[] = dspot07_sceneTex_006398;
-
-#define dspot07_sceneTex_005798 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTex_005798"
-static const ALIGN_ASSET(2) char spot07_sceneTex_005798[] = dspot07_sceneTex_005798;
-
-#define dspot07_sceneTex_005398 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTex_005398"
-static const ALIGN_ASSET(2) char spot07_sceneTex_005398[] = dspot07_sceneTex_005398;
-
-#define dspot07_sceneTex_004F98 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTex_004F98"
-static const ALIGN_ASSET(2) char spot07_sceneTex_004F98[] = dspot07_sceneTex_004F98;
-
-#define dspot07_sceneTex_007798 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTex_007798"
-static const ALIGN_ASSET(2) char spot07_sceneTex_007798[] = dspot07_sceneTex_007798;
-
-#define dspot07_sceneTex_006F98 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTex_006F98"
-static const ALIGN_ASSET(2) char spot07_sceneTex_006F98[] = dspot07_sceneTex_006F98;
-
-#define dspot07_sceneTex_006798 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTex_006798"
-static const ALIGN_ASSET(2) char spot07_sceneTex_006798[] = dspot07_sceneTex_006798;
-
-#define dspot07_sceneTex_003F98 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTex_003F98"
+#define dspot07_sceneTex_003F98 "__OTR__scenes/shared/spot07_scene/spot07_sceneTex_003F98"
 static const ALIGN_ASSET(2) char spot07_sceneTex_003F98[] = dspot07_sceneTex_003F98;
 
-#define dspot07_sceneTex_007F98 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTex_007F98"
-static const ALIGN_ASSET(2) char spot07_sceneTex_007F98[] = dspot07_sceneTex_007F98;
+#define dspot07_sceneTex_004F98 "__OTR__scenes/shared/spot07_scene/spot07_sceneTex_004F98"
+static const ALIGN_ASSET(2) char spot07_sceneTex_004F98[] = dspot07_sceneTex_004F98;
 
-#define dspot07_sceneTex_008798 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTex_008798"
-static const ALIGN_ASSET(2) char spot07_sceneTex_008798[] = dspot07_sceneTex_008798;
+#define dspot07_sceneTex_005398 "__OTR__scenes/shared/spot07_scene/spot07_sceneTex_005398"
+static const ALIGN_ASSET(2) char spot07_sceneTex_005398[] = dspot07_sceneTex_005398;
 
-#define dspot07_sceneTex_007B98 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTex_007B98"
-static const ALIGN_ASSET(2) char spot07_sceneTex_007B98[] = dspot07_sceneTex_007B98;
+#define dspot07_sceneTex_005798 "__OTR__scenes/shared/spot07_scene/spot07_sceneTex_005798"
+static const ALIGN_ASSET(2) char spot07_sceneTex_005798[] = dspot07_sceneTex_005798;
 
-#define dspot07_sceneTex_006B98 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTex_006B98"
-static const ALIGN_ASSET(2) char spot07_sceneTex_006B98[] = dspot07_sceneTex_006B98;
-
-#define dspot07_sceneTex_005F98 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTex_005F98"
-static const ALIGN_ASSET(2) char spot07_sceneTex_005F98[] = dspot07_sceneTex_005F98;
-
-#define dspot07_sceneTex_005B98 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneTex_005B98"
+#define dspot07_sceneTex_005B98 "__OTR__scenes/shared/spot07_scene/spot07_sceneTex_005B98"
 static const ALIGN_ASSET(2) char spot07_sceneTex_005B98[] = dspot07_sceneTex_005B98;
 
-#define dspot07_sceneCollisionHeader_003824 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneCollisionHeader_003824"
+#define dspot07_sceneTex_005F98 "__OTR__scenes/shared/spot07_scene/spot07_sceneTex_005F98"
+static const ALIGN_ASSET(2) char spot07_sceneTex_005F98[] = dspot07_sceneTex_005F98;
 
-#define dspot07_sceneCollisionHeader_003824 "__OTR__scenes/nonmq/spot07_scene/spot07_sceneCollisionHeader_003824"
+#define dspot07_sceneTex_006398 "__OTR__scenes/shared/spot07_scene/spot07_sceneTex_006398"
+static const ALIGN_ASSET(2) char spot07_sceneTex_006398[] = dspot07_sceneTex_006398;
+
+#define dspot07_sceneTex_006798 "__OTR__scenes/shared/spot07_scene/spot07_sceneTex_006798"
+static const ALIGN_ASSET(2) char spot07_sceneTex_006798[] = dspot07_sceneTex_006798;
+
+#define dspot07_sceneTex_006B98 "__OTR__scenes/shared/spot07_scene/spot07_sceneTex_006B98"
+static const ALIGN_ASSET(2) char spot07_sceneTex_006B98[] = dspot07_sceneTex_006B98;
+
+#define dspot07_sceneTex_006F98 "__OTR__scenes/shared/spot07_scene/spot07_sceneTex_006F98"
+static const ALIGN_ASSET(2) char spot07_sceneTex_006F98[] = dspot07_sceneTex_006F98;
+
+#define dspot07_sceneTex_007798 "__OTR__scenes/shared/spot07_scene/spot07_sceneTex_007798"
+static const ALIGN_ASSET(2) char spot07_sceneTex_007798[] = dspot07_sceneTex_007798;
+
+#define dspot07_sceneTex_007B98 "__OTR__scenes/shared/spot07_scene/spot07_sceneTex_007B98"
+static const ALIGN_ASSET(2) char spot07_sceneTex_007B98[] = dspot07_sceneTex_007B98;
+
+#define dspot07_sceneTex_007F98 "__OTR__scenes/shared/spot07_scene/spot07_sceneTex_007F98"
+static const ALIGN_ASSET(2) char spot07_sceneTex_007F98[] = dspot07_sceneTex_007F98;
+
+#define dspot07_sceneTex_008798 "__OTR__scenes/shared/spot07_scene/spot07_sceneTex_008798"
+static const ALIGN_ASSET(2) char spot07_sceneTex_008798[] = dspot07_sceneTex_008798;
+
+#define dspot07_sceneTex_009018 "__OTR__scenes/shared/spot07_scene/spot07_sceneTex_009018"
+static const ALIGN_ASSET(2) char spot07_sceneTex_009018[] = dspot07_sceneTex_009018;
+
+#define dspot07_sceneTex_009418 "__OTR__scenes/shared/spot07_scene/spot07_sceneTex_009418"
+static const ALIGN_ASSET(2) char spot07_sceneTex_009418[] = dspot07_sceneTex_009418;
+
+#define dspot07_sceneTLUT_003F70 "__OTR__scenes/shared/spot07_scene/spot07_sceneTLUT_003F70"
+static const ALIGN_ASSET(2) char spot07_sceneTLUT_003F70[] = dspot07_sceneTLUT_003F70;
+
+#define dgZorasDomainIntroCs "__OTR__scenes/shared/spot07_scene/gZorasDomainIntroCs"
+static const ALIGN_ASSET(2) char gZorasDomainIntroCs[] = dgZorasDomainIntroCs;
+
+#define dgZorasDomainDayEntranceTex "__OTR__scenes/shared/spot07_scene/gZorasDomainDayEntranceTex"
+static const ALIGN_ASSET(2) char gZorasDomainDayEntranceTex[] = dgZorasDomainDayEntranceTex;
+
+#define dgZorasDomainNightEntranceTex "__OTR__scenes/shared/spot07_scene/gZorasDomainNightEntranceTex"
+static const ALIGN_ASSET(2) char gZorasDomainNightEntranceTex[] = dgZorasDomainNightEntranceTex;
+
+#define dspot07_sceneCollisionHeader_003824 "__OTR__scenes/shared/spot07_scene/spot07_sceneCollisionHeader_003824"
+static const ALIGN_ASSET(2) char spot07_sceneCollisionHeader_003824[] = dspot07_sceneCollisionHeader_003824;
+
+#define dspot07_sceneCollisionHeader_003824 "__OTR__scenes/shared/spot07_scene/spot07_sceneCollisionHeader_003824"
+
+#define dspot07_sceneCollisionHeader_003824 "__OTR__scenes/shared/spot07_scene/spot07_sceneCollisionHeader_003824"
 
 
 #endif // OVERWORLD_SPOT07_SCENE_H
diff --git a/soh/assets/scenes/overworld/spot08/spot08_room_0.h b/soh/assets/scenes/overworld/spot08/spot08_room_0.h
index aaec4510f..d2629f414 100644
--- a/soh/assets/scenes/overworld/spot08/spot08_room_0.h
+++ b/soh/assets/scenes/overworld/spot08/spot08_room_0.h
@@ -3,382 +3,382 @@
 
 #include "align_asset_macro.h"
 
-#define dspot08_room_0DL_0051E8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_0051E8"
+#define dspot08_room_0DL_0051E8 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_0051E8"
 static const ALIGN_ASSET(2) char spot08_room_0DL_0051E8[] = dspot08_room_0DL_0051E8;
 
-#define dspot08_room_0DL_000DC0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_000DC0"
+#define dspot08_room_0DL_000DC0 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_000DC0"
 static const ALIGN_ASSET(2) char spot08_room_0DL_000DC0[] = dspot08_room_0DL_000DC0;
 
-#define dspot08_room_0DL_007840 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_007840"
+#define dspot08_room_0DL_007840 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_007840"
 static const ALIGN_ASSET(2) char spot08_room_0DL_007840[] = dspot08_room_0DL_007840;
 
-#define dspot08_room_0DL_001068 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_001068"
+#define dspot08_room_0DL_001068 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_001068"
 static const ALIGN_ASSET(2) char spot08_room_0DL_001068[] = dspot08_room_0DL_001068;
 
-#define dspot08_room_0DL_0079F0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_0079F0"
+#define dspot08_room_0DL_0079F0 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_0079F0"
 static const ALIGN_ASSET(2) char spot08_room_0DL_0079F0[] = dspot08_room_0DL_0079F0;
 
-#define dspot08_room_0DL_0013B8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_0013B8"
+#define dspot08_room_0DL_0013B8 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_0013B8"
 static const ALIGN_ASSET(2) char spot08_room_0DL_0013B8[] = dspot08_room_0DL_0013B8;
 
-#define dspot08_room_0DL_007BA0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_007BA0"
+#define dspot08_room_0DL_007BA0 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_007BA0"
 static const ALIGN_ASSET(2) char spot08_room_0DL_007BA0[] = dspot08_room_0DL_007BA0;
 
-#define dspot08_room_0DL_005B00 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_005B00"
+#define dspot08_room_0DL_005B00 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_005B00"
 static const ALIGN_ASSET(2) char spot08_room_0DL_005B00[] = dspot08_room_0DL_005B00;
 
-#define dspot08_room_0DL_007478 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_007478"
+#define dspot08_room_0DL_007478 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_007478"
 static const ALIGN_ASSET(2) char spot08_room_0DL_007478[] = dspot08_room_0DL_007478;
 
-#define dspot08_room_0DL_001978 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_001978"
+#define dspot08_room_0DL_001978 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_001978"
 static const ALIGN_ASSET(2) char spot08_room_0DL_001978[] = dspot08_room_0DL_001978;
 
-#define dspot08_room_0DL_002120 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_002120"
+#define dspot08_room_0DL_002120 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_002120"
 static const ALIGN_ASSET(2) char spot08_room_0DL_002120[] = dspot08_room_0DL_002120;
 
-#define dspot08_room_0DL_002538 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_002538"
+#define dspot08_room_0DL_002538 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_002538"
 static const ALIGN_ASSET(2) char spot08_room_0DL_002538[] = dspot08_room_0DL_002538;
 
-#define dspot08_room_0DL_006120 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_006120"
+#define dspot08_room_0DL_006120 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_006120"
 static const ALIGN_ASSET(2) char spot08_room_0DL_006120[] = dspot08_room_0DL_006120;
 
-#define dspot08_room_0DL_0066F8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_0066F8"
+#define dspot08_room_0DL_0066F8 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_0066F8"
 static const ALIGN_ASSET(2) char spot08_room_0DL_0066F8[] = dspot08_room_0DL_0066F8;
 
-#define dspot08_room_0DL_006C48 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_006C48"
+#define dspot08_room_0DL_006C48 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_006C48"
 static const ALIGN_ASSET(2) char spot08_room_0DL_006C48[] = dspot08_room_0DL_006C48;
 
-#define dspot08_room_0DL_003048 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_003048"
+#define dspot08_room_0DL_003048 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_003048"
 static const ALIGN_ASSET(2) char spot08_room_0DL_003048[] = dspot08_room_0DL_003048;
 
-#define dspot08_room_0DL_0015F0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_0015F0"
+#define dspot08_room_0DL_0015F0 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_0015F0"
 static const ALIGN_ASSET(2) char spot08_room_0DL_0015F0[] = dspot08_room_0DL_0015F0;
 
-#define dspot08_room_0DL_007D30 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_007D30"
+#define dspot08_room_0DL_007D30 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_007D30"
 static const ALIGN_ASSET(2) char spot08_room_0DL_007D30[] = dspot08_room_0DL_007D30;
 
-#define dspot08_room_0DL_007FE8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_007FE8"
+#define dspot08_room_0DL_007FE8 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_007FE8"
 static const ALIGN_ASSET(2) char spot08_room_0DL_007FE8[] = dspot08_room_0DL_007FE8;
 
-#define dspot08_room_0DL_0048B0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_0048B0"
+#define dspot08_room_0DL_0048B0 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_0048B0"
 static const ALIGN_ASSET(2) char spot08_room_0DL_0048B0[] = dspot08_room_0DL_0048B0;
 
-#define dspot08_room_0DL_0069C0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0DL_0069C0"
+#define dspot08_room_0DL_0069C0 "__OTR__scenes/shared/spot08_scene/spot08_room_0DL_0069C0"
 static const ALIGN_ASSET(2) char spot08_room_0DL_0069C0[] = dspot08_room_0DL_0069C0;
 
-#define dspot08_room_0Set_000700DL_0051E8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_0051E8"
+#define dspot08_room_0Set_000700DL_0051E8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_0051E8"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_0051E8[] = dspot08_room_0Set_000700DL_0051E8;
 
-#define dspot08_room_0Set_000700DL_000DC0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_000DC0"
+#define dspot08_room_0Set_000700DL_000DC0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_000DC0"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_000DC0[] = dspot08_room_0Set_000700DL_000DC0;
 
-#define dspot08_room_0Set_000700DL_007840 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_007840"
+#define dspot08_room_0Set_000700DL_007840 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_007840"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_007840[] = dspot08_room_0Set_000700DL_007840;
 
-#define dspot08_room_0Set_000700DL_001068 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_001068"
+#define dspot08_room_0Set_000700DL_001068 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_001068"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_001068[] = dspot08_room_0Set_000700DL_001068;
 
-#define dspot08_room_0Set_000700DL_0079F0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_0079F0"
+#define dspot08_room_0Set_000700DL_0079F0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_0079F0"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_0079F0[] = dspot08_room_0Set_000700DL_0079F0;
 
-#define dspot08_room_0Set_000700DL_0013B8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_0013B8"
+#define dspot08_room_0Set_000700DL_0013B8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_0013B8"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_0013B8[] = dspot08_room_0Set_000700DL_0013B8;
 
-#define dspot08_room_0Set_000700DL_007BA0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_007BA0"
+#define dspot08_room_0Set_000700DL_007BA0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_007BA0"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_007BA0[] = dspot08_room_0Set_000700DL_007BA0;
 
-#define dspot08_room_0Set_000700DL_005B00 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_005B00"
+#define dspot08_room_0Set_000700DL_005B00 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_005B00"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_005B00[] = dspot08_room_0Set_000700DL_005B00;
 
-#define dspot08_room_0Set_000700DL_007478 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_007478"
+#define dspot08_room_0Set_000700DL_007478 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_007478"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_007478[] = dspot08_room_0Set_000700DL_007478;
 
-#define dspot08_room_0Set_000700DL_001978 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_001978"
+#define dspot08_room_0Set_000700DL_001978 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_001978"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_001978[] = dspot08_room_0Set_000700DL_001978;
 
-#define dspot08_room_0Set_000700DL_002120 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_002120"
+#define dspot08_room_0Set_000700DL_002120 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_002120"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_002120[] = dspot08_room_0Set_000700DL_002120;
 
-#define dspot08_room_0Set_000700DL_002538 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_002538"
+#define dspot08_room_0Set_000700DL_002538 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_002538"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_002538[] = dspot08_room_0Set_000700DL_002538;
 
-#define dspot08_room_0Set_000700DL_006120 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_006120"
+#define dspot08_room_0Set_000700DL_006120 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_006120"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_006120[] = dspot08_room_0Set_000700DL_006120;
 
-#define dspot08_room_0Set_000700DL_0066F8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_0066F8"
+#define dspot08_room_0Set_000700DL_0066F8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_0066F8"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_0066F8[] = dspot08_room_0Set_000700DL_0066F8;
 
-#define dspot08_room_0Set_000700DL_006C48 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_006C48"
+#define dspot08_room_0Set_000700DL_006C48 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_006C48"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_006C48[] = dspot08_room_0Set_000700DL_006C48;
 
-#define dspot08_room_0Set_000700DL_003048 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_003048"
+#define dspot08_room_0Set_000700DL_003048 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_003048"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_003048[] = dspot08_room_0Set_000700DL_003048;
 
-#define dspot08_room_0Set_000700DL_0015F0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_0015F0"
+#define dspot08_room_0Set_000700DL_0015F0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_0015F0"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_0015F0[] = dspot08_room_0Set_000700DL_0015F0;
 
-#define dspot08_room_0Set_000700DL_007D30 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_007D30"
+#define dspot08_room_0Set_000700DL_007D30 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_007D30"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_007D30[] = dspot08_room_0Set_000700DL_007D30;
 
-#define dspot08_room_0Set_000700DL_007FE8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_007FE8"
+#define dspot08_room_0Set_000700DL_007FE8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_007FE8"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_007FE8[] = dspot08_room_0Set_000700DL_007FE8;
 
-#define dspot08_room_0Set_000700DL_0048B0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_0048B0"
+#define dspot08_room_0Set_000700DL_0048B0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_0048B0"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_0048B0[] = dspot08_room_0Set_000700DL_0048B0;
 
-#define dspot08_room_0Set_000700DL_0069C0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000700DL_0069C0"
+#define dspot08_room_0Set_000700DL_0069C0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000700DL_0069C0"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000700DL_0069C0[] = dspot08_room_0Set_000700DL_0069C0;
 
-#define dspot08_room_0Set_000330DL_0051E8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_0051E8"
+#define dspot08_room_0Set_000330DL_0051E8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_0051E8"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_0051E8[] = dspot08_room_0Set_000330DL_0051E8;
 
-#define dspot08_room_0Set_000330DL_000DC0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_000DC0"
+#define dspot08_room_0Set_000330DL_000DC0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_000DC0"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_000DC0[] = dspot08_room_0Set_000330DL_000DC0;
 
-#define dspot08_room_0Set_000330DL_007840 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_007840"
+#define dspot08_room_0Set_000330DL_007840 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_007840"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_007840[] = dspot08_room_0Set_000330DL_007840;
 
-#define dspot08_room_0Set_000330DL_001068 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_001068"
+#define dspot08_room_0Set_000330DL_001068 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_001068"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_001068[] = dspot08_room_0Set_000330DL_001068;
 
-#define dspot08_room_0Set_000330DL_0079F0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_0079F0"
+#define dspot08_room_0Set_000330DL_0079F0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_0079F0"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_0079F0[] = dspot08_room_0Set_000330DL_0079F0;
 
-#define dspot08_room_0Set_000330DL_0013B8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_0013B8"
+#define dspot08_room_0Set_000330DL_0013B8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_0013B8"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_0013B8[] = dspot08_room_0Set_000330DL_0013B8;
 
-#define dspot08_room_0Set_000330DL_007BA0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_007BA0"
+#define dspot08_room_0Set_000330DL_007BA0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_007BA0"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_007BA0[] = dspot08_room_0Set_000330DL_007BA0;
 
-#define dspot08_room_0Set_000330DL_005B00 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_005B00"
+#define dspot08_room_0Set_000330DL_005B00 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_005B00"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_005B00[] = dspot08_room_0Set_000330DL_005B00;
 
-#define dspot08_room_0Set_000330DL_007478 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_007478"
+#define dspot08_room_0Set_000330DL_007478 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_007478"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_007478[] = dspot08_room_0Set_000330DL_007478;
 
-#define dspot08_room_0Set_000330DL_001978 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_001978"
+#define dspot08_room_0Set_000330DL_001978 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_001978"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_001978[] = dspot08_room_0Set_000330DL_001978;
 
-#define dspot08_room_0Set_000330DL_002120 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_002120"
+#define dspot08_room_0Set_000330DL_002120 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_002120"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_002120[] = dspot08_room_0Set_000330DL_002120;
 
-#define dspot08_room_0Set_000330DL_002538 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_002538"
+#define dspot08_room_0Set_000330DL_002538 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_002538"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_002538[] = dspot08_room_0Set_000330DL_002538;
 
-#define dspot08_room_0Set_000330DL_006120 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_006120"
+#define dspot08_room_0Set_000330DL_006120 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_006120"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_006120[] = dspot08_room_0Set_000330DL_006120;
 
-#define dspot08_room_0Set_000330DL_0066F8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_0066F8"
+#define dspot08_room_0Set_000330DL_0066F8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_0066F8"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_0066F8[] = dspot08_room_0Set_000330DL_0066F8;
 
-#define dspot08_room_0Set_000330DL_006C48 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_006C48"
+#define dspot08_room_0Set_000330DL_006C48 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_006C48"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_006C48[] = dspot08_room_0Set_000330DL_006C48;
 
-#define dspot08_room_0Set_000330DL_003048 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_003048"
+#define dspot08_room_0Set_000330DL_003048 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_003048"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_003048[] = dspot08_room_0Set_000330DL_003048;
 
-#define dspot08_room_0Set_000330DL_0015F0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_0015F0"
+#define dspot08_room_0Set_000330DL_0015F0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_0015F0"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_0015F0[] = dspot08_room_0Set_000330DL_0015F0;
 
-#define dspot08_room_0Set_000330DL_007D30 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_007D30"
+#define dspot08_room_0Set_000330DL_007D30 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_007D30"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_007D30[] = dspot08_room_0Set_000330DL_007D30;
 
-#define dspot08_room_0Set_000330DL_007FE8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_007FE8"
+#define dspot08_room_0Set_000330DL_007FE8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_007FE8"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_007FE8[] = dspot08_room_0Set_000330DL_007FE8;
 
-#define dspot08_room_0Set_000330DL_0048B0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_0048B0"
+#define dspot08_room_0Set_000330DL_0048B0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_0048B0"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_0048B0[] = dspot08_room_0Set_000330DL_0048B0;
 
-#define dspot08_room_0Set_000330DL_0069C0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000330DL_0069C0"
+#define dspot08_room_0Set_000330DL_0069C0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000330DL_0069C0"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000330DL_0069C0[] = dspot08_room_0Set_000330DL_0069C0;
 
-#define dspot08_room_0Set_0008E0DL_0051E8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_0051E8"
+#define dspot08_room_0Set_0008E0DL_0051E8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_0051E8"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_0051E8[] = dspot08_room_0Set_0008E0DL_0051E8;
 
-#define dspot08_room_0Set_0008E0DL_000DC0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_000DC0"
+#define dspot08_room_0Set_0008E0DL_000DC0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_000DC0"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_000DC0[] = dspot08_room_0Set_0008E0DL_000DC0;
 
-#define dspot08_room_0Set_0008E0DL_007840 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_007840"
+#define dspot08_room_0Set_0008E0DL_007840 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_007840"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_007840[] = dspot08_room_0Set_0008E0DL_007840;
 
-#define dspot08_room_0Set_0008E0DL_001068 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_001068"
+#define dspot08_room_0Set_0008E0DL_001068 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_001068"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_001068[] = dspot08_room_0Set_0008E0DL_001068;
 
-#define dspot08_room_0Set_0008E0DL_0079F0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_0079F0"
+#define dspot08_room_0Set_0008E0DL_0079F0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_0079F0"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_0079F0[] = dspot08_room_0Set_0008E0DL_0079F0;
 
-#define dspot08_room_0Set_0008E0DL_0013B8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_0013B8"
+#define dspot08_room_0Set_0008E0DL_0013B8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_0013B8"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_0013B8[] = dspot08_room_0Set_0008E0DL_0013B8;
 
-#define dspot08_room_0Set_0008E0DL_007BA0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_007BA0"
+#define dspot08_room_0Set_0008E0DL_007BA0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_007BA0"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_007BA0[] = dspot08_room_0Set_0008E0DL_007BA0;
 
-#define dspot08_room_0Set_0008E0DL_005B00 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_005B00"
+#define dspot08_room_0Set_0008E0DL_005B00 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_005B00"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_005B00[] = dspot08_room_0Set_0008E0DL_005B00;
 
-#define dspot08_room_0Set_0008E0DL_007478 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_007478"
+#define dspot08_room_0Set_0008E0DL_007478 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_007478"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_007478[] = dspot08_room_0Set_0008E0DL_007478;
 
-#define dspot08_room_0Set_0008E0DL_001978 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_001978"
+#define dspot08_room_0Set_0008E0DL_001978 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_001978"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_001978[] = dspot08_room_0Set_0008E0DL_001978;
 
-#define dspot08_room_0Set_0008E0DL_002120 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_002120"
+#define dspot08_room_0Set_0008E0DL_002120 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_002120"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_002120[] = dspot08_room_0Set_0008E0DL_002120;
 
-#define dspot08_room_0Set_0008E0DL_002538 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_002538"
+#define dspot08_room_0Set_0008E0DL_002538 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_002538"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_002538[] = dspot08_room_0Set_0008E0DL_002538;
 
-#define dspot08_room_0Set_0008E0DL_006120 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_006120"
+#define dspot08_room_0Set_0008E0DL_006120 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_006120"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_006120[] = dspot08_room_0Set_0008E0DL_006120;
 
-#define dspot08_room_0Set_0008E0DL_0066F8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_0066F8"
+#define dspot08_room_0Set_0008E0DL_0066F8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_0066F8"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_0066F8[] = dspot08_room_0Set_0008E0DL_0066F8;
 
-#define dspot08_room_0Set_0008E0DL_006C48 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_006C48"
+#define dspot08_room_0Set_0008E0DL_006C48 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_006C48"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_006C48[] = dspot08_room_0Set_0008E0DL_006C48;
 
-#define dspot08_room_0Set_0008E0DL_003048 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_003048"
+#define dspot08_room_0Set_0008E0DL_003048 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_003048"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_003048[] = dspot08_room_0Set_0008E0DL_003048;
 
-#define dspot08_room_0Set_0008E0DL_0015F0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_0015F0"
+#define dspot08_room_0Set_0008E0DL_0015F0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_0015F0"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_0015F0[] = dspot08_room_0Set_0008E0DL_0015F0;
 
-#define dspot08_room_0Set_0008E0DL_007D30 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_007D30"
+#define dspot08_room_0Set_0008E0DL_007D30 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_007D30"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_007D30[] = dspot08_room_0Set_0008E0DL_007D30;
 
-#define dspot08_room_0Set_0008E0DL_007FE8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_007FE8"
+#define dspot08_room_0Set_0008E0DL_007FE8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_007FE8"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_007FE8[] = dspot08_room_0Set_0008E0DL_007FE8;
 
-#define dspot08_room_0Set_0008E0DL_0048B0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_0048B0"
+#define dspot08_room_0Set_0008E0DL_0048B0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_0048B0"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_0048B0[] = dspot08_room_0Set_0008E0DL_0048B0;
 
-#define dspot08_room_0Set_0008E0DL_0069C0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0008E0DL_0069C0"
+#define dspot08_room_0Set_0008E0DL_0069C0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0008E0DL_0069C0"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0008E0DL_0069C0[] = dspot08_room_0Set_0008E0DL_0069C0;
 
-#define dspot08_room_0Set_0009A0DL_0051E8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_0051E8"
+#define dspot08_room_0Set_0009A0DL_0051E8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_0051E8"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_0051E8[] = dspot08_room_0Set_0009A0DL_0051E8;
 
-#define dspot08_room_0Set_0009A0DL_000DC0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_000DC0"
+#define dspot08_room_0Set_0009A0DL_000DC0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_000DC0"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_000DC0[] = dspot08_room_0Set_0009A0DL_000DC0;
 
-#define dspot08_room_0Set_0009A0DL_007840 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_007840"
+#define dspot08_room_0Set_0009A0DL_007840 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_007840"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_007840[] = dspot08_room_0Set_0009A0DL_007840;
 
-#define dspot08_room_0Set_0009A0DL_001068 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_001068"
+#define dspot08_room_0Set_0009A0DL_001068 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_001068"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_001068[] = dspot08_room_0Set_0009A0DL_001068;
 
-#define dspot08_room_0Set_0009A0DL_0079F0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_0079F0"
+#define dspot08_room_0Set_0009A0DL_0079F0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_0079F0"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_0079F0[] = dspot08_room_0Set_0009A0DL_0079F0;
 
-#define dspot08_room_0Set_0009A0DL_0013B8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_0013B8"
+#define dspot08_room_0Set_0009A0DL_0013B8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_0013B8"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_0013B8[] = dspot08_room_0Set_0009A0DL_0013B8;
 
-#define dspot08_room_0Set_0009A0DL_007BA0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_007BA0"
+#define dspot08_room_0Set_0009A0DL_007BA0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_007BA0"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_007BA0[] = dspot08_room_0Set_0009A0DL_007BA0;
 
-#define dspot08_room_0Set_0009A0DL_005B00 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_005B00"
+#define dspot08_room_0Set_0009A0DL_005B00 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_005B00"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_005B00[] = dspot08_room_0Set_0009A0DL_005B00;
 
-#define dspot08_room_0Set_0009A0DL_007478 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_007478"
+#define dspot08_room_0Set_0009A0DL_007478 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_007478"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_007478[] = dspot08_room_0Set_0009A0DL_007478;
 
-#define dspot08_room_0Set_0009A0DL_001978 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_001978"
+#define dspot08_room_0Set_0009A0DL_001978 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_001978"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_001978[] = dspot08_room_0Set_0009A0DL_001978;
 
-#define dspot08_room_0Set_0009A0DL_002120 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_002120"
+#define dspot08_room_0Set_0009A0DL_002120 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_002120"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_002120[] = dspot08_room_0Set_0009A0DL_002120;
 
-#define dspot08_room_0Set_0009A0DL_002538 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_002538"
+#define dspot08_room_0Set_0009A0DL_002538 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_002538"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_002538[] = dspot08_room_0Set_0009A0DL_002538;
 
-#define dspot08_room_0Set_0009A0DL_006120 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_006120"
+#define dspot08_room_0Set_0009A0DL_006120 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_006120"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_006120[] = dspot08_room_0Set_0009A0DL_006120;
 
-#define dspot08_room_0Set_0009A0DL_0066F8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_0066F8"
+#define dspot08_room_0Set_0009A0DL_0066F8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_0066F8"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_0066F8[] = dspot08_room_0Set_0009A0DL_0066F8;
 
-#define dspot08_room_0Set_0009A0DL_006C48 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_006C48"
+#define dspot08_room_0Set_0009A0DL_006C48 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_006C48"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_006C48[] = dspot08_room_0Set_0009A0DL_006C48;
 
-#define dspot08_room_0Set_0009A0DL_003048 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_003048"
+#define dspot08_room_0Set_0009A0DL_003048 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_003048"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_003048[] = dspot08_room_0Set_0009A0DL_003048;
 
-#define dspot08_room_0Set_0009A0DL_0015F0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_0015F0"
+#define dspot08_room_0Set_0009A0DL_0015F0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_0015F0"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_0015F0[] = dspot08_room_0Set_0009A0DL_0015F0;
 
-#define dspot08_room_0Set_0009A0DL_007D30 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_007D30"
+#define dspot08_room_0Set_0009A0DL_007D30 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_007D30"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_007D30[] = dspot08_room_0Set_0009A0DL_007D30;
 
-#define dspot08_room_0Set_0009A0DL_007FE8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_007FE8"
+#define dspot08_room_0Set_0009A0DL_007FE8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_007FE8"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_007FE8[] = dspot08_room_0Set_0009A0DL_007FE8;
 
-#define dspot08_room_0Set_0009A0DL_0048B0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_0048B0"
+#define dspot08_room_0Set_0009A0DL_0048B0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_0048B0"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_0048B0[] = dspot08_room_0Set_0009A0DL_0048B0;
 
-#define dspot08_room_0Set_0009A0DL_0069C0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_0009A0DL_0069C0"
+#define dspot08_room_0Set_0009A0DL_0069C0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_0009A0DL_0069C0"
 static const ALIGN_ASSET(2) char spot08_room_0Set_0009A0DL_0069C0[] = dspot08_room_0Set_0009A0DL_0069C0;
 
-#define dspot08_room_0Set_000AD0DL_0051E8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_0051E8"
+#define dspot08_room_0Set_000AD0DL_0051E8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_0051E8"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_0051E8[] = dspot08_room_0Set_000AD0DL_0051E8;
 
-#define dspot08_room_0Set_000AD0DL_000DC0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_000DC0"
+#define dspot08_room_0Set_000AD0DL_000DC0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_000DC0"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_000DC0[] = dspot08_room_0Set_000AD0DL_000DC0;
 
-#define dspot08_room_0Set_000AD0DL_007840 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_007840"
+#define dspot08_room_0Set_000AD0DL_007840 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_007840"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_007840[] = dspot08_room_0Set_000AD0DL_007840;
 
-#define dspot08_room_0Set_000AD0DL_001068 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_001068"
+#define dspot08_room_0Set_000AD0DL_001068 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_001068"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_001068[] = dspot08_room_0Set_000AD0DL_001068;
 
-#define dspot08_room_0Set_000AD0DL_0079F0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_0079F0"
+#define dspot08_room_0Set_000AD0DL_0079F0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_0079F0"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_0079F0[] = dspot08_room_0Set_000AD0DL_0079F0;
 
-#define dspot08_room_0Set_000AD0DL_0013B8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_0013B8"
+#define dspot08_room_0Set_000AD0DL_0013B8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_0013B8"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_0013B8[] = dspot08_room_0Set_000AD0DL_0013B8;
 
-#define dspot08_room_0Set_000AD0DL_007BA0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_007BA0"
+#define dspot08_room_0Set_000AD0DL_007BA0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_007BA0"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_007BA0[] = dspot08_room_0Set_000AD0DL_007BA0;
 
-#define dspot08_room_0Set_000AD0DL_005B00 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_005B00"
+#define dspot08_room_0Set_000AD0DL_005B00 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_005B00"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_005B00[] = dspot08_room_0Set_000AD0DL_005B00;
 
-#define dspot08_room_0Set_000AD0DL_007478 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_007478"
+#define dspot08_room_0Set_000AD0DL_007478 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_007478"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_007478[] = dspot08_room_0Set_000AD0DL_007478;
 
-#define dspot08_room_0Set_000AD0DL_001978 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_001978"
+#define dspot08_room_0Set_000AD0DL_001978 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_001978"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_001978[] = dspot08_room_0Set_000AD0DL_001978;
 
-#define dspot08_room_0Set_000AD0DL_002120 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_002120"
+#define dspot08_room_0Set_000AD0DL_002120 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_002120"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_002120[] = dspot08_room_0Set_000AD0DL_002120;
 
-#define dspot08_room_0Set_000AD0DL_002538 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_002538"
+#define dspot08_room_0Set_000AD0DL_002538 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_002538"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_002538[] = dspot08_room_0Set_000AD0DL_002538;
 
-#define dspot08_room_0Set_000AD0DL_006120 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_006120"
+#define dspot08_room_0Set_000AD0DL_006120 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_006120"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_006120[] = dspot08_room_0Set_000AD0DL_006120;
 
-#define dspot08_room_0Set_000AD0DL_0066F8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_0066F8"
+#define dspot08_room_0Set_000AD0DL_0066F8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_0066F8"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_0066F8[] = dspot08_room_0Set_000AD0DL_0066F8;
 
-#define dspot08_room_0Set_000AD0DL_006C48 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_006C48"
+#define dspot08_room_0Set_000AD0DL_006C48 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_006C48"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_006C48[] = dspot08_room_0Set_000AD0DL_006C48;
 
-#define dspot08_room_0Set_000AD0DL_003048 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_003048"
+#define dspot08_room_0Set_000AD0DL_003048 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_003048"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_003048[] = dspot08_room_0Set_000AD0DL_003048;
 
-#define dspot08_room_0Set_000AD0DL_0015F0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_0015F0"
+#define dspot08_room_0Set_000AD0DL_0015F0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_0015F0"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_0015F0[] = dspot08_room_0Set_000AD0DL_0015F0;
 
-#define dspot08_room_0Set_000AD0DL_007D30 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_007D30"
+#define dspot08_room_0Set_000AD0DL_007D30 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_007D30"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_007D30[] = dspot08_room_0Set_000AD0DL_007D30;
 
-#define dspot08_room_0Set_000AD0DL_007FE8 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_007FE8"
+#define dspot08_room_0Set_000AD0DL_007FE8 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_007FE8"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_007FE8[] = dspot08_room_0Set_000AD0DL_007FE8;
 
-#define dspot08_room_0Set_000AD0DL_0048B0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_0048B0"
+#define dspot08_room_0Set_000AD0DL_0048B0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_0048B0"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_0048B0[] = dspot08_room_0Set_000AD0DL_0048B0;
 
-#define dspot08_room_0Set_000AD0DL_0069C0 "__OTR__scenes/nonmq/spot08_scene/spot08_room_0Set_000AD0DL_0069C0"
+#define dspot08_room_0Set_000AD0DL_0069C0 "__OTR__scenes/shared/spot08_scene/spot08_room_0Set_000AD0DL_0069C0"
 static const ALIGN_ASSET(2) char spot08_room_0Set_000AD0DL_0069C0[] = dspot08_room_0Set_000AD0DL_0069C0;
 
 
diff --git a/soh/assets/scenes/overworld/spot08/spot08_scene.h b/soh/assets/scenes/overworld/spot08/spot08_scene.h
index 76f13d7b8..b8667ff4b 100644
--- a/soh/assets/scenes/overworld/spot08/spot08_scene.h
+++ b/soh/assets/scenes/overworld/spot08/spot08_scene.h
@@ -3,102 +3,102 @@
 
 #include "align_asset_macro.h"
 
-#define dgZorasFountainIntroCs "__OTR__scenes/nonmq/spot08_scene/gZorasFountainIntroCs"
-static const ALIGN_ASSET(2) char gZorasFountainIntroCs[] = dgZorasFountainIntroCs;
-
-#define dspot08_sceneCollisionHeader_002CE0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneCollisionHeader_002CE0"
-static const ALIGN_ASSET(2) char spot08_sceneCollisionHeader_002CE0[] = dspot08_sceneCollisionHeader_002CE0;
-
-#define dspot08_sceneTex_0081A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_0081A0"
-static const ALIGN_ASSET(2) char spot08_sceneTex_0081A0[] = dspot08_sceneTex_0081A0;
-
-#define dspot08_sceneTLUT_004CC0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTLUT_004CC0"
-static const ALIGN_ASSET(2) char spot08_sceneTLUT_004CC0[] = dspot08_sceneTLUT_004CC0;
-
-#define dspot08_sceneTex_0069A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_0069A0"
-static const ALIGN_ASSET(2) char spot08_sceneTex_0069A0[] = dspot08_sceneTex_0069A0;
-
-#define dspot08_sceneTex_0109A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_0109A0"
-static const ALIGN_ASSET(2) char spot08_sceneTex_0109A0[] = dspot08_sceneTex_0109A0;
-
-#define dspot08_sceneTex_004DA0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_004DA0"
+#define dspot08_sceneTex_004DA0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_004DA0"
 static const ALIGN_ASSET(2) char spot08_sceneTex_004DA0[] = dspot08_sceneTex_004DA0;
 
-#define dspot08_sceneTex_00B9A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_00B9A0"
-static const ALIGN_ASSET(2) char spot08_sceneTex_00B9A0[] = dspot08_sceneTex_00B9A0;
-
-#define dspot08_sceneTLUT_004D38 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTLUT_004D38"
-static const ALIGN_ASSET(2) char spot08_sceneTLUT_004D38[] = dspot08_sceneTLUT_004D38;
-
-#define dspot08_sceneTex_00A9A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_00A9A0"
-static const ALIGN_ASSET(2) char spot08_sceneTex_00A9A0[] = dspot08_sceneTex_00A9A0;
-
-#define dspot08_sceneTex_005DA0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_005DA0"
+#define dspot08_sceneTex_005DA0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_005DA0"
 static const ALIGN_ASSET(2) char spot08_sceneTex_005DA0[] = dspot08_sceneTex_005DA0;
 
-#define dspot08_sceneTex_00D1A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_00D1A0"
-static const ALIGN_ASSET(2) char spot08_sceneTex_00D1A0[] = dspot08_sceneTex_00D1A0;
-
-#define dspot08_sceneTex_00C1A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_00C1A0"
-static const ALIGN_ASSET(2) char spot08_sceneTex_00C1A0[] = dspot08_sceneTex_00C1A0;
-
-#define dspot08_sceneTex_010AA0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_010AA0"
-static const ALIGN_ASSET(2) char spot08_sceneTex_010AA0[] = dspot08_sceneTex_010AA0;
-
-#define dspot08_sceneTex_0061A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_0061A0"
+#define dspot08_sceneTex_0061A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_0061A0"
 static const ALIGN_ASSET(2) char spot08_sceneTex_0061A0[] = dspot08_sceneTex_0061A0;
 
-#define dspot08_sceneTex_010EA0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_010EA0"
-static const ALIGN_ASSET(2) char spot08_sceneTex_010EA0[] = dspot08_sceneTex_010EA0;
+#define dspot08_sceneTex_0069A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_0069A0"
+static const ALIGN_ASSET(2) char spot08_sceneTex_0069A0[] = dspot08_sceneTex_0069A0;
 
-#define dspot08_sceneTex_00B1A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_00B1A0"
-static const ALIGN_ASSET(2) char spot08_sceneTex_00B1A0[] = dspot08_sceneTex_00B1A0;
-
-#define dspot08_sceneTLUT_004D10 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTLUT_004D10"
-static const ALIGN_ASSET(2) char spot08_sceneTLUT_004D10[] = dspot08_sceneTLUT_004D10;
-
-#define dspot08_sceneTex_00F1A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_00F1A0"
-static const ALIGN_ASSET(2) char spot08_sceneTex_00F1A0[] = dspot08_sceneTex_00F1A0;
-
-#define dspot08_sceneTLUT_004D60 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTLUT_004D60"
-static const ALIGN_ASSET(2) char spot08_sceneTLUT_004D60[] = dspot08_sceneTLUT_004D60;
-
-#define dspot08_sceneTex_00A1A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_00A1A0"
-static const ALIGN_ASSET(2) char spot08_sceneTex_00A1A0[] = dspot08_sceneTex_00A1A0;
-
-#define dspot08_sceneTLUT_004CE8 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTLUT_004CE8"
-static const ALIGN_ASSET(2) char spot08_sceneTLUT_004CE8[] = dspot08_sceneTLUT_004CE8;
-
-#define dspot08_sceneTex_00E1A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_00E1A0"
-static const ALIGN_ASSET(2) char spot08_sceneTex_00E1A0[] = dspot08_sceneTex_00E1A0;
-
-#define dspot08_sceneTex_0091A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_0091A0"
-static const ALIGN_ASSET(2) char spot08_sceneTex_0091A0[] = dspot08_sceneTex_0091A0;
-
-#define dspot08_sceneTex_0101A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_0101A0"
-static const ALIGN_ASSET(2) char spot08_sceneTex_0101A0[] = dspot08_sceneTex_0101A0;
-
-#define dspot08_sceneTex_00F9A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_00F9A0"
-static const ALIGN_ASSET(2) char spot08_sceneTex_00F9A0[] = dspot08_sceneTex_00F9A0;
-
-#define dspot08_sceneTLUT_004D80 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTLUT_004D80"
-static const ALIGN_ASSET(2) char spot08_sceneTLUT_004D80[] = dspot08_sceneTLUT_004D80;
-
-#define dspot08_sceneTex_0089A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_0089A0"
-static const ALIGN_ASSET(2) char spot08_sceneTex_0089A0[] = dspot08_sceneTex_0089A0;
-
-#define dspot08_sceneTex_0071A0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneTex_0071A0"
+#define dspot08_sceneTex_0071A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_0071A0"
 static const ALIGN_ASSET(2) char spot08_sceneTex_0071A0[] = dspot08_sceneTex_0071A0;
 
-#define dspot08_sceneCollisionHeader_002CE0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneCollisionHeader_002CE0"
+#define dspot08_sceneTex_0081A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_0081A0"
+static const ALIGN_ASSET(2) char spot08_sceneTex_0081A0[] = dspot08_sceneTex_0081A0;
 
-#define dspot08_sceneCollisionHeader_002CE0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneCollisionHeader_002CE0"
+#define dspot08_sceneTex_0089A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_0089A0"
+static const ALIGN_ASSET(2) char spot08_sceneTex_0089A0[] = dspot08_sceneTex_0089A0;
 
-#define dspot08_sceneCollisionHeader_002CE0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneCollisionHeader_002CE0"
+#define dspot08_sceneTex_0091A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_0091A0"
+static const ALIGN_ASSET(2) char spot08_sceneTex_0091A0[] = dspot08_sceneTex_0091A0;
 
-#define dspot08_sceneCollisionHeader_002CE0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneCollisionHeader_002CE0"
+#define dspot08_sceneTex_00A1A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_00A1A0"
+static const ALIGN_ASSET(2) char spot08_sceneTex_00A1A0[] = dspot08_sceneTex_00A1A0;
 
-#define dspot08_sceneCollisionHeader_002CE0 "__OTR__scenes/nonmq/spot08_scene/spot08_sceneCollisionHeader_002CE0"
+#define dspot08_sceneTex_00A9A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_00A9A0"
+static const ALIGN_ASSET(2) char spot08_sceneTex_00A9A0[] = dspot08_sceneTex_00A9A0;
+
+#define dspot08_sceneTex_00B1A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_00B1A0"
+static const ALIGN_ASSET(2) char spot08_sceneTex_00B1A0[] = dspot08_sceneTex_00B1A0;
+
+#define dspot08_sceneTex_00B9A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_00B9A0"
+static const ALIGN_ASSET(2) char spot08_sceneTex_00B9A0[] = dspot08_sceneTex_00B9A0;
+
+#define dspot08_sceneTex_00C1A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_00C1A0"
+static const ALIGN_ASSET(2) char spot08_sceneTex_00C1A0[] = dspot08_sceneTex_00C1A0;
+
+#define dspot08_sceneTex_00D1A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_00D1A0"
+static const ALIGN_ASSET(2) char spot08_sceneTex_00D1A0[] = dspot08_sceneTex_00D1A0;
+
+#define dspot08_sceneTex_00E1A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_00E1A0"
+static const ALIGN_ASSET(2) char spot08_sceneTex_00E1A0[] = dspot08_sceneTex_00E1A0;
+
+#define dspot08_sceneTex_00F1A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_00F1A0"
+static const ALIGN_ASSET(2) char spot08_sceneTex_00F1A0[] = dspot08_sceneTex_00F1A0;
+
+#define dspot08_sceneTex_00F9A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_00F9A0"
+static const ALIGN_ASSET(2) char spot08_sceneTex_00F9A0[] = dspot08_sceneTex_00F9A0;
+
+#define dspot08_sceneTex_0101A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_0101A0"
+static const ALIGN_ASSET(2) char spot08_sceneTex_0101A0[] = dspot08_sceneTex_0101A0;
+
+#define dspot08_sceneTex_0109A0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_0109A0"
+static const ALIGN_ASSET(2) char spot08_sceneTex_0109A0[] = dspot08_sceneTex_0109A0;
+
+#define dspot08_sceneTex_010AA0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_010AA0"
+static const ALIGN_ASSET(2) char spot08_sceneTex_010AA0[] = dspot08_sceneTex_010AA0;
+
+#define dspot08_sceneTex_010EA0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTex_010EA0"
+static const ALIGN_ASSET(2) char spot08_sceneTex_010EA0[] = dspot08_sceneTex_010EA0;
+
+#define dspot08_sceneTLUT_004CC0 "__OTR__scenes/shared/spot08_scene/spot08_sceneTLUT_004CC0"
+static const ALIGN_ASSET(2) char spot08_sceneTLUT_004CC0[] = dspot08_sceneTLUT_004CC0;
+
+#define dspot08_sceneTLUT_004CE8 "__OTR__scenes/shared/spot08_scene/spot08_sceneTLUT_004CE8"
+static const ALIGN_ASSET(2) char spot08_sceneTLUT_004CE8[] = dspot08_sceneTLUT_004CE8;
+
+#define dspot08_sceneTLUT_004D10 "__OTR__scenes/shared/spot08_scene/spot08_sceneTLUT_004D10"
+static const ALIGN_ASSET(2) char spot08_sceneTLUT_004D10[] = dspot08_sceneTLUT_004D10;
+
+#define dspot08_sceneTLUT_004D38 "__OTR__scenes/shared/spot08_scene/spot08_sceneTLUT_004D38"
+static const ALIGN_ASSET(2) char spot08_sceneTLUT_004D38[] = dspot08_sceneTLUT_004D38;
+
+#define dspot08_sceneTLUT_004D60 "__OTR__scenes/shared/spot08_scene/spot08_sceneTLUT_004D60"
+static const ALIGN_ASSET(2) char spot08_sceneTLUT_004D60[] = dspot08_sceneTLUT_004D60;
+
+#define dspot08_sceneTLUT_004D80 "__OTR__scenes/shared/spot08_scene/spot08_sceneTLUT_004D80"
+static const ALIGN_ASSET(2) char spot08_sceneTLUT_004D80[] = dspot08_sceneTLUT_004D80;
+
+#define dgZorasFountainIntroCs "__OTR__scenes/shared/spot08_scene/gZorasFountainIntroCs"
+static const ALIGN_ASSET(2) char gZorasFountainIntroCs[] = dgZorasFountainIntroCs;
+
+#define dspot08_sceneCollisionHeader_002CE0 "__OTR__scenes/shared/spot08_scene/spot08_sceneCollisionHeader_002CE0"
+static const ALIGN_ASSET(2) char spot08_sceneCollisionHeader_002CE0[] = dspot08_sceneCollisionHeader_002CE0;
+
+#define dspot08_sceneCollisionHeader_002CE0 "__OTR__scenes/shared/spot08_scene/spot08_sceneCollisionHeader_002CE0"
+
+#define dspot08_sceneCollisionHeader_002CE0 "__OTR__scenes/shared/spot08_scene/spot08_sceneCollisionHeader_002CE0"
+
+#define dspot08_sceneCollisionHeader_002CE0 "__OTR__scenes/shared/spot08_scene/spot08_sceneCollisionHeader_002CE0"
+
+#define dspot08_sceneCollisionHeader_002CE0 "__OTR__scenes/shared/spot08_scene/spot08_sceneCollisionHeader_002CE0"
+
+#define dspot08_sceneCollisionHeader_002CE0 "__OTR__scenes/shared/spot08_scene/spot08_sceneCollisionHeader_002CE0"
 
 
 #endif // OVERWORLD_SPOT08_SCENE_H
diff --git a/soh/assets/scenes/overworld/spot09/spot09_room_0.h b/soh/assets/scenes/overworld/spot09/spot09_room_0.h
index 2671659b5..8bfbbe779 100644
--- a/soh/assets/scenes/overworld/spot09/spot09_room_0.h
+++ b/soh/assets/scenes/overworld/spot09/spot09_room_0.h
@@ -3,490 +3,490 @@
 
 #include "align_asset_macro.h"
 
-#define dgSpot09DL_007108 "__OTR__scenes/nonmq/spot09_scene/gSpot09DL_007108"
+#define dgSpot09DL_007108 "__OTR__scenes/shared/spot09_scene/gSpot09DL_007108"
 static const ALIGN_ASSET(2) char gSpot09DL_007108[] = dgSpot09DL_007108;
 
-#define dgSpot09DL_008780 "__OTR__scenes/nonmq/spot09_scene/gSpot09DL_008780"
+#define dgSpot09DL_008780 "__OTR__scenes/shared/spot09_scene/gSpot09DL_008780"
 static const ALIGN_ASSET(2) char gSpot09DL_008780[] = dgSpot09DL_008780;
 
-#define dspot09_room_0DL_0084C0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_0084C0"
+#define dspot09_room_0DL_0084C0 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_0084C0"
 static const ALIGN_ASSET(2) char spot09_room_0DL_0084C0[] = dspot09_room_0DL_0084C0;
 
-#define dspot09_room_0DL_002158 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_002158"
+#define dspot09_room_0DL_002158 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_002158"
 static const ALIGN_ASSET(2) char spot09_room_0DL_002158[] = dspot09_room_0DL_002158;
 
-#define dspot09_room_0DL_002698 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_002698"
+#define dspot09_room_0DL_002698 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_002698"
 static const ALIGN_ASSET(2) char spot09_room_0DL_002698[] = dspot09_room_0DL_002698;
 
-#define dspot09_room_0DL_008108 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_008108"
+#define dspot09_room_0DL_008108 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_008108"
 static const ALIGN_ASSET(2) char spot09_room_0DL_008108[] = dspot09_room_0DL_008108;
 
-#define dspot09_room_0DL_002A70 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_002A70"
+#define dspot09_room_0DL_002A70 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_002A70"
 static const ALIGN_ASSET(2) char spot09_room_0DL_002A70[] = dspot09_room_0DL_002A70;
 
-#define dspot09_room_0DL_002DA8 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_002DA8"
+#define dspot09_room_0DL_002DA8 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_002DA8"
 static const ALIGN_ASSET(2) char spot09_room_0DL_002DA8[] = dspot09_room_0DL_002DA8;
 
-#define dspot09_room_0DL_0030D0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_0030D0"
+#define dspot09_room_0DL_0030D0 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_0030D0"
 static const ALIGN_ASSET(2) char spot09_room_0DL_0030D0[] = dspot09_room_0DL_0030D0;
 
-#define dspot09_room_0DL_001550 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_001550"
+#define dspot09_room_0DL_001550 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_001550"
 static const ALIGN_ASSET(2) char spot09_room_0DL_001550[] = dspot09_room_0DL_001550;
 
-#define dspot09_room_0DL_003308 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_003308"
+#define dspot09_room_0DL_003308 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_003308"
 static const ALIGN_ASSET(2) char spot09_room_0DL_003308[] = dspot09_room_0DL_003308;
 
-#define dspot09_room_0DL_003630 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_003630"
+#define dspot09_room_0DL_003630 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_003630"
 static const ALIGN_ASSET(2) char spot09_room_0DL_003630[] = dspot09_room_0DL_003630;
 
-#define dspot09_room_0DL_0017A0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_0017A0"
+#define dspot09_room_0DL_0017A0 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_0017A0"
 static const ALIGN_ASSET(2) char spot09_room_0DL_0017A0[] = dspot09_room_0DL_0017A0;
 
-#define dspot09_room_0DL_001A40 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_001A40"
+#define dspot09_room_0DL_001A40 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_001A40"
 static const ALIGN_ASSET(2) char spot09_room_0DL_001A40[] = dspot09_room_0DL_001A40;
 
-#define dspot09_room_0DL_006F88 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_006F88"
+#define dspot09_room_0DL_006F88 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_006F88"
 static const ALIGN_ASSET(2) char spot09_room_0DL_006F88[] = dspot09_room_0DL_006F88;
 
-#define dspot09_room_0DL_001E98 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_001E98"
+#define dspot09_room_0DL_001E98 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_001E98"
 static const ALIGN_ASSET(2) char spot09_room_0DL_001E98[] = dspot09_room_0DL_001E98;
 
-#define dspot09_room_0DL_001330 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_001330"
+#define dspot09_room_0DL_001330 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_001330"
 static const ALIGN_ASSET(2) char spot09_room_0DL_001330[] = dspot09_room_0DL_001330;
 
-#define dspot09_room_0DL_007FF8 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_007FF8"
+#define dspot09_room_0DL_007FF8 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_007FF8"
 static const ALIGN_ASSET(2) char spot09_room_0DL_007FF8[] = dspot09_room_0DL_007FF8;
 
-#define dspot09_room_0DL_008318 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_008318"
+#define dspot09_room_0DL_008318 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_008318"
 static const ALIGN_ASSET(2) char spot09_room_0DL_008318[] = dspot09_room_0DL_008318;
 
-#define dspot09_room_0DL_005C68 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_005C68"
+#define dspot09_room_0DL_005C68 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_005C68"
 static const ALIGN_ASSET(2) char spot09_room_0DL_005C68[] = dspot09_room_0DL_005C68;
 
-#define dspot09_room_0DL_005E80 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_005E80"
+#define dspot09_room_0DL_005E80 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_005E80"
 static const ALIGN_ASSET(2) char spot09_room_0DL_005E80[] = dspot09_room_0DL_005E80;
 
-#define dspot09_room_0DL_0060C8 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_0060C8"
+#define dspot09_room_0DL_0060C8 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_0060C8"
 static const ALIGN_ASSET(2) char spot09_room_0DL_0060C8[] = dspot09_room_0DL_0060C8;
 
-#define dspot09_room_0DL_006360 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_006360"
+#define dspot09_room_0DL_006360 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_006360"
 static const ALIGN_ASSET(2) char spot09_room_0DL_006360[] = dspot09_room_0DL_006360;
 
-#define dspot09_room_0DL_0065C0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_0065C0"
+#define dspot09_room_0DL_0065C0 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_0065C0"
 static const ALIGN_ASSET(2) char spot09_room_0DL_0065C0[] = dspot09_room_0DL_0065C0;
 
-#define dspot09_room_0DL_006888 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_006888"
+#define dspot09_room_0DL_006888 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_006888"
 static const ALIGN_ASSET(2) char spot09_room_0DL_006888[] = dspot09_room_0DL_006888;
 
-#define dspot09_room_0DL_006C40 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_006C40"
+#define dspot09_room_0DL_006C40 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_006C40"
 static const ALIGN_ASSET(2) char spot09_room_0DL_006C40[] = dspot09_room_0DL_006C40;
 
-#define dspot09_room_0DL_007530 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_007530"
+#define dspot09_room_0DL_007530 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_007530"
 static const ALIGN_ASSET(2) char spot09_room_0DL_007530[] = dspot09_room_0DL_007530;
 
-#define dspot09_room_0DL_008698 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_008698"
+#define dspot09_room_0DL_008698 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_008698"
 static const ALIGN_ASSET(2) char spot09_room_0DL_008698[] = dspot09_room_0DL_008698;
 
-#define dspot09_room_0DL_003C98 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_003C98"
+#define dspot09_room_0DL_003C98 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_003C98"
 static const ALIGN_ASSET(2) char spot09_room_0DL_003C98[] = dspot09_room_0DL_003C98;
 
-#define dspot09_room_0DL_004540 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_004540"
+#define dspot09_room_0DL_004540 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_004540"
 static const ALIGN_ASSET(2) char spot09_room_0DL_004540[] = dspot09_room_0DL_004540;
 
-#define dspot09_room_0DL_004C00 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_004C00"
+#define dspot09_room_0DL_004C00 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_004C00"
 static const ALIGN_ASSET(2) char spot09_room_0DL_004C00[] = dspot09_room_0DL_004C00;
 
-#define dspot09_room_0DL_005128 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_005128"
+#define dspot09_room_0DL_005128 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_005128"
 static const ALIGN_ASSET(2) char spot09_room_0DL_005128[] = dspot09_room_0DL_005128;
 
-#define dspot09_room_0DL_005598 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_005598"
+#define dspot09_room_0DL_005598 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_005598"
 static const ALIGN_ASSET(2) char spot09_room_0DL_005598[] = dspot09_room_0DL_005598;
 
-#define dspot09_room_0DL_005A08 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0DL_005A08"
+#define dspot09_room_0DL_005A08 "__OTR__scenes/shared/spot09_scene/spot09_room_0DL_005A08"
 static const ALIGN_ASSET(2) char spot09_room_0DL_005A08[] = dspot09_room_0DL_005A08;
 
-#define dspot09_room_0Set_000500DL_0084C0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_0084C0"
+#define dspot09_room_0Set_000500DL_0084C0 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_0084C0"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_0084C0[] = dspot09_room_0Set_000500DL_0084C0;
 
-#define dspot09_room_0Set_000500DL_002158 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_002158"
+#define dspot09_room_0Set_000500DL_002158 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_002158"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_002158[] = dspot09_room_0Set_000500DL_002158;
 
-#define dspot09_room_0Set_000500DL_002698 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_002698"
+#define dspot09_room_0Set_000500DL_002698 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_002698"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_002698[] = dspot09_room_0Set_000500DL_002698;
 
-#define dspot09_room_0Set_000500DL_008108 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_008108"
+#define dspot09_room_0Set_000500DL_008108 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_008108"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_008108[] = dspot09_room_0Set_000500DL_008108;
 
-#define dspot09_room_0Set_000500DL_002A70 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_002A70"
+#define dspot09_room_0Set_000500DL_002A70 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_002A70"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_002A70[] = dspot09_room_0Set_000500DL_002A70;
 
-#define dspot09_room_0Set_000500DL_002DA8 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_002DA8"
+#define dspot09_room_0Set_000500DL_002DA8 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_002DA8"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_002DA8[] = dspot09_room_0Set_000500DL_002DA8;
 
-#define dspot09_room_0Set_000500DL_0030D0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_0030D0"
+#define dspot09_room_0Set_000500DL_0030D0 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_0030D0"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_0030D0[] = dspot09_room_0Set_000500DL_0030D0;
 
-#define dspot09_room_0Set_000500DL_001550 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_001550"
+#define dspot09_room_0Set_000500DL_001550 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_001550"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_001550[] = dspot09_room_0Set_000500DL_001550;
 
-#define dspot09_room_0Set_000500DL_003308 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_003308"
+#define dspot09_room_0Set_000500DL_003308 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_003308"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_003308[] = dspot09_room_0Set_000500DL_003308;
 
-#define dspot09_room_0Set_000500DL_003630 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_003630"
+#define dspot09_room_0Set_000500DL_003630 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_003630"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_003630[] = dspot09_room_0Set_000500DL_003630;
 
-#define dspot09_room_0Set_000500DL_0017A0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_0017A0"
+#define dspot09_room_0Set_000500DL_0017A0 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_0017A0"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_0017A0[] = dspot09_room_0Set_000500DL_0017A0;
 
-#define dspot09_room_0Set_000500DL_001A40 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_001A40"
+#define dspot09_room_0Set_000500DL_001A40 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_001A40"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_001A40[] = dspot09_room_0Set_000500DL_001A40;
 
-#define dspot09_room_0Set_000500DL_006F88 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_006F88"
+#define dspot09_room_0Set_000500DL_006F88 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_006F88"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_006F88[] = dspot09_room_0Set_000500DL_006F88;
 
-#define dspot09_room_0Set_000500DL_001E98 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_001E98"
+#define dspot09_room_0Set_000500DL_001E98 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_001E98"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_001E98[] = dspot09_room_0Set_000500DL_001E98;
 
-#define dspot09_room_0Set_000500DL_001330 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_001330"
+#define dspot09_room_0Set_000500DL_001330 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_001330"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_001330[] = dspot09_room_0Set_000500DL_001330;
 
-#define dspot09_room_0Set_000500DL_007FF8 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_007FF8"
+#define dspot09_room_0Set_000500DL_007FF8 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_007FF8"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_007FF8[] = dspot09_room_0Set_000500DL_007FF8;
 
-#define dspot09_room_0Set_000500DL_008318 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_008318"
+#define dspot09_room_0Set_000500DL_008318 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_008318"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_008318[] = dspot09_room_0Set_000500DL_008318;
 
-#define dspot09_room_0Set_000500DL_005C68 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_005C68"
+#define dspot09_room_0Set_000500DL_005C68 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_005C68"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_005C68[] = dspot09_room_0Set_000500DL_005C68;
 
-#define dspot09_room_0Set_000500DL_005E80 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_005E80"
+#define dspot09_room_0Set_000500DL_005E80 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_005E80"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_005E80[] = dspot09_room_0Set_000500DL_005E80;
 
-#define dspot09_room_0Set_000500DL_0060C8 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_0060C8"
+#define dspot09_room_0Set_000500DL_0060C8 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_0060C8"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_0060C8[] = dspot09_room_0Set_000500DL_0060C8;
 
-#define dspot09_room_0Set_000500DL_006360 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_006360"
+#define dspot09_room_0Set_000500DL_006360 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_006360"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_006360[] = dspot09_room_0Set_000500DL_006360;
 
-#define dspot09_room_0Set_000500DL_0065C0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_0065C0"
+#define dspot09_room_0Set_000500DL_0065C0 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_0065C0"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_0065C0[] = dspot09_room_0Set_000500DL_0065C0;
 
-#define dspot09_room_0Set_000500DL_006888 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_006888"
+#define dspot09_room_0Set_000500DL_006888 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_006888"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_006888[] = dspot09_room_0Set_000500DL_006888;
 
-#define dspot09_room_0Set_000500DL_006C40 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_006C40"
+#define dspot09_room_0Set_000500DL_006C40 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_006C40"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_006C40[] = dspot09_room_0Set_000500DL_006C40;
 
-#define dspot09_room_0Set_000500DL_007530 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_007530"
+#define dspot09_room_0Set_000500DL_007530 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_007530"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_007530[] = dspot09_room_0Set_000500DL_007530;
 
-#define dspot09_room_0Set_000500DL_008698 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_008698"
+#define dspot09_room_0Set_000500DL_008698 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_008698"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_008698[] = dspot09_room_0Set_000500DL_008698;
 
-#define dspot09_room_0Set_000500DL_003C98 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_003C98"
+#define dspot09_room_0Set_000500DL_003C98 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_003C98"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_003C98[] = dspot09_room_0Set_000500DL_003C98;
 
-#define dspot09_room_0Set_000500DL_004540 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_004540"
+#define dspot09_room_0Set_000500DL_004540 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_004540"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_004540[] = dspot09_room_0Set_000500DL_004540;
 
-#define dspot09_room_0Set_000500DL_004C00 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_004C00"
+#define dspot09_room_0Set_000500DL_004C00 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_004C00"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_004C00[] = dspot09_room_0Set_000500DL_004C00;
 
-#define dspot09_room_0Set_000500DL_005128 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_005128"
+#define dspot09_room_0Set_000500DL_005128 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_005128"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_005128[] = dspot09_room_0Set_000500DL_005128;
 
-#define dspot09_room_0Set_000500DL_005598 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_005598"
+#define dspot09_room_0Set_000500DL_005598 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_005598"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_005598[] = dspot09_room_0Set_000500DL_005598;
 
-#define dspot09_room_0Set_000500DL_005A08 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000500DL_005A08"
+#define dspot09_room_0Set_000500DL_005A08 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000500DL_005A08"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000500DL_005A08[] = dspot09_room_0Set_000500DL_005A08;
 
-#define dspot09_room_0Set_000890DL_0084C0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_0084C0"
+#define dspot09_room_0Set_000890DL_0084C0 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_0084C0"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_0084C0[] = dspot09_room_0Set_000890DL_0084C0;
 
-#define dspot09_room_0Set_000890DL_002158 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_002158"
+#define dspot09_room_0Set_000890DL_002158 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_002158"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_002158[] = dspot09_room_0Set_000890DL_002158;
 
-#define dspot09_room_0Set_000890DL_002698 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_002698"
+#define dspot09_room_0Set_000890DL_002698 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_002698"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_002698[] = dspot09_room_0Set_000890DL_002698;
 
-#define dspot09_room_0Set_000890DL_008108 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_008108"
+#define dspot09_room_0Set_000890DL_008108 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_008108"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_008108[] = dspot09_room_0Set_000890DL_008108;
 
-#define dspot09_room_0Set_000890DL_002A70 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_002A70"
+#define dspot09_room_0Set_000890DL_002A70 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_002A70"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_002A70[] = dspot09_room_0Set_000890DL_002A70;
 
-#define dspot09_room_0Set_000890DL_002DA8 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_002DA8"
+#define dspot09_room_0Set_000890DL_002DA8 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_002DA8"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_002DA8[] = dspot09_room_0Set_000890DL_002DA8;
 
-#define dspot09_room_0Set_000890DL_0030D0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_0030D0"
+#define dspot09_room_0Set_000890DL_0030D0 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_0030D0"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_0030D0[] = dspot09_room_0Set_000890DL_0030D0;
 
-#define dspot09_room_0Set_000890DL_001550 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_001550"
+#define dspot09_room_0Set_000890DL_001550 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_001550"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_001550[] = dspot09_room_0Set_000890DL_001550;
 
-#define dspot09_room_0Set_000890DL_003308 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_003308"
+#define dspot09_room_0Set_000890DL_003308 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_003308"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_003308[] = dspot09_room_0Set_000890DL_003308;
 
-#define dspot09_room_0Set_000890DL_003630 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_003630"
+#define dspot09_room_0Set_000890DL_003630 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_003630"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_003630[] = dspot09_room_0Set_000890DL_003630;
 
-#define dspot09_room_0Set_000890DL_0017A0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_0017A0"
+#define dspot09_room_0Set_000890DL_0017A0 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_0017A0"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_0017A0[] = dspot09_room_0Set_000890DL_0017A0;
 
-#define dspot09_room_0Set_000890DL_001A40 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_001A40"
+#define dspot09_room_0Set_000890DL_001A40 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_001A40"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_001A40[] = dspot09_room_0Set_000890DL_001A40;
 
-#define dspot09_room_0Set_000890DL_006F88 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_006F88"
+#define dspot09_room_0Set_000890DL_006F88 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_006F88"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_006F88[] = dspot09_room_0Set_000890DL_006F88;
 
-#define dspot09_room_0Set_000890DL_001E98 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_001E98"
+#define dspot09_room_0Set_000890DL_001E98 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_001E98"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_001E98[] = dspot09_room_0Set_000890DL_001E98;
 
-#define dspot09_room_0Set_000890DL_001330 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_001330"
+#define dspot09_room_0Set_000890DL_001330 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_001330"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_001330[] = dspot09_room_0Set_000890DL_001330;
 
-#define dspot09_room_0Set_000890DL_007FF8 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_007FF8"
+#define dspot09_room_0Set_000890DL_007FF8 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_007FF8"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_007FF8[] = dspot09_room_0Set_000890DL_007FF8;
 
-#define dspot09_room_0Set_000890DL_008318 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_008318"
+#define dspot09_room_0Set_000890DL_008318 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_008318"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_008318[] = dspot09_room_0Set_000890DL_008318;
 
-#define dspot09_room_0Set_000890DL_005C68 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_005C68"
+#define dspot09_room_0Set_000890DL_005C68 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_005C68"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_005C68[] = dspot09_room_0Set_000890DL_005C68;
 
-#define dspot09_room_0Set_000890DL_005E80 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_005E80"
+#define dspot09_room_0Set_000890DL_005E80 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_005E80"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_005E80[] = dspot09_room_0Set_000890DL_005E80;
 
-#define dspot09_room_0Set_000890DL_0060C8 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_0060C8"
+#define dspot09_room_0Set_000890DL_0060C8 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_0060C8"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_0060C8[] = dspot09_room_0Set_000890DL_0060C8;
 
-#define dspot09_room_0Set_000890DL_006360 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_006360"
+#define dspot09_room_0Set_000890DL_006360 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_006360"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_006360[] = dspot09_room_0Set_000890DL_006360;
 
-#define dspot09_room_0Set_000890DL_0065C0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_0065C0"
+#define dspot09_room_0Set_000890DL_0065C0 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_0065C0"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_0065C0[] = dspot09_room_0Set_000890DL_0065C0;
 
-#define dspot09_room_0Set_000890DL_006888 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_006888"
+#define dspot09_room_0Set_000890DL_006888 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_006888"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_006888[] = dspot09_room_0Set_000890DL_006888;
 
-#define dspot09_room_0Set_000890DL_006C40 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_006C40"
+#define dspot09_room_0Set_000890DL_006C40 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_006C40"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_006C40[] = dspot09_room_0Set_000890DL_006C40;
 
-#define dspot09_room_0Set_000890DL_007530 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_007530"
+#define dspot09_room_0Set_000890DL_007530 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_007530"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_007530[] = dspot09_room_0Set_000890DL_007530;
 
-#define dspot09_room_0Set_000890DL_008698 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_008698"
+#define dspot09_room_0Set_000890DL_008698 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_008698"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_008698[] = dspot09_room_0Set_000890DL_008698;
 
-#define dspot09_room_0Set_000890DL_003C98 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_003C98"
+#define dspot09_room_0Set_000890DL_003C98 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_003C98"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_003C98[] = dspot09_room_0Set_000890DL_003C98;
 
-#define dspot09_room_0Set_000890DL_004540 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_004540"
+#define dspot09_room_0Set_000890DL_004540 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_004540"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_004540[] = dspot09_room_0Set_000890DL_004540;
 
-#define dspot09_room_0Set_000890DL_004C00 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_004C00"
+#define dspot09_room_0Set_000890DL_004C00 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_004C00"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_004C00[] = dspot09_room_0Set_000890DL_004C00;
 
-#define dspot09_room_0Set_000890DL_005128 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_005128"
+#define dspot09_room_0Set_000890DL_005128 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_005128"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_005128[] = dspot09_room_0Set_000890DL_005128;
 
-#define dspot09_room_0Set_000890DL_005598 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_005598"
+#define dspot09_room_0Set_000890DL_005598 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_005598"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_005598[] = dspot09_room_0Set_000890DL_005598;
 
-#define dspot09_room_0Set_000890DL_005A08 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000890DL_005A08"
+#define dspot09_room_0Set_000890DL_005A08 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000890DL_005A08"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000890DL_005A08[] = dspot09_room_0Set_000890DL_005A08;
 
-#define dspot09_room_0Set_000960DL_0084C0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_0084C0"
+#define dspot09_room_0Set_000960DL_0084C0 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_0084C0"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_0084C0[] = dspot09_room_0Set_000960DL_0084C0;
 
-#define dspot09_room_0Set_000960DL_002158 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_002158"
+#define dspot09_room_0Set_000960DL_002158 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_002158"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_002158[] = dspot09_room_0Set_000960DL_002158;
 
-#define dspot09_room_0Set_000960DL_002698 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_002698"
+#define dspot09_room_0Set_000960DL_002698 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_002698"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_002698[] = dspot09_room_0Set_000960DL_002698;
 
-#define dspot09_room_0Set_000960DL_008108 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_008108"
+#define dspot09_room_0Set_000960DL_008108 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_008108"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_008108[] = dspot09_room_0Set_000960DL_008108;
 
-#define dspot09_room_0Set_000960DL_002A70 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_002A70"
+#define dspot09_room_0Set_000960DL_002A70 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_002A70"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_002A70[] = dspot09_room_0Set_000960DL_002A70;
 
-#define dspot09_room_0Set_000960DL_002DA8 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_002DA8"
+#define dspot09_room_0Set_000960DL_002DA8 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_002DA8"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_002DA8[] = dspot09_room_0Set_000960DL_002DA8;
 
-#define dspot09_room_0Set_000960DL_0030D0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_0030D0"
+#define dspot09_room_0Set_000960DL_0030D0 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_0030D0"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_0030D0[] = dspot09_room_0Set_000960DL_0030D0;
 
-#define dspot09_room_0Set_000960DL_001550 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_001550"
+#define dspot09_room_0Set_000960DL_001550 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_001550"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_001550[] = dspot09_room_0Set_000960DL_001550;
 
-#define dspot09_room_0Set_000960DL_003308 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_003308"
+#define dspot09_room_0Set_000960DL_003308 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_003308"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_003308[] = dspot09_room_0Set_000960DL_003308;
 
-#define dspot09_room_0Set_000960DL_003630 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_003630"
+#define dspot09_room_0Set_000960DL_003630 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_003630"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_003630[] = dspot09_room_0Set_000960DL_003630;
 
-#define dspot09_room_0Set_000960DL_0017A0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_0017A0"
+#define dspot09_room_0Set_000960DL_0017A0 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_0017A0"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_0017A0[] = dspot09_room_0Set_000960DL_0017A0;
 
-#define dspot09_room_0Set_000960DL_001A40 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_001A40"
+#define dspot09_room_0Set_000960DL_001A40 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_001A40"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_001A40[] = dspot09_room_0Set_000960DL_001A40;
 
-#define dspot09_room_0Set_000960DL_006F88 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_006F88"
+#define dspot09_room_0Set_000960DL_006F88 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_006F88"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_006F88[] = dspot09_room_0Set_000960DL_006F88;
 
-#define dspot09_room_0Set_000960DL_001E98 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_001E98"
+#define dspot09_room_0Set_000960DL_001E98 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_001E98"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_001E98[] = dspot09_room_0Set_000960DL_001E98;
 
-#define dspot09_room_0Set_000960DL_001330 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_001330"
+#define dspot09_room_0Set_000960DL_001330 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_001330"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_001330[] = dspot09_room_0Set_000960DL_001330;
 
-#define dspot09_room_0Set_000960DL_007FF8 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_007FF8"
+#define dspot09_room_0Set_000960DL_007FF8 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_007FF8"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_007FF8[] = dspot09_room_0Set_000960DL_007FF8;
 
-#define dspot09_room_0Set_000960DL_008318 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_008318"
+#define dspot09_room_0Set_000960DL_008318 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_008318"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_008318[] = dspot09_room_0Set_000960DL_008318;
 
-#define dspot09_room_0Set_000960DL_005C68 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_005C68"
+#define dspot09_room_0Set_000960DL_005C68 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_005C68"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_005C68[] = dspot09_room_0Set_000960DL_005C68;
 
-#define dspot09_room_0Set_000960DL_005E80 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_005E80"
+#define dspot09_room_0Set_000960DL_005E80 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_005E80"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_005E80[] = dspot09_room_0Set_000960DL_005E80;
 
-#define dspot09_room_0Set_000960DL_0060C8 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_0060C8"
+#define dspot09_room_0Set_000960DL_0060C8 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_0060C8"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_0060C8[] = dspot09_room_0Set_000960DL_0060C8;
 
-#define dspot09_room_0Set_000960DL_006360 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_006360"
+#define dspot09_room_0Set_000960DL_006360 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_006360"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_006360[] = dspot09_room_0Set_000960DL_006360;
 
-#define dspot09_room_0Set_000960DL_0065C0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_0065C0"
+#define dspot09_room_0Set_000960DL_0065C0 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_0065C0"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_0065C0[] = dspot09_room_0Set_000960DL_0065C0;
 
-#define dspot09_room_0Set_000960DL_006888 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_006888"
+#define dspot09_room_0Set_000960DL_006888 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_006888"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_006888[] = dspot09_room_0Set_000960DL_006888;
 
-#define dspot09_room_0Set_000960DL_006C40 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_006C40"
+#define dspot09_room_0Set_000960DL_006C40 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_006C40"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_006C40[] = dspot09_room_0Set_000960DL_006C40;
 
-#define dspot09_room_0Set_000960DL_007530 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_007530"
+#define dspot09_room_0Set_000960DL_007530 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_007530"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_007530[] = dspot09_room_0Set_000960DL_007530;
 
-#define dspot09_room_0Set_000960DL_008698 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_008698"
+#define dspot09_room_0Set_000960DL_008698 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_008698"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_008698[] = dspot09_room_0Set_000960DL_008698;
 
-#define dspot09_room_0Set_000960DL_003C98 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_003C98"
+#define dspot09_room_0Set_000960DL_003C98 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_003C98"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_003C98[] = dspot09_room_0Set_000960DL_003C98;
 
-#define dspot09_room_0Set_000960DL_004540 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_004540"
+#define dspot09_room_0Set_000960DL_004540 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_004540"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_004540[] = dspot09_room_0Set_000960DL_004540;
 
-#define dspot09_room_0Set_000960DL_004C00 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_004C00"
+#define dspot09_room_0Set_000960DL_004C00 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_004C00"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_004C00[] = dspot09_room_0Set_000960DL_004C00;
 
-#define dspot09_room_0Set_000960DL_005128 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_005128"
+#define dspot09_room_0Set_000960DL_005128 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_005128"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_005128[] = dspot09_room_0Set_000960DL_005128;
 
-#define dspot09_room_0Set_000960DL_005598 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_005598"
+#define dspot09_room_0Set_000960DL_005598 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_005598"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_005598[] = dspot09_room_0Set_000960DL_005598;
 
-#define dspot09_room_0Set_000960DL_005A08 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000960DL_005A08"
+#define dspot09_room_0Set_000960DL_005A08 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000960DL_005A08"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000960DL_005A08[] = dspot09_room_0Set_000960DL_005A08;
 
-#define dspot09_room_0Set_000A80DL_0084C0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_0084C0"
+#define dspot09_room_0Set_000A80DL_0084C0 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_0084C0"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_0084C0[] = dspot09_room_0Set_000A80DL_0084C0;
 
-#define dspot09_room_0Set_000A80DL_002158 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_002158"
+#define dspot09_room_0Set_000A80DL_002158 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_002158"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_002158[] = dspot09_room_0Set_000A80DL_002158;
 
-#define dspot09_room_0Set_000A80DL_002698 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_002698"
+#define dspot09_room_0Set_000A80DL_002698 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_002698"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_002698[] = dspot09_room_0Set_000A80DL_002698;
 
-#define dspot09_room_0Set_000A80DL_008108 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_008108"
+#define dspot09_room_0Set_000A80DL_008108 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_008108"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_008108[] = dspot09_room_0Set_000A80DL_008108;
 
-#define dspot09_room_0Set_000A80DL_002A70 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_002A70"
+#define dspot09_room_0Set_000A80DL_002A70 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_002A70"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_002A70[] = dspot09_room_0Set_000A80DL_002A70;
 
-#define dspot09_room_0Set_000A80DL_002DA8 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_002DA8"
+#define dspot09_room_0Set_000A80DL_002DA8 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_002DA8"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_002DA8[] = dspot09_room_0Set_000A80DL_002DA8;
 
-#define dspot09_room_0Set_000A80DL_0030D0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_0030D0"
+#define dspot09_room_0Set_000A80DL_0030D0 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_0030D0"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_0030D0[] = dspot09_room_0Set_000A80DL_0030D0;
 
-#define dspot09_room_0Set_000A80DL_001550 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_001550"
+#define dspot09_room_0Set_000A80DL_001550 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_001550"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_001550[] = dspot09_room_0Set_000A80DL_001550;
 
-#define dspot09_room_0Set_000A80DL_003308 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_003308"
+#define dspot09_room_0Set_000A80DL_003308 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_003308"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_003308[] = dspot09_room_0Set_000A80DL_003308;
 
-#define dspot09_room_0Set_000A80DL_003630 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_003630"
+#define dspot09_room_0Set_000A80DL_003630 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_003630"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_003630[] = dspot09_room_0Set_000A80DL_003630;
 
-#define dspot09_room_0Set_000A80DL_0017A0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_0017A0"
+#define dspot09_room_0Set_000A80DL_0017A0 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_0017A0"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_0017A0[] = dspot09_room_0Set_000A80DL_0017A0;
 
-#define dspot09_room_0Set_000A80DL_001A40 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_001A40"
+#define dspot09_room_0Set_000A80DL_001A40 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_001A40"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_001A40[] = dspot09_room_0Set_000A80DL_001A40;
 
-#define dspot09_room_0Set_000A80DL_006F88 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_006F88"
+#define dspot09_room_0Set_000A80DL_006F88 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_006F88"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_006F88[] = dspot09_room_0Set_000A80DL_006F88;
 
-#define dspot09_room_0Set_000A80DL_001E98 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_001E98"
+#define dspot09_room_0Set_000A80DL_001E98 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_001E98"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_001E98[] = dspot09_room_0Set_000A80DL_001E98;
 
-#define dspot09_room_0Set_000A80DL_001330 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_001330"
+#define dspot09_room_0Set_000A80DL_001330 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_001330"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_001330[] = dspot09_room_0Set_000A80DL_001330;
 
-#define dspot09_room_0Set_000A80DL_007FF8 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_007FF8"
+#define dspot09_room_0Set_000A80DL_007FF8 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_007FF8"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_007FF8[] = dspot09_room_0Set_000A80DL_007FF8;
 
-#define dspot09_room_0Set_000A80DL_008318 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_008318"
+#define dspot09_room_0Set_000A80DL_008318 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_008318"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_008318[] = dspot09_room_0Set_000A80DL_008318;
 
-#define dspot09_room_0Set_000A80DL_005C68 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_005C68"
+#define dspot09_room_0Set_000A80DL_005C68 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_005C68"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_005C68[] = dspot09_room_0Set_000A80DL_005C68;
 
-#define dspot09_room_0Set_000A80DL_005E80 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_005E80"
+#define dspot09_room_0Set_000A80DL_005E80 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_005E80"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_005E80[] = dspot09_room_0Set_000A80DL_005E80;
 
-#define dspot09_room_0Set_000A80DL_0060C8 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_0060C8"
+#define dspot09_room_0Set_000A80DL_0060C8 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_0060C8"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_0060C8[] = dspot09_room_0Set_000A80DL_0060C8;
 
-#define dspot09_room_0Set_000A80DL_006360 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_006360"
+#define dspot09_room_0Set_000A80DL_006360 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_006360"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_006360[] = dspot09_room_0Set_000A80DL_006360;
 
-#define dspot09_room_0Set_000A80DL_0065C0 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_0065C0"
+#define dspot09_room_0Set_000A80DL_0065C0 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_0065C0"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_0065C0[] = dspot09_room_0Set_000A80DL_0065C0;
 
-#define dspot09_room_0Set_000A80DL_006888 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_006888"
+#define dspot09_room_0Set_000A80DL_006888 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_006888"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_006888[] = dspot09_room_0Set_000A80DL_006888;
 
-#define dspot09_room_0Set_000A80DL_006C40 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_006C40"
+#define dspot09_room_0Set_000A80DL_006C40 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_006C40"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_006C40[] = dspot09_room_0Set_000A80DL_006C40;
 
-#define dspot09_room_0Set_000A80DL_007530 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_007530"
+#define dspot09_room_0Set_000A80DL_007530 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_007530"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_007530[] = dspot09_room_0Set_000A80DL_007530;
 
-#define dspot09_room_0Set_000A80DL_008698 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_008698"
+#define dspot09_room_0Set_000A80DL_008698 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_008698"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_008698[] = dspot09_room_0Set_000A80DL_008698;
 
-#define dspot09_room_0Set_000A80DL_003C98 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_003C98"
+#define dspot09_room_0Set_000A80DL_003C98 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_003C98"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_003C98[] = dspot09_room_0Set_000A80DL_003C98;
 
-#define dspot09_room_0Set_000A80DL_004540 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_004540"
+#define dspot09_room_0Set_000A80DL_004540 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_004540"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_004540[] = dspot09_room_0Set_000A80DL_004540;
 
-#define dspot09_room_0Set_000A80DL_004C00 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_004C00"
+#define dspot09_room_0Set_000A80DL_004C00 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_004C00"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_004C00[] = dspot09_room_0Set_000A80DL_004C00;
 
-#define dspot09_room_0Set_000A80DL_005128 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_005128"
+#define dspot09_room_0Set_000A80DL_005128 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_005128"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_005128[] = dspot09_room_0Set_000A80DL_005128;
 
-#define dspot09_room_0Set_000A80DL_005598 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_005598"
+#define dspot09_room_0Set_000A80DL_005598 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_005598"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_005598[] = dspot09_room_0Set_000A80DL_005598;
 
-#define dspot09_room_0Set_000A80DL_005A08 "__OTR__scenes/nonmq/spot09_scene/spot09_room_0Set_000A80DL_005A08"
+#define dspot09_room_0Set_000A80DL_005A08 "__OTR__scenes/shared/spot09_scene/spot09_room_0Set_000A80DL_005A08"
 static const ALIGN_ASSET(2) char spot09_room_0Set_000A80DL_005A08[] = dspot09_room_0Set_000A80DL_005A08;
 
 
diff --git a/soh/assets/scenes/overworld/spot09/spot09_scene.h b/soh/assets/scenes/overworld/spot09/spot09_scene.h
index faf5e298a..8b81e3db3 100644
--- a/soh/assets/scenes/overworld/spot09/spot09_scene.h
+++ b/soh/assets/scenes/overworld/spot09/spot09_scene.h
@@ -3,88 +3,88 @@
 
 #include "align_asset_macro.h"
 
-#define dgGerudoValleyBridgeJumpFieldFortressCs "__OTR__scenes/nonmq/spot09_scene/gGerudoValleyBridgeJumpFieldFortressCs"
-static const ALIGN_ASSET(2) char gGerudoValleyBridgeJumpFieldFortressCs[] = dgGerudoValleyBridgeJumpFieldFortressCs;
-
-#define dgGerudoValleyBridgeJumpFortressToFieldCs "__OTR__scenes/nonmq/spot09_scene/gGerudoValleyBridgeJumpFortressToFieldCs"
-static const ALIGN_ASSET(2) char gGerudoValleyBridgeJumpFortressToFieldCs[] = dgGerudoValleyBridgeJumpFortressToFieldCs;
-
-#define dgGerudoValleyIntroCs "__OTR__scenes/nonmq/spot09_scene/gGerudoValleyIntroCs"
-static const ALIGN_ASSET(2) char gGerudoValleyIntroCs[] = dgGerudoValleyIntroCs;
-
-#define dspot09_sceneCollisionHeader_002128 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneCollisionHeader_002128"
-static const ALIGN_ASSET(2) char spot09_sceneCollisionHeader_002128[] = dspot09_sceneCollisionHeader_002128;
-
-#define dspot09_sceneTex_006D60 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_006D60"
-static const ALIGN_ASSET(2) char spot09_sceneTex_006D60[] = dspot09_sceneTex_006D60;
-
-#define dspot09_sceneTex_009160 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_009160"
-static const ALIGN_ASSET(2) char spot09_sceneTex_009160[] = dspot09_sceneTex_009160;
-
-#define dspot09_sceneTex_00F960 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_00F960"
-static const ALIGN_ASSET(2) char spot09_sceneTex_00F960[] = dspot09_sceneTex_00F960;
-
-#define dspot09_sceneTex_00D160 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_00D160"
-static const ALIGN_ASSET(2) char spot09_sceneTex_00D160[] = dspot09_sceneTex_00D160;
-
-#define dspot09_sceneTex_006C60 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_006C60"
-static const ALIGN_ASSET(2) char spot09_sceneTex_006C60[] = dspot09_sceneTex_006C60;
-
-#define dspot09_sceneTex_007160 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_007160"
-static const ALIGN_ASSET(2) char spot09_sceneTex_007160[] = dspot09_sceneTex_007160;
-
-#define dspot09_sceneTex_00A960 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_00A960"
-static const ALIGN_ASSET(2) char spot09_sceneTex_00A960[] = dspot09_sceneTex_00A960;
-
-#define dspot09_sceneTex_004460 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_004460"
-static const ALIGN_ASSET(2) char spot09_sceneTex_004460[] = dspot09_sceneTex_004460;
-
-#define dspot09_sceneTex_008160 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_008160"
-static const ALIGN_ASSET(2) char spot09_sceneTex_008160[] = dspot09_sceneTex_008160;
-
-#define dspot09_sceneTex_00C160 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_00C160"
-static const ALIGN_ASSET(2) char spot09_sceneTex_00C160[] = dspot09_sceneTex_00C160;
-
-#define dspot09_sceneTex_005C60 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_005C60"
-static const ALIGN_ASSET(2) char spot09_sceneTex_005C60[] = dspot09_sceneTex_005C60;
-
-#define dspot09_sceneTex_006460 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_006460"
-static const ALIGN_ASSET(2) char spot09_sceneTex_006460[] = dspot09_sceneTex_006460;
-
-#define dspot09_sceneTex_00B960 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_00B960"
-static const ALIGN_ASSET(2) char spot09_sceneTex_00B960[] = dspot09_sceneTex_00B960;
-
-#define dspot09_sceneTex_010960 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_010960"
-static const ALIGN_ASSET(2) char spot09_sceneTex_010960[] = dspot09_sceneTex_010960;
-
-#define dspot09_sceneTex_00A160 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_00A160"
-static const ALIGN_ASSET(2) char spot09_sceneTex_00A160[] = dspot09_sceneTex_00A160;
-
-#define dspot09_sceneTex_00E160 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_00E160"
-static const ALIGN_ASSET(2) char spot09_sceneTex_00E160[] = dspot09_sceneTex_00E160;
-
-#define dspot09_sceneTex_00F160 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_00F160"
-static const ALIGN_ASSET(2) char spot09_sceneTex_00F160[] = dspot09_sceneTex_00F160;
-
-#define dspot09_sceneTex_00E960 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_00E960"
-static const ALIGN_ASSET(2) char spot09_sceneTex_00E960[] = dspot09_sceneTex_00E960;
-
-#define dspot09_sceneTex_005460 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_005460"
-static const ALIGN_ASSET(2) char spot09_sceneTex_005460[] = dspot09_sceneTex_005460;
-
-#define dspot09_sceneTLUT_003440 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTLUT_003440"
-static const ALIGN_ASSET(2) char spot09_sceneTLUT_003440[] = dspot09_sceneTLUT_003440;
-
-#define dspot09_sceneTex_003460 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneTex_003460"
+#define dspot09_sceneTex_003460 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_003460"
 static const ALIGN_ASSET(2) char spot09_sceneTex_003460[] = dspot09_sceneTex_003460;
 
-#define dspot09_sceneCollisionHeader_002128 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneCollisionHeader_002128"
+#define dspot09_sceneTex_004460 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_004460"
+static const ALIGN_ASSET(2) char spot09_sceneTex_004460[] = dspot09_sceneTex_004460;
 
-#define dspot09_sceneCollisionHeader_002128 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneCollisionHeader_002128"
+#define dspot09_sceneTex_005460 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_005460"
+static const ALIGN_ASSET(2) char spot09_sceneTex_005460[] = dspot09_sceneTex_005460;
 
-#define dspot09_sceneCollisionHeader_002128 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneCollisionHeader_002128"
+#define dspot09_sceneTex_005C60 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_005C60"
+static const ALIGN_ASSET(2) char spot09_sceneTex_005C60[] = dspot09_sceneTex_005C60;
 
-#define dspot09_sceneCollisionHeader_002128 "__OTR__scenes/nonmq/spot09_scene/spot09_sceneCollisionHeader_002128"
+#define dspot09_sceneTex_006460 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_006460"
+static const ALIGN_ASSET(2) char spot09_sceneTex_006460[] = dspot09_sceneTex_006460;
+
+#define dspot09_sceneTex_006C60 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_006C60"
+static const ALIGN_ASSET(2) char spot09_sceneTex_006C60[] = dspot09_sceneTex_006C60;
+
+#define dspot09_sceneTex_006D60 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_006D60"
+static const ALIGN_ASSET(2) char spot09_sceneTex_006D60[] = dspot09_sceneTex_006D60;
+
+#define dspot09_sceneTex_007160 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_007160"
+static const ALIGN_ASSET(2) char spot09_sceneTex_007160[] = dspot09_sceneTex_007160;
+
+#define dspot09_sceneTex_008160 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_008160"
+static const ALIGN_ASSET(2) char spot09_sceneTex_008160[] = dspot09_sceneTex_008160;
+
+#define dspot09_sceneTex_009160 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_009160"
+static const ALIGN_ASSET(2) char spot09_sceneTex_009160[] = dspot09_sceneTex_009160;
+
+#define dspot09_sceneTex_00A160 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_00A160"
+static const ALIGN_ASSET(2) char spot09_sceneTex_00A160[] = dspot09_sceneTex_00A160;
+
+#define dspot09_sceneTex_00A960 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_00A960"
+static const ALIGN_ASSET(2) char spot09_sceneTex_00A960[] = dspot09_sceneTex_00A960;
+
+#define dspot09_sceneTex_00B960 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_00B960"
+static const ALIGN_ASSET(2) char spot09_sceneTex_00B960[] = dspot09_sceneTex_00B960;
+
+#define dspot09_sceneTex_00C160 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_00C160"
+static const ALIGN_ASSET(2) char spot09_sceneTex_00C160[] = dspot09_sceneTex_00C160;
+
+#define dspot09_sceneTex_00D160 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_00D160"
+static const ALIGN_ASSET(2) char spot09_sceneTex_00D160[] = dspot09_sceneTex_00D160;
+
+#define dspot09_sceneTex_00E160 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_00E160"
+static const ALIGN_ASSET(2) char spot09_sceneTex_00E160[] = dspot09_sceneTex_00E160;
+
+#define dspot09_sceneTex_00E960 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_00E960"
+static const ALIGN_ASSET(2) char spot09_sceneTex_00E960[] = dspot09_sceneTex_00E960;
+
+#define dspot09_sceneTex_00F160 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_00F160"
+static const ALIGN_ASSET(2) char spot09_sceneTex_00F160[] = dspot09_sceneTex_00F160;
+
+#define dspot09_sceneTex_00F960 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_00F960"
+static const ALIGN_ASSET(2) char spot09_sceneTex_00F960[] = dspot09_sceneTex_00F960;
+
+#define dspot09_sceneTex_010960 "__OTR__scenes/shared/spot09_scene/spot09_sceneTex_010960"
+static const ALIGN_ASSET(2) char spot09_sceneTex_010960[] = dspot09_sceneTex_010960;
+
+#define dspot09_sceneTLUT_003440 "__OTR__scenes/shared/spot09_scene/spot09_sceneTLUT_003440"
+static const ALIGN_ASSET(2) char spot09_sceneTLUT_003440[] = dspot09_sceneTLUT_003440;
+
+#define dgGerudoValleyBridgeJumpFieldFortressCs "__OTR__scenes/shared/spot09_scene/gGerudoValleyBridgeJumpFieldFortressCs"
+static const ALIGN_ASSET(2) char gGerudoValleyBridgeJumpFieldFortressCs[] = dgGerudoValleyBridgeJumpFieldFortressCs;
+
+#define dgGerudoValleyBridgeJumpFortressToFieldCs "__OTR__scenes/shared/spot09_scene/gGerudoValleyBridgeJumpFortressToFieldCs"
+static const ALIGN_ASSET(2) char gGerudoValleyBridgeJumpFortressToFieldCs[] = dgGerudoValleyBridgeJumpFortressToFieldCs;
+
+#define dgGerudoValleyIntroCs "__OTR__scenes/shared/spot09_scene/gGerudoValleyIntroCs"
+static const ALIGN_ASSET(2) char gGerudoValleyIntroCs[] = dgGerudoValleyIntroCs;
+
+#define dspot09_sceneCollisionHeader_002128 "__OTR__scenes/shared/spot09_scene/spot09_sceneCollisionHeader_002128"
+static const ALIGN_ASSET(2) char spot09_sceneCollisionHeader_002128[] = dspot09_sceneCollisionHeader_002128;
+
+#define dspot09_sceneCollisionHeader_002128 "__OTR__scenes/shared/spot09_scene/spot09_sceneCollisionHeader_002128"
+
+#define dspot09_sceneCollisionHeader_002128 "__OTR__scenes/shared/spot09_scene/spot09_sceneCollisionHeader_002128"
+
+#define dspot09_sceneCollisionHeader_002128 "__OTR__scenes/shared/spot09_scene/spot09_sceneCollisionHeader_002128"
+
+#define dspot09_sceneCollisionHeader_002128 "__OTR__scenes/shared/spot09_scene/spot09_sceneCollisionHeader_002128"
 
 
 #endif // OVERWORLD_SPOT09_SCENE_H
diff --git a/soh/assets/scenes/overworld/spot10/spot10_room_0.h b/soh/assets/scenes/overworld/spot10/spot10_room_0.h
index 7a299efbc..3b5d66354 100644
--- a/soh/assets/scenes/overworld/spot10/spot10_room_0.h
+++ b/soh/assets/scenes/overworld/spot10/spot10_room_0.h
@@ -3,13 +3,13 @@
 
 #include "align_asset_macro.h"
 
-#define dspot10_room_0DL_0025B0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_0DL_0025B0"
+#define dspot10_room_0DL_0025B0 "__OTR__scenes/shared/spot10_scene/spot10_room_0DL_0025B0"
 static const ALIGN_ASSET(2) char spot10_room_0DL_0025B0[] = dspot10_room_0DL_0025B0;
 
-#define dspot10_room_0Set_0000B0DL_0025B0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_0Set_0000B0DL_0025B0"
+#define dspot10_room_0Set_0000B0DL_0025B0 "__OTR__scenes/shared/spot10_scene/spot10_room_0Set_0000B0DL_0025B0"
 static const ALIGN_ASSET(2) char spot10_room_0Set_0000B0DL_0025B0[] = dspot10_room_0Set_0000B0DL_0025B0;
 
-#define dspot10_room_0Set_000130DL_0025B0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_0Set_000130DL_0025B0"
+#define dspot10_room_0Set_000130DL_0025B0 "__OTR__scenes/shared/spot10_scene/spot10_room_0Set_000130DL_0025B0"
 static const ALIGN_ASSET(2) char spot10_room_0Set_000130DL_0025B0[] = dspot10_room_0Set_000130DL_0025B0;
 
 
diff --git a/soh/assets/scenes/overworld/spot10/spot10_room_1.h b/soh/assets/scenes/overworld/spot10/spot10_room_1.h
index 9f507333f..0fa0c6bb1 100644
--- a/soh/assets/scenes/overworld/spot10/spot10_room_1.h
+++ b/soh/assets/scenes/overworld/spot10/spot10_room_1.h
@@ -3,49 +3,49 @@
 
 #include "align_asset_macro.h"
 
-#define dspot10_room_1DL_003B48 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1DL_003B48"
-static const ALIGN_ASSET(2) char spot10_room_1DL_003B48[] = dspot10_room_1DL_003B48;
-
-#define dspot10_room_1Tex_003FA0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Tex_003FA0"
-static const ALIGN_ASSET(2) char spot10_room_1Tex_003FA0[] = dspot10_room_1Tex_003FA0;
-
-#define dspot10_room_1Tex_003BA0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Tex_003BA0"
+#define dspot10_room_1Tex_003BA0 "__OTR__scenes/shared/spot10_scene/spot10_room_1Tex_003BA0"
 static const ALIGN_ASSET(2) char spot10_room_1Tex_003BA0[] = dspot10_room_1Tex_003BA0;
 
-#define dspot10_room_1Tex_005FA0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Tex_005FA0"
-static const ALIGN_ASSET(2) char spot10_room_1Tex_005FA0[] = dspot10_room_1Tex_005FA0;
+#define dspot10_room_1Tex_003FA0 "__OTR__scenes/shared/spot10_scene/spot10_room_1Tex_003FA0"
+static const ALIGN_ASSET(2) char spot10_room_1Tex_003FA0[] = dspot10_room_1Tex_003FA0;
 
-#define dspot10_room_1Tex_0067A0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Tex_0067A0"
-static const ALIGN_ASSET(2) char spot10_room_1Tex_0067A0[] = dspot10_room_1Tex_0067A0;
-
-#define dspot10_room_1Tex_006FA0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Tex_006FA0"
-static const ALIGN_ASSET(2) char spot10_room_1Tex_006FA0[] = dspot10_room_1Tex_006FA0;
-
-#define dspot10_room_1Tex_004FA0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Tex_004FA0"
-static const ALIGN_ASSET(2) char spot10_room_1Tex_004FA0[] = dspot10_room_1Tex_004FA0;
-
-#define dspot10_room_1Tex_0047A0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Tex_0047A0"
+#define dspot10_room_1Tex_0047A0 "__OTR__scenes/shared/spot10_scene/spot10_room_1Tex_0047A0"
 static const ALIGN_ASSET(2) char spot10_room_1Tex_0047A0[] = dspot10_room_1Tex_0047A0;
 
-#define dspot10_room_1DL_007C18 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1DL_007C18"
-static const ALIGN_ASSET(2) char spot10_room_1DL_007C18[] = dspot10_room_1DL_007C18;
+#define dspot10_room_1Tex_004FA0 "__OTR__scenes/shared/spot10_scene/spot10_room_1Tex_004FA0"
+static const ALIGN_ASSET(2) char spot10_room_1Tex_004FA0[] = dspot10_room_1Tex_004FA0;
 
-#define dspot10_room_1Tex_008030 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Tex_008030"
-static const ALIGN_ASSET(2) char spot10_room_1Tex_008030[] = dspot10_room_1Tex_008030;
+#define dspot10_room_1Tex_005FA0 "__OTR__scenes/shared/spot10_scene/spot10_room_1Tex_005FA0"
+static const ALIGN_ASSET(2) char spot10_room_1Tex_005FA0[] = dspot10_room_1Tex_005FA0;
 
-#define dspot10_room_1Tex_007C30 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Tex_007C30"
+#define dspot10_room_1Tex_0067A0 "__OTR__scenes/shared/spot10_scene/spot10_room_1Tex_0067A0"
+static const ALIGN_ASSET(2) char spot10_room_1Tex_0067A0[] = dspot10_room_1Tex_0067A0;
+
+#define dspot10_room_1Tex_006FA0 "__OTR__scenes/shared/spot10_scene/spot10_room_1Tex_006FA0"
+static const ALIGN_ASSET(2) char spot10_room_1Tex_006FA0[] = dspot10_room_1Tex_006FA0;
+
+#define dspot10_room_1Tex_007C30 "__OTR__scenes/shared/spot10_scene/spot10_room_1Tex_007C30"
 static const ALIGN_ASSET(2) char spot10_room_1Tex_007C30[] = dspot10_room_1Tex_007C30;
 
-#define dspot10_room_1Set_000110DL_003B48 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Set_000110DL_003B48"
+#define dspot10_room_1Tex_008030 "__OTR__scenes/shared/spot10_scene/spot10_room_1Tex_008030"
+static const ALIGN_ASSET(2) char spot10_room_1Tex_008030[] = dspot10_room_1Tex_008030;
+
+#define dspot10_room_1DL_003B48 "__OTR__scenes/shared/spot10_scene/spot10_room_1DL_003B48"
+static const ALIGN_ASSET(2) char spot10_room_1DL_003B48[] = dspot10_room_1DL_003B48;
+
+#define dspot10_room_1DL_007C18 "__OTR__scenes/shared/spot10_scene/spot10_room_1DL_007C18"
+static const ALIGN_ASSET(2) char spot10_room_1DL_007C18[] = dspot10_room_1DL_007C18;
+
+#define dspot10_room_1Set_000110DL_003B48 "__OTR__scenes/shared/spot10_scene/spot10_room_1Set_000110DL_003B48"
 static const ALIGN_ASSET(2) char spot10_room_1Set_000110DL_003B48[] = dspot10_room_1Set_000110DL_003B48;
 
-#define dspot10_room_1Set_000110DL_007C18 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Set_000110DL_007C18"
+#define dspot10_room_1Set_000110DL_007C18 "__OTR__scenes/shared/spot10_scene/spot10_room_1Set_000110DL_007C18"
 static const ALIGN_ASSET(2) char spot10_room_1Set_000110DL_007C18[] = dspot10_room_1Set_000110DL_007C18;
 
-#define dspot10_room_1Set_0001A0DL_003B48 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Set_0001A0DL_003B48"
+#define dspot10_room_1Set_0001A0DL_003B48 "__OTR__scenes/shared/spot10_scene/spot10_room_1Set_0001A0DL_003B48"
 static const ALIGN_ASSET(2) char spot10_room_1Set_0001A0DL_003B48[] = dspot10_room_1Set_0001A0DL_003B48;
 
-#define dspot10_room_1Set_0001A0DL_007C18 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Set_0001A0DL_007C18"
+#define dspot10_room_1Set_0001A0DL_007C18 "__OTR__scenes/shared/spot10_scene/spot10_room_1Set_0001A0DL_007C18"
 static const ALIGN_ASSET(2) char spot10_room_1Set_0001A0DL_007C18[] = dspot10_room_1Set_0001A0DL_007C18;
 
 
diff --git a/soh/assets/scenes/overworld/spot10/spot10_room_2.h b/soh/assets/scenes/overworld/spot10/spot10_room_2.h
index 3ccc4dd3d..bba64ebd2 100644
--- a/soh/assets/scenes/overworld/spot10/spot10_room_2.h
+++ b/soh/assets/scenes/overworld/spot10/spot10_room_2.h
@@ -3,22 +3,22 @@
 
 #include "align_asset_macro.h"
 
-#define dspot10_room_2DL_0023B0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_2DL_0023B0"
-static const ALIGN_ASSET(2) char spot10_room_2DL_0023B0[] = dspot10_room_2DL_0023B0;
-
-#define dspot10_room_2Tex_0043E8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_2Tex_0043E8"
-static const ALIGN_ASSET(2) char spot10_room_2Tex_0043E8[] = dspot10_room_2Tex_0043E8;
-
-#define dspot10_room_2Tex_0023E8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_2Tex_0023E8"
+#define dspot10_room_2Tex_0023E8 "__OTR__scenes/shared/spot10_scene/spot10_room_2Tex_0023E8"
 static const ALIGN_ASSET(2) char spot10_room_2Tex_0023E8[] = dspot10_room_2Tex_0023E8;
 
-#define dspot10_room_2Tex_0033E8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_2Tex_0033E8"
+#define dspot10_room_2Tex_0033E8 "__OTR__scenes/shared/spot10_scene/spot10_room_2Tex_0033E8"
 static const ALIGN_ASSET(2) char spot10_room_2Tex_0033E8[] = dspot10_room_2Tex_0033E8;
 
-#define dspot10_room_2Set_000110DL_0023B0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_2Set_000110DL_0023B0"
+#define dspot10_room_2Tex_0043E8 "__OTR__scenes/shared/spot10_scene/spot10_room_2Tex_0043E8"
+static const ALIGN_ASSET(2) char spot10_room_2Tex_0043E8[] = dspot10_room_2Tex_0043E8;
+
+#define dspot10_room_2DL_0023B0 "__OTR__scenes/shared/spot10_scene/spot10_room_2DL_0023B0"
+static const ALIGN_ASSET(2) char spot10_room_2DL_0023B0[] = dspot10_room_2DL_0023B0;
+
+#define dspot10_room_2Set_000110DL_0023B0 "__OTR__scenes/shared/spot10_scene/spot10_room_2Set_000110DL_0023B0"
 static const ALIGN_ASSET(2) char spot10_room_2Set_000110DL_0023B0[] = dspot10_room_2Set_000110DL_0023B0;
 
-#define dspot10_room_2Set_0001F0DL_0023B0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_2Set_0001F0DL_0023B0"
+#define dspot10_room_2Set_0001F0DL_0023B0 "__OTR__scenes/shared/spot10_scene/spot10_room_2Set_0001F0DL_0023B0"
 static const ALIGN_ASSET(2) char spot10_room_2Set_0001F0DL_0023B0[] = dspot10_room_2Set_0001F0DL_0023B0;
 
 
diff --git a/soh/assets/scenes/overworld/spot10/spot10_room_3.h b/soh/assets/scenes/overworld/spot10/spot10_room_3.h
index b21990ad1..0a20d1ed7 100644
--- a/soh/assets/scenes/overworld/spot10/spot10_room_3.h
+++ b/soh/assets/scenes/overworld/spot10/spot10_room_3.h
@@ -3,34 +3,34 @@
 
 #include "align_asset_macro.h"
 
-#define dspot10_room_3DL_0028C0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_3DL_0028C0"
-static const ALIGN_ASSET(2) char spot10_room_3DL_0028C0[] = dspot10_room_3DL_0028C0;
-
-#define dspot10_room_3Tex_0038F8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_3Tex_0038F8"
-static const ALIGN_ASSET(2) char spot10_room_3Tex_0038F8[] = dspot10_room_3Tex_0038F8;
-
-#define dspot10_room_3Tex_0028F8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_3Tex_0028F8"
+#define dspot10_room_3Tex_0028F8 "__OTR__scenes/shared/spot10_scene/spot10_room_3Tex_0028F8"
 static const ALIGN_ASSET(2) char spot10_room_3Tex_0028F8[] = dspot10_room_3Tex_0028F8;
 
-#define dspot10_room_3Tex_0048F8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_3Tex_0048F8"
+#define dspot10_room_3Tex_0038F8 "__OTR__scenes/shared/spot10_scene/spot10_room_3Tex_0038F8"
+static const ALIGN_ASSET(2) char spot10_room_3Tex_0038F8[] = dspot10_room_3Tex_0038F8;
+
+#define dspot10_room_3Tex_0048F8 "__OTR__scenes/shared/spot10_scene/spot10_room_3Tex_0048F8"
 static const ALIGN_ASSET(2) char spot10_room_3Tex_0048F8[] = dspot10_room_3Tex_0048F8;
 
-#define dspot10_room_3DL_005298 "__OTR__scenes/nonmq/spot10_scene/spot10_room_3DL_005298"
-static const ALIGN_ASSET(2) char spot10_room_3DL_005298[] = dspot10_room_3DL_005298;
-
-#define dspot10_room_3Tex_0052A8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_3Tex_0052A8"
+#define dspot10_room_3Tex_0052A8 "__OTR__scenes/shared/spot10_scene/spot10_room_3Tex_0052A8"
 static const ALIGN_ASSET(2) char spot10_room_3Tex_0052A8[] = dspot10_room_3Tex_0052A8;
 
-#define dspot10_room_3Set_000150DL_0028C0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_3Set_000150DL_0028C0"
+#define dspot10_room_3DL_0028C0 "__OTR__scenes/shared/spot10_scene/spot10_room_3DL_0028C0"
+static const ALIGN_ASSET(2) char spot10_room_3DL_0028C0[] = dspot10_room_3DL_0028C0;
+
+#define dspot10_room_3DL_005298 "__OTR__scenes/shared/spot10_scene/spot10_room_3DL_005298"
+static const ALIGN_ASSET(2) char spot10_room_3DL_005298[] = dspot10_room_3DL_005298;
+
+#define dspot10_room_3Set_000150DL_0028C0 "__OTR__scenes/shared/spot10_scene/spot10_room_3Set_000150DL_0028C0"
 static const ALIGN_ASSET(2) char spot10_room_3Set_000150DL_0028C0[] = dspot10_room_3Set_000150DL_0028C0;
 
-#define dspot10_room_3Set_000150DL_005298 "__OTR__scenes/nonmq/spot10_scene/spot10_room_3Set_000150DL_005298"
+#define dspot10_room_3Set_000150DL_005298 "__OTR__scenes/shared/spot10_scene/spot10_room_3Set_000150DL_005298"
 static const ALIGN_ASSET(2) char spot10_room_3Set_000150DL_005298[] = dspot10_room_3Set_000150DL_005298;
 
-#define dspot10_room_3Set_000210DL_0028C0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_3Set_000210DL_0028C0"
+#define dspot10_room_3Set_000210DL_0028C0 "__OTR__scenes/shared/spot10_scene/spot10_room_3Set_000210DL_0028C0"
 static const ALIGN_ASSET(2) char spot10_room_3Set_000210DL_0028C0[] = dspot10_room_3Set_000210DL_0028C0;
 
-#define dspot10_room_3Set_000210DL_005298 "__OTR__scenes/nonmq/spot10_scene/spot10_room_3Set_000210DL_005298"
+#define dspot10_room_3Set_000210DL_005298 "__OTR__scenes/shared/spot10_scene/spot10_room_3Set_000210DL_005298"
 static const ALIGN_ASSET(2) char spot10_room_3Set_000210DL_005298[] = dspot10_room_3Set_000210DL_005298;
 
 
diff --git a/soh/assets/scenes/overworld/spot10/spot10_room_4.h b/soh/assets/scenes/overworld/spot10/spot10_room_4.h
index 75bebd799..b8c7d4d06 100644
--- a/soh/assets/scenes/overworld/spot10/spot10_room_4.h
+++ b/soh/assets/scenes/overworld/spot10/spot10_room_4.h
@@ -3,13 +3,13 @@
 
 #include "align_asset_macro.h"
 
-#define dspot10_room_4DL_002490 "__OTR__scenes/nonmq/spot10_scene/spot10_room_4DL_002490"
+#define dspot10_room_4DL_002490 "__OTR__scenes/shared/spot10_scene/spot10_room_4DL_002490"
 static const ALIGN_ASSET(2) char spot10_room_4DL_002490[] = dspot10_room_4DL_002490;
 
-#define dspot10_room_4Set_0000B0DL_002490 "__OTR__scenes/nonmq/spot10_scene/spot10_room_4Set_0000B0DL_002490"
+#define dspot10_room_4Set_0000B0DL_002490 "__OTR__scenes/shared/spot10_scene/spot10_room_4Set_0000B0DL_002490"
 static const ALIGN_ASSET(2) char spot10_room_4Set_0000B0DL_002490[] = dspot10_room_4Set_0000B0DL_002490;
 
-#define dspot10_room_4Set_000130DL_002490 "__OTR__scenes/nonmq/spot10_scene/spot10_room_4Set_000130DL_002490"
+#define dspot10_room_4Set_000130DL_002490 "__OTR__scenes/shared/spot10_scene/spot10_room_4Set_000130DL_002490"
 static const ALIGN_ASSET(2) char spot10_room_4Set_000130DL_002490[] = dspot10_room_4Set_000130DL_002490;
 
 
diff --git a/soh/assets/scenes/overworld/spot10/spot10_room_5.h b/soh/assets/scenes/overworld/spot10/spot10_room_5.h
index 8095b0b86..c805d386c 100644
--- a/soh/assets/scenes/overworld/spot10/spot10_room_5.h
+++ b/soh/assets/scenes/overworld/spot10/spot10_room_5.h
@@ -3,25 +3,25 @@
 
 #include "align_asset_macro.h"
 
-#define dspot10_room_5DL_003780 "__OTR__scenes/nonmq/spot10_scene/spot10_room_5DL_003780"
-static const ALIGN_ASSET(2) char spot10_room_5DL_003780[] = dspot10_room_5DL_003780;
-
-#define dspot10_room_5Tex_0067F0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_5Tex_0067F0"
-static const ALIGN_ASSET(2) char spot10_room_5Tex_0067F0[] = dspot10_room_5Tex_0067F0;
-
-#define dspot10_room_5Tex_0047F0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_5Tex_0047F0"
-static const ALIGN_ASSET(2) char spot10_room_5Tex_0047F0[] = dspot10_room_5Tex_0047F0;
-
-#define dspot10_room_5Tex_0057F0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_5Tex_0057F0"
-static const ALIGN_ASSET(2) char spot10_room_5Tex_0057F0[] = dspot10_room_5Tex_0057F0;
-
-#define dspot10_room_5Tex_0037F0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_5Tex_0037F0"
+#define dspot10_room_5Tex_0037F0 "__OTR__scenes/shared/spot10_scene/spot10_room_5Tex_0037F0"
 static const ALIGN_ASSET(2) char spot10_room_5Tex_0037F0[] = dspot10_room_5Tex_0037F0;
 
-#define dspot10_room_5Set_0000E0DL_003780 "__OTR__scenes/nonmq/spot10_scene/spot10_room_5Set_0000E0DL_003780"
+#define dspot10_room_5Tex_0047F0 "__OTR__scenes/shared/spot10_scene/spot10_room_5Tex_0047F0"
+static const ALIGN_ASSET(2) char spot10_room_5Tex_0047F0[] = dspot10_room_5Tex_0047F0;
+
+#define dspot10_room_5Tex_0057F0 "__OTR__scenes/shared/spot10_scene/spot10_room_5Tex_0057F0"
+static const ALIGN_ASSET(2) char spot10_room_5Tex_0057F0[] = dspot10_room_5Tex_0057F0;
+
+#define dspot10_room_5Tex_0067F0 "__OTR__scenes/shared/spot10_scene/spot10_room_5Tex_0067F0"
+static const ALIGN_ASSET(2) char spot10_room_5Tex_0067F0[] = dspot10_room_5Tex_0067F0;
+
+#define dspot10_room_5DL_003780 "__OTR__scenes/shared/spot10_scene/spot10_room_5DL_003780"
+static const ALIGN_ASSET(2) char spot10_room_5DL_003780[] = dspot10_room_5DL_003780;
+
+#define dspot10_room_5Set_0000E0DL_003780 "__OTR__scenes/shared/spot10_scene/spot10_room_5Set_0000E0DL_003780"
 static const ALIGN_ASSET(2) char spot10_room_5Set_0000E0DL_003780[] = dspot10_room_5Set_0000E0DL_003780;
 
-#define dspot10_room_5Set_000180DL_003780 "__OTR__scenes/nonmq/spot10_scene/spot10_room_5Set_000180DL_003780"
+#define dspot10_room_5Set_000180DL_003780 "__OTR__scenes/shared/spot10_scene/spot10_room_5Set_000180DL_003780"
 static const ALIGN_ASSET(2) char spot10_room_5Set_000180DL_003780[] = dspot10_room_5Set_000180DL_003780;
 
 
diff --git a/soh/assets/scenes/overworld/spot10/spot10_room_6.h b/soh/assets/scenes/overworld/spot10/spot10_room_6.h
index ff6ea589a..4be7b2210 100644
--- a/soh/assets/scenes/overworld/spot10/spot10_room_6.h
+++ b/soh/assets/scenes/overworld/spot10/spot10_room_6.h
@@ -3,22 +3,22 @@
 
 #include "align_asset_macro.h"
 
-#define dspot10_room_6DL_0022B8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_6DL_0022B8"
-static const ALIGN_ASSET(2) char spot10_room_6DL_0022B8[] = dspot10_room_6DL_0022B8;
-
-#define dspot10_room_6Tex_0022E8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_6Tex_0022E8"
+#define dspot10_room_6Tex_0022E8 "__OTR__scenes/shared/spot10_scene/spot10_room_6Tex_0022E8"
 static const ALIGN_ASSET(2) char spot10_room_6Tex_0022E8[] = dspot10_room_6Tex_0022E8;
 
-#define dspot10_room_6Tex_002AE8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_6Tex_002AE8"
+#define dspot10_room_6Tex_002AE8 "__OTR__scenes/shared/spot10_scene/spot10_room_6Tex_002AE8"
 static const ALIGN_ASSET(2) char spot10_room_6Tex_002AE8[] = dspot10_room_6Tex_002AE8;
 
-#define dspot10_room_6Tex_0032E8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_6Tex_0032E8"
+#define dspot10_room_6Tex_0032E8 "__OTR__scenes/shared/spot10_scene/spot10_room_6Tex_0032E8"
 static const ALIGN_ASSET(2) char spot10_room_6Tex_0032E8[] = dspot10_room_6Tex_0032E8;
 
-#define dspot10_room_6Set_000100DL_0022B8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_6Set_000100DL_0022B8"
+#define dspot10_room_6DL_0022B8 "__OTR__scenes/shared/spot10_scene/spot10_room_6DL_0022B8"
+static const ALIGN_ASSET(2) char spot10_room_6DL_0022B8[] = dspot10_room_6DL_0022B8;
+
+#define dspot10_room_6Set_000100DL_0022B8 "__OTR__scenes/shared/spot10_scene/spot10_room_6Set_000100DL_0022B8"
 static const ALIGN_ASSET(2) char spot10_room_6Set_000100DL_0022B8[] = dspot10_room_6Set_000100DL_0022B8;
 
-#define dspot10_room_6Set_000190DL_0022B8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_6Set_000190DL_0022B8"
+#define dspot10_room_6Set_000190DL_0022B8 "__OTR__scenes/shared/spot10_scene/spot10_room_6Set_000190DL_0022B8"
 static const ALIGN_ASSET(2) char spot10_room_6Set_000190DL_0022B8[] = dspot10_room_6Set_000190DL_0022B8;
 
 
diff --git a/soh/assets/scenes/overworld/spot10/spot10_room_7.h b/soh/assets/scenes/overworld/spot10/spot10_room_7.h
index 1d9bbf375..37b8c7dfd 100644
--- a/soh/assets/scenes/overworld/spot10/spot10_room_7.h
+++ b/soh/assets/scenes/overworld/spot10/spot10_room_7.h
@@ -3,13 +3,13 @@
 
 #include "align_asset_macro.h"
 
-#define dspot10_room_7DL_002588 "__OTR__scenes/nonmq/spot10_scene/spot10_room_7DL_002588"
+#define dspot10_room_7DL_002588 "__OTR__scenes/shared/spot10_scene/spot10_room_7DL_002588"
 static const ALIGN_ASSET(2) char spot10_room_7DL_002588[] = dspot10_room_7DL_002588;
 
-#define dspot10_room_7Set_0000F0DL_002588 "__OTR__scenes/nonmq/spot10_scene/spot10_room_7Set_0000F0DL_002588"
+#define dspot10_room_7Set_0000F0DL_002588 "__OTR__scenes/shared/spot10_scene/spot10_room_7Set_0000F0DL_002588"
 static const ALIGN_ASSET(2) char spot10_room_7Set_0000F0DL_002588[] = dspot10_room_7Set_0000F0DL_002588;
 
-#define dspot10_room_7Set_0001B0DL_002588 "__OTR__scenes/nonmq/spot10_scene/spot10_room_7Set_0001B0DL_002588"
+#define dspot10_room_7Set_0001B0DL_002588 "__OTR__scenes/shared/spot10_scene/spot10_room_7Set_0001B0DL_002588"
 static const ALIGN_ASSET(2) char spot10_room_7Set_0001B0DL_002588[] = dspot10_room_7Set_0001B0DL_002588;
 
 
diff --git a/soh/assets/scenes/overworld/spot10/spot10_room_8.h b/soh/assets/scenes/overworld/spot10/spot10_room_8.h
index 656132ca2..6b3ecf1fd 100644
--- a/soh/assets/scenes/overworld/spot10/spot10_room_8.h
+++ b/soh/assets/scenes/overworld/spot10/spot10_room_8.h
@@ -3,13 +3,13 @@
 
 #include "align_asset_macro.h"
 
-#define dspot10_room_8DL_002630 "__OTR__scenes/nonmq/spot10_scene/spot10_room_8DL_002630"
+#define dspot10_room_8DL_002630 "__OTR__scenes/shared/spot10_scene/spot10_room_8DL_002630"
 static const ALIGN_ASSET(2) char spot10_room_8DL_002630[] = dspot10_room_8DL_002630;
 
-#define dspot10_room_8Set_000120DL_002630 "__OTR__scenes/nonmq/spot10_scene/spot10_room_8Set_000120DL_002630"
+#define dspot10_room_8Set_000120DL_002630 "__OTR__scenes/shared/spot10_scene/spot10_room_8Set_000120DL_002630"
 static const ALIGN_ASSET(2) char spot10_room_8Set_000120DL_002630[] = dspot10_room_8Set_000120DL_002630;
 
-#define dspot10_room_8Set_000200DL_002630 "__OTR__scenes/nonmq/spot10_scene/spot10_room_8Set_000200DL_002630"
+#define dspot10_room_8Set_000200DL_002630 "__OTR__scenes/shared/spot10_scene/spot10_room_8Set_000200DL_002630"
 static const ALIGN_ASSET(2) char spot10_room_8Set_000200DL_002630[] = dspot10_room_8Set_000200DL_002630;
 
 
diff --git a/soh/assets/scenes/overworld/spot10/spot10_room_9.h b/soh/assets/scenes/overworld/spot10/spot10_room_9.h
index 5eebcd9e4..77d308b6f 100644
--- a/soh/assets/scenes/overworld/spot10/spot10_room_9.h
+++ b/soh/assets/scenes/overworld/spot10/spot10_room_9.h
@@ -3,34 +3,34 @@
 
 #include "align_asset_macro.h"
 
-#define dspot10_room_9DL_001EC0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_9DL_001EC0"
-static const ALIGN_ASSET(2) char spot10_room_9DL_001EC0[] = dspot10_room_9DL_001EC0;
-
-#define dspot10_room_9Tex_0026F8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_9Tex_0026F8"
-static const ALIGN_ASSET(2) char spot10_room_9Tex_0026F8[] = dspot10_room_9Tex_0026F8;
-
-#define dspot10_room_9Tex_001EF8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_9Tex_001EF8"
+#define dspot10_room_9Tex_001EF8 "__OTR__scenes/shared/spot10_scene/spot10_room_9Tex_001EF8"
 static const ALIGN_ASSET(2) char spot10_room_9Tex_001EF8[] = dspot10_room_9Tex_001EF8;
 
-#define dspot10_room_9DL_0033C0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_9DL_0033C0"
-static const ALIGN_ASSET(2) char spot10_room_9DL_0033C0[] = dspot10_room_9DL_0033C0;
+#define dspot10_room_9Tex_0026F8 "__OTR__scenes/shared/spot10_scene/spot10_room_9Tex_0026F8"
+static const ALIGN_ASSET(2) char spot10_room_9Tex_0026F8[] = dspot10_room_9Tex_0026F8;
 
-#define dspot10_room_9Tex_0037D8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_9Tex_0037D8"
-static const ALIGN_ASSET(2) char spot10_room_9Tex_0037D8[] = dspot10_room_9Tex_0037D8;
-
-#define dspot10_room_9Tex_0033D8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_9Tex_0033D8"
+#define dspot10_room_9Tex_0033D8 "__OTR__scenes/shared/spot10_scene/spot10_room_9Tex_0033D8"
 static const ALIGN_ASSET(2) char spot10_room_9Tex_0033D8[] = dspot10_room_9Tex_0033D8;
 
-#define dspot10_room_9Set_0000B0DL_001EC0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_9Set_0000B0DL_001EC0"
+#define dspot10_room_9Tex_0037D8 "__OTR__scenes/shared/spot10_scene/spot10_room_9Tex_0037D8"
+static const ALIGN_ASSET(2) char spot10_room_9Tex_0037D8[] = dspot10_room_9Tex_0037D8;
+
+#define dspot10_room_9DL_001EC0 "__OTR__scenes/shared/spot10_scene/spot10_room_9DL_001EC0"
+static const ALIGN_ASSET(2) char spot10_room_9DL_001EC0[] = dspot10_room_9DL_001EC0;
+
+#define dspot10_room_9DL_0033C0 "__OTR__scenes/shared/spot10_scene/spot10_room_9DL_0033C0"
+static const ALIGN_ASSET(2) char spot10_room_9DL_0033C0[] = dspot10_room_9DL_0033C0;
+
+#define dspot10_room_9Set_0000B0DL_001EC0 "__OTR__scenes/shared/spot10_scene/spot10_room_9Set_0000B0DL_001EC0"
 static const ALIGN_ASSET(2) char spot10_room_9Set_0000B0DL_001EC0[] = dspot10_room_9Set_0000B0DL_001EC0;
 
-#define dspot10_room_9Set_0000B0DL_0033C0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_9Set_0000B0DL_0033C0"
+#define dspot10_room_9Set_0000B0DL_0033C0 "__OTR__scenes/shared/spot10_scene/spot10_room_9Set_0000B0DL_0033C0"
 static const ALIGN_ASSET(2) char spot10_room_9Set_0000B0DL_0033C0[] = dspot10_room_9Set_0000B0DL_0033C0;
 
-#define dspot10_room_9Set_000140DL_001EC0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_9Set_000140DL_001EC0"
+#define dspot10_room_9Set_000140DL_001EC0 "__OTR__scenes/shared/spot10_scene/spot10_room_9Set_000140DL_001EC0"
 static const ALIGN_ASSET(2) char spot10_room_9Set_000140DL_001EC0[] = dspot10_room_9Set_000140DL_001EC0;
 
-#define dspot10_room_9Set_000140DL_0033C0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_9Set_000140DL_0033C0"
+#define dspot10_room_9Set_000140DL_0033C0 "__OTR__scenes/shared/spot10_scene/spot10_room_9Set_000140DL_0033C0"
 static const ALIGN_ASSET(2) char spot10_room_9Set_000140DL_0033C0[] = dspot10_room_9Set_000140DL_0033C0;
 
 
diff --git a/soh/assets/scenes/overworld/spot10/spot10_scene.h b/soh/assets/scenes/overworld/spot10/spot10_scene.h
index 7b964f396..da24ca800 100644
--- a/soh/assets/scenes/overworld/spot10/spot10_scene.h
+++ b/soh/assets/scenes/overworld/spot10/spot10_scene.h
@@ -3,36 +3,36 @@
 
 #include "align_asset_macro.h"
 
-#define dspot10_sceneCollisionHeader_00AC98 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneCollisionHeader_00AC98"
-static const ALIGN_ASSET(2) char spot10_sceneCollisionHeader_00AC98[] = dspot10_sceneCollisionHeader_00AC98;
-
-#define dspot10_sceneTex_00FC30 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneTex_00FC30"
-static const ALIGN_ASSET(2) char spot10_sceneTex_00FC30[] = dspot10_sceneTex_00FC30;
-
-#define dspot10_sceneTex_00EA30 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneTex_00EA30"
-static const ALIGN_ASSET(2) char spot10_sceneTex_00EA30[] = dspot10_sceneTex_00EA30;
-
-#define dspot10_sceneTex_00DA30 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneTex_00DA30"
-static const ALIGN_ASSET(2) char spot10_sceneTex_00DA30[] = dspot10_sceneTex_00DA30;
-
-#define dspot10_sceneTex_00F430 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneTex_00F430"
-static const ALIGN_ASSET(2) char spot10_sceneTex_00F430[] = dspot10_sceneTex_00F430;
-
-#define dspot10_sceneTex_00F230 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneTex_00F230"
-static const ALIGN_ASSET(2) char spot10_sceneTex_00F230[] = dspot10_sceneTex_00F230;
-
-#define dspot10_sceneTex_00C230 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneTex_00C230"
+#define dspot10_sceneTex_00C230 "__OTR__scenes/shared/spot10_scene/spot10_sceneTex_00C230"
 static const ALIGN_ASSET(2) char spot10_sceneTex_00C230[] = dspot10_sceneTex_00C230;
 
-#define dspot10_sceneTex_00CA30 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneTex_00CA30"
+#define dspot10_sceneTex_00CA30 "__OTR__scenes/shared/spot10_scene/spot10_sceneTex_00CA30"
 static const ALIGN_ASSET(2) char spot10_sceneTex_00CA30[] = dspot10_sceneTex_00CA30;
 
-#define dspot10_sceneTex_00D230 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneTex_00D230"
+#define dspot10_sceneTex_00D230 "__OTR__scenes/shared/spot10_scene/spot10_sceneTex_00D230"
 static const ALIGN_ASSET(2) char spot10_sceneTex_00D230[] = dspot10_sceneTex_00D230;
 
-#define dspot10_sceneCollisionHeader_00AC98 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneCollisionHeader_00AC98"
+#define dspot10_sceneTex_00DA30 "__OTR__scenes/shared/spot10_scene/spot10_sceneTex_00DA30"
+static const ALIGN_ASSET(2) char spot10_sceneTex_00DA30[] = dspot10_sceneTex_00DA30;
 
-#define dspot10_sceneCollisionHeader_00AC98 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneCollisionHeader_00AC98"
+#define dspot10_sceneTex_00EA30 "__OTR__scenes/shared/spot10_scene/spot10_sceneTex_00EA30"
+static const ALIGN_ASSET(2) char spot10_sceneTex_00EA30[] = dspot10_sceneTex_00EA30;
+
+#define dspot10_sceneTex_00F230 "__OTR__scenes/shared/spot10_scene/spot10_sceneTex_00F230"
+static const ALIGN_ASSET(2) char spot10_sceneTex_00F230[] = dspot10_sceneTex_00F230;
+
+#define dspot10_sceneTex_00F430 "__OTR__scenes/shared/spot10_scene/spot10_sceneTex_00F430"
+static const ALIGN_ASSET(2) char spot10_sceneTex_00F430[] = dspot10_sceneTex_00F430;
+
+#define dspot10_sceneTex_00FC30 "__OTR__scenes/shared/spot10_scene/spot10_sceneTex_00FC30"
+static const ALIGN_ASSET(2) char spot10_sceneTex_00FC30[] = dspot10_sceneTex_00FC30;
+
+#define dspot10_sceneCollisionHeader_00AC98 "__OTR__scenes/shared/spot10_scene/spot10_sceneCollisionHeader_00AC98"
+static const ALIGN_ASSET(2) char spot10_sceneCollisionHeader_00AC98[] = dspot10_sceneCollisionHeader_00AC98;
+
+#define dspot10_sceneCollisionHeader_00AC98 "__OTR__scenes/shared/spot10_scene/spot10_sceneCollisionHeader_00AC98"
+
+#define dspot10_sceneCollisionHeader_00AC98 "__OTR__scenes/shared/spot10_scene/spot10_sceneCollisionHeader_00AC98"
 
 
 #endif // OVERWORLD_SPOT10_SCENE_H
diff --git a/soh/assets/scenes/overworld/spot11/spot11_room_0.h b/soh/assets/scenes/overworld/spot11/spot11_room_0.h
index cbaea5212..dd113f69e 100644
--- a/soh/assets/scenes/overworld/spot11/spot11_room_0.h
+++ b/soh/assets/scenes/overworld/spot11/spot11_room_0.h
@@ -3,232 +3,232 @@
 
 #include "align_asset_macro.h"
 
-#define dspot11_room_0DL_0037A8 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_0037A8"
+#define dspot11_room_0DL_0037A8 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_0037A8"
 static const ALIGN_ASSET(2) char spot11_room_0DL_0037A8[] = dspot11_room_0DL_0037A8;
 
-#define dspot11_room_0DL_002548 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_002548"
+#define dspot11_room_0DL_002548 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_002548"
 static const ALIGN_ASSET(2) char spot11_room_0DL_002548[] = dspot11_room_0DL_002548;
 
-#define dspot11_room_0DL_0029F0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_0029F0"
+#define dspot11_room_0DL_0029F0 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_0029F0"
 static const ALIGN_ASSET(2) char spot11_room_0DL_0029F0[] = dspot11_room_0DL_0029F0;
 
-#define dspot11_room_0DL_002D68 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_002D68"
+#define dspot11_room_0DL_002D68 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_002D68"
 static const ALIGN_ASSET(2) char spot11_room_0DL_002D68[] = dspot11_room_0DL_002D68;
 
-#define dspot11_room_0DL_008520 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_008520"
+#define dspot11_room_0DL_008520 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_008520"
 static const ALIGN_ASSET(2) char spot11_room_0DL_008520[] = dspot11_room_0DL_008520;
 
-#define dspot11_room_0DL_00A238 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_00A238"
+#define dspot11_room_0DL_00A238 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_00A238"
 static const ALIGN_ASSET(2) char spot11_room_0DL_00A238[] = dspot11_room_0DL_00A238;
 
-#define dspot11_room_0DL_00A478 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_00A478"
+#define dspot11_room_0DL_00A478 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_00A478"
 static const ALIGN_ASSET(2) char spot11_room_0DL_00A478[] = dspot11_room_0DL_00A478;
 
-#define dspot11_room_0DL_00A6D8 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_00A6D8"
+#define dspot11_room_0DL_00A6D8 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_00A6D8"
 static const ALIGN_ASSET(2) char spot11_room_0DL_00A6D8[] = dspot11_room_0DL_00A6D8;
 
-#define dspot11_room_0DL_00A900 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_00A900"
+#define dspot11_room_0DL_00A900 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_00A900"
 static const ALIGN_ASSET(2) char spot11_room_0DL_00A900[] = dspot11_room_0DL_00A900;
 
-#define dspot11_room_0DL_00AB78 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_00AB78"
+#define dspot11_room_0DL_00AB78 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_00AB78"
 static const ALIGN_ASSET(2) char spot11_room_0DL_00AB78[] = dspot11_room_0DL_00AB78;
 
-#define dspot11_room_0DL_00ADB0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_00ADB0"
+#define dspot11_room_0DL_00ADB0 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_00ADB0"
 static const ALIGN_ASSET(2) char spot11_room_0DL_00ADB0[] = dspot11_room_0DL_00ADB0;
 
-#define dspot11_room_0DL_000E40 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_000E40"
+#define dspot11_room_0DL_000E40 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_000E40"
 static const ALIGN_ASSET(2) char spot11_room_0DL_000E40[] = dspot11_room_0DL_000E40;
 
-#define dspot11_room_0DL_001ED0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_001ED0"
+#define dspot11_room_0DL_001ED0 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_001ED0"
 static const ALIGN_ASSET(2) char spot11_room_0DL_001ED0[] = dspot11_room_0DL_001ED0;
 
-#define dspot11_room_0DL_00C3C0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_00C3C0"
+#define dspot11_room_0DL_00C3C0 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_00C3C0"
 static const ALIGN_ASSET(2) char spot11_room_0DL_00C3C0[] = dspot11_room_0DL_00C3C0;
 
-#define dspot11_room_0DL_002FA0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_002FA0"
+#define dspot11_room_0DL_002FA0 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_002FA0"
 static const ALIGN_ASSET(2) char spot11_room_0DL_002FA0[] = dspot11_room_0DL_002FA0;
 
-#define dspot11_room_0DL_003510 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_003510"
+#define dspot11_room_0DL_003510 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_003510"
 static const ALIGN_ASSET(2) char spot11_room_0DL_003510[] = dspot11_room_0DL_003510;
 
-#define dspot11_room_0DL_001578 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_001578"
+#define dspot11_room_0DL_001578 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_001578"
 static const ALIGN_ASSET(2) char spot11_room_0DL_001578[] = dspot11_room_0DL_001578;
 
-#define dspot11_room_0DL_00B5B0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_00B5B0"
+#define dspot11_room_0DL_00B5B0 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_00B5B0"
 static const ALIGN_ASSET(2) char spot11_room_0DL_00B5B0[] = dspot11_room_0DL_00B5B0;
 
-#define dspot11_room_0DL_001138 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0DL_001138"
+#define dspot11_room_0DL_001138 "__OTR__scenes/shared/spot11_scene/spot11_room_0DL_001138"
 static const ALIGN_ASSET(2) char spot11_room_0DL_001138[] = dspot11_room_0DL_001138;
 
-#define dspot11_room_0Set_000410DL_0037A8 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_0037A8"
+#define dspot11_room_0Set_000410DL_0037A8 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_0037A8"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_0037A8[] = dspot11_room_0Set_000410DL_0037A8;
 
-#define dspot11_room_0Set_000410DL_002548 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_002548"
+#define dspot11_room_0Set_000410DL_002548 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_002548"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_002548[] = dspot11_room_0Set_000410DL_002548;
 
-#define dspot11_room_0Set_000410DL_0029F0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_0029F0"
+#define dspot11_room_0Set_000410DL_0029F0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_0029F0"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_0029F0[] = dspot11_room_0Set_000410DL_0029F0;
 
-#define dspot11_room_0Set_000410DL_002D68 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_002D68"
+#define dspot11_room_0Set_000410DL_002D68 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_002D68"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_002D68[] = dspot11_room_0Set_000410DL_002D68;
 
-#define dspot11_room_0Set_000410DL_008520 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_008520"
+#define dspot11_room_0Set_000410DL_008520 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_008520"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_008520[] = dspot11_room_0Set_000410DL_008520;
 
-#define dspot11_room_0Set_000410DL_00A238 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_00A238"
+#define dspot11_room_0Set_000410DL_00A238 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_00A238"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_00A238[] = dspot11_room_0Set_000410DL_00A238;
 
-#define dspot11_room_0Set_000410DL_00A478 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_00A478"
+#define dspot11_room_0Set_000410DL_00A478 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_00A478"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_00A478[] = dspot11_room_0Set_000410DL_00A478;
 
-#define dspot11_room_0Set_000410DL_00A6D8 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_00A6D8"
+#define dspot11_room_0Set_000410DL_00A6D8 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_00A6D8"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_00A6D8[] = dspot11_room_0Set_000410DL_00A6D8;
 
-#define dspot11_room_0Set_000410DL_00A900 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_00A900"
+#define dspot11_room_0Set_000410DL_00A900 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_00A900"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_00A900[] = dspot11_room_0Set_000410DL_00A900;
 
-#define dspot11_room_0Set_000410DL_00AB78 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_00AB78"
+#define dspot11_room_0Set_000410DL_00AB78 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_00AB78"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_00AB78[] = dspot11_room_0Set_000410DL_00AB78;
 
-#define dspot11_room_0Set_000410DL_00ADB0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_00ADB0"
+#define dspot11_room_0Set_000410DL_00ADB0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_00ADB0"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_00ADB0[] = dspot11_room_0Set_000410DL_00ADB0;
 
-#define dspot11_room_0Set_000410DL_000E40 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_000E40"
+#define dspot11_room_0Set_000410DL_000E40 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_000E40"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_000E40[] = dspot11_room_0Set_000410DL_000E40;
 
-#define dspot11_room_0Set_000410DL_001ED0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_001ED0"
+#define dspot11_room_0Set_000410DL_001ED0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_001ED0"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_001ED0[] = dspot11_room_0Set_000410DL_001ED0;
 
-#define dspot11_room_0Set_000410DL_00C3C0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_00C3C0"
+#define dspot11_room_0Set_000410DL_00C3C0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_00C3C0"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_00C3C0[] = dspot11_room_0Set_000410DL_00C3C0;
 
-#define dspot11_room_0Set_000410DL_002FA0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_002FA0"
+#define dspot11_room_0Set_000410DL_002FA0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_002FA0"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_002FA0[] = dspot11_room_0Set_000410DL_002FA0;
 
-#define dspot11_room_0Set_000410DL_003510 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_003510"
+#define dspot11_room_0Set_000410DL_003510 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_003510"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_003510[] = dspot11_room_0Set_000410DL_003510;
 
-#define dspot11_room_0Set_000410DL_001578 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_001578"
+#define dspot11_room_0Set_000410DL_001578 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_001578"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_001578[] = dspot11_room_0Set_000410DL_001578;
 
-#define dspot11_room_0Set_000410DL_00B5B0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_00B5B0"
+#define dspot11_room_0Set_000410DL_00B5B0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_00B5B0"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_00B5B0[] = dspot11_room_0Set_000410DL_00B5B0;
 
-#define dspot11_room_0Set_000410DL_001138 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000410DL_001138"
+#define dspot11_room_0Set_000410DL_001138 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000410DL_001138"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000410DL_001138[] = dspot11_room_0Set_000410DL_001138;
 
-#define dspot11_room_0Set_000710DL_0037A8 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_0037A8"
+#define dspot11_room_0Set_000710DL_0037A8 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_0037A8"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_0037A8[] = dspot11_room_0Set_000710DL_0037A8;
 
-#define dspot11_room_0Set_000710DL_002548 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_002548"
+#define dspot11_room_0Set_000710DL_002548 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_002548"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_002548[] = dspot11_room_0Set_000710DL_002548;
 
-#define dspot11_room_0Set_000710DL_0029F0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_0029F0"
+#define dspot11_room_0Set_000710DL_0029F0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_0029F0"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_0029F0[] = dspot11_room_0Set_000710DL_0029F0;
 
-#define dspot11_room_0Set_000710DL_002D68 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_002D68"
+#define dspot11_room_0Set_000710DL_002D68 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_002D68"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_002D68[] = dspot11_room_0Set_000710DL_002D68;
 
-#define dspot11_room_0Set_000710DL_008520 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_008520"
+#define dspot11_room_0Set_000710DL_008520 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_008520"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_008520[] = dspot11_room_0Set_000710DL_008520;
 
-#define dspot11_room_0Set_000710DL_00A238 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_00A238"
+#define dspot11_room_0Set_000710DL_00A238 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_00A238"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_00A238[] = dspot11_room_0Set_000710DL_00A238;
 
-#define dspot11_room_0Set_000710DL_00A478 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_00A478"
+#define dspot11_room_0Set_000710DL_00A478 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_00A478"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_00A478[] = dspot11_room_0Set_000710DL_00A478;
 
-#define dspot11_room_0Set_000710DL_00A6D8 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_00A6D8"
+#define dspot11_room_0Set_000710DL_00A6D8 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_00A6D8"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_00A6D8[] = dspot11_room_0Set_000710DL_00A6D8;
 
-#define dspot11_room_0Set_000710DL_00A900 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_00A900"
+#define dspot11_room_0Set_000710DL_00A900 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_00A900"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_00A900[] = dspot11_room_0Set_000710DL_00A900;
 
-#define dspot11_room_0Set_000710DL_00AB78 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_00AB78"
+#define dspot11_room_0Set_000710DL_00AB78 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_00AB78"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_00AB78[] = dspot11_room_0Set_000710DL_00AB78;
 
-#define dspot11_room_0Set_000710DL_00ADB0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_00ADB0"
+#define dspot11_room_0Set_000710DL_00ADB0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_00ADB0"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_00ADB0[] = dspot11_room_0Set_000710DL_00ADB0;
 
-#define dspot11_room_0Set_000710DL_000E40 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_000E40"
+#define dspot11_room_0Set_000710DL_000E40 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_000E40"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_000E40[] = dspot11_room_0Set_000710DL_000E40;
 
-#define dspot11_room_0Set_000710DL_001ED0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_001ED0"
+#define dspot11_room_0Set_000710DL_001ED0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_001ED0"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_001ED0[] = dspot11_room_0Set_000710DL_001ED0;
 
-#define dspot11_room_0Set_000710DL_00C3C0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_00C3C0"
+#define dspot11_room_0Set_000710DL_00C3C0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_00C3C0"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_00C3C0[] = dspot11_room_0Set_000710DL_00C3C0;
 
-#define dspot11_room_0Set_000710DL_002FA0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_002FA0"
+#define dspot11_room_0Set_000710DL_002FA0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_002FA0"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_002FA0[] = dspot11_room_0Set_000710DL_002FA0;
 
-#define dspot11_room_0Set_000710DL_003510 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_003510"
+#define dspot11_room_0Set_000710DL_003510 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_003510"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_003510[] = dspot11_room_0Set_000710DL_003510;
 
-#define dspot11_room_0Set_000710DL_001578 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_001578"
+#define dspot11_room_0Set_000710DL_001578 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_001578"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_001578[] = dspot11_room_0Set_000710DL_001578;
 
-#define dspot11_room_0Set_000710DL_00B5B0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_00B5B0"
+#define dspot11_room_0Set_000710DL_00B5B0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_00B5B0"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_00B5B0[] = dspot11_room_0Set_000710DL_00B5B0;
 
-#define dspot11_room_0Set_000710DL_001138 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_000710DL_001138"
+#define dspot11_room_0Set_000710DL_001138 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_000710DL_001138"
 static const ALIGN_ASSET(2) char spot11_room_0Set_000710DL_001138[] = dspot11_room_0Set_000710DL_001138;
 
-#define dspot11_room_0Set_0007F0DL_0037A8 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_0037A8"
+#define dspot11_room_0Set_0007F0DL_0037A8 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_0037A8"
 static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_0037A8[] = dspot11_room_0Set_0007F0DL_0037A8;
 
-#define dspot11_room_0Set_0007F0DL_002548 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_002548"
+#define dspot11_room_0Set_0007F0DL_002548 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_002548"
 static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_002548[] = dspot11_room_0Set_0007F0DL_002548;
 
-#define dspot11_room_0Set_0007F0DL_0029F0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_0029F0"
+#define dspot11_room_0Set_0007F0DL_0029F0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_0029F0"
 static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_0029F0[] = dspot11_room_0Set_0007F0DL_0029F0;
 
-#define dspot11_room_0Set_0007F0DL_002D68 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_002D68"
+#define dspot11_room_0Set_0007F0DL_002D68 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_002D68"
 static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_002D68[] = dspot11_room_0Set_0007F0DL_002D68;
 
-#define dspot11_room_0Set_0007F0DL_008520 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_008520"
+#define dspot11_room_0Set_0007F0DL_008520 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_008520"
 static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_008520[] = dspot11_room_0Set_0007F0DL_008520;
 
-#define dspot11_room_0Set_0007F0DL_00A238 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_00A238"
+#define dspot11_room_0Set_0007F0DL_00A238 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_00A238"
 static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_00A238[] = dspot11_room_0Set_0007F0DL_00A238;
 
-#define dspot11_room_0Set_0007F0DL_00A478 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_00A478"
+#define dspot11_room_0Set_0007F0DL_00A478 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_00A478"
 static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_00A478[] = dspot11_room_0Set_0007F0DL_00A478;
 
-#define dspot11_room_0Set_0007F0DL_00A6D8 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_00A6D8"
+#define dspot11_room_0Set_0007F0DL_00A6D8 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_00A6D8"
 static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_00A6D8[] = dspot11_room_0Set_0007F0DL_00A6D8;
 
-#define dspot11_room_0Set_0007F0DL_00A900 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_00A900"
+#define dspot11_room_0Set_0007F0DL_00A900 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_00A900"
 static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_00A900[] = dspot11_room_0Set_0007F0DL_00A900;
 
-#define dspot11_room_0Set_0007F0DL_00AB78 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_00AB78"
+#define dspot11_room_0Set_0007F0DL_00AB78 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_00AB78"
 static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_00AB78[] = dspot11_room_0Set_0007F0DL_00AB78;
 
-#define dspot11_room_0Set_0007F0DL_00ADB0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_00ADB0"
+#define dspot11_room_0Set_0007F0DL_00ADB0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_00ADB0"
 static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_00ADB0[] = dspot11_room_0Set_0007F0DL_00ADB0;
 
-#define dspot11_room_0Set_0007F0DL_000E40 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_000E40"
+#define dspot11_room_0Set_0007F0DL_000E40 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_000E40"
 static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_000E40[] = dspot11_room_0Set_0007F0DL_000E40;
 
-#define dspot11_room_0Set_0007F0DL_001ED0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_001ED0"
+#define dspot11_room_0Set_0007F0DL_001ED0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_001ED0"
 static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_001ED0[] = dspot11_room_0Set_0007F0DL_001ED0;
 
-#define dspot11_room_0Set_0007F0DL_00C3C0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_00C3C0"
+#define dspot11_room_0Set_0007F0DL_00C3C0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_00C3C0"
 static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_00C3C0[] = dspot11_room_0Set_0007F0DL_00C3C0;
 
-#define dspot11_room_0Set_0007F0DL_002FA0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_002FA0"
+#define dspot11_room_0Set_0007F0DL_002FA0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_002FA0"
 static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_002FA0[] = dspot11_room_0Set_0007F0DL_002FA0;
 
-#define dspot11_room_0Set_0007F0DL_003510 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_003510"
+#define dspot11_room_0Set_0007F0DL_003510 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_003510"
 static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_003510[] = dspot11_room_0Set_0007F0DL_003510;
 
-#define dspot11_room_0Set_0007F0DL_001578 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_001578"
+#define dspot11_room_0Set_0007F0DL_001578 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_001578"
 static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_001578[] = dspot11_room_0Set_0007F0DL_001578;
 
-#define dspot11_room_0Set_0007F0DL_00B5B0 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_00B5B0"
+#define dspot11_room_0Set_0007F0DL_00B5B0 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_00B5B0"
 static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_00B5B0[] = dspot11_room_0Set_0007F0DL_00B5B0;
 
-#define dspot11_room_0Set_0007F0DL_001138 "__OTR__scenes/nonmq/spot11_scene/spot11_room_0Set_0007F0DL_001138"
+#define dspot11_room_0Set_0007F0DL_001138 "__OTR__scenes/shared/spot11_scene/spot11_room_0Set_0007F0DL_001138"
 static const ALIGN_ASSET(2) char spot11_room_0Set_0007F0DL_001138[] = dspot11_room_0Set_0007F0DL_001138;
 
 
diff --git a/soh/assets/scenes/overworld/spot11/spot11_scene.h b/soh/assets/scenes/overworld/spot11/spot11_scene.h
index 35d42b9f6..865832ed3 100644
--- a/soh/assets/scenes/overworld/spot11/spot11_scene.h
+++ b/soh/assets/scenes/overworld/spot11/spot11_scene.h
@@ -3,113 +3,113 @@
 
 #include "align_asset_macro.h"
 
-#define dgDesertColossusIntroCs "__OTR__scenes/nonmq/spot11_scene/gDesertColossusIntroCs"
-static const ALIGN_ASSET(2) char gDesertColossusIntroCs[] = dgDesertColossusIntroCs;
-
-#define dspot11_sceneCollisionHeader_004EE4 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneCollisionHeader_004EE4"
-static const ALIGN_ASSET(2) char spot11_sceneCollisionHeader_004EE4[] = dspot11_sceneCollisionHeader_004EE4;
-
-#define dspot11_sceneTex_017CE0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_017CE0"
-static const ALIGN_ASSET(2) char spot11_sceneTex_017CE0[] = dspot11_sceneTex_017CE0;
-
-#define dspot11_sceneTex_0184E0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_0184E0"
-static const ALIGN_ASSET(2) char spot11_sceneTex_0184E0[] = dspot11_sceneTex_0184E0;
-
-#define dspot11_sceneTex_0104E0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_0104E0"
-static const ALIGN_ASSET(2) char spot11_sceneTex_0104E0[] = dspot11_sceneTex_0104E0;
-
-#define dspot11_sceneTex_0174E0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_0174E0"
-static const ALIGN_ASSET(2) char spot11_sceneTex_0174E0[] = dspot11_sceneTex_0174E0;
-
-#define dspot11_sceneTex_0124E0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_0124E0"
-static const ALIGN_ASSET(2) char spot11_sceneTex_0124E0[] = dspot11_sceneTex_0124E0;
-
-#define dspot11_sceneTex_013CE0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_013CE0"
-static const ALIGN_ASSET(2) char spot11_sceneTex_013CE0[] = dspot11_sceneTex_013CE0;
-
-#define dspot11_sceneTex_00F4A0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_00F4A0"
-static const ALIGN_ASSET(2) char spot11_sceneTex_00F4A0[] = dspot11_sceneTex_00F4A0;
-
-#define dspot11_sceneTex_0154E0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_0154E0"
-static const ALIGN_ASSET(2) char spot11_sceneTex_0154E0[] = dspot11_sceneTex_0154E0;
-
-#define dspot11_sceneTex_012CE0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_012CE0"
-static const ALIGN_ASSET(2) char spot11_sceneTex_012CE0[] = dspot11_sceneTex_012CE0;
-
-#define dspot11_sceneTex_011CE0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_011CE0"
-static const ALIGN_ASSET(2) char spot11_sceneTex_011CE0[] = dspot11_sceneTex_011CE0;
-
-#define dspot11_sceneTex_00ECA0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_00ECA0"
-static const ALIGN_ASSET(2) char spot11_sceneTex_00ECA0[] = dspot11_sceneTex_00ECA0;
-
-#define dspot11_sceneTex_00BCA0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_00BCA0"
-static const ALIGN_ASSET(2) char spot11_sceneTex_00BCA0[] = dspot11_sceneTex_00BCA0;
-
-#define dspot11_sceneTex_0134E0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_0134E0"
-static const ALIGN_ASSET(2) char spot11_sceneTex_0134E0[] = dspot11_sceneTex_0134E0;
-
-#define dspot11_sceneTex_00FCE0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_00FCE0"
-static const ALIGN_ASSET(2) char spot11_sceneTex_00FCE0[] = dspot11_sceneTex_00FCE0;
-
-#define dspot11_sceneTex_00B8A0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_00B8A0"
-static const ALIGN_ASSET(2) char spot11_sceneTex_00B8A0[] = dspot11_sceneTex_00B8A0;
-
-#define dspot11_sceneTex_008CA0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_008CA0"
-static const ALIGN_ASSET(2) char spot11_sceneTex_008CA0[] = dspot11_sceneTex_008CA0;
-
-#define dspot11_sceneTex_00D4A0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_00D4A0"
-static const ALIGN_ASSET(2) char spot11_sceneTex_00D4A0[] = dspot11_sceneTex_00D4A0;
-
-#define dspot11_sceneTex_00A0A0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_00A0A0"
-static const ALIGN_ASSET(2) char spot11_sceneTex_00A0A0[] = dspot11_sceneTex_00A0A0;
-
-#define dspot11_sceneTex_0084A0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_0084A0"
-static const ALIGN_ASSET(2) char spot11_sceneTex_0084A0[] = dspot11_sceneTex_0084A0;
-
-#define dspot11_sceneTex_00CCA0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_00CCA0"
-static const ALIGN_ASSET(2) char spot11_sceneTex_00CCA0[] = dspot11_sceneTex_00CCA0;
-
-#define dspot11_sceneTex_00A8A0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_00A8A0"
-static const ALIGN_ASSET(2) char spot11_sceneTex_00A8A0[] = dspot11_sceneTex_00A8A0;
-
-#define dspot11_sceneTex_007CA0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_007CA0"
+#define dspot11_sceneTex_007CA0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_007CA0"
 static const ALIGN_ASSET(2) char spot11_sceneTex_007CA0[] = dspot11_sceneTex_007CA0;
 
-#define dspot11_sceneTex_0090A0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_0090A0"
+#define dspot11_sceneTex_0084A0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_0084A0"
+static const ALIGN_ASSET(2) char spot11_sceneTex_0084A0[] = dspot11_sceneTex_0084A0;
+
+#define dspot11_sceneTex_008CA0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_008CA0"
+static const ALIGN_ASSET(2) char spot11_sceneTex_008CA0[] = dspot11_sceneTex_008CA0;
+
+#define dspot11_sceneTex_0090A0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_0090A0"
 static const ALIGN_ASSET(2) char spot11_sceneTex_0090A0[] = dspot11_sceneTex_0090A0;
 
-#define dspot11_sceneTex_00C4A0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_00C4A0"
+#define dspot11_sceneTex_00A0A0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_00A0A0"
+static const ALIGN_ASSET(2) char spot11_sceneTex_00A0A0[] = dspot11_sceneTex_00A0A0;
+
+#define dspot11_sceneTex_00A8A0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_00A8A0"
+static const ALIGN_ASSET(2) char spot11_sceneTex_00A8A0[] = dspot11_sceneTex_00A8A0;
+
+#define dspot11_sceneTex_00B8A0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_00B8A0"
+static const ALIGN_ASSET(2) char spot11_sceneTex_00B8A0[] = dspot11_sceneTex_00B8A0;
+
+#define dspot11_sceneTex_00BCA0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_00BCA0"
+static const ALIGN_ASSET(2) char spot11_sceneTex_00BCA0[] = dspot11_sceneTex_00BCA0;
+
+#define dspot11_sceneTex_00C4A0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_00C4A0"
 static const ALIGN_ASSET(2) char spot11_sceneTex_00C4A0[] = dspot11_sceneTex_00C4A0;
 
-#define dspot11_sceneTex_016CE0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_016CE0"
-static const ALIGN_ASSET(2) char spot11_sceneTex_016CE0[] = dspot11_sceneTex_016CE0;
+#define dspot11_sceneTex_00CCA0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_00CCA0"
+static const ALIGN_ASSET(2) char spot11_sceneTex_00CCA0[] = dspot11_sceneTex_00CCA0;
 
-#define dspot11_sceneTex_010CE0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_010CE0"
-static const ALIGN_ASSET(2) char spot11_sceneTex_010CE0[] = dspot11_sceneTex_010CE0;
+#define dspot11_sceneTex_00D4A0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_00D4A0"
+static const ALIGN_ASSET(2) char spot11_sceneTex_00D4A0[] = dspot11_sceneTex_00D4A0;
 
-#define dspot11_sceneTex_00FCA0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_00FCA0"
-static const ALIGN_ASSET(2) char spot11_sceneTex_00FCA0[] = dspot11_sceneTex_00FCA0;
-
-#define dspot11_sceneTex_0144E0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_0144E0"
-static const ALIGN_ASSET(2) char spot11_sceneTex_0144E0[] = dspot11_sceneTex_0144E0;
-
-#define dspot11_sceneTex_015CE0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_015CE0"
-static const ALIGN_ASSET(2) char spot11_sceneTex_015CE0[] = dspot11_sceneTex_015CE0;
-
-#define dspot11_sceneTex_018CE0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_018CE0"
-static const ALIGN_ASSET(2) char spot11_sceneTex_018CE0[] = dspot11_sceneTex_018CE0;
-
-#define dspot11_sceneTex_0164E0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_0164E0"
-static const ALIGN_ASSET(2) char spot11_sceneTex_0164E0[] = dspot11_sceneTex_0164E0;
-
-#define dspot11_sceneTex_00DCA0 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneTex_00DCA0"
+#define dspot11_sceneTex_00DCA0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_00DCA0"
 static const ALIGN_ASSET(2) char spot11_sceneTex_00DCA0[] = dspot11_sceneTex_00DCA0;
 
-#define dspot11_sceneCollisionHeader_004EE4 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneCollisionHeader_004EE4"
+#define dspot11_sceneTex_00ECA0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_00ECA0"
+static const ALIGN_ASSET(2) char spot11_sceneTex_00ECA0[] = dspot11_sceneTex_00ECA0;
 
-#define dspot11_sceneCollisionHeader_004EE4 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneCollisionHeader_004EE4"
+#define dspot11_sceneTex_00F4A0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_00F4A0"
+static const ALIGN_ASSET(2) char spot11_sceneTex_00F4A0[] = dspot11_sceneTex_00F4A0;
 
-#define dspot11_sceneCollisionHeader_004EE4 "__OTR__scenes/nonmq/spot11_scene/spot11_sceneCollisionHeader_004EE4"
+#define dspot11_sceneTex_00FCA0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_00FCA0"
+static const ALIGN_ASSET(2) char spot11_sceneTex_00FCA0[] = dspot11_sceneTex_00FCA0;
+
+#define dspot11_sceneTex_00FCE0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_00FCE0"
+static const ALIGN_ASSET(2) char spot11_sceneTex_00FCE0[] = dspot11_sceneTex_00FCE0;
+
+#define dspot11_sceneTex_0104E0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_0104E0"
+static const ALIGN_ASSET(2) char spot11_sceneTex_0104E0[] = dspot11_sceneTex_0104E0;
+
+#define dspot11_sceneTex_010CE0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_010CE0"
+static const ALIGN_ASSET(2) char spot11_sceneTex_010CE0[] = dspot11_sceneTex_010CE0;
+
+#define dspot11_sceneTex_011CE0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_011CE0"
+static const ALIGN_ASSET(2) char spot11_sceneTex_011CE0[] = dspot11_sceneTex_011CE0;
+
+#define dspot11_sceneTex_0124E0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_0124E0"
+static const ALIGN_ASSET(2) char spot11_sceneTex_0124E0[] = dspot11_sceneTex_0124E0;
+
+#define dspot11_sceneTex_012CE0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_012CE0"
+static const ALIGN_ASSET(2) char spot11_sceneTex_012CE0[] = dspot11_sceneTex_012CE0;
+
+#define dspot11_sceneTex_0134E0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_0134E0"
+static const ALIGN_ASSET(2) char spot11_sceneTex_0134E0[] = dspot11_sceneTex_0134E0;
+
+#define dspot11_sceneTex_013CE0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_013CE0"
+static const ALIGN_ASSET(2) char spot11_sceneTex_013CE0[] = dspot11_sceneTex_013CE0;
+
+#define dspot11_sceneTex_0144E0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_0144E0"
+static const ALIGN_ASSET(2) char spot11_sceneTex_0144E0[] = dspot11_sceneTex_0144E0;
+
+#define dspot11_sceneTex_0154E0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_0154E0"
+static const ALIGN_ASSET(2) char spot11_sceneTex_0154E0[] = dspot11_sceneTex_0154E0;
+
+#define dspot11_sceneTex_015CE0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_015CE0"
+static const ALIGN_ASSET(2) char spot11_sceneTex_015CE0[] = dspot11_sceneTex_015CE0;
+
+#define dspot11_sceneTex_0164E0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_0164E0"
+static const ALIGN_ASSET(2) char spot11_sceneTex_0164E0[] = dspot11_sceneTex_0164E0;
+
+#define dspot11_sceneTex_016CE0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_016CE0"
+static const ALIGN_ASSET(2) char spot11_sceneTex_016CE0[] = dspot11_sceneTex_016CE0;
+
+#define dspot11_sceneTex_0174E0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_0174E0"
+static const ALIGN_ASSET(2) char spot11_sceneTex_0174E0[] = dspot11_sceneTex_0174E0;
+
+#define dspot11_sceneTex_017CE0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_017CE0"
+static const ALIGN_ASSET(2) char spot11_sceneTex_017CE0[] = dspot11_sceneTex_017CE0;
+
+#define dspot11_sceneTex_0184E0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_0184E0"
+static const ALIGN_ASSET(2) char spot11_sceneTex_0184E0[] = dspot11_sceneTex_0184E0;
+
+#define dspot11_sceneTex_018CE0 "__OTR__scenes/shared/spot11_scene/spot11_sceneTex_018CE0"
+static const ALIGN_ASSET(2) char spot11_sceneTex_018CE0[] = dspot11_sceneTex_018CE0;
+
+#define dgDesertColossusIntroCs "__OTR__scenes/shared/spot11_scene/gDesertColossusIntroCs"
+static const ALIGN_ASSET(2) char gDesertColossusIntroCs[] = dgDesertColossusIntroCs;
+
+#define dspot11_sceneCollisionHeader_004EE4 "__OTR__scenes/shared/spot11_scene/spot11_sceneCollisionHeader_004EE4"
+static const ALIGN_ASSET(2) char spot11_sceneCollisionHeader_004EE4[] = dspot11_sceneCollisionHeader_004EE4;
+
+#define dspot11_sceneCollisionHeader_004EE4 "__OTR__scenes/shared/spot11_scene/spot11_sceneCollisionHeader_004EE4"
+
+#define dspot11_sceneCollisionHeader_004EE4 "__OTR__scenes/shared/spot11_scene/spot11_sceneCollisionHeader_004EE4"
+
+#define dspot11_sceneCollisionHeader_004EE4 "__OTR__scenes/shared/spot11_scene/spot11_sceneCollisionHeader_004EE4"
 
 
 #endif // OVERWORLD_SPOT11_SCENE_H
diff --git a/soh/assets/scenes/overworld/spot12/spot12_room_0.h b/soh/assets/scenes/overworld/spot12/spot12_room_0.h
index 056e1178f..ac1000376 100644
--- a/soh/assets/scenes/overworld/spot12/spot12_room_0.h
+++ b/soh/assets/scenes/overworld/spot12/spot12_room_0.h
@@ -3,430 +3,430 @@
 
 #include "align_asset_macro.h"
 
-#define dspot12_room_0DL_0048A8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_0048A8"
-static const ALIGN_ASSET(2) char spot12_room_0DL_0048A8[] = dspot12_room_0DL_0048A8;
-
-#define dspot12_room_0Tex_00C6B0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Tex_00C6B0"
-static const ALIGN_ASSET(2) char spot12_room_0Tex_00C6B0[] = dspot12_room_0Tex_00C6B0;
-
-#define dspot12_room_0TLUT_008A90 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0TLUT_008A90"
-static const ALIGN_ASSET(2) char spot12_room_0TLUT_008A90[] = dspot12_room_0TLUT_008A90;
-
-#define dspot12_room_0DL_0050F0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_0050F0"
-static const ALIGN_ASSET(2) char spot12_room_0DL_0050F0[] = dspot12_room_0DL_0050F0;
-
-#define dspot12_room_0DL_0055D0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_0055D0"
-static const ALIGN_ASSET(2) char spot12_room_0DL_0055D0[] = dspot12_room_0DL_0055D0;
-
-#define dspot12_room_0DL_005B48 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_005B48"
-static const ALIGN_ASSET(2) char spot12_room_0DL_005B48[] = dspot12_room_0DL_005B48;
-
-#define dspot12_room_0Tex_00EAB0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Tex_00EAB0"
-static const ALIGN_ASSET(2) char spot12_room_0Tex_00EAB0[] = dspot12_room_0Tex_00EAB0;
-
-#define dspot12_room_0DL_0065C8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_0065C8"
-static const ALIGN_ASSET(2) char spot12_room_0DL_0065C8[] = dspot12_room_0DL_0065C8;
-
-#define dspot12_room_0Tex_00A6B0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Tex_00A6B0"
-static const ALIGN_ASSET(2) char spot12_room_0Tex_00A6B0[] = dspot12_room_0Tex_00A6B0;
-
-#define dspot12_room_0DL_006F10 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_006F10"
-static const ALIGN_ASSET(2) char spot12_room_0DL_006F10[] = dspot12_room_0DL_006F10;
-
-#define dspot12_room_0DL_00FA10 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_00FA10"
-static const ALIGN_ASSET(2) char spot12_room_0DL_00FA10[] = dspot12_room_0DL_00FA10;
-
-#define dspot12_room_0DL_004CC8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_004CC8"
-static const ALIGN_ASSET(2) char spot12_room_0DL_004CC8[] = dspot12_room_0DL_004CC8;
-
-#define dspot12_room_0DL_008000 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_008000"
-static const ALIGN_ASSET(2) char spot12_room_0DL_008000[] = dspot12_room_0DL_008000;
-
-#define dspot12_room_0Tex_008AB0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Tex_008AB0"
+#define dspot12_room_0Tex_008AB0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Tex_008AB0"
 static const ALIGN_ASSET(2) char spot12_room_0Tex_008AB0[] = dspot12_room_0Tex_008AB0;
 
-#define dspot12_room_0Tex_0096B0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Tex_0096B0"
-static const ALIGN_ASSET(2) char spot12_room_0Tex_0096B0[] = dspot12_room_0Tex_0096B0;
-
-#define dspot12_room_0Tex_00CAB0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Tex_00CAB0"
-static const ALIGN_ASSET(2) char spot12_room_0Tex_00CAB0[] = dspot12_room_0Tex_00CAB0;
-
-#define dspot12_room_0Tex_00B6B0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Tex_00B6B0"
-static const ALIGN_ASSET(2) char spot12_room_0Tex_00B6B0[] = dspot12_room_0Tex_00B6B0;
-
-#define dspot12_room_0Tex_009EB0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Tex_009EB0"
-static const ALIGN_ASSET(2) char spot12_room_0Tex_009EB0[] = dspot12_room_0Tex_009EB0;
-
-#define dspot12_room_0DL_00F740 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_00F740"
-static const ALIGN_ASSET(2) char spot12_room_0DL_00F740[] = dspot12_room_0DL_00F740;
-
-#define dspot12_room_0Tex_00FDB8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Tex_00FDB8"
-static const ALIGN_ASSET(2) char spot12_room_0Tex_00FDB8[] = dspot12_room_0Tex_00FDB8;
-
-#define dspot12_room_0Tex_00FD78 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Tex_00FD78"
-static const ALIGN_ASSET(2) char spot12_room_0Tex_00FD78[] = dspot12_room_0Tex_00FD78;
-
-#define dspot12_room_0DL_001F40 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_001F40"
-static const ALIGN_ASSET(2) char spot12_room_0DL_001F40[] = dspot12_room_0DL_001F40;
-
-#define dspot12_room_0DL_001AE0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_001AE0"
-static const ALIGN_ASSET(2) char spot12_room_0DL_001AE0[] = dspot12_room_0DL_001AE0;
-
-#define dspot12_room_0DL_001D30 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_001D30"
-static const ALIGN_ASSET(2) char spot12_room_0DL_001D30[] = dspot12_room_0DL_001D30;
-
-#define dspot12_room_0DL_0014F0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_0014F0"
-static const ALIGN_ASSET(2) char spot12_room_0DL_0014F0[] = dspot12_room_0DL_0014F0;
-
-#define dspot12_room_0Tex_00BEB0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Tex_00BEB0"
-static const ALIGN_ASSET(2) char spot12_room_0Tex_00BEB0[] = dspot12_room_0Tex_00BEB0;
-
-#define dspot12_room_0Tex_00D2B0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Tex_00D2B0"
-static const ALIGN_ASSET(2) char spot12_room_0Tex_00D2B0[] = dspot12_room_0Tex_00D2B0;
-
-#define dspot12_room_0DL_003970 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_003970"
-static const ALIGN_ASSET(2) char spot12_room_0DL_003970[] = dspot12_room_0DL_003970;
-
-#define dspot12_room_0Tex_00E2B0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Tex_00E2B0"
-static const ALIGN_ASSET(2) char spot12_room_0Tex_00E2B0[] = dspot12_room_0Tex_00E2B0;
-
-#define dspot12_room_0Tex_0092B0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Tex_0092B0"
+#define dspot12_room_0Tex_0092B0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Tex_0092B0"
 static const ALIGN_ASSET(2) char spot12_room_0Tex_0092B0[] = dspot12_room_0Tex_0092B0;
 
-#define dspot12_room_0DL_00F430 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_00F430"
-static const ALIGN_ASSET(2) char spot12_room_0DL_00F430[] = dspot12_room_0DL_00F430;
+#define dspot12_room_0Tex_0096B0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Tex_0096B0"
+static const ALIGN_ASSET(2) char spot12_room_0Tex_0096B0[] = dspot12_room_0Tex_0096B0;
 
-#define dspot12_room_0Tex_0105B8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Tex_0105B8"
+#define dspot12_room_0Tex_009EB0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Tex_009EB0"
+static const ALIGN_ASSET(2) char spot12_room_0Tex_009EB0[] = dspot12_room_0Tex_009EB0;
+
+#define dspot12_room_0Tex_00A6B0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Tex_00A6B0"
+static const ALIGN_ASSET(2) char spot12_room_0Tex_00A6B0[] = dspot12_room_0Tex_00A6B0;
+
+#define dspot12_room_0Tex_00B6B0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Tex_00B6B0"
+static const ALIGN_ASSET(2) char spot12_room_0Tex_00B6B0[] = dspot12_room_0Tex_00B6B0;
+
+#define dspot12_room_0Tex_00BEB0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Tex_00BEB0"
+static const ALIGN_ASSET(2) char spot12_room_0Tex_00BEB0[] = dspot12_room_0Tex_00BEB0;
+
+#define dspot12_room_0Tex_00C6B0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Tex_00C6B0"
+static const ALIGN_ASSET(2) char spot12_room_0Tex_00C6B0[] = dspot12_room_0Tex_00C6B0;
+
+#define dspot12_room_0Tex_00CAB0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Tex_00CAB0"
+static const ALIGN_ASSET(2) char spot12_room_0Tex_00CAB0[] = dspot12_room_0Tex_00CAB0;
+
+#define dspot12_room_0Tex_00D2B0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Tex_00D2B0"
+static const ALIGN_ASSET(2) char spot12_room_0Tex_00D2B0[] = dspot12_room_0Tex_00D2B0;
+
+#define dspot12_room_0Tex_00E2B0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Tex_00E2B0"
+static const ALIGN_ASSET(2) char spot12_room_0Tex_00E2B0[] = dspot12_room_0Tex_00E2B0;
+
+#define dspot12_room_0Tex_00EAB0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Tex_00EAB0"
+static const ALIGN_ASSET(2) char spot12_room_0Tex_00EAB0[] = dspot12_room_0Tex_00EAB0;
+
+#define dspot12_room_0Tex_00FD78 "__OTR__scenes/shared/spot12_scene/spot12_room_0Tex_00FD78"
+static const ALIGN_ASSET(2) char spot12_room_0Tex_00FD78[] = dspot12_room_0Tex_00FD78;
+
+#define dspot12_room_0Tex_00FDB8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Tex_00FDB8"
+static const ALIGN_ASSET(2) char spot12_room_0Tex_00FDB8[] = dspot12_room_0Tex_00FDB8;
+
+#define dspot12_room_0Tex_0105B8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Tex_0105B8"
 static const ALIGN_ASSET(2) char spot12_room_0Tex_0105B8[] = dspot12_room_0Tex_0105B8;
 
-#define dspot12_room_0DL_008620 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_008620"
+#define dspot12_room_0TLUT_008A90 "__OTR__scenes/shared/spot12_scene/spot12_room_0TLUT_008A90"
+static const ALIGN_ASSET(2) char spot12_room_0TLUT_008A90[] = dspot12_room_0TLUT_008A90;
+
+#define dspot12_room_0DL_0048A8 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_0048A8"
+static const ALIGN_ASSET(2) char spot12_room_0DL_0048A8[] = dspot12_room_0DL_0048A8;
+
+#define dspot12_room_0DL_0050F0 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_0050F0"
+static const ALIGN_ASSET(2) char spot12_room_0DL_0050F0[] = dspot12_room_0DL_0050F0;
+
+#define dspot12_room_0DL_0055D0 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_0055D0"
+static const ALIGN_ASSET(2) char spot12_room_0DL_0055D0[] = dspot12_room_0DL_0055D0;
+
+#define dspot12_room_0DL_005B48 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_005B48"
+static const ALIGN_ASSET(2) char spot12_room_0DL_005B48[] = dspot12_room_0DL_005B48;
+
+#define dspot12_room_0DL_0065C8 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_0065C8"
+static const ALIGN_ASSET(2) char spot12_room_0DL_0065C8[] = dspot12_room_0DL_0065C8;
+
+#define dspot12_room_0DL_006F10 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_006F10"
+static const ALIGN_ASSET(2) char spot12_room_0DL_006F10[] = dspot12_room_0DL_006F10;
+
+#define dspot12_room_0DL_00FA10 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_00FA10"
+static const ALIGN_ASSET(2) char spot12_room_0DL_00FA10[] = dspot12_room_0DL_00FA10;
+
+#define dspot12_room_0DL_004CC8 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_004CC8"
+static const ALIGN_ASSET(2) char spot12_room_0DL_004CC8[] = dspot12_room_0DL_004CC8;
+
+#define dspot12_room_0DL_008000 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_008000"
+static const ALIGN_ASSET(2) char spot12_room_0DL_008000[] = dspot12_room_0DL_008000;
+
+#define dspot12_room_0DL_00F740 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_00F740"
+static const ALIGN_ASSET(2) char spot12_room_0DL_00F740[] = dspot12_room_0DL_00F740;
+
+#define dspot12_room_0DL_001F40 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_001F40"
+static const ALIGN_ASSET(2) char spot12_room_0DL_001F40[] = dspot12_room_0DL_001F40;
+
+#define dspot12_room_0DL_001AE0 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_001AE0"
+static const ALIGN_ASSET(2) char spot12_room_0DL_001AE0[] = dspot12_room_0DL_001AE0;
+
+#define dspot12_room_0DL_001D30 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_001D30"
+static const ALIGN_ASSET(2) char spot12_room_0DL_001D30[] = dspot12_room_0DL_001D30;
+
+#define dspot12_room_0DL_0014F0 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_0014F0"
+static const ALIGN_ASSET(2) char spot12_room_0DL_0014F0[] = dspot12_room_0DL_0014F0;
+
+#define dspot12_room_0DL_003970 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_003970"
+static const ALIGN_ASSET(2) char spot12_room_0DL_003970[] = dspot12_room_0DL_003970;
+
+#define dspot12_room_0DL_00F430 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_00F430"
+static const ALIGN_ASSET(2) char spot12_room_0DL_00F430[] = dspot12_room_0DL_00F430;
+
+#define dspot12_room_0DL_008620 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_008620"
 static const ALIGN_ASSET(2) char spot12_room_0DL_008620[] = dspot12_room_0DL_008620;
 
-#define dspot12_room_0DL_000B60 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_000B60"
+#define dspot12_room_0DL_000B60 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_000B60"
 static const ALIGN_ASSET(2) char spot12_room_0DL_000B60[] = dspot12_room_0DL_000B60;
 
-#define dspot12_room_0DL_0088C8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_0088C8"
+#define dspot12_room_0DL_0088C8 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_0088C8"
 static const ALIGN_ASSET(2) char spot12_room_0DL_0088C8[] = dspot12_room_0DL_0088C8;
 
-#define dspot12_room_0DL_00FC80 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_00FC80"
+#define dspot12_room_0DL_00FC80 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_00FC80"
 static const ALIGN_ASSET(2) char spot12_room_0DL_00FC80[] = dspot12_room_0DL_00FC80;
 
-#define dspot12_room_0DL_007640 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0DL_007640"
+#define dspot12_room_0DL_007640 "__OTR__scenes/shared/spot12_scene/spot12_room_0DL_007640"
 static const ALIGN_ASSET(2) char spot12_room_0DL_007640[] = dspot12_room_0DL_007640;
 
-#define dspot12_room_0Set_000300DL_0048A8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_0048A8"
+#define dspot12_room_0Set_000300DL_0048A8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_0048A8"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_0048A8[] = dspot12_room_0Set_000300DL_0048A8;
 
-#define dspot12_room_0Set_000300DL_0050F0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_0050F0"
+#define dspot12_room_0Set_000300DL_0050F0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_0050F0"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_0050F0[] = dspot12_room_0Set_000300DL_0050F0;
 
-#define dspot12_room_0Set_000300DL_0055D0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_0055D0"
+#define dspot12_room_0Set_000300DL_0055D0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_0055D0"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_0055D0[] = dspot12_room_0Set_000300DL_0055D0;
 
-#define dspot12_room_0Set_000300DL_005B48 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_005B48"
+#define dspot12_room_0Set_000300DL_005B48 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_005B48"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_005B48[] = dspot12_room_0Set_000300DL_005B48;
 
-#define dspot12_room_0Set_000300DL_0065C8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_0065C8"
+#define dspot12_room_0Set_000300DL_0065C8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_0065C8"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_0065C8[] = dspot12_room_0Set_000300DL_0065C8;
 
-#define dspot12_room_0Set_000300DL_006F10 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_006F10"
+#define dspot12_room_0Set_000300DL_006F10 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_006F10"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_006F10[] = dspot12_room_0Set_000300DL_006F10;
 
-#define dspot12_room_0Set_000300DL_00FA10 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_00FA10"
+#define dspot12_room_0Set_000300DL_00FA10 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_00FA10"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_00FA10[] = dspot12_room_0Set_000300DL_00FA10;
 
-#define dspot12_room_0Set_000300DL_004CC8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_004CC8"
+#define dspot12_room_0Set_000300DL_004CC8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_004CC8"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_004CC8[] = dspot12_room_0Set_000300DL_004CC8;
 
-#define dspot12_room_0Set_000300DL_008000 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_008000"
+#define dspot12_room_0Set_000300DL_008000 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_008000"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_008000[] = dspot12_room_0Set_000300DL_008000;
 
-#define dspot12_room_0Set_000300DL_00F740 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_00F740"
+#define dspot12_room_0Set_000300DL_00F740 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_00F740"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_00F740[] = dspot12_room_0Set_000300DL_00F740;
 
-#define dspot12_room_0Set_000300DL_001F40 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_001F40"
+#define dspot12_room_0Set_000300DL_001F40 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_001F40"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_001F40[] = dspot12_room_0Set_000300DL_001F40;
 
-#define dspot12_room_0Set_000300DL_001AE0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_001AE0"
+#define dspot12_room_0Set_000300DL_001AE0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_001AE0"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_001AE0[] = dspot12_room_0Set_000300DL_001AE0;
 
-#define dspot12_room_0Set_000300DL_001D30 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_001D30"
+#define dspot12_room_0Set_000300DL_001D30 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_001D30"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_001D30[] = dspot12_room_0Set_000300DL_001D30;
 
-#define dspot12_room_0Set_000300DL_0014F0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_0014F0"
+#define dspot12_room_0Set_000300DL_0014F0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_0014F0"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_0014F0[] = dspot12_room_0Set_000300DL_0014F0;
 
-#define dspot12_room_0Set_000300DL_003970 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_003970"
+#define dspot12_room_0Set_000300DL_003970 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_003970"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_003970[] = dspot12_room_0Set_000300DL_003970;
 
-#define dspot12_room_0Set_000300DL_00F430 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_00F430"
+#define dspot12_room_0Set_000300DL_00F430 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_00F430"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_00F430[] = dspot12_room_0Set_000300DL_00F430;
 
-#define dspot12_room_0Set_000300DL_008620 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_008620"
+#define dspot12_room_0Set_000300DL_008620 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_008620"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_008620[] = dspot12_room_0Set_000300DL_008620;
 
-#define dspot12_room_0Set_000300DL_000B60 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_000B60"
+#define dspot12_room_0Set_000300DL_000B60 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_000B60"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_000B60[] = dspot12_room_0Set_000300DL_000B60;
 
-#define dspot12_room_0Set_000300DL_0088C8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_0088C8"
+#define dspot12_room_0Set_000300DL_0088C8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_0088C8"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_0088C8[] = dspot12_room_0Set_000300DL_0088C8;
 
-#define dspot12_room_0Set_000300DL_00FC80 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_00FC80"
+#define dspot12_room_0Set_000300DL_00FC80 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_00FC80"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_00FC80[] = dspot12_room_0Set_000300DL_00FC80;
 
-#define dspot12_room_0Set_000300DL_007640 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000300DL_007640"
+#define dspot12_room_0Set_000300DL_007640 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000300DL_007640"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000300DL_007640[] = dspot12_room_0Set_000300DL_007640;
 
-#define dspot12_room_0Set_000540DL_0048A8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_0048A8"
+#define dspot12_room_0Set_000540DL_0048A8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_0048A8"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_0048A8[] = dspot12_room_0Set_000540DL_0048A8;
 
-#define dspot12_room_0Set_000540DL_0050F0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_0050F0"
+#define dspot12_room_0Set_000540DL_0050F0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_0050F0"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_0050F0[] = dspot12_room_0Set_000540DL_0050F0;
 
-#define dspot12_room_0Set_000540DL_0055D0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_0055D0"
+#define dspot12_room_0Set_000540DL_0055D0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_0055D0"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_0055D0[] = dspot12_room_0Set_000540DL_0055D0;
 
-#define dspot12_room_0Set_000540DL_005B48 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_005B48"
+#define dspot12_room_0Set_000540DL_005B48 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_005B48"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_005B48[] = dspot12_room_0Set_000540DL_005B48;
 
-#define dspot12_room_0Set_000540DL_0065C8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_0065C8"
+#define dspot12_room_0Set_000540DL_0065C8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_0065C8"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_0065C8[] = dspot12_room_0Set_000540DL_0065C8;
 
-#define dspot12_room_0Set_000540DL_006F10 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_006F10"
+#define dspot12_room_0Set_000540DL_006F10 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_006F10"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_006F10[] = dspot12_room_0Set_000540DL_006F10;
 
-#define dspot12_room_0Set_000540DL_00FA10 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_00FA10"
+#define dspot12_room_0Set_000540DL_00FA10 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_00FA10"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_00FA10[] = dspot12_room_0Set_000540DL_00FA10;
 
-#define dspot12_room_0Set_000540DL_004CC8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_004CC8"
+#define dspot12_room_0Set_000540DL_004CC8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_004CC8"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_004CC8[] = dspot12_room_0Set_000540DL_004CC8;
 
-#define dspot12_room_0Set_000540DL_008000 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_008000"
+#define dspot12_room_0Set_000540DL_008000 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_008000"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_008000[] = dspot12_room_0Set_000540DL_008000;
 
-#define dspot12_room_0Set_000540DL_00F740 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_00F740"
+#define dspot12_room_0Set_000540DL_00F740 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_00F740"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_00F740[] = dspot12_room_0Set_000540DL_00F740;
 
-#define dspot12_room_0Set_000540DL_001F40 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_001F40"
+#define dspot12_room_0Set_000540DL_001F40 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_001F40"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_001F40[] = dspot12_room_0Set_000540DL_001F40;
 
-#define dspot12_room_0Set_000540DL_001AE0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_001AE0"
+#define dspot12_room_0Set_000540DL_001AE0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_001AE0"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_001AE0[] = dspot12_room_0Set_000540DL_001AE0;
 
-#define dspot12_room_0Set_000540DL_001D30 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_001D30"
+#define dspot12_room_0Set_000540DL_001D30 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_001D30"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_001D30[] = dspot12_room_0Set_000540DL_001D30;
 
-#define dspot12_room_0Set_000540DL_0014F0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_0014F0"
+#define dspot12_room_0Set_000540DL_0014F0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_0014F0"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_0014F0[] = dspot12_room_0Set_000540DL_0014F0;
 
-#define dspot12_room_0Set_000540DL_003970 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_003970"
+#define dspot12_room_0Set_000540DL_003970 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_003970"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_003970[] = dspot12_room_0Set_000540DL_003970;
 
-#define dspot12_room_0Set_000540DL_00F430 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_00F430"
+#define dspot12_room_0Set_000540DL_00F430 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_00F430"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_00F430[] = dspot12_room_0Set_000540DL_00F430;
 
-#define dspot12_room_0Set_000540DL_008620 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_008620"
+#define dspot12_room_0Set_000540DL_008620 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_008620"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_008620[] = dspot12_room_0Set_000540DL_008620;
 
-#define dspot12_room_0Set_000540DL_000B60 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_000B60"
+#define dspot12_room_0Set_000540DL_000B60 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_000B60"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_000B60[] = dspot12_room_0Set_000540DL_000B60;
 
-#define dspot12_room_0Set_000540DL_0088C8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_0088C8"
+#define dspot12_room_0Set_000540DL_0088C8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_0088C8"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_0088C8[] = dspot12_room_0Set_000540DL_0088C8;
 
-#define dspot12_room_0Set_000540DL_00FC80 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_00FC80"
+#define dspot12_room_0Set_000540DL_00FC80 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_00FC80"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_00FC80[] = dspot12_room_0Set_000540DL_00FC80;
 
-#define dspot12_room_0Set_000540DL_007640 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000540DL_007640"
+#define dspot12_room_0Set_000540DL_007640 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000540DL_007640"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000540DL_007640[] = dspot12_room_0Set_000540DL_007640;
 
-#define dspot12_room_0Set_000790DL_0048A8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_0048A8"
+#define dspot12_room_0Set_000790DL_0048A8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_0048A8"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_0048A8[] = dspot12_room_0Set_000790DL_0048A8;
 
-#define dspot12_room_0Set_000790DL_0050F0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_0050F0"
+#define dspot12_room_0Set_000790DL_0050F0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_0050F0"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_0050F0[] = dspot12_room_0Set_000790DL_0050F0;
 
-#define dspot12_room_0Set_000790DL_0055D0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_0055D0"
+#define dspot12_room_0Set_000790DL_0055D0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_0055D0"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_0055D0[] = dspot12_room_0Set_000790DL_0055D0;
 
-#define dspot12_room_0Set_000790DL_005B48 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_005B48"
+#define dspot12_room_0Set_000790DL_005B48 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_005B48"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_005B48[] = dspot12_room_0Set_000790DL_005B48;
 
-#define dspot12_room_0Set_000790DL_0065C8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_0065C8"
+#define dspot12_room_0Set_000790DL_0065C8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_0065C8"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_0065C8[] = dspot12_room_0Set_000790DL_0065C8;
 
-#define dspot12_room_0Set_000790DL_006F10 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_006F10"
+#define dspot12_room_0Set_000790DL_006F10 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_006F10"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_006F10[] = dspot12_room_0Set_000790DL_006F10;
 
-#define dspot12_room_0Set_000790DL_00FA10 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_00FA10"
+#define dspot12_room_0Set_000790DL_00FA10 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_00FA10"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_00FA10[] = dspot12_room_0Set_000790DL_00FA10;
 
-#define dspot12_room_0Set_000790DL_004CC8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_004CC8"
+#define dspot12_room_0Set_000790DL_004CC8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_004CC8"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_004CC8[] = dspot12_room_0Set_000790DL_004CC8;
 
-#define dspot12_room_0Set_000790DL_008000 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_008000"
+#define dspot12_room_0Set_000790DL_008000 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_008000"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_008000[] = dspot12_room_0Set_000790DL_008000;
 
-#define dspot12_room_0Set_000790DL_00F740 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_00F740"
+#define dspot12_room_0Set_000790DL_00F740 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_00F740"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_00F740[] = dspot12_room_0Set_000790DL_00F740;
 
-#define dspot12_room_0Set_000790DL_001F40 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_001F40"
+#define dspot12_room_0Set_000790DL_001F40 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_001F40"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_001F40[] = dspot12_room_0Set_000790DL_001F40;
 
-#define dspot12_room_0Set_000790DL_001AE0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_001AE0"
+#define dspot12_room_0Set_000790DL_001AE0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_001AE0"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_001AE0[] = dspot12_room_0Set_000790DL_001AE0;
 
-#define dspot12_room_0Set_000790DL_001D30 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_001D30"
+#define dspot12_room_0Set_000790DL_001D30 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_001D30"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_001D30[] = dspot12_room_0Set_000790DL_001D30;
 
-#define dspot12_room_0Set_000790DL_0014F0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_0014F0"
+#define dspot12_room_0Set_000790DL_0014F0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_0014F0"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_0014F0[] = dspot12_room_0Set_000790DL_0014F0;
 
-#define dspot12_room_0Set_000790DL_003970 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_003970"
+#define dspot12_room_0Set_000790DL_003970 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_003970"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_003970[] = dspot12_room_0Set_000790DL_003970;
 
-#define dspot12_room_0Set_000790DL_00F430 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_00F430"
+#define dspot12_room_0Set_000790DL_00F430 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_00F430"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_00F430[] = dspot12_room_0Set_000790DL_00F430;
 
-#define dspot12_room_0Set_000790DL_008620 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_008620"
+#define dspot12_room_0Set_000790DL_008620 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_008620"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_008620[] = dspot12_room_0Set_000790DL_008620;
 
-#define dspot12_room_0Set_000790DL_000B60 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_000B60"
+#define dspot12_room_0Set_000790DL_000B60 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_000B60"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_000B60[] = dspot12_room_0Set_000790DL_000B60;
 
-#define dspot12_room_0Set_000790DL_0088C8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_0088C8"
+#define dspot12_room_0Set_000790DL_0088C8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_0088C8"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_0088C8[] = dspot12_room_0Set_000790DL_0088C8;
 
-#define dspot12_room_0Set_000790DL_00FC80 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_00FC80"
+#define dspot12_room_0Set_000790DL_00FC80 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_00FC80"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_00FC80[] = dspot12_room_0Set_000790DL_00FC80;
 
-#define dspot12_room_0Set_000790DL_007640 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000790DL_007640"
+#define dspot12_room_0Set_000790DL_007640 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000790DL_007640"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000790DL_007640[] = dspot12_room_0Set_000790DL_007640;
 
-#define dspot12_room_0Set_000860DL_0048A8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_0048A8"
+#define dspot12_room_0Set_000860DL_0048A8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_0048A8"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_0048A8[] = dspot12_room_0Set_000860DL_0048A8;
 
-#define dspot12_room_0Set_000860DL_0050F0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_0050F0"
+#define dspot12_room_0Set_000860DL_0050F0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_0050F0"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_0050F0[] = dspot12_room_0Set_000860DL_0050F0;
 
-#define dspot12_room_0Set_000860DL_0055D0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_0055D0"
+#define dspot12_room_0Set_000860DL_0055D0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_0055D0"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_0055D0[] = dspot12_room_0Set_000860DL_0055D0;
 
-#define dspot12_room_0Set_000860DL_005B48 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_005B48"
+#define dspot12_room_0Set_000860DL_005B48 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_005B48"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_005B48[] = dspot12_room_0Set_000860DL_005B48;
 
-#define dspot12_room_0Set_000860DL_0065C8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_0065C8"
+#define dspot12_room_0Set_000860DL_0065C8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_0065C8"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_0065C8[] = dspot12_room_0Set_000860DL_0065C8;
 
-#define dspot12_room_0Set_000860DL_006F10 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_006F10"
+#define dspot12_room_0Set_000860DL_006F10 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_006F10"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_006F10[] = dspot12_room_0Set_000860DL_006F10;
 
-#define dspot12_room_0Set_000860DL_00FA10 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_00FA10"
+#define dspot12_room_0Set_000860DL_00FA10 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_00FA10"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_00FA10[] = dspot12_room_0Set_000860DL_00FA10;
 
-#define dspot12_room_0Set_000860DL_004CC8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_004CC8"
+#define dspot12_room_0Set_000860DL_004CC8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_004CC8"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_004CC8[] = dspot12_room_0Set_000860DL_004CC8;
 
-#define dspot12_room_0Set_000860DL_008000 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_008000"
+#define dspot12_room_0Set_000860DL_008000 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_008000"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_008000[] = dspot12_room_0Set_000860DL_008000;
 
-#define dspot12_room_0Set_000860DL_00F740 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_00F740"
+#define dspot12_room_0Set_000860DL_00F740 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_00F740"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_00F740[] = dspot12_room_0Set_000860DL_00F740;
 
-#define dspot12_room_0Set_000860DL_001F40 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_001F40"
+#define dspot12_room_0Set_000860DL_001F40 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_001F40"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_001F40[] = dspot12_room_0Set_000860DL_001F40;
 
-#define dspot12_room_0Set_000860DL_001AE0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_001AE0"
+#define dspot12_room_0Set_000860DL_001AE0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_001AE0"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_001AE0[] = dspot12_room_0Set_000860DL_001AE0;
 
-#define dspot12_room_0Set_000860DL_001D30 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_001D30"
+#define dspot12_room_0Set_000860DL_001D30 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_001D30"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_001D30[] = dspot12_room_0Set_000860DL_001D30;
 
-#define dspot12_room_0Set_000860DL_0014F0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_0014F0"
+#define dspot12_room_0Set_000860DL_0014F0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_0014F0"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_0014F0[] = dspot12_room_0Set_000860DL_0014F0;
 
-#define dspot12_room_0Set_000860DL_003970 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_003970"
+#define dspot12_room_0Set_000860DL_003970 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_003970"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_003970[] = dspot12_room_0Set_000860DL_003970;
 
-#define dspot12_room_0Set_000860DL_00F430 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_00F430"
+#define dspot12_room_0Set_000860DL_00F430 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_00F430"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_00F430[] = dspot12_room_0Set_000860DL_00F430;
 
-#define dspot12_room_0Set_000860DL_008620 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_008620"
+#define dspot12_room_0Set_000860DL_008620 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_008620"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_008620[] = dspot12_room_0Set_000860DL_008620;
 
-#define dspot12_room_0Set_000860DL_000B60 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_000B60"
+#define dspot12_room_0Set_000860DL_000B60 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_000B60"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_000B60[] = dspot12_room_0Set_000860DL_000B60;
 
-#define dspot12_room_0Set_000860DL_0088C8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_0088C8"
+#define dspot12_room_0Set_000860DL_0088C8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_0088C8"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_0088C8[] = dspot12_room_0Set_000860DL_0088C8;
 
-#define dspot12_room_0Set_000860DL_00FC80 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_00FC80"
+#define dspot12_room_0Set_000860DL_00FC80 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_00FC80"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_00FC80[] = dspot12_room_0Set_000860DL_00FC80;
 
-#define dspot12_room_0Set_000860DL_007640 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_000860DL_007640"
+#define dspot12_room_0Set_000860DL_007640 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_000860DL_007640"
 static const ALIGN_ASSET(2) char spot12_room_0Set_000860DL_007640[] = dspot12_room_0Set_000860DL_007640;
 
-#define dspot12_room_0Set_0008C0DL_0048A8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_0048A8"
+#define dspot12_room_0Set_0008C0DL_0048A8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_0048A8"
 static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_0048A8[] = dspot12_room_0Set_0008C0DL_0048A8;
 
-#define dspot12_room_0Set_0008C0DL_0050F0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_0050F0"
+#define dspot12_room_0Set_0008C0DL_0050F0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_0050F0"
 static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_0050F0[] = dspot12_room_0Set_0008C0DL_0050F0;
 
-#define dspot12_room_0Set_0008C0DL_0055D0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_0055D0"
+#define dspot12_room_0Set_0008C0DL_0055D0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_0055D0"
 static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_0055D0[] = dspot12_room_0Set_0008C0DL_0055D0;
 
-#define dspot12_room_0Set_0008C0DL_005B48 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_005B48"
+#define dspot12_room_0Set_0008C0DL_005B48 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_005B48"
 static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_005B48[] = dspot12_room_0Set_0008C0DL_005B48;
 
-#define dspot12_room_0Set_0008C0DL_0065C8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_0065C8"
+#define dspot12_room_0Set_0008C0DL_0065C8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_0065C8"
 static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_0065C8[] = dspot12_room_0Set_0008C0DL_0065C8;
 
-#define dspot12_room_0Set_0008C0DL_006F10 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_006F10"
+#define dspot12_room_0Set_0008C0DL_006F10 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_006F10"
 static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_006F10[] = dspot12_room_0Set_0008C0DL_006F10;
 
-#define dspot12_room_0Set_0008C0DL_00FA10 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_00FA10"
+#define dspot12_room_0Set_0008C0DL_00FA10 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_00FA10"
 static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_00FA10[] = dspot12_room_0Set_0008C0DL_00FA10;
 
-#define dspot12_room_0Set_0008C0DL_004CC8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_004CC8"
+#define dspot12_room_0Set_0008C0DL_004CC8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_004CC8"
 static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_004CC8[] = dspot12_room_0Set_0008C0DL_004CC8;
 
-#define dspot12_room_0Set_0008C0DL_008000 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_008000"
+#define dspot12_room_0Set_0008C0DL_008000 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_008000"
 static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_008000[] = dspot12_room_0Set_0008C0DL_008000;
 
-#define dspot12_room_0Set_0008C0DL_00F740 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_00F740"
+#define dspot12_room_0Set_0008C0DL_00F740 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_00F740"
 static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_00F740[] = dspot12_room_0Set_0008C0DL_00F740;
 
-#define dspot12_room_0Set_0008C0DL_001F40 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_001F40"
+#define dspot12_room_0Set_0008C0DL_001F40 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_001F40"
 static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_001F40[] = dspot12_room_0Set_0008C0DL_001F40;
 
-#define dspot12_room_0Set_0008C0DL_001AE0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_001AE0"
+#define dspot12_room_0Set_0008C0DL_001AE0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_001AE0"
 static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_001AE0[] = dspot12_room_0Set_0008C0DL_001AE0;
 
-#define dspot12_room_0Set_0008C0DL_001D30 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_001D30"
+#define dspot12_room_0Set_0008C0DL_001D30 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_001D30"
 static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_001D30[] = dspot12_room_0Set_0008C0DL_001D30;
 
-#define dspot12_room_0Set_0008C0DL_0014F0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_0014F0"
+#define dspot12_room_0Set_0008C0DL_0014F0 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_0014F0"
 static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_0014F0[] = dspot12_room_0Set_0008C0DL_0014F0;
 
-#define dspot12_room_0Set_0008C0DL_003970 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_003970"
+#define dspot12_room_0Set_0008C0DL_003970 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_003970"
 static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_003970[] = dspot12_room_0Set_0008C0DL_003970;
 
-#define dspot12_room_0Set_0008C0DL_00F430 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_00F430"
+#define dspot12_room_0Set_0008C0DL_00F430 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_00F430"
 static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_00F430[] = dspot12_room_0Set_0008C0DL_00F430;
 
-#define dspot12_room_0Set_0008C0DL_008620 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_008620"
+#define dspot12_room_0Set_0008C0DL_008620 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_008620"
 static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_008620[] = dspot12_room_0Set_0008C0DL_008620;
 
-#define dspot12_room_0Set_0008C0DL_000B60 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_000B60"
+#define dspot12_room_0Set_0008C0DL_000B60 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_000B60"
 static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_000B60[] = dspot12_room_0Set_0008C0DL_000B60;
 
-#define dspot12_room_0Set_0008C0DL_0088C8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_0088C8"
+#define dspot12_room_0Set_0008C0DL_0088C8 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_0088C8"
 static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_0088C8[] = dspot12_room_0Set_0008C0DL_0088C8;
 
-#define dspot12_room_0Set_0008C0DL_00FC80 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_00FC80"
+#define dspot12_room_0Set_0008C0DL_00FC80 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_00FC80"
 static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_00FC80[] = dspot12_room_0Set_0008C0DL_00FC80;
 
-#define dspot12_room_0Set_0008C0DL_007640 "__OTR__scenes/nonmq/spot12_scene/spot12_room_0Set_0008C0DL_007640"
+#define dspot12_room_0Set_0008C0DL_007640 "__OTR__scenes/shared/spot12_scene/spot12_room_0Set_0008C0DL_007640"
 static const ALIGN_ASSET(2) char spot12_room_0Set_0008C0DL_007640[] = dspot12_room_0Set_0008C0DL_007640;
 
 
diff --git a/soh/assets/scenes/overworld/spot12/spot12_room_1.h b/soh/assets/scenes/overworld/spot12/spot12_room_1.h
index d6f478f38..89e0e3fc2 100644
--- a/soh/assets/scenes/overworld/spot12/spot12_room_1.h
+++ b/soh/assets/scenes/overworld/spot12/spot12_room_1.h
@@ -3,211 +3,211 @@
 
 #include "align_asset_macro.h"
 
-#define dspot12_room_1DL_0050A0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1DL_0050A0"
-static const ALIGN_ASSET(2) char spot12_room_1DL_0050A0[] = dspot12_room_1DL_0050A0;
-
-#define dspot12_room_1DL_0026A8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1DL_0026A8"
-static const ALIGN_ASSET(2) char spot12_room_1DL_0026A8[] = dspot12_room_1DL_0026A8;
-
-#define dspot12_room_1DL_002DB0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1DL_002DB0"
-static const ALIGN_ASSET(2) char spot12_room_1DL_002DB0[] = dspot12_room_1DL_002DB0;
-
-#define dspot12_room_1Tex_009E38 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Tex_009E38"
-static const ALIGN_ASSET(2) char spot12_room_1Tex_009E38[] = dspot12_room_1Tex_009E38;
-
-#define dspot12_room_1Tex_00A638 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Tex_00A638"
-static const ALIGN_ASSET(2) char spot12_room_1Tex_00A638[] = dspot12_room_1Tex_00A638;
-
-#define dspot12_room_1DL_001180 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1DL_001180"
-static const ALIGN_ASSET(2) char spot12_room_1DL_001180[] = dspot12_room_1DL_001180;
-
-#define dspot12_room_1Tex_008E38 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Tex_008E38"
-static const ALIGN_ASSET(2) char spot12_room_1Tex_008E38[] = dspot12_room_1Tex_008E38;
-
-#define dspot12_room_1Tex_007638 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Tex_007638"
-static const ALIGN_ASSET(2) char spot12_room_1Tex_007638[] = dspot12_room_1Tex_007638;
-
-#define dspot12_room_1Tex_006638 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Tex_006638"
-static const ALIGN_ASSET(2) char spot12_room_1Tex_006638[] = dspot12_room_1Tex_006638;
-
-#define dspot12_room_1DL_0034E8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1DL_0034E8"
-static const ALIGN_ASSET(2) char spot12_room_1DL_0034E8[] = dspot12_room_1DL_0034E8;
-
-#define dspot12_room_1Tex_007E38 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Tex_007E38"
-static const ALIGN_ASSET(2) char spot12_room_1Tex_007E38[] = dspot12_room_1Tex_007E38;
-
-#define dspot12_room_1DL_004798 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1DL_004798"
-static const ALIGN_ASSET(2) char spot12_room_1DL_004798[] = dspot12_room_1DL_004798;
-
-#define dspot12_room_1DL_003E40 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1DL_003E40"
-static const ALIGN_ASSET(2) char spot12_room_1DL_003E40[] = dspot12_room_1DL_003E40;
-
-#define dspot12_room_1DL_00AF80 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1DL_00AF80"
-static const ALIGN_ASSET(2) char spot12_room_1DL_00AF80[] = dspot12_room_1DL_00AF80;
-
-#define dspot12_room_1Tex_00B8A0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Tex_00B8A0"
-static const ALIGN_ASSET(2) char spot12_room_1Tex_00B8A0[] = dspot12_room_1Tex_00B8A0;
-
-#define dspot12_room_1Tex_00B0A0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Tex_00B0A0"
-static const ALIGN_ASSET(2) char spot12_room_1Tex_00B0A0[] = dspot12_room_1Tex_00B0A0;
-
-#define dspot12_room_1DL_001E58 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1DL_001E58"
-static const ALIGN_ASSET(2) char spot12_room_1DL_001E58[] = dspot12_room_1DL_001E58;
-
-#define dspot12_room_1DL_002A60 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1DL_002A60"
-static const ALIGN_ASSET(2) char spot12_room_1DL_002A60[] = dspot12_room_1DL_002A60;
-
-#define dspot12_room_1Tex_005638 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Tex_005638"
+#define dspot12_room_1Tex_005638 "__OTR__scenes/shared/spot12_scene/spot12_room_1Tex_005638"
 static const ALIGN_ASSET(2) char spot12_room_1Tex_005638[] = dspot12_room_1Tex_005638;
 
-#define dspot12_room_1Set_000200DL_0050A0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000200DL_0050A0"
+#define dspot12_room_1Tex_006638 "__OTR__scenes/shared/spot12_scene/spot12_room_1Tex_006638"
+static const ALIGN_ASSET(2) char spot12_room_1Tex_006638[] = dspot12_room_1Tex_006638;
+
+#define dspot12_room_1Tex_007638 "__OTR__scenes/shared/spot12_scene/spot12_room_1Tex_007638"
+static const ALIGN_ASSET(2) char spot12_room_1Tex_007638[] = dspot12_room_1Tex_007638;
+
+#define dspot12_room_1Tex_007E38 "__OTR__scenes/shared/spot12_scene/spot12_room_1Tex_007E38"
+static const ALIGN_ASSET(2) char spot12_room_1Tex_007E38[] = dspot12_room_1Tex_007E38;
+
+#define dspot12_room_1Tex_008E38 "__OTR__scenes/shared/spot12_scene/spot12_room_1Tex_008E38"
+static const ALIGN_ASSET(2) char spot12_room_1Tex_008E38[] = dspot12_room_1Tex_008E38;
+
+#define dspot12_room_1Tex_009E38 "__OTR__scenes/shared/spot12_scene/spot12_room_1Tex_009E38"
+static const ALIGN_ASSET(2) char spot12_room_1Tex_009E38[] = dspot12_room_1Tex_009E38;
+
+#define dspot12_room_1Tex_00A638 "__OTR__scenes/shared/spot12_scene/spot12_room_1Tex_00A638"
+static const ALIGN_ASSET(2) char spot12_room_1Tex_00A638[] = dspot12_room_1Tex_00A638;
+
+#define dspot12_room_1Tex_00B0A0 "__OTR__scenes/shared/spot12_scene/spot12_room_1Tex_00B0A0"
+static const ALIGN_ASSET(2) char spot12_room_1Tex_00B0A0[] = dspot12_room_1Tex_00B0A0;
+
+#define dspot12_room_1Tex_00B8A0 "__OTR__scenes/shared/spot12_scene/spot12_room_1Tex_00B8A0"
+static const ALIGN_ASSET(2) char spot12_room_1Tex_00B8A0[] = dspot12_room_1Tex_00B8A0;
+
+#define dspot12_room_1DL_0050A0 "__OTR__scenes/shared/spot12_scene/spot12_room_1DL_0050A0"
+static const ALIGN_ASSET(2) char spot12_room_1DL_0050A0[] = dspot12_room_1DL_0050A0;
+
+#define dspot12_room_1DL_0026A8 "__OTR__scenes/shared/spot12_scene/spot12_room_1DL_0026A8"
+static const ALIGN_ASSET(2) char spot12_room_1DL_0026A8[] = dspot12_room_1DL_0026A8;
+
+#define dspot12_room_1DL_002DB0 "__OTR__scenes/shared/spot12_scene/spot12_room_1DL_002DB0"
+static const ALIGN_ASSET(2) char spot12_room_1DL_002DB0[] = dspot12_room_1DL_002DB0;
+
+#define dspot12_room_1DL_001180 "__OTR__scenes/shared/spot12_scene/spot12_room_1DL_001180"
+static const ALIGN_ASSET(2) char spot12_room_1DL_001180[] = dspot12_room_1DL_001180;
+
+#define dspot12_room_1DL_0034E8 "__OTR__scenes/shared/spot12_scene/spot12_room_1DL_0034E8"
+static const ALIGN_ASSET(2) char spot12_room_1DL_0034E8[] = dspot12_room_1DL_0034E8;
+
+#define dspot12_room_1DL_004798 "__OTR__scenes/shared/spot12_scene/spot12_room_1DL_004798"
+static const ALIGN_ASSET(2) char spot12_room_1DL_004798[] = dspot12_room_1DL_004798;
+
+#define dspot12_room_1DL_003E40 "__OTR__scenes/shared/spot12_scene/spot12_room_1DL_003E40"
+static const ALIGN_ASSET(2) char spot12_room_1DL_003E40[] = dspot12_room_1DL_003E40;
+
+#define dspot12_room_1DL_00AF80 "__OTR__scenes/shared/spot12_scene/spot12_room_1DL_00AF80"
+static const ALIGN_ASSET(2) char spot12_room_1DL_00AF80[] = dspot12_room_1DL_00AF80;
+
+#define dspot12_room_1DL_001E58 "__OTR__scenes/shared/spot12_scene/spot12_room_1DL_001E58"
+static const ALIGN_ASSET(2) char spot12_room_1DL_001E58[] = dspot12_room_1DL_001E58;
+
+#define dspot12_room_1DL_002A60 "__OTR__scenes/shared/spot12_scene/spot12_room_1DL_002A60"
+static const ALIGN_ASSET(2) char spot12_room_1DL_002A60[] = dspot12_room_1DL_002A60;
+
+#define dspot12_room_1Set_000200DL_0050A0 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000200DL_0050A0"
 static const ALIGN_ASSET(2) char spot12_room_1Set_000200DL_0050A0[] = dspot12_room_1Set_000200DL_0050A0;
 
-#define dspot12_room_1Set_000200DL_0026A8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000200DL_0026A8"
+#define dspot12_room_1Set_000200DL_0026A8 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000200DL_0026A8"
 static const ALIGN_ASSET(2) char spot12_room_1Set_000200DL_0026A8[] = dspot12_room_1Set_000200DL_0026A8;
 
-#define dspot12_room_1Set_000200DL_002DB0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000200DL_002DB0"
+#define dspot12_room_1Set_000200DL_002DB0 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000200DL_002DB0"
 static const ALIGN_ASSET(2) char spot12_room_1Set_000200DL_002DB0[] = dspot12_room_1Set_000200DL_002DB0;
 
-#define dspot12_room_1Set_000200DL_001180 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000200DL_001180"
+#define dspot12_room_1Set_000200DL_001180 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000200DL_001180"
 static const ALIGN_ASSET(2) char spot12_room_1Set_000200DL_001180[] = dspot12_room_1Set_000200DL_001180;
 
-#define dspot12_room_1Set_000200DL_0034E8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000200DL_0034E8"
+#define dspot12_room_1Set_000200DL_0034E8 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000200DL_0034E8"
 static const ALIGN_ASSET(2) char spot12_room_1Set_000200DL_0034E8[] = dspot12_room_1Set_000200DL_0034E8;
 
-#define dspot12_room_1Set_000200DL_004798 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000200DL_004798"
+#define dspot12_room_1Set_000200DL_004798 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000200DL_004798"
 static const ALIGN_ASSET(2) char spot12_room_1Set_000200DL_004798[] = dspot12_room_1Set_000200DL_004798;
 
-#define dspot12_room_1Set_000200DL_003E40 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000200DL_003E40"
+#define dspot12_room_1Set_000200DL_003E40 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000200DL_003E40"
 static const ALIGN_ASSET(2) char spot12_room_1Set_000200DL_003E40[] = dspot12_room_1Set_000200DL_003E40;
 
-#define dspot12_room_1Set_000200DL_00AF80 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000200DL_00AF80"
+#define dspot12_room_1Set_000200DL_00AF80 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000200DL_00AF80"
 static const ALIGN_ASSET(2) char spot12_room_1Set_000200DL_00AF80[] = dspot12_room_1Set_000200DL_00AF80;
 
-#define dspot12_room_1Set_000200DL_001E58 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000200DL_001E58"
+#define dspot12_room_1Set_000200DL_001E58 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000200DL_001E58"
 static const ALIGN_ASSET(2) char spot12_room_1Set_000200DL_001E58[] = dspot12_room_1Set_000200DL_001E58;
 
-#define dspot12_room_1Set_000200DL_002A60 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000200DL_002A60"
+#define dspot12_room_1Set_000200DL_002A60 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000200DL_002A60"
 static const ALIGN_ASSET(2) char spot12_room_1Set_000200DL_002A60[] = dspot12_room_1Set_000200DL_002A60;
 
-#define dspot12_room_1Set_0003B0DL_0050A0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0003B0DL_0050A0"
+#define dspot12_room_1Set_0003B0DL_0050A0 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0003B0DL_0050A0"
 static const ALIGN_ASSET(2) char spot12_room_1Set_0003B0DL_0050A0[] = dspot12_room_1Set_0003B0DL_0050A0;
 
-#define dspot12_room_1Set_0003B0DL_0026A8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0003B0DL_0026A8"
+#define dspot12_room_1Set_0003B0DL_0026A8 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0003B0DL_0026A8"
 static const ALIGN_ASSET(2) char spot12_room_1Set_0003B0DL_0026A8[] = dspot12_room_1Set_0003B0DL_0026A8;
 
-#define dspot12_room_1Set_0003B0DL_002DB0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0003B0DL_002DB0"
+#define dspot12_room_1Set_0003B0DL_002DB0 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0003B0DL_002DB0"
 static const ALIGN_ASSET(2) char spot12_room_1Set_0003B0DL_002DB0[] = dspot12_room_1Set_0003B0DL_002DB0;
 
-#define dspot12_room_1Set_0003B0DL_001180 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0003B0DL_001180"
+#define dspot12_room_1Set_0003B0DL_001180 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0003B0DL_001180"
 static const ALIGN_ASSET(2) char spot12_room_1Set_0003B0DL_001180[] = dspot12_room_1Set_0003B0DL_001180;
 
-#define dspot12_room_1Set_0003B0DL_0034E8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0003B0DL_0034E8"
+#define dspot12_room_1Set_0003B0DL_0034E8 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0003B0DL_0034E8"
 static const ALIGN_ASSET(2) char spot12_room_1Set_0003B0DL_0034E8[] = dspot12_room_1Set_0003B0DL_0034E8;
 
-#define dspot12_room_1Set_0003B0DL_004798 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0003B0DL_004798"
+#define dspot12_room_1Set_0003B0DL_004798 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0003B0DL_004798"
 static const ALIGN_ASSET(2) char spot12_room_1Set_0003B0DL_004798[] = dspot12_room_1Set_0003B0DL_004798;
 
-#define dspot12_room_1Set_0003B0DL_003E40 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0003B0DL_003E40"
+#define dspot12_room_1Set_0003B0DL_003E40 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0003B0DL_003E40"
 static const ALIGN_ASSET(2) char spot12_room_1Set_0003B0DL_003E40[] = dspot12_room_1Set_0003B0DL_003E40;
 
-#define dspot12_room_1Set_0003B0DL_00AF80 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0003B0DL_00AF80"
+#define dspot12_room_1Set_0003B0DL_00AF80 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0003B0DL_00AF80"
 static const ALIGN_ASSET(2) char spot12_room_1Set_0003B0DL_00AF80[] = dspot12_room_1Set_0003B0DL_00AF80;
 
-#define dspot12_room_1Set_0003B0DL_001E58 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0003B0DL_001E58"
+#define dspot12_room_1Set_0003B0DL_001E58 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0003B0DL_001E58"
 static const ALIGN_ASSET(2) char spot12_room_1Set_0003B0DL_001E58[] = dspot12_room_1Set_0003B0DL_001E58;
 
-#define dspot12_room_1Set_0003B0DL_002A60 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0003B0DL_002A60"
+#define dspot12_room_1Set_0003B0DL_002A60 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0003B0DL_002A60"
 static const ALIGN_ASSET(2) char spot12_room_1Set_0003B0DL_002A60[] = dspot12_room_1Set_0003B0DL_002A60;
 
-#define dspot12_room_1Set_000500DL_0050A0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000500DL_0050A0"
+#define dspot12_room_1Set_000500DL_0050A0 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000500DL_0050A0"
 static const ALIGN_ASSET(2) char spot12_room_1Set_000500DL_0050A0[] = dspot12_room_1Set_000500DL_0050A0;
 
-#define dspot12_room_1Set_000500DL_0026A8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000500DL_0026A8"
+#define dspot12_room_1Set_000500DL_0026A8 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000500DL_0026A8"
 static const ALIGN_ASSET(2) char spot12_room_1Set_000500DL_0026A8[] = dspot12_room_1Set_000500DL_0026A8;
 
-#define dspot12_room_1Set_000500DL_002DB0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000500DL_002DB0"
+#define dspot12_room_1Set_000500DL_002DB0 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000500DL_002DB0"
 static const ALIGN_ASSET(2) char spot12_room_1Set_000500DL_002DB0[] = dspot12_room_1Set_000500DL_002DB0;
 
-#define dspot12_room_1Set_000500DL_001180 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000500DL_001180"
+#define dspot12_room_1Set_000500DL_001180 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000500DL_001180"
 static const ALIGN_ASSET(2) char spot12_room_1Set_000500DL_001180[] = dspot12_room_1Set_000500DL_001180;
 
-#define dspot12_room_1Set_000500DL_0034E8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000500DL_0034E8"
+#define dspot12_room_1Set_000500DL_0034E8 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000500DL_0034E8"
 static const ALIGN_ASSET(2) char spot12_room_1Set_000500DL_0034E8[] = dspot12_room_1Set_000500DL_0034E8;
 
-#define dspot12_room_1Set_000500DL_004798 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000500DL_004798"
+#define dspot12_room_1Set_000500DL_004798 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000500DL_004798"
 static const ALIGN_ASSET(2) char spot12_room_1Set_000500DL_004798[] = dspot12_room_1Set_000500DL_004798;
 
-#define dspot12_room_1Set_000500DL_003E40 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000500DL_003E40"
+#define dspot12_room_1Set_000500DL_003E40 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000500DL_003E40"
 static const ALIGN_ASSET(2) char spot12_room_1Set_000500DL_003E40[] = dspot12_room_1Set_000500DL_003E40;
 
-#define dspot12_room_1Set_000500DL_00AF80 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000500DL_00AF80"
+#define dspot12_room_1Set_000500DL_00AF80 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000500DL_00AF80"
 static const ALIGN_ASSET(2) char spot12_room_1Set_000500DL_00AF80[] = dspot12_room_1Set_000500DL_00AF80;
 
-#define dspot12_room_1Set_000500DL_001E58 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000500DL_001E58"
+#define dspot12_room_1Set_000500DL_001E58 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000500DL_001E58"
 static const ALIGN_ASSET(2) char spot12_room_1Set_000500DL_001E58[] = dspot12_room_1Set_000500DL_001E58;
 
-#define dspot12_room_1Set_000500DL_002A60 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000500DL_002A60"
+#define dspot12_room_1Set_000500DL_002A60 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000500DL_002A60"
 static const ALIGN_ASSET(2) char spot12_room_1Set_000500DL_002A60[] = dspot12_room_1Set_000500DL_002A60;
 
-#define dspot12_room_1Set_000720DL_0050A0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000720DL_0050A0"
+#define dspot12_room_1Set_000720DL_0050A0 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000720DL_0050A0"
 static const ALIGN_ASSET(2) char spot12_room_1Set_000720DL_0050A0[] = dspot12_room_1Set_000720DL_0050A0;
 
-#define dspot12_room_1Set_000720DL_0026A8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000720DL_0026A8"
+#define dspot12_room_1Set_000720DL_0026A8 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000720DL_0026A8"
 static const ALIGN_ASSET(2) char spot12_room_1Set_000720DL_0026A8[] = dspot12_room_1Set_000720DL_0026A8;
 
-#define dspot12_room_1Set_000720DL_002DB0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000720DL_002DB0"
+#define dspot12_room_1Set_000720DL_002DB0 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000720DL_002DB0"
 static const ALIGN_ASSET(2) char spot12_room_1Set_000720DL_002DB0[] = dspot12_room_1Set_000720DL_002DB0;
 
-#define dspot12_room_1Set_000720DL_001180 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000720DL_001180"
+#define dspot12_room_1Set_000720DL_001180 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000720DL_001180"
 static const ALIGN_ASSET(2) char spot12_room_1Set_000720DL_001180[] = dspot12_room_1Set_000720DL_001180;
 
-#define dspot12_room_1Set_000720DL_0034E8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000720DL_0034E8"
+#define dspot12_room_1Set_000720DL_0034E8 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000720DL_0034E8"
 static const ALIGN_ASSET(2) char spot12_room_1Set_000720DL_0034E8[] = dspot12_room_1Set_000720DL_0034E8;
 
-#define dspot12_room_1Set_000720DL_004798 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000720DL_004798"
+#define dspot12_room_1Set_000720DL_004798 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000720DL_004798"
 static const ALIGN_ASSET(2) char spot12_room_1Set_000720DL_004798[] = dspot12_room_1Set_000720DL_004798;
 
-#define dspot12_room_1Set_000720DL_003E40 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000720DL_003E40"
+#define dspot12_room_1Set_000720DL_003E40 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000720DL_003E40"
 static const ALIGN_ASSET(2) char spot12_room_1Set_000720DL_003E40[] = dspot12_room_1Set_000720DL_003E40;
 
-#define dspot12_room_1Set_000720DL_00AF80 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000720DL_00AF80"
+#define dspot12_room_1Set_000720DL_00AF80 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000720DL_00AF80"
 static const ALIGN_ASSET(2) char spot12_room_1Set_000720DL_00AF80[] = dspot12_room_1Set_000720DL_00AF80;
 
-#define dspot12_room_1Set_000720DL_001E58 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000720DL_001E58"
+#define dspot12_room_1Set_000720DL_001E58 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000720DL_001E58"
 static const ALIGN_ASSET(2) char spot12_room_1Set_000720DL_001E58[] = dspot12_room_1Set_000720DL_001E58;
 
-#define dspot12_room_1Set_000720DL_002A60 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_000720DL_002A60"
+#define dspot12_room_1Set_000720DL_002A60 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_000720DL_002A60"
 static const ALIGN_ASSET(2) char spot12_room_1Set_000720DL_002A60[] = dspot12_room_1Set_000720DL_002A60;
 
-#define dspot12_room_1Set_0007F0DL_0050A0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0007F0DL_0050A0"
+#define dspot12_room_1Set_0007F0DL_0050A0 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0007F0DL_0050A0"
 static const ALIGN_ASSET(2) char spot12_room_1Set_0007F0DL_0050A0[] = dspot12_room_1Set_0007F0DL_0050A0;
 
-#define dspot12_room_1Set_0007F0DL_0026A8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0007F0DL_0026A8"
+#define dspot12_room_1Set_0007F0DL_0026A8 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0007F0DL_0026A8"
 static const ALIGN_ASSET(2) char spot12_room_1Set_0007F0DL_0026A8[] = dspot12_room_1Set_0007F0DL_0026A8;
 
-#define dspot12_room_1Set_0007F0DL_002DB0 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0007F0DL_002DB0"
+#define dspot12_room_1Set_0007F0DL_002DB0 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0007F0DL_002DB0"
 static const ALIGN_ASSET(2) char spot12_room_1Set_0007F0DL_002DB0[] = dspot12_room_1Set_0007F0DL_002DB0;
 
-#define dspot12_room_1Set_0007F0DL_001180 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0007F0DL_001180"
+#define dspot12_room_1Set_0007F0DL_001180 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0007F0DL_001180"
 static const ALIGN_ASSET(2) char spot12_room_1Set_0007F0DL_001180[] = dspot12_room_1Set_0007F0DL_001180;
 
-#define dspot12_room_1Set_0007F0DL_0034E8 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0007F0DL_0034E8"
+#define dspot12_room_1Set_0007F0DL_0034E8 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0007F0DL_0034E8"
 static const ALIGN_ASSET(2) char spot12_room_1Set_0007F0DL_0034E8[] = dspot12_room_1Set_0007F0DL_0034E8;
 
-#define dspot12_room_1Set_0007F0DL_004798 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0007F0DL_004798"
+#define dspot12_room_1Set_0007F0DL_004798 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0007F0DL_004798"
 static const ALIGN_ASSET(2) char spot12_room_1Set_0007F0DL_004798[] = dspot12_room_1Set_0007F0DL_004798;
 
-#define dspot12_room_1Set_0007F0DL_003E40 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0007F0DL_003E40"
+#define dspot12_room_1Set_0007F0DL_003E40 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0007F0DL_003E40"
 static const ALIGN_ASSET(2) char spot12_room_1Set_0007F0DL_003E40[] = dspot12_room_1Set_0007F0DL_003E40;
 
-#define dspot12_room_1Set_0007F0DL_00AF80 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0007F0DL_00AF80"
+#define dspot12_room_1Set_0007F0DL_00AF80 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0007F0DL_00AF80"
 static const ALIGN_ASSET(2) char spot12_room_1Set_0007F0DL_00AF80[] = dspot12_room_1Set_0007F0DL_00AF80;
 
-#define dspot12_room_1Set_0007F0DL_001E58 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0007F0DL_001E58"
+#define dspot12_room_1Set_0007F0DL_001E58 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0007F0DL_001E58"
 static const ALIGN_ASSET(2) char spot12_room_1Set_0007F0DL_001E58[] = dspot12_room_1Set_0007F0DL_001E58;
 
-#define dspot12_room_1Set_0007F0DL_002A60 "__OTR__scenes/nonmq/spot12_scene/spot12_room_1Set_0007F0DL_002A60"
+#define dspot12_room_1Set_0007F0DL_002A60 "__OTR__scenes/shared/spot12_scene/spot12_room_1Set_0007F0DL_002A60"
 static const ALIGN_ASSET(2) char spot12_room_1Set_0007F0DL_002A60[] = dspot12_room_1Set_0007F0DL_002A60;
 
 
diff --git a/soh/assets/scenes/overworld/spot12/spot12_scene.h b/soh/assets/scenes/overworld/spot12/spot12_scene.h
index f08278485..df4d41f4a 100644
--- a/soh/assets/scenes/overworld/spot12/spot12_scene.h
+++ b/soh/assets/scenes/overworld/spot12/spot12_scene.h
@@ -3,66 +3,66 @@
 
 #include "align_asset_macro.h"
 
-#define dgGerudoFortressFirstCaptureCs "__OTR__scenes/nonmq/spot12_scene/gGerudoFortressFirstCaptureCs"
-static const ALIGN_ASSET(2) char gGerudoFortressFirstCaptureCs[] = dgGerudoFortressFirstCaptureCs;
-
-#define dgGerudoFortressIntroCs "__OTR__scenes/nonmq/spot12_scene/gGerudoFortressIntroCs"
-static const ALIGN_ASSET(2) char gGerudoFortressIntroCs[] = dgGerudoFortressIntroCs;
-
-#define dgSpot12_009678Tex "__OTR__scenes/nonmq/spot12_scene/gSpot12_009678Tex"
-static const ALIGN_ASSET(2) char gSpot12_009678Tex[] = dgSpot12_009678Tex;
-
-#define dgSpot12_00DE78Tex "__OTR__scenes/nonmq/spot12_scene/gSpot12_00DE78Tex"
-static const ALIGN_ASSET(2) char gSpot12_00DE78Tex[] = dgSpot12_00DE78Tex;
-
-#define dspot12_sceneCollisionHeader_005030 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneCollisionHeader_005030"
-static const ALIGN_ASSET(2) char spot12_sceneCollisionHeader_005030[] = dspot12_sceneCollisionHeader_005030;
-
-#define dspot12_sceneTex_008E78 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneTex_008E78"
-static const ALIGN_ASSET(2) char spot12_sceneTex_008E78[] = dspot12_sceneTex_008E78;
-
-#define dspot12_sceneTLUT_006650 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneTLUT_006650"
-static const ALIGN_ASSET(2) char spot12_sceneTLUT_006650[] = dspot12_sceneTLUT_006650;
-
-#define dspot12_sceneTex_00EE78 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneTex_00EE78"
-static const ALIGN_ASSET(2) char spot12_sceneTex_00EE78[] = dspot12_sceneTex_00EE78;
-
-#define dspot12_sceneTex_007678 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneTex_007678"
-static const ALIGN_ASSET(2) char spot12_sceneTex_007678[] = dspot12_sceneTex_007678;
-
-#define dspot12_sceneTex_006678 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneTex_006678"
+#define dspot12_sceneTex_006678 "__OTR__scenes/shared/spot12_scene/spot12_sceneTex_006678"
 static const ALIGN_ASSET(2) char spot12_sceneTex_006678[] = dspot12_sceneTex_006678;
 
-#define dspot12_sceneTex_00C678 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneTex_00C678"
-static const ALIGN_ASSET(2) char spot12_sceneTex_00C678[] = dspot12_sceneTex_00C678;
+#define dspot12_sceneTex_007678 "__OTR__scenes/shared/spot12_scene/spot12_sceneTex_007678"
+static const ALIGN_ASSET(2) char spot12_sceneTex_007678[] = dspot12_sceneTex_007678;
 
-#define dspot12_sceneTex_00B678 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneTex_00B678"
-static const ALIGN_ASSET(2) char spot12_sceneTex_00B678[] = dspot12_sceneTex_00B678;
-
-#define dspot12_sceneTex_00BE78 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneTex_00BE78"
-static const ALIGN_ASSET(2) char spot12_sceneTex_00BE78[] = dspot12_sceneTex_00BE78;
-
-#define dspot12_sceneTex_00CE78 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneTex_00CE78"
-static const ALIGN_ASSET(2) char spot12_sceneTex_00CE78[] = dspot12_sceneTex_00CE78;
-
-#define dspot12_sceneTex_00A678 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneTex_00A678"
-static const ALIGN_ASSET(2) char spot12_sceneTex_00A678[] = dspot12_sceneTex_00A678;
-
-#define dspot12_sceneTex_00D678 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneTex_00D678"
-static const ALIGN_ASSET(2) char spot12_sceneTex_00D678[] = dspot12_sceneTex_00D678;
-
-#define dspot12_sceneTex_008678 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneTex_008678"
+#define dspot12_sceneTex_008678 "__OTR__scenes/shared/spot12_scene/spot12_sceneTex_008678"
 static const ALIGN_ASSET(2) char spot12_sceneTex_008678[] = dspot12_sceneTex_008678;
 
-#define dspot12_sceneCollisionHeader_005030 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneCollisionHeader_005030"
+#define dspot12_sceneTex_008E78 "__OTR__scenes/shared/spot12_scene/spot12_sceneTex_008E78"
+static const ALIGN_ASSET(2) char spot12_sceneTex_008E78[] = dspot12_sceneTex_008E78;
 
-#define dspot12_sceneCollisionHeader_005030 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneCollisionHeader_005030"
+#define dspot12_sceneTex_00A678 "__OTR__scenes/shared/spot12_scene/spot12_sceneTex_00A678"
+static const ALIGN_ASSET(2) char spot12_sceneTex_00A678[] = dspot12_sceneTex_00A678;
 
-#define dspot12_sceneCollisionHeader_005030 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneCollisionHeader_005030"
+#define dspot12_sceneTex_00B678 "__OTR__scenes/shared/spot12_scene/spot12_sceneTex_00B678"
+static const ALIGN_ASSET(2) char spot12_sceneTex_00B678[] = dspot12_sceneTex_00B678;
 
-#define dspot12_sceneCollisionHeader_005030 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneCollisionHeader_005030"
+#define dspot12_sceneTex_00BE78 "__OTR__scenes/shared/spot12_scene/spot12_sceneTex_00BE78"
+static const ALIGN_ASSET(2) char spot12_sceneTex_00BE78[] = dspot12_sceneTex_00BE78;
 
-#define dspot12_sceneCollisionHeader_005030 "__OTR__scenes/nonmq/spot12_scene/spot12_sceneCollisionHeader_005030"
+#define dspot12_sceneTex_00C678 "__OTR__scenes/shared/spot12_scene/spot12_sceneTex_00C678"
+static const ALIGN_ASSET(2) char spot12_sceneTex_00C678[] = dspot12_sceneTex_00C678;
+
+#define dspot12_sceneTex_00CE78 "__OTR__scenes/shared/spot12_scene/spot12_sceneTex_00CE78"
+static const ALIGN_ASSET(2) char spot12_sceneTex_00CE78[] = dspot12_sceneTex_00CE78;
+
+#define dspot12_sceneTex_00D678 "__OTR__scenes/shared/spot12_scene/spot12_sceneTex_00D678"
+static const ALIGN_ASSET(2) char spot12_sceneTex_00D678[] = dspot12_sceneTex_00D678;
+
+#define dspot12_sceneTex_00EE78 "__OTR__scenes/shared/spot12_scene/spot12_sceneTex_00EE78"
+static const ALIGN_ASSET(2) char spot12_sceneTex_00EE78[] = dspot12_sceneTex_00EE78;
+
+#define dspot12_sceneTLUT_006650 "__OTR__scenes/shared/spot12_scene/spot12_sceneTLUT_006650"
+static const ALIGN_ASSET(2) char spot12_sceneTLUT_006650[] = dspot12_sceneTLUT_006650;
+
+#define dgGerudoFortressFirstCaptureCs "__OTR__scenes/shared/spot12_scene/gGerudoFortressFirstCaptureCs"
+static const ALIGN_ASSET(2) char gGerudoFortressFirstCaptureCs[] = dgGerudoFortressFirstCaptureCs;
+
+#define dgGerudoFortressIntroCs "__OTR__scenes/shared/spot12_scene/gGerudoFortressIntroCs"
+static const ALIGN_ASSET(2) char gGerudoFortressIntroCs[] = dgGerudoFortressIntroCs;
+
+#define dgSpot12_009678Tex "__OTR__scenes/shared/spot12_scene/gSpot12_009678Tex"
+static const ALIGN_ASSET(2) char gSpot12_009678Tex[] = dgSpot12_009678Tex;
+
+#define dgSpot12_00DE78Tex "__OTR__scenes/shared/spot12_scene/gSpot12_00DE78Tex"
+static const ALIGN_ASSET(2) char gSpot12_00DE78Tex[] = dgSpot12_00DE78Tex;
+
+#define dspot12_sceneCollisionHeader_005030 "__OTR__scenes/shared/spot12_scene/spot12_sceneCollisionHeader_005030"
+static const ALIGN_ASSET(2) char spot12_sceneCollisionHeader_005030[] = dspot12_sceneCollisionHeader_005030;
+
+#define dspot12_sceneCollisionHeader_005030 "__OTR__scenes/shared/spot12_scene/spot12_sceneCollisionHeader_005030"
+
+#define dspot12_sceneCollisionHeader_005030 "__OTR__scenes/shared/spot12_scene/spot12_sceneCollisionHeader_005030"
+
+#define dspot12_sceneCollisionHeader_005030 "__OTR__scenes/shared/spot12_scene/spot12_sceneCollisionHeader_005030"
+
+#define dspot12_sceneCollisionHeader_005030 "__OTR__scenes/shared/spot12_scene/spot12_sceneCollisionHeader_005030"
+
+#define dspot12_sceneCollisionHeader_005030 "__OTR__scenes/shared/spot12_scene/spot12_sceneCollisionHeader_005030"
 
 
 #endif // OVERWORLD_SPOT12_SCENE_H
diff --git a/soh/assets/scenes/overworld/spot13/spot13_room_0.h b/soh/assets/scenes/overworld/spot13/spot13_room_0.h
index 95d567382..61954b60e 100644
--- a/soh/assets/scenes/overworld/spot13/spot13_room_0.h
+++ b/soh/assets/scenes/overworld/spot13/spot13_room_0.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dspot13_room_0DL_0008F8 "__OTR__scenes/nonmq/spot13_scene/spot13_room_0DL_0008F8"
+#define dspot13_room_0DL_0008F8 "__OTR__scenes/shared/spot13_scene/spot13_room_0DL_0008F8"
 static const ALIGN_ASSET(2) char spot13_room_0DL_0008F8[] = dspot13_room_0DL_0008F8;
 
 
diff --git a/soh/assets/scenes/overworld/spot13/spot13_room_1.h b/soh/assets/scenes/overworld/spot13/spot13_room_1.h
index 59bd37305..540ead3a9 100644
--- a/soh/assets/scenes/overworld/spot13/spot13_room_1.h
+++ b/soh/assets/scenes/overworld/spot13/spot13_room_1.h
@@ -3,86 +3,86 @@
 
 #include "align_asset_macro.h"
 
-#define dspot13_room_1DL_007D68 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1DL_007D68"
-static const ALIGN_ASSET(2) char spot13_room_1DL_007D68[] = dspot13_room_1DL_007D68;
-
-#define dspot13_room_1Tex_00EE08 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_00EE08"
-static const ALIGN_ASSET(2) char spot13_room_1Tex_00EE08[] = dspot13_room_1Tex_00EE08;
-
-#define dspot13_room_1Tex_008608 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_008608"
-static const ALIGN_ASSET(2) char spot13_room_1Tex_008608[] = dspot13_room_1Tex_008608;
-
-#define dspot13_room_1Tex_00C408 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_00C408"
-static const ALIGN_ASSET(2) char spot13_room_1Tex_00C408[] = dspot13_room_1Tex_00C408;
-
-#define dspot13_room_1Tex_00AE08 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_00AE08"
-static const ALIGN_ASSET(2) char spot13_room_1Tex_00AE08[] = dspot13_room_1Tex_00AE08;
-
-#define dspot13_room_1TLUT_007DC0 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1TLUT_007DC0"
-static const ALIGN_ASSET(2) char spot13_room_1TLUT_007DC0[] = dspot13_room_1TLUT_007DC0;
-
-#define dspot13_room_1Tex_00B808 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_00B808"
-static const ALIGN_ASSET(2) char spot13_room_1Tex_00B808[] = dspot13_room_1Tex_00B808;
-
-#define dspot13_room_1TLUT_007DE8 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1TLUT_007DE8"
-static const ALIGN_ASSET(2) char spot13_room_1TLUT_007DE8[] = dspot13_room_1TLUT_007DE8;
-
-#define dspot13_room_1Tex_008A08 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_008A08"
-static const ALIGN_ASSET(2) char spot13_room_1Tex_008A08[] = dspot13_room_1Tex_008A08;
-
-#define dspot13_room_1Tex_007E08 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_007E08"
+#define dspot13_room_1Tex_007E08 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_007E08"
 static const ALIGN_ASSET(2) char spot13_room_1Tex_007E08[] = dspot13_room_1Tex_007E08;
 
-#define dspot13_room_1Tex_009A08 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_009A08"
+#define dspot13_room_1Tex_008608 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_008608"
+static const ALIGN_ASSET(2) char spot13_room_1Tex_008608[] = dspot13_room_1Tex_008608;
+
+#define dspot13_room_1Tex_008A08 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_008A08"
+static const ALIGN_ASSET(2) char spot13_room_1Tex_008A08[] = dspot13_room_1Tex_008A08;
+
+#define dspot13_room_1Tex_009A08 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_009A08"
 static const ALIGN_ASSET(2) char spot13_room_1Tex_009A08[] = dspot13_room_1Tex_009A08;
 
-#define dspot13_room_1Tex_009C08 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_009C08"
+#define dspot13_room_1Tex_009C08 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_009C08"
 static const ALIGN_ASSET(2) char spot13_room_1Tex_009C08[] = dspot13_room_1Tex_009C08;
 
-#define dspot13_room_1Tex_010E08 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_010E08"
-static const ALIGN_ASSET(2) char spot13_room_1Tex_010E08[] = dspot13_room_1Tex_010E08;
-
-#define dspot13_room_1Tex_00A608 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_00A608"
-static const ALIGN_ASSET(2) char spot13_room_1Tex_00A608[] = dspot13_room_1Tex_00A608;
-
-#define dspot13_room_1Tex_00FE08 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_00FE08"
-static const ALIGN_ASSET(2) char spot13_room_1Tex_00FE08[] = dspot13_room_1Tex_00FE08;
-
-#define dspot13_room_1Tex_009E08 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_009E08"
+#define dspot13_room_1Tex_009E08 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_009E08"
 static const ALIGN_ASSET(2) char spot13_room_1Tex_009E08[] = dspot13_room_1Tex_009E08;
 
-#define dspot13_room_1Tex_010608 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_010608"
-static const ALIGN_ASSET(2) char spot13_room_1Tex_010608[] = dspot13_room_1Tex_010608;
+#define dspot13_room_1Tex_00A608 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_00A608"
+static const ALIGN_ASSET(2) char spot13_room_1Tex_00A608[] = dspot13_room_1Tex_00A608;
 
-#define dspot13_room_1Tex_00B608 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_00B608"
-static const ALIGN_ASSET(2) char spot13_room_1Tex_00B608[] = dspot13_room_1Tex_00B608;
-
-#define dspot13_room_1Tex_011208 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_011208"
-static const ALIGN_ASSET(2) char spot13_room_1Tex_011208[] = dspot13_room_1Tex_011208;
-
-#define dspot13_room_1Tex_00C608 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_00C608"
-static const ALIGN_ASSET(2) char spot13_room_1Tex_00C608[] = dspot13_room_1Tex_00C608;
-
-#define dspot13_room_1Tex_00AA08 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_00AA08"
+#define dspot13_room_1Tex_00AA08 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_00AA08"
 static const ALIGN_ASSET(2) char spot13_room_1Tex_00AA08[] = dspot13_room_1Tex_00AA08;
 
-#define dspot13_room_1Tex_00BC08 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_00BC08"
+#define dspot13_room_1Tex_00AE08 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_00AE08"
+static const ALIGN_ASSET(2) char spot13_room_1Tex_00AE08[] = dspot13_room_1Tex_00AE08;
+
+#define dspot13_room_1Tex_00B608 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_00B608"
+static const ALIGN_ASSET(2) char spot13_room_1Tex_00B608[] = dspot13_room_1Tex_00B608;
+
+#define dspot13_room_1Tex_00B808 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_00B808"
+static const ALIGN_ASSET(2) char spot13_room_1Tex_00B808[] = dspot13_room_1Tex_00B808;
+
+#define dspot13_room_1Tex_00BC08 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_00BC08"
 static const ALIGN_ASSET(2) char spot13_room_1Tex_00BC08[] = dspot13_room_1Tex_00BC08;
 
-#define dspot13_room_1Tex_00E608 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_00E608"
-static const ALIGN_ASSET(2) char spot13_room_1Tex_00E608[] = dspot13_room_1Tex_00E608;
+#define dspot13_room_1Tex_00C408 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_00C408"
+static const ALIGN_ASSET(2) char spot13_room_1Tex_00C408[] = dspot13_room_1Tex_00C408;
 
-#define dspot13_room_1Tex_00D608 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_00D608"
+#define dspot13_room_1Tex_00C608 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_00C608"
+static const ALIGN_ASSET(2) char spot13_room_1Tex_00C608[] = dspot13_room_1Tex_00C608;
+
+#define dspot13_room_1Tex_00D608 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_00D608"
 static const ALIGN_ASSET(2) char spot13_room_1Tex_00D608[] = dspot13_room_1Tex_00D608;
 
-#define dspot13_room_1DL_011E28 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1DL_011E28"
-static const ALIGN_ASSET(2) char spot13_room_1DL_011E28[] = dspot13_room_1DL_011E28;
+#define dspot13_room_1Tex_00E608 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_00E608"
+static const ALIGN_ASSET(2) char spot13_room_1Tex_00E608[] = dspot13_room_1Tex_00E608;
 
-#define dspot13_room_1Tex_012240 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_012240"
+#define dspot13_room_1Tex_00EE08 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_00EE08"
+static const ALIGN_ASSET(2) char spot13_room_1Tex_00EE08[] = dspot13_room_1Tex_00EE08;
+
+#define dspot13_room_1Tex_00FE08 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_00FE08"
+static const ALIGN_ASSET(2) char spot13_room_1Tex_00FE08[] = dspot13_room_1Tex_00FE08;
+
+#define dspot13_room_1Tex_010608 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_010608"
+static const ALIGN_ASSET(2) char spot13_room_1Tex_010608[] = dspot13_room_1Tex_010608;
+
+#define dspot13_room_1Tex_010E08 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_010E08"
+static const ALIGN_ASSET(2) char spot13_room_1Tex_010E08[] = dspot13_room_1Tex_010E08;
+
+#define dspot13_room_1Tex_011208 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_011208"
+static const ALIGN_ASSET(2) char spot13_room_1Tex_011208[] = dspot13_room_1Tex_011208;
+
+#define dspot13_room_1Tex_011E40 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_011E40"
+static const ALIGN_ASSET(2) char spot13_room_1Tex_011E40[] = dspot13_room_1Tex_011E40;
+
+#define dspot13_room_1Tex_012240 "__OTR__scenes/shared/spot13_scene/spot13_room_1Tex_012240"
 static const ALIGN_ASSET(2) char spot13_room_1Tex_012240[] = dspot13_room_1Tex_012240;
 
-#define dspot13_room_1Tex_011E40 "__OTR__scenes/nonmq/spot13_scene/spot13_room_1Tex_011E40"
-static const ALIGN_ASSET(2) char spot13_room_1Tex_011E40[] = dspot13_room_1Tex_011E40;
+#define dspot13_room_1TLUT_007DC0 "__OTR__scenes/shared/spot13_scene/spot13_room_1TLUT_007DC0"
+static const ALIGN_ASSET(2) char spot13_room_1TLUT_007DC0[] = dspot13_room_1TLUT_007DC0;
+
+#define dspot13_room_1TLUT_007DE8 "__OTR__scenes/shared/spot13_scene/spot13_room_1TLUT_007DE8"
+static const ALIGN_ASSET(2) char spot13_room_1TLUT_007DE8[] = dspot13_room_1TLUT_007DE8;
+
+#define dspot13_room_1DL_007D68 "__OTR__scenes/shared/spot13_scene/spot13_room_1DL_007D68"
+static const ALIGN_ASSET(2) char spot13_room_1DL_007D68[] = dspot13_room_1DL_007D68;
+
+#define dspot13_room_1DL_011E28 "__OTR__scenes/shared/spot13_scene/spot13_room_1DL_011E28"
+static const ALIGN_ASSET(2) char spot13_room_1DL_011E28[] = dspot13_room_1DL_011E28;
 
 
 #endif // OVERWORLD_SPOT13_ROOM_1_H
diff --git a/soh/assets/scenes/overworld/spot13/spot13_scene.h b/soh/assets/scenes/overworld/spot13/spot13_scene.h
index a4e7eb89e..68375d20e 100644
--- a/soh/assets/scenes/overworld/spot13/spot13_scene.h
+++ b/soh/assets/scenes/overworld/spot13/spot13_scene.h
@@ -3,16 +3,17 @@
 
 #include "align_asset_macro.h"
 
-#define dspot13_sceneCollisionHeader_003A00 "__OTR__scenes/nonmq/spot13_scene/spot13_sceneCollisionHeader_003A00"
-static const ALIGN_ASSET(2) char spot13_sceneCollisionHeader_003A00[] = dspot13_sceneCollisionHeader_003A00;
-
-#define dspot13_sceneTex_004E30 "__OTR__scenes/nonmq/spot13_scene/spot13_sceneTex_004E30"
-static const ALIGN_ASSET(2) char spot13_sceneTex_004E30[] = dspot13_sceneTex_004E30;
-
-#define dspot13_sceneTex_003E30 "__OTR__scenes/nonmq/spot13_scene/spot13_sceneTex_003E30"
-static const ALIGN_ASSET(2) char spot13_sceneTex_003E30[] = dspot13_sceneTex_003E30;
-
-#define dspot13_sceneTex_003A30 "__OTR__scenes/nonmq/spot13_scene/spot13_sceneTex_003A30"
+#define dspot13_sceneTex_003A30 "__OTR__scenes/shared/spot13_scene/spot13_sceneTex_003A30"
 static const ALIGN_ASSET(2) char spot13_sceneTex_003A30[] = dspot13_sceneTex_003A30;
 
+#define dspot13_sceneTex_003E30 "__OTR__scenes/shared/spot13_scene/spot13_sceneTex_003E30"
+static const ALIGN_ASSET(2) char spot13_sceneTex_003E30[] = dspot13_sceneTex_003E30;
+
+#define dspot13_sceneTex_004E30 "__OTR__scenes/shared/spot13_scene/spot13_sceneTex_004E30"
+static const ALIGN_ASSET(2) char spot13_sceneTex_004E30[] = dspot13_sceneTex_004E30;
+
+#define dspot13_sceneCollisionHeader_003A00 "__OTR__scenes/shared/spot13_scene/spot13_sceneCollisionHeader_003A00"
+static const ALIGN_ASSET(2) char spot13_sceneCollisionHeader_003A00[] = dspot13_sceneCollisionHeader_003A00;
+
+
 #endif // OVERWORLD_SPOT13_SCENE_H
diff --git a/soh/assets/scenes/overworld/spot15/spot15_room_0.h b/soh/assets/scenes/overworld/spot15/spot15_room_0.h
index a0fc18ce3..2cfd661a0 100644
--- a/soh/assets/scenes/overworld/spot15/spot15_room_0.h
+++ b/soh/assets/scenes/overworld/spot15/spot15_room_0.h
@@ -3,115 +3,115 @@
 
 #include "align_asset_macro.h"
 
-#define dspot15_room_0DL_0093C0 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_0093C0"
+#define dspot15_room_0DL_0093C0 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_0093C0"
 static const ALIGN_ASSET(2) char spot15_room_0DL_0093C0[] = dspot15_room_0DL_0093C0;
 
-#define dspot15_room_0DL_00CBD8 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_00CBD8"
+#define dspot15_room_0DL_00CBD8 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_00CBD8"
 static const ALIGN_ASSET(2) char spot15_room_0DL_00CBD8[] = dspot15_room_0DL_00CBD8;
 
-#define dspot15_room_0DL_00B1D8 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_00B1D8"
+#define dspot15_room_0DL_00B1D8 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_00B1D8"
 static const ALIGN_ASSET(2) char spot15_room_0DL_00B1D8[] = dspot15_room_0DL_00B1D8;
 
-#define dspot15_room_0DL_00AB18 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_00AB18"
+#define dspot15_room_0DL_00AB18 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_00AB18"
 static const ALIGN_ASSET(2) char spot15_room_0DL_00AB18[] = dspot15_room_0DL_00AB18;
 
-#define dspot15_room_0DL_007EE8 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_007EE8"
+#define dspot15_room_0DL_007EE8 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_007EE8"
 static const ALIGN_ASSET(2) char spot15_room_0DL_007EE8[] = dspot15_room_0DL_007EE8;
 
-#define dspot15_room_0DL_0082A0 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_0082A0"
+#define dspot15_room_0DL_0082A0 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_0082A0"
 static const ALIGN_ASSET(2) char spot15_room_0DL_0082A0[] = dspot15_room_0DL_0082A0;
 
-#define dspot15_room_0DL_008728 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_008728"
+#define dspot15_room_0DL_008728 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_008728"
 static const ALIGN_ASSET(2) char spot15_room_0DL_008728[] = dspot15_room_0DL_008728;
 
-#define dspot15_room_0DL_00C0F8 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_00C0F8"
+#define dspot15_room_0DL_00C0F8 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_00C0F8"
 static const ALIGN_ASSET(2) char spot15_room_0DL_00C0F8[] = dspot15_room_0DL_00C0F8;
 
-#define dspot15_room_0DL_004A78 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_004A78"
+#define dspot15_room_0DL_004A78 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_004A78"
 static const ALIGN_ASSET(2) char spot15_room_0DL_004A78[] = dspot15_room_0DL_004A78;
 
-#define dspot15_room_0DL_00B8A0 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_00B8A0"
+#define dspot15_room_0DL_00B8A0 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_00B8A0"
 static const ALIGN_ASSET(2) char spot15_room_0DL_00B8A0[] = dspot15_room_0DL_00B8A0;
 
-#define dspot15_room_0DL_001160 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_001160"
+#define dspot15_room_0DL_001160 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_001160"
 static const ALIGN_ASSET(2) char spot15_room_0DL_001160[] = dspot15_room_0DL_001160;
 
-#define dspot15_room_0DL_0019E0 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_0019E0"
+#define dspot15_room_0DL_0019E0 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_0019E0"
 static const ALIGN_ASSET(2) char spot15_room_0DL_0019E0[] = dspot15_room_0DL_0019E0;
 
-#define dspot15_room_0DL_0020E8 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_0020E8"
+#define dspot15_room_0DL_0020E8 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_0020E8"
 static const ALIGN_ASSET(2) char spot15_room_0DL_0020E8[] = dspot15_room_0DL_0020E8;
 
-#define dspot15_room_0DL_0047C0 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_0047C0"
+#define dspot15_room_0DL_0047C0 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_0047C0"
 static const ALIGN_ASSET(2) char spot15_room_0DL_0047C0[] = dspot15_room_0DL_0047C0;
 
-#define dspot15_room_0DL_005550 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_005550"
+#define dspot15_room_0DL_005550 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_005550"
 static const ALIGN_ASSET(2) char spot15_room_0DL_005550[] = dspot15_room_0DL_005550;
 
-#define dspot15_room_0DL_008EF8 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_008EF8"
+#define dspot15_room_0DL_008EF8 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_008EF8"
 static const ALIGN_ASSET(2) char spot15_room_0DL_008EF8[] = dspot15_room_0DL_008EF8;
 
-#define dspot15_room_0DL_00C270 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_00C270"
+#define dspot15_room_0DL_00C270 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_00C270"
 static const ALIGN_ASSET(2) char spot15_room_0DL_00C270[] = dspot15_room_0DL_00C270;
 
-#define dspot15_room_0DL_003C58 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_003C58"
+#define dspot15_room_0DL_003C58 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_003C58"
 static const ALIGN_ASSET(2) char spot15_room_0DL_003C58[] = dspot15_room_0DL_003C58;
 
-#define dspot15_room_0DL_00BEC0 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_00BEC0"
+#define dspot15_room_0DL_00BEC0 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_00BEC0"
 static const ALIGN_ASSET(2) char spot15_room_0DL_00BEC0[] = dspot15_room_0DL_00BEC0;
 
-#define dspot15_room_0DL_004588 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_004588"
+#define dspot15_room_0DL_004588 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_004588"
 static const ALIGN_ASSET(2) char spot15_room_0DL_004588[] = dspot15_room_0DL_004588;
 
-#define dspot15_room_0DL_00A118 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_00A118"
+#define dspot15_room_0DL_00A118 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_00A118"
 static const ALIGN_ASSET(2) char spot15_room_0DL_00A118[] = dspot15_room_0DL_00A118;
 
-#define dspot15_room_0DL_00A5C0 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_00A5C0"
+#define dspot15_room_0DL_00A5C0 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_00A5C0"
 static const ALIGN_ASSET(2) char spot15_room_0DL_00A5C0[] = dspot15_room_0DL_00A5C0;
 
-#define dspot15_room_0DL_00C748 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_00C748"
+#define dspot15_room_0DL_00C748 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_00C748"
 static const ALIGN_ASSET(2) char spot15_room_0DL_00C748[] = dspot15_room_0DL_00C748;
 
-#define dspot15_room_0DL_005EB0 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_005EB0"
+#define dspot15_room_0DL_005EB0 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_005EB0"
 static const ALIGN_ASSET(2) char spot15_room_0DL_005EB0[] = dspot15_room_0DL_005EB0;
 
-#define dspot15_room_0DL_006510 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_006510"
+#define dspot15_room_0DL_006510 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_006510"
 static const ALIGN_ASSET(2) char spot15_room_0DL_006510[] = dspot15_room_0DL_006510;
 
-#define dspot15_room_0DL_006A20 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_006A20"
+#define dspot15_room_0DL_006A20 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_006A20"
 static const ALIGN_ASSET(2) char spot15_room_0DL_006A20[] = dspot15_room_0DL_006A20;
 
-#define dspot15_room_0DL_007278 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_007278"
+#define dspot15_room_0DL_007278 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_007278"
 static const ALIGN_ASSET(2) char spot15_room_0DL_007278[] = dspot15_room_0DL_007278;
 
-#define dspot15_room_0DL_007B38 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_007B38"
+#define dspot15_room_0DL_007B38 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_007B38"
 static const ALIGN_ASSET(2) char spot15_room_0DL_007B38[] = dspot15_room_0DL_007B38;
 
-#define dspot15_room_0DL_004E88 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_004E88"
+#define dspot15_room_0DL_004E88 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_004E88"
 static const ALIGN_ASSET(2) char spot15_room_0DL_004E88[] = dspot15_room_0DL_004E88;
 
-#define dspot15_room_0DL_00D098 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_00D098"
+#define dspot15_room_0DL_00D098 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_00D098"
 static const ALIGN_ASSET(2) char spot15_room_0DL_00D098[] = dspot15_room_0DL_00D098;
 
-#define dspot15_room_0DL_00CE90 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_00CE90"
+#define dspot15_room_0DL_00CE90 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_00CE90"
 static const ALIGN_ASSET(2) char spot15_room_0DL_00CE90[] = dspot15_room_0DL_00CE90;
 
-#define dspot15_room_0DL_0036D0 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_0036D0"
+#define dspot15_room_0DL_0036D0 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_0036D0"
 static const ALIGN_ASSET(2) char spot15_room_0DL_0036D0[] = dspot15_room_0DL_0036D0;
 
-#define dspot15_room_0DL_0091D8 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_0091D8"
+#define dspot15_room_0DL_0091D8 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_0091D8"
 static const ALIGN_ASSET(2) char spot15_room_0DL_0091D8[] = dspot15_room_0DL_0091D8;
 
-#define dspot15_room_0DL_002C50 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_002C50"
+#define dspot15_room_0DL_002C50 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_002C50"
 static const ALIGN_ASSET(2) char spot15_room_0DL_002C50[] = dspot15_room_0DL_002C50;
 
-#define dspot15_room_0DL_00BBC0 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_00BBC0"
+#define dspot15_room_0DL_00BBC0 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_00BBC0"
 static const ALIGN_ASSET(2) char spot15_room_0DL_00BBC0[] = dspot15_room_0DL_00BBC0;
 
-#define dspot15_room_0DL_00B628 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_00B628"
+#define dspot15_room_0DL_00B628 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_00B628"
 static const ALIGN_ASSET(2) char spot15_room_0DL_00B628[] = dspot15_room_0DL_00B628;
 
-#define dspot15_room_0DL_0041F0 "__OTR__scenes/nonmq/spot15_scene/spot15_room_0DL_0041F0"
+#define dspot15_room_0DL_0041F0 "__OTR__scenes/shared/spot15_scene/spot15_room_0DL_0041F0"
 static const ALIGN_ASSET(2) char spot15_room_0DL_0041F0[] = dspot15_room_0DL_0041F0;
 
 
diff --git a/soh/assets/scenes/overworld/spot15/spot15_scene.h b/soh/assets/scenes/overworld/spot15/spot15_scene.h
index 73e3adc62..48febaec5 100644
--- a/soh/assets/scenes/overworld/spot15/spot15_scene.h
+++ b/soh/assets/scenes/overworld/spot15/spot15_scene.h
@@ -3,139 +3,140 @@
 
 #include "align_asset_macro.h"
 
-#define dgHyruleCastleIntroCs "__OTR__scenes/nonmq/spot15_scene/gHyruleCastleIntroCs"
-static const ALIGN_ASSET(2) char gHyruleCastleIntroCs[] = dgHyruleCastleIntroCs;
-
-#define dspot15_sceneCollisionHeader_003CE8 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneCollisionHeader_003CE8"
-static const ALIGN_ASSET(2) char spot15_sceneCollisionHeader_003CE8[] = dspot15_sceneCollisionHeader_003CE8;
-
-#define dspot15_sceneTex_013400 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_013400"
-static const ALIGN_ASSET(2) char spot15_sceneTex_013400[] = dspot15_sceneTex_013400;
-
-#define dspot15_sceneTex_004900 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_004900"
-static const ALIGN_ASSET(2) char spot15_sceneTex_004900[] = dspot15_sceneTex_004900;
-
-#define dspot15_sceneTex_004A00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_004A00"
-static const ALIGN_ASSET(2) char spot15_sceneTex_004A00[] = dspot15_sceneTex_004A00;
-
-#define dspot15_sceneTex_006400 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_006400"
-static const ALIGN_ASSET(2) char spot15_sceneTex_006400[] = dspot15_sceneTex_006400;
-
-#define dspot15_sceneTex_010400 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_010400"
-static const ALIGN_ASSET(2) char spot15_sceneTex_010400[] = dspot15_sceneTex_010400;
-
-#define dspot15_sceneTex_011400 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_011400"
-static const ALIGN_ASSET(2) char spot15_sceneTex_011400[] = dspot15_sceneTex_011400;
-
-#define dspot15_sceneTex_007300 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_007300"
-static const ALIGN_ASSET(2) char spot15_sceneTex_007300[] = dspot15_sceneTex_007300;
-
-#define dspot15_sceneTex_006F00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_006F00"
-static const ALIGN_ASSET(2) char spot15_sceneTex_006F00[] = dspot15_sceneTex_006F00;
-
-#define dspot15_sceneTex_007B00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_007B00"
-static const ALIGN_ASSET(2) char spot15_sceneTex_007B00[] = dspot15_sceneTex_007B00;
-
-#define dspot15_sceneTex_014400 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_014400"
-static const ALIGN_ASSET(2) char spot15_sceneTex_014400[] = dspot15_sceneTex_014400;
-
-#define dspot15_sceneTex_00FC00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_00FC00"
-static const ALIGN_ASSET(2) char spot15_sceneTex_00FC00[] = dspot15_sceneTex_00FC00;
-
-#define dspot15_sceneTex_011C00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_011C00"
-static const ALIGN_ASSET(2) char spot15_sceneTex_011C00[] = dspot15_sceneTex_011C00;
-
-#define dspot15_sceneTex_014C00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_014C00"
-static const ALIGN_ASSET(2) char spot15_sceneTex_014C00[] = dspot15_sceneTex_014C00;
-
-#define dspot15_sceneTex_00DA00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_00DA00"
-static const ALIGN_ASSET(2) char spot15_sceneTex_00DA00[] = dspot15_sceneTex_00DA00;
-
-#define dspot15_sceneTex_007C00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_007C00"
-static const ALIGN_ASSET(2) char spot15_sceneTex_007C00[] = dspot15_sceneTex_007C00;
-
-#define dspot15_sceneTex_009900 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_009900"
-static const ALIGN_ASSET(2) char spot15_sceneTex_009900[] = dspot15_sceneTex_009900;
-
-#define dspot15_sceneTex_00A900 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_00A900"
-static const ALIGN_ASSET(2) char spot15_sceneTex_00A900[] = dspot15_sceneTex_00A900;
-
-#define dspot15_sceneTex_010C00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_010C00"
-static const ALIGN_ASSET(2) char spot15_sceneTex_010C00[] = dspot15_sceneTex_010C00;
-
-#define dspot15_sceneTex_016C00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_016C00"
-static const ALIGN_ASSET(2) char spot15_sceneTex_016C00[] = dspot15_sceneTex_016C00;
-
-#define dspot15_sceneTex_00A100 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_00A100"
-static const ALIGN_ASSET(2) char spot15_sceneTex_00A100[] = dspot15_sceneTex_00A100;
-
-#define dspot15_sceneTex_017400 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_017400"
-static const ALIGN_ASSET(2) char spot15_sceneTex_017400[] = dspot15_sceneTex_017400;
-
-#define dspot15_sceneTex_00EC00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_00EC00"
-static const ALIGN_ASSET(2) char spot15_sceneTex_00EC00[] = dspot15_sceneTex_00EC00;
-
-#define dspot15_sceneTex_008E00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_008E00"
-static const ALIGN_ASSET(2) char spot15_sceneTex_008E00[] = dspot15_sceneTex_008E00;
-
-#define dspot15_sceneTex_015E00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_015E00"
-static const ALIGN_ASSET(2) char spot15_sceneTex_015E00[] = dspot15_sceneTex_015E00;
-
-#define dspot15_sceneTex_00CA00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_00CA00"
-static const ALIGN_ASSET(2) char spot15_sceneTex_00CA00[] = dspot15_sceneTex_00CA00;
-
-#define dspot15_sceneTex_004100 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_004100"
+#define dspot15_sceneTex_004100 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_004100"
 static const ALIGN_ASSET(2) char spot15_sceneTex_004100[] = dspot15_sceneTex_004100;
 
-#define dspot15_sceneTex_00BA00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_00BA00"
-static const ALIGN_ASSET(2) char spot15_sceneTex_00BA00[] = dspot15_sceneTex_00BA00;
+#define dspot15_sceneTex_004900 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_004900"
+static const ALIGN_ASSET(2) char spot15_sceneTex_004900[] = dspot15_sceneTex_004900;
 
-#define dspot15_sceneTex_009800 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_009800"
-static const ALIGN_ASSET(2) char spot15_sceneTex_009800[] = dspot15_sceneTex_009800;
+#define dspot15_sceneTex_004A00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_004A00"
+static const ALIGN_ASSET(2) char spot15_sceneTex_004A00[] = dspot15_sceneTex_004A00;
 
-#define dspot15_sceneTex_015C00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_015C00"
-static const ALIGN_ASSET(2) char spot15_sceneTex_015C00[] = dspot15_sceneTex_015C00;
-
-#define dspot15_sceneTex_018400 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_018400"
-static const ALIGN_ASSET(2) char spot15_sceneTex_018400[] = dspot15_sceneTex_018400;
-
-#define dspot15_sceneTex_00B900 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_00B900"
-static const ALIGN_ASSET(2) char spot15_sceneTex_00B900[] = dspot15_sceneTex_00B900;
-
-#define dspot15_sceneTex_00C200 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_00C200"
-static const ALIGN_ASSET(2) char spot15_sceneTex_00C200[] = dspot15_sceneTex_00C200;
-
-#define dspot15_sceneTex_016600 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_016600"
-static const ALIGN_ASSET(2) char spot15_sceneTex_016600[] = dspot15_sceneTex_016600;
-
-#define dspot15_sceneTex_006D00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_006D00"
-static const ALIGN_ASSET(2) char spot15_sceneTex_006D00[] = dspot15_sceneTex_006D00;
-
-#define dspot15_sceneTex_00EA00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_00EA00"
-static const ALIGN_ASSET(2) char spot15_sceneTex_00EA00[] = dspot15_sceneTex_00EA00;
-
-#define dspot15_sceneTex_012400 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_012400"
-static const ALIGN_ASSET(2) char spot15_sceneTex_012400[] = dspot15_sceneTex_012400;
-
-#define dspot15_sceneTex_005400 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_005400"
-static const ALIGN_ASSET(2) char spot15_sceneTex_005400[] = dspot15_sceneTex_005400;
-
-#define dspot15_sceneTex_007E00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_007E00"
-static const ALIGN_ASSET(2) char spot15_sceneTex_007E00[] = dspot15_sceneTex_007E00;
-
-#define dspot15_sceneTex_017C00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_017C00"
-static const ALIGN_ASSET(2) char spot15_sceneTex_017C00[] = dspot15_sceneTex_017C00;
-
-#define dspot15_sceneTex_006500 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_006500"
-static const ALIGN_ASSET(2) char spot15_sceneTex_006500[] = dspot15_sceneTex_006500;
-
-#define dspot15_sceneTex_009600 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_009600"
-static const ALIGN_ASSET(2) char spot15_sceneTex_009600[] = dspot15_sceneTex_009600;
-
-#define dspot15_sceneTex_004C00 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_004C00"
+#define dspot15_sceneTex_004C00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_004C00"
 static const ALIGN_ASSET(2) char spot15_sceneTex_004C00[] = dspot15_sceneTex_004C00;
 
-#define dspot15_sceneTex_016800 "__OTR__scenes/nonmq/spot15_scene/spot15_sceneTex_016800"
+#define dspot15_sceneTex_005400 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_005400"
+static const ALIGN_ASSET(2) char spot15_sceneTex_005400[] = dspot15_sceneTex_005400;
+
+#define dspot15_sceneTex_006400 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_006400"
+static const ALIGN_ASSET(2) char spot15_sceneTex_006400[] = dspot15_sceneTex_006400;
+
+#define dspot15_sceneTex_006500 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_006500"
+static const ALIGN_ASSET(2) char spot15_sceneTex_006500[] = dspot15_sceneTex_006500;
+
+#define dspot15_sceneTex_006D00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_006D00"
+static const ALIGN_ASSET(2) char spot15_sceneTex_006D00[] = dspot15_sceneTex_006D00;
+
+#define dspot15_sceneTex_006F00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_006F00"
+static const ALIGN_ASSET(2) char spot15_sceneTex_006F00[] = dspot15_sceneTex_006F00;
+
+#define dspot15_sceneTex_007300 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_007300"
+static const ALIGN_ASSET(2) char spot15_sceneTex_007300[] = dspot15_sceneTex_007300;
+
+#define dspot15_sceneTex_007B00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_007B00"
+static const ALIGN_ASSET(2) char spot15_sceneTex_007B00[] = dspot15_sceneTex_007B00;
+
+#define dspot15_sceneTex_007C00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_007C00"
+static const ALIGN_ASSET(2) char spot15_sceneTex_007C00[] = dspot15_sceneTex_007C00;
+
+#define dspot15_sceneTex_007E00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_007E00"
+static const ALIGN_ASSET(2) char spot15_sceneTex_007E00[] = dspot15_sceneTex_007E00;
+
+#define dspot15_sceneTex_008E00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_008E00"
+static const ALIGN_ASSET(2) char spot15_sceneTex_008E00[] = dspot15_sceneTex_008E00;
+
+#define dspot15_sceneTex_009600 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_009600"
+static const ALIGN_ASSET(2) char spot15_sceneTex_009600[] = dspot15_sceneTex_009600;
+
+#define dspot15_sceneTex_009800 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_009800"
+static const ALIGN_ASSET(2) char spot15_sceneTex_009800[] = dspot15_sceneTex_009800;
+
+#define dspot15_sceneTex_009900 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_009900"
+static const ALIGN_ASSET(2) char spot15_sceneTex_009900[] = dspot15_sceneTex_009900;
+
+#define dspot15_sceneTex_00A100 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_00A100"
+static const ALIGN_ASSET(2) char spot15_sceneTex_00A100[] = dspot15_sceneTex_00A100;
+
+#define dspot15_sceneTex_00A900 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_00A900"
+static const ALIGN_ASSET(2) char spot15_sceneTex_00A900[] = dspot15_sceneTex_00A900;
+
+#define dspot15_sceneTex_00B900 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_00B900"
+static const ALIGN_ASSET(2) char spot15_sceneTex_00B900[] = dspot15_sceneTex_00B900;
+
+#define dspot15_sceneTex_00BA00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_00BA00"
+static const ALIGN_ASSET(2) char spot15_sceneTex_00BA00[] = dspot15_sceneTex_00BA00;
+
+#define dspot15_sceneTex_00C200 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_00C200"
+static const ALIGN_ASSET(2) char spot15_sceneTex_00C200[] = dspot15_sceneTex_00C200;
+
+#define dspot15_sceneTex_00CA00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_00CA00"
+static const ALIGN_ASSET(2) char spot15_sceneTex_00CA00[] = dspot15_sceneTex_00CA00;
+
+#define dspot15_sceneTex_00DA00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_00DA00"
+static const ALIGN_ASSET(2) char spot15_sceneTex_00DA00[] = dspot15_sceneTex_00DA00;
+
+#define dspot15_sceneTex_00EA00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_00EA00"
+static const ALIGN_ASSET(2) char spot15_sceneTex_00EA00[] = dspot15_sceneTex_00EA00;
+
+#define dspot15_sceneTex_00EC00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_00EC00"
+static const ALIGN_ASSET(2) char spot15_sceneTex_00EC00[] = dspot15_sceneTex_00EC00;
+
+#define dspot15_sceneTex_00FC00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_00FC00"
+static const ALIGN_ASSET(2) char spot15_sceneTex_00FC00[] = dspot15_sceneTex_00FC00;
+
+#define dspot15_sceneTex_010400 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_010400"
+static const ALIGN_ASSET(2) char spot15_sceneTex_010400[] = dspot15_sceneTex_010400;
+
+#define dspot15_sceneTex_010C00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_010C00"
+static const ALIGN_ASSET(2) char spot15_sceneTex_010C00[] = dspot15_sceneTex_010C00;
+
+#define dspot15_sceneTex_011400 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_011400"
+static const ALIGN_ASSET(2) char spot15_sceneTex_011400[] = dspot15_sceneTex_011400;
+
+#define dspot15_sceneTex_011C00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_011C00"
+static const ALIGN_ASSET(2) char spot15_sceneTex_011C00[] = dspot15_sceneTex_011C00;
+
+#define dspot15_sceneTex_012400 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_012400"
+static const ALIGN_ASSET(2) char spot15_sceneTex_012400[] = dspot15_sceneTex_012400;
+
+#define dspot15_sceneTex_013400 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_013400"
+static const ALIGN_ASSET(2) char spot15_sceneTex_013400[] = dspot15_sceneTex_013400;
+
+#define dspot15_sceneTex_014400 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_014400"
+static const ALIGN_ASSET(2) char spot15_sceneTex_014400[] = dspot15_sceneTex_014400;
+
+#define dspot15_sceneTex_014C00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_014C00"
+static const ALIGN_ASSET(2) char spot15_sceneTex_014C00[] = dspot15_sceneTex_014C00;
+
+#define dspot15_sceneTex_015C00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_015C00"
+static const ALIGN_ASSET(2) char spot15_sceneTex_015C00[] = dspot15_sceneTex_015C00;
+
+#define dspot15_sceneTex_015E00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_015E00"
+static const ALIGN_ASSET(2) char spot15_sceneTex_015E00[] = dspot15_sceneTex_015E00;
+
+#define dspot15_sceneTex_016600 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_016600"
+static const ALIGN_ASSET(2) char spot15_sceneTex_016600[] = dspot15_sceneTex_016600;
+
+#define dspot15_sceneTex_016800 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_016800"
 static const ALIGN_ASSET(2) char spot15_sceneTex_016800[] = dspot15_sceneTex_016800;
 
+#define dspot15_sceneTex_016C00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_016C00"
+static const ALIGN_ASSET(2) char spot15_sceneTex_016C00[] = dspot15_sceneTex_016C00;
+
+#define dspot15_sceneTex_017400 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_017400"
+static const ALIGN_ASSET(2) char spot15_sceneTex_017400[] = dspot15_sceneTex_017400;
+
+#define dspot15_sceneTex_017C00 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_017C00"
+static const ALIGN_ASSET(2) char spot15_sceneTex_017C00[] = dspot15_sceneTex_017C00;
+
+#define dspot15_sceneTex_018400 "__OTR__scenes/shared/spot15_scene/spot15_sceneTex_018400"
+static const ALIGN_ASSET(2) char spot15_sceneTex_018400[] = dspot15_sceneTex_018400;
+
+#define dgHyruleCastleIntroCs "__OTR__scenes/shared/spot15_scene/gHyruleCastleIntroCs"
+static const ALIGN_ASSET(2) char gHyruleCastleIntroCs[] = dgHyruleCastleIntroCs;
+
+#define dspot15_sceneCollisionHeader_003CE8 "__OTR__scenes/shared/spot15_scene/spot15_sceneCollisionHeader_003CE8"
+static const ALIGN_ASSET(2) char spot15_sceneCollisionHeader_003CE8[] = dspot15_sceneCollisionHeader_003CE8;
+
+
 #endif // OVERWORLD_SPOT15_SCENE_H
diff --git a/soh/assets/scenes/overworld/spot16/spot16_room_0.h b/soh/assets/scenes/overworld/spot16/spot16_room_0.h
index 7103cc719..81ce6513e 100644
--- a/soh/assets/scenes/overworld/spot16/spot16_room_0.h
+++ b/soh/assets/scenes/overworld/spot16/spot16_room_0.h
@@ -3,280 +3,280 @@
 
 #include "align_asset_macro.h"
 
-#define dspot16_room_0DL_002A78 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0DL_002A78"
+#define dspot16_room_0DL_002A78 "__OTR__scenes/shared/spot16_scene/spot16_room_0DL_002A78"
 static const ALIGN_ASSET(2) char spot16_room_0DL_002A78[] = dspot16_room_0DL_002A78;
 
-#define dspot16_room_0DL_00A5A8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0DL_00A5A8"
+#define dspot16_room_0DL_00A5A8 "__OTR__scenes/shared/spot16_scene/spot16_room_0DL_00A5A8"
 static const ALIGN_ASSET(2) char spot16_room_0DL_00A5A8[] = dspot16_room_0DL_00A5A8;
 
-#define dspot16_room_0DL_004788 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0DL_004788"
+#define dspot16_room_0DL_004788 "__OTR__scenes/shared/spot16_scene/spot16_room_0DL_004788"
 static const ALIGN_ASSET(2) char spot16_room_0DL_004788[] = dspot16_room_0DL_004788;
 
-#define dspot16_room_0DL_00A6F8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0DL_00A6F8"
+#define dspot16_room_0DL_00A6F8 "__OTR__scenes/shared/spot16_scene/spot16_room_0DL_00A6F8"
 static const ALIGN_ASSET(2) char spot16_room_0DL_00A6F8[] = dspot16_room_0DL_00A6F8;
 
-#define dspot16_room_0DL_005B98 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0DL_005B98"
+#define dspot16_room_0DL_005B98 "__OTR__scenes/shared/spot16_scene/spot16_room_0DL_005B98"
 static const ALIGN_ASSET(2) char spot16_room_0DL_005B98[] = dspot16_room_0DL_005B98;
 
-#define dspot16_room_0DL_009BD0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0DL_009BD0"
+#define dspot16_room_0DL_009BD0 "__OTR__scenes/shared/spot16_scene/spot16_room_0DL_009BD0"
 static const ALIGN_ASSET(2) char spot16_room_0DL_009BD0[] = dspot16_room_0DL_009BD0;
 
-#define dspot16_room_0DL_007200 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0DL_007200"
+#define dspot16_room_0DL_007200 "__OTR__scenes/shared/spot16_scene/spot16_room_0DL_007200"
 static const ALIGN_ASSET(2) char spot16_room_0DL_007200[] = dspot16_room_0DL_007200;
 
-#define dspot16_room_0DL_00A8E8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0DL_00A8E8"
+#define dspot16_room_0DL_00A8E8 "__OTR__scenes/shared/spot16_scene/spot16_room_0DL_00A8E8"
 static const ALIGN_ASSET(2) char spot16_room_0DL_00A8E8[] = dspot16_room_0DL_00A8E8;
 
-#define dspot16_room_0DL_0060E0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0DL_0060E0"
+#define dspot16_room_0DL_0060E0 "__OTR__scenes/shared/spot16_scene/spot16_room_0DL_0060E0"
 static const ALIGN_ASSET(2) char spot16_room_0DL_0060E0[] = dspot16_room_0DL_0060E0;
 
-#define dspot16_room_0DL_00A240 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0DL_00A240"
+#define dspot16_room_0DL_00A240 "__OTR__scenes/shared/spot16_scene/spot16_room_0DL_00A240"
 static const ALIGN_ASSET(2) char spot16_room_0DL_00A240[] = dspot16_room_0DL_00A240;
 
-#define dspot16_room_0DL_00ABC8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0DL_00ABC8"
+#define dspot16_room_0DL_00ABC8 "__OTR__scenes/shared/spot16_scene/spot16_room_0DL_00ABC8"
 static const ALIGN_ASSET(2) char spot16_room_0DL_00ABC8[] = dspot16_room_0DL_00ABC8;
 
-#define dspot16_room_0DL_0066D0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0DL_0066D0"
+#define dspot16_room_0DL_0066D0 "__OTR__scenes/shared/spot16_scene/spot16_room_0DL_0066D0"
 static const ALIGN_ASSET(2) char spot16_room_0DL_0066D0[] = dspot16_room_0DL_0066D0;
 
-#define dspot16_room_0DL_007C78 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0DL_007C78"
+#define dspot16_room_0DL_007C78 "__OTR__scenes/shared/spot16_scene/spot16_room_0DL_007C78"
 static const ALIGN_ASSET(2) char spot16_room_0DL_007C78[] = dspot16_room_0DL_007C78;
 
-#define dspot16_room_0DL_00AA48 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0DL_00AA48"
+#define dspot16_room_0DL_00AA48 "__OTR__scenes/shared/spot16_scene/spot16_room_0DL_00AA48"
 static const ALIGN_ASSET(2) char spot16_room_0DL_00AA48[] = dspot16_room_0DL_00AA48;
 
-#define dspot16_room_0Set_000470DL_002A78 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000470DL_002A78"
+#define dspot16_room_0Set_000470DL_002A78 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000470DL_002A78"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000470DL_002A78[] = dspot16_room_0Set_000470DL_002A78;
 
-#define dspot16_room_0Set_000470DL_00A5A8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000470DL_00A5A8"
+#define dspot16_room_0Set_000470DL_00A5A8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000470DL_00A5A8"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000470DL_00A5A8[] = dspot16_room_0Set_000470DL_00A5A8;
 
-#define dspot16_room_0Set_000470DL_004788 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000470DL_004788"
+#define dspot16_room_0Set_000470DL_004788 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000470DL_004788"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000470DL_004788[] = dspot16_room_0Set_000470DL_004788;
 
-#define dspot16_room_0Set_000470DL_00A6F8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000470DL_00A6F8"
+#define dspot16_room_0Set_000470DL_00A6F8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000470DL_00A6F8"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000470DL_00A6F8[] = dspot16_room_0Set_000470DL_00A6F8;
 
-#define dspot16_room_0Set_000470DL_005B98 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000470DL_005B98"
+#define dspot16_room_0Set_000470DL_005B98 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000470DL_005B98"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000470DL_005B98[] = dspot16_room_0Set_000470DL_005B98;
 
-#define dspot16_room_0Set_000470DL_009BD0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000470DL_009BD0"
+#define dspot16_room_0Set_000470DL_009BD0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000470DL_009BD0"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000470DL_009BD0[] = dspot16_room_0Set_000470DL_009BD0;
 
-#define dspot16_room_0Set_000470DL_007200 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000470DL_007200"
+#define dspot16_room_0Set_000470DL_007200 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000470DL_007200"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000470DL_007200[] = dspot16_room_0Set_000470DL_007200;
 
-#define dspot16_room_0Set_000470DL_00A8E8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000470DL_00A8E8"
+#define dspot16_room_0Set_000470DL_00A8E8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000470DL_00A8E8"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000470DL_00A8E8[] = dspot16_room_0Set_000470DL_00A8E8;
 
-#define dspot16_room_0Set_000470DL_0060E0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000470DL_0060E0"
+#define dspot16_room_0Set_000470DL_0060E0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000470DL_0060E0"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000470DL_0060E0[] = dspot16_room_0Set_000470DL_0060E0;
 
-#define dspot16_room_0Set_000470DL_00A240 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000470DL_00A240"
+#define dspot16_room_0Set_000470DL_00A240 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000470DL_00A240"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000470DL_00A240[] = dspot16_room_0Set_000470DL_00A240;
 
-#define dspot16_room_0Set_000470DL_00ABC8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000470DL_00ABC8"
+#define dspot16_room_0Set_000470DL_00ABC8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000470DL_00ABC8"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000470DL_00ABC8[] = dspot16_room_0Set_000470DL_00ABC8;
 
-#define dspot16_room_0Set_000470DL_0066D0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000470DL_0066D0"
+#define dspot16_room_0Set_000470DL_0066D0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000470DL_0066D0"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000470DL_0066D0[] = dspot16_room_0Set_000470DL_0066D0;
 
-#define dspot16_room_0Set_000470DL_007C78 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000470DL_007C78"
+#define dspot16_room_0Set_000470DL_007C78 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000470DL_007C78"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000470DL_007C78[] = dspot16_room_0Set_000470DL_007C78;
 
-#define dspot16_room_0Set_000940DL_002A78 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000940DL_002A78"
+#define dspot16_room_0Set_000940DL_002A78 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000940DL_002A78"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000940DL_002A78[] = dspot16_room_0Set_000940DL_002A78;
 
-#define dspot16_room_0Set_000940DL_00A5A8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000940DL_00A5A8"
+#define dspot16_room_0Set_000940DL_00A5A8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000940DL_00A5A8"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000940DL_00A5A8[] = dspot16_room_0Set_000940DL_00A5A8;
 
-#define dspot16_room_0Set_000940DL_004788 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000940DL_004788"
+#define dspot16_room_0Set_000940DL_004788 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000940DL_004788"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000940DL_004788[] = dspot16_room_0Set_000940DL_004788;
 
-#define dspot16_room_0Set_000940DL_00A6F8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000940DL_00A6F8"
+#define dspot16_room_0Set_000940DL_00A6F8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000940DL_00A6F8"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000940DL_00A6F8[] = dspot16_room_0Set_000940DL_00A6F8;
 
-#define dspot16_room_0Set_000940DL_005B98 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000940DL_005B98"
+#define dspot16_room_0Set_000940DL_005B98 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000940DL_005B98"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000940DL_005B98[] = dspot16_room_0Set_000940DL_005B98;
 
-#define dspot16_room_0Set_000940DL_009BD0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000940DL_009BD0"
+#define dspot16_room_0Set_000940DL_009BD0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000940DL_009BD0"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000940DL_009BD0[] = dspot16_room_0Set_000940DL_009BD0;
 
-#define dspot16_room_0Set_000940DL_007200 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000940DL_007200"
+#define dspot16_room_0Set_000940DL_007200 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000940DL_007200"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000940DL_007200[] = dspot16_room_0Set_000940DL_007200;
 
-#define dspot16_room_0Set_000940DL_00A8E8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000940DL_00A8E8"
+#define dspot16_room_0Set_000940DL_00A8E8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000940DL_00A8E8"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000940DL_00A8E8[] = dspot16_room_0Set_000940DL_00A8E8;
 
-#define dspot16_room_0Set_000940DL_0060E0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000940DL_0060E0"
+#define dspot16_room_0Set_000940DL_0060E0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000940DL_0060E0"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000940DL_0060E0[] = dspot16_room_0Set_000940DL_0060E0;
 
-#define dspot16_room_0Set_000940DL_00A240 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000940DL_00A240"
+#define dspot16_room_0Set_000940DL_00A240 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000940DL_00A240"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000940DL_00A240[] = dspot16_room_0Set_000940DL_00A240;
 
-#define dspot16_room_0Set_000940DL_00ABC8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000940DL_00ABC8"
+#define dspot16_room_0Set_000940DL_00ABC8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000940DL_00ABC8"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000940DL_00ABC8[] = dspot16_room_0Set_000940DL_00ABC8;
 
-#define dspot16_room_0Set_000940DL_0066D0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000940DL_0066D0"
+#define dspot16_room_0Set_000940DL_0066D0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000940DL_0066D0"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000940DL_0066D0[] = dspot16_room_0Set_000940DL_0066D0;
 
-#define dspot16_room_0Set_000940DL_007C78 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000940DL_007C78"
+#define dspot16_room_0Set_000940DL_007C78 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000940DL_007C78"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000940DL_007C78[] = dspot16_room_0Set_000940DL_007C78;
 
-#define dspot16_room_0Set_0009B0DL_002A78 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_0009B0DL_002A78"
+#define dspot16_room_0Set_0009B0DL_002A78 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_0009B0DL_002A78"
 static const ALIGN_ASSET(2) char spot16_room_0Set_0009B0DL_002A78[] = dspot16_room_0Set_0009B0DL_002A78;
 
-#define dspot16_room_0Set_0009B0DL_00A5A8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_0009B0DL_00A5A8"
+#define dspot16_room_0Set_0009B0DL_00A5A8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_0009B0DL_00A5A8"
 static const ALIGN_ASSET(2) char spot16_room_0Set_0009B0DL_00A5A8[] = dspot16_room_0Set_0009B0DL_00A5A8;
 
-#define dspot16_room_0Set_0009B0DL_004788 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_0009B0DL_004788"
+#define dspot16_room_0Set_0009B0DL_004788 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_0009B0DL_004788"
 static const ALIGN_ASSET(2) char spot16_room_0Set_0009B0DL_004788[] = dspot16_room_0Set_0009B0DL_004788;
 
-#define dspot16_room_0Set_0009B0DL_00A6F8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_0009B0DL_00A6F8"
+#define dspot16_room_0Set_0009B0DL_00A6F8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_0009B0DL_00A6F8"
 static const ALIGN_ASSET(2) char spot16_room_0Set_0009B0DL_00A6F8[] = dspot16_room_0Set_0009B0DL_00A6F8;
 
-#define dspot16_room_0Set_0009B0DL_005B98 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_0009B0DL_005B98"
+#define dspot16_room_0Set_0009B0DL_005B98 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_0009B0DL_005B98"
 static const ALIGN_ASSET(2) char spot16_room_0Set_0009B0DL_005B98[] = dspot16_room_0Set_0009B0DL_005B98;
 
-#define dspot16_room_0Set_0009B0DL_009BD0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_0009B0DL_009BD0"
+#define dspot16_room_0Set_0009B0DL_009BD0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_0009B0DL_009BD0"
 static const ALIGN_ASSET(2) char spot16_room_0Set_0009B0DL_009BD0[] = dspot16_room_0Set_0009B0DL_009BD0;
 
-#define dspot16_room_0Set_0009B0DL_007200 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_0009B0DL_007200"
+#define dspot16_room_0Set_0009B0DL_007200 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_0009B0DL_007200"
 static const ALIGN_ASSET(2) char spot16_room_0Set_0009B0DL_007200[] = dspot16_room_0Set_0009B0DL_007200;
 
-#define dspot16_room_0Set_0009B0DL_00A8E8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_0009B0DL_00A8E8"
+#define dspot16_room_0Set_0009B0DL_00A8E8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_0009B0DL_00A8E8"
 static const ALIGN_ASSET(2) char spot16_room_0Set_0009B0DL_00A8E8[] = dspot16_room_0Set_0009B0DL_00A8E8;
 
-#define dspot16_room_0Set_0009B0DL_0060E0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_0009B0DL_0060E0"
+#define dspot16_room_0Set_0009B0DL_0060E0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_0009B0DL_0060E0"
 static const ALIGN_ASSET(2) char spot16_room_0Set_0009B0DL_0060E0[] = dspot16_room_0Set_0009B0DL_0060E0;
 
-#define dspot16_room_0Set_0009B0DL_00A240 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_0009B0DL_00A240"
+#define dspot16_room_0Set_0009B0DL_00A240 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_0009B0DL_00A240"
 static const ALIGN_ASSET(2) char spot16_room_0Set_0009B0DL_00A240[] = dspot16_room_0Set_0009B0DL_00A240;
 
-#define dspot16_room_0Set_0009B0DL_00ABC8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_0009B0DL_00ABC8"
+#define dspot16_room_0Set_0009B0DL_00ABC8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_0009B0DL_00ABC8"
 static const ALIGN_ASSET(2) char spot16_room_0Set_0009B0DL_00ABC8[] = dspot16_room_0Set_0009B0DL_00ABC8;
 
-#define dspot16_room_0Set_0009B0DL_0066D0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_0009B0DL_0066D0"
+#define dspot16_room_0Set_0009B0DL_0066D0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_0009B0DL_0066D0"
 static const ALIGN_ASSET(2) char spot16_room_0Set_0009B0DL_0066D0[] = dspot16_room_0Set_0009B0DL_0066D0;
 
-#define dspot16_room_0Set_0009B0DL_007C78 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_0009B0DL_007C78"
+#define dspot16_room_0Set_0009B0DL_007C78 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_0009B0DL_007C78"
 static const ALIGN_ASSET(2) char spot16_room_0Set_0009B0DL_007C78[] = dspot16_room_0Set_0009B0DL_007C78;
 
-#define dspot16_room_0Set_000A90DL_002A78 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000A90DL_002A78"
+#define dspot16_room_0Set_000A90DL_002A78 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000A90DL_002A78"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000A90DL_002A78[] = dspot16_room_0Set_000A90DL_002A78;
 
-#define dspot16_room_0Set_000A90DL_00A5A8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000A90DL_00A5A8"
+#define dspot16_room_0Set_000A90DL_00A5A8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000A90DL_00A5A8"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000A90DL_00A5A8[] = dspot16_room_0Set_000A90DL_00A5A8;
 
-#define dspot16_room_0Set_000A90DL_004788 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000A90DL_004788"
+#define dspot16_room_0Set_000A90DL_004788 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000A90DL_004788"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000A90DL_004788[] = dspot16_room_0Set_000A90DL_004788;
 
-#define dspot16_room_0Set_000A90DL_00A6F8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000A90DL_00A6F8"
+#define dspot16_room_0Set_000A90DL_00A6F8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000A90DL_00A6F8"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000A90DL_00A6F8[] = dspot16_room_0Set_000A90DL_00A6F8;
 
-#define dspot16_room_0Set_000A90DL_005B98 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000A90DL_005B98"
+#define dspot16_room_0Set_000A90DL_005B98 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000A90DL_005B98"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000A90DL_005B98[] = dspot16_room_0Set_000A90DL_005B98;
 
-#define dspot16_room_0Set_000A90DL_009BD0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000A90DL_009BD0"
+#define dspot16_room_0Set_000A90DL_009BD0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000A90DL_009BD0"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000A90DL_009BD0[] = dspot16_room_0Set_000A90DL_009BD0;
 
-#define dspot16_room_0Set_000A90DL_007200 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000A90DL_007200"
+#define dspot16_room_0Set_000A90DL_007200 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000A90DL_007200"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000A90DL_007200[] = dspot16_room_0Set_000A90DL_007200;
 
-#define dspot16_room_0Set_000A90DL_00A8E8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000A90DL_00A8E8"
+#define dspot16_room_0Set_000A90DL_00A8E8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000A90DL_00A8E8"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000A90DL_00A8E8[] = dspot16_room_0Set_000A90DL_00A8E8;
 
-#define dspot16_room_0Set_000A90DL_0060E0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000A90DL_0060E0"
+#define dspot16_room_0Set_000A90DL_0060E0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000A90DL_0060E0"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000A90DL_0060E0[] = dspot16_room_0Set_000A90DL_0060E0;
 
-#define dspot16_room_0Set_000A90DL_00A240 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000A90DL_00A240"
+#define dspot16_room_0Set_000A90DL_00A240 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000A90DL_00A240"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000A90DL_00A240[] = dspot16_room_0Set_000A90DL_00A240;
 
-#define dspot16_room_0Set_000A90DL_00ABC8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000A90DL_00ABC8"
+#define dspot16_room_0Set_000A90DL_00ABC8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000A90DL_00ABC8"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000A90DL_00ABC8[] = dspot16_room_0Set_000A90DL_00ABC8;
 
-#define dspot16_room_0Set_000A90DL_0066D0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000A90DL_0066D0"
+#define dspot16_room_0Set_000A90DL_0066D0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000A90DL_0066D0"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000A90DL_0066D0[] = dspot16_room_0Set_000A90DL_0066D0;
 
-#define dspot16_room_0Set_000A90DL_007C78 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000A90DL_007C78"
+#define dspot16_room_0Set_000A90DL_007C78 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000A90DL_007C78"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000A90DL_007C78[] = dspot16_room_0Set_000A90DL_007C78;
 
-#define dspot16_room_0Set_000B70DL_002A78 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000B70DL_002A78"
+#define dspot16_room_0Set_000B70DL_002A78 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000B70DL_002A78"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000B70DL_002A78[] = dspot16_room_0Set_000B70DL_002A78;
 
-#define dspot16_room_0Set_000B70DL_00A5A8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000B70DL_00A5A8"
+#define dspot16_room_0Set_000B70DL_00A5A8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000B70DL_00A5A8"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000B70DL_00A5A8[] = dspot16_room_0Set_000B70DL_00A5A8;
 
-#define dspot16_room_0Set_000B70DL_004788 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000B70DL_004788"
+#define dspot16_room_0Set_000B70DL_004788 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000B70DL_004788"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000B70DL_004788[] = dspot16_room_0Set_000B70DL_004788;
 
-#define dspot16_room_0Set_000B70DL_00A6F8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000B70DL_00A6F8"
+#define dspot16_room_0Set_000B70DL_00A6F8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000B70DL_00A6F8"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000B70DL_00A6F8[] = dspot16_room_0Set_000B70DL_00A6F8;
 
-#define dspot16_room_0Set_000B70DL_005B98 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000B70DL_005B98"
+#define dspot16_room_0Set_000B70DL_005B98 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000B70DL_005B98"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000B70DL_005B98[] = dspot16_room_0Set_000B70DL_005B98;
 
-#define dspot16_room_0Set_000B70DL_009BD0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000B70DL_009BD0"
+#define dspot16_room_0Set_000B70DL_009BD0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000B70DL_009BD0"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000B70DL_009BD0[] = dspot16_room_0Set_000B70DL_009BD0;
 
-#define dspot16_room_0Set_000B70DL_007200 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000B70DL_007200"
+#define dspot16_room_0Set_000B70DL_007200 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000B70DL_007200"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000B70DL_007200[] = dspot16_room_0Set_000B70DL_007200;
 
-#define dspot16_room_0Set_000B70DL_00A8E8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000B70DL_00A8E8"
+#define dspot16_room_0Set_000B70DL_00A8E8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000B70DL_00A8E8"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000B70DL_00A8E8[] = dspot16_room_0Set_000B70DL_00A8E8;
 
-#define dspot16_room_0Set_000B70DL_0060E0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000B70DL_0060E0"
+#define dspot16_room_0Set_000B70DL_0060E0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000B70DL_0060E0"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000B70DL_0060E0[] = dspot16_room_0Set_000B70DL_0060E0;
 
-#define dspot16_room_0Set_000B70DL_00A240 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000B70DL_00A240"
+#define dspot16_room_0Set_000B70DL_00A240 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000B70DL_00A240"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000B70DL_00A240[] = dspot16_room_0Set_000B70DL_00A240;
 
-#define dspot16_room_0Set_000B70DL_00ABC8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000B70DL_00ABC8"
+#define dspot16_room_0Set_000B70DL_00ABC8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000B70DL_00ABC8"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000B70DL_00ABC8[] = dspot16_room_0Set_000B70DL_00ABC8;
 
-#define dspot16_room_0Set_000B70DL_0066D0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000B70DL_0066D0"
+#define dspot16_room_0Set_000B70DL_0066D0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000B70DL_0066D0"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000B70DL_0066D0[] = dspot16_room_0Set_000B70DL_0066D0;
 
-#define dspot16_room_0Set_000B70DL_007C78 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000B70DL_007C78"
+#define dspot16_room_0Set_000B70DL_007C78 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000B70DL_007C78"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000B70DL_007C78[] = dspot16_room_0Set_000B70DL_007C78;
 
-#define dspot16_room_0Set_000C00DL_002A78 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000C00DL_002A78"
+#define dspot16_room_0Set_000C00DL_002A78 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000C00DL_002A78"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000C00DL_002A78[] = dspot16_room_0Set_000C00DL_002A78;
 
-#define dspot16_room_0Set_000C00DL_00A5A8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000C00DL_00A5A8"
+#define dspot16_room_0Set_000C00DL_00A5A8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000C00DL_00A5A8"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000C00DL_00A5A8[] = dspot16_room_0Set_000C00DL_00A5A8;
 
-#define dspot16_room_0Set_000C00DL_004788 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000C00DL_004788"
+#define dspot16_room_0Set_000C00DL_004788 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000C00DL_004788"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000C00DL_004788[] = dspot16_room_0Set_000C00DL_004788;
 
-#define dspot16_room_0Set_000C00DL_00A6F8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000C00DL_00A6F8"
+#define dspot16_room_0Set_000C00DL_00A6F8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000C00DL_00A6F8"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000C00DL_00A6F8[] = dspot16_room_0Set_000C00DL_00A6F8;
 
-#define dspot16_room_0Set_000C00DL_005B98 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000C00DL_005B98"
+#define dspot16_room_0Set_000C00DL_005B98 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000C00DL_005B98"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000C00DL_005B98[] = dspot16_room_0Set_000C00DL_005B98;
 
-#define dspot16_room_0Set_000C00DL_009BD0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000C00DL_009BD0"
+#define dspot16_room_0Set_000C00DL_009BD0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000C00DL_009BD0"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000C00DL_009BD0[] = dspot16_room_0Set_000C00DL_009BD0;
 
-#define dspot16_room_0Set_000C00DL_007200 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000C00DL_007200"
+#define dspot16_room_0Set_000C00DL_007200 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000C00DL_007200"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000C00DL_007200[] = dspot16_room_0Set_000C00DL_007200;
 
-#define dspot16_room_0Set_000C00DL_00A8E8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000C00DL_00A8E8"
+#define dspot16_room_0Set_000C00DL_00A8E8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000C00DL_00A8E8"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000C00DL_00A8E8[] = dspot16_room_0Set_000C00DL_00A8E8;
 
-#define dspot16_room_0Set_000C00DL_0060E0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000C00DL_0060E0"
+#define dspot16_room_0Set_000C00DL_0060E0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000C00DL_0060E0"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000C00DL_0060E0[] = dspot16_room_0Set_000C00DL_0060E0;
 
-#define dspot16_room_0Set_000C00DL_00A240 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000C00DL_00A240"
+#define dspot16_room_0Set_000C00DL_00A240 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000C00DL_00A240"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000C00DL_00A240[] = dspot16_room_0Set_000C00DL_00A240;
 
-#define dspot16_room_0Set_000C00DL_00ABC8 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000C00DL_00ABC8"
+#define dspot16_room_0Set_000C00DL_00ABC8 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000C00DL_00ABC8"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000C00DL_00ABC8[] = dspot16_room_0Set_000C00DL_00ABC8;
 
-#define dspot16_room_0Set_000C00DL_0066D0 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000C00DL_0066D0"
+#define dspot16_room_0Set_000C00DL_0066D0 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000C00DL_0066D0"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000C00DL_0066D0[] = dspot16_room_0Set_000C00DL_0066D0;
 
-#define dspot16_room_0Set_000C00DL_007C78 "__OTR__scenes/nonmq/spot16_scene/spot16_room_0Set_000C00DL_007C78"
+#define dspot16_room_0Set_000C00DL_007C78 "__OTR__scenes/shared/spot16_scene/spot16_room_0Set_000C00DL_007C78"
 static const ALIGN_ASSET(2) char spot16_room_0Set_000C00DL_007C78[] = dspot16_room_0Set_000C00DL_007C78;
 
 
diff --git a/soh/assets/scenes/overworld/spot16/spot16_scene.h b/soh/assets/scenes/overworld/spot16/spot16_scene.h
index d288da992..eb9ef0ca5 100644
--- a/soh/assets/scenes/overworld/spot16/spot16_scene.h
+++ b/soh/assets/scenes/overworld/spot16/spot16_scene.h
@@ -3,137 +3,137 @@
 
 #include "align_asset_macro.h"
 
-#define dgDMTOwlCs "__OTR__scenes/nonmq/spot16_scene/gDMTOwlCs"
-static const ALIGN_ASSET(2) char gDMTOwlCs[] = dgDMTOwlCs;
-
-#define dgDMTIntroCs "__OTR__scenes/nonmq/spot16_scene/gDMTIntroCs"
-static const ALIGN_ASSET(2) char gDMTIntroCs[] = dgDMTIntroCs;
-
-#define dspot16_sceneCollisionHeader_003D10 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneCollisionHeader_003D10"
-static const ALIGN_ASSET(2) char spot16_sceneCollisionHeader_003D10[] = dspot16_sceneCollisionHeader_003D10;
-
-#define dspot16_scene_Tex_01AE98 "__OTR__scenes/nonmq/spot16_scene/spot16_scene_Tex_01AE98"
-static const ALIGN_ASSET(2) char spot16_scene_Tex_01AE98[] = dspot16_scene_Tex_01AE98;
-
-#define dspot16_sceneTex_019698 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_019698"
-static const ALIGN_ASSET(2) char spot16_sceneTex_019698[] = dspot16_sceneTex_019698;
-
-#define dspot16_sceneTex_00CD98 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_00CD98"
-static const ALIGN_ASSET(2) char spot16_sceneTex_00CD98[] = dspot16_sceneTex_00CD98;
-
-#define dspot16_sceneTex_015598 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_015598"
-static const ALIGN_ASSET(2) char spot16_sceneTex_015598[] = dspot16_sceneTex_015598;
-
-#define dspot16_sceneTex_016E98 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_016E98"
-static const ALIGN_ASSET(2) char spot16_sceneTex_016E98[] = dspot16_sceneTex_016E98;
-
-#define dspot16_sceneTex_008198 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_008198"
+#define dspot16_sceneTex_008198 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_008198"
 static const ALIGN_ASSET(2) char spot16_sceneTex_008198[] = dspot16_sceneTex_008198;
 
-#define dspot16_sceneTex_00AD98 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_00AD98"
-static const ALIGN_ASSET(2) char spot16_sceneTex_00AD98[] = dspot16_sceneTex_00AD98;
-
-#define dspot16_sceneTex_009D98 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_009D98"
-static const ALIGN_ASSET(2) char spot16_sceneTex_009D98[] = dspot16_sceneTex_009D98;
-
-#define dspot16_sceneTex_00BD98 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_00BD98"
-static const ALIGN_ASSET(2) char spot16_sceneTex_00BD98[] = dspot16_sceneTex_00BD98;
-
-#define dspot16_sceneTex_015D98 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_015D98"
-static const ALIGN_ASSET(2) char spot16_sceneTex_015D98[] = dspot16_sceneTex_015D98;
-
-#define dspot16_sceneTex_01D698 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_01D698"
-static const ALIGN_ASSET(2) char spot16_sceneTex_01D698[] = dspot16_sceneTex_01D698;
-
-#define dspot16_sceneTex_009198 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_009198"
+#define dspot16_sceneTex_009198 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_009198"
 static const ALIGN_ASSET(2) char spot16_sceneTex_009198[] = dspot16_sceneTex_009198;
 
-#define dspot16_sceneTex_009998 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_009998"
+#define dspot16_sceneTex_009998 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_009998"
 static const ALIGN_ASSET(2) char spot16_sceneTex_009998[] = dspot16_sceneTex_009998;
 
-#define dspot16_sceneTex_01DE98 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_01DE98"
-static const ALIGN_ASSET(2) char spot16_sceneTex_01DE98[] = dspot16_sceneTex_01DE98;
+#define dspot16_sceneTex_009D98 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_009D98"
+static const ALIGN_ASSET(2) char spot16_sceneTex_009D98[] = dspot16_sceneTex_009D98;
 
-#define dspot16_sceneTex_018E98 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_018E98"
-static const ALIGN_ASSET(2) char spot16_sceneTex_018E98[] = dspot16_sceneTex_018E98;
+#define dspot16_sceneTex_00AD98 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_00AD98"
+static const ALIGN_ASSET(2) char spot16_sceneTex_00AD98[] = dspot16_sceneTex_00AD98;
 
-#define dspot16_sceneTex_018698 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_018698"
-static const ALIGN_ASSET(2) char spot16_sceneTex_018698[] = dspot16_sceneTex_018698;
+#define dspot16_sceneTex_00BD98 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_00BD98"
+static const ALIGN_ASSET(2) char spot16_sceneTex_00BD98[] = dspot16_sceneTex_00BD98;
 
-#define dspot16_sceneTex_014D98 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_014D98"
-static const ALIGN_ASSET(2) char spot16_sceneTex_014D98[] = dspot16_sceneTex_014D98;
+#define dspot16_sceneTex_00CD98 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_00CD98"
+static const ALIGN_ASSET(2) char spot16_sceneTex_00CD98[] = dspot16_sceneTex_00CD98;
 
-#define dspot16_sceneTex_00E198 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_00E198"
-static const ALIGN_ASSET(2) char spot16_sceneTex_00E198[] = dspot16_sceneTex_00E198;
-
-#define dspot16_sceneTex_015E98 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_015E98"
-static const ALIGN_ASSET(2) char spot16_sceneTex_015E98[] = dspot16_sceneTex_015E98;
-
-#define dspot16_sceneTex_011198 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_011198"
-static const ALIGN_ASSET(2) char spot16_sceneTex_011198[] = dspot16_sceneTex_011198;
-
-#define dspot16_sceneTex_011598 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_011598"
-static const ALIGN_ASSET(2) char spot16_sceneTex_011598[] = dspot16_sceneTex_011598;
-
-#define dspot16_sceneTex_013798 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_013798"
-static const ALIGN_ASSET(2) char spot16_sceneTex_013798[] = dspot16_sceneTex_013798;
-
-#define dspot16_sceneTex_00DF98 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_00DF98"
-static const ALIGN_ASSET(2) char spot16_sceneTex_00DF98[] = dspot16_sceneTex_00DF98;
-
-#define dspot16_sceneTex_00D398 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_00D398"
-static const ALIGN_ASSET(2) char spot16_sceneTex_00D398[] = dspot16_sceneTex_00D398;
-
-#define dspot16_sceneTex_00CF98 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_00CF98"
+#define dspot16_sceneTex_00CF98 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_00CF98"
 static const ALIGN_ASSET(2) char spot16_sceneTex_00CF98[] = dspot16_sceneTex_00CF98;
 
-#define dspot16_sceneTex_012798 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_012798"
-static const ALIGN_ASSET(2) char spot16_sceneTex_012798[] = dspot16_sceneTex_012798;
+#define dspot16_sceneTex_00D398 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_00D398"
+static const ALIGN_ASSET(2) char spot16_sceneTex_00D398[] = dspot16_sceneTex_00D398;
 
-#define dspot16_sceneTex_011798 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_011798"
-static const ALIGN_ASSET(2) char spot16_sceneTex_011798[] = dspot16_sceneTex_011798;
-
-#define dspot16_sceneTex_010198 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_010198"
-static const ALIGN_ASSET(2) char spot16_sceneTex_010198[] = dspot16_sceneTex_010198;
-
-#define dspot16_sceneTex_00F198 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_00F198"
-static const ALIGN_ASSET(2) char spot16_sceneTex_00F198[] = dspot16_sceneTex_00F198;
-
-#define dspot16_sceneTex_01B698 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_01B698"
-static const ALIGN_ASSET(2) char spot16_sceneTex_01B698[] = dspot16_sceneTex_01B698;
-
-#define dspot16_sceneTex_017E98 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_017E98"
-static const ALIGN_ASSET(2) char spot16_sceneTex_017E98[] = dspot16_sceneTex_017E98;
-
-#define dspot16_sceneTex_019E98 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_019E98"
-static const ALIGN_ASSET(2) char spot16_sceneTex_019E98[] = dspot16_sceneTex_019E98;
-
-#define dspot16_sceneTex_01C698 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_01C698"
-static const ALIGN_ASSET(2) char spot16_sceneTex_01C698[] = dspot16_sceneTex_01C698;
-
-#define dspot16_sceneTex_00D798 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_00D798"
+#define dspot16_sceneTex_00D798 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_00D798"
 static const ALIGN_ASSET(2) char spot16_sceneTex_00D798[] = dspot16_sceneTex_00D798;
 
-#define dspot16_sceneTLUT_008170 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTLUT_008170"
-static const ALIGN_ASSET(2) char spot16_sceneTLUT_008170[] = dspot16_sceneTLUT_008170;
+#define dspot16_sceneTex_00DF98 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_00DF98"
+static const ALIGN_ASSET(2) char spot16_sceneTex_00DF98[] = dspot16_sceneTex_00DF98;
 
-#define dspot16_sceneTex_013D98 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_013D98"
-static const ALIGN_ASSET(2) char spot16_sceneTex_013D98[] = dspot16_sceneTex_013D98;
+#define dspot16_sceneTex_00E198 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_00E198"
+static const ALIGN_ASSET(2) char spot16_sceneTex_00E198[] = dspot16_sceneTex_00E198;
 
-#define dspot16_sceneTex_013998 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneTex_013998"
+#define dspot16_sceneTex_00F198 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_00F198"
+static const ALIGN_ASSET(2) char spot16_sceneTex_00F198[] = dspot16_sceneTex_00F198;
+
+#define dspot16_sceneTex_010198 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_010198"
+static const ALIGN_ASSET(2) char spot16_sceneTex_010198[] = dspot16_sceneTex_010198;
+
+#define dspot16_sceneTex_011198 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_011198"
+static const ALIGN_ASSET(2) char spot16_sceneTex_011198[] = dspot16_sceneTex_011198;
+
+#define dspot16_sceneTex_011598 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_011598"
+static const ALIGN_ASSET(2) char spot16_sceneTex_011598[] = dspot16_sceneTex_011598;
+
+#define dspot16_sceneTex_011798 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_011798"
+static const ALIGN_ASSET(2) char spot16_sceneTex_011798[] = dspot16_sceneTex_011798;
+
+#define dspot16_sceneTex_012798 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_012798"
+static const ALIGN_ASSET(2) char spot16_sceneTex_012798[] = dspot16_sceneTex_012798;
+
+#define dspot16_sceneTex_013798 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_013798"
+static const ALIGN_ASSET(2) char spot16_sceneTex_013798[] = dspot16_sceneTex_013798;
+
+#define dspot16_sceneTex_013998 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_013998"
 static const ALIGN_ASSET(2) char spot16_sceneTex_013998[] = dspot16_sceneTex_013998;
 
-#define dspot16_sceneCollisionHeader_003D10 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneCollisionHeader_003D10"
+#define dspot16_sceneTex_013D98 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_013D98"
+static const ALIGN_ASSET(2) char spot16_sceneTex_013D98[] = dspot16_sceneTex_013D98;
 
-#define dspot16_sceneCollisionHeader_003D10 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneCollisionHeader_003D10"
+#define dspot16_sceneTex_014D98 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_014D98"
+static const ALIGN_ASSET(2) char spot16_sceneTex_014D98[] = dspot16_sceneTex_014D98;
 
-#define dspot16_sceneCollisionHeader_003D10 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneCollisionHeader_003D10"
+#define dspot16_sceneTex_015598 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_015598"
+static const ALIGN_ASSET(2) char spot16_sceneTex_015598[] = dspot16_sceneTex_015598;
 
-#define dspot16_sceneCollisionHeader_003D10 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneCollisionHeader_003D10"
+#define dspot16_sceneTex_015D98 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_015D98"
+static const ALIGN_ASSET(2) char spot16_sceneTex_015D98[] = dspot16_sceneTex_015D98;
 
-#define dspot16_sceneCollisionHeader_003D10 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneCollisionHeader_003D10"
+#define dspot16_sceneTex_015E98 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_015E98"
+static const ALIGN_ASSET(2) char spot16_sceneTex_015E98[] = dspot16_sceneTex_015E98;
 
-#define dspot16_sceneCollisionHeader_003D10 "__OTR__scenes/nonmq/spot16_scene/spot16_sceneCollisionHeader_003D10"
+#define dspot16_sceneTex_016E98 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_016E98"
+static const ALIGN_ASSET(2) char spot16_sceneTex_016E98[] = dspot16_sceneTex_016E98;
+
+#define dspot16_sceneTex_017E98 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_017E98"
+static const ALIGN_ASSET(2) char spot16_sceneTex_017E98[] = dspot16_sceneTex_017E98;
+
+#define dspot16_sceneTex_018698 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_018698"
+static const ALIGN_ASSET(2) char spot16_sceneTex_018698[] = dspot16_sceneTex_018698;
+
+#define dspot16_sceneTex_018E98 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_018E98"
+static const ALIGN_ASSET(2) char spot16_sceneTex_018E98[] = dspot16_sceneTex_018E98;
+
+#define dspot16_sceneTex_019698 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_019698"
+static const ALIGN_ASSET(2) char spot16_sceneTex_019698[] = dspot16_sceneTex_019698;
+
+#define dspot16_sceneTex_019E98 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_019E98"
+static const ALIGN_ASSET(2) char spot16_sceneTex_019E98[] = dspot16_sceneTex_019E98;
+
+#define dspot16_sceneTex_01B698 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_01B698"
+static const ALIGN_ASSET(2) char spot16_sceneTex_01B698[] = dspot16_sceneTex_01B698;
+
+#define dspot16_sceneTex_01C698 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_01C698"
+static const ALIGN_ASSET(2) char spot16_sceneTex_01C698[] = dspot16_sceneTex_01C698;
+
+#define dspot16_sceneTex_01D698 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_01D698"
+static const ALIGN_ASSET(2) char spot16_sceneTex_01D698[] = dspot16_sceneTex_01D698;
+
+#define dspot16_sceneTex_01DE98 "__OTR__scenes/shared/spot16_scene/spot16_sceneTex_01DE98"
+static const ALIGN_ASSET(2) char spot16_sceneTex_01DE98[] = dspot16_sceneTex_01DE98;
+
+#define dspot16_sceneTLUT_008170 "__OTR__scenes/shared/spot16_scene/spot16_sceneTLUT_008170"
+static const ALIGN_ASSET(2) char spot16_sceneTLUT_008170[] = dspot16_sceneTLUT_008170;
+
+#define dgDMTOwlCs "__OTR__scenes/shared/spot16_scene/gDMTOwlCs"
+static const ALIGN_ASSET(2) char gDMTOwlCs[] = dgDMTOwlCs;
+
+#define dgDMTIntroCs "__OTR__scenes/shared/spot16_scene/gDMTIntroCs"
+static const ALIGN_ASSET(2) char gDMTIntroCs[] = dgDMTIntroCs;
+
+#define dspot16_sceneCollisionHeader_003D10 "__OTR__scenes/shared/spot16_scene/spot16_sceneCollisionHeader_003D10"
+static const ALIGN_ASSET(2) char spot16_sceneCollisionHeader_003D10[] = dspot16_sceneCollisionHeader_003D10;
+
+#define dspot16_scene_Tex_01AE98 "__OTR__scenes/shared/spot16_scene/spot16_scene_Tex_01AE98"
+static const ALIGN_ASSET(2) char spot16_scene_Tex_01AE98[] = dspot16_scene_Tex_01AE98;
+
+#define dspot16_sceneCollisionHeader_003D10 "__OTR__scenes/shared/spot16_scene/spot16_sceneCollisionHeader_003D10"
+
+#define dspot16_sceneCollisionHeader_003D10 "__OTR__scenes/shared/spot16_scene/spot16_sceneCollisionHeader_003D10"
+
+#define dspot16_sceneCollisionHeader_003D10 "__OTR__scenes/shared/spot16_scene/spot16_sceneCollisionHeader_003D10"
+
+#define dspot16_sceneCollisionHeader_003D10 "__OTR__scenes/shared/spot16_scene/spot16_sceneCollisionHeader_003D10"
+
+#define dspot16_sceneCollisionHeader_003D10 "__OTR__scenes/shared/spot16_scene/spot16_sceneCollisionHeader_003D10"
+
+#define dspot16_sceneCollisionHeader_003D10 "__OTR__scenes/shared/spot16_scene/spot16_sceneCollisionHeader_003D10"
 
 
 #endif // OVERWORLD_SPOT16_SCENE_H
diff --git a/soh/assets/scenes/overworld/spot17/spot17_room_0.h b/soh/assets/scenes/overworld/spot17/spot17_room_0.h
index f6fb5cec7..0ec746553 100644
--- a/soh/assets/scenes/overworld/spot17/spot17_room_0.h
+++ b/soh/assets/scenes/overworld/spot17/spot17_room_0.h
@@ -3,64 +3,64 @@
 
 #include "align_asset_macro.h"
 
-#define dspot17_room_0DL_001D30 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0DL_001D30"
-static const ALIGN_ASSET(2) char spot17_room_0DL_001D30[] = dspot17_room_0DL_001D30;
-
-#define dspot17_room_0DL_001110 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0DL_001110"
-static const ALIGN_ASSET(2) char spot17_room_0DL_001110[] = dspot17_room_0DL_001110;
-
-#define dspot17_room_0Tex_005080 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0Tex_005080"
-static const ALIGN_ASSET(2) char spot17_room_0Tex_005080[] = dspot17_room_0Tex_005080;
-
-#define dspot17_room_0Tex_003880 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0Tex_003880"
+#define dspot17_room_0Tex_003880 "__OTR__scenes/shared/spot17_scene/spot17_room_0Tex_003880"
 static const ALIGN_ASSET(2) char spot17_room_0Tex_003880[] = dspot17_room_0Tex_003880;
 
-#define dspot17_room_0Tex_004880 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0Tex_004880"
+#define dspot17_room_0Tex_004880 "__OTR__scenes/shared/spot17_scene/spot17_room_0Tex_004880"
 static const ALIGN_ASSET(2) char spot17_room_0Tex_004880[] = dspot17_room_0Tex_004880;
 
-#define dspot17_room_0Tex_005880 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0Tex_005880"
+#define dspot17_room_0Tex_005080 "__OTR__scenes/shared/spot17_scene/spot17_room_0Tex_005080"
+static const ALIGN_ASSET(2) char spot17_room_0Tex_005080[] = dspot17_room_0Tex_005080;
+
+#define dspot17_room_0Tex_005880 "__OTR__scenes/shared/spot17_scene/spot17_room_0Tex_005880"
 static const ALIGN_ASSET(2) char spot17_room_0Tex_005880[] = dspot17_room_0Tex_005880;
 
-#define dspot17_room_0DL_0027C8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0DL_0027C8"
+#define dspot17_room_0DL_001D30 "__OTR__scenes/shared/spot17_scene/spot17_room_0DL_001D30"
+static const ALIGN_ASSET(2) char spot17_room_0DL_001D30[] = dspot17_room_0DL_001D30;
+
+#define dspot17_room_0DL_001110 "__OTR__scenes/shared/spot17_scene/spot17_room_0DL_001110"
+static const ALIGN_ASSET(2) char spot17_room_0DL_001110[] = dspot17_room_0DL_001110;
+
+#define dspot17_room_0DL_0027C8 "__OTR__scenes/shared/spot17_scene/spot17_room_0DL_0027C8"
 static const ALIGN_ASSET(2) char spot17_room_0DL_0027C8[] = dspot17_room_0DL_0027C8;
 
-#define dspot17_room_0DL_003480 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0DL_003480"
+#define dspot17_room_0DL_003480 "__OTR__scenes/shared/spot17_scene/spot17_room_0DL_003480"
 static const ALIGN_ASSET(2) char spot17_room_0DL_003480[] = dspot17_room_0DL_003480;
 
-#define dspot17_room_0Set_0000C0DL_001D30 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0Set_0000C0DL_001D30"
+#define dspot17_room_0Set_0000C0DL_001D30 "__OTR__scenes/shared/spot17_scene/spot17_room_0Set_0000C0DL_001D30"
 static const ALIGN_ASSET(2) char spot17_room_0Set_0000C0DL_001D30[] = dspot17_room_0Set_0000C0DL_001D30;
 
-#define dspot17_room_0Set_0000C0DL_001110 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0Set_0000C0DL_001110"
+#define dspot17_room_0Set_0000C0DL_001110 "__OTR__scenes/shared/spot17_scene/spot17_room_0Set_0000C0DL_001110"
 static const ALIGN_ASSET(2) char spot17_room_0Set_0000C0DL_001110[] = dspot17_room_0Set_0000C0DL_001110;
 
-#define dspot17_room_0Set_0000C0DL_0027C8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0Set_0000C0DL_0027C8"
+#define dspot17_room_0Set_0000C0DL_0027C8 "__OTR__scenes/shared/spot17_scene/spot17_room_0Set_0000C0DL_0027C8"
 static const ALIGN_ASSET(2) char spot17_room_0Set_0000C0DL_0027C8[] = dspot17_room_0Set_0000C0DL_0027C8;
 
-#define dspot17_room_0Set_0000C0DL_003480 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0Set_0000C0DL_003480"
+#define dspot17_room_0Set_0000C0DL_003480 "__OTR__scenes/shared/spot17_scene/spot17_room_0Set_0000C0DL_003480"
 static const ALIGN_ASSET(2) char spot17_room_0Set_0000C0DL_003480[] = dspot17_room_0Set_0000C0DL_003480;
 
-#define dspot17_room_0Set_000120DL_001D30 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0Set_000120DL_001D30"
+#define dspot17_room_0Set_000120DL_001D30 "__OTR__scenes/shared/spot17_scene/spot17_room_0Set_000120DL_001D30"
 static const ALIGN_ASSET(2) char spot17_room_0Set_000120DL_001D30[] = dspot17_room_0Set_000120DL_001D30;
 
-#define dspot17_room_0Set_000120DL_001110 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0Set_000120DL_001110"
+#define dspot17_room_0Set_000120DL_001110 "__OTR__scenes/shared/spot17_scene/spot17_room_0Set_000120DL_001110"
 static const ALIGN_ASSET(2) char spot17_room_0Set_000120DL_001110[] = dspot17_room_0Set_000120DL_001110;
 
-#define dspot17_room_0Set_000120DL_0027C8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0Set_000120DL_0027C8"
+#define dspot17_room_0Set_000120DL_0027C8 "__OTR__scenes/shared/spot17_scene/spot17_room_0Set_000120DL_0027C8"
 static const ALIGN_ASSET(2) char spot17_room_0Set_000120DL_0027C8[] = dspot17_room_0Set_000120DL_0027C8;
 
-#define dspot17_room_0Set_000120DL_003480 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0Set_000120DL_003480"
+#define dspot17_room_0Set_000120DL_003480 "__OTR__scenes/shared/spot17_scene/spot17_room_0Set_000120DL_003480"
 static const ALIGN_ASSET(2) char spot17_room_0Set_000120DL_003480[] = dspot17_room_0Set_000120DL_003480;
 
-#define dspot17_room_0Set_000170DL_001D30 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0Set_000170DL_001D30"
+#define dspot17_room_0Set_000170DL_001D30 "__OTR__scenes/shared/spot17_scene/spot17_room_0Set_000170DL_001D30"
 static const ALIGN_ASSET(2) char spot17_room_0Set_000170DL_001D30[] = dspot17_room_0Set_000170DL_001D30;
 
-#define dspot17_room_0Set_000170DL_001110 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0Set_000170DL_001110"
+#define dspot17_room_0Set_000170DL_001110 "__OTR__scenes/shared/spot17_scene/spot17_room_0Set_000170DL_001110"
 static const ALIGN_ASSET(2) char spot17_room_0Set_000170DL_001110[] = dspot17_room_0Set_000170DL_001110;
 
-#define dspot17_room_0Set_000170DL_0027C8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0Set_000170DL_0027C8"
+#define dspot17_room_0Set_000170DL_0027C8 "__OTR__scenes/shared/spot17_scene/spot17_room_0Set_000170DL_0027C8"
 static const ALIGN_ASSET(2) char spot17_room_0Set_000170DL_0027C8[] = dspot17_room_0Set_000170DL_0027C8;
 
-#define dspot17_room_0Set_000170DL_003480 "__OTR__scenes/nonmq/spot17_scene/spot17_room_0Set_000170DL_003480"
+#define dspot17_room_0Set_000170DL_003480 "__OTR__scenes/shared/spot17_scene/spot17_room_0Set_000170DL_003480"
 static const ALIGN_ASSET(2) char spot17_room_0Set_000170DL_003480[] = dspot17_room_0Set_000170DL_003480;
 
 
diff --git a/soh/assets/scenes/overworld/spot17/spot17_room_1.h b/soh/assets/scenes/overworld/spot17/spot17_room_1.h
index b47c62986..3dd887130 100644
--- a/soh/assets/scenes/overworld/spot17/spot17_room_1.h
+++ b/soh/assets/scenes/overworld/spot17/spot17_room_1.h
@@ -3,376 +3,376 @@
 
 #include "align_asset_macro.h"
 
-#define dspot17_room_1DL_010A50 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_010A50"
-static const ALIGN_ASSET(2) char spot17_room_1DL_010A50[] = dspot17_room_1DL_010A50;
-
-#define dspot17_room_1Tex_010E58 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Tex_010E58"
-static const ALIGN_ASSET(2) char spot17_room_1Tex_010E58[] = dspot17_room_1Tex_010E58;
-
-#define dspot17_room_1Tex_011258 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Tex_011258"
-static const ALIGN_ASSET(2) char spot17_room_1Tex_011258[] = dspot17_room_1Tex_011258;
-
-#define dspot17_room_1Tex_011658 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Tex_011658"
-static const ALIGN_ASSET(2) char spot17_room_1Tex_011658[] = dspot17_room_1Tex_011658;
-
-#define dspot17_room_1Tex_011A58 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Tex_011A58"
-static const ALIGN_ASSET(2) char spot17_room_1Tex_011A58[] = dspot17_room_1Tex_011A58;
-
-#define dspot17_room_1DL_00A438 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_00A438"
-static const ALIGN_ASSET(2) char spot17_room_1DL_00A438[] = dspot17_room_1DL_00A438;
-
-#define dspot17_room_1Tex_00F4D8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Tex_00F4D8"
-static const ALIGN_ASSET(2) char spot17_room_1Tex_00F4D8[] = dspot17_room_1Tex_00F4D8;
-
-#define dspot17_room_1DL_007010 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_007010"
-static const ALIGN_ASSET(2) char spot17_room_1DL_007010[] = dspot17_room_1DL_007010;
-
-#define dspot17_room_1DL_0072B0 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_0072B0"
-static const ALIGN_ASSET(2) char spot17_room_1DL_0072B0[] = dspot17_room_1DL_0072B0;
-
-#define dspot17_room_1DL_005290 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_005290"
-static const ALIGN_ASSET(2) char spot17_room_1DL_005290[] = dspot17_room_1DL_005290;
-
-#define dspot17_room_1DL_010D10 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_010D10"
-static const ALIGN_ASSET(2) char spot17_room_1DL_010D10[] = dspot17_room_1DL_010D10;
-
-#define dspot17_room_1DL_005E68 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_005E68"
-static const ALIGN_ASSET(2) char spot17_room_1DL_005E68[] = dspot17_room_1DL_005E68;
-
-#define dspot17_room_1DL_002098 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_002098"
-static const ALIGN_ASSET(2) char spot17_room_1DL_002098[] = dspot17_room_1DL_002098;
-
-#define dspot17_room_1Tex_00E8D8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Tex_00E8D8"
-static const ALIGN_ASSET(2) char spot17_room_1Tex_00E8D8[] = dspot17_room_1Tex_00E8D8;
-
-#define dspot17_room_1Tex_00D7D8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Tex_00D7D8"
-static const ALIGN_ASSET(2) char spot17_room_1Tex_00D7D8[] = dspot17_room_1Tex_00D7D8;
-
-#define dspot17_room_1DL_0096B0 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_0096B0"
-static const ALIGN_ASSET(2) char spot17_room_1DL_0096B0[] = dspot17_room_1DL_0096B0;
-
-#define dspot17_room_1DL_008868 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_008868"
-static const ALIGN_ASSET(2) char spot17_room_1DL_008868[] = dspot17_room_1DL_008868;
-
-#define dspot17_room_1Tex_00FCD8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Tex_00FCD8"
-static const ALIGN_ASSET(2) char spot17_room_1Tex_00FCD8[] = dspot17_room_1Tex_00FCD8;
-
-#define dspot17_room_1DL_006A00 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_006A00"
-static const ALIGN_ASSET(2) char spot17_room_1DL_006A00[] = dspot17_room_1DL_006A00;
-
-#define dspot17_room_1Tex_00BBD8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Tex_00BBD8"
+#define dspot17_room_1Tex_00BBD8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Tex_00BBD8"
 static const ALIGN_ASSET(2) char spot17_room_1Tex_00BBD8[] = dspot17_room_1Tex_00BBD8;
 
-#define dspot17_room_1Tex_00D3D8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Tex_00D3D8"
-static const ALIGN_ASSET(2) char spot17_room_1Tex_00D3D8[] = dspot17_room_1Tex_00D3D8;
-
-#define dspot17_room_1Tex_00C3D8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Tex_00C3D8"
+#define dspot17_room_1Tex_00C3D8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Tex_00C3D8"
 static const ALIGN_ASSET(2) char spot17_room_1Tex_00C3D8[] = dspot17_room_1Tex_00C3D8;
 
-#define dspot17_room_1DL_009FB0 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_009FB0"
-static const ALIGN_ASSET(2) char spot17_room_1DL_009FB0[] = dspot17_room_1DL_009FB0;
-
-#define dspot17_room_1Tex_00F0D8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Tex_00F0D8"
-static const ALIGN_ASSET(2) char spot17_room_1Tex_00F0D8[] = dspot17_room_1Tex_00F0D8;
-
-#define dspot17_room_1DL_010060 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_010060"
-static const ALIGN_ASSET(2) char spot17_room_1DL_010060[] = dspot17_room_1DL_010060;
-
-#define dspot17_room_1Tex_012258 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Tex_012258"
-static const ALIGN_ASSET(2) char spot17_room_1Tex_012258[] = dspot17_room_1Tex_012258;
-
-#define dspot17_room_1DL_010300 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_010300"
-static const ALIGN_ASSET(2) char spot17_room_1DL_010300[] = dspot17_room_1DL_010300;
-
-#define dspot17_room_1DL_0012E8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_0012E8"
-static const ALIGN_ASSET(2) char spot17_room_1DL_0012E8[] = dspot17_room_1DL_0012E8;
-
-#define dspot17_room_1Tex_00ECD8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Tex_00ECD8"
-static const ALIGN_ASSET(2) char spot17_room_1Tex_00ECD8[] = dspot17_room_1Tex_00ECD8;
-
-#define dspot17_room_1DL_000E50 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_000E50"
-static const ALIGN_ASSET(2) char spot17_room_1DL_000E50[] = dspot17_room_1DL_000E50;
-
-#define dspot17_room_1Tex_00CBD8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Tex_00CBD8"
+#define dspot17_room_1Tex_00CBD8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Tex_00CBD8"
 static const ALIGN_ASSET(2) char spot17_room_1Tex_00CBD8[] = dspot17_room_1Tex_00CBD8;
 
-#define dspot17_room_1DL_007B78 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_007B78"
-static const ALIGN_ASSET(2) char spot17_room_1DL_007B78[] = dspot17_room_1DL_007B78;
+#define dspot17_room_1Tex_00D3D8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Tex_00D3D8"
+static const ALIGN_ASSET(2) char spot17_room_1Tex_00D3D8[] = dspot17_room_1Tex_00D3D8;
 
-#define dspot17_room_1Tex_00E7D8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Tex_00E7D8"
+#define dspot17_room_1Tex_00D7D8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Tex_00D7D8"
+static const ALIGN_ASSET(2) char spot17_room_1Tex_00D7D8[] = dspot17_room_1Tex_00D7D8;
+
+#define dspot17_room_1Tex_00E7D8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Tex_00E7D8"
 static const ALIGN_ASSET(2) char spot17_room_1Tex_00E7D8[] = dspot17_room_1Tex_00E7D8;
 
-#define dspot17_room_1DL_005550 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_005550"
+#define dspot17_room_1Tex_00E8D8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Tex_00E8D8"
+static const ALIGN_ASSET(2) char spot17_room_1Tex_00E8D8[] = dspot17_room_1Tex_00E8D8;
+
+#define dspot17_room_1Tex_00ECD8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Tex_00ECD8"
+static const ALIGN_ASSET(2) char spot17_room_1Tex_00ECD8[] = dspot17_room_1Tex_00ECD8;
+
+#define dspot17_room_1Tex_00F0D8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Tex_00F0D8"
+static const ALIGN_ASSET(2) char spot17_room_1Tex_00F0D8[] = dspot17_room_1Tex_00F0D8;
+
+#define dspot17_room_1Tex_00F4D8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Tex_00F4D8"
+static const ALIGN_ASSET(2) char spot17_room_1Tex_00F4D8[] = dspot17_room_1Tex_00F4D8;
+
+#define dspot17_room_1Tex_00FCD8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Tex_00FCD8"
+static const ALIGN_ASSET(2) char spot17_room_1Tex_00FCD8[] = dspot17_room_1Tex_00FCD8;
+
+#define dspot17_room_1Tex_010E58 "__OTR__scenes/shared/spot17_scene/spot17_room_1Tex_010E58"
+static const ALIGN_ASSET(2) char spot17_room_1Tex_010E58[] = dspot17_room_1Tex_010E58;
+
+#define dspot17_room_1Tex_011258 "__OTR__scenes/shared/spot17_scene/spot17_room_1Tex_011258"
+static const ALIGN_ASSET(2) char spot17_room_1Tex_011258[] = dspot17_room_1Tex_011258;
+
+#define dspot17_room_1Tex_011658 "__OTR__scenes/shared/spot17_scene/spot17_room_1Tex_011658"
+static const ALIGN_ASSET(2) char spot17_room_1Tex_011658[] = dspot17_room_1Tex_011658;
+
+#define dspot17_room_1Tex_011A58 "__OTR__scenes/shared/spot17_scene/spot17_room_1Tex_011A58"
+static const ALIGN_ASSET(2) char spot17_room_1Tex_011A58[] = dspot17_room_1Tex_011A58;
+
+#define dspot17_room_1Tex_012258 "__OTR__scenes/shared/spot17_scene/spot17_room_1Tex_012258"
+static const ALIGN_ASSET(2) char spot17_room_1Tex_012258[] = dspot17_room_1Tex_012258;
+
+#define dspot17_room_1DL_010A50 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_010A50"
+static const ALIGN_ASSET(2) char spot17_room_1DL_010A50[] = dspot17_room_1DL_010A50;
+
+#define dspot17_room_1DL_00A438 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_00A438"
+static const ALIGN_ASSET(2) char spot17_room_1DL_00A438[] = dspot17_room_1DL_00A438;
+
+#define dspot17_room_1DL_007010 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_007010"
+static const ALIGN_ASSET(2) char spot17_room_1DL_007010[] = dspot17_room_1DL_007010;
+
+#define dspot17_room_1DL_0072B0 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_0072B0"
+static const ALIGN_ASSET(2) char spot17_room_1DL_0072B0[] = dspot17_room_1DL_0072B0;
+
+#define dspot17_room_1DL_005290 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_005290"
+static const ALIGN_ASSET(2) char spot17_room_1DL_005290[] = dspot17_room_1DL_005290;
+
+#define dspot17_room_1DL_010D10 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_010D10"
+static const ALIGN_ASSET(2) char spot17_room_1DL_010D10[] = dspot17_room_1DL_010D10;
+
+#define dspot17_room_1DL_005E68 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_005E68"
+static const ALIGN_ASSET(2) char spot17_room_1DL_005E68[] = dspot17_room_1DL_005E68;
+
+#define dspot17_room_1DL_002098 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_002098"
+static const ALIGN_ASSET(2) char spot17_room_1DL_002098[] = dspot17_room_1DL_002098;
+
+#define dspot17_room_1DL_0096B0 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_0096B0"
+static const ALIGN_ASSET(2) char spot17_room_1DL_0096B0[] = dspot17_room_1DL_0096B0;
+
+#define dspot17_room_1DL_008868 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_008868"
+static const ALIGN_ASSET(2) char spot17_room_1DL_008868[] = dspot17_room_1DL_008868;
+
+#define dspot17_room_1DL_006A00 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_006A00"
+static const ALIGN_ASSET(2) char spot17_room_1DL_006A00[] = dspot17_room_1DL_006A00;
+
+#define dspot17_room_1DL_009FB0 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_009FB0"
+static const ALIGN_ASSET(2) char spot17_room_1DL_009FB0[] = dspot17_room_1DL_009FB0;
+
+#define dspot17_room_1DL_010060 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_010060"
+static const ALIGN_ASSET(2) char spot17_room_1DL_010060[] = dspot17_room_1DL_010060;
+
+#define dspot17_room_1DL_010300 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_010300"
+static const ALIGN_ASSET(2) char spot17_room_1DL_010300[] = dspot17_room_1DL_010300;
+
+#define dspot17_room_1DL_0012E8 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_0012E8"
+static const ALIGN_ASSET(2) char spot17_room_1DL_0012E8[] = dspot17_room_1DL_0012E8;
+
+#define dspot17_room_1DL_000E50 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_000E50"
+static const ALIGN_ASSET(2) char spot17_room_1DL_000E50[] = dspot17_room_1DL_000E50;
+
+#define dspot17_room_1DL_007B78 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_007B78"
+static const ALIGN_ASSET(2) char spot17_room_1DL_007B78[] = dspot17_room_1DL_007B78;
+
+#define dspot17_room_1DL_005550 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_005550"
 static const ALIGN_ASSET(2) char spot17_room_1DL_005550[] = dspot17_room_1DL_005550;
 
-#define dspot17_room_1DL_00AD00 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_00AD00"
+#define dspot17_room_1DL_00AD00 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_00AD00"
 static const ALIGN_ASSET(2) char spot17_room_1DL_00AD00[] = dspot17_room_1DL_00AD00;
 
-#define dspot17_room_1DL_00B4A8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_00B4A8"
+#define dspot17_room_1DL_00B4A8 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_00B4A8"
 static const ALIGN_ASSET(2) char spot17_room_1DL_00B4A8[] = dspot17_room_1DL_00B4A8;
 
-#define dspot17_room_1DL_002938 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_002938"
+#define dspot17_room_1DL_002938 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_002938"
 static const ALIGN_ASSET(2) char spot17_room_1DL_002938[] = dspot17_room_1DL_002938;
 
-#define dspot17_room_1DL_003850 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_003850"
+#define dspot17_room_1DL_003850 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_003850"
 static const ALIGN_ASSET(2) char spot17_room_1DL_003850[] = dspot17_room_1DL_003850;
 
-#define dspot17_room_1DL_001A00 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_001A00"
+#define dspot17_room_1DL_001A00 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_001A00"
 static const ALIGN_ASSET(2) char spot17_room_1DL_001A00[] = dspot17_room_1DL_001A00;
 
-#define dspot17_room_1DL_00A908 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_00A908"
+#define dspot17_room_1DL_00A908 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_00A908"
 static const ALIGN_ASSET(2) char spot17_room_1DL_00A908[] = dspot17_room_1DL_00A908;
 
-#define dspot17_room_1DL_008F98 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_008F98"
+#define dspot17_room_1DL_008F98 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_008F98"
 static const ALIGN_ASSET(2) char spot17_room_1DL_008F98[] = dspot17_room_1DL_008F98;
 
-#define dspot17_room_1DL_009AA0 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_009AA0"
+#define dspot17_room_1DL_009AA0 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_009AA0"
 static const ALIGN_ASSET(2) char spot17_room_1DL_009AA0[] = dspot17_room_1DL_009AA0;
 
-#define dspot17_room_1DL_004AC8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1DL_004AC8"
+#define dspot17_room_1DL_004AC8 "__OTR__scenes/shared/spot17_scene/spot17_room_1DL_004AC8"
 static const ALIGN_ASSET(2) char spot17_room_1DL_004AC8[] = dspot17_room_1DL_004AC8;
 
-#define dspot17_room_1Set_0004C0DL_010A50 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_010A50"
+#define dspot17_room_1Set_0004C0DL_010A50 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_010A50"
 static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_010A50[] = dspot17_room_1Set_0004C0DL_010A50;
 
-#define dspot17_room_1Set_0004C0DL_00A438 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_00A438"
+#define dspot17_room_1Set_0004C0DL_00A438 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_00A438"
 static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_00A438[] = dspot17_room_1Set_0004C0DL_00A438;
 
-#define dspot17_room_1Set_0004C0DL_007010 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_007010"
+#define dspot17_room_1Set_0004C0DL_007010 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_007010"
 static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_007010[] = dspot17_room_1Set_0004C0DL_007010;
 
-#define dspot17_room_1Set_0004C0DL_0072B0 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_0072B0"
+#define dspot17_room_1Set_0004C0DL_0072B0 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_0072B0"
 static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_0072B0[] = dspot17_room_1Set_0004C0DL_0072B0;
 
-#define dspot17_room_1Set_0004C0DL_005290 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_005290"
+#define dspot17_room_1Set_0004C0DL_005290 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_005290"
 static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_005290[] = dspot17_room_1Set_0004C0DL_005290;
 
-#define dspot17_room_1Set_0004C0DL_010D10 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_010D10"
+#define dspot17_room_1Set_0004C0DL_010D10 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_010D10"
 static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_010D10[] = dspot17_room_1Set_0004C0DL_010D10;
 
-#define dspot17_room_1Set_0004C0DL_005E68 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_005E68"
+#define dspot17_room_1Set_0004C0DL_005E68 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_005E68"
 static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_005E68[] = dspot17_room_1Set_0004C0DL_005E68;
 
-#define dspot17_room_1Set_0004C0DL_002098 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_002098"
+#define dspot17_room_1Set_0004C0DL_002098 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_002098"
 static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_002098[] = dspot17_room_1Set_0004C0DL_002098;
 
-#define dspot17_room_1Set_0004C0DL_0096B0 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_0096B0"
+#define dspot17_room_1Set_0004C0DL_0096B0 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_0096B0"
 static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_0096B0[] = dspot17_room_1Set_0004C0DL_0096B0;
 
-#define dspot17_room_1Set_0004C0DL_008868 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_008868"
+#define dspot17_room_1Set_0004C0DL_008868 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_008868"
 static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_008868[] = dspot17_room_1Set_0004C0DL_008868;
 
-#define dspot17_room_1Set_0004C0DL_006A00 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_006A00"
+#define dspot17_room_1Set_0004C0DL_006A00 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_006A00"
 static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_006A00[] = dspot17_room_1Set_0004C0DL_006A00;
 
-#define dspot17_room_1Set_0004C0DL_009FB0 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_009FB0"
+#define dspot17_room_1Set_0004C0DL_009FB0 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_009FB0"
 static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_009FB0[] = dspot17_room_1Set_0004C0DL_009FB0;
 
-#define dspot17_room_1Set_0004C0DL_010060 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_010060"
+#define dspot17_room_1Set_0004C0DL_010060 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_010060"
 static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_010060[] = dspot17_room_1Set_0004C0DL_010060;
 
-#define dspot17_room_1Set_0004C0DL_010300 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_010300"
+#define dspot17_room_1Set_0004C0DL_010300 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_010300"
 static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_010300[] = dspot17_room_1Set_0004C0DL_010300;
 
-#define dspot17_room_1Set_0004C0DL_0012E8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_0012E8"
+#define dspot17_room_1Set_0004C0DL_0012E8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_0012E8"
 static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_0012E8[] = dspot17_room_1Set_0004C0DL_0012E8;
 
-#define dspot17_room_1Set_0004C0DL_000E50 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_000E50"
+#define dspot17_room_1Set_0004C0DL_000E50 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_000E50"
 static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_000E50[] = dspot17_room_1Set_0004C0DL_000E50;
 
-#define dspot17_room_1Set_0004C0DL_007B78 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_007B78"
+#define dspot17_room_1Set_0004C0DL_007B78 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_007B78"
 static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_007B78[] = dspot17_room_1Set_0004C0DL_007B78;
 
-#define dspot17_room_1Set_0004C0DL_005550 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_005550"
+#define dspot17_room_1Set_0004C0DL_005550 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_005550"
 static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_005550[] = dspot17_room_1Set_0004C0DL_005550;
 
-#define dspot17_room_1Set_0004C0DL_00AD00 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_00AD00"
+#define dspot17_room_1Set_0004C0DL_00AD00 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_00AD00"
 static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_00AD00[] = dspot17_room_1Set_0004C0DL_00AD00;
 
-#define dspot17_room_1Set_0004C0DL_00B4A8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_00B4A8"
+#define dspot17_room_1Set_0004C0DL_00B4A8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_00B4A8"
 static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_00B4A8[] = dspot17_room_1Set_0004C0DL_00B4A8;
 
-#define dspot17_room_1Set_0004C0DL_002938 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_002938"
+#define dspot17_room_1Set_0004C0DL_002938 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_002938"
 static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_002938[] = dspot17_room_1Set_0004C0DL_002938;
 
-#define dspot17_room_1Set_0004C0DL_003850 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_003850"
+#define dspot17_room_1Set_0004C0DL_003850 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_003850"
 static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_003850[] = dspot17_room_1Set_0004C0DL_003850;
 
-#define dspot17_room_1Set_0004C0DL_001A00 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_001A00"
+#define dspot17_room_1Set_0004C0DL_001A00 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_001A00"
 static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_001A00[] = dspot17_room_1Set_0004C0DL_001A00;
 
-#define dspot17_room_1Set_0004C0DL_00A908 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_00A908"
+#define dspot17_room_1Set_0004C0DL_00A908 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_00A908"
 static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_00A908[] = dspot17_room_1Set_0004C0DL_00A908;
 
-#define dspot17_room_1Set_0004C0DL_008F98 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_008F98"
+#define dspot17_room_1Set_0004C0DL_008F98 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_008F98"
 static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_008F98[] = dspot17_room_1Set_0004C0DL_008F98;
 
-#define dspot17_room_1Set_0004C0DL_009AA0 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_009AA0"
+#define dspot17_room_1Set_0004C0DL_009AA0 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_009AA0"
 static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_009AA0[] = dspot17_room_1Set_0004C0DL_009AA0;
 
-#define dspot17_room_1Set_0004C0DL_004AC8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_0004C0DL_004AC8"
+#define dspot17_room_1Set_0004C0DL_004AC8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_0004C0DL_004AC8"
 static const ALIGN_ASSET(2) char spot17_room_1Set_0004C0DL_004AC8[] = dspot17_room_1Set_0004C0DL_004AC8;
 
-#define dspot17_room_1Set_000830DL_010A50 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_010A50"
+#define dspot17_room_1Set_000830DL_010A50 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_010A50"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_010A50[] = dspot17_room_1Set_000830DL_010A50;
 
-#define dspot17_room_1Set_000830DL_00A438 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_00A438"
+#define dspot17_room_1Set_000830DL_00A438 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_00A438"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_00A438[] = dspot17_room_1Set_000830DL_00A438;
 
-#define dspot17_room_1Set_000830DL_007010 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_007010"
+#define dspot17_room_1Set_000830DL_007010 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_007010"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_007010[] = dspot17_room_1Set_000830DL_007010;
 
-#define dspot17_room_1Set_000830DL_0072B0 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_0072B0"
+#define dspot17_room_1Set_000830DL_0072B0 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_0072B0"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_0072B0[] = dspot17_room_1Set_000830DL_0072B0;
 
-#define dspot17_room_1Set_000830DL_005290 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_005290"
+#define dspot17_room_1Set_000830DL_005290 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_005290"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_005290[] = dspot17_room_1Set_000830DL_005290;
 
-#define dspot17_room_1Set_000830DL_010D10 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_010D10"
+#define dspot17_room_1Set_000830DL_010D10 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_010D10"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_010D10[] = dspot17_room_1Set_000830DL_010D10;
 
-#define dspot17_room_1Set_000830DL_005E68 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_005E68"
+#define dspot17_room_1Set_000830DL_005E68 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_005E68"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_005E68[] = dspot17_room_1Set_000830DL_005E68;
 
-#define dspot17_room_1Set_000830DL_002098 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_002098"
+#define dspot17_room_1Set_000830DL_002098 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_002098"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_002098[] = dspot17_room_1Set_000830DL_002098;
 
-#define dspot17_room_1Set_000830DL_0096B0 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_0096B0"
+#define dspot17_room_1Set_000830DL_0096B0 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_0096B0"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_0096B0[] = dspot17_room_1Set_000830DL_0096B0;
 
-#define dspot17_room_1Set_000830DL_008868 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_008868"
+#define dspot17_room_1Set_000830DL_008868 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_008868"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_008868[] = dspot17_room_1Set_000830DL_008868;
 
-#define dspot17_room_1Set_000830DL_006A00 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_006A00"
+#define dspot17_room_1Set_000830DL_006A00 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_006A00"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_006A00[] = dspot17_room_1Set_000830DL_006A00;
 
-#define dspot17_room_1Set_000830DL_009FB0 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_009FB0"
+#define dspot17_room_1Set_000830DL_009FB0 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_009FB0"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_009FB0[] = dspot17_room_1Set_000830DL_009FB0;
 
-#define dspot17_room_1Set_000830DL_010060 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_010060"
+#define dspot17_room_1Set_000830DL_010060 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_010060"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_010060[] = dspot17_room_1Set_000830DL_010060;
 
-#define dspot17_room_1Set_000830DL_010300 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_010300"
+#define dspot17_room_1Set_000830DL_010300 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_010300"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_010300[] = dspot17_room_1Set_000830DL_010300;
 
-#define dspot17_room_1Set_000830DL_0012E8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_0012E8"
+#define dspot17_room_1Set_000830DL_0012E8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_0012E8"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_0012E8[] = dspot17_room_1Set_000830DL_0012E8;
 
-#define dspot17_room_1Set_000830DL_000E50 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_000E50"
+#define dspot17_room_1Set_000830DL_000E50 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_000E50"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_000E50[] = dspot17_room_1Set_000830DL_000E50;
 
-#define dspot17_room_1Set_000830DL_007B78 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_007B78"
+#define dspot17_room_1Set_000830DL_007B78 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_007B78"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_007B78[] = dspot17_room_1Set_000830DL_007B78;
 
-#define dspot17_room_1Set_000830DL_005550 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_005550"
+#define dspot17_room_1Set_000830DL_005550 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_005550"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_005550[] = dspot17_room_1Set_000830DL_005550;
 
-#define dspot17_room_1Set_000830DL_00AD00 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_00AD00"
+#define dspot17_room_1Set_000830DL_00AD00 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_00AD00"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_00AD00[] = dspot17_room_1Set_000830DL_00AD00;
 
-#define dspot17_room_1Set_000830DL_00B4A8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_00B4A8"
+#define dspot17_room_1Set_000830DL_00B4A8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_00B4A8"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_00B4A8[] = dspot17_room_1Set_000830DL_00B4A8;
 
-#define dspot17_room_1Set_000830DL_002938 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_002938"
+#define dspot17_room_1Set_000830DL_002938 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_002938"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_002938[] = dspot17_room_1Set_000830DL_002938;
 
-#define dspot17_room_1Set_000830DL_003850 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_003850"
+#define dspot17_room_1Set_000830DL_003850 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_003850"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_003850[] = dspot17_room_1Set_000830DL_003850;
 
-#define dspot17_room_1Set_000830DL_001A00 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_001A00"
+#define dspot17_room_1Set_000830DL_001A00 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_001A00"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_001A00[] = dspot17_room_1Set_000830DL_001A00;
 
-#define dspot17_room_1Set_000830DL_00A908 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_00A908"
+#define dspot17_room_1Set_000830DL_00A908 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_00A908"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_00A908[] = dspot17_room_1Set_000830DL_00A908;
 
-#define dspot17_room_1Set_000830DL_008F98 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_008F98"
+#define dspot17_room_1Set_000830DL_008F98 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_008F98"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_008F98[] = dspot17_room_1Set_000830DL_008F98;
 
-#define dspot17_room_1Set_000830DL_009AA0 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_009AA0"
+#define dspot17_room_1Set_000830DL_009AA0 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_009AA0"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_009AA0[] = dspot17_room_1Set_000830DL_009AA0;
 
-#define dspot17_room_1Set_000830DL_004AC8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000830DL_004AC8"
+#define dspot17_room_1Set_000830DL_004AC8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000830DL_004AC8"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000830DL_004AC8[] = dspot17_room_1Set_000830DL_004AC8;
 
-#define dspot17_room_1Set_000940DL_010A50 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_010A50"
+#define dspot17_room_1Set_000940DL_010A50 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_010A50"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_010A50[] = dspot17_room_1Set_000940DL_010A50;
 
-#define dspot17_room_1Set_000940DL_00A438 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_00A438"
+#define dspot17_room_1Set_000940DL_00A438 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_00A438"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_00A438[] = dspot17_room_1Set_000940DL_00A438;
 
-#define dspot17_room_1Set_000940DL_007010 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_007010"
+#define dspot17_room_1Set_000940DL_007010 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_007010"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_007010[] = dspot17_room_1Set_000940DL_007010;
 
-#define dspot17_room_1Set_000940DL_0072B0 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_0072B0"
+#define dspot17_room_1Set_000940DL_0072B0 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_0072B0"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_0072B0[] = dspot17_room_1Set_000940DL_0072B0;
 
-#define dspot17_room_1Set_000940DL_005290 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_005290"
+#define dspot17_room_1Set_000940DL_005290 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_005290"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_005290[] = dspot17_room_1Set_000940DL_005290;
 
-#define dspot17_room_1Set_000940DL_010D10 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_010D10"
+#define dspot17_room_1Set_000940DL_010D10 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_010D10"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_010D10[] = dspot17_room_1Set_000940DL_010D10;
 
-#define dspot17_room_1Set_000940DL_005E68 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_005E68"
+#define dspot17_room_1Set_000940DL_005E68 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_005E68"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_005E68[] = dspot17_room_1Set_000940DL_005E68;
 
-#define dspot17_room_1Set_000940DL_002098 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_002098"
+#define dspot17_room_1Set_000940DL_002098 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_002098"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_002098[] = dspot17_room_1Set_000940DL_002098;
 
-#define dspot17_room_1Set_000940DL_0096B0 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_0096B0"
+#define dspot17_room_1Set_000940DL_0096B0 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_0096B0"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_0096B0[] = dspot17_room_1Set_000940DL_0096B0;
 
-#define dspot17_room_1Set_000940DL_008868 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_008868"
+#define dspot17_room_1Set_000940DL_008868 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_008868"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_008868[] = dspot17_room_1Set_000940DL_008868;
 
-#define dspot17_room_1Set_000940DL_006A00 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_006A00"
+#define dspot17_room_1Set_000940DL_006A00 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_006A00"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_006A00[] = dspot17_room_1Set_000940DL_006A00;
 
-#define dspot17_room_1Set_000940DL_009FB0 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_009FB0"
+#define dspot17_room_1Set_000940DL_009FB0 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_009FB0"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_009FB0[] = dspot17_room_1Set_000940DL_009FB0;
 
-#define dspot17_room_1Set_000940DL_010060 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_010060"
+#define dspot17_room_1Set_000940DL_010060 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_010060"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_010060[] = dspot17_room_1Set_000940DL_010060;
 
-#define dspot17_room_1Set_000940DL_010300 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_010300"
+#define dspot17_room_1Set_000940DL_010300 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_010300"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_010300[] = dspot17_room_1Set_000940DL_010300;
 
-#define dspot17_room_1Set_000940DL_0012E8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_0012E8"
+#define dspot17_room_1Set_000940DL_0012E8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_0012E8"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_0012E8[] = dspot17_room_1Set_000940DL_0012E8;
 
-#define dspot17_room_1Set_000940DL_000E50 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_000E50"
+#define dspot17_room_1Set_000940DL_000E50 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_000E50"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_000E50[] = dspot17_room_1Set_000940DL_000E50;
 
-#define dspot17_room_1Set_000940DL_007B78 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_007B78"
+#define dspot17_room_1Set_000940DL_007B78 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_007B78"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_007B78[] = dspot17_room_1Set_000940DL_007B78;
 
-#define dspot17_room_1Set_000940DL_005550 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_005550"
+#define dspot17_room_1Set_000940DL_005550 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_005550"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_005550[] = dspot17_room_1Set_000940DL_005550;
 
-#define dspot17_room_1Set_000940DL_00AD00 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_00AD00"
+#define dspot17_room_1Set_000940DL_00AD00 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_00AD00"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_00AD00[] = dspot17_room_1Set_000940DL_00AD00;
 
-#define dspot17_room_1Set_000940DL_00B4A8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_00B4A8"
+#define dspot17_room_1Set_000940DL_00B4A8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_00B4A8"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_00B4A8[] = dspot17_room_1Set_000940DL_00B4A8;
 
-#define dspot17_room_1Set_000940DL_002938 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_002938"
+#define dspot17_room_1Set_000940DL_002938 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_002938"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_002938[] = dspot17_room_1Set_000940DL_002938;
 
-#define dspot17_room_1Set_000940DL_003850 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_003850"
+#define dspot17_room_1Set_000940DL_003850 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_003850"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_003850[] = dspot17_room_1Set_000940DL_003850;
 
-#define dspot17_room_1Set_000940DL_001A00 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_001A00"
+#define dspot17_room_1Set_000940DL_001A00 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_001A00"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_001A00[] = dspot17_room_1Set_000940DL_001A00;
 
-#define dspot17_room_1Set_000940DL_00A908 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_00A908"
+#define dspot17_room_1Set_000940DL_00A908 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_00A908"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_00A908[] = dspot17_room_1Set_000940DL_00A908;
 
-#define dspot17_room_1Set_000940DL_008F98 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_008F98"
+#define dspot17_room_1Set_000940DL_008F98 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_008F98"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_008F98[] = dspot17_room_1Set_000940DL_008F98;
 
-#define dspot17_room_1Set_000940DL_009AA0 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_009AA0"
+#define dspot17_room_1Set_000940DL_009AA0 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_009AA0"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_009AA0[] = dspot17_room_1Set_000940DL_009AA0;
 
-#define dspot17_room_1Set_000940DL_004AC8 "__OTR__scenes/nonmq/spot17_scene/spot17_room_1Set_000940DL_004AC8"
+#define dspot17_room_1Set_000940DL_004AC8 "__OTR__scenes/shared/spot17_scene/spot17_room_1Set_000940DL_004AC8"
 static const ALIGN_ASSET(2) char spot17_room_1Set_000940DL_004AC8[] = dspot17_room_1Set_000940DL_004AC8;
 
 
diff --git a/soh/assets/scenes/overworld/spot17/spot17_scene.h b/soh/assets/scenes/overworld/spot17/spot17_scene.h
index 24f2ff86d..16c783e77 100644
--- a/soh/assets/scenes/overworld/spot17/spot17_scene.h
+++ b/soh/assets/scenes/overworld/spot17/spot17_scene.h
@@ -3,83 +3,83 @@
 
 #include "align_asset_macro.h"
 
-#define dgDeathMountainCraterBoleroCs "__OTR__scenes/nonmq/spot17_scene/gDeathMountainCraterBoleroCs"
-static const ALIGN_ASSET(2) char gDeathMountainCraterBoleroCs[] = dgDeathMountainCraterBoleroCs;
-
-#define dgDeathMountainCraterIntroCs "__OTR__scenes/nonmq/spot17_scene/gDeathMountainCraterIntroCs"
-static const ALIGN_ASSET(2) char gDeathMountainCraterIntroCs[] = dgDeathMountainCraterIntroCs;
-
-#define dspot17_sceneCollisionHeader_0045A4 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneCollisionHeader_0045A4"
-static const ALIGN_ASSET(2) char spot17_sceneCollisionHeader_0045A4[] = dspot17_sceneCollisionHeader_0045A4;
-
-#define dspot17_sceneTex_007AD8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_007AD8"
+#define dspot17_sceneTex_007AD8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_007AD8"
 static const ALIGN_ASSET(2) char spot17_sceneTex_007AD8[] = dspot17_sceneTex_007AD8;
 
-#define dspot17_sceneTLUT_007890 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTLUT_007890"
-static const ALIGN_ASSET(2) char spot17_sceneTLUT_007890[] = dspot17_sceneTLUT_007890;
-
-#define dspot17_sceneTex_00D6D8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_00D6D8"
-static const ALIGN_ASSET(2) char spot17_sceneTex_00D6D8[] = dspot17_sceneTex_00D6D8;
-
-#define dspot17_sceneTex_00F8D8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_00F8D8"
-static const ALIGN_ASSET(2) char spot17_sceneTex_00F8D8[] = dspot17_sceneTex_00F8D8;
-
-#define dspot17_sceneTex_00F0D8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_00F0D8"
-static const ALIGN_ASSET(2) char spot17_sceneTex_00F0D8[] = dspot17_sceneTex_00F0D8;
-
-#define dspot17_sceneTex_00BED8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_00BED8"
-static const ALIGN_ASSET(2) char spot17_sceneTex_00BED8[] = dspot17_sceneTex_00BED8;
-
-#define dspot17_sceneTex_00A6D8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_00A6D8"
-static const ALIGN_ASSET(2) char spot17_sceneTex_00A6D8[] = dspot17_sceneTex_00A6D8;
-
-#define dspot17_sceneTex_009ED8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_009ED8"
-static const ALIGN_ASSET(2) char spot17_sceneTex_009ED8[] = dspot17_sceneTex_009ED8;
-
-#define dspot17_sceneTex_00FCD8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_00FCD8"
-static const ALIGN_ASSET(2) char spot17_sceneTex_00FCD8[] = dspot17_sceneTex_00FCD8;
-
-#define dspot17_sceneTex_00D8D8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_00D8D8"
-static const ALIGN_ASSET(2) char spot17_sceneTex_00D8D8[] = dspot17_sceneTex_00D8D8;
-
-#define dspot17_sceneTex_008ED8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_008ED8"
-static const ALIGN_ASSET(2) char spot17_sceneTex_008ED8[] = dspot17_sceneTex_008ED8;
-
-#define dspot17_sceneTex_00E0D8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_00E0D8"
-static const ALIGN_ASSET(2) char spot17_sceneTex_00E0D8[] = dspot17_sceneTex_00E0D8;
-
-#define dspot17_sceneTLUT_007AB8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTLUT_007AB8"
-static const ALIGN_ASSET(2) char spot17_sceneTLUT_007AB8[] = dspot17_sceneTLUT_007AB8;
-
-#define dspot17_sceneTex_00B6D8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_00B6D8"
-static const ALIGN_ASSET(2) char spot17_sceneTex_00B6D8[] = dspot17_sceneTex_00B6D8;
-
-#define dspot17_sceneTex_00E8D8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_00E8D8"
-static const ALIGN_ASSET(2) char spot17_sceneTex_00E8D8[] = dspot17_sceneTex_00E8D8;
-
-#define dspot17_sceneTex_00AED8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_00AED8"
-static const ALIGN_ASSET(2) char spot17_sceneTex_00AED8[] = dspot17_sceneTex_00AED8;
-
-#define dspot17_sceneTLUT_007A98 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTLUT_007A98"
-static const ALIGN_ASSET(2) char spot17_sceneTLUT_007A98[] = dspot17_sceneTLUT_007A98;
-
-#define dspot17_sceneTex_0096D8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_0096D8"
-static const ALIGN_ASSET(2) char spot17_sceneTex_0096D8[] = dspot17_sceneTex_0096D8;
-
-#define dspot17_sceneTex_0082D8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_0082D8"
+#define dspot17_sceneTex_0082D8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_0082D8"
 static const ALIGN_ASSET(2) char spot17_sceneTex_0082D8[] = dspot17_sceneTex_0082D8;
 
-#define dspot17_sceneTex_0086D8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_0086D8"
+#define dspot17_sceneTex_0086D8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_0086D8"
 static const ALIGN_ASSET(2) char spot17_sceneTex_0086D8[] = dspot17_sceneTex_0086D8;
 
-#define dspot17_sceneTex_00C6D8 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneTex_00C6D8"
+#define dspot17_sceneTex_008ED8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_008ED8"
+static const ALIGN_ASSET(2) char spot17_sceneTex_008ED8[] = dspot17_sceneTex_008ED8;
+
+#define dspot17_sceneTex_0096D8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_0096D8"
+static const ALIGN_ASSET(2) char spot17_sceneTex_0096D8[] = dspot17_sceneTex_0096D8;
+
+#define dspot17_sceneTex_009ED8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_009ED8"
+static const ALIGN_ASSET(2) char spot17_sceneTex_009ED8[] = dspot17_sceneTex_009ED8;
+
+#define dspot17_sceneTex_00A6D8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_00A6D8"
+static const ALIGN_ASSET(2) char spot17_sceneTex_00A6D8[] = dspot17_sceneTex_00A6D8;
+
+#define dspot17_sceneTex_00AED8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_00AED8"
+static const ALIGN_ASSET(2) char spot17_sceneTex_00AED8[] = dspot17_sceneTex_00AED8;
+
+#define dspot17_sceneTex_00B6D8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_00B6D8"
+static const ALIGN_ASSET(2) char spot17_sceneTex_00B6D8[] = dspot17_sceneTex_00B6D8;
+
+#define dspot17_sceneTex_00BED8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_00BED8"
+static const ALIGN_ASSET(2) char spot17_sceneTex_00BED8[] = dspot17_sceneTex_00BED8;
+
+#define dspot17_sceneTex_00C6D8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_00C6D8"
 static const ALIGN_ASSET(2) char spot17_sceneTex_00C6D8[] = dspot17_sceneTex_00C6D8;
 
-#define dspot17_sceneCollisionHeader_0045A4 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneCollisionHeader_0045A4"
+#define dspot17_sceneTex_00D6D8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_00D6D8"
+static const ALIGN_ASSET(2) char spot17_sceneTex_00D6D8[] = dspot17_sceneTex_00D6D8;
 
-#define dspot17_sceneCollisionHeader_0045A4 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneCollisionHeader_0045A4"
+#define dspot17_sceneTex_00D8D8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_00D8D8"
+static const ALIGN_ASSET(2) char spot17_sceneTex_00D8D8[] = dspot17_sceneTex_00D8D8;
 
-#define dspot17_sceneCollisionHeader_0045A4 "__OTR__scenes/nonmq/spot17_scene/spot17_sceneCollisionHeader_0045A4"
+#define dspot17_sceneTex_00E0D8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_00E0D8"
+static const ALIGN_ASSET(2) char spot17_sceneTex_00E0D8[] = dspot17_sceneTex_00E0D8;
+
+#define dspot17_sceneTex_00E8D8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_00E8D8"
+static const ALIGN_ASSET(2) char spot17_sceneTex_00E8D8[] = dspot17_sceneTex_00E8D8;
+
+#define dspot17_sceneTex_00F0D8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_00F0D8"
+static const ALIGN_ASSET(2) char spot17_sceneTex_00F0D8[] = dspot17_sceneTex_00F0D8;
+
+#define dspot17_sceneTex_00F8D8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_00F8D8"
+static const ALIGN_ASSET(2) char spot17_sceneTex_00F8D8[] = dspot17_sceneTex_00F8D8;
+
+#define dspot17_sceneTex_00FCD8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTex_00FCD8"
+static const ALIGN_ASSET(2) char spot17_sceneTex_00FCD8[] = dspot17_sceneTex_00FCD8;
+
+#define dspot17_sceneTLUT_007890 "__OTR__scenes/shared/spot17_scene/spot17_sceneTLUT_007890"
+static const ALIGN_ASSET(2) char spot17_sceneTLUT_007890[] = dspot17_sceneTLUT_007890;
+
+#define dspot17_sceneTLUT_007A98 "__OTR__scenes/shared/spot17_scene/spot17_sceneTLUT_007A98"
+static const ALIGN_ASSET(2) char spot17_sceneTLUT_007A98[] = dspot17_sceneTLUT_007A98;
+
+#define dspot17_sceneTLUT_007AB8 "__OTR__scenes/shared/spot17_scene/spot17_sceneTLUT_007AB8"
+static const ALIGN_ASSET(2) char spot17_sceneTLUT_007AB8[] = dspot17_sceneTLUT_007AB8;
+
+#define dgDeathMountainCraterBoleroCs "__OTR__scenes/shared/spot17_scene/gDeathMountainCraterBoleroCs"
+static const ALIGN_ASSET(2) char gDeathMountainCraterBoleroCs[] = dgDeathMountainCraterBoleroCs;
+
+#define dgDeathMountainCraterIntroCs "__OTR__scenes/shared/spot17_scene/gDeathMountainCraterIntroCs"
+static const ALIGN_ASSET(2) char gDeathMountainCraterIntroCs[] = dgDeathMountainCraterIntroCs;
+
+#define dspot17_sceneCollisionHeader_0045A4 "__OTR__scenes/shared/spot17_scene/spot17_sceneCollisionHeader_0045A4"
+static const ALIGN_ASSET(2) char spot17_sceneCollisionHeader_0045A4[] = dspot17_sceneCollisionHeader_0045A4;
+
+#define dspot17_sceneCollisionHeader_0045A4 "__OTR__scenes/shared/spot17_scene/spot17_sceneCollisionHeader_0045A4"
+
+#define dspot17_sceneCollisionHeader_0045A4 "__OTR__scenes/shared/spot17_scene/spot17_sceneCollisionHeader_0045A4"
+
+#define dspot17_sceneCollisionHeader_0045A4 "__OTR__scenes/shared/spot17_scene/spot17_sceneCollisionHeader_0045A4"
 
 
 #endif // OVERWORLD_SPOT17_SCENE_H
diff --git a/soh/assets/scenes/overworld/spot18/spot18_room_0.h b/soh/assets/scenes/overworld/spot18/spot18_room_0.h
index ed7ece37b..a2f9b3cc1 100644
--- a/soh/assets/scenes/overworld/spot18/spot18_room_0.h
+++ b/soh/assets/scenes/overworld/spot18/spot18_room_0.h
@@ -3,106 +3,106 @@
 
 #include "align_asset_macro.h"
 
-#define dspot18_room_0DL_003238 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0DL_003238"
-static const ALIGN_ASSET(2) char spot18_room_0DL_003238[] = dspot18_room_0DL_003238;
-
-#define dspot18_room_0Tex_009960 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_009960"
-static const ALIGN_ASSET(2) char spot18_room_0Tex_009960[] = dspot18_room_0Tex_009960;
-
-#define dspot18_room_0Tex_00C160 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_00C160"
-static const ALIGN_ASSET(2) char spot18_room_0Tex_00C160[] = dspot18_room_0Tex_00C160;
-
-#define dspot18_room_0Tex_00A960 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_00A960"
-static const ALIGN_ASSET(2) char spot18_room_0Tex_00A960[] = dspot18_room_0Tex_00A960;
-
-#define dspot18_room_0Tex_009160 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_009160"
-static const ALIGN_ASSET(2) char spot18_room_0Tex_009160[] = dspot18_room_0Tex_009160;
-
-#define dspot18_room_0Tex_00B960 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_00B960"
-static const ALIGN_ASSET(2) char spot18_room_0Tex_00B960[] = dspot18_room_0Tex_00B960;
-
-#define dspot18_room_0Tex_006960 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_006960"
-static const ALIGN_ASSET(2) char spot18_room_0Tex_006960[] = dspot18_room_0Tex_006960;
-
-#define dspot18_room_0Tex_008960 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_008960"
-static const ALIGN_ASSET(2) char spot18_room_0Tex_008960[] = dspot18_room_0Tex_008960;
-
-#define dspot18_room_0Tex_005960 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_005960"
-static const ALIGN_ASSET(2) char spot18_room_0Tex_005960[] = dspot18_room_0Tex_005960;
-
-#define dspot18_room_0Tex_00B160 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_00B160"
-static const ALIGN_ASSET(2) char spot18_room_0Tex_00B160[] = dspot18_room_0Tex_00B160;
-
-#define dspot18_room_0Tex_007960 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_007960"
-static const ALIGN_ASSET(2) char spot18_room_0Tex_007960[] = dspot18_room_0Tex_007960;
-
-#define dspot18_room_0Tex_008160 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_008160"
-static const ALIGN_ASSET(2) char spot18_room_0Tex_008160[] = dspot18_room_0Tex_008160;
-
-#define dspot18_room_0Tex_00A160 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_00A160"
-static const ALIGN_ASSET(2) char spot18_room_0Tex_00A160[] = dspot18_room_0Tex_00A160;
-
-#define dspot18_room_0Tex_00C960 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_00C960"
-static const ALIGN_ASSET(2) char spot18_room_0Tex_00C960[] = dspot18_room_0Tex_00C960;
-
-#define dspot18_room_0Tex_007160 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_007160"
-static const ALIGN_ASSET(2) char spot18_room_0Tex_007160[] = dspot18_room_0Tex_007160;
-
-#define dspot18_room_0Tex_004960 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_004960"
+#define dspot18_room_0Tex_004960 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_004960"
 static const ALIGN_ASSET(2) char spot18_room_0Tex_004960[] = dspot18_room_0Tex_004960;
 
-#define dspot18_room_0Tex_005560 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_005560"
-static const ALIGN_ASSET(2) char spot18_room_0Tex_005560[] = dspot18_room_0Tex_005560;
-
-#define dspot18_room_0Tex_005160 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_005160"
+#define dspot18_room_0Tex_005160 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_005160"
 static const ALIGN_ASSET(2) char spot18_room_0Tex_005160[] = dspot18_room_0Tex_005160;
 
-#define dspot18_room_0DL_00DC80 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0DL_00DC80"
-static const ALIGN_ASSET(2) char spot18_room_0DL_00DC80[] = dspot18_room_0DL_00DC80;
+#define dspot18_room_0Tex_005560 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_005560"
+static const ALIGN_ASSET(2) char spot18_room_0Tex_005560[] = dspot18_room_0Tex_005560;
 
-#define dspot18_room_0Tex_00EFC8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_00EFC8"
-static const ALIGN_ASSET(2) char spot18_room_0Tex_00EFC8[] = dspot18_room_0Tex_00EFC8;
+#define dspot18_room_0Tex_005960 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_005960"
+static const ALIGN_ASSET(2) char spot18_room_0Tex_005960[] = dspot18_room_0Tex_005960;
 
-#define dspot18_room_0Tex_00FFC8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_00FFC8"
-static const ALIGN_ASSET(2) char spot18_room_0Tex_00FFC8[] = dspot18_room_0Tex_00FFC8;
+#define dspot18_room_0Tex_006960 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_006960"
+static const ALIGN_ASSET(2) char spot18_room_0Tex_006960[] = dspot18_room_0Tex_006960;
 
-#define dspot18_room_0Tex_0117C8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_0117C8"
-static const ALIGN_ASSET(2) char spot18_room_0Tex_0117C8[] = dspot18_room_0Tex_0117C8;
+#define dspot18_room_0Tex_007160 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_007160"
+static const ALIGN_ASSET(2) char spot18_room_0Tex_007160[] = dspot18_room_0Tex_007160;
 
-#define dspot18_room_0Tex_0107C8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_0107C8"
-static const ALIGN_ASSET(2) char spot18_room_0Tex_0107C8[] = dspot18_room_0Tex_0107C8;
+#define dspot18_room_0Tex_007960 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_007960"
+static const ALIGN_ASSET(2) char spot18_room_0Tex_007960[] = dspot18_room_0Tex_007960;
 
-#define dspot18_room_0Tex_00DFC8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Tex_00DFC8"
+#define dspot18_room_0Tex_008160 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_008160"
+static const ALIGN_ASSET(2) char spot18_room_0Tex_008160[] = dspot18_room_0Tex_008160;
+
+#define dspot18_room_0Tex_008960 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_008960"
+static const ALIGN_ASSET(2) char spot18_room_0Tex_008960[] = dspot18_room_0Tex_008960;
+
+#define dspot18_room_0Tex_009160 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_009160"
+static const ALIGN_ASSET(2) char spot18_room_0Tex_009160[] = dspot18_room_0Tex_009160;
+
+#define dspot18_room_0Tex_009960 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_009960"
+static const ALIGN_ASSET(2) char spot18_room_0Tex_009960[] = dspot18_room_0Tex_009960;
+
+#define dspot18_room_0Tex_00A160 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_00A160"
+static const ALIGN_ASSET(2) char spot18_room_0Tex_00A160[] = dspot18_room_0Tex_00A160;
+
+#define dspot18_room_0Tex_00A960 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_00A960"
+static const ALIGN_ASSET(2) char spot18_room_0Tex_00A960[] = dspot18_room_0Tex_00A960;
+
+#define dspot18_room_0Tex_00B160 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_00B160"
+static const ALIGN_ASSET(2) char spot18_room_0Tex_00B160[] = dspot18_room_0Tex_00B160;
+
+#define dspot18_room_0Tex_00B960 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_00B960"
+static const ALIGN_ASSET(2) char spot18_room_0Tex_00B960[] = dspot18_room_0Tex_00B960;
+
+#define dspot18_room_0Tex_00C160 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_00C160"
+static const ALIGN_ASSET(2) char spot18_room_0Tex_00C160[] = dspot18_room_0Tex_00C160;
+
+#define dspot18_room_0Tex_00C960 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_00C960"
+static const ALIGN_ASSET(2) char spot18_room_0Tex_00C960[] = dspot18_room_0Tex_00C960;
+
+#define dspot18_room_0Tex_00DFC8 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_00DFC8"
 static const ALIGN_ASSET(2) char spot18_room_0Tex_00DFC8[] = dspot18_room_0Tex_00DFC8;
 
-#define dspot18_room_0DL_0013E0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0DL_0013E0"
+#define dspot18_room_0Tex_00EFC8 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_00EFC8"
+static const ALIGN_ASSET(2) char spot18_room_0Tex_00EFC8[] = dspot18_room_0Tex_00EFC8;
+
+#define dspot18_room_0Tex_00FFC8 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_00FFC8"
+static const ALIGN_ASSET(2) char spot18_room_0Tex_00FFC8[] = dspot18_room_0Tex_00FFC8;
+
+#define dspot18_room_0Tex_0107C8 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_0107C8"
+static const ALIGN_ASSET(2) char spot18_room_0Tex_0107C8[] = dspot18_room_0Tex_0107C8;
+
+#define dspot18_room_0Tex_0117C8 "__OTR__scenes/shared/spot18_scene/spot18_room_0Tex_0117C8"
+static const ALIGN_ASSET(2) char spot18_room_0Tex_0117C8[] = dspot18_room_0Tex_0117C8;
+
+#define dspot18_room_0DL_003238 "__OTR__scenes/shared/spot18_scene/spot18_room_0DL_003238"
+static const ALIGN_ASSET(2) char spot18_room_0DL_003238[] = dspot18_room_0DL_003238;
+
+#define dspot18_room_0DL_00DC80 "__OTR__scenes/shared/spot18_scene/spot18_room_0DL_00DC80"
+static const ALIGN_ASSET(2) char spot18_room_0DL_00DC80[] = dspot18_room_0DL_00DC80;
+
+#define dspot18_room_0DL_0013E0 "__OTR__scenes/shared/spot18_scene/spot18_room_0DL_0013E0"
 static const ALIGN_ASSET(2) char spot18_room_0DL_0013E0[] = dspot18_room_0DL_0013E0;
 
-#define dspot18_room_0Set_0003C0DL_003238 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Set_0003C0DL_003238"
+#define dspot18_room_0Set_0003C0DL_003238 "__OTR__scenes/shared/spot18_scene/spot18_room_0Set_0003C0DL_003238"
 static const ALIGN_ASSET(2) char spot18_room_0Set_0003C0DL_003238[] = dspot18_room_0Set_0003C0DL_003238;
 
-#define dspot18_room_0Set_0003C0DL_00DC80 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Set_0003C0DL_00DC80"
+#define dspot18_room_0Set_0003C0DL_00DC80 "__OTR__scenes/shared/spot18_scene/spot18_room_0Set_0003C0DL_00DC80"
 static const ALIGN_ASSET(2) char spot18_room_0Set_0003C0DL_00DC80[] = dspot18_room_0Set_0003C0DL_00DC80;
 
-#define dspot18_room_0Set_0003C0DL_0013E0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Set_0003C0DL_0013E0"
+#define dspot18_room_0Set_0003C0DL_0013E0 "__OTR__scenes/shared/spot18_scene/spot18_room_0Set_0003C0DL_0013E0"
 static const ALIGN_ASSET(2) char spot18_room_0Set_0003C0DL_0013E0[] = dspot18_room_0Set_0003C0DL_0013E0;
 
-#define dspot18_room_0Set_000730DL_003238 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Set_000730DL_003238"
+#define dspot18_room_0Set_000730DL_003238 "__OTR__scenes/shared/spot18_scene/spot18_room_0Set_000730DL_003238"
 static const ALIGN_ASSET(2) char spot18_room_0Set_000730DL_003238[] = dspot18_room_0Set_000730DL_003238;
 
-#define dspot18_room_0Set_000730DL_00DC80 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Set_000730DL_00DC80"
+#define dspot18_room_0Set_000730DL_00DC80 "__OTR__scenes/shared/spot18_scene/spot18_room_0Set_000730DL_00DC80"
 static const ALIGN_ASSET(2) char spot18_room_0Set_000730DL_00DC80[] = dspot18_room_0Set_000730DL_00DC80;
 
-#define dspot18_room_0Set_000730DL_0013E0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Set_000730DL_0013E0"
+#define dspot18_room_0Set_000730DL_0013E0 "__OTR__scenes/shared/spot18_scene/spot18_room_0Set_000730DL_0013E0"
 static const ALIGN_ASSET(2) char spot18_room_0Set_000730DL_0013E0[] = dspot18_room_0Set_000730DL_0013E0;
 
-#define dspot18_room_0Set_000D10DL_003238 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Set_000D10DL_003238"
+#define dspot18_room_0Set_000D10DL_003238 "__OTR__scenes/shared/spot18_scene/spot18_room_0Set_000D10DL_003238"
 static const ALIGN_ASSET(2) char spot18_room_0Set_000D10DL_003238[] = dspot18_room_0Set_000D10DL_003238;
 
-#define dspot18_room_0Set_000D10DL_00DC80 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Set_000D10DL_00DC80"
+#define dspot18_room_0Set_000D10DL_00DC80 "__OTR__scenes/shared/spot18_scene/spot18_room_0Set_000D10DL_00DC80"
 static const ALIGN_ASSET(2) char spot18_room_0Set_000D10DL_00DC80[] = dspot18_room_0Set_000D10DL_00DC80;
 
-#define dspot18_room_0Set_000D10DL_0013E0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_0Set_000D10DL_0013E0"
+#define dspot18_room_0Set_000D10DL_0013E0 "__OTR__scenes/shared/spot18_scene/spot18_room_0Set_000D10DL_0013E0"
 static const ALIGN_ASSET(2) char spot18_room_0Set_000D10DL_0013E0[] = dspot18_room_0Set_000D10DL_0013E0;
 
 
diff --git a/soh/assets/scenes/overworld/spot18/spot18_room_1.h b/soh/assets/scenes/overworld/spot18/spot18_room_1.h
index fad61da7e..8f6af81cd 100644
--- a/soh/assets/scenes/overworld/spot18/spot18_room_1.h
+++ b/soh/assets/scenes/overworld/spot18/spot18_room_1.h
@@ -3,115 +3,115 @@
 
 #include "align_asset_macro.h"
 
-#define dspot18_room_1DL_001A38 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1DL_001A38"
-static const ALIGN_ASSET(2) char spot18_room_1DL_001A38[] = dspot18_room_1DL_001A38;
-
-#define dspot18_room_1DL_0059F0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1DL_0059F0"
-static const ALIGN_ASSET(2) char spot18_room_1DL_0059F0[] = dspot18_room_1DL_0059F0;
-
-#define dspot18_room_1DL_001770 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1DL_001770"
-static const ALIGN_ASSET(2) char spot18_room_1DL_001770[] = dspot18_room_1DL_001770;
-
-#define dspot18_room_1Tex_003068 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Tex_003068"
-static const ALIGN_ASSET(2) char spot18_room_1Tex_003068[] = dspot18_room_1Tex_003068;
-
-#define dspot18_room_1DL_001E60 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1DL_001E60"
-static const ALIGN_ASSET(2) char spot18_room_1DL_001E60[] = dspot18_room_1DL_001E60;
-
-#define dspot18_room_1Tex_004868 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Tex_004868"
-static const ALIGN_ASSET(2) char spot18_room_1Tex_004868[] = dspot18_room_1Tex_004868;
-
-#define dspot18_room_1DL_005CC0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1DL_005CC0"
-static const ALIGN_ASSET(2) char spot18_room_1DL_005CC0[] = dspot18_room_1DL_005CC0;
-
-#define dspot18_room_1Tex_005E00 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Tex_005E00"
-static const ALIGN_ASSET(2) char spot18_room_1Tex_005E00[] = dspot18_room_1Tex_005E00;
-
-#define dspot18_room_1DL_0007D0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1DL_0007D0"
-static const ALIGN_ASSET(2) char spot18_room_1DL_0007D0[] = dspot18_room_1DL_0007D0;
-
-#define dspot18_room_1Tex_004068 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Tex_004068"
-static const ALIGN_ASSET(2) char spot18_room_1Tex_004068[] = dspot18_room_1Tex_004068;
-
-#define dspot18_room_1DL_001398 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1DL_001398"
-static const ALIGN_ASSET(2) char spot18_room_1DL_001398[] = dspot18_room_1DL_001398;
-
-#define dspot18_room_1DL_002660 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1DL_002660"
-static const ALIGN_ASSET(2) char spot18_room_1DL_002660[] = dspot18_room_1DL_002660;
-
-#define dspot18_room_1Tex_002868 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Tex_002868"
+#define dspot18_room_1Tex_002868 "__OTR__scenes/shared/spot18_scene/spot18_room_1Tex_002868"
 static const ALIGN_ASSET(2) char spot18_room_1Tex_002868[] = dspot18_room_1Tex_002868;
 
-#define dspot18_room_1Set_000170DL_001A38 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000170DL_001A38"
+#define dspot18_room_1Tex_003068 "__OTR__scenes/shared/spot18_scene/spot18_room_1Tex_003068"
+static const ALIGN_ASSET(2) char spot18_room_1Tex_003068[] = dspot18_room_1Tex_003068;
+
+#define dspot18_room_1Tex_004068 "__OTR__scenes/shared/spot18_scene/spot18_room_1Tex_004068"
+static const ALIGN_ASSET(2) char spot18_room_1Tex_004068[] = dspot18_room_1Tex_004068;
+
+#define dspot18_room_1Tex_004868 "__OTR__scenes/shared/spot18_scene/spot18_room_1Tex_004868"
+static const ALIGN_ASSET(2) char spot18_room_1Tex_004868[] = dspot18_room_1Tex_004868;
+
+#define dspot18_room_1Tex_005E00 "__OTR__scenes/shared/spot18_scene/spot18_room_1Tex_005E00"
+static const ALIGN_ASSET(2) char spot18_room_1Tex_005E00[] = dspot18_room_1Tex_005E00;
+
+#define dspot18_room_1DL_001A38 "__OTR__scenes/shared/spot18_scene/spot18_room_1DL_001A38"
+static const ALIGN_ASSET(2) char spot18_room_1DL_001A38[] = dspot18_room_1DL_001A38;
+
+#define dspot18_room_1DL_0059F0 "__OTR__scenes/shared/spot18_scene/spot18_room_1DL_0059F0"
+static const ALIGN_ASSET(2) char spot18_room_1DL_0059F0[] = dspot18_room_1DL_0059F0;
+
+#define dspot18_room_1DL_001770 "__OTR__scenes/shared/spot18_scene/spot18_room_1DL_001770"
+static const ALIGN_ASSET(2) char spot18_room_1DL_001770[] = dspot18_room_1DL_001770;
+
+#define dspot18_room_1DL_001E60 "__OTR__scenes/shared/spot18_scene/spot18_room_1DL_001E60"
+static const ALIGN_ASSET(2) char spot18_room_1DL_001E60[] = dspot18_room_1DL_001E60;
+
+#define dspot18_room_1DL_005CC0 "__OTR__scenes/shared/spot18_scene/spot18_room_1DL_005CC0"
+static const ALIGN_ASSET(2) char spot18_room_1DL_005CC0[] = dspot18_room_1DL_005CC0;
+
+#define dspot18_room_1DL_0007D0 "__OTR__scenes/shared/spot18_scene/spot18_room_1DL_0007D0"
+static const ALIGN_ASSET(2) char spot18_room_1DL_0007D0[] = dspot18_room_1DL_0007D0;
+
+#define dspot18_room_1DL_001398 "__OTR__scenes/shared/spot18_scene/spot18_room_1DL_001398"
+static const ALIGN_ASSET(2) char spot18_room_1DL_001398[] = dspot18_room_1DL_001398;
+
+#define dspot18_room_1DL_002660 "__OTR__scenes/shared/spot18_scene/spot18_room_1DL_002660"
+static const ALIGN_ASSET(2) char spot18_room_1DL_002660[] = dspot18_room_1DL_002660;
+
+#define dspot18_room_1Set_000170DL_001A38 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000170DL_001A38"
 static const ALIGN_ASSET(2) char spot18_room_1Set_000170DL_001A38[] = dspot18_room_1Set_000170DL_001A38;
 
-#define dspot18_room_1Set_000170DL_0059F0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000170DL_0059F0"
+#define dspot18_room_1Set_000170DL_0059F0 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000170DL_0059F0"
 static const ALIGN_ASSET(2) char spot18_room_1Set_000170DL_0059F0[] = dspot18_room_1Set_000170DL_0059F0;
 
-#define dspot18_room_1Set_000170DL_001770 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000170DL_001770"
+#define dspot18_room_1Set_000170DL_001770 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000170DL_001770"
 static const ALIGN_ASSET(2) char spot18_room_1Set_000170DL_001770[] = dspot18_room_1Set_000170DL_001770;
 
-#define dspot18_room_1Set_000170DL_001E60 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000170DL_001E60"
+#define dspot18_room_1Set_000170DL_001E60 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000170DL_001E60"
 static const ALIGN_ASSET(2) char spot18_room_1Set_000170DL_001E60[] = dspot18_room_1Set_000170DL_001E60;
 
-#define dspot18_room_1Set_000170DL_005CC0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000170DL_005CC0"
+#define dspot18_room_1Set_000170DL_005CC0 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000170DL_005CC0"
 static const ALIGN_ASSET(2) char spot18_room_1Set_000170DL_005CC0[] = dspot18_room_1Set_000170DL_005CC0;
 
-#define dspot18_room_1Set_000170DL_0007D0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000170DL_0007D0"
+#define dspot18_room_1Set_000170DL_0007D0 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000170DL_0007D0"
 static const ALIGN_ASSET(2) char spot18_room_1Set_000170DL_0007D0[] = dspot18_room_1Set_000170DL_0007D0;
 
-#define dspot18_room_1Set_000170DL_001398 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000170DL_001398"
+#define dspot18_room_1Set_000170DL_001398 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000170DL_001398"
 static const ALIGN_ASSET(2) char spot18_room_1Set_000170DL_001398[] = dspot18_room_1Set_000170DL_001398;
 
-#define dspot18_room_1Set_000170DL_002660 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000170DL_002660"
+#define dspot18_room_1Set_000170DL_002660 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000170DL_002660"
 static const ALIGN_ASSET(2) char spot18_room_1Set_000170DL_002660[] = dspot18_room_1Set_000170DL_002660;
 
-#define dspot18_room_1Set_000230DL_001A38 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000230DL_001A38"
+#define dspot18_room_1Set_000230DL_001A38 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000230DL_001A38"
 static const ALIGN_ASSET(2) char spot18_room_1Set_000230DL_001A38[] = dspot18_room_1Set_000230DL_001A38;
 
-#define dspot18_room_1Set_000230DL_0059F0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000230DL_0059F0"
+#define dspot18_room_1Set_000230DL_0059F0 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000230DL_0059F0"
 static const ALIGN_ASSET(2) char spot18_room_1Set_000230DL_0059F0[] = dspot18_room_1Set_000230DL_0059F0;
 
-#define dspot18_room_1Set_000230DL_001770 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000230DL_001770"
+#define dspot18_room_1Set_000230DL_001770 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000230DL_001770"
 static const ALIGN_ASSET(2) char spot18_room_1Set_000230DL_001770[] = dspot18_room_1Set_000230DL_001770;
 
-#define dspot18_room_1Set_000230DL_001E60 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000230DL_001E60"
+#define dspot18_room_1Set_000230DL_001E60 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000230DL_001E60"
 static const ALIGN_ASSET(2) char spot18_room_1Set_000230DL_001E60[] = dspot18_room_1Set_000230DL_001E60;
 
-#define dspot18_room_1Set_000230DL_005CC0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000230DL_005CC0"
+#define dspot18_room_1Set_000230DL_005CC0 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000230DL_005CC0"
 static const ALIGN_ASSET(2) char spot18_room_1Set_000230DL_005CC0[] = dspot18_room_1Set_000230DL_005CC0;
 
-#define dspot18_room_1Set_000230DL_0007D0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000230DL_0007D0"
+#define dspot18_room_1Set_000230DL_0007D0 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000230DL_0007D0"
 static const ALIGN_ASSET(2) char spot18_room_1Set_000230DL_0007D0[] = dspot18_room_1Set_000230DL_0007D0;
 
-#define dspot18_room_1Set_000230DL_001398 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000230DL_001398"
+#define dspot18_room_1Set_000230DL_001398 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000230DL_001398"
 static const ALIGN_ASSET(2) char spot18_room_1Set_000230DL_001398[] = dspot18_room_1Set_000230DL_001398;
 
-#define dspot18_room_1Set_000230DL_002660 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000230DL_002660"
+#define dspot18_room_1Set_000230DL_002660 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000230DL_002660"
 static const ALIGN_ASSET(2) char spot18_room_1Set_000230DL_002660[] = dspot18_room_1Set_000230DL_002660;
 
-#define dspot18_room_1Set_000300DL_001A38 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000300DL_001A38"
+#define dspot18_room_1Set_000300DL_001A38 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000300DL_001A38"
 static const ALIGN_ASSET(2) char spot18_room_1Set_000300DL_001A38[] = dspot18_room_1Set_000300DL_001A38;
 
-#define dspot18_room_1Set_000300DL_0059F0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000300DL_0059F0"
+#define dspot18_room_1Set_000300DL_0059F0 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000300DL_0059F0"
 static const ALIGN_ASSET(2) char spot18_room_1Set_000300DL_0059F0[] = dspot18_room_1Set_000300DL_0059F0;
 
-#define dspot18_room_1Set_000300DL_001770 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000300DL_001770"
+#define dspot18_room_1Set_000300DL_001770 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000300DL_001770"
 static const ALIGN_ASSET(2) char spot18_room_1Set_000300DL_001770[] = dspot18_room_1Set_000300DL_001770;
 
-#define dspot18_room_1Set_000300DL_001E60 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000300DL_001E60"
+#define dspot18_room_1Set_000300DL_001E60 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000300DL_001E60"
 static const ALIGN_ASSET(2) char spot18_room_1Set_000300DL_001E60[] = dspot18_room_1Set_000300DL_001E60;
 
-#define dspot18_room_1Set_000300DL_005CC0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000300DL_005CC0"
+#define dspot18_room_1Set_000300DL_005CC0 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000300DL_005CC0"
 static const ALIGN_ASSET(2) char spot18_room_1Set_000300DL_005CC0[] = dspot18_room_1Set_000300DL_005CC0;
 
-#define dspot18_room_1Set_000300DL_0007D0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000300DL_0007D0"
+#define dspot18_room_1Set_000300DL_0007D0 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000300DL_0007D0"
 static const ALIGN_ASSET(2) char spot18_room_1Set_000300DL_0007D0[] = dspot18_room_1Set_000300DL_0007D0;
 
-#define dspot18_room_1Set_000300DL_001398 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000300DL_001398"
+#define dspot18_room_1Set_000300DL_001398 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000300DL_001398"
 static const ALIGN_ASSET(2) char spot18_room_1Set_000300DL_001398[] = dspot18_room_1Set_000300DL_001398;
 
-#define dspot18_room_1Set_000300DL_002660 "__OTR__scenes/nonmq/spot18_scene/spot18_room_1Set_000300DL_002660"
+#define dspot18_room_1Set_000300DL_002660 "__OTR__scenes/shared/spot18_scene/spot18_room_1Set_000300DL_002660"
 static const ALIGN_ASSET(2) char spot18_room_1Set_000300DL_002660[] = dspot18_room_1Set_000300DL_002660;
 
 
diff --git a/soh/assets/scenes/overworld/spot18/spot18_room_2.h b/soh/assets/scenes/overworld/spot18/spot18_room_2.h
index 71a11385d..4207bcd96 100644
--- a/soh/assets/scenes/overworld/spot18/spot18_room_2.h
+++ b/soh/assets/scenes/overworld/spot18/spot18_room_2.h
@@ -3,181 +3,181 @@
 
 #include "align_asset_macro.h"
 
-#define dspot18_room_2DL_003F10 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2DL_003F10"
-static const ALIGN_ASSET(2) char spot18_room_2DL_003F10[] = dspot18_room_2DL_003F10;
-
-#define dspot18_room_2Tex_009018 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_009018"
-static const ALIGN_ASSET(2) char spot18_room_2Tex_009018[] = dspot18_room_2Tex_009018;
-
-#define dspot18_room_2DL_00CF58 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2DL_00CF58"
-static const ALIGN_ASSET(2) char spot18_room_2DL_00CF58[] = dspot18_room_2DL_00CF58;
-
-#define dspot18_room_2Tex_00E1A8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_00E1A8"
-static const ALIGN_ASSET(2) char spot18_room_2Tex_00E1A8[] = dspot18_room_2Tex_00E1A8;
-
-#define dspot18_room_2DL_004320 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2DL_004320"
-static const ALIGN_ASSET(2) char spot18_room_2DL_004320[] = dspot18_room_2DL_004320;
-
-#define dspot18_room_2Tex_007818 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_007818"
-static const ALIGN_ASSET(2) char spot18_room_2Tex_007818[] = dspot18_room_2Tex_007818;
-
-#define dspot18_room_2DL_004690 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2DL_004690"
-static const ALIGN_ASSET(2) char spot18_room_2DL_004690[] = dspot18_room_2DL_004690;
-
-#define dspot18_room_2Tex_008018 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_008018"
-static const ALIGN_ASSET(2) char spot18_room_2Tex_008018[] = dspot18_room_2Tex_008018;
-
-#define dspot18_room_2DL_00D0D0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2DL_00D0D0"
-static const ALIGN_ASSET(2) char spot18_room_2DL_00D0D0[] = dspot18_room_2DL_00D0D0;
-
-#define dspot18_room_2DL_001FE8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2DL_001FE8"
-static const ALIGN_ASSET(2) char spot18_room_2DL_001FE8[] = dspot18_room_2DL_001FE8;
-
-#define dspot18_room_2Tex_006018 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_006018"
-static const ALIGN_ASSET(2) char spot18_room_2Tex_006018[] = dspot18_room_2Tex_006018;
-
-#define dspot18_room_2Tex_006818 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_006818"
-static const ALIGN_ASSET(2) char spot18_room_2Tex_006818[] = dspot18_room_2Tex_006818;
-
-#define dspot18_room_2DL_003090 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2DL_003090"
-static const ALIGN_ASSET(2) char spot18_room_2DL_003090[] = dspot18_room_2DL_003090;
-
-#define dspot18_room_2Tex_009818 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_009818"
-static const ALIGN_ASSET(2) char spot18_room_2Tex_009818[] = dspot18_room_2Tex_009818;
-
-#define dspot18_room_2Tex_00A818 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_00A818"
-static const ALIGN_ASSET(2) char spot18_room_2Tex_00A818[] = dspot18_room_2Tex_00A818;
-
-#define dspot18_room_2Tex_00B018 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_00B018"
-static const ALIGN_ASSET(2) char spot18_room_2Tex_00B018[] = dspot18_room_2Tex_00B018;
-
-#define dspot18_room_2Tex_008818 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_008818"
-static const ALIGN_ASSET(2) char spot18_room_2Tex_008818[] = dspot18_room_2Tex_008818;
-
-#define dspot18_room_2Tex_004818 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_004818"
+#define dspot18_room_2Tex_004818 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_004818"
 static const ALIGN_ASSET(2) char spot18_room_2Tex_004818[] = dspot18_room_2Tex_004818;
 
-#define dspot18_room_2Tex_007018 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_007018"
-static const ALIGN_ASSET(2) char spot18_room_2Tex_007018[] = dspot18_room_2Tex_007018;
-
-#define dspot18_room_2Tex_00A018 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_00A018"
-static const ALIGN_ASSET(2) char spot18_room_2Tex_00A018[] = dspot18_room_2Tex_00A018;
-
-#define dspot18_room_2Tex_00B818 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_00B818"
-static const ALIGN_ASSET(2) char spot18_room_2Tex_00B818[] = dspot18_room_2Tex_00B818;
-
-#define dspot18_room_2DL_00CBC0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2DL_00CBC0"
-static const ALIGN_ASSET(2) char spot18_room_2DL_00CBC0[] = dspot18_room_2DL_00CBC0;
-
-#define dspot18_room_2Tex_00F1A8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_00F1A8"
-static const ALIGN_ASSET(2) char spot18_room_2Tex_00F1A8[] = dspot18_room_2Tex_00F1A8;
-
-#define dspot18_room_2Tex_0109A8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_0109A8"
-static const ALIGN_ASSET(2) char spot18_room_2Tex_0109A8[] = dspot18_room_2Tex_0109A8;
-
-#define dspot18_room_2Tex_00F9A8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_00F9A8"
-static const ALIGN_ASSET(2) char spot18_room_2Tex_00F9A8[] = dspot18_room_2Tex_00F9A8;
-
-#define dspot18_room_2Tex_00D1A8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_00D1A8"
-static const ALIGN_ASSET(2) char spot18_room_2Tex_00D1A8[] = dspot18_room_2Tex_00D1A8;
-
-#define dspot18_room_2DL_0019D0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2DL_0019D0"
-static const ALIGN_ASSET(2) char spot18_room_2DL_0019D0[] = dspot18_room_2DL_0019D0;
-
-#define dspot18_room_2Tex_005818 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Tex_005818"
+#define dspot18_room_2Tex_005818 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_005818"
 static const ALIGN_ASSET(2) char spot18_room_2Tex_005818[] = dspot18_room_2Tex_005818;
 
-#define dspot18_room_2DL_000E30 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2DL_000E30"
+#define dspot18_room_2Tex_006018 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_006018"
+static const ALIGN_ASSET(2) char spot18_room_2Tex_006018[] = dspot18_room_2Tex_006018;
+
+#define dspot18_room_2Tex_006818 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_006818"
+static const ALIGN_ASSET(2) char spot18_room_2Tex_006818[] = dspot18_room_2Tex_006818;
+
+#define dspot18_room_2Tex_007018 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_007018"
+static const ALIGN_ASSET(2) char spot18_room_2Tex_007018[] = dspot18_room_2Tex_007018;
+
+#define dspot18_room_2Tex_007818 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_007818"
+static const ALIGN_ASSET(2) char spot18_room_2Tex_007818[] = dspot18_room_2Tex_007818;
+
+#define dspot18_room_2Tex_008018 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_008018"
+static const ALIGN_ASSET(2) char spot18_room_2Tex_008018[] = dspot18_room_2Tex_008018;
+
+#define dspot18_room_2Tex_008818 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_008818"
+static const ALIGN_ASSET(2) char spot18_room_2Tex_008818[] = dspot18_room_2Tex_008818;
+
+#define dspot18_room_2Tex_009018 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_009018"
+static const ALIGN_ASSET(2) char spot18_room_2Tex_009018[] = dspot18_room_2Tex_009018;
+
+#define dspot18_room_2Tex_009818 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_009818"
+static const ALIGN_ASSET(2) char spot18_room_2Tex_009818[] = dspot18_room_2Tex_009818;
+
+#define dspot18_room_2Tex_00A018 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_00A018"
+static const ALIGN_ASSET(2) char spot18_room_2Tex_00A018[] = dspot18_room_2Tex_00A018;
+
+#define dspot18_room_2Tex_00A818 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_00A818"
+static const ALIGN_ASSET(2) char spot18_room_2Tex_00A818[] = dspot18_room_2Tex_00A818;
+
+#define dspot18_room_2Tex_00B018 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_00B018"
+static const ALIGN_ASSET(2) char spot18_room_2Tex_00B018[] = dspot18_room_2Tex_00B018;
+
+#define dspot18_room_2Tex_00B818 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_00B818"
+static const ALIGN_ASSET(2) char spot18_room_2Tex_00B818[] = dspot18_room_2Tex_00B818;
+
+#define dspot18_room_2Tex_00D1A8 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_00D1A8"
+static const ALIGN_ASSET(2) char spot18_room_2Tex_00D1A8[] = dspot18_room_2Tex_00D1A8;
+
+#define dspot18_room_2Tex_00E1A8 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_00E1A8"
+static const ALIGN_ASSET(2) char spot18_room_2Tex_00E1A8[] = dspot18_room_2Tex_00E1A8;
+
+#define dspot18_room_2Tex_00F1A8 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_00F1A8"
+static const ALIGN_ASSET(2) char spot18_room_2Tex_00F1A8[] = dspot18_room_2Tex_00F1A8;
+
+#define dspot18_room_2Tex_00F9A8 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_00F9A8"
+static const ALIGN_ASSET(2) char spot18_room_2Tex_00F9A8[] = dspot18_room_2Tex_00F9A8;
+
+#define dspot18_room_2Tex_0109A8 "__OTR__scenes/shared/spot18_scene/spot18_room_2Tex_0109A8"
+static const ALIGN_ASSET(2) char spot18_room_2Tex_0109A8[] = dspot18_room_2Tex_0109A8;
+
+#define dspot18_room_2DL_003F10 "__OTR__scenes/shared/spot18_scene/spot18_room_2DL_003F10"
+static const ALIGN_ASSET(2) char spot18_room_2DL_003F10[] = dspot18_room_2DL_003F10;
+
+#define dspot18_room_2DL_00CF58 "__OTR__scenes/shared/spot18_scene/spot18_room_2DL_00CF58"
+static const ALIGN_ASSET(2) char spot18_room_2DL_00CF58[] = dspot18_room_2DL_00CF58;
+
+#define dspot18_room_2DL_004320 "__OTR__scenes/shared/spot18_scene/spot18_room_2DL_004320"
+static const ALIGN_ASSET(2) char spot18_room_2DL_004320[] = dspot18_room_2DL_004320;
+
+#define dspot18_room_2DL_004690 "__OTR__scenes/shared/spot18_scene/spot18_room_2DL_004690"
+static const ALIGN_ASSET(2) char spot18_room_2DL_004690[] = dspot18_room_2DL_004690;
+
+#define dspot18_room_2DL_00D0D0 "__OTR__scenes/shared/spot18_scene/spot18_room_2DL_00D0D0"
+static const ALIGN_ASSET(2) char spot18_room_2DL_00D0D0[] = dspot18_room_2DL_00D0D0;
+
+#define dspot18_room_2DL_001FE8 "__OTR__scenes/shared/spot18_scene/spot18_room_2DL_001FE8"
+static const ALIGN_ASSET(2) char spot18_room_2DL_001FE8[] = dspot18_room_2DL_001FE8;
+
+#define dspot18_room_2DL_003090 "__OTR__scenes/shared/spot18_scene/spot18_room_2DL_003090"
+static const ALIGN_ASSET(2) char spot18_room_2DL_003090[] = dspot18_room_2DL_003090;
+
+#define dspot18_room_2DL_00CBC0 "__OTR__scenes/shared/spot18_scene/spot18_room_2DL_00CBC0"
+static const ALIGN_ASSET(2) char spot18_room_2DL_00CBC0[] = dspot18_room_2DL_00CBC0;
+
+#define dspot18_room_2DL_0019D0 "__OTR__scenes/shared/spot18_scene/spot18_room_2DL_0019D0"
+static const ALIGN_ASSET(2) char spot18_room_2DL_0019D0[] = dspot18_room_2DL_0019D0;
+
+#define dspot18_room_2DL_000E30 "__OTR__scenes/shared/spot18_scene/spot18_room_2DL_000E30"
 static const ALIGN_ASSET(2) char spot18_room_2DL_000E30[] = dspot18_room_2DL_000E30;
 
-#define dspot18_room_2Set_000150DL_003F10 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000150DL_003F10"
+#define dspot18_room_2Set_000150DL_003F10 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000150DL_003F10"
 static const ALIGN_ASSET(2) char spot18_room_2Set_000150DL_003F10[] = dspot18_room_2Set_000150DL_003F10;
 
-#define dspot18_room_2Set_000150DL_00CF58 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000150DL_00CF58"
+#define dspot18_room_2Set_000150DL_00CF58 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000150DL_00CF58"
 static const ALIGN_ASSET(2) char spot18_room_2Set_000150DL_00CF58[] = dspot18_room_2Set_000150DL_00CF58;
 
-#define dspot18_room_2Set_000150DL_004320 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000150DL_004320"
+#define dspot18_room_2Set_000150DL_004320 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000150DL_004320"
 static const ALIGN_ASSET(2) char spot18_room_2Set_000150DL_004320[] = dspot18_room_2Set_000150DL_004320;
 
-#define dspot18_room_2Set_000150DL_004690 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000150DL_004690"
+#define dspot18_room_2Set_000150DL_004690 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000150DL_004690"
 static const ALIGN_ASSET(2) char spot18_room_2Set_000150DL_004690[] = dspot18_room_2Set_000150DL_004690;
 
-#define dspot18_room_2Set_000150DL_00D0D0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000150DL_00D0D0"
+#define dspot18_room_2Set_000150DL_00D0D0 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000150DL_00D0D0"
 static const ALIGN_ASSET(2) char spot18_room_2Set_000150DL_00D0D0[] = dspot18_room_2Set_000150DL_00D0D0;
 
-#define dspot18_room_2Set_000150DL_001FE8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000150DL_001FE8"
+#define dspot18_room_2Set_000150DL_001FE8 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000150DL_001FE8"
 static const ALIGN_ASSET(2) char spot18_room_2Set_000150DL_001FE8[] = dspot18_room_2Set_000150DL_001FE8;
 
-#define dspot18_room_2Set_000150DL_003090 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000150DL_003090"
+#define dspot18_room_2Set_000150DL_003090 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000150DL_003090"
 static const ALIGN_ASSET(2) char spot18_room_2Set_000150DL_003090[] = dspot18_room_2Set_000150DL_003090;
 
-#define dspot18_room_2Set_000150DL_00CBC0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000150DL_00CBC0"
+#define dspot18_room_2Set_000150DL_00CBC0 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000150DL_00CBC0"
 static const ALIGN_ASSET(2) char spot18_room_2Set_000150DL_00CBC0[] = dspot18_room_2Set_000150DL_00CBC0;
 
-#define dspot18_room_2Set_000150DL_0019D0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000150DL_0019D0"
+#define dspot18_room_2Set_000150DL_0019D0 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000150DL_0019D0"
 static const ALIGN_ASSET(2) char spot18_room_2Set_000150DL_0019D0[] = dspot18_room_2Set_000150DL_0019D0;
 
-#define dspot18_room_2Set_000150DL_000E30 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000150DL_000E30"
+#define dspot18_room_2Set_000150DL_000E30 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000150DL_000E30"
 static const ALIGN_ASSET(2) char spot18_room_2Set_000150DL_000E30[] = dspot18_room_2Set_000150DL_000E30;
 
-#define dspot18_room_2Set_000200DL_003F10 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000200DL_003F10"
+#define dspot18_room_2Set_000200DL_003F10 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000200DL_003F10"
 static const ALIGN_ASSET(2) char spot18_room_2Set_000200DL_003F10[] = dspot18_room_2Set_000200DL_003F10;
 
-#define dspot18_room_2Set_000200DL_00CF58 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000200DL_00CF58"
+#define dspot18_room_2Set_000200DL_00CF58 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000200DL_00CF58"
 static const ALIGN_ASSET(2) char spot18_room_2Set_000200DL_00CF58[] = dspot18_room_2Set_000200DL_00CF58;
 
-#define dspot18_room_2Set_000200DL_004320 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000200DL_004320"
+#define dspot18_room_2Set_000200DL_004320 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000200DL_004320"
 static const ALIGN_ASSET(2) char spot18_room_2Set_000200DL_004320[] = dspot18_room_2Set_000200DL_004320;
 
-#define dspot18_room_2Set_000200DL_004690 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000200DL_004690"
+#define dspot18_room_2Set_000200DL_004690 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000200DL_004690"
 static const ALIGN_ASSET(2) char spot18_room_2Set_000200DL_004690[] = dspot18_room_2Set_000200DL_004690;
 
-#define dspot18_room_2Set_000200DL_00D0D0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000200DL_00D0D0"
+#define dspot18_room_2Set_000200DL_00D0D0 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000200DL_00D0D0"
 static const ALIGN_ASSET(2) char spot18_room_2Set_000200DL_00D0D0[] = dspot18_room_2Set_000200DL_00D0D0;
 
-#define dspot18_room_2Set_000200DL_001FE8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000200DL_001FE8"
+#define dspot18_room_2Set_000200DL_001FE8 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000200DL_001FE8"
 static const ALIGN_ASSET(2) char spot18_room_2Set_000200DL_001FE8[] = dspot18_room_2Set_000200DL_001FE8;
 
-#define dspot18_room_2Set_000200DL_003090 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000200DL_003090"
+#define dspot18_room_2Set_000200DL_003090 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000200DL_003090"
 static const ALIGN_ASSET(2) char spot18_room_2Set_000200DL_003090[] = dspot18_room_2Set_000200DL_003090;
 
-#define dspot18_room_2Set_000200DL_00CBC0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000200DL_00CBC0"
+#define dspot18_room_2Set_000200DL_00CBC0 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000200DL_00CBC0"
 static const ALIGN_ASSET(2) char spot18_room_2Set_000200DL_00CBC0[] = dspot18_room_2Set_000200DL_00CBC0;
 
-#define dspot18_room_2Set_000200DL_0019D0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000200DL_0019D0"
+#define dspot18_room_2Set_000200DL_0019D0 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000200DL_0019D0"
 static const ALIGN_ASSET(2) char spot18_room_2Set_000200DL_0019D0[] = dspot18_room_2Set_000200DL_0019D0;
 
-#define dspot18_room_2Set_000200DL_000E30 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_000200DL_000E30"
+#define dspot18_room_2Set_000200DL_000E30 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_000200DL_000E30"
 static const ALIGN_ASSET(2) char spot18_room_2Set_000200DL_000E30[] = dspot18_room_2Set_000200DL_000E30;
 
-#define dspot18_room_2Set_0002E0DL_003F10 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_0002E0DL_003F10"
+#define dspot18_room_2Set_0002E0DL_003F10 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_0002E0DL_003F10"
 static const ALIGN_ASSET(2) char spot18_room_2Set_0002E0DL_003F10[] = dspot18_room_2Set_0002E0DL_003F10;
 
-#define dspot18_room_2Set_0002E0DL_00CF58 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_0002E0DL_00CF58"
+#define dspot18_room_2Set_0002E0DL_00CF58 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_0002E0DL_00CF58"
 static const ALIGN_ASSET(2) char spot18_room_2Set_0002E0DL_00CF58[] = dspot18_room_2Set_0002E0DL_00CF58;
 
-#define dspot18_room_2Set_0002E0DL_004320 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_0002E0DL_004320"
+#define dspot18_room_2Set_0002E0DL_004320 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_0002E0DL_004320"
 static const ALIGN_ASSET(2) char spot18_room_2Set_0002E0DL_004320[] = dspot18_room_2Set_0002E0DL_004320;
 
-#define dspot18_room_2Set_0002E0DL_004690 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_0002E0DL_004690"
+#define dspot18_room_2Set_0002E0DL_004690 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_0002E0DL_004690"
 static const ALIGN_ASSET(2) char spot18_room_2Set_0002E0DL_004690[] = dspot18_room_2Set_0002E0DL_004690;
 
-#define dspot18_room_2Set_0002E0DL_00D0D0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_0002E0DL_00D0D0"
+#define dspot18_room_2Set_0002E0DL_00D0D0 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_0002E0DL_00D0D0"
 static const ALIGN_ASSET(2) char spot18_room_2Set_0002E0DL_00D0D0[] = dspot18_room_2Set_0002E0DL_00D0D0;
 
-#define dspot18_room_2Set_0002E0DL_001FE8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_0002E0DL_001FE8"
+#define dspot18_room_2Set_0002E0DL_001FE8 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_0002E0DL_001FE8"
 static const ALIGN_ASSET(2) char spot18_room_2Set_0002E0DL_001FE8[] = dspot18_room_2Set_0002E0DL_001FE8;
 
-#define dspot18_room_2Set_0002E0DL_003090 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_0002E0DL_003090"
+#define dspot18_room_2Set_0002E0DL_003090 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_0002E0DL_003090"
 static const ALIGN_ASSET(2) char spot18_room_2Set_0002E0DL_003090[] = dspot18_room_2Set_0002E0DL_003090;
 
-#define dspot18_room_2Set_0002E0DL_00CBC0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_0002E0DL_00CBC0"
+#define dspot18_room_2Set_0002E0DL_00CBC0 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_0002E0DL_00CBC0"
 static const ALIGN_ASSET(2) char spot18_room_2Set_0002E0DL_00CBC0[] = dspot18_room_2Set_0002E0DL_00CBC0;
 
-#define dspot18_room_2Set_0002E0DL_0019D0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_0002E0DL_0019D0"
+#define dspot18_room_2Set_0002E0DL_0019D0 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_0002E0DL_0019D0"
 static const ALIGN_ASSET(2) char spot18_room_2Set_0002E0DL_0019D0[] = dspot18_room_2Set_0002E0DL_0019D0;
 
-#define dspot18_room_2Set_0002E0DL_000E30 "__OTR__scenes/nonmq/spot18_scene/spot18_room_2Set_0002E0DL_000E30"
+#define dspot18_room_2Set_0002E0DL_000E30 "__OTR__scenes/shared/spot18_scene/spot18_room_2Set_0002E0DL_000E30"
 static const ALIGN_ASSET(2) char spot18_room_2Set_0002E0DL_000E30[] = dspot18_room_2Set_0002E0DL_000E30;
 
 
diff --git a/soh/assets/scenes/overworld/spot18/spot18_room_3.h b/soh/assets/scenes/overworld/spot18/spot18_room_3.h
index dd22bb742..ebae0385b 100644
--- a/soh/assets/scenes/overworld/spot18/spot18_room_3.h
+++ b/soh/assets/scenes/overworld/spot18/spot18_room_3.h
@@ -3,265 +3,265 @@
 
 #include "align_asset_macro.h"
 
-#define dspot18_room_3DL_0014C0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3DL_0014C0"
-static const ALIGN_ASSET(2) char spot18_room_3DL_0014C0[] = dspot18_room_3DL_0014C0;
-
-#define dspot18_room_3Tex_014848 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_014848"
-static const ALIGN_ASSET(2) char spot18_room_3Tex_014848[] = dspot18_room_3Tex_014848;
-
-#define dspot18_room_3Tex_013848 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_013848"
-static const ALIGN_ASSET(2) char spot18_room_3Tex_013848[] = dspot18_room_3Tex_013848;
-
-#define dspot18_room_3Tex_015848 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_015848"
-static const ALIGN_ASSET(2) char spot18_room_3Tex_015848[] = dspot18_room_3Tex_015848;
-
-#define dspot18_room_3Tex_016048 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_016048"
-static const ALIGN_ASSET(2) char spot18_room_3Tex_016048[] = dspot18_room_3Tex_016048;
-
-#define dspot18_room_3Tex_011C48 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_011C48"
-static const ALIGN_ASSET(2) char spot18_room_3Tex_011C48[] = dspot18_room_3Tex_011C48;
-
-#define dspot18_room_3Tex_014048 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_014048"
-static const ALIGN_ASSET(2) char spot18_room_3Tex_014048[] = dspot18_room_3Tex_014048;
-
-#define dspot18_room_3Tex_016C48 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_016C48"
-static const ALIGN_ASSET(2) char spot18_room_3Tex_016C48[] = dspot18_room_3Tex_016C48;
-
-#define dspot18_room_3Tex_012448 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_012448"
-static const ALIGN_ASSET(2) char spot18_room_3Tex_012448[] = dspot18_room_3Tex_012448;
-
-#define dspot18_room_3Tex_012648 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_012648"
-static const ALIGN_ASSET(2) char spot18_room_3Tex_012648[] = dspot18_room_3Tex_012648;
-
-#define dspot18_room_3DL_002B28 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3DL_002B28"
-static const ALIGN_ASSET(2) char spot18_room_3DL_002B28[] = dspot18_room_3DL_002B28;
-
-#define dspot18_room_3Tex_00C048 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_00C048"
-static const ALIGN_ASSET(2) char spot18_room_3Tex_00C048[] = dspot18_room_3Tex_00C048;
-
-#define dspot18_room_3Tex_00C448 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_00C448"
-static const ALIGN_ASSET(2) char spot18_room_3Tex_00C448[] = dspot18_room_3Tex_00C448;
-
-#define dspot18_room_3Tex_00DC48 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_00DC48"
-static const ALIGN_ASSET(2) char spot18_room_3Tex_00DC48[] = dspot18_room_3Tex_00DC48;
-
-#define dspot18_room_3Tex_011448 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_011448"
-static const ALIGN_ASSET(2) char spot18_room_3Tex_011448[] = dspot18_room_3Tex_011448;
-
-#define dspot18_room_3Tex_00E448 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_00E448"
-static const ALIGN_ASSET(2) char spot18_room_3Tex_00E448[] = dspot18_room_3Tex_00E448;
-
-#define dspot18_room_3Tex_015048 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_015048"
-static const ALIGN_ASSET(2) char spot18_room_3Tex_015048[] = dspot18_room_3Tex_015048;
-
-#define dspot18_room_3Tex_017448 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_017448"
-static const ALIGN_ASSET(2) char spot18_room_3Tex_017448[] = dspot18_room_3Tex_017448;
-
-#define dspot18_room_3DL_018610 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3DL_018610"
-static const ALIGN_ASSET(2) char spot18_room_3DL_018610[] = dspot18_room_3DL_018610;
-
-#define dspot18_room_3Tex_0194E8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_0194E8"
-static const ALIGN_ASSET(2) char spot18_room_3Tex_0194E8[] = dspot18_room_3Tex_0194E8;
-
-#define dspot18_room_3Tex_01B4E8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_01B4E8"
-static const ALIGN_ASSET(2) char spot18_room_3Tex_01B4E8[] = dspot18_room_3Tex_01B4E8;
-
-#define dspot18_room_3Tex_01A4E8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_01A4E8"
-static const ALIGN_ASSET(2) char spot18_room_3Tex_01A4E8[] = dspot18_room_3Tex_01A4E8;
-
-#define dspot18_room_3DL_00A0D0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3DL_00A0D0"
-static const ALIGN_ASSET(2) char spot18_room_3DL_00A0D0[] = dspot18_room_3DL_00A0D0;
-
-#define dspot18_room_3DL_018F48 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3DL_018F48"
-static const ALIGN_ASSET(2) char spot18_room_3DL_018F48[] = dspot18_room_3DL_018F48;
-
-#define dspot18_room_3Tex_01CCE8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_01CCE8"
-static const ALIGN_ASSET(2) char spot18_room_3Tex_01CCE8[] = dspot18_room_3Tex_01CCE8;
-
-#define dspot18_room_3Tex_01BCE8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_01BCE8"
-static const ALIGN_ASSET(2) char spot18_room_3Tex_01BCE8[] = dspot18_room_3Tex_01BCE8;
-
-#define dspot18_room_3DL_005080 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3DL_005080"
-static const ALIGN_ASSET(2) char spot18_room_3DL_005080[] = dspot18_room_3DL_005080;
-
-#define dspot18_room_3Tex_00BC48 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_00BC48"
-static const ALIGN_ASSET(2) char spot18_room_3Tex_00BC48[] = dspot18_room_3Tex_00BC48;
-
-#define dspot18_room_3Tex_00D848 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_00D848"
-static const ALIGN_ASSET(2) char spot18_room_3Tex_00D848[] = dspot18_room_3Tex_00D848;
-
-#define dspot18_room_3Tex_00C848 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_00C848"
-static const ALIGN_ASSET(2) char spot18_room_3Tex_00C848[] = dspot18_room_3Tex_00C848;
-
-#define dspot18_room_3Tex_010C48 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_010C48"
-static const ALIGN_ASSET(2) char spot18_room_3Tex_010C48[] = dspot18_room_3Tex_010C48;
-
-#define dspot18_room_3Tex_010448 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_010448"
-static const ALIGN_ASSET(2) char spot18_room_3Tex_010448[] = dspot18_room_3Tex_010448;
-
-#define dspot18_room_3Tex_00F448 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_00F448"
-static const ALIGN_ASSET(2) char spot18_room_3Tex_00F448[] = dspot18_room_3Tex_00F448;
-
-#define dspot18_room_3Tex_016848 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_016848"
-static const ALIGN_ASSET(2) char spot18_room_3Tex_016848[] = dspot18_room_3Tex_016848;
-
-#define dspot18_room_3DL_018948 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3DL_018948"
-static const ALIGN_ASSET(2) char spot18_room_3DL_018948[] = dspot18_room_3DL_018948;
-
-#define dspot18_room_3DL_0193D8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3DL_0193D8"
-static const ALIGN_ASSET(2) char spot18_room_3DL_0193D8[] = dspot18_room_3DL_0193D8;
-
-#define dspot18_room_3DL_00ADD0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3DL_00ADD0"
-static const ALIGN_ASSET(2) char spot18_room_3DL_00ADD0[] = dspot18_room_3DL_00ADD0;
-
-#define dspot18_room_3Tex_00B448 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_00B448"
+#define dspot18_room_3Tex_00B448 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_00B448"
 static const ALIGN_ASSET(2) char spot18_room_3Tex_00B448[] = dspot18_room_3Tex_00B448;
 
-#define dspot18_room_3Tex_00EC48 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_00EC48"
+#define dspot18_room_3Tex_00BC48 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_00BC48"
+static const ALIGN_ASSET(2) char spot18_room_3Tex_00BC48[] = dspot18_room_3Tex_00BC48;
+
+#define dspot18_room_3Tex_00C048 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_00C048"
+static const ALIGN_ASSET(2) char spot18_room_3Tex_00C048[] = dspot18_room_3Tex_00C048;
+
+#define dspot18_room_3Tex_00C448 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_00C448"
+static const ALIGN_ASSET(2) char spot18_room_3Tex_00C448[] = dspot18_room_3Tex_00C448;
+
+#define dspot18_room_3Tex_00C848 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_00C848"
+static const ALIGN_ASSET(2) char spot18_room_3Tex_00C848[] = dspot18_room_3Tex_00C848;
+
+#define dspot18_room_3Tex_00D848 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_00D848"
+static const ALIGN_ASSET(2) char spot18_room_3Tex_00D848[] = dspot18_room_3Tex_00D848;
+
+#define dspot18_room_3Tex_00DC48 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_00DC48"
+static const ALIGN_ASSET(2) char spot18_room_3Tex_00DC48[] = dspot18_room_3Tex_00DC48;
+
+#define dspot18_room_3Tex_00E448 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_00E448"
+static const ALIGN_ASSET(2) char spot18_room_3Tex_00E448[] = dspot18_room_3Tex_00E448;
+
+#define dspot18_room_3Tex_00EC48 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_00EC48"
 static const ALIGN_ASSET(2) char spot18_room_3Tex_00EC48[] = dspot18_room_3Tex_00EC48;
 
-#define dspot18_room_3DL_019218 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3DL_019218"
-static const ALIGN_ASSET(2) char spot18_room_3DL_019218[] = dspot18_room_3DL_019218;
+#define dspot18_room_3Tex_00F448 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_00F448"
+static const ALIGN_ASSET(2) char spot18_room_3Tex_00F448[] = dspot18_room_3Tex_00F448;
 
-#define dspot18_room_3DL_00B288 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3DL_00B288"
-static const ALIGN_ASSET(2) char spot18_room_3DL_00B288[] = dspot18_room_3DL_00B288;
+#define dspot18_room_3Tex_010448 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_010448"
+static const ALIGN_ASSET(2) char spot18_room_3Tex_010448[] = dspot18_room_3Tex_010448;
 
-#define dspot18_room_3Tex_012848 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Tex_012848"
+#define dspot18_room_3Tex_010C48 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_010C48"
+static const ALIGN_ASSET(2) char spot18_room_3Tex_010C48[] = dspot18_room_3Tex_010C48;
+
+#define dspot18_room_3Tex_011448 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_011448"
+static const ALIGN_ASSET(2) char spot18_room_3Tex_011448[] = dspot18_room_3Tex_011448;
+
+#define dspot18_room_3Tex_011C48 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_011C48"
+static const ALIGN_ASSET(2) char spot18_room_3Tex_011C48[] = dspot18_room_3Tex_011C48;
+
+#define dspot18_room_3Tex_012448 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_012448"
+static const ALIGN_ASSET(2) char spot18_room_3Tex_012448[] = dspot18_room_3Tex_012448;
+
+#define dspot18_room_3Tex_012648 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_012648"
+static const ALIGN_ASSET(2) char spot18_room_3Tex_012648[] = dspot18_room_3Tex_012648;
+
+#define dspot18_room_3Tex_012848 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_012848"
 static const ALIGN_ASSET(2) char spot18_room_3Tex_012848[] = dspot18_room_3Tex_012848;
 
-#define dspot18_room_3DL_002230 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3DL_002230"
+#define dspot18_room_3Tex_013848 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_013848"
+static const ALIGN_ASSET(2) char spot18_room_3Tex_013848[] = dspot18_room_3Tex_013848;
+
+#define dspot18_room_3Tex_014048 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_014048"
+static const ALIGN_ASSET(2) char spot18_room_3Tex_014048[] = dspot18_room_3Tex_014048;
+
+#define dspot18_room_3Tex_014848 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_014848"
+static const ALIGN_ASSET(2) char spot18_room_3Tex_014848[] = dspot18_room_3Tex_014848;
+
+#define dspot18_room_3Tex_015048 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_015048"
+static const ALIGN_ASSET(2) char spot18_room_3Tex_015048[] = dspot18_room_3Tex_015048;
+
+#define dspot18_room_3Tex_015848 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_015848"
+static const ALIGN_ASSET(2) char spot18_room_3Tex_015848[] = dspot18_room_3Tex_015848;
+
+#define dspot18_room_3Tex_016048 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_016048"
+static const ALIGN_ASSET(2) char spot18_room_3Tex_016048[] = dspot18_room_3Tex_016048;
+
+#define dspot18_room_3Tex_016848 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_016848"
+static const ALIGN_ASSET(2) char spot18_room_3Tex_016848[] = dspot18_room_3Tex_016848;
+
+#define dspot18_room_3Tex_016C48 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_016C48"
+static const ALIGN_ASSET(2) char spot18_room_3Tex_016C48[] = dspot18_room_3Tex_016C48;
+
+#define dspot18_room_3Tex_017448 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_017448"
+static const ALIGN_ASSET(2) char spot18_room_3Tex_017448[] = dspot18_room_3Tex_017448;
+
+#define dspot18_room_3Tex_0194E8 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_0194E8"
+static const ALIGN_ASSET(2) char spot18_room_3Tex_0194E8[] = dspot18_room_3Tex_0194E8;
+
+#define dspot18_room_3Tex_01A4E8 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_01A4E8"
+static const ALIGN_ASSET(2) char spot18_room_3Tex_01A4E8[] = dspot18_room_3Tex_01A4E8;
+
+#define dspot18_room_3Tex_01B4E8 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_01B4E8"
+static const ALIGN_ASSET(2) char spot18_room_3Tex_01B4E8[] = dspot18_room_3Tex_01B4E8;
+
+#define dspot18_room_3Tex_01BCE8 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_01BCE8"
+static const ALIGN_ASSET(2) char spot18_room_3Tex_01BCE8[] = dspot18_room_3Tex_01BCE8;
+
+#define dspot18_room_3Tex_01CCE8 "__OTR__scenes/shared/spot18_scene/spot18_room_3Tex_01CCE8"
+static const ALIGN_ASSET(2) char spot18_room_3Tex_01CCE8[] = dspot18_room_3Tex_01CCE8;
+
+#define dspot18_room_3DL_0014C0 "__OTR__scenes/shared/spot18_scene/spot18_room_3DL_0014C0"
+static const ALIGN_ASSET(2) char spot18_room_3DL_0014C0[] = dspot18_room_3DL_0014C0;
+
+#define dspot18_room_3DL_002B28 "__OTR__scenes/shared/spot18_scene/spot18_room_3DL_002B28"
+static const ALIGN_ASSET(2) char spot18_room_3DL_002B28[] = dspot18_room_3DL_002B28;
+
+#define dspot18_room_3DL_018610 "__OTR__scenes/shared/spot18_scene/spot18_room_3DL_018610"
+static const ALIGN_ASSET(2) char spot18_room_3DL_018610[] = dspot18_room_3DL_018610;
+
+#define dspot18_room_3DL_00A0D0 "__OTR__scenes/shared/spot18_scene/spot18_room_3DL_00A0D0"
+static const ALIGN_ASSET(2) char spot18_room_3DL_00A0D0[] = dspot18_room_3DL_00A0D0;
+
+#define dspot18_room_3DL_018F48 "__OTR__scenes/shared/spot18_scene/spot18_room_3DL_018F48"
+static const ALIGN_ASSET(2) char spot18_room_3DL_018F48[] = dspot18_room_3DL_018F48;
+
+#define dspot18_room_3DL_005080 "__OTR__scenes/shared/spot18_scene/spot18_room_3DL_005080"
+static const ALIGN_ASSET(2) char spot18_room_3DL_005080[] = dspot18_room_3DL_005080;
+
+#define dspot18_room_3DL_018948 "__OTR__scenes/shared/spot18_scene/spot18_room_3DL_018948"
+static const ALIGN_ASSET(2) char spot18_room_3DL_018948[] = dspot18_room_3DL_018948;
+
+#define dspot18_room_3DL_0193D8 "__OTR__scenes/shared/spot18_scene/spot18_room_3DL_0193D8"
+static const ALIGN_ASSET(2) char spot18_room_3DL_0193D8[] = dspot18_room_3DL_0193D8;
+
+#define dspot18_room_3DL_00ADD0 "__OTR__scenes/shared/spot18_scene/spot18_room_3DL_00ADD0"
+static const ALIGN_ASSET(2) char spot18_room_3DL_00ADD0[] = dspot18_room_3DL_00ADD0;
+
+#define dspot18_room_3DL_019218 "__OTR__scenes/shared/spot18_scene/spot18_room_3DL_019218"
+static const ALIGN_ASSET(2) char spot18_room_3DL_019218[] = dspot18_room_3DL_019218;
+
+#define dspot18_room_3DL_00B288 "__OTR__scenes/shared/spot18_scene/spot18_room_3DL_00B288"
+static const ALIGN_ASSET(2) char spot18_room_3DL_00B288[] = dspot18_room_3DL_00B288;
+
+#define dspot18_room_3DL_002230 "__OTR__scenes/shared/spot18_scene/spot18_room_3DL_002230"
 static const ALIGN_ASSET(2) char spot18_room_3DL_002230[] = dspot18_room_3DL_002230;
 
-#define dspot18_room_3DL_008218 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3DL_008218"
+#define dspot18_room_3DL_008218 "__OTR__scenes/shared/spot18_scene/spot18_room_3DL_008218"
 static const ALIGN_ASSET(2) char spot18_room_3DL_008218[] = dspot18_room_3DL_008218;
 
-#define dspot18_room_3DL_018BF8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3DL_018BF8"
+#define dspot18_room_3DL_018BF8 "__OTR__scenes/shared/spot18_scene/spot18_room_3DL_018BF8"
 static const ALIGN_ASSET(2) char spot18_room_3DL_018BF8[] = dspot18_room_3DL_018BF8;
 
-#define dspot18_room_3Set_000400DL_0014C0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000400DL_0014C0"
+#define dspot18_room_3Set_000400DL_0014C0 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000400DL_0014C0"
 static const ALIGN_ASSET(2) char spot18_room_3Set_000400DL_0014C0[] = dspot18_room_3Set_000400DL_0014C0;
 
-#define dspot18_room_3Set_000400DL_002B28 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000400DL_002B28"
+#define dspot18_room_3Set_000400DL_002B28 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000400DL_002B28"
 static const ALIGN_ASSET(2) char spot18_room_3Set_000400DL_002B28[] = dspot18_room_3Set_000400DL_002B28;
 
-#define dspot18_room_3Set_000400DL_018610 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000400DL_018610"
+#define dspot18_room_3Set_000400DL_018610 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000400DL_018610"
 static const ALIGN_ASSET(2) char spot18_room_3Set_000400DL_018610[] = dspot18_room_3Set_000400DL_018610;
 
-#define dspot18_room_3Set_000400DL_00A0D0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000400DL_00A0D0"
+#define dspot18_room_3Set_000400DL_00A0D0 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000400DL_00A0D0"
 static const ALIGN_ASSET(2) char spot18_room_3Set_000400DL_00A0D0[] = dspot18_room_3Set_000400DL_00A0D0;
 
-#define dspot18_room_3Set_000400DL_018F48 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000400DL_018F48"
+#define dspot18_room_3Set_000400DL_018F48 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000400DL_018F48"
 static const ALIGN_ASSET(2) char spot18_room_3Set_000400DL_018F48[] = dspot18_room_3Set_000400DL_018F48;
 
-#define dspot18_room_3Set_000400DL_005080 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000400DL_005080"
+#define dspot18_room_3Set_000400DL_005080 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000400DL_005080"
 static const ALIGN_ASSET(2) char spot18_room_3Set_000400DL_005080[] = dspot18_room_3Set_000400DL_005080;
 
-#define dspot18_room_3Set_000400DL_018948 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000400DL_018948"
+#define dspot18_room_3Set_000400DL_018948 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000400DL_018948"
 static const ALIGN_ASSET(2) char spot18_room_3Set_000400DL_018948[] = dspot18_room_3Set_000400DL_018948;
 
-#define dspot18_room_3Set_000400DL_0193D8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000400DL_0193D8"
+#define dspot18_room_3Set_000400DL_0193D8 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000400DL_0193D8"
 static const ALIGN_ASSET(2) char spot18_room_3Set_000400DL_0193D8[] = dspot18_room_3Set_000400DL_0193D8;
 
-#define dspot18_room_3Set_000400DL_00ADD0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000400DL_00ADD0"
+#define dspot18_room_3Set_000400DL_00ADD0 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000400DL_00ADD0"
 static const ALIGN_ASSET(2) char spot18_room_3Set_000400DL_00ADD0[] = dspot18_room_3Set_000400DL_00ADD0;
 
-#define dspot18_room_3Set_000400DL_019218 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000400DL_019218"
+#define dspot18_room_3Set_000400DL_019218 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000400DL_019218"
 static const ALIGN_ASSET(2) char spot18_room_3Set_000400DL_019218[] = dspot18_room_3Set_000400DL_019218;
 
-#define dspot18_room_3Set_000400DL_00B288 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000400DL_00B288"
+#define dspot18_room_3Set_000400DL_00B288 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000400DL_00B288"
 static const ALIGN_ASSET(2) char spot18_room_3Set_000400DL_00B288[] = dspot18_room_3Set_000400DL_00B288;
 
-#define dspot18_room_3Set_000400DL_002230 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000400DL_002230"
+#define dspot18_room_3Set_000400DL_002230 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000400DL_002230"
 static const ALIGN_ASSET(2) char spot18_room_3Set_000400DL_002230[] = dspot18_room_3Set_000400DL_002230;
 
-#define dspot18_room_3Set_000400DL_008218 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000400DL_008218"
+#define dspot18_room_3Set_000400DL_008218 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000400DL_008218"
 static const ALIGN_ASSET(2) char spot18_room_3Set_000400DL_008218[] = dspot18_room_3Set_000400DL_008218;
 
-#define dspot18_room_3Set_000400DL_018BF8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000400DL_018BF8"
+#define dspot18_room_3Set_000400DL_018BF8 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000400DL_018BF8"
 static const ALIGN_ASSET(2) char spot18_room_3Set_000400DL_018BF8[] = dspot18_room_3Set_000400DL_018BF8;
 
-#define dspot18_room_3Set_0006C0DL_0014C0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_0006C0DL_0014C0"
+#define dspot18_room_3Set_0006C0DL_0014C0 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_0006C0DL_0014C0"
 static const ALIGN_ASSET(2) char spot18_room_3Set_0006C0DL_0014C0[] = dspot18_room_3Set_0006C0DL_0014C0;
 
-#define dspot18_room_3Set_0006C0DL_002B28 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_0006C0DL_002B28"
+#define dspot18_room_3Set_0006C0DL_002B28 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_0006C0DL_002B28"
 static const ALIGN_ASSET(2) char spot18_room_3Set_0006C0DL_002B28[] = dspot18_room_3Set_0006C0DL_002B28;
 
-#define dspot18_room_3Set_0006C0DL_018610 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_0006C0DL_018610"
+#define dspot18_room_3Set_0006C0DL_018610 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_0006C0DL_018610"
 static const ALIGN_ASSET(2) char spot18_room_3Set_0006C0DL_018610[] = dspot18_room_3Set_0006C0DL_018610;
 
-#define dspot18_room_3Set_0006C0DL_00A0D0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_0006C0DL_00A0D0"
+#define dspot18_room_3Set_0006C0DL_00A0D0 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_0006C0DL_00A0D0"
 static const ALIGN_ASSET(2) char spot18_room_3Set_0006C0DL_00A0D0[] = dspot18_room_3Set_0006C0DL_00A0D0;
 
-#define dspot18_room_3Set_0006C0DL_018F48 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_0006C0DL_018F48"
+#define dspot18_room_3Set_0006C0DL_018F48 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_0006C0DL_018F48"
 static const ALIGN_ASSET(2) char spot18_room_3Set_0006C0DL_018F48[] = dspot18_room_3Set_0006C0DL_018F48;
 
-#define dspot18_room_3Set_0006C0DL_005080 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_0006C0DL_005080"
+#define dspot18_room_3Set_0006C0DL_005080 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_0006C0DL_005080"
 static const ALIGN_ASSET(2) char spot18_room_3Set_0006C0DL_005080[] = dspot18_room_3Set_0006C0DL_005080;
 
-#define dspot18_room_3Set_0006C0DL_018948 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_0006C0DL_018948"
+#define dspot18_room_3Set_0006C0DL_018948 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_0006C0DL_018948"
 static const ALIGN_ASSET(2) char spot18_room_3Set_0006C0DL_018948[] = dspot18_room_3Set_0006C0DL_018948;
 
-#define dspot18_room_3Set_0006C0DL_0193D8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_0006C0DL_0193D8"
+#define dspot18_room_3Set_0006C0DL_0193D8 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_0006C0DL_0193D8"
 static const ALIGN_ASSET(2) char spot18_room_3Set_0006C0DL_0193D8[] = dspot18_room_3Set_0006C0DL_0193D8;
 
-#define dspot18_room_3Set_0006C0DL_00ADD0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_0006C0DL_00ADD0"
+#define dspot18_room_3Set_0006C0DL_00ADD0 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_0006C0DL_00ADD0"
 static const ALIGN_ASSET(2) char spot18_room_3Set_0006C0DL_00ADD0[] = dspot18_room_3Set_0006C0DL_00ADD0;
 
-#define dspot18_room_3Set_0006C0DL_019218 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_0006C0DL_019218"
+#define dspot18_room_3Set_0006C0DL_019218 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_0006C0DL_019218"
 static const ALIGN_ASSET(2) char spot18_room_3Set_0006C0DL_019218[] = dspot18_room_3Set_0006C0DL_019218;
 
-#define dspot18_room_3Set_0006C0DL_00B288 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_0006C0DL_00B288"
+#define dspot18_room_3Set_0006C0DL_00B288 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_0006C0DL_00B288"
 static const ALIGN_ASSET(2) char spot18_room_3Set_0006C0DL_00B288[] = dspot18_room_3Set_0006C0DL_00B288;
 
-#define dspot18_room_3Set_0006C0DL_002230 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_0006C0DL_002230"
+#define dspot18_room_3Set_0006C0DL_002230 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_0006C0DL_002230"
 static const ALIGN_ASSET(2) char spot18_room_3Set_0006C0DL_002230[] = dspot18_room_3Set_0006C0DL_002230;
 
-#define dspot18_room_3Set_0006C0DL_008218 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_0006C0DL_008218"
+#define dspot18_room_3Set_0006C0DL_008218 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_0006C0DL_008218"
 static const ALIGN_ASSET(2) char spot18_room_3Set_0006C0DL_008218[] = dspot18_room_3Set_0006C0DL_008218;
 
-#define dspot18_room_3Set_0006C0DL_018BF8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_0006C0DL_018BF8"
+#define dspot18_room_3Set_0006C0DL_018BF8 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_0006C0DL_018BF8"
 static const ALIGN_ASSET(2) char spot18_room_3Set_0006C0DL_018BF8[] = dspot18_room_3Set_0006C0DL_018BF8;
 
-#define dspot18_room_3Set_000800DL_0014C0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000800DL_0014C0"
+#define dspot18_room_3Set_000800DL_0014C0 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000800DL_0014C0"
 static const ALIGN_ASSET(2) char spot18_room_3Set_000800DL_0014C0[] = dspot18_room_3Set_000800DL_0014C0;
 
-#define dspot18_room_3Set_000800DL_002B28 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000800DL_002B28"
+#define dspot18_room_3Set_000800DL_002B28 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000800DL_002B28"
 static const ALIGN_ASSET(2) char spot18_room_3Set_000800DL_002B28[] = dspot18_room_3Set_000800DL_002B28;
 
-#define dspot18_room_3Set_000800DL_018610 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000800DL_018610"
+#define dspot18_room_3Set_000800DL_018610 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000800DL_018610"
 static const ALIGN_ASSET(2) char spot18_room_3Set_000800DL_018610[] = dspot18_room_3Set_000800DL_018610;
 
-#define dspot18_room_3Set_000800DL_00A0D0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000800DL_00A0D0"
+#define dspot18_room_3Set_000800DL_00A0D0 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000800DL_00A0D0"
 static const ALIGN_ASSET(2) char spot18_room_3Set_000800DL_00A0D0[] = dspot18_room_3Set_000800DL_00A0D0;
 
-#define dspot18_room_3Set_000800DL_018F48 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000800DL_018F48"
+#define dspot18_room_3Set_000800DL_018F48 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000800DL_018F48"
 static const ALIGN_ASSET(2) char spot18_room_3Set_000800DL_018F48[] = dspot18_room_3Set_000800DL_018F48;
 
-#define dspot18_room_3Set_000800DL_005080 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000800DL_005080"
+#define dspot18_room_3Set_000800DL_005080 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000800DL_005080"
 static const ALIGN_ASSET(2) char spot18_room_3Set_000800DL_005080[] = dspot18_room_3Set_000800DL_005080;
 
-#define dspot18_room_3Set_000800DL_018948 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000800DL_018948"
+#define dspot18_room_3Set_000800DL_018948 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000800DL_018948"
 static const ALIGN_ASSET(2) char spot18_room_3Set_000800DL_018948[] = dspot18_room_3Set_000800DL_018948;
 
-#define dspot18_room_3Set_000800DL_0193D8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000800DL_0193D8"
+#define dspot18_room_3Set_000800DL_0193D8 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000800DL_0193D8"
 static const ALIGN_ASSET(2) char spot18_room_3Set_000800DL_0193D8[] = dspot18_room_3Set_000800DL_0193D8;
 
-#define dspot18_room_3Set_000800DL_00ADD0 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000800DL_00ADD0"
+#define dspot18_room_3Set_000800DL_00ADD0 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000800DL_00ADD0"
 static const ALIGN_ASSET(2) char spot18_room_3Set_000800DL_00ADD0[] = dspot18_room_3Set_000800DL_00ADD0;
 
-#define dspot18_room_3Set_000800DL_019218 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000800DL_019218"
+#define dspot18_room_3Set_000800DL_019218 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000800DL_019218"
 static const ALIGN_ASSET(2) char spot18_room_3Set_000800DL_019218[] = dspot18_room_3Set_000800DL_019218;
 
-#define dspot18_room_3Set_000800DL_00B288 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000800DL_00B288"
+#define dspot18_room_3Set_000800DL_00B288 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000800DL_00B288"
 static const ALIGN_ASSET(2) char spot18_room_3Set_000800DL_00B288[] = dspot18_room_3Set_000800DL_00B288;
 
-#define dspot18_room_3Set_000800DL_002230 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000800DL_002230"
+#define dspot18_room_3Set_000800DL_002230 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000800DL_002230"
 static const ALIGN_ASSET(2) char spot18_room_3Set_000800DL_002230[] = dspot18_room_3Set_000800DL_002230;
 
-#define dspot18_room_3Set_000800DL_008218 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000800DL_008218"
+#define dspot18_room_3Set_000800DL_008218 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000800DL_008218"
 static const ALIGN_ASSET(2) char spot18_room_3Set_000800DL_008218[] = dspot18_room_3Set_000800DL_008218;
 
-#define dspot18_room_3Set_000800DL_018BF8 "__OTR__scenes/nonmq/spot18_scene/spot18_room_3Set_000800DL_018BF8"
+#define dspot18_room_3Set_000800DL_018BF8 "__OTR__scenes/shared/spot18_scene/spot18_room_3Set_000800DL_018BF8"
 static const ALIGN_ASSET(2) char spot18_room_3Set_000800DL_018BF8[] = dspot18_room_3Set_000800DL_018BF8;
 
 
diff --git a/soh/assets/scenes/overworld/spot18/spot18_scene.h b/soh/assets/scenes/overworld/spot18/spot18_scene.h
index f078c9d7f..e7c30767c 100644
--- a/soh/assets/scenes/overworld/spot18/spot18_scene.h
+++ b/soh/assets/scenes/overworld/spot18/spot18_scene.h
@@ -3,47 +3,47 @@
 
 #include "align_asset_macro.h"
 
-#define dgGoronCityDaruniaCorrectCs "__OTR__scenes/nonmq/spot18_scene/gGoronCityDaruniaCorrectCs"
-static const ALIGN_ASSET(2) char gGoronCityDaruniaCorrectCs[] = dgGoronCityDaruniaCorrectCs;
-
-#define dgGoronCityDarunia01Cs "__OTR__scenes/nonmq/spot18_scene/gGoronCityDarunia01Cs"
-static const ALIGN_ASSET(2) char gGoronCityDarunia01Cs[] = dgGoronCityDarunia01Cs;
-
-#define dgGoronCityDaruniaWrongCs "__OTR__scenes/nonmq/spot18_scene/gGoronCityDaruniaWrongCs"
-static const ALIGN_ASSET(2) char gGoronCityDaruniaWrongCs[] = dgGoronCityDaruniaWrongCs;
-
-#define dgGoronCityIntroCs "__OTR__scenes/nonmq/spot18_scene/gGoronCityIntroCs"
-static const ALIGN_ASSET(2) char gGoronCityIntroCs[] = dgGoronCityIntroCs;
-
-#define dgGoronCityNightEntranceTex "__OTR__scenes/nonmq/spot18_scene/gGoronCityNightEntranceTex"
-static const ALIGN_ASSET(2) char gGoronCityNightEntranceTex[] = dgGoronCityNightEntranceTex;
-
-#define dgGoronCityDayEntranceTex "__OTR__scenes/nonmq/spot18_scene/gGoronCityDayEntranceTex"
-static const ALIGN_ASSET(2) char gGoronCityDayEntranceTex[] = dgGoronCityDayEntranceTex;
-
-#define dspot18_sceneCollisionHeader_0059AC "__OTR__scenes/nonmq/spot18_scene/spot18_sceneCollisionHeader_0059AC"
-static const ALIGN_ASSET(2) char spot18_sceneCollisionHeader_0059AC[] = dspot18_sceneCollisionHeader_0059AC;
-
-#define dspot18_sceneTLUT_0085C0 "__OTR__scenes/nonmq/spot18_scene/spot18_sceneTLUT_0085C0"
-static const ALIGN_ASSET(2) char spot18_sceneTLUT_0085C0[] = dspot18_sceneTLUT_0085C0;
-
-#define dspot18_sceneTex_009C48 "__OTR__scenes/nonmq/spot18_scene/spot18_sceneTex_009C48"
-static const ALIGN_ASSET(2) char spot18_sceneTex_009C48[] = dspot18_sceneTex_009C48;
-
-#define dspot18_sceneTex_009008 "__OTR__scenes/nonmq/spot18_scene/spot18_sceneTex_009008"
-static const ALIGN_ASSET(2) char spot18_sceneTex_009008[] = dspot18_sceneTex_009008;
-
-#define dspot18_sceneTex_0087C8 "__OTR__scenes/nonmq/spot18_scene/spot18_sceneTex_0087C8"
+#define dspot18_sceneTex_0087C8 "__OTR__scenes/shared/spot18_scene/spot18_sceneTex_0087C8"
 static const ALIGN_ASSET(2) char spot18_sceneTex_0087C8[] = dspot18_sceneTex_0087C8;
 
-#define dspot18_sceneTex_009848 "__OTR__scenes/nonmq/spot18_scene/spot18_sceneTex_009848"
+#define dspot18_sceneTex_009008 "__OTR__scenes/shared/spot18_scene/spot18_sceneTex_009008"
+static const ALIGN_ASSET(2) char spot18_sceneTex_009008[] = dspot18_sceneTex_009008;
+
+#define dspot18_sceneTex_009848 "__OTR__scenes/shared/spot18_scene/spot18_sceneTex_009848"
 static const ALIGN_ASSET(2) char spot18_sceneTex_009848[] = dspot18_sceneTex_009848;
 
-#define dspot18_sceneCollisionHeader_0059AC "__OTR__scenes/nonmq/spot18_scene/spot18_sceneCollisionHeader_0059AC"
+#define dspot18_sceneTex_009C48 "__OTR__scenes/shared/spot18_scene/spot18_sceneTex_009C48"
+static const ALIGN_ASSET(2) char spot18_sceneTex_009C48[] = dspot18_sceneTex_009C48;
 
-#define dspot18_sceneCollisionHeader_0059AC "__OTR__scenes/nonmq/spot18_scene/spot18_sceneCollisionHeader_0059AC"
+#define dspot18_sceneTLUT_0085C0 "__OTR__scenes/shared/spot18_scene/spot18_sceneTLUT_0085C0"
+static const ALIGN_ASSET(2) char spot18_sceneTLUT_0085C0[] = dspot18_sceneTLUT_0085C0;
 
-#define dspot18_sceneCollisionHeader_0059AC "__OTR__scenes/nonmq/spot18_scene/spot18_sceneCollisionHeader_0059AC"
+#define dgGoronCityDaruniaCorrectCs "__OTR__scenes/shared/spot18_scene/gGoronCityDaruniaCorrectCs"
+static const ALIGN_ASSET(2) char gGoronCityDaruniaCorrectCs[] = dgGoronCityDaruniaCorrectCs;
+
+#define dgGoronCityDarunia01Cs "__OTR__scenes/shared/spot18_scene/gGoronCityDarunia01Cs"
+static const ALIGN_ASSET(2) char gGoronCityDarunia01Cs[] = dgGoronCityDarunia01Cs;
+
+#define dgGoronCityDaruniaWrongCs "__OTR__scenes/shared/spot18_scene/gGoronCityDaruniaWrongCs"
+static const ALIGN_ASSET(2) char gGoronCityDaruniaWrongCs[] = dgGoronCityDaruniaWrongCs;
+
+#define dgGoronCityIntroCs "__OTR__scenes/shared/spot18_scene/gGoronCityIntroCs"
+static const ALIGN_ASSET(2) char gGoronCityIntroCs[] = dgGoronCityIntroCs;
+
+#define dgGoronCityNightEntranceTex "__OTR__scenes/shared/spot18_scene/gGoronCityNightEntranceTex"
+static const ALIGN_ASSET(2) char gGoronCityNightEntranceTex[] = dgGoronCityNightEntranceTex;
+
+#define dgGoronCityDayEntranceTex "__OTR__scenes/shared/spot18_scene/gGoronCityDayEntranceTex"
+static const ALIGN_ASSET(2) char gGoronCityDayEntranceTex[] = dgGoronCityDayEntranceTex;
+
+#define dspot18_sceneCollisionHeader_0059AC "__OTR__scenes/shared/spot18_scene/spot18_sceneCollisionHeader_0059AC"
+static const ALIGN_ASSET(2) char spot18_sceneCollisionHeader_0059AC[] = dspot18_sceneCollisionHeader_0059AC;
+
+#define dspot18_sceneCollisionHeader_0059AC "__OTR__scenes/shared/spot18_scene/spot18_sceneCollisionHeader_0059AC"
+
+#define dspot18_sceneCollisionHeader_0059AC "__OTR__scenes/shared/spot18_scene/spot18_sceneCollisionHeader_0059AC"
+
+#define dspot18_sceneCollisionHeader_0059AC "__OTR__scenes/shared/spot18_scene/spot18_sceneCollisionHeader_0059AC"
 
 
 #endif // OVERWORLD_SPOT18_SCENE_H
diff --git a/soh/assets/scenes/overworld/spot20/spot20_room_0.h b/soh/assets/scenes/overworld/spot20/spot20_room_0.h
index d75adc694..25f6cac67 100644
--- a/soh/assets/scenes/overworld/spot20/spot20_room_0.h
+++ b/soh/assets/scenes/overworld/spot20/spot20_room_0.h
@@ -3,478 +3,478 @@
 
 #include "align_asset_macro.h"
 
-#define dgSpot20DL_005E50 "__OTR__scenes/nonmq/spot20_scene/gSpot20DL_005E50"
+#define dgSpot20DL_005E50 "__OTR__scenes/shared/spot20_scene/gSpot20DL_005E50"
 static const ALIGN_ASSET(2) char gSpot20DL_005E50[] = dgSpot20DL_005E50;
 
-#define dgSpot20DL_0066B8 "__OTR__scenes/nonmq/spot20_scene/gSpot20DL_0066B8"
+#define dgSpot20DL_0066B8 "__OTR__scenes/shared/spot20_scene/gSpot20DL_0066B8"
 static const ALIGN_ASSET(2) char gSpot20DL_0066B8[] = dgSpot20DL_0066B8;
 
-#define dspot20_room_0DL_001880 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0DL_001880"
+#define dspot20_room_0DL_001880 "__OTR__scenes/shared/spot20_scene/spot20_room_0DL_001880"
 static const ALIGN_ASSET(2) char spot20_room_0DL_001880[] = dspot20_room_0DL_001880;
 
-#define dspot20_room_0DL_0056B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0DL_0056B8"
+#define dspot20_room_0DL_0056B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0DL_0056B8"
 static const ALIGN_ASSET(2) char spot20_room_0DL_0056B8[] = dspot20_room_0DL_0056B8;
 
-#define dspot20_room_0DL_005C48 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0DL_005C48"
+#define dspot20_room_0DL_005C48 "__OTR__scenes/shared/spot20_scene/spot20_room_0DL_005C48"
 static const ALIGN_ASSET(2) char spot20_room_0DL_005C48[] = dspot20_room_0DL_005C48;
 
-#define dspot20_room_0DL_003CA0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0DL_003CA0"
+#define dspot20_room_0DL_003CA0 "__OTR__scenes/shared/spot20_scene/spot20_room_0DL_003CA0"
 static const ALIGN_ASSET(2) char spot20_room_0DL_003CA0[] = dspot20_room_0DL_003CA0;
 
-#define dspot20_room_0DL_0033B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0DL_0033B8"
+#define dspot20_room_0DL_0033B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0DL_0033B8"
 static const ALIGN_ASSET(2) char spot20_room_0DL_0033B8[] = dspot20_room_0DL_0033B8;
 
-#define dspot20_room_0DL_004460 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0DL_004460"
+#define dspot20_room_0DL_004460 "__OTR__scenes/shared/spot20_scene/spot20_room_0DL_004460"
 static const ALIGN_ASSET(2) char spot20_room_0DL_004460[] = dspot20_room_0DL_004460;
 
-#define dspot20_room_0DL_0065E8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0DL_0065E8"
+#define dspot20_room_0DL_0065E8 "__OTR__scenes/shared/spot20_scene/spot20_room_0DL_0065E8"
 static const ALIGN_ASSET(2) char spot20_room_0DL_0065E8[] = dspot20_room_0DL_0065E8;
 
-#define dspot20_room_0DL_004C38 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0DL_004C38"
+#define dspot20_room_0DL_004C38 "__OTR__scenes/shared/spot20_scene/spot20_room_0DL_004C38"
 static const ALIGN_ASSET(2) char spot20_room_0DL_004C38[] = dspot20_room_0DL_004C38;
 
-#define dspot20_room_0DL_005140 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0DL_005140"
+#define dspot20_room_0DL_005140 "__OTR__scenes/shared/spot20_scene/spot20_room_0DL_005140"
 static const ALIGN_ASSET(2) char spot20_room_0DL_005140[] = dspot20_room_0DL_005140;
 
-#define dspot20_room_0DL_001FB8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0DL_001FB8"
+#define dspot20_room_0DL_001FB8 "__OTR__scenes/shared/spot20_scene/spot20_room_0DL_001FB8"
 static const ALIGN_ASSET(2) char spot20_room_0DL_001FB8[] = dspot20_room_0DL_001FB8;
 
-#define dspot20_room_0DL_002730 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0DL_002730"
+#define dspot20_room_0DL_002730 "__OTR__scenes/shared/spot20_scene/spot20_room_0DL_002730"
 static const ALIGN_ASSET(2) char spot20_room_0DL_002730[] = dspot20_room_0DL_002730;
 
-#define dspot20_room_0DL_0062D0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0DL_0062D0"
+#define dspot20_room_0DL_0062D0 "__OTR__scenes/shared/spot20_scene/spot20_room_0DL_0062D0"
 static const ALIGN_ASSET(2) char spot20_room_0DL_0062D0[] = dspot20_room_0DL_0062D0;
 
-#define dspot20_room_0DL_002C00 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0DL_002C00"
+#define dspot20_room_0DL_002C00 "__OTR__scenes/shared/spot20_scene/spot20_room_0DL_002C00"
 static const ALIGN_ASSET(2) char spot20_room_0DL_002C00[] = dspot20_room_0DL_002C00;
 
-#define dspot20_room_0Set_000630DL_001880 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000630DL_001880"
+#define dspot20_room_0Set_000630DL_001880 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000630DL_001880"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000630DL_001880[] = dspot20_room_0Set_000630DL_001880;
 
-#define dspot20_room_0Set_000630DL_0056B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000630DL_0056B8"
+#define dspot20_room_0Set_000630DL_0056B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000630DL_0056B8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000630DL_0056B8[] = dspot20_room_0Set_000630DL_0056B8;
 
-#define dspot20_room_0Set_000630DL_005C48 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000630DL_005C48"
+#define dspot20_room_0Set_000630DL_005C48 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000630DL_005C48"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000630DL_005C48[] = dspot20_room_0Set_000630DL_005C48;
 
-#define dspot20_room_0Set_000630DL_003CA0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000630DL_003CA0"
+#define dspot20_room_0Set_000630DL_003CA0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000630DL_003CA0"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000630DL_003CA0[] = dspot20_room_0Set_000630DL_003CA0;
 
-#define dspot20_room_0Set_000630DL_0033B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000630DL_0033B8"
+#define dspot20_room_0Set_000630DL_0033B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000630DL_0033B8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000630DL_0033B8[] = dspot20_room_0Set_000630DL_0033B8;
 
-#define dspot20_room_0Set_000630DL_004460 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000630DL_004460"
+#define dspot20_room_0Set_000630DL_004460 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000630DL_004460"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000630DL_004460[] = dspot20_room_0Set_000630DL_004460;
 
-#define dspot20_room_0Set_000630DL_0065E8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000630DL_0065E8"
+#define dspot20_room_0Set_000630DL_0065E8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000630DL_0065E8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000630DL_0065E8[] = dspot20_room_0Set_000630DL_0065E8;
 
-#define dspot20_room_0Set_000630DL_004C38 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000630DL_004C38"
+#define dspot20_room_0Set_000630DL_004C38 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000630DL_004C38"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000630DL_004C38[] = dspot20_room_0Set_000630DL_004C38;
 
-#define dspot20_room_0Set_000630DL_005140 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000630DL_005140"
+#define dspot20_room_0Set_000630DL_005140 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000630DL_005140"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000630DL_005140[] = dspot20_room_0Set_000630DL_005140;
 
-#define dspot20_room_0Set_000630DL_001FB8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000630DL_001FB8"
+#define dspot20_room_0Set_000630DL_001FB8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000630DL_001FB8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000630DL_001FB8[] = dspot20_room_0Set_000630DL_001FB8;
 
-#define dspot20_room_0Set_000630DL_002730 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000630DL_002730"
+#define dspot20_room_0Set_000630DL_002730 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000630DL_002730"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000630DL_002730[] = dspot20_room_0Set_000630DL_002730;
 
-#define dspot20_room_0Set_000630DL_0062D0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000630DL_0062D0"
+#define dspot20_room_0Set_000630DL_0062D0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000630DL_0062D0"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000630DL_0062D0[] = dspot20_room_0Set_000630DL_0062D0;
 
-#define dspot20_room_0Set_000630DL_002C00 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000630DL_002C00"
+#define dspot20_room_0Set_000630DL_002C00 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000630DL_002C00"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000630DL_002C00[] = dspot20_room_0Set_000630DL_002C00;
 
-#define dspot20_room_0Set_0002F0DL_001880 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0002F0DL_001880"
+#define dspot20_room_0Set_0002F0DL_001880 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0002F0DL_001880"
 static const ALIGN_ASSET(2) char spot20_room_0Set_0002F0DL_001880[] = dspot20_room_0Set_0002F0DL_001880;
 
-#define dspot20_room_0Set_0002F0DL_0056B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0002F0DL_0056B8"
+#define dspot20_room_0Set_0002F0DL_0056B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0002F0DL_0056B8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_0002F0DL_0056B8[] = dspot20_room_0Set_0002F0DL_0056B8;
 
-#define dspot20_room_0Set_0002F0DL_005C48 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0002F0DL_005C48"
+#define dspot20_room_0Set_0002F0DL_005C48 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0002F0DL_005C48"
 static const ALIGN_ASSET(2) char spot20_room_0Set_0002F0DL_005C48[] = dspot20_room_0Set_0002F0DL_005C48;
 
-#define dspot20_room_0Set_0002F0DL_003CA0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0002F0DL_003CA0"
+#define dspot20_room_0Set_0002F0DL_003CA0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0002F0DL_003CA0"
 static const ALIGN_ASSET(2) char spot20_room_0Set_0002F0DL_003CA0[] = dspot20_room_0Set_0002F0DL_003CA0;
 
-#define dspot20_room_0Set_0002F0DL_0033B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0002F0DL_0033B8"
+#define dspot20_room_0Set_0002F0DL_0033B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0002F0DL_0033B8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_0002F0DL_0033B8[] = dspot20_room_0Set_0002F0DL_0033B8;
 
-#define dspot20_room_0Set_0002F0DL_004460 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0002F0DL_004460"
+#define dspot20_room_0Set_0002F0DL_004460 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0002F0DL_004460"
 static const ALIGN_ASSET(2) char spot20_room_0Set_0002F0DL_004460[] = dspot20_room_0Set_0002F0DL_004460;
 
-#define dspot20_room_0Set_0002F0DL_0065E8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0002F0DL_0065E8"
+#define dspot20_room_0Set_0002F0DL_0065E8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0002F0DL_0065E8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_0002F0DL_0065E8[] = dspot20_room_0Set_0002F0DL_0065E8;
 
-#define dspot20_room_0Set_0002F0DL_004C38 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0002F0DL_004C38"
+#define dspot20_room_0Set_0002F0DL_004C38 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0002F0DL_004C38"
 static const ALIGN_ASSET(2) char spot20_room_0Set_0002F0DL_004C38[] = dspot20_room_0Set_0002F0DL_004C38;
 
-#define dspot20_room_0Set_0002F0DL_005140 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0002F0DL_005140"
+#define dspot20_room_0Set_0002F0DL_005140 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0002F0DL_005140"
 static const ALIGN_ASSET(2) char spot20_room_0Set_0002F0DL_005140[] = dspot20_room_0Set_0002F0DL_005140;
 
-#define dspot20_room_0Set_0002F0DL_001FB8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0002F0DL_001FB8"
+#define dspot20_room_0Set_0002F0DL_001FB8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0002F0DL_001FB8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_0002F0DL_001FB8[] = dspot20_room_0Set_0002F0DL_001FB8;
 
-#define dspot20_room_0Set_0002F0DL_002730 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0002F0DL_002730"
+#define dspot20_room_0Set_0002F0DL_002730 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0002F0DL_002730"
 static const ALIGN_ASSET(2) char spot20_room_0Set_0002F0DL_002730[] = dspot20_room_0Set_0002F0DL_002730;
 
-#define dspot20_room_0Set_0002F0DL_0062D0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0002F0DL_0062D0"
+#define dspot20_room_0Set_0002F0DL_0062D0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0002F0DL_0062D0"
 static const ALIGN_ASSET(2) char spot20_room_0Set_0002F0DL_0062D0[] = dspot20_room_0Set_0002F0DL_0062D0;
 
-#define dspot20_room_0Set_0002F0DL_002C00 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0002F0DL_002C00"
+#define dspot20_room_0Set_0002F0DL_002C00 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0002F0DL_002C00"
 static const ALIGN_ASSET(2) char spot20_room_0Set_0002F0DL_002C00[] = dspot20_room_0Set_0002F0DL_002C00;
 
-#define dspot20_room_0Set_000500DL_001880 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000500DL_001880"
+#define dspot20_room_0Set_000500DL_001880 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000500DL_001880"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000500DL_001880[] = dspot20_room_0Set_000500DL_001880;
 
-#define dspot20_room_0Set_000500DL_0056B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000500DL_0056B8"
+#define dspot20_room_0Set_000500DL_0056B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000500DL_0056B8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000500DL_0056B8[] = dspot20_room_0Set_000500DL_0056B8;
 
-#define dspot20_room_0Set_000500DL_005C48 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000500DL_005C48"
+#define dspot20_room_0Set_000500DL_005C48 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000500DL_005C48"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000500DL_005C48[] = dspot20_room_0Set_000500DL_005C48;
 
-#define dspot20_room_0Set_000500DL_003CA0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000500DL_003CA0"
+#define dspot20_room_0Set_000500DL_003CA0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000500DL_003CA0"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000500DL_003CA0[] = dspot20_room_0Set_000500DL_003CA0;
 
-#define dspot20_room_0Set_000500DL_0033B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000500DL_0033B8"
+#define dspot20_room_0Set_000500DL_0033B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000500DL_0033B8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000500DL_0033B8[] = dspot20_room_0Set_000500DL_0033B8;
 
-#define dspot20_room_0Set_000500DL_004460 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000500DL_004460"
+#define dspot20_room_0Set_000500DL_004460 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000500DL_004460"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000500DL_004460[] = dspot20_room_0Set_000500DL_004460;
 
-#define dspot20_room_0Set_000500DL_0065E8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000500DL_0065E8"
+#define dspot20_room_0Set_000500DL_0065E8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000500DL_0065E8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000500DL_0065E8[] = dspot20_room_0Set_000500DL_0065E8;
 
-#define dspot20_room_0Set_000500DL_004C38 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000500DL_004C38"
+#define dspot20_room_0Set_000500DL_004C38 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000500DL_004C38"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000500DL_004C38[] = dspot20_room_0Set_000500DL_004C38;
 
-#define dspot20_room_0Set_000500DL_005140 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000500DL_005140"
+#define dspot20_room_0Set_000500DL_005140 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000500DL_005140"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000500DL_005140[] = dspot20_room_0Set_000500DL_005140;
 
-#define dspot20_room_0Set_000500DL_001FB8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000500DL_001FB8"
+#define dspot20_room_0Set_000500DL_001FB8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000500DL_001FB8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000500DL_001FB8[] = dspot20_room_0Set_000500DL_001FB8;
 
-#define dspot20_room_0Set_000500DL_002730 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000500DL_002730"
+#define dspot20_room_0Set_000500DL_002730 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000500DL_002730"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000500DL_002730[] = dspot20_room_0Set_000500DL_002730;
 
-#define dspot20_room_0Set_000500DL_0062D0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000500DL_0062D0"
+#define dspot20_room_0Set_000500DL_0062D0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000500DL_0062D0"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000500DL_0062D0[] = dspot20_room_0Set_000500DL_0062D0;
 
-#define dspot20_room_0Set_000500DL_002C00 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000500DL_002C00"
+#define dspot20_room_0Set_000500DL_002C00 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000500DL_002C00"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000500DL_002C00[] = dspot20_room_0Set_000500DL_002C00;
 
-#define dspot20_room_0Set_000860DL_001880 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000860DL_001880"
+#define dspot20_room_0Set_000860DL_001880 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000860DL_001880"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000860DL_001880[] = dspot20_room_0Set_000860DL_001880;
 
-#define dspot20_room_0Set_000860DL_0056B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000860DL_0056B8"
+#define dspot20_room_0Set_000860DL_0056B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000860DL_0056B8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000860DL_0056B8[] = dspot20_room_0Set_000860DL_0056B8;
 
-#define dspot20_room_0Set_000860DL_005C48 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000860DL_005C48"
+#define dspot20_room_0Set_000860DL_005C48 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000860DL_005C48"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000860DL_005C48[] = dspot20_room_0Set_000860DL_005C48;
 
-#define dspot20_room_0Set_000860DL_003CA0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000860DL_003CA0"
+#define dspot20_room_0Set_000860DL_003CA0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000860DL_003CA0"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000860DL_003CA0[] = dspot20_room_0Set_000860DL_003CA0;
 
-#define dspot20_room_0Set_000860DL_0033B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000860DL_0033B8"
+#define dspot20_room_0Set_000860DL_0033B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000860DL_0033B8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000860DL_0033B8[] = dspot20_room_0Set_000860DL_0033B8;
 
-#define dspot20_room_0Set_000860DL_004460 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000860DL_004460"
+#define dspot20_room_0Set_000860DL_004460 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000860DL_004460"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000860DL_004460[] = dspot20_room_0Set_000860DL_004460;
 
-#define dspot20_room_0Set_000860DL_0065E8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000860DL_0065E8"
+#define dspot20_room_0Set_000860DL_0065E8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000860DL_0065E8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000860DL_0065E8[] = dspot20_room_0Set_000860DL_0065E8;
 
-#define dspot20_room_0Set_000860DL_004C38 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000860DL_004C38"
+#define dspot20_room_0Set_000860DL_004C38 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000860DL_004C38"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000860DL_004C38[] = dspot20_room_0Set_000860DL_004C38;
 
-#define dspot20_room_0Set_000860DL_005140 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000860DL_005140"
+#define dspot20_room_0Set_000860DL_005140 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000860DL_005140"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000860DL_005140[] = dspot20_room_0Set_000860DL_005140;
 
-#define dspot20_room_0Set_000860DL_001FB8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000860DL_001FB8"
+#define dspot20_room_0Set_000860DL_001FB8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000860DL_001FB8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000860DL_001FB8[] = dspot20_room_0Set_000860DL_001FB8;
 
-#define dspot20_room_0Set_000860DL_002730 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000860DL_002730"
+#define dspot20_room_0Set_000860DL_002730 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000860DL_002730"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000860DL_002730[] = dspot20_room_0Set_000860DL_002730;
 
-#define dspot20_room_0Set_000860DL_0062D0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000860DL_0062D0"
+#define dspot20_room_0Set_000860DL_0062D0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000860DL_0062D0"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000860DL_0062D0[] = dspot20_room_0Set_000860DL_0062D0;
 
-#define dspot20_room_0Set_000860DL_002C00 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000860DL_002C00"
+#define dspot20_room_0Set_000860DL_002C00 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000860DL_002C00"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000860DL_002C00[] = dspot20_room_0Set_000860DL_002C00;
 
-#define dspot20_room_0Set_000980DL_001880 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000980DL_001880"
+#define dspot20_room_0Set_000980DL_001880 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000980DL_001880"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000980DL_001880[] = dspot20_room_0Set_000980DL_001880;
 
-#define dspot20_room_0Set_000980DL_0056B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000980DL_0056B8"
+#define dspot20_room_0Set_000980DL_0056B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000980DL_0056B8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000980DL_0056B8[] = dspot20_room_0Set_000980DL_0056B8;
 
-#define dspot20_room_0Set_000980DL_005C48 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000980DL_005C48"
+#define dspot20_room_0Set_000980DL_005C48 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000980DL_005C48"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000980DL_005C48[] = dspot20_room_0Set_000980DL_005C48;
 
-#define dspot20_room_0Set_000980DL_003CA0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000980DL_003CA0"
+#define dspot20_room_0Set_000980DL_003CA0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000980DL_003CA0"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000980DL_003CA0[] = dspot20_room_0Set_000980DL_003CA0;
 
-#define dspot20_room_0Set_000980DL_0033B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000980DL_0033B8"
+#define dspot20_room_0Set_000980DL_0033B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000980DL_0033B8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000980DL_0033B8[] = dspot20_room_0Set_000980DL_0033B8;
 
-#define dspot20_room_0Set_000980DL_004460 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000980DL_004460"
+#define dspot20_room_0Set_000980DL_004460 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000980DL_004460"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000980DL_004460[] = dspot20_room_0Set_000980DL_004460;
 
-#define dspot20_room_0Set_000980DL_0065E8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000980DL_0065E8"
+#define dspot20_room_0Set_000980DL_0065E8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000980DL_0065E8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000980DL_0065E8[] = dspot20_room_0Set_000980DL_0065E8;
 
-#define dspot20_room_0Set_000980DL_004C38 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000980DL_004C38"
+#define dspot20_room_0Set_000980DL_004C38 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000980DL_004C38"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000980DL_004C38[] = dspot20_room_0Set_000980DL_004C38;
 
-#define dspot20_room_0Set_000980DL_005140 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000980DL_005140"
+#define dspot20_room_0Set_000980DL_005140 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000980DL_005140"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000980DL_005140[] = dspot20_room_0Set_000980DL_005140;
 
-#define dspot20_room_0Set_000980DL_001FB8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000980DL_001FB8"
+#define dspot20_room_0Set_000980DL_001FB8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000980DL_001FB8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000980DL_001FB8[] = dspot20_room_0Set_000980DL_001FB8;
 
-#define dspot20_room_0Set_000980DL_002730 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000980DL_002730"
+#define dspot20_room_0Set_000980DL_002730 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000980DL_002730"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000980DL_002730[] = dspot20_room_0Set_000980DL_002730;
 
-#define dspot20_room_0Set_000980DL_0062D0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000980DL_0062D0"
+#define dspot20_room_0Set_000980DL_0062D0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000980DL_0062D0"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000980DL_0062D0[] = dspot20_room_0Set_000980DL_0062D0;
 
-#define dspot20_room_0Set_000980DL_002C00 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000980DL_002C00"
+#define dspot20_room_0Set_000980DL_002C00 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000980DL_002C00"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000980DL_002C00[] = dspot20_room_0Set_000980DL_002C00;
 
-#define dspot20_room_0Set_000AA0DL_001880 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000AA0DL_001880"
+#define dspot20_room_0Set_000AA0DL_001880 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000AA0DL_001880"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000AA0DL_001880[] = dspot20_room_0Set_000AA0DL_001880;
 
-#define dspot20_room_0Set_000AA0DL_0056B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000AA0DL_0056B8"
+#define dspot20_room_0Set_000AA0DL_0056B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000AA0DL_0056B8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000AA0DL_0056B8[] = dspot20_room_0Set_000AA0DL_0056B8;
 
-#define dspot20_room_0Set_000AA0DL_005C48 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000AA0DL_005C48"
+#define dspot20_room_0Set_000AA0DL_005C48 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000AA0DL_005C48"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000AA0DL_005C48[] = dspot20_room_0Set_000AA0DL_005C48;
 
-#define dspot20_room_0Set_000AA0DL_003CA0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000AA0DL_003CA0"
+#define dspot20_room_0Set_000AA0DL_003CA0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000AA0DL_003CA0"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000AA0DL_003CA0[] = dspot20_room_0Set_000AA0DL_003CA0;
 
-#define dspot20_room_0Set_000AA0DL_0033B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000AA0DL_0033B8"
+#define dspot20_room_0Set_000AA0DL_0033B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000AA0DL_0033B8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000AA0DL_0033B8[] = dspot20_room_0Set_000AA0DL_0033B8;
 
-#define dspot20_room_0Set_000AA0DL_004460 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000AA0DL_004460"
+#define dspot20_room_0Set_000AA0DL_004460 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000AA0DL_004460"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000AA0DL_004460[] = dspot20_room_0Set_000AA0DL_004460;
 
-#define dspot20_room_0Set_000AA0DL_0065E8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000AA0DL_0065E8"
+#define dspot20_room_0Set_000AA0DL_0065E8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000AA0DL_0065E8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000AA0DL_0065E8[] = dspot20_room_0Set_000AA0DL_0065E8;
 
-#define dspot20_room_0Set_000AA0DL_004C38 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000AA0DL_004C38"
+#define dspot20_room_0Set_000AA0DL_004C38 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000AA0DL_004C38"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000AA0DL_004C38[] = dspot20_room_0Set_000AA0DL_004C38;
 
-#define dspot20_room_0Set_000AA0DL_005140 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000AA0DL_005140"
+#define dspot20_room_0Set_000AA0DL_005140 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000AA0DL_005140"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000AA0DL_005140[] = dspot20_room_0Set_000AA0DL_005140;
 
-#define dspot20_room_0Set_000AA0DL_001FB8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000AA0DL_001FB8"
+#define dspot20_room_0Set_000AA0DL_001FB8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000AA0DL_001FB8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000AA0DL_001FB8[] = dspot20_room_0Set_000AA0DL_001FB8;
 
-#define dspot20_room_0Set_000AA0DL_002730 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000AA0DL_002730"
+#define dspot20_room_0Set_000AA0DL_002730 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000AA0DL_002730"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000AA0DL_002730[] = dspot20_room_0Set_000AA0DL_002730;
 
-#define dspot20_room_0Set_000AA0DL_0062D0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000AA0DL_0062D0"
+#define dspot20_room_0Set_000AA0DL_0062D0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000AA0DL_0062D0"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000AA0DL_0062D0[] = dspot20_room_0Set_000AA0DL_0062D0;
 
-#define dspot20_room_0Set_000AA0DL_002C00 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000AA0DL_002C00"
+#define dspot20_room_0Set_000AA0DL_002C00 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000AA0DL_002C00"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000AA0DL_002C00[] = dspot20_room_0Set_000AA0DL_002C00;
 
-#define dspot20_room_0Set_000C60DL_001880 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000C60DL_001880"
+#define dspot20_room_0Set_000C60DL_001880 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000C60DL_001880"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000C60DL_001880[] = dspot20_room_0Set_000C60DL_001880;
 
-#define dspot20_room_0Set_000C60DL_0056B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000C60DL_0056B8"
+#define dspot20_room_0Set_000C60DL_0056B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000C60DL_0056B8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000C60DL_0056B8[] = dspot20_room_0Set_000C60DL_0056B8;
 
-#define dspot20_room_0Set_000C60DL_005C48 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000C60DL_005C48"
+#define dspot20_room_0Set_000C60DL_005C48 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000C60DL_005C48"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000C60DL_005C48[] = dspot20_room_0Set_000C60DL_005C48;
 
-#define dspot20_room_0Set_000C60DL_003CA0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000C60DL_003CA0"
+#define dspot20_room_0Set_000C60DL_003CA0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000C60DL_003CA0"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000C60DL_003CA0[] = dspot20_room_0Set_000C60DL_003CA0;
 
-#define dspot20_room_0Set_000C60DL_0033B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000C60DL_0033B8"
+#define dspot20_room_0Set_000C60DL_0033B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000C60DL_0033B8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000C60DL_0033B8[] = dspot20_room_0Set_000C60DL_0033B8;
 
-#define dspot20_room_0Set_000C60DL_004460 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000C60DL_004460"
+#define dspot20_room_0Set_000C60DL_004460 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000C60DL_004460"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000C60DL_004460[] = dspot20_room_0Set_000C60DL_004460;
 
-#define dspot20_room_0Set_000C60DL_0065E8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000C60DL_0065E8"
+#define dspot20_room_0Set_000C60DL_0065E8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000C60DL_0065E8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000C60DL_0065E8[] = dspot20_room_0Set_000C60DL_0065E8;
 
-#define dspot20_room_0Set_000C60DL_004C38 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000C60DL_004C38"
+#define dspot20_room_0Set_000C60DL_004C38 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000C60DL_004C38"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000C60DL_004C38[] = dspot20_room_0Set_000C60DL_004C38;
 
-#define dspot20_room_0Set_000C60DL_005140 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000C60DL_005140"
+#define dspot20_room_0Set_000C60DL_005140 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000C60DL_005140"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000C60DL_005140[] = dspot20_room_0Set_000C60DL_005140;
 
-#define dspot20_room_0Set_000C60DL_001FB8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000C60DL_001FB8"
+#define dspot20_room_0Set_000C60DL_001FB8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000C60DL_001FB8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000C60DL_001FB8[] = dspot20_room_0Set_000C60DL_001FB8;
 
-#define dspot20_room_0Set_000C60DL_002730 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000C60DL_002730"
+#define dspot20_room_0Set_000C60DL_002730 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000C60DL_002730"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000C60DL_002730[] = dspot20_room_0Set_000C60DL_002730;
 
-#define dspot20_room_0Set_000C60DL_0062D0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000C60DL_0062D0"
+#define dspot20_room_0Set_000C60DL_0062D0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000C60DL_0062D0"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000C60DL_0062D0[] = dspot20_room_0Set_000C60DL_0062D0;
 
-#define dspot20_room_0Set_000C60DL_002C00 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000C60DL_002C00"
+#define dspot20_room_0Set_000C60DL_002C00 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000C60DL_002C00"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000C60DL_002C00[] = dspot20_room_0Set_000C60DL_002C00;
 
-#define dspot20_room_0Set_000E50DL_001880 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000E50DL_001880"
+#define dspot20_room_0Set_000E50DL_001880 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000E50DL_001880"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000E50DL_001880[] = dspot20_room_0Set_000E50DL_001880;
 
-#define dspot20_room_0Set_000E50DL_0056B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000E50DL_0056B8"
+#define dspot20_room_0Set_000E50DL_0056B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000E50DL_0056B8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000E50DL_0056B8[] = dspot20_room_0Set_000E50DL_0056B8;
 
-#define dspot20_room_0Set_000E50DL_005C48 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000E50DL_005C48"
+#define dspot20_room_0Set_000E50DL_005C48 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000E50DL_005C48"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000E50DL_005C48[] = dspot20_room_0Set_000E50DL_005C48;
 
-#define dspot20_room_0Set_000E50DL_003CA0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000E50DL_003CA0"
+#define dspot20_room_0Set_000E50DL_003CA0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000E50DL_003CA0"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000E50DL_003CA0[] = dspot20_room_0Set_000E50DL_003CA0;
 
-#define dspot20_room_0Set_000E50DL_0033B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000E50DL_0033B8"
+#define dspot20_room_0Set_000E50DL_0033B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000E50DL_0033B8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000E50DL_0033B8[] = dspot20_room_0Set_000E50DL_0033B8;
 
-#define dspot20_room_0Set_000E50DL_004460 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000E50DL_004460"
+#define dspot20_room_0Set_000E50DL_004460 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000E50DL_004460"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000E50DL_004460[] = dspot20_room_0Set_000E50DL_004460;
 
-#define dspot20_room_0Set_000E50DL_0065E8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000E50DL_0065E8"
+#define dspot20_room_0Set_000E50DL_0065E8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000E50DL_0065E8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000E50DL_0065E8[] = dspot20_room_0Set_000E50DL_0065E8;
 
-#define dspot20_room_0Set_000E50DL_004C38 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000E50DL_004C38"
+#define dspot20_room_0Set_000E50DL_004C38 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000E50DL_004C38"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000E50DL_004C38[] = dspot20_room_0Set_000E50DL_004C38;
 
-#define dspot20_room_0Set_000E50DL_005140 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000E50DL_005140"
+#define dspot20_room_0Set_000E50DL_005140 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000E50DL_005140"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000E50DL_005140[] = dspot20_room_0Set_000E50DL_005140;
 
-#define dspot20_room_0Set_000E50DL_001FB8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000E50DL_001FB8"
+#define dspot20_room_0Set_000E50DL_001FB8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000E50DL_001FB8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000E50DL_001FB8[] = dspot20_room_0Set_000E50DL_001FB8;
 
-#define dspot20_room_0Set_000E50DL_002730 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000E50DL_002730"
+#define dspot20_room_0Set_000E50DL_002730 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000E50DL_002730"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000E50DL_002730[] = dspot20_room_0Set_000E50DL_002730;
 
-#define dspot20_room_0Set_000E50DL_0062D0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000E50DL_0062D0"
+#define dspot20_room_0Set_000E50DL_0062D0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000E50DL_0062D0"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000E50DL_0062D0[] = dspot20_room_0Set_000E50DL_0062D0;
 
-#define dspot20_room_0Set_000E50DL_002C00 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_000E50DL_002C00"
+#define dspot20_room_0Set_000E50DL_002C00 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_000E50DL_002C00"
 static const ALIGN_ASSET(2) char spot20_room_0Set_000E50DL_002C00[] = dspot20_room_0Set_000E50DL_002C00;
 
-#define dspot20_room_0Set_001040DL_001880 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001040DL_001880"
+#define dspot20_room_0Set_001040DL_001880 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001040DL_001880"
 static const ALIGN_ASSET(2) char spot20_room_0Set_001040DL_001880[] = dspot20_room_0Set_001040DL_001880;
 
-#define dspot20_room_0Set_001040DL_0056B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001040DL_0056B8"
+#define dspot20_room_0Set_001040DL_0056B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001040DL_0056B8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_001040DL_0056B8[] = dspot20_room_0Set_001040DL_0056B8;
 
-#define dspot20_room_0Set_001040DL_005C48 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001040DL_005C48"
+#define dspot20_room_0Set_001040DL_005C48 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001040DL_005C48"
 static const ALIGN_ASSET(2) char spot20_room_0Set_001040DL_005C48[] = dspot20_room_0Set_001040DL_005C48;
 
-#define dspot20_room_0Set_001040DL_003CA0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001040DL_003CA0"
+#define dspot20_room_0Set_001040DL_003CA0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001040DL_003CA0"
 static const ALIGN_ASSET(2) char spot20_room_0Set_001040DL_003CA0[] = dspot20_room_0Set_001040DL_003CA0;
 
-#define dspot20_room_0Set_001040DL_0033B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001040DL_0033B8"
+#define dspot20_room_0Set_001040DL_0033B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001040DL_0033B8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_001040DL_0033B8[] = dspot20_room_0Set_001040DL_0033B8;
 
-#define dspot20_room_0Set_001040DL_004460 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001040DL_004460"
+#define dspot20_room_0Set_001040DL_004460 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001040DL_004460"
 static const ALIGN_ASSET(2) char spot20_room_0Set_001040DL_004460[] = dspot20_room_0Set_001040DL_004460;
 
-#define dspot20_room_0Set_001040DL_0065E8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001040DL_0065E8"
+#define dspot20_room_0Set_001040DL_0065E8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001040DL_0065E8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_001040DL_0065E8[] = dspot20_room_0Set_001040DL_0065E8;
 
-#define dspot20_room_0Set_001040DL_004C38 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001040DL_004C38"
+#define dspot20_room_0Set_001040DL_004C38 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001040DL_004C38"
 static const ALIGN_ASSET(2) char spot20_room_0Set_001040DL_004C38[] = dspot20_room_0Set_001040DL_004C38;
 
-#define dspot20_room_0Set_001040DL_005140 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001040DL_005140"
+#define dspot20_room_0Set_001040DL_005140 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001040DL_005140"
 static const ALIGN_ASSET(2) char spot20_room_0Set_001040DL_005140[] = dspot20_room_0Set_001040DL_005140;
 
-#define dspot20_room_0Set_001040DL_001FB8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001040DL_001FB8"
+#define dspot20_room_0Set_001040DL_001FB8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001040DL_001FB8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_001040DL_001FB8[] = dspot20_room_0Set_001040DL_001FB8;
 
-#define dspot20_room_0Set_001040DL_002730 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001040DL_002730"
+#define dspot20_room_0Set_001040DL_002730 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001040DL_002730"
 static const ALIGN_ASSET(2) char spot20_room_0Set_001040DL_002730[] = dspot20_room_0Set_001040DL_002730;
 
-#define dspot20_room_0Set_001040DL_0062D0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001040DL_0062D0"
+#define dspot20_room_0Set_001040DL_0062D0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001040DL_0062D0"
 static const ALIGN_ASSET(2) char spot20_room_0Set_001040DL_0062D0[] = dspot20_room_0Set_001040DL_0062D0;
 
-#define dspot20_room_0Set_001040DL_002C00 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001040DL_002C00"
+#define dspot20_room_0Set_001040DL_002C00 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001040DL_002C00"
 static const ALIGN_ASSET(2) char spot20_room_0Set_001040DL_002C00[] = dspot20_room_0Set_001040DL_002C00;
 
-#define dspot20_room_0Set_001170DL_001880 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001170DL_001880"
+#define dspot20_room_0Set_001170DL_001880 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001170DL_001880"
 static const ALIGN_ASSET(2) char spot20_room_0Set_001170DL_001880[] = dspot20_room_0Set_001170DL_001880;
 
-#define dspot20_room_0Set_001170DL_0056B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001170DL_0056B8"
+#define dspot20_room_0Set_001170DL_0056B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001170DL_0056B8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_001170DL_0056B8[] = dspot20_room_0Set_001170DL_0056B8;
 
-#define dspot20_room_0Set_001170DL_005C48 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001170DL_005C48"
+#define dspot20_room_0Set_001170DL_005C48 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001170DL_005C48"
 static const ALIGN_ASSET(2) char spot20_room_0Set_001170DL_005C48[] = dspot20_room_0Set_001170DL_005C48;
 
-#define dspot20_room_0Set_001170DL_003CA0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001170DL_003CA0"
+#define dspot20_room_0Set_001170DL_003CA0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001170DL_003CA0"
 static const ALIGN_ASSET(2) char spot20_room_0Set_001170DL_003CA0[] = dspot20_room_0Set_001170DL_003CA0;
 
-#define dspot20_room_0Set_001170DL_0033B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001170DL_0033B8"
+#define dspot20_room_0Set_001170DL_0033B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001170DL_0033B8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_001170DL_0033B8[] = dspot20_room_0Set_001170DL_0033B8;
 
-#define dspot20_room_0Set_001170DL_004460 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001170DL_004460"
+#define dspot20_room_0Set_001170DL_004460 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001170DL_004460"
 static const ALIGN_ASSET(2) char spot20_room_0Set_001170DL_004460[] = dspot20_room_0Set_001170DL_004460;
 
-#define dspot20_room_0Set_001170DL_0065E8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001170DL_0065E8"
+#define dspot20_room_0Set_001170DL_0065E8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001170DL_0065E8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_001170DL_0065E8[] = dspot20_room_0Set_001170DL_0065E8;
 
-#define dspot20_room_0Set_001170DL_004C38 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001170DL_004C38"
+#define dspot20_room_0Set_001170DL_004C38 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001170DL_004C38"
 static const ALIGN_ASSET(2) char spot20_room_0Set_001170DL_004C38[] = dspot20_room_0Set_001170DL_004C38;
 
-#define dspot20_room_0Set_001170DL_005140 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001170DL_005140"
+#define dspot20_room_0Set_001170DL_005140 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001170DL_005140"
 static const ALIGN_ASSET(2) char spot20_room_0Set_001170DL_005140[] = dspot20_room_0Set_001170DL_005140;
 
-#define dspot20_room_0Set_001170DL_001FB8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001170DL_001FB8"
+#define dspot20_room_0Set_001170DL_001FB8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001170DL_001FB8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_001170DL_001FB8[] = dspot20_room_0Set_001170DL_001FB8;
 
-#define dspot20_room_0Set_001170DL_002730 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001170DL_002730"
+#define dspot20_room_0Set_001170DL_002730 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001170DL_002730"
 static const ALIGN_ASSET(2) char spot20_room_0Set_001170DL_002730[] = dspot20_room_0Set_001170DL_002730;
 
-#define dspot20_room_0Set_001170DL_0062D0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001170DL_0062D0"
+#define dspot20_room_0Set_001170DL_0062D0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001170DL_0062D0"
 static const ALIGN_ASSET(2) char spot20_room_0Set_001170DL_0062D0[] = dspot20_room_0Set_001170DL_0062D0;
 
-#define dspot20_room_0Set_001170DL_002C00 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_001170DL_002C00"
+#define dspot20_room_0Set_001170DL_002C00 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_001170DL_002C00"
 static const ALIGN_ASSET(2) char spot20_room_0Set_001170DL_002C00[] = dspot20_room_0Set_001170DL_002C00;
 
-#define dspot20_room_0Set_0013A0DL_001880 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0013A0DL_001880"
+#define dspot20_room_0Set_0013A0DL_001880 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0013A0DL_001880"
 static const ALIGN_ASSET(2) char spot20_room_0Set_0013A0DL_001880[] = dspot20_room_0Set_0013A0DL_001880;
 
-#define dspot20_room_0Set_0013A0DL_0056B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0013A0DL_0056B8"
+#define dspot20_room_0Set_0013A0DL_0056B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0013A0DL_0056B8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_0013A0DL_0056B8[] = dspot20_room_0Set_0013A0DL_0056B8;
 
-#define dspot20_room_0Set_0013A0DL_005C48 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0013A0DL_005C48"
+#define dspot20_room_0Set_0013A0DL_005C48 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0013A0DL_005C48"
 static const ALIGN_ASSET(2) char spot20_room_0Set_0013A0DL_005C48[] = dspot20_room_0Set_0013A0DL_005C48;
 
-#define dspot20_room_0Set_0013A0DL_003CA0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0013A0DL_003CA0"
+#define dspot20_room_0Set_0013A0DL_003CA0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0013A0DL_003CA0"
 static const ALIGN_ASSET(2) char spot20_room_0Set_0013A0DL_003CA0[] = dspot20_room_0Set_0013A0DL_003CA0;
 
-#define dspot20_room_0Set_0013A0DL_0033B8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0013A0DL_0033B8"
+#define dspot20_room_0Set_0013A0DL_0033B8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0013A0DL_0033B8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_0013A0DL_0033B8[] = dspot20_room_0Set_0013A0DL_0033B8;
 
-#define dspot20_room_0Set_0013A0DL_004460 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0013A0DL_004460"
+#define dspot20_room_0Set_0013A0DL_004460 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0013A0DL_004460"
 static const ALIGN_ASSET(2) char spot20_room_0Set_0013A0DL_004460[] = dspot20_room_0Set_0013A0DL_004460;
 
-#define dspot20_room_0Set_0013A0DL_0065E8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0013A0DL_0065E8"
+#define dspot20_room_0Set_0013A0DL_0065E8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0013A0DL_0065E8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_0013A0DL_0065E8[] = dspot20_room_0Set_0013A0DL_0065E8;
 
-#define dspot20_room_0Set_0013A0DL_004C38 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0013A0DL_004C38"
+#define dspot20_room_0Set_0013A0DL_004C38 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0013A0DL_004C38"
 static const ALIGN_ASSET(2) char spot20_room_0Set_0013A0DL_004C38[] = dspot20_room_0Set_0013A0DL_004C38;
 
-#define dspot20_room_0Set_0013A0DL_005140 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0013A0DL_005140"
+#define dspot20_room_0Set_0013A0DL_005140 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0013A0DL_005140"
 static const ALIGN_ASSET(2) char spot20_room_0Set_0013A0DL_005140[] = dspot20_room_0Set_0013A0DL_005140;
 
-#define dspot20_room_0Set_0013A0DL_001FB8 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0013A0DL_001FB8"
+#define dspot20_room_0Set_0013A0DL_001FB8 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0013A0DL_001FB8"
 static const ALIGN_ASSET(2) char spot20_room_0Set_0013A0DL_001FB8[] = dspot20_room_0Set_0013A0DL_001FB8;
 
-#define dspot20_room_0Set_0013A0DL_002730 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0013A0DL_002730"
+#define dspot20_room_0Set_0013A0DL_002730 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0013A0DL_002730"
 static const ALIGN_ASSET(2) char spot20_room_0Set_0013A0DL_002730[] = dspot20_room_0Set_0013A0DL_002730;
 
-#define dspot20_room_0Set_0013A0DL_0062D0 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0013A0DL_0062D0"
+#define dspot20_room_0Set_0013A0DL_0062D0 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0013A0DL_0062D0"
 static const ALIGN_ASSET(2) char spot20_room_0Set_0013A0DL_0062D0[] = dspot20_room_0Set_0013A0DL_0062D0;
 
-#define dspot20_room_0Set_0013A0DL_002C00 "__OTR__scenes/nonmq/spot20_scene/spot20_room_0Set_0013A0DL_002C00"
+#define dspot20_room_0Set_0013A0DL_002C00 "__OTR__scenes/shared/spot20_scene/spot20_room_0Set_0013A0DL_002C00"
 static const ALIGN_ASSET(2) char spot20_room_0Set_0013A0DL_002C00[] = dspot20_room_0Set_0013A0DL_002C00;
 
 
diff --git a/soh/assets/scenes/overworld/spot20/spot20_scene.h b/soh/assets/scenes/overworld/spot20/spot20_scene.h
index 2434fd180..93e10e23d 100644
--- a/soh/assets/scenes/overworld/spot20/spot20_scene.h
+++ b/soh/assets/scenes/overworld/spot20/spot20_scene.h
@@ -3,105 +3,105 @@
 
 #include "align_asset_macro.h"
 
-#define dgLonLonRanchIntroCs "__OTR__scenes/nonmq/spot20_scene/gLonLonRanchIntroCs"
-static const ALIGN_ASSET(2) char gLonLonRanchIntroCs[] = dgLonLonRanchIntroCs;
-
-#define dgLonLonRanchDayWindowTex "__OTR__scenes/nonmq/spot20_scene/gLonLonRanchDayWindowTex"
-static const ALIGN_ASSET(2) char gLonLonRanchDayWindowTex[] = dgLonLonRanchDayWindowTex;
-
-#define dgLonLonRangeNightWindowsTex "__OTR__scenes/nonmq/spot20_scene/gLonLonRangeNightWindowsTex"
-static const ALIGN_ASSET(2) char gLonLonRangeNightWindowsTex[] = dgLonLonRangeNightWindowsTex;
-
-#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneCollisionHeader_002948"
-static const ALIGN_ASSET(2) char spot20_sceneCollisionHeader_002948[] = dspot20_sceneCollisionHeader_002948;
-
-#define dspot20_sceneTex_00D9E0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_00D9E0"
-static const ALIGN_ASSET(2) char spot20_sceneTex_00D9E0[] = dspot20_sceneTex_00D9E0;
-
-#define dspot20_sceneTex_00D1E0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_00D1E0"
-static const ALIGN_ASSET(2) char spot20_sceneTex_00D1E0[] = dspot20_sceneTex_00D1E0;
-
-#define dspot20_sceneTex_0069E0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_0069E0"
-static const ALIGN_ASSET(2) char spot20_sceneTex_0069E0[] = dspot20_sceneTex_0069E0;
-
-#define dspot20_sceneTLUT_005DB0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTLUT_005DB0"
-static const ALIGN_ASSET(2) char spot20_sceneTLUT_005DB0[] = dspot20_sceneTLUT_005DB0;
-
-#define dspot20_sceneTex_0067E0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_0067E0"
-static const ALIGN_ASSET(2) char spot20_sceneTex_0067E0[] = dspot20_sceneTex_0067E0;
-
-#define dspot20_sceneTex_00F9E0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_00F9E0"
-static const ALIGN_ASSET(2) char spot20_sceneTex_00F9E0[] = dspot20_sceneTex_00F9E0;
-
-#define dspot20_sceneTex_00C9E0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_00C9E0"
-static const ALIGN_ASSET(2) char spot20_sceneTex_00C9E0[] = dspot20_sceneTex_00C9E0;
-
-#define dspot20_sceneTex_00BBE0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_00BBE0"
-static const ALIGN_ASSET(2) char spot20_sceneTex_00BBE0[] = dspot20_sceneTex_00BBE0;
-
-#define dspot20_sceneTex_00BDE0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_00BDE0"
-static const ALIGN_ASSET(2) char spot20_sceneTex_00BDE0[] = dspot20_sceneTex_00BDE0;
-
-#define dspot20_sceneTex_0091E0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_0091E0"
-static const ALIGN_ASSET(2) char spot20_sceneTex_0091E0[] = dspot20_sceneTex_0091E0;
-
-#define dspot20_sceneTex_0071E0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_0071E0"
-static const ALIGN_ASSET(2) char spot20_sceneTex_0071E0[] = dspot20_sceneTex_0071E0;
-
-#define dspot20_sceneTex_005FE0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_005FE0"
+#define dspot20_sceneTex_005FE0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_005FE0"
 static const ALIGN_ASSET(2) char spot20_sceneTex_005FE0[] = dspot20_sceneTex_005FE0;
 
-#define dspot20_sceneTex_00ABE0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_00ABE0"
-static const ALIGN_ASSET(2) char spot20_sceneTex_00ABE0[] = dspot20_sceneTex_00ABE0;
+#define dspot20_sceneTex_0067E0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_0067E0"
+static const ALIGN_ASSET(2) char spot20_sceneTex_0067E0[] = dspot20_sceneTex_0067E0;
 
-#define dspot20_sceneTex_009BE0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_009BE0"
-static const ALIGN_ASSET(2) char spot20_sceneTex_009BE0[] = dspot20_sceneTex_009BE0;
+#define dspot20_sceneTex_0069E0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_0069E0"
+static const ALIGN_ASSET(2) char spot20_sceneTex_0069E0[] = dspot20_sceneTex_0069E0;
 
-#define dspot20_sceneTex_00E9E0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_00E9E0"
-static const ALIGN_ASSET(2) char spot20_sceneTex_00E9E0[] = dspot20_sceneTex_00E9E0;
+#define dspot20_sceneTex_0071E0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_0071E0"
+static const ALIGN_ASSET(2) char spot20_sceneTex_0071E0[] = dspot20_sceneTex_0071E0;
 
-#define dspot20_sceneTex_00E1E0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_00E1E0"
-static const ALIGN_ASSET(2) char spot20_sceneTex_00E1E0[] = dspot20_sceneTex_00E1E0;
+#define dspot20_sceneTex_0091E0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_0091E0"
+static const ALIGN_ASSET(2) char spot20_sceneTex_0091E0[] = dspot20_sceneTex_0091E0;
 
-#define dspot20_sceneTex_00C1E0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_00C1E0"
-static const ALIGN_ASSET(2) char spot20_sceneTex_00C1E0[] = dspot20_sceneTex_00C1E0;
-
-#define dspot20_sceneTLUT_005FB8 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTLUT_005FB8"
-static const ALIGN_ASSET(2) char spot20_sceneTLUT_005FB8[] = dspot20_sceneTLUT_005FB8;
-
-#define dspot20_sceneTex_0093E0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_0093E0"
+#define dspot20_sceneTex_0093E0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_0093E0"
 static const ALIGN_ASSET(2) char spot20_sceneTex_0093E0[] = dspot20_sceneTex_0093E0;
 
-#define dspot20_sceneTex_00F1E0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_00F1E0"
+#define dspot20_sceneTex_009BE0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_009BE0"
+static const ALIGN_ASSET(2) char spot20_sceneTex_009BE0[] = dspot20_sceneTex_009BE0;
+
+#define dspot20_sceneTex_00ABE0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_00ABE0"
+static const ALIGN_ASSET(2) char spot20_sceneTex_00ABE0[] = dspot20_sceneTex_00ABE0;
+
+#define dspot20_sceneTex_00BBE0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_00BBE0"
+static const ALIGN_ASSET(2) char spot20_sceneTex_00BBE0[] = dspot20_sceneTex_00BBE0;
+
+#define dspot20_sceneTex_00BDE0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_00BDE0"
+static const ALIGN_ASSET(2) char spot20_sceneTex_00BDE0[] = dspot20_sceneTex_00BDE0;
+
+#define dspot20_sceneTex_00C1E0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_00C1E0"
+static const ALIGN_ASSET(2) char spot20_sceneTex_00C1E0[] = dspot20_sceneTex_00C1E0;
+
+#define dspot20_sceneTex_00C9E0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_00C9E0"
+static const ALIGN_ASSET(2) char spot20_sceneTex_00C9E0[] = dspot20_sceneTex_00C9E0;
+
+#define dspot20_sceneTex_00D1E0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_00D1E0"
+static const ALIGN_ASSET(2) char spot20_sceneTex_00D1E0[] = dspot20_sceneTex_00D1E0;
+
+#define dspot20_sceneTex_00D9E0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_00D9E0"
+static const ALIGN_ASSET(2) char spot20_sceneTex_00D9E0[] = dspot20_sceneTex_00D9E0;
+
+#define dspot20_sceneTex_00E1E0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_00E1E0"
+static const ALIGN_ASSET(2) char spot20_sceneTex_00E1E0[] = dspot20_sceneTex_00E1E0;
+
+#define dspot20_sceneTex_00E9E0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_00E9E0"
+static const ALIGN_ASSET(2) char spot20_sceneTex_00E9E0[] = dspot20_sceneTex_00E9E0;
+
+#define dspot20_sceneTex_00F1E0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_00F1E0"
 static const ALIGN_ASSET(2) char spot20_sceneTex_00F1E0[] = dspot20_sceneTex_00F1E0;
 
-#define dspot20_sceneTex_010BE0 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_010BE0"
+#define dspot20_sceneTex_00F9E0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_00F9E0"
+static const ALIGN_ASSET(2) char spot20_sceneTex_00F9E0[] = dspot20_sceneTex_00F9E0;
+
+#define dspot20_sceneTex_010BE0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_010BE0"
 static const ALIGN_ASSET(2) char spot20_sceneTex_010BE0[] = dspot20_sceneTex_010BE0;
 
-#define dspot20_sceneTex_010E20 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneTex_010E20"
+#define dspot20_sceneTex_010E20 "__OTR__scenes/shared/spot20_scene/spot20_sceneTex_010E20"
 static const ALIGN_ASSET(2) char spot20_sceneTex_010E20[] = dspot20_sceneTex_010E20;
 
-#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneCollisionHeader_002948"
+#define dspot20_sceneTLUT_005DB0 "__OTR__scenes/shared/spot20_scene/spot20_sceneTLUT_005DB0"
+static const ALIGN_ASSET(2) char spot20_sceneTLUT_005DB0[] = dspot20_sceneTLUT_005DB0;
 
-#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneCollisionHeader_002948"
+#define dspot20_sceneTLUT_005FB8 "__OTR__scenes/shared/spot20_scene/spot20_sceneTLUT_005FB8"
+static const ALIGN_ASSET(2) char spot20_sceneTLUT_005FB8[] = dspot20_sceneTLUT_005FB8;
 
-#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneCollisionHeader_002948"
+#define dgLonLonRanchIntroCs "__OTR__scenes/shared/spot20_scene/gLonLonRanchIntroCs"
+static const ALIGN_ASSET(2) char gLonLonRanchIntroCs[] = dgLonLonRanchIntroCs;
 
-#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneCollisionHeader_002948"
+#define dgLonLonRanchDayWindowTex "__OTR__scenes/shared/spot20_scene/gLonLonRanchDayWindowTex"
+static const ALIGN_ASSET(2) char gLonLonRanchDayWindowTex[] = dgLonLonRanchDayWindowTex;
 
-#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneCollisionHeader_002948"
+#define dgLonLonRangeNightWindowsTex "__OTR__scenes/shared/spot20_scene/gLonLonRangeNightWindowsTex"
+static const ALIGN_ASSET(2) char gLonLonRangeNightWindowsTex[] = dgLonLonRangeNightWindowsTex;
 
-#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneCollisionHeader_002948"
+#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/shared/spot20_scene/spot20_sceneCollisionHeader_002948"
+static const ALIGN_ASSET(2) char spot20_sceneCollisionHeader_002948[] = dspot20_sceneCollisionHeader_002948;
 
-#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneCollisionHeader_002948"
+#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/shared/spot20_scene/spot20_sceneCollisionHeader_002948"
 
-#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneCollisionHeader_002948"
+#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/shared/spot20_scene/spot20_sceneCollisionHeader_002948"
 
-#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneCollisionHeader_002948"
+#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/shared/spot20_scene/spot20_sceneCollisionHeader_002948"
 
-#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneCollisionHeader_002948"
+#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/shared/spot20_scene/spot20_sceneCollisionHeader_002948"
 
-#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/nonmq/spot20_scene/spot20_sceneCollisionHeader_002948"
+#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/shared/spot20_scene/spot20_sceneCollisionHeader_002948"
+
+#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/shared/spot20_scene/spot20_sceneCollisionHeader_002948"
+
+#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/shared/spot20_scene/spot20_sceneCollisionHeader_002948"
+
+#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/shared/spot20_scene/spot20_sceneCollisionHeader_002948"
+
+#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/shared/spot20_scene/spot20_sceneCollisionHeader_002948"
+
+#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/shared/spot20_scene/spot20_sceneCollisionHeader_002948"
+
+#define dspot20_sceneCollisionHeader_002948 "__OTR__scenes/shared/spot20_scene/spot20_sceneCollisionHeader_002948"
 
 
 #endif // OVERWORLD_SPOT20_SCENE_H
diff --git a/soh/assets/scenes/shops/alley_shop/alley_shop_room_0.h b/soh/assets/scenes/shops/alley_shop/alley_shop_room_0.h
index 1bf183c70..46c2754e2 100644
--- a/soh/assets/scenes/shops/alley_shop/alley_shop_room_0.h
+++ b/soh/assets/scenes/shops/alley_shop/alley_shop_room_0.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dalley_shop_room_0DL_0013E0 "__OTR__scenes/nonmq/alley_shop_scene/alley_shop_room_0DL_0013E0"
+#define dalley_shop_room_0DL_0013E0 "__OTR__scenes/shared/alley_shop_scene/alley_shop_room_0DL_0013E0"
 static const ALIGN_ASSET(2) char alley_shop_room_0DL_0013E0[] = dalley_shop_room_0DL_0013E0;
 
 
diff --git a/soh/assets/scenes/shops/alley_shop/alley_shop_scene.h b/soh/assets/scenes/shops/alley_shop/alley_shop_scene.h
index fa0feb5c0..025066535 100644
--- a/soh/assets/scenes/shops/alley_shop/alley_shop_scene.h
+++ b/soh/assets/scenes/shops/alley_shop/alley_shop_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dalley_shop_sceneCollisionHeader_000584 "__OTR__scenes/nonmq/alley_shop_scene/alley_shop_sceneCollisionHeader_000584"
+#define dalley_shop_sceneCollisionHeader_000584 "__OTR__scenes/shared/alley_shop_scene/alley_shop_sceneCollisionHeader_000584"
 static const ALIGN_ASSET(2) char alley_shop_sceneCollisionHeader_000584[] = dalley_shop_sceneCollisionHeader_000584;
 
 
diff --git a/soh/assets/scenes/shops/drag/drag_room_0.h b/soh/assets/scenes/shops/drag/drag_room_0.h
index ee173eca0..267fb20ef 100644
--- a/soh/assets/scenes/shops/drag/drag_room_0.h
+++ b/soh/assets/scenes/shops/drag/drag_room_0.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define ddrag_room_0DL_006618 "__OTR__scenes/nonmq/drag_scene/drag_room_0DL_006618"
+#define ddrag_room_0DL_006618 "__OTR__scenes/shared/drag_scene/drag_room_0DL_006618"
 static const ALIGN_ASSET(2) char drag_room_0DL_006618[] = ddrag_room_0DL_006618;
 
 
diff --git a/soh/assets/scenes/shops/drag/drag_scene.h b/soh/assets/scenes/shops/drag/drag_scene.h
index c42054d50..693493143 100644
--- a/soh/assets/scenes/shops/drag/drag_scene.h
+++ b/soh/assets/scenes/shops/drag/drag_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define ddrag_sceneCollisionHeader_0003C0 "__OTR__scenes/nonmq/drag_scene/drag_sceneCollisionHeader_0003C0"
+#define ddrag_sceneCollisionHeader_0003C0 "__OTR__scenes/shared/drag_scene/drag_sceneCollisionHeader_0003C0"
 static const ALIGN_ASSET(2) char drag_sceneCollisionHeader_0003C0[] = ddrag_sceneCollisionHeader_0003C0;
 
 
diff --git a/soh/assets/scenes/shops/face_shop/face_shop_room_0.h b/soh/assets/scenes/shops/face_shop/face_shop_room_0.h
index ea0d792b4..12e581155 100644
--- a/soh/assets/scenes/shops/face_shop/face_shop_room_0.h
+++ b/soh/assets/scenes/shops/face_shop/face_shop_room_0.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dface_shop_room_0DL_008E08 "__OTR__scenes/nonmq/face_shop_scene/face_shop_room_0DL_008E08"
+#define dface_shop_room_0DL_008E08 "__OTR__scenes/shared/face_shop_scene/face_shop_room_0DL_008E08"
 static const ALIGN_ASSET(2) char face_shop_room_0DL_008E08[] = dface_shop_room_0DL_008E08;
 
 
diff --git a/soh/assets/scenes/shops/face_shop/face_shop_scene.h b/soh/assets/scenes/shops/face_shop/face_shop_scene.h
index 386a1a2ff..601d58993 100644
--- a/soh/assets/scenes/shops/face_shop/face_shop_scene.h
+++ b/soh/assets/scenes/shops/face_shop/face_shop_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dface_shop_sceneCollisionHeader_000338 "__OTR__scenes/nonmq/face_shop_scene/face_shop_sceneCollisionHeader_000338"
+#define dface_shop_sceneCollisionHeader_000338 "__OTR__scenes/shared/face_shop_scene/face_shop_sceneCollisionHeader_000338"
 static const ALIGN_ASSET(2) char face_shop_sceneCollisionHeader_000338[] = dface_shop_sceneCollisionHeader_000338;
 
 
diff --git a/soh/assets/scenes/shops/golon/golon_room_0.h b/soh/assets/scenes/shops/golon/golon_room_0.h
index b4f6c001d..900313def 100644
--- a/soh/assets/scenes/shops/golon/golon_room_0.h
+++ b/soh/assets/scenes/shops/golon/golon_room_0.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dgolon_room_0DL_0009B0 "__OTR__scenes/nonmq/golon_scene/golon_room_0DL_0009B0"
+#define dgolon_room_0DL_0009B0 "__OTR__scenes/shared/golon_scene/golon_room_0DL_0009B0"
 static const ALIGN_ASSET(2) char golon_room_0DL_0009B0[] = dgolon_room_0DL_0009B0;
 
 
diff --git a/soh/assets/scenes/shops/golon/golon_scene.h b/soh/assets/scenes/shops/golon/golon_scene.h
index aba348670..a102ae1ae 100644
--- a/soh/assets/scenes/shops/golon/golon_scene.h
+++ b/soh/assets/scenes/shops/golon/golon_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dgolon_sceneCollisionHeader_000368 "__OTR__scenes/nonmq/golon_scene/golon_sceneCollisionHeader_000368"
+#define dgolon_sceneCollisionHeader_000368 "__OTR__scenes/shared/golon_scene/golon_sceneCollisionHeader_000368"
 static const ALIGN_ASSET(2) char golon_sceneCollisionHeader_000368[] = dgolon_sceneCollisionHeader_000368;
 
 
diff --git a/soh/assets/scenes/shops/kokiri_shop/kokiri_shop_room_0.h b/soh/assets/scenes/shops/kokiri_shop/kokiri_shop_room_0.h
index dc8424b78..7a6ca3f45 100644
--- a/soh/assets/scenes/shops/kokiri_shop/kokiri_shop_room_0.h
+++ b/soh/assets/scenes/shops/kokiri_shop/kokiri_shop_room_0.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dkokiri_shop_room_0DL_00B428 "__OTR__scenes/nonmq/kokiri_shop_scene/kokiri_shop_room_0DL_00B428"
+#define dkokiri_shop_room_0DL_00B428 "__OTR__scenes/shared/kokiri_shop_scene/kokiri_shop_room_0DL_00B428"
 static const ALIGN_ASSET(2) char kokiri_shop_room_0DL_00B428[] = dkokiri_shop_room_0DL_00B428;
 
 
diff --git a/soh/assets/scenes/shops/kokiri_shop/kokiri_shop_scene.h b/soh/assets/scenes/shops/kokiri_shop/kokiri_shop_scene.h
index adfa7c8ba..fa5bd5ef6 100644
--- a/soh/assets/scenes/shops/kokiri_shop/kokiri_shop_scene.h
+++ b/soh/assets/scenes/shops/kokiri_shop/kokiri_shop_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dkokiri_shop_sceneCollisionHeader_000950 "__OTR__scenes/nonmq/kokiri_shop_scene/kokiri_shop_sceneCollisionHeader_000950"
+#define dkokiri_shop_sceneCollisionHeader_000950 "__OTR__scenes/shared/kokiri_shop_scene/kokiri_shop_sceneCollisionHeader_000950"
 static const ALIGN_ASSET(2) char kokiri_shop_sceneCollisionHeader_000950[] = dkokiri_shop_sceneCollisionHeader_000950;
 
 
diff --git a/soh/assets/scenes/shops/night_shop/night_shop_room_0.h b/soh/assets/scenes/shops/night_shop/night_shop_room_0.h
index ea97e50a7..c93f973db 100644
--- a/soh/assets/scenes/shops/night_shop/night_shop_room_0.h
+++ b/soh/assets/scenes/shops/night_shop/night_shop_room_0.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dnight_shop_room_0DL_003100 "__OTR__scenes/nonmq/night_shop_scene/night_shop_room_0DL_003100"
+#define dnight_shop_room_0DL_003100 "__OTR__scenes/shared/night_shop_scene/night_shop_room_0DL_003100"
 static const ALIGN_ASSET(2) char night_shop_room_0DL_003100[] = dnight_shop_room_0DL_003100;
 
 
diff --git a/soh/assets/scenes/shops/night_shop/night_shop_scene.h b/soh/assets/scenes/shops/night_shop/night_shop_scene.h
index 3b5307dee..737f54873 100644
--- a/soh/assets/scenes/shops/night_shop/night_shop_scene.h
+++ b/soh/assets/scenes/shops/night_shop/night_shop_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dnight_shop_sceneCollisionHeader_000644 "__OTR__scenes/nonmq/night_shop_scene/night_shop_sceneCollisionHeader_000644"
+#define dnight_shop_sceneCollisionHeader_000644 "__OTR__scenes/shared/night_shop_scene/night_shop_sceneCollisionHeader_000644"
 static const ALIGN_ASSET(2) char night_shop_sceneCollisionHeader_000644[] = dnight_shop_sceneCollisionHeader_000644;
 
 
diff --git a/soh/assets/scenes/shops/shop1/shop1_room_0.h b/soh/assets/scenes/shops/shop1/shop1_room_0.h
index 1d0a99e90..36955854e 100644
--- a/soh/assets/scenes/shops/shop1/shop1_room_0.h
+++ b/soh/assets/scenes/shops/shop1/shop1_room_0.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dshop1_room_0DL_003F18 "__OTR__scenes/nonmq/shop1_scene/shop1_room_0DL_003F18"
+#define dshop1_room_0DL_003F18 "__OTR__scenes/shared/shop1_scene/shop1_room_0DL_003F18"
 static const ALIGN_ASSET(2) char shop1_room_0DL_003F18[] = dshop1_room_0DL_003F18;
 
 
diff --git a/soh/assets/scenes/shops/shop1/shop1_scene.h b/soh/assets/scenes/shops/shop1/shop1_scene.h
index d67f59784..cbb75c31f 100644
--- a/soh/assets/scenes/shops/shop1/shop1_scene.h
+++ b/soh/assets/scenes/shops/shop1/shop1_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dshop1_sceneCollisionHeader_0002B8 "__OTR__scenes/nonmq/shop1_scene/shop1_sceneCollisionHeader_0002B8"
+#define dshop1_sceneCollisionHeader_0002B8 "__OTR__scenes/shared/shop1_scene/shop1_sceneCollisionHeader_0002B8"
 static const ALIGN_ASSET(2) char shop1_sceneCollisionHeader_0002B8[] = dshop1_sceneCollisionHeader_0002B8;
 
 
diff --git a/soh/assets/scenes/shops/zoora/zoora_room_0.h b/soh/assets/scenes/shops/zoora/zoora_room_0.h
index 7c7ba04e8..d83d3eb24 100644
--- a/soh/assets/scenes/shops/zoora/zoora_room_0.h
+++ b/soh/assets/scenes/shops/zoora/zoora_room_0.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dzoora_room_0DL_0009C0 "__OTR__scenes/nonmq/zoora_scene/zoora_room_0DL_0009C0"
+#define dzoora_room_0DL_0009C0 "__OTR__scenes/shared/zoora_scene/zoora_room_0DL_0009C0"
 static const ALIGN_ASSET(2) char zoora_room_0DL_0009C0[] = dzoora_room_0DL_0009C0;
 
 
diff --git a/soh/assets/scenes/shops/zoora/zoora_scene.h b/soh/assets/scenes/shops/zoora/zoora_scene.h
index 1cea04bc1..c8fe5385e 100644
--- a/soh/assets/scenes/shops/zoora/zoora_scene.h
+++ b/soh/assets/scenes/shops/zoora/zoora_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dzoora_sceneCollisionHeader_000360 "__OTR__scenes/nonmq/zoora_scene/zoora_sceneCollisionHeader_000360"
+#define dzoora_sceneCollisionHeader_000360 "__OTR__scenes/shared/zoora_scene/zoora_sceneCollisionHeader_000360"
 static const ALIGN_ASSET(2) char zoora_sceneCollisionHeader_000360[] = dzoora_sceneCollisionHeader_000360;
 
 
diff --git a/soh/assets/scenes/test_levels/besitu/besitu_room_0.h b/soh/assets/scenes/test_levels/besitu/besitu_room_0.h
index 2afdbb7da..7a2455665 100644
--- a/soh/assets/scenes/test_levels/besitu/besitu_room_0.h
+++ b/soh/assets/scenes/test_levels/besitu/besitu_room_0.h
@@ -3,29 +3,29 @@
 
 #include "align_asset_macro.h"
 
-#define dbesitu_room_0DL_001C80 "__OTR__scenes/nonmq/besitu_scene/besitu_room_0DL_001C80"
-static const ALIGN_ASSET(2) char besitu_room_0DL_001C80[] = dbesitu_room_0DL_001C80;
-
-#define dbesitu_room_0Tex_001CD8 "__OTR__scenes/nonmq/besitu_scene/besitu_room_0Tex_001CD8"
+#define dbesitu_room_0Tex_001CD8 "__OTR__scenes/shared/besitu_scene/besitu_room_0Tex_001CD8"
 static const ALIGN_ASSET(2) char besitu_room_0Tex_001CD8[] = dbesitu_room_0Tex_001CD8;
 
-#define dbesitu_room_0Tex_004CD8 "__OTR__scenes/nonmq/besitu_scene/besitu_room_0Tex_004CD8"
-static const ALIGN_ASSET(2) char besitu_room_0Tex_004CD8[] = dbesitu_room_0Tex_004CD8;
+#define dbesitu_room_0Tex_002CD8 "__OTR__scenes/shared/besitu_scene/besitu_room_0Tex_002CD8"
+static const ALIGN_ASSET(2) char besitu_room_0Tex_002CD8[] = dbesitu_room_0Tex_002CD8;
 
-#define dbesitu_room_0TLUT_001CB8 "__OTR__scenes/nonmq/besitu_scene/besitu_room_0TLUT_001CB8"
-static const ALIGN_ASSET(2) char besitu_room_0TLUT_001CB8[] = dbesitu_room_0TLUT_001CB8;
-
-#define dbesitu_room_0Tex_003CD8 "__OTR__scenes/nonmq/besitu_scene/besitu_room_0Tex_003CD8"
-static const ALIGN_ASSET(2) char besitu_room_0Tex_003CD8[] = dbesitu_room_0Tex_003CD8;
-
-#define dbesitu_room_0Tex_0034D8 "__OTR__scenes/nonmq/besitu_scene/besitu_room_0Tex_0034D8"
+#define dbesitu_room_0Tex_0034D8 "__OTR__scenes/shared/besitu_scene/besitu_room_0Tex_0034D8"
 static const ALIGN_ASSET(2) char besitu_room_0Tex_0034D8[] = dbesitu_room_0Tex_0034D8;
 
-#define dbesitu_room_0Tex_0044D8 "__OTR__scenes/nonmq/besitu_scene/besitu_room_0Tex_0044D8"
+#define dbesitu_room_0Tex_003CD8 "__OTR__scenes/shared/besitu_scene/besitu_room_0Tex_003CD8"
+static const ALIGN_ASSET(2) char besitu_room_0Tex_003CD8[] = dbesitu_room_0Tex_003CD8;
+
+#define dbesitu_room_0Tex_0044D8 "__OTR__scenes/shared/besitu_scene/besitu_room_0Tex_0044D8"
 static const ALIGN_ASSET(2) char besitu_room_0Tex_0044D8[] = dbesitu_room_0Tex_0044D8;
 
-#define dbesitu_room_0Tex_002CD8 "__OTR__scenes/nonmq/besitu_scene/besitu_room_0Tex_002CD8"
-static const ALIGN_ASSET(2) char besitu_room_0Tex_002CD8[] = dbesitu_room_0Tex_002CD8;
+#define dbesitu_room_0Tex_004CD8 "__OTR__scenes/shared/besitu_scene/besitu_room_0Tex_004CD8"
+static const ALIGN_ASSET(2) char besitu_room_0Tex_004CD8[] = dbesitu_room_0Tex_004CD8;
+
+#define dbesitu_room_0TLUT_001CB8 "__OTR__scenes/shared/besitu_scene/besitu_room_0TLUT_001CB8"
+static const ALIGN_ASSET(2) char besitu_room_0TLUT_001CB8[] = dbesitu_room_0TLUT_001CB8;
+
+#define dbesitu_room_0DL_001C80 "__OTR__scenes/shared/besitu_scene/besitu_room_0DL_001C80"
+static const ALIGN_ASSET(2) char besitu_room_0DL_001C80[] = dbesitu_room_0DL_001C80;
 
 
 #endif // TEST_LEVELS_BESITU_ROOM_0_H
diff --git a/soh/assets/scenes/test_levels/besitu/besitu_scene.h b/soh/assets/scenes/test_levels/besitu/besitu_scene.h
index 55964d264..e9841944e 100644
--- a/soh/assets/scenes/test_levels/besitu/besitu_scene.h
+++ b/soh/assets/scenes/test_levels/besitu/besitu_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dbesitu_sceneCollisionHeader_000478 "__OTR__scenes/nonmq/besitu_scene/besitu_sceneCollisionHeader_000478"
+#define dbesitu_sceneCollisionHeader_000478 "__OTR__scenes/shared/besitu_scene/besitu_sceneCollisionHeader_000478"
 static const ALIGN_ASSET(2) char besitu_sceneCollisionHeader_000478[] = dbesitu_sceneCollisionHeader_000478;
 
 
diff --git a/soh/assets/scenes/test_levels/depth_test/depth_test_room_0.h b/soh/assets/scenes/test_levels/depth_test/depth_test_room_0.h
index 5cbe9ea1c..6fd273039 100644
--- a/soh/assets/scenes/test_levels/depth_test/depth_test_room_0.h
+++ b/soh/assets/scenes/test_levels/depth_test/depth_test_room_0.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define ddepth_test_room_0DL_0004A0 "__OTR__scenes/nonmq/depth_test_scene/depth_test_room_0DL_0004A0"
+#define ddepth_test_room_0DL_0004A0 "__OTR__scenes/shared/depth_test_scene/depth_test_room_0DL_0004A0"
 static const ALIGN_ASSET(2) char depth_test_room_0DL_0004A0[] = ddepth_test_room_0DL_0004A0;
 
 
diff --git a/soh/assets/scenes/test_levels/depth_test/depth_test_scene.h b/soh/assets/scenes/test_levels/depth_test/depth_test_scene.h
index 507a79455..0a036df47 100644
--- a/soh/assets/scenes/test_levels/depth_test/depth_test_scene.h
+++ b/soh/assets/scenes/test_levels/depth_test/depth_test_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define ddepth_test_sceneCollisionHeader_0002D4 "__OTR__scenes/nonmq/depth_test_scene/depth_test_sceneCollisionHeader_0002D4"
+#define ddepth_test_sceneCollisionHeader_0002D4 "__OTR__scenes/shared/depth_test_scene/depth_test_sceneCollisionHeader_0002D4"
 static const ALIGN_ASSET(2) char depth_test_sceneCollisionHeader_0002D4[] = ddepth_test_sceneCollisionHeader_0002D4;
 
 
diff --git a/soh/assets/scenes/test_levels/sasatest/sasatest_room_0.h b/soh/assets/scenes/test_levels/sasatest/sasatest_room_0.h
index fac20a13e..3a0d07a74 100644
--- a/soh/assets/scenes/test_levels/sasatest/sasatest_room_0.h
+++ b/soh/assets/scenes/test_levels/sasatest/sasatest_room_0.h
@@ -3,16 +3,16 @@
 
 #include "align_asset_macro.h"
 
-#define dsasatest_room_0DL_001580 "__OTR__scenes/nonmq/sasatest_scene/sasatest_room_0DL_001580"
+#define dsasatest_room_0DL_001580 "__OTR__scenes/shared/sasatest_scene/sasatest_room_0DL_001580"
 static const ALIGN_ASSET(2) char sasatest_room_0DL_001580[] = dsasatest_room_0DL_001580;
 
-#define dsasatest_room_0Set_000310DL_001580 "__OTR__scenes/nonmq/sasatest_scene/sasatest_room_0Set_000310DL_001580"
+#define dsasatest_room_0Set_000310DL_001580 "__OTR__scenes/shared/sasatest_scene/sasatest_room_0Set_000310DL_001580"
 static const ALIGN_ASSET(2) char sasatest_room_0Set_000310DL_001580[] = dsasatest_room_0Set_000310DL_001580;
 
-#define dsasatest_room_0Set_0001C0DL_001580 "__OTR__scenes/nonmq/sasatest_scene/sasatest_room_0Set_0001C0DL_001580"
+#define dsasatest_room_0Set_0001C0DL_001580 "__OTR__scenes/shared/sasatest_scene/sasatest_room_0Set_0001C0DL_001580"
 static const ALIGN_ASSET(2) char sasatest_room_0Set_0001C0DL_001580[] = dsasatest_room_0Set_0001C0DL_001580;
 
-#define dsasatest_room_0Set_000270DL_001580 "__OTR__scenes/nonmq/sasatest_scene/sasatest_room_0Set_000270DL_001580"
+#define dsasatest_room_0Set_000270DL_001580 "__OTR__scenes/shared/sasatest_scene/sasatest_room_0Set_000270DL_001580"
 static const ALIGN_ASSET(2) char sasatest_room_0Set_000270DL_001580[] = dsasatest_room_0Set_000270DL_001580;
 
 
diff --git a/soh/assets/scenes/test_levels/sasatest/sasatest_scene.h b/soh/assets/scenes/test_levels/sasatest/sasatest_scene.h
index 648614986..5a595e6e1 100644
--- a/soh/assets/scenes/test_levels/sasatest/sasatest_scene.h
+++ b/soh/assets/scenes/test_levels/sasatest/sasatest_scene.h
@@ -3,14 +3,14 @@
 
 #include "align_asset_macro.h"
 
-#define dsasatest_sceneCollisionHeader_002838 "__OTR__scenes/nonmq/sasatest_scene/sasatest_sceneCollisionHeader_002838"
+#define dsasatest_sceneCollisionHeader_002838 "__OTR__scenes/shared/sasatest_scene/sasatest_sceneCollisionHeader_002838"
 static const ALIGN_ASSET(2) char sasatest_sceneCollisionHeader_002838[] = dsasatest_sceneCollisionHeader_002838;
 
-#define dsasatest_sceneCollisionHeader_002838 "__OTR__scenes/nonmq/sasatest_scene/sasatest_sceneCollisionHeader_002838"
+#define dsasatest_sceneCollisionHeader_002838 "__OTR__scenes/shared/sasatest_scene/sasatest_sceneCollisionHeader_002838"
 
-#define dsasatest_sceneCollisionHeader_002838 "__OTR__scenes/nonmq/sasatest_scene/sasatest_sceneCollisionHeader_002838"
+#define dsasatest_sceneCollisionHeader_002838 "__OTR__scenes/shared/sasatest_scene/sasatest_sceneCollisionHeader_002838"
 
-#define dsasatest_sceneCollisionHeader_002838 "__OTR__scenes/nonmq/sasatest_scene/sasatest_sceneCollisionHeader_002838"
+#define dsasatest_sceneCollisionHeader_002838 "__OTR__scenes/shared/sasatest_scene/sasatest_sceneCollisionHeader_002838"
 
 
 #endif // TEST_LEVELS_SASATEST_SCENE_H
diff --git a/soh/assets/scenes/test_levels/sutaru/sutaru_room_0.h b/soh/assets/scenes/test_levels/sutaru/sutaru_room_0.h
index 42788f6c7..375643e95 100644
--- a/soh/assets/scenes/test_levels/sutaru/sutaru_room_0.h
+++ b/soh/assets/scenes/test_levels/sutaru/sutaru_room_0.h
@@ -3,29 +3,29 @@
 
 #include "align_asset_macro.h"
 
-#define dsutaru_room_0DL_001B00 "__OTR__scenes/nonmq/sutaru_scene/sutaru_room_0DL_001B00"
-static const ALIGN_ASSET(2) char sutaru_room_0DL_001B00[] = dsutaru_room_0DL_001B00;
-
-#define dsutaru_room_0Tex_0020F0 "__OTR__scenes/nonmq/sutaru_scene/sutaru_room_0Tex_0020F0"
+#define dsutaru_room_0Tex_0020F0 "__OTR__scenes/shared/sutaru_scene/sutaru_room_0Tex_0020F0"
 static const ALIGN_ASSET(2) char sutaru_room_0Tex_0020F0[] = dsutaru_room_0Tex_0020F0;
 
-#define dsutaru_room_0Tex_0028F0 "__OTR__scenes/nonmq/sutaru_scene/sutaru_room_0Tex_0028F0"
+#define dsutaru_room_0Tex_0028F0 "__OTR__scenes/shared/sutaru_scene/sutaru_room_0Tex_0028F0"
 static const ALIGN_ASSET(2) char sutaru_room_0Tex_0028F0[] = dsutaru_room_0Tex_0028F0;
 
-#define dsutaru_room_0Tex_002AF0 "__OTR__scenes/nonmq/sutaru_scene/sutaru_room_0Tex_002AF0"
+#define dsutaru_room_0Tex_002AF0 "__OTR__scenes/shared/sutaru_scene/sutaru_room_0Tex_002AF0"
 static const ALIGN_ASSET(2) char sutaru_room_0Tex_002AF0[] = dsutaru_room_0Tex_002AF0;
 
-#define dsutaru_room_0Tex_003AF0 "__OTR__scenes/nonmq/sutaru_scene/sutaru_room_0Tex_003AF0"
+#define dsutaru_room_0Tex_003AF0 "__OTR__scenes/shared/sutaru_scene/sutaru_room_0Tex_003AF0"
 static const ALIGN_ASSET(2) char sutaru_room_0Tex_003AF0[] = dsutaru_room_0Tex_003AF0;
 
-#define dsutaru_room_0Tex_0042F0 "__OTR__scenes/nonmq/sutaru_scene/sutaru_room_0Tex_0042F0"
+#define dsutaru_room_0Tex_0042F0 "__OTR__scenes/shared/sutaru_scene/sutaru_room_0Tex_0042F0"
 static const ALIGN_ASSET(2) char sutaru_room_0Tex_0042F0[] = dsutaru_room_0Tex_0042F0;
 
-#define dsutaru_room_0Tex_0052F0 "__OTR__scenes/nonmq/sutaru_scene/sutaru_room_0Tex_0052F0"
+#define dsutaru_room_0Tex_0052F0 "__OTR__scenes/shared/sutaru_scene/sutaru_room_0Tex_0052F0"
 static const ALIGN_ASSET(2) char sutaru_room_0Tex_0052F0[] = dsutaru_room_0Tex_0052F0;
 
-#define dsutaru_room_0Tex_0062F0 "__OTR__scenes/nonmq/sutaru_scene/sutaru_room_0Tex_0062F0"
+#define dsutaru_room_0Tex_0062F0 "__OTR__scenes/shared/sutaru_scene/sutaru_room_0Tex_0062F0"
 static const ALIGN_ASSET(2) char sutaru_room_0Tex_0062F0[] = dsutaru_room_0Tex_0062F0;
 
+#define dsutaru_room_0DL_001B00 "__OTR__scenes/shared/sutaru_scene/sutaru_room_0DL_001B00"
+static const ALIGN_ASSET(2) char sutaru_room_0DL_001B00[] = dsutaru_room_0DL_001B00;
+
 
 #endif // TEST_LEVELS_SUTARU_ROOM_0_H
diff --git a/soh/assets/scenes/test_levels/sutaru/sutaru_scene.h b/soh/assets/scenes/test_levels/sutaru/sutaru_scene.h
index 115c20517..89fde57e6 100644
--- a/soh/assets/scenes/test_levels/sutaru/sutaru_scene.h
+++ b/soh/assets/scenes/test_levels/sutaru/sutaru_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dsutaru_sceneCollisionHeader_000B78 "__OTR__scenes/nonmq/sutaru_scene/sutaru_sceneCollisionHeader_000B78"
+#define dsutaru_sceneCollisionHeader_000B78 "__OTR__scenes/shared/sutaru_scene/sutaru_sceneCollisionHeader_000B78"
 static const ALIGN_ASSET(2) char sutaru_sceneCollisionHeader_000B78[] = dsutaru_sceneCollisionHeader_000B78;
 
 
diff --git a/soh/assets/scenes/test_levels/syotes/syotes_room_0.h b/soh/assets/scenes/test_levels/syotes/syotes_room_0.h
index daa4c7b91..3cb0b318a 100644
--- a/soh/assets/scenes/test_levels/syotes/syotes_room_0.h
+++ b/soh/assets/scenes/test_levels/syotes/syotes_room_0.h
@@ -3,44 +3,44 @@
 
 #include "align_asset_macro.h"
 
-#define dsyotes_room_0DL_0031C8 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0DL_0031C8"
-static const ALIGN_ASSET(2) char syotes_room_0DL_0031C8[] = dsyotes_room_0DL_0031C8;
-
-#define dsyotes_room_0Tex_0069E8 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_0069E8"
-static const ALIGN_ASSET(2) char syotes_room_0Tex_0069E8[] = dsyotes_room_0Tex_0069E8;
-
-#define dsyotes_room_0Tex_0079E8 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_0079E8"
-static const ALIGN_ASSET(2) char syotes_room_0Tex_0079E8[] = dsyotes_room_0Tex_0079E8;
-
-#define dsyotes_room_0Tex_0089E8 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_0089E8"
-static const ALIGN_ASSET(2) char syotes_room_0Tex_0089E8[] = dsyotes_room_0Tex_0089E8;
-
-#define dsyotes_room_0Tex_0039E8 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_0039E8"
-static const ALIGN_ASSET(2) char syotes_room_0Tex_0039E8[] = dsyotes_room_0Tex_0039E8;
-
-#define dsyotes_room_0Tex_0031E8 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_0031E8"
+#define dsyotes_room_0Tex_0031E8 "__OTR__scenes/shared/syotes_scene/syotes_room_0Tex_0031E8"
 static const ALIGN_ASSET(2) char syotes_room_0Tex_0031E8[] = dsyotes_room_0Tex_0031E8;
 
-#define dsyotes_room_0Tex_0061E8 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_0061E8"
-static const ALIGN_ASSET(2) char syotes_room_0Tex_0061E8[] = dsyotes_room_0Tex_0061E8;
+#define dsyotes_room_0Tex_0039E8 "__OTR__scenes/shared/syotes_scene/syotes_room_0Tex_0039E8"
+static const ALIGN_ASSET(2) char syotes_room_0Tex_0039E8[] = dsyotes_room_0Tex_0039E8;
 
-#define dsyotes_room_0Tex_0041E8 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_0041E8"
+#define dsyotes_room_0Tex_0041E8 "__OTR__scenes/shared/syotes_scene/syotes_room_0Tex_0041E8"
 static const ALIGN_ASSET(2) char syotes_room_0Tex_0041E8[] = dsyotes_room_0Tex_0041E8;
 
-#define dsyotes_room_0Tex_0099E8 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_0099E8"
-static const ALIGN_ASSET(2) char syotes_room_0Tex_0099E8[] = dsyotes_room_0Tex_0099E8;
-
-#define dsyotes_room_0Tex_00A9E8 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_00A9E8"
-static const ALIGN_ASSET(2) char syotes_room_0Tex_00A9E8[] = dsyotes_room_0Tex_00A9E8;
-
-#define dsyotes_room_0Tex_0051E8 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_0051E8"
+#define dsyotes_room_0Tex_0051E8 "__OTR__scenes/shared/syotes_scene/syotes_room_0Tex_0051E8"
 static const ALIGN_ASSET(2) char syotes_room_0Tex_0051E8[] = dsyotes_room_0Tex_0051E8;
 
-#define dsyotes_room_0DL_00BF70 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0DL_00BF70"
-static const ALIGN_ASSET(2) char syotes_room_0DL_00BF70[] = dsyotes_room_0DL_00BF70;
+#define dsyotes_room_0Tex_0061E8 "__OTR__scenes/shared/syotes_scene/syotes_room_0Tex_0061E8"
+static const ALIGN_ASSET(2) char syotes_room_0Tex_0061E8[] = dsyotes_room_0Tex_0061E8;
 
-#define dsyotes_room_0Tex_00BF80 "__OTR__scenes/nonmq/syotes_scene/syotes_room_0Tex_00BF80"
+#define dsyotes_room_0Tex_0069E8 "__OTR__scenes/shared/syotes_scene/syotes_room_0Tex_0069E8"
+static const ALIGN_ASSET(2) char syotes_room_0Tex_0069E8[] = dsyotes_room_0Tex_0069E8;
+
+#define dsyotes_room_0Tex_0079E8 "__OTR__scenes/shared/syotes_scene/syotes_room_0Tex_0079E8"
+static const ALIGN_ASSET(2) char syotes_room_0Tex_0079E8[] = dsyotes_room_0Tex_0079E8;
+
+#define dsyotes_room_0Tex_0089E8 "__OTR__scenes/shared/syotes_scene/syotes_room_0Tex_0089E8"
+static const ALIGN_ASSET(2) char syotes_room_0Tex_0089E8[] = dsyotes_room_0Tex_0089E8;
+
+#define dsyotes_room_0Tex_0099E8 "__OTR__scenes/shared/syotes_scene/syotes_room_0Tex_0099E8"
+static const ALIGN_ASSET(2) char syotes_room_0Tex_0099E8[] = dsyotes_room_0Tex_0099E8;
+
+#define dsyotes_room_0Tex_00A9E8 "__OTR__scenes/shared/syotes_scene/syotes_room_0Tex_00A9E8"
+static const ALIGN_ASSET(2) char syotes_room_0Tex_00A9E8[] = dsyotes_room_0Tex_00A9E8;
+
+#define dsyotes_room_0Tex_00BF80 "__OTR__scenes/shared/syotes_scene/syotes_room_0Tex_00BF80"
 static const ALIGN_ASSET(2) char syotes_room_0Tex_00BF80[] = dsyotes_room_0Tex_00BF80;
 
+#define dsyotes_room_0DL_0031C8 "__OTR__scenes/shared/syotes_scene/syotes_room_0DL_0031C8"
+static const ALIGN_ASSET(2) char syotes_room_0DL_0031C8[] = dsyotes_room_0DL_0031C8;
+
+#define dsyotes_room_0DL_00BF70 "__OTR__scenes/shared/syotes_scene/syotes_room_0DL_00BF70"
+static const ALIGN_ASSET(2) char syotes_room_0DL_00BF70[] = dsyotes_room_0DL_00BF70;
+
 
 #endif // TEST_LEVELS_SYOTES_ROOM_0_H
diff --git a/soh/assets/scenes/test_levels/syotes/syotes_scene.h b/soh/assets/scenes/test_levels/syotes/syotes_scene.h
index 62b5bfa0b..83733242a 100644
--- a/soh/assets/scenes/test_levels/syotes/syotes_scene.h
+++ b/soh/assets/scenes/test_levels/syotes/syotes_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dsyotes_sceneCollisionHeader_001BD4 "__OTR__scenes/nonmq/syotes_scene/syotes_sceneCollisionHeader_001BD4"
+#define dsyotes_sceneCollisionHeader_001BD4 "__OTR__scenes/shared/syotes_scene/syotes_sceneCollisionHeader_001BD4"
 static const ALIGN_ASSET(2) char syotes_sceneCollisionHeader_001BD4[] = dsyotes_sceneCollisionHeader_001BD4;
 
 
diff --git a/soh/assets/scenes/test_levels/syotes2/syotes2_room_0.h b/soh/assets/scenes/test_levels/syotes2/syotes2_room_0.h
index 3c908c82a..8529deb41 100644
--- a/soh/assets/scenes/test_levels/syotes2/syotes2_room_0.h
+++ b/soh/assets/scenes/test_levels/syotes2/syotes2_room_0.h
@@ -3,29 +3,29 @@
 
 #include "align_asset_macro.h"
 
-#define dsyotes2_room_0DL_0046B8 "__OTR__scenes/nonmq/syotes2_scene/syotes2_room_0DL_0046B8"
-static const ALIGN_ASSET(2) char syotes2_room_0DL_0046B8[] = dsyotes2_room_0DL_0046B8;
-
-#define dsyotes2_room_0Tex_006EF8 "__OTR__scenes/nonmq/syotes2_scene/syotes2_room_0Tex_006EF8"
-static const ALIGN_ASSET(2) char syotes2_room_0Tex_006EF8[] = dsyotes2_room_0Tex_006EF8;
-
-#define dsyotes2_room_0Tex_0056F8 "__OTR__scenes/nonmq/syotes2_scene/syotes2_room_0Tex_0056F8"
-static const ALIGN_ASSET(2) char syotes2_room_0Tex_0056F8[] = dsyotes2_room_0Tex_0056F8;
-
-#define dsyotes2_room_0Tex_004EF8 "__OTR__scenes/nonmq/syotes2_scene/syotes2_room_0Tex_004EF8"
-static const ALIGN_ASSET(2) char syotes2_room_0Tex_004EF8[] = dsyotes2_room_0Tex_004EF8;
-
-#define dsyotes2_room_0Tex_008EF8 "__OTR__scenes/nonmq/syotes2_scene/syotes2_room_0Tex_008EF8"
-static const ALIGN_ASSET(2) char syotes2_room_0Tex_008EF8[] = dsyotes2_room_0Tex_008EF8;
-
-#define dsyotes2_room_0Tex_0066F8 "__OTR__scenes/nonmq/syotes2_scene/syotes2_room_0Tex_0066F8"
-static const ALIGN_ASSET(2) char syotes2_room_0Tex_0066F8[] = dsyotes2_room_0Tex_0066F8;
-
-#define dsyotes2_room_0Tex_0046F8 "__OTR__scenes/nonmq/syotes2_scene/syotes2_room_0Tex_0046F8"
+#define dsyotes2_room_0Tex_0046F8 "__OTR__scenes/shared/syotes2_scene/syotes2_room_0Tex_0046F8"
 static const ALIGN_ASSET(2) char syotes2_room_0Tex_0046F8[] = dsyotes2_room_0Tex_0046F8;
 
-#define dsyotes2_room_0Tex_007EF8 "__OTR__scenes/nonmq/syotes2_scene/syotes2_room_0Tex_007EF8"
+#define dsyotes2_room_0Tex_004EF8 "__OTR__scenes/shared/syotes2_scene/syotes2_room_0Tex_004EF8"
+static const ALIGN_ASSET(2) char syotes2_room_0Tex_004EF8[] = dsyotes2_room_0Tex_004EF8;
+
+#define dsyotes2_room_0Tex_0056F8 "__OTR__scenes/shared/syotes2_scene/syotes2_room_0Tex_0056F8"
+static const ALIGN_ASSET(2) char syotes2_room_0Tex_0056F8[] = dsyotes2_room_0Tex_0056F8;
+
+#define dsyotes2_room_0Tex_0066F8 "__OTR__scenes/shared/syotes2_scene/syotes2_room_0Tex_0066F8"
+static const ALIGN_ASSET(2) char syotes2_room_0Tex_0066F8[] = dsyotes2_room_0Tex_0066F8;
+
+#define dsyotes2_room_0Tex_006EF8 "__OTR__scenes/shared/syotes2_scene/syotes2_room_0Tex_006EF8"
+static const ALIGN_ASSET(2) char syotes2_room_0Tex_006EF8[] = dsyotes2_room_0Tex_006EF8;
+
+#define dsyotes2_room_0Tex_007EF8 "__OTR__scenes/shared/syotes2_scene/syotes2_room_0Tex_007EF8"
 static const ALIGN_ASSET(2) char syotes2_room_0Tex_007EF8[] = dsyotes2_room_0Tex_007EF8;
 
+#define dsyotes2_room_0Tex_008EF8 "__OTR__scenes/shared/syotes2_scene/syotes2_room_0Tex_008EF8"
+static const ALIGN_ASSET(2) char syotes2_room_0Tex_008EF8[] = dsyotes2_room_0Tex_008EF8;
+
+#define dsyotes2_room_0DL_0046B8 "__OTR__scenes/shared/syotes2_scene/syotes2_room_0DL_0046B8"
+static const ALIGN_ASSET(2) char syotes2_room_0DL_0046B8[] = dsyotes2_room_0DL_0046B8;
+
 
 #endif // TEST_LEVELS_SYOTES2_ROOM_0_H
diff --git a/soh/assets/scenes/test_levels/syotes2/syotes2_scene.h b/soh/assets/scenes/test_levels/syotes2/syotes2_scene.h
index 99da67035..2280899d7 100644
--- a/soh/assets/scenes/test_levels/syotes2/syotes2_scene.h
+++ b/soh/assets/scenes/test_levels/syotes2/syotes2_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dsyotes2_sceneCollisionHeader_002478 "__OTR__scenes/nonmq/syotes2_scene/syotes2_sceneCollisionHeader_002478"
+#define dsyotes2_sceneCollisionHeader_002478 "__OTR__scenes/shared/syotes2_scene/syotes2_sceneCollisionHeader_002478"
 static const ALIGN_ASSET(2) char syotes2_sceneCollisionHeader_002478[] = dsyotes2_sceneCollisionHeader_002478;
 
 
diff --git a/soh/assets/scenes/test_levels/test01/test01_room_0.h b/soh/assets/scenes/test_levels/test01/test01_room_0.h
index 14eeda7a2..dd59a8f07 100644
--- a/soh/assets/scenes/test_levels/test01/test01_room_0.h
+++ b/soh/assets/scenes/test_levels/test01/test01_room_0.h
@@ -3,26 +3,26 @@
 
 #include "align_asset_macro.h"
 
-#define dtest01_room_0DL_006438 "__OTR__scenes/nonmq/test01_scene/test01_room_0DL_006438"
-static const ALIGN_ASSET(2) char test01_room_0DL_006438[] = dtest01_room_0DL_006438;
-
-#define dtest01_room_0Tex_008490 "__OTR__scenes/nonmq/test01_scene/test01_room_0Tex_008490"
-static const ALIGN_ASSET(2) char test01_room_0Tex_008490[] = dtest01_room_0Tex_008490;
-
-#define dtest01_room_0Tex_007490 "__OTR__scenes/nonmq/test01_scene/test01_room_0Tex_007490"
-static const ALIGN_ASSET(2) char test01_room_0Tex_007490[] = dtest01_room_0Tex_007490;
-
-#define dtest01_room_0Tex_006C90 "__OTR__scenes/nonmq/test01_scene/test01_room_0Tex_006C90"
-static const ALIGN_ASSET(2) char test01_room_0Tex_006C90[] = dtest01_room_0Tex_006C90;
-
-#define dtest01_room_0Tex_006490 "__OTR__scenes/nonmq/test01_scene/test01_room_0Tex_006490"
+#define dtest01_room_0Tex_006490 "__OTR__scenes/shared/test01_scene/test01_room_0Tex_006490"
 static const ALIGN_ASSET(2) char test01_room_0Tex_006490[] = dtest01_room_0Tex_006490;
 
-#define dtest01_room_0DL_0090D8 "__OTR__scenes/nonmq/test01_scene/test01_room_0DL_0090D8"
-static const ALIGN_ASSET(2) char test01_room_0DL_0090D8[] = dtest01_room_0DL_0090D8;
+#define dtest01_room_0Tex_006C90 "__OTR__scenes/shared/test01_scene/test01_room_0Tex_006C90"
+static const ALIGN_ASSET(2) char test01_room_0Tex_006C90[] = dtest01_room_0Tex_006C90;
 
-#define dtest01_room_0Tex_0090E8 "__OTR__scenes/nonmq/test01_scene/test01_room_0Tex_0090E8"
+#define dtest01_room_0Tex_007490 "__OTR__scenes/shared/test01_scene/test01_room_0Tex_007490"
+static const ALIGN_ASSET(2) char test01_room_0Tex_007490[] = dtest01_room_0Tex_007490;
+
+#define dtest01_room_0Tex_008490 "__OTR__scenes/shared/test01_scene/test01_room_0Tex_008490"
+static const ALIGN_ASSET(2) char test01_room_0Tex_008490[] = dtest01_room_0Tex_008490;
+
+#define dtest01_room_0Tex_0090E8 "__OTR__scenes/shared/test01_scene/test01_room_0Tex_0090E8"
 static const ALIGN_ASSET(2) char test01_room_0Tex_0090E8[] = dtest01_room_0Tex_0090E8;
 
+#define dtest01_room_0DL_006438 "__OTR__scenes/shared/test01_scene/test01_room_0DL_006438"
+static const ALIGN_ASSET(2) char test01_room_0DL_006438[] = dtest01_room_0DL_006438;
+
+#define dtest01_room_0DL_0090D8 "__OTR__scenes/shared/test01_scene/test01_room_0DL_0090D8"
+static const ALIGN_ASSET(2) char test01_room_0DL_0090D8[] = dtest01_room_0DL_0090D8;
+
 
 #endif // TEST_LEVELS_TEST01_ROOM_0_H
diff --git a/soh/assets/scenes/test_levels/test01/test01_scene.h b/soh/assets/scenes/test_levels/test01/test01_scene.h
index a194ec16d..fd1d15ba9 100644
--- a/soh/assets/scenes/test_levels/test01/test01_scene.h
+++ b/soh/assets/scenes/test_levels/test01/test01_scene.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dtest01_sceneCollisionHeader_003DEC "__OTR__scenes/nonmq/test01_scene/test01_sceneCollisionHeader_003DEC"
+#define dtest01_sceneCollisionHeader_003DEC "__OTR__scenes/shared/test01_scene/test01_sceneCollisionHeader_003DEC"
 static const ALIGN_ASSET(2) char test01_sceneCollisionHeader_003DEC[] = dtest01_sceneCollisionHeader_003DEC;
 
 
diff --git a/soh/assets/scenes/test_levels/testroom/testroom_room_0.h b/soh/assets/scenes/test_levels/testroom/testroom_room_0.h
index 4854ac076..3291706e6 100644
--- a/soh/assets/scenes/test_levels/testroom/testroom_room_0.h
+++ b/soh/assets/scenes/test_levels/testroom/testroom_room_0.h
@@ -3,23 +3,23 @@
 
 #include "align_asset_macro.h"
 
-#define dtestroom_room_0DL_000A50 "__OTR__scenes/nonmq/testroom_scene/testroom_room_0DL_000A50"
-static const ALIGN_ASSET(2) char testroom_room_0DL_000A50[] = dtestroom_room_0DL_000A50;
-
-#define dtestroom_room_0Tex_000E00 "__OTR__scenes/nonmq/testroom_scene/testroom_room_0Tex_000E00"
+#define dtestroom_room_0Tex_000E00 "__OTR__scenes/shared/testroom_scene/testroom_room_0Tex_000E00"
 static const ALIGN_ASSET(2) char testroom_room_0Tex_000E00[] = dtestroom_room_0Tex_000E00;
 
-#define dtestroom_room_0Tex_001600 "__OTR__scenes/nonmq/testroom_scene/testroom_room_0Tex_001600"
+#define dtestroom_room_0Tex_001600 "__OTR__scenes/shared/testroom_scene/testroom_room_0Tex_001600"
 static const ALIGN_ASSET(2) char testroom_room_0Tex_001600[] = dtestroom_room_0Tex_001600;
 
-#define dtestroom_room_0Tex_002600 "__OTR__scenes/nonmq/testroom_scene/testroom_room_0Tex_002600"
+#define dtestroom_room_0Tex_002600 "__OTR__scenes/shared/testroom_scene/testroom_room_0Tex_002600"
 static const ALIGN_ASSET(2) char testroom_room_0Tex_002600[] = dtestroom_room_0Tex_002600;
 
-#define dtestroom_room_0Tex_002E00 "__OTR__scenes/nonmq/testroom_scene/testroom_room_0Tex_002E00"
+#define dtestroom_room_0Tex_002E00 "__OTR__scenes/shared/testroom_scene/testroom_room_0Tex_002E00"
 static const ALIGN_ASSET(2) char testroom_room_0Tex_002E00[] = dtestroom_room_0Tex_002E00;
 
-#define dtestroom_room_0Tex_003E00 "__OTR__scenes/nonmq/testroom_scene/testroom_room_0Tex_003E00"
+#define dtestroom_room_0Tex_003E00 "__OTR__scenes/shared/testroom_scene/testroom_room_0Tex_003E00"
 static const ALIGN_ASSET(2) char testroom_room_0Tex_003E00[] = dtestroom_room_0Tex_003E00;
 
+#define dtestroom_room_0DL_000A50 "__OTR__scenes/shared/testroom_scene/testroom_room_0DL_000A50"
+static const ALIGN_ASSET(2) char testroom_room_0DL_000A50[] = dtestroom_room_0DL_000A50;
+
 
 #endif // TEST_LEVELS_TESTROOM_ROOM_0_H
diff --git a/soh/assets/scenes/test_levels/testroom/testroom_room_1.h b/soh/assets/scenes/test_levels/testroom/testroom_room_1.h
index 94efd01c2..1b3abaef7 100644
--- a/soh/assets/scenes/test_levels/testroom/testroom_room_1.h
+++ b/soh/assets/scenes/test_levels/testroom/testroom_room_1.h
@@ -3,17 +3,17 @@
 
 #include "align_asset_macro.h"
 
-#define dtestroom_room_1DL_000970 "__OTR__scenes/nonmq/testroom_scene/testroom_room_1DL_000970"
-static const ALIGN_ASSET(2) char testroom_room_1DL_000970[] = dtestroom_room_1DL_000970;
-
-#define dtestroom_room_1Tex_000BE8 "__OTR__scenes/nonmq/testroom_scene/testroom_room_1Tex_000BE8"
+#define dtestroom_room_1Tex_000BE8 "__OTR__scenes/shared/testroom_scene/testroom_room_1Tex_000BE8"
 static const ALIGN_ASSET(2) char testroom_room_1Tex_000BE8[] = dtestroom_room_1Tex_000BE8;
 
-#define dtestroom_room_1Tex_0013E8 "__OTR__scenes/nonmq/testroom_scene/testroom_room_1Tex_0013E8"
+#define dtestroom_room_1Tex_0013E8 "__OTR__scenes/shared/testroom_scene/testroom_room_1Tex_0013E8"
 static const ALIGN_ASSET(2) char testroom_room_1Tex_0013E8[] = dtestroom_room_1Tex_0013E8;
 
-#define dtestroom_room_1Tex_001BE8 "__OTR__scenes/nonmq/testroom_scene/testroom_room_1Tex_001BE8"
+#define dtestroom_room_1Tex_001BE8 "__OTR__scenes/shared/testroom_scene/testroom_room_1Tex_001BE8"
 static const ALIGN_ASSET(2) char testroom_room_1Tex_001BE8[] = dtestroom_room_1Tex_001BE8;
 
+#define dtestroom_room_1DL_000970 "__OTR__scenes/shared/testroom_scene/testroom_room_1DL_000970"
+static const ALIGN_ASSET(2) char testroom_room_1DL_000970[] = dtestroom_room_1DL_000970;
+
 
 #endif // TEST_LEVELS_TESTROOM_ROOM_1_H
diff --git a/soh/assets/scenes/test_levels/testroom/testroom_room_2.h b/soh/assets/scenes/test_levels/testroom/testroom_room_2.h
index 22874c780..990e3fcec 100644
--- a/soh/assets/scenes/test_levels/testroom/testroom_room_2.h
+++ b/soh/assets/scenes/test_levels/testroom/testroom_room_2.h
@@ -3,20 +3,20 @@
 
 #include "align_asset_macro.h"
 
-#define dtestroom_room_2DL_001590 "__OTR__scenes/nonmq/testroom_scene/testroom_room_2DL_001590"
-static const ALIGN_ASSET(2) char testroom_room_2DL_001590[] = dtestroom_room_2DL_001590;
-
-#define dtestroom_room_2Tex_001A78 "__OTR__scenes/nonmq/testroom_scene/testroom_room_2Tex_001A78"
+#define dtestroom_room_2Tex_001A78 "__OTR__scenes/shared/testroom_scene/testroom_room_2Tex_001A78"
 static const ALIGN_ASSET(2) char testroom_room_2Tex_001A78[] = dtestroom_room_2Tex_001A78;
 
-#define dtestroom_room_2TLUT_001A58 "__OTR__scenes/nonmq/testroom_scene/testroom_room_2TLUT_001A58"
-static const ALIGN_ASSET(2) char testroom_room_2TLUT_001A58[] = dtestroom_room_2TLUT_001A58;
-
-#define dtestroom_room_2Tex_002278 "__OTR__scenes/nonmq/testroom_scene/testroom_room_2Tex_002278"
+#define dtestroom_room_2Tex_002278 "__OTR__scenes/shared/testroom_scene/testroom_room_2Tex_002278"
 static const ALIGN_ASSET(2) char testroom_room_2Tex_002278[] = dtestroom_room_2Tex_002278;
 
-#define dtestroom_room_2Tex_002A78 "__OTR__scenes/nonmq/testroom_scene/testroom_room_2Tex_002A78"
+#define dtestroom_room_2Tex_002A78 "__OTR__scenes/shared/testroom_scene/testroom_room_2Tex_002A78"
 static const ALIGN_ASSET(2) char testroom_room_2Tex_002A78[] = dtestroom_room_2Tex_002A78;
 
+#define dtestroom_room_2TLUT_001A58 "__OTR__scenes/shared/testroom_scene/testroom_room_2TLUT_001A58"
+static const ALIGN_ASSET(2) char testroom_room_2TLUT_001A58[] = dtestroom_room_2TLUT_001A58;
+
+#define dtestroom_room_2DL_001590 "__OTR__scenes/shared/testroom_scene/testroom_room_2DL_001590"
+static const ALIGN_ASSET(2) char testroom_room_2DL_001590[] = dtestroom_room_2DL_001590;
+
 
 #endif // TEST_LEVELS_TESTROOM_ROOM_2_H
diff --git a/soh/assets/scenes/test_levels/testroom/testroom_room_3.h b/soh/assets/scenes/test_levels/testroom/testroom_room_3.h
index 13f748780..fb3873b15 100644
--- a/soh/assets/scenes/test_levels/testroom/testroom_room_3.h
+++ b/soh/assets/scenes/test_levels/testroom/testroom_room_3.h
@@ -3,20 +3,20 @@
 
 #include "align_asset_macro.h"
 
-#define dtestroom_room_3DL_000730 "__OTR__scenes/nonmq/testroom_scene/testroom_room_3DL_000730"
-static const ALIGN_ASSET(2) char testroom_room_3DL_000730[] = dtestroom_room_3DL_000730;
-
-#define dtestroom_room_3Tex_000A18 "__OTR__scenes/nonmq/testroom_scene/testroom_room_3Tex_000A18"
+#define dtestroom_room_3Tex_000A18 "__OTR__scenes/shared/testroom_scene/testroom_room_3Tex_000A18"
 static const ALIGN_ASSET(2) char testroom_room_3Tex_000A18[] = dtestroom_room_3Tex_000A18;
 
-#define dtestroom_room_3Tex_001218 "__OTR__scenes/nonmq/testroom_scene/testroom_room_3Tex_001218"
+#define dtestroom_room_3Tex_001218 "__OTR__scenes/shared/testroom_scene/testroom_room_3Tex_001218"
 static const ALIGN_ASSET(2) char testroom_room_3Tex_001218[] = dtestroom_room_3Tex_001218;
 
-#define dtestroom_room_3Tex_002218 "__OTR__scenes/nonmq/testroom_scene/testroom_room_3Tex_002218"
+#define dtestroom_room_3Tex_002218 "__OTR__scenes/shared/testroom_scene/testroom_room_3Tex_002218"
 static const ALIGN_ASSET(2) char testroom_room_3Tex_002218[] = dtestroom_room_3Tex_002218;
 
-#define dtestroom_room_3Tex_003218 "__OTR__scenes/nonmq/testroom_scene/testroom_room_3Tex_003218"
+#define dtestroom_room_3Tex_003218 "__OTR__scenes/shared/testroom_scene/testroom_room_3Tex_003218"
 static const ALIGN_ASSET(2) char testroom_room_3Tex_003218[] = dtestroom_room_3Tex_003218;
 
+#define dtestroom_room_3DL_000730 "__OTR__scenes/shared/testroom_scene/testroom_room_3DL_000730"
+static const ALIGN_ASSET(2) char testroom_room_3DL_000730[] = dtestroom_room_3DL_000730;
+
 
 #endif // TEST_LEVELS_TESTROOM_ROOM_3_H
diff --git a/soh/assets/scenes/test_levels/testroom/testroom_room_4.h b/soh/assets/scenes/test_levels/testroom/testroom_room_4.h
index 55eb7df18..6bb6d097a 100644
--- a/soh/assets/scenes/test_levels/testroom/testroom_room_4.h
+++ b/soh/assets/scenes/test_levels/testroom/testroom_room_4.h
@@ -3,7 +3,7 @@
 
 #include "align_asset_macro.h"
 
-#define dtestroom_room_4DL_0001F0 "__OTR__scenes/nonmq/testroom_scene/testroom_room_4DL_0001F0"
+#define dtestroom_room_4DL_0001F0 "__OTR__scenes/shared/testroom_scene/testroom_room_4DL_0001F0"
 static const ALIGN_ASSET(2) char testroom_room_4DL_0001F0[] = dtestroom_room_4DL_0001F0;
 
 
diff --git a/soh/assets/scenes/test_levels/testroom/testroom_scene.h b/soh/assets/scenes/test_levels/testroom/testroom_scene.h
index 4ef8caafd..4b45eb3f9 100644
--- a/soh/assets/scenes/test_levels/testroom/testroom_scene.h
+++ b/soh/assets/scenes/test_levels/testroom/testroom_scene.h
@@ -3,16 +3,17 @@
 
 #include "align_asset_macro.h"
 
-#define dtestroom_sceneCollisionHeader_0021D4 "__OTR__scenes/nonmq/testroom_scene/testroom_sceneCollisionHeader_0021D4"
-static const ALIGN_ASSET(2) char testroom_sceneCollisionHeader_0021D4[] = dtestroom_sceneCollisionHeader_0021D4;
-
-#define dtestroom_sceneTex_002200 "__OTR__scenes/nonmq/testroom_scene/testroom_sceneTex_002200"
+#define dtestroom_sceneTex_002200 "__OTR__scenes/shared/testroom_scene/testroom_sceneTex_002200"
 static const ALIGN_ASSET(2) char testroom_sceneTex_002200[] = dtestroom_sceneTex_002200;
 
-#define dtestroom_sceneTex_002A00 "__OTR__scenes/nonmq/testroom_scene/testroom_sceneTex_002A00"
+#define dtestroom_sceneTex_002A00 "__OTR__scenes/shared/testroom_scene/testroom_sceneTex_002A00"
 static const ALIGN_ASSET(2) char testroom_sceneTex_002A00[] = dtestroom_sceneTex_002A00;
 
-#define dtestroom_sceneTex_003A00 "__OTR__scenes/nonmq/testroom_scene/testroom_sceneTex_003A00"
+#define dtestroom_sceneTex_003A00 "__OTR__scenes/shared/testroom_scene/testroom_sceneTex_003A00"
 static const ALIGN_ASSET(2) char testroom_sceneTex_003A00[] = dtestroom_sceneTex_003A00;
 
+#define dtestroom_sceneCollisionHeader_0021D4 "__OTR__scenes/shared/testroom_scene/testroom_sceneCollisionHeader_0021D4"
+static const ALIGN_ASSET(2) char testroom_sceneCollisionHeader_0021D4[] = dtestroom_sceneCollisionHeader_0021D4;
+
+
 #endif // TEST_LEVELS_TESTROOM_SCENE_H
diff --git a/soh/assets/textures/nintendo_rogo_static/nintendo_rogo_static.h b/soh/assets/textures/nintendo_rogo_static/nintendo_rogo_static.h
index 978b0cd13..d91945ffc 100644
--- a/soh/assets/textures/nintendo_rogo_static/nintendo_rogo_static.h
+++ b/soh/assets/textures/nintendo_rogo_static/nintendo_rogo_static.h
@@ -3,6 +3,9 @@
 
 #include "align_asset_macro.h"
 
+#define dnintendo_rogo_staticTex_0029C0 "__OTR__textures/nintendo_rogo_static/nintendo_rogo_staticTex_0029C0"
+static const ALIGN_ASSET(2) char nintendo_rogo_staticTex_0029C0[] = dnintendo_rogo_staticTex_0029C0;
+
 #define dnintendo_rogo_static_Tex_000000 "__OTR__textures/nintendo_rogo_static/nintendo_rogo_static_Tex_000000"
 static const ALIGN_ASSET(2) char nintendo_rogo_static_Tex_000000[] = dnintendo_rogo_static_Tex_000000;
 
@@ -12,7 +15,4 @@ static const ALIGN_ASSET(2) char nintendo_rogo_static_Tex_001800[] = dnintendo_r
 #define dgNintendo64LogoDL "__OTR__textures/nintendo_rogo_static/gNintendo64LogoDL"
 static const ALIGN_ASSET(2) char gNintendo64LogoDL[] = dgNintendo64LogoDL;
 
-#define dnintendo_rogo_staticTex_0029C0 "__OTR__textures/nintendo_rogo_static/nintendo_rogo_staticTex_0029C0"
-static const ALIGN_ASSET(2) char nintendo_rogo_staticTex_0029C0[] = dnintendo_rogo_staticTex_0029C0;
-
 #endif // TEXTURES_NINTENDO_ROGO_STATIC_H
diff --git a/soh/soh/Enhancements/cosmetics/authenticGfxPatches.cpp b/soh/soh/Enhancements/cosmetics/authenticGfxPatches.cpp
index 4149e8dd0..de97f3840 100644
--- a/soh/soh/Enhancements/cosmetics/authenticGfxPatches.cpp
+++ b/soh/soh/Enhancements/cosmetics/authenticGfxPatches.cpp
@@ -240,10 +240,9 @@ void PatchMirroredSoldOutGI() {
 // Patches the Sun Song Etching in the Royal Grave to be mirrored in mirror mode
 // This is achieved by mirroring the texture at the boundary and overriding the vertex texture coordinates
 void PatchMirroredSunSongEtching() {
-    static const char gMqRoyalGraveBackRoomDL[] = "__OTR__scenes/mq/hakaana_ouke_scene/hakaana_ouke_room_2DL_005040";
-    static const char gNonMqRoyalGraveBackRoomDL[] = "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_2DL_005040";
-    static const char gMqRoyalGraveBackRoomSongVtx[] = "__OTR__scenes/mq/hakaana_ouke_scene/hakaana_ouke_room_2Vtx_004F80";
-    static const char gNonMqRoyalGraveBackRoomSongVtx[] = "__OTR__scenes/nonmq/hakaana_ouke_scene/hakaana_ouke_room_2Vtx_004F80";
+    // Only using these strings for graphics patching lookup, we don't need aligned assets here
+    static const char gRoyalGraveBackRoomDL[] = "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_2DL_005040";
+    static const char gRoyalGraveBackRoomSongVtx[] = "__OTR__scenes/shared/hakaana_ouke_scene/hakaana_ouke_room_2Vtx_004F80";
 
     static Vtx* mirroredSunSongVtx;
 
@@ -254,23 +253,11 @@ void PatchMirroredSunSongEtching() {
                              G_TX_NOMIRROR | G_TX_CLAMP, 7, 5, G_TX_NOLOD, G_TX_NOLOD)
     };
 
-    const char* royalGraveBackRoomDL;
-    const char* royalGraveBackRoomSongVtx;
-
-    // If we have the original game, then always prefer the nonmq paths as that is what will be used in game
-    if (ResourceMgr_GameHasOriginal()) {
-        royalGraveBackRoomDL = gNonMqRoyalGraveBackRoomDL;
-        royalGraveBackRoomSongVtx = gNonMqRoyalGraveBackRoomSongVtx;
-    } else {
-        royalGraveBackRoomDL = gMqRoyalGraveBackRoomDL;
-        royalGraveBackRoomSongVtx = gMqRoyalGraveBackRoomSongVtx;
-    }
-
     if (CVarGetInteger("gMirroredWorld", 0)) {
         if (mirroredSunSongVtx == nullptr) {
             // Copy the original vertices that we want to modify (4 at the beginning of the resource)
             mirroredSunSongVtx = (Vtx*)malloc(sizeof(Vtx) * 4);
-            Vtx* origVtx = (Vtx*)ResourceGetDataByName(royalGraveBackRoomSongVtx);
+            Vtx* origVtx = (Vtx*)ResourceGetDataByName(gRoyalGraveBackRoomSongVtx);
             memcpy(mirroredSunSongVtx, origVtx, sizeof(Vtx) * 4);
 
             // Offset the vertex U coordinate values by the width of the texture
@@ -279,21 +266,21 @@ void PatchMirroredSunSongEtching() {
             }
         }
 
-        ResourceMgr_PatchGfxByName(royalGraveBackRoomDL, "RoyalGraveSunSongTexture_1", 13, mirroredSunSongTex[1]);
-        ResourceMgr_PatchGfxByName(royalGraveBackRoomDL, "RoyalGraveSunSongTexture_2", 17, mirroredSunSongTex[5]);
-        ResourceMgr_PatchGfxByName(royalGraveBackRoomDL, "RoyalGraveSunSongTextureCords_1", 24, gsSPVertex(mirroredSunSongVtx, 4, 0));
+        ResourceMgr_PatchGfxByName(gRoyalGraveBackRoomDL, "RoyalGraveSunSongTexture_1", 13, mirroredSunSongTex[1]);
+        ResourceMgr_PatchGfxByName(gRoyalGraveBackRoomDL, "RoyalGraveSunSongTexture_2", 17, mirroredSunSongTex[5]);
+        ResourceMgr_PatchGfxByName(gRoyalGraveBackRoomDL, "RoyalGraveSunSongTextureCords_1", 24, gsSPVertex(mirroredSunSongVtx, 4, 0));
         // noop as the original vertex command is 128 bit wide
-        ResourceMgr_PatchGfxByName(royalGraveBackRoomDL, "RoyalGraveSunSongTextureCords_2", 25, gsSPNoOp());
+        ResourceMgr_PatchGfxByName(gRoyalGraveBackRoomDL, "RoyalGraveSunSongTextureCords_2", 25, gsSPNoOp());
     } else {
         if (mirroredSunSongVtx != nullptr) {
             free(mirroredSunSongVtx);
             mirroredSunSongVtx = nullptr;
         }
 
-        ResourceMgr_UnpatchGfxByName(royalGraveBackRoomDL, "RoyalGraveSunSongTexture_1");
-        ResourceMgr_UnpatchGfxByName(royalGraveBackRoomDL, "RoyalGraveSunSongTexture_2");
-        ResourceMgr_UnpatchGfxByName(royalGraveBackRoomDL, "RoyalGraveSunSongTextureCords_1");
-        ResourceMgr_UnpatchGfxByName(royalGraveBackRoomDL, "RoyalGraveSunSongTextureCords_2");
+        ResourceMgr_UnpatchGfxByName(gRoyalGraveBackRoomDL, "RoyalGraveSunSongTexture_1");
+        ResourceMgr_UnpatchGfxByName(gRoyalGraveBackRoomDL, "RoyalGraveSunSongTexture_2");
+        ResourceMgr_UnpatchGfxByName(gRoyalGraveBackRoomDL, "RoyalGraveSunSongTextureCords_1");
+        ResourceMgr_UnpatchGfxByName(gRoyalGraveBackRoomDL, "RoyalGraveSunSongTextureCords_2");
     }
 }
 
diff --git a/soh/soh/mq_asset_hacks.h b/soh/soh/mq_asset_hacks.h
index dacf8a54e..4ffcecb5d 100644
--- a/soh/soh/mq_asset_hacks.h
+++ b/soh/soh/mq_asset_hacks.h
@@ -13,97 +13,6 @@ void* D_8012A2F8_MQ[] = {
     gYdanTex_00CA18_MQ,
 };
 
-#define dgGoronCityNightEntranceTex_MQ "__OTR__scenes/mq/spot18_scene/gGoronCityNightEntranceTex"
-static const ALIGN_ASSET(2) char gGoronCityNightEntranceTex_MQ[] = dgGoronCityNightEntranceTex_MQ;
-
-#define dgGoronCityDayEntranceTex_MQ "__OTR__scenes/mq/spot18_scene/gGoronCityDayEntranceTex"
-static const ALIGN_ASSET(2) char gGoronCityDayEntranceTex_MQ[] = dgGoronCityDayEntranceTex_MQ;
-void* sGoronCityEntranceTextures_MQ[] = {
-    gGoronCityDayEntranceTex_MQ,
-    gGoronCityNightEntranceTex_MQ,
-};
-
-#define dgLonLonRanchDayWindowTex_MQ "__OTR__scenes/mq/spot20_scene/gLonLonRanchDayWindowTex"
-static const ALIGN_ASSET(2) char gLonLonRanchDayWindowTex_MQ[] = dgLonLonRanchDayWindowTex_MQ;
-
-#define dgLonLonRangeNightWindowsTex_MQ "__OTR__scenes/mq/spot20_scene/gLonLonRangeNightWindowsTex"
-static const ALIGN_ASSET(2) char gLonLonRangeNightWindowsTex_MQ[] = dgLonLonRangeNightWindowsTex_MQ;
-void* sLonLonRanchWindowTextures_MQ[] = {
-    gLonLonRanchDayWindowTex_MQ,
-    gLonLonRangeNightWindowsTex_MQ,
-};
-
-// walls of GF room where they throw you when you get caught
-#define dgSpot12_009678Tex_MQ "__OTR__scenes/mq/spot12_scene/gSpot12_009678Tex"
-static const ALIGN_ASSET(2) char gSpot12_009678Tex_MQ[] = dgSpot12_009678Tex_MQ;
-
-#define dgSpot12_00DE78Tex_MQ "__OTR__scenes/mq/spot12_scene/gSpot12_00DE78Tex"
-static const ALIGN_ASSET(2) char gSpot12_00DE78Tex_MQ[] = dgSpot12_00DE78Tex_MQ;
-void* D_8012A380_MQ[] = {
-    gSpot12_009678Tex_MQ,
-    gSpot12_00DE78Tex_MQ,
-};
-
-#define dgZorasDomainDayEntranceTex_MQ "__OTR__scenes/mq/spot07_scene/gZorasDomainDayEntranceTex"
-static const ALIGN_ASSET(2) char gZorasDomainDayEntranceTex_MQ[] = dgZorasDomainDayEntranceTex_MQ;
-
-#define dgZorasDomainNightEntranceTex_MQ "__OTR__scenes/mq/spot07_scene/gZorasDomainNightEntranceTex"
-static const ALIGN_ASSET(2) char gZorasDomainNightEntranceTex_MQ[] = dgZorasDomainNightEntranceTex_MQ;
-void* sZorasDomainEntranceTextures_MQ[] = {
-    gZorasDomainDayEntranceTex_MQ,
-    gZorasDomainNightEntranceTex_MQ,
-};
-
-#define dgKakarikoVillageDayWindowTex_MQ "__OTR__scenes/mq/spot01_scene/gKakarikoVillageDayWindowTex"
-static const ALIGN_ASSET(2) char gKakarikoVillageDayWindowTex_MQ[] = dgKakarikoVillageDayWindowTex_MQ;
-
-#define dgKakarikoVillageNightWindowTex_MQ "__OTR__scenes/mq/spot01_scene/gKakarikoVillageNightWindowTex"
-static const ALIGN_ASSET(2) char gKakarikoVillageNightWindowTex_MQ[] = dgKakarikoVillageNightWindowTex_MQ;
-void* sKakarikoWindowTextures_MQ[] = {
-    gKakarikoVillageDayWindowTex_MQ,
-    gKakarikoVillageNightWindowTex_MQ,
-};
-
-#define dgGuardHouseOutSideView2NightTex_MQ "__OTR__scenes/mq/miharigoya_scene/gGuardHouseOutSideView2NightTex"
-static const ALIGN_ASSET(2) char gGuardHouseOutSideView2NightTex_MQ[] = dgGuardHouseOutSideView2NightTex_MQ;
-
-#define dgGuardHouseOutSideView2DayTex_MQ "__OTR__scenes/mq/miharigoya_scene/gGuardHouseOutSideView2DayTex"
-static const ALIGN_ASSET(2) char gGuardHouseOutSideView2DayTex_MQ[] = dgGuardHouseOutSideView2DayTex_MQ;
-
-#define dgGuardHouseOutSideView1NightTex_MQ "__OTR__scenes/mq/miharigoya_scene/gGuardHouseOutSideView1NightTex"
-static const ALIGN_ASSET(2) char gGuardHouseOutSideView1NightTex_MQ[] = dgGuardHouseOutSideView1NightTex_MQ;
-
-#define dgGuardHouseOutSideView1DayTex_MQ "__OTR__scenes/mq/miharigoya_scene/gGuardHouseOutSideView1DayTex"
-static const ALIGN_ASSET(2) char gGuardHouseOutSideView1DayTex_MQ[] = dgGuardHouseOutSideView1DayTex_MQ;
-void* sGuardHouseView2Textures_MQ[] = {
-    gGuardHouseOutSideView1DayTex_MQ,
-    gGuardHouseOutSideView1NightTex_MQ,
-};
-void* sGuardHouseView1Textures_MQ[] = {
-    gGuardHouseOutSideView2DayTex_MQ,
-    gGuardHouseOutSideView2NightTex_MQ,
-};
-
-#define dgLonLonHouseDayEntranceTex_MQ "__OTR__scenes/mq/souko_scene/gLonLonHouseDayEntranceTex"
-static const ALIGN_ASSET(2) char gLonLonHouseDayEntranceTex_MQ[] = dgLonLonHouseDayEntranceTex_MQ;
-
-#define dgLonLonHouseNightEntranceTex_MQ "__OTR__scenes/mq/souko_scene/gLonLonHouseNightEntranceTex"
-static const ALIGN_ASSET(2) char gLonLonHouseNightEntranceTex_MQ[] = dgLonLonHouseNightEntranceTex_MQ;
-void* sLonLonHouseEntranceTextures_MQ[] = {
-    gLonLonHouseDayEntranceTex_MQ,
-    gLonLonHouseNightEntranceTex_MQ,
-};
-
-#define dgThievesHideoutNightEntranceTex_MQ "__OTR__scenes/mq/gerudoway_scene/gThievesHideoutNightEntranceTex"
-static const ALIGN_ASSET(2) char gThievesHideoutNightEntranceTex_MQ[] = dgThievesHideoutNightEntranceTex_MQ;
-
-#define dgThievesHideoutDayEntranceTex_MQ "__OTR__scenes/mq/gerudoway_scene/gThievesHideoutDayEntranceTex"
-static const ALIGN_ASSET(2) char gThievesHideoutDayEntranceTex_MQ[] = dgThievesHideoutDayEntranceTex_MQ;
-void* sThievesHideoutEntranceTextures_MQ[] = {
-    gThievesHideoutDayEntranceTex_MQ,
-    gThievesHideoutNightEntranceTex_MQ,
-};
-
 #define dgDCDayEntranceTex_MQ "__OTR__scenes/mq/ddan_scene/gDCDayEntranceTex"
 static const ALIGN_ASSET(2) char gDCDayEntranceTex_MQ[] = dgDCDayEntranceTex_MQ;
 
diff --git a/soh/soh/z_play_otr.cpp b/soh/soh/z_play_otr.cpp
index 5e54da8ed..828380ea7 100644
--- a/soh/soh/z_play_otr.cpp
+++ b/soh/soh/z_play_otr.cpp
@@ -29,11 +29,13 @@ extern "C" void OTRPlay_SpawnScene(PlayState* play, s32 sceneNum, s32 spawn) {
 
     //osSyncPrintf("\nSCENE SIZE %fK\n", (scene->sceneFile.vromEnd - scene->sceneFile.vromStart) / 1024.0f);
 
-    std::string sceneVersion;
-    if (IsGameMasterQuest()) {
-        sceneVersion = "mq";
-    } else {
-        sceneVersion = "nonmq";
+    // Scenes considered "dungeon" with a MQ variant
+    int16_t inNonSharedScene = (sceneNum >= SCENE_DEKU_TREE && sceneNum <= SCENE_ICE_CAVERN) ||
+                               sceneNum == SCENE_GERUDO_TRAINING_GROUND || sceneNum == SCENE_INSIDE_GANONS_CASTLE;
+
+    std::string sceneVersion = "shared";
+    if (inNonSharedScene) {
+        sceneVersion = IsGameMasterQuest() ? "mq" : "nonmq";
     }
     std::string scenePath = StringHelper::Sprintf("scenes/%s/%s/%s", sceneVersion.c_str(), scene->sceneFile.fileName, scene->sceneFile.fileName);
 
diff --git a/soh/src/code/z_scene_table.c b/soh/src/code/z_scene_table.c
index d1065533c..52136e6a9 100644
--- a/soh/src/code/z_scene_table.c
+++ b/soh/src/code/z_scene_table.c
@@ -1212,11 +1212,7 @@ void func_8009AFE0(PlayState* play) {
 
     { s32 pad[2]; }
 
-    if (ResourceMgr_IsGameMasterQuest()) {
-        gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sThievesHideoutEntranceTextures_MQ[gSaveContext.nightFlag]));
-    } else {
-        gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sThievesHideoutEntranceTextures[gSaveContext.nightFlag]));
-    }
+    gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sThievesHideoutEntranceTextures[gSaveContext.nightFlag]));
 
     CLOSE_DISPS(play->state.gfxCtx);
 }
@@ -1673,11 +1669,7 @@ void func_8009D31C(PlayState* play) {
 
     { s32 pad[2]; }
 
-    if (ResourceMgr_IsGameMasterQuest()) {
-        gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sLonLonHouseEntranceTextures_MQ[gSaveContext.nightFlag]));
-    } else {
-        gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sLonLonHouseEntranceTextures[gSaveContext.nightFlag]));
-    }
+    gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sLonLonHouseEntranceTextures[gSaveContext.nightFlag]));
 
     gDPPipeSync(POLY_OPA_DISP++);
     gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128);
@@ -1709,13 +1701,8 @@ void func_8009D438(PlayState* play) {
         var = gSaveContext.nightFlag;
     }
 
-    if (ResourceMgr_IsGameMasterQuest()) {
-        gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sGuardHouseView1Textures_MQ[var]));
-        gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sGuardHouseView2Textures_MQ[var]));
-    } else {
-        gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sGuardHouseView1Textures[var]));
-        gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sGuardHouseView2Textures[var]));
-    }
+    gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sGuardHouseView1Textures[var]));
+    gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sGuardHouseView2Textures[var]));
 
     gDPPipeSync(POLY_OPA_DISP++);
     gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128);
@@ -1859,11 +1846,7 @@ void func_8009DD5C(PlayState* play) {
 
     { s32 pad[2]; }
 
-    if (ResourceMgr_IsGameMasterQuest()) {
-        gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sKakarikoWindowTextures_MQ[gSaveContext.nightFlag]));
-    } else {
-        gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sKakarikoWindowTextures[gSaveContext.nightFlag]));
-    }
+    gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sKakarikoWindowTextures[gSaveContext.nightFlag]));
 
     gDPPipeSync(POLY_OPA_DISP++);
     gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128);
@@ -1998,12 +1981,8 @@ void func_8009E730(PlayState* play) {
 
     gDPPipeSync(POLY_OPA_DISP++);
     gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128);
-    
-    if (ResourceMgr_IsGameMasterQuest()) {
-        gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sZorasDomainEntranceTextures_MQ[gSaveContext.nightFlag]));
-    } else {
-        gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sZorasDomainEntranceTextures[gSaveContext.nightFlag]));
-    }
+
+    gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sZorasDomainEntranceTextures[gSaveContext.nightFlag]));
 
     { s32 pad[2]; }
 
@@ -2136,11 +2115,7 @@ void func_8009F1B4(PlayState* play) {
 
     { s32 pad[2]; }
 
-    if (ResourceMgr_IsGameMasterQuest()) {
-        gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A380_MQ[gSaveContext.nightFlag]));
-    } else {
-        gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A380[gSaveContext.nightFlag]));
-    }
+    gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A380[gSaveContext.nightFlag]));
 
     CLOSE_DISPS(play->state.gfxCtx);
 }
@@ -2273,11 +2248,7 @@ void func_8009F9D0(PlayState* play) {
     gDPPipeSync(POLY_XLU_DISP++);
     gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
 
-    if (ResourceMgr_IsGameMasterQuest()) {
-        gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sGoronCityEntranceTextures_MQ[gSaveContext.nightFlag]));
-    } else {
-        gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sGoronCityEntranceTextures[gSaveContext.nightFlag]));
-    }
+    gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sGoronCityEntranceTextures[gSaveContext.nightFlag]));
 
     { s32 pad[2]; }
 
@@ -2295,11 +2266,7 @@ void func_8009FB74(PlayState* play) {
 
     { s32 pad[2]; }
 
-    if (ResourceMgr_IsGameMasterQuest()) {
-        gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sLonLonRanchWindowTextures_MQ[gSaveContext.nightFlag]));
-    } else {
-        gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sLonLonRanchWindowTextures[gSaveContext.nightFlag]));
-    }
+    gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sLonLonRanchWindowTextures[gSaveContext.nightFlag]));
 
     gDPPipeSync(POLY_OPA_DISP++);
     gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128);

From 959b307b9e53d6eddd3466f5bced4dd3440d92f6 Mon Sep 17 00:00:00 2001
From: Adam Bird <Archez@users.noreply.github.com>
Date: Mon, 6 Nov 2023 17:46:48 -0500
Subject: [PATCH 19/38] Fix: Repair working directory on Mac and use app
 directory for extractor search paths (#3359)

* fix otr regen on mac release

* linux args
---
 soh/macosx/soh-macos.sh.in    |  5 +++++
 soh/soh/Extractor/Extract.cpp | 10 ++++++----
 soh/soh/Extractor/Extract.h   |  3 ++-
 soh/soh/OTRGlobals.cpp        |  9 +++++----
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/soh/macosx/soh-macos.sh.in b/soh/macosx/soh-macos.sh.in
index 177e309f4..0983f63b1 100755
--- a/soh/macosx/soh-macos.sh.in
+++ b/soh/macosx/soh-macos.sh.in
@@ -219,12 +219,14 @@ if [ ! -e "$SHIP_HOME"/oot.otr ] || [ ! -e "$SHIP_HOME"/oot-mq.otr ]; then
 			*)
 				osascript -e 'display notification "One or more invalid ROM provided" with title "Ship Of Harkinian"'
 				rm -r "$ASSETDIR"
+				cd "$SNAME"
 				continue;
 		esac
 
 		# Only generate OTR if we don't have on of this type yet
 		if [ -e "$SHIP_HOME"/"$OTRNAME" ]; then
 			rm -r "$ASSETDIR"
+			cd "$SNAME"
 			continue;
 		fi
 
@@ -234,6 +236,7 @@ if [ ! -e "$SHIP_HOME"/oot.otr ] || [ ! -e "$SHIP_HOME"/oot-mq.otr ]; then
 			osascript -e 'display notification "OTR successfully generated" with title "Ship Of Harkinian"'
 			cp "$ASSETDIR"/oot.otr "$SHIP_HOME"/"$OTRNAME"
 			rm -r "$ASSETDIR"
+			cd "$SNAME"
 		fi
 	done
 
@@ -243,6 +246,8 @@ if [ ! -e "$SHIP_HOME"/oot.otr ] || [ ! -e "$SHIP_HOME"/oot-mq.otr ]; then
 	fi
 fi
 
+cd "$SNAME"
+
 arch_name="$(uname -m)"
 launch_arch="arm64"
 if [ "${arch_name}" = "x86_64" ] && [ "$(sysctl -in sysctl.proc_translated)" != "1" ]; then
diff --git a/soh/soh/Extractor/Extract.cpp b/soh/soh/Extractor/Extract.cpp
index 4769c48f6..d4b524474 100644
--- a/soh/soh/Extractor/Extract.cpp
+++ b/soh/soh/Extractor/Extract.cpp
@@ -225,7 +225,7 @@ void Extractor::GetRoms(std::vector<std::string>& roms) {
     //}
 #elif unix
     // Open the directory of the app.
-    DIR* d = opendir(".");
+    DIR* d = opendir(mSearchPath.c_str());
     struct dirent* dir;
 
     if (d != NULL) {
@@ -248,7 +248,7 @@ void Extractor::GetRoms(std::vector<std::string>& roms) {
     }
     closedir(d);
 #else
-    for (const auto& file : std::filesystem::directory_iterator("./")) {
+    for (const auto& file : std::filesystem::directory_iterator(mSearchPath)) {
         if (file.is_directory())
             continue;
         if ((file.path().extension() == ".n64") || (file.path().extension() == ".z64") ||
@@ -297,7 +297,7 @@ bool Extractor::GetRomPathFromBox() {
     }
     mCurrentRomPath = nameBuffer;
     #else
-    auto selection = pfd::open_file("Select a file", ".", { "N64 Roms", "*.z64 *.n64 *.v64" }).result();
+    auto selection = pfd::open_file("Select a file", mSearchPath, { "N64 Roms", "*.z64 *.n64 *.v64" }).result();
 
     if (selection.empty()) {
         return false;
@@ -430,10 +430,12 @@ bool Extractor::ManuallySearchForRomMatchingType(RomSearchMode searchMode) {
     return true;
 }
 
-bool Extractor::Run(RomSearchMode searchMode) {
+bool Extractor::Run(std::string searchPath, RomSearchMode searchMode) {
     std::vector<std::string> roms;
     std::ifstream inFile;
 
+    mSearchPath = searchPath;
+
     GetRoms(roms);
     FilterRoms(roms, searchMode);
 
diff --git a/soh/soh/Extractor/Extract.h b/soh/soh/Extractor/Extract.h
index 4ff7cb92f..ce4008fbe 100644
--- a/soh/soh/Extractor/Extract.h
+++ b/soh/soh/Extractor/Extract.h
@@ -28,6 +28,7 @@ enum class RomSearchMode {
 class Extractor {
     std::unique_ptr<unsigned char[]> mRomData = std::make_unique<unsigned char[]>(MB64);
     std::string mCurrentRomPath;
+    std::string mSearchPath;
     size_t mCurRomSize = 0;
 
     bool GetRomPathFromBox();
@@ -58,7 +59,7 @@ class Extractor {
     static void ShowErrorBox(const char* title, const char* text);
     bool IsMasterQuest() const;
 
-    bool Run(RomSearchMode searchMode = RomSearchMode::Both);
+    bool Run(std::string searchPath, RomSearchMode searchMode = RomSearchMode::Both);
     bool CallZapd(std::string installPath, std::string exportdir);
     const char* GetZapdStr();
     std::string Mkdtemp();
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index 7f0d8c5d6..1199a7e99 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -890,7 +890,7 @@ void DetectOTRVersion(std::string fileName, bool isMQ) {
             }
 
             Extractor extract;
-            if (!extract.Run(isMQ ? RomSearchMode::MQ : RomSearchMode::Vanilla)) {
+            if (!extract.Run(LUS::Context::GetAppDirectoryPath(appShortName), isMQ ? RomSearchMode::MQ : RomSearchMode::Vanilla)) {
                 Extractor::ShowErrorBox("Error", "An error occured, no OTR file was generated.\n\nExiting...");
                 exit(1);
             }
@@ -932,7 +932,8 @@ extern "C" void InitOTR() {
 #elif defined(__WIIU__)
     LUS::WiiU::Init(appShortName);
 #endif
-   #ifdef _WIN32
+
+#ifdef _WIN32
     char* tempVar = getenv("TEMP");
     std::filesystem::path tempPath;
     try {
@@ -985,7 +986,7 @@ extern "C" void InitOTR() {
         bool generatedOtrIsMQ = false;
         if (Extractor::ShowYesNoBox("No OTR Files", "No OTR files found. Generate one now?") == IDYES) {
             Extractor extract;
-            if (!extract.Run()) {
+            if (!extract.Run(LUS::Context::GetAppDirectoryPath(appShortName))) {
                 Extractor::ShowErrorBox("Error", "An error occured, no OTR file was generated.\n\nExiting...");
                 exit(1);
             }
@@ -996,7 +997,7 @@ extern "C" void InitOTR() {
         }
         if (Extractor::ShowYesNoBox("Extraction Complete", "ROM Extracted. Extract another?") == IDYES) {
             Extractor extract;
-            if (!extract.Run(generatedOtrIsMQ ? RomSearchMode::Vanilla : RomSearchMode::MQ)) {
+            if (!extract.Run(LUS::Context::GetAppDirectoryPath(appShortName), generatedOtrIsMQ ? RomSearchMode::Vanilla : RomSearchMode::MQ)) {
                 Extractor::ShowErrorBox("Error", "An error occured, an OTR file may have been generated by a different step.\n\nContinuing...");
             } else {
                 extract.CallZapd(installPath, LUS::Context::GetAppDirectoryPath(appShortName));

From 1d3e7d4be93ebf5fc5664b7085f5f7ffd4eb6330 Mon Sep 17 00:00:00 2001
From: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
Date: Mon, 6 Nov 2023 23:48:20 +0100
Subject: [PATCH 20/38] Add MS shuffle to the hell mode preset (#3360)

---
 soh/soh/Enhancements/presets.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/soh/soh/Enhancements/presets.h b/soh/soh/Enhancements/presets.h
index ed639bc1f..f0f586e00 100644
--- a/soh/soh/Enhancements/presets.h
+++ b/soh/soh/Enhancements/presets.h
@@ -1023,6 +1023,7 @@ const std::vector<PresetEntry> hellModePresetEntries = {
     PRESET_ENTRY_S32("gRandomizeShuffleGerudoToken", 1),
     PRESET_ENTRY_S32("gRandomizeShuffleKeyRings", RO_KEYRINGS_RANDOM),
     PRESET_ENTRY_S32("gRandomizeShuffleKokiriSword", 1),
+    PRESET_ENTRY_S32("gRandomizeShuffleMasterSword", 1),
     PRESET_ENTRY_S32("gRandomizeShuffleOcarinas", 1),
     PRESET_ENTRY_S32("gRandomizeShuffleScrubs", RO_SCRUBS_RANDOM),
     PRESET_ENTRY_S32("gRandomizeShuffleSongs", RO_SONG_SHUFFLE_ANYWHERE),

From b6a3ed93a2f2cc1256169e872cd247779b885e1b Mon Sep 17 00:00:00 2001
From: Adam Bird <Archez@users.noreply.github.com>
Date: Mon, 6 Nov 2023 20:05:18 -0500
Subject: [PATCH 21/38] bump lus (#3361)

---
 libultraship | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libultraship b/libultraship
index 317edd72c..c75ff3653 160000
--- a/libultraship
+++ b/libultraship
@@ -1 +1 @@
-Subproject commit 317edd72cc317387f8ac010a9ec772d4bfdfdbb6
+Subproject commit c75ff3653f699cb1a8c017b10e4b3986259d8cf0

From 30ab8e9ed75f222ee16289a624a1cab0fd393857 Mon Sep 17 00:00:00 2001
From: Adam Bird <Archez@users.noreply.github.com>
Date: Mon, 6 Nov 2023 20:55:50 -0500
Subject: [PATCH 22/38] version bump to MacReady Alfa (#3363)

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee27c1e02..0633ab80a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,8 +5,8 @@ set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use")
 
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
 
-project(Ship VERSION 7.1.1 LANGUAGES C CXX)
-set(PROJECT_BUILD_NAME "Sulu Bravo" CACHE STRING "")
+project(Ship VERSION 8.0.0 LANGUAGES C CXX)
+set(PROJECT_BUILD_NAME "MacReady Alfa" CACHE STRING "")
 set(PROJECT_TEAM "github.com/harbourmasters" CACHE STRING "")
 
 set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT soh)

From 78ffb41cd2d8fa3e68ee9fcb1fb496ddeede878e Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Mon, 13 Nov 2023 16:11:29 -0700
Subject: [PATCH 23/38] Moved the check for `!seqInfo.canBeUsedAsReplacement`
 in `InitializeShufflePool` to exclude them before modifying either shuffle
 pool. (#3370)

---
 soh/soh/Enhancements/audio/AudioCollection.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/soh/soh/Enhancements/audio/AudioCollection.cpp b/soh/soh/Enhancements/audio/AudioCollection.cpp
index a5499bd4f..9da742f91 100644
--- a/soh/soh/Enhancements/audio/AudioCollection.cpp
+++ b/soh/soh/Enhancements/audio/AudioCollection.cpp
@@ -400,8 +400,9 @@ void AudioCollection::InitializeShufflePool() {
     if (shufflePoolInitialized) return;
     
     for (auto& [seqId, seqInfo] : sequenceMap) {
+        if (!seqInfo.canBeUsedAsReplacement) continue;
         const std::string cvarKey = "gAudioEditor.Excluded." + seqInfo.sfxKey;
-        if (CVarGetInteger(cvarKey.c_str(), 0) && !seqInfo.canBeUsedAsReplacement) {
+        if (CVarGetInteger(cvarKey.c_str(), 0)) {
             excludedSequences.insert(&seqInfo);
         } else {
             includedSequences.insert(&seqInfo);

From dd6271ecae9868c99bdc79324c6143f082fbcc65 Mon Sep 17 00:00:00 2001
From: PurpleHato <linkvssangoku.jr@gmail.com>
Date: Tue, 14 Nov 2023 00:13:46 +0100
Subject: [PATCH 24/38] ADD: No HUD Heart animation (#3348)

* ADD: No HUD Heart Animation

I've seen this requested multiple times for modding purposes for the case of using "lifebars" instead of hearts

* TWEAK: Move it under the the mods

* REM: Whitespace

* REM: Whitespace2

* Tweak: Cvar Oppsie
---
 soh/soh/SohMenuBar.cpp     |  2 ++
 soh/src/code/z_lifemeter.c | 25 ++++++++++++++++++-------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp
index a5fc12299..c871a8d04 100644
--- a/soh/soh/SohMenuBar.cpp
+++ b/soh/soh/SohMenuBar.cpp
@@ -913,6 +913,8 @@ void DrawEnhancementsMenu() {
                 UIWidgets::Tooltip("Disables grottos rotating with the camera. To be used in conjunction with mods that want to replace grottos with 3D objects.");
                 UIWidgets::PaddedEnhancementCheckbox("Invisible Bunny Hood", "gHideBunnyHood", true, false);
                 UIWidgets::Tooltip("Turns Bunny Hood invisible while still maintaining its effects.");
+                UIWidgets::PaddedEnhancementCheckbox("Disable HUD Heart animations", "gNoHUDHeartAnimation", true, false);
+                UIWidgets::Tooltip("Disables the beating animation of the hearts on the HUD.");
 
                 ImGui::EndMenu();
             }
diff --git a/soh/src/code/z_lifemeter.c b/soh/src/code/z_lifemeter.c
index 8d5e41a20..69cba24b4 100644
--- a/soh/src/code/z_lifemeter.c
+++ b/soh/src/code/z_lifemeter.c
@@ -601,13 +601,24 @@ void HealthMeter_Draw(PlayState* play) {
 
             {
                 Mtx* matrix = Graph_Alloc(gfxCtx, sizeof(Mtx));
-                Matrix_SetTranslateScaleMtx2(matrix, 
-                HeartsScale+(HeartsScale/3) - ((HeartsScale/3) * sp144), 
-                HeartsScale+(HeartsScale/3) - ((HeartsScale/3) * sp144),
-                HeartsScale+(HeartsScale/3) - ((HeartsScale/3) * sp144), 
-                -130+offsetX, //Pos X
-                (-94+offsetY) *-1, //Pos Y
-                0.0f);
+                
+                if (CVarGetInteger("gNoHUDHeartAnimation", 0)) {
+                    Matrix_SetTranslateScaleMtx2(matrix,
+                        HeartsScale,          // Scale X
+                        HeartsScale,          // Scale Y
+                        HeartsScale,          // Scale Z
+                        -130 + offsetX,       // Pos X
+                        (-94 + offsetY) * -1, // Pos Y
+                        0.0f);
+                } else {
+                    Matrix_SetTranslateScaleMtx2(matrix, HeartsScale + (HeartsScale / 3) - ((HeartsScale / 3) * sp144),
+                        HeartsScale + (HeartsScale / 3) - ((HeartsScale / 3) * sp144),
+                        HeartsScale + (HeartsScale / 3) - ((HeartsScale / 3) * sp144),
+                        -130 + offsetX,       // Pos X
+                        (-94 + offsetY) * -1, // Pos Y
+                        0.0f);
+                }
+
                 gSPMatrix(OVERLAY_DISP++, matrix, G_MTX_MODELVIEW | G_MTX_LOAD);
                 gSPVertex(OVERLAY_DISP++, sp154, 4, 0);
                 gSP1Quadrangle(OVERLAY_DISP++, 0, 2, 3, 1, 0);

From cf88b3d2bf0b7e63506f823b0e1bac0d2743124b Mon Sep 17 00:00:00 2001
From: Ralphie Morell <rafael.morell@techfield.us>
Date: Mon, 13 Nov 2023 23:45:15 -0500
Subject: [PATCH 25/38] Fix edge case of MS shuffle (#3364)

---
 soh/src/code/z_parameter.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c
index ec25d2062..bbaa8d90b 100644
--- a/soh/src/code/z_parameter.c
+++ b/soh/src/code/z_parameter.c
@@ -1469,6 +1469,7 @@ void Inventory_SwapAgeEquipment(void) {
                 gSaveContext.equips.buttonItems[0] = ITEM_SWORD_MASTER;
             } else {
                 gSaveContext.equips.buttonItems[0] = ITEM_NONE;
+                Flags_SetInfTable(INFTABLE_SWORDLESS);
             }
 
             if (gSaveContext.inventory.items[SLOT_NUT] != ITEM_NONE) {

From 60687aff0d862e473a1c610a40da46260045dca4 Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Mon, 13 Nov 2023 21:45:41 -0700
Subject: [PATCH 26/38] Move everything in `RandomizerCheckTracker::LoadFile()`
 except the block to load the "trackerData" section to a new `OnLoadGame` hook
 function to fix crashes on transferred saves. (#3368)

---
 .../randomizer/randomizer_check_tracker.cpp   | 112 +++++++++---------
 1 file changed, 58 insertions(+), 54 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
index 5f7790dd0..6123c1a27 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
@@ -452,6 +452,63 @@ bool HasItemBeenCollected(RandomizerCheck rc) {
     return false;
 }
 
+void CheckTrackerLoadGame(int32_t fileNum) {
+    LoadSettings();
+    TrySetAreas();
+    for (auto [rc, rcObj] : RandomizerCheckObjects::GetAllRCObjects()) {
+        RandomizerCheckTrackerData rcTrackerData = gSaveContext.checkTrackerData[rc];
+        if (rc == RC_UNKNOWN_CHECK || rc == RC_MAX || rc == RC_LINKS_POCKET ||
+            !RandomizerCheckObjects::GetAllRCObjects().contains(rc))
+            continue;
+
+        RandomizerCheckObject realRcObj;
+        if (rc == RC_GIFT_FROM_SAGES && !IS_RANDO) {
+            realRcObj = RCO_RAORU;
+        } else {
+            realRcObj = rcObj;
+        }
+        if (!IsVisibleInCheckTracker(realRcObj)) continue;
+
+        checksByArea.find(realRcObj.rcArea)->second.push_back(realRcObj);
+        if (rcTrackerData.status == RCSHOW_SAVED || rcTrackerData.skipped) {
+            areaChecksGotten[realRcObj.rcArea]++;
+        }
+
+        if (areaChecksGotten[realRcObj.rcArea] != 0 || RandomizerCheckObjects::AreaIsOverworld(realRcObj.rcArea)) {
+            areasSpoiled |= (1 << realRcObj.rcArea);
+        }
+    }
+    if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_LINKS_POCKET) != RO_LINKS_POCKET_NOTHING && IS_RANDO) {
+        s8 startingAge = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_STARTING_AGE);
+        RandomizerCheckArea startingArea;
+        switch (startingAge) {
+            case RO_AGE_CHILD:
+                startingArea = RCAREA_KOKIRI_FOREST;
+                break;
+            case RO_AGE_ADULT:
+                startingArea = RCAREA_MARKET;
+                break;
+            default:
+                startingArea = RCAREA_KOKIRI_FOREST;
+                break;
+        }
+        RandomizerCheckObject linksPocket = { RC_LINKS_POCKET, RCVORMQ_BOTH, RCTYPE_LINKS_POCKET, startingArea, ACTOR_ID_MAX, SCENE_ID_MAX, 0x00, GI_NONE, false, "Link's Pocket", "Link's Pocket" };
+        
+        checksByArea.find(startingArea)->second.push_back(linksPocket);
+        areaChecksGotten[startingArea]++;
+    }
+
+    showVOrMQ = (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_RANDOM_MQ_DUNGEONS) == RO_MQ_DUNGEONS_RANDOM_NUMBER ||
+                (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_RANDOM_MQ_DUNGEONS) == RO_MQ_DUNGEONS_SET_NUMBER &&
+                OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_COUNT) < 12));
+    LinksPocket();
+    SongFromImpa();
+    GiftFromSages();
+    initialized = true;
+    UpdateAllOrdering();
+    UpdateInventoryChecks();
+}
+
 void CheckTrackerDialogClosed() {
     if (messageCloseCheck) {
         messageCloseCheck = false;
@@ -679,9 +736,6 @@ void SaveFile(SaveContext* saveContext, int sectionID, bool fullSave) {
 }
 
 void LoadFile() {
-    Teardown();
-    LoadSettings();
-    TrySetAreas();
     SaveManager::Instance->LoadArray("checks", RC_MAX, [](size_t i) {
         SaveManager::Instance->LoadStruct("", [&]() {
             SaveManager::Instance->LoadData("status", gSaveContext.checkTrackerData[i].status);
@@ -689,58 +743,7 @@ void LoadFile() {
             SaveManager::Instance->LoadData("price", gSaveContext.checkTrackerData[i].price);
             SaveManager::Instance->LoadData("hintItem", gSaveContext.checkTrackerData[i].hintItem);
         });
-        RandomizerCheckTrackerData entry = gSaveContext.checkTrackerData[i];
-        RandomizerCheck rc = static_cast<RandomizerCheck>(i);
-        if (rc == RC_UNKNOWN_CHECK || rc == RC_MAX ||
-            !RandomizerCheckObjects::GetAllRCObjects().contains(rc))
-            return;
-
-        RandomizerCheckObject entry2;
-        if (rc == RC_GIFT_FROM_SAGES && !IS_RANDO) {
-            entry2 = RCO_RAORU;
-        } else {
-            entry2 = RandomizerCheckObjects::GetAllRCObjects().find(rc)->second;
-        }
-        if (!IsVisibleInCheckTracker(entry2)) return;
-
-        checksByArea.find(entry2.rcArea)->second.push_back(entry2);
-        if (entry.status == RCSHOW_SAVED || entry.skipped) {
-            areaChecksGotten[entry2.rcArea]++;
-        }
-
-        if (areaChecksGotten[entry2.rcArea] != 0 || RandomizerCheckObjects::AreaIsOverworld(entry2.rcArea)) {
-            areasSpoiled |= (1 << entry2.rcArea);
-        }
     });
-    if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_LINKS_POCKET) != RO_LINKS_POCKET_NOTHING && IS_RANDO) {
-        s8 startingAge = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_STARTING_AGE);
-        RandomizerCheckArea startingArea;
-        switch (startingAge) {
-            case RO_AGE_CHILD:
-                startingArea = RCAREA_KOKIRI_FOREST;
-                break;
-            case RO_AGE_ADULT:
-                startingArea = RCAREA_MARKET;
-                break;
-            default:
-                startingArea = RCAREA_KOKIRI_FOREST;
-                break;
-        }
-        RandomizerCheckObject linksPocket = { RC_LINKS_POCKET, RCVORMQ_BOTH, RCTYPE_LINKS_POCKET, startingArea, ACTOR_ID_MAX, SCENE_ID_MAX, 0x00, GI_NONE, false, "Link's Pocket", "Link's Pocket" };
-        
-        checksByArea.find(startingArea)->second.push_back(linksPocket);
-        areaChecksGotten[startingArea]++;
-    }
-
-    showVOrMQ = (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_RANDOM_MQ_DUNGEONS) == RO_MQ_DUNGEONS_RANDOM_NUMBER ||
-                (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_RANDOM_MQ_DUNGEONS) == RO_MQ_DUNGEONS_SET_NUMBER &&
-                OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_COUNT) < 12));
-    LinksPocket();
-    SongFromImpa();
-    GiftFromSages();
-    initialized = true;
-    UpdateAllOrdering();
-    UpdateInventoryChecks();
 }
 
 void Teardown() {
@@ -1533,6 +1536,7 @@ void CheckTrackerWindow::InitElement() {
     SaveManager::Instance->AddInitFunction(InitTrackerData);
     sectionId = SaveManager::Instance->AddSaveFunction("trackerData", 1, SaveFile, true, -1);
     SaveManager::Instance->AddLoadFunction("trackerData", 1, LoadFile);
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnLoadGame>(CheckTrackerLoadGame);
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnExitGame>([](uint32_t fileNum) {
         Teardown();
     });

From 384403edb5cd7dd5e2d37e86ff048845b315be05 Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Mon, 13 Nov 2023 21:45:52 -0700
Subject: [PATCH 27/38] Rename all instances of Desert Wasteland to Haunted
 Wasteland. (#3372)

---
 soh/soh/ActorDB.cpp                                          | 2 +-
 soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp | 2 +-
 soh/soh/Enhancements/randomizer/randomizer_tricks.cpp        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/soh/soh/ActorDB.cpp b/soh/soh/ActorDB.cpp
index 2cf4d8fe7..a66048b32 100644
--- a/soh/soh/ActorDB.cpp
+++ b/soh/soh/ActorDB.cpp
@@ -439,7 +439,7 @@ static std::unordered_map<u16, const char*> actorDescriptions = {
     { ACTOR_EN_DAIKU_KAKARIKO, "Carpenters (Kakariko)" },
     { ACTOR_BG_BOWL_WALL, "Bombchu Bowling Alley Wall" },
     { ACTOR_EN_WALL_TUBO, "Bombchu Bowling Alley Bullseyes" },
-    { ACTOR_EN_PO_DESERT, "Poe Guide (Desert Wasteland)" },
+    { ACTOR_EN_PO_DESERT, "Poe Guide (Haunted Wasteland)" },
     { ACTOR_EN_CROW, "Guay" },
     { ACTOR_DOOR_KILLER, "Fake Door" },
     { ACTOR_BG_SPOT11_OASIS, "Oasis (Desert Colossus)" },
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
index 9a3669582..d7f99edfb 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
@@ -783,7 +783,7 @@ std::map<RandomizerCheckArea, std::string> rcAreaNames = {
     { RCAREA_LAKE_HYLIA, "Lake Hylia"},
     { RCAREA_GERUDO_VALLEY, "Gerudo Valley"},
     { RCAREA_GERUDO_FORTRESS, "Gerudo Fortress"},
-    { RCAREA_WASTELAND, "Desert Wasteland"},
+    { RCAREA_WASTELAND, "Haunted Wasteland"},
     { RCAREA_DESERT_COLOSSUS, "Desert Colossus"},
     { RCAREA_MARKET, "Hyrule Market"},
     { RCAREA_HYRULE_CASTLE, "Hyrule Castle"},
diff --git a/soh/soh/Enhancements/randomizer/randomizer_tricks.cpp b/soh/soh/Enhancements/randomizer/randomizer_tricks.cpp
index 398077f6e..8a397f840 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_tricks.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_tricks.cpp
@@ -219,7 +219,7 @@ std::unordered_map<RandomizerTrickArea, std::string> rtAreaNames = {
     { RTAREA_LAKE_HYLIA, "Lake Hylia"},
     { RTAREA_GERUDO_VALLEY, "Gerudo Valley"},
     { RTAREA_GERUDO_FORTRESS, "Gerudo Fortress"},
-    { RTAREA_WASTELAND, "Desert Wasteland"},   
+    { RTAREA_WASTELAND, "Haunted Wasteland"},   
     { RTAREA_DESERT_COLOSSUS, "Desert Colossus"},
     { RTAREA_MARKET, "Hyrule Market"},
     { RTAREA_HYRULE_CASTLE, "Hyrule Castle"},

From fe9c0fa4f722e01a099addb13268a4dedb2d71c7 Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Date: Mon, 13 Nov 2023 21:10:56 -0800
Subject: [PATCH 28/38] bump lus (#3394)

---
 libultraship | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libultraship b/libultraship
index c75ff3653..9509806ae 160000
--- a/libultraship
+++ b/libultraship
@@ -1 +1 @@
-Subproject commit c75ff3653f699cb1a8c017b10e4b3986259d8cf0
+Subproject commit 9509806ae3ca6e35882fb976de70c5bde471b8f5

From 304016ddd2ac45e5101e03faa66f0a88f431d213 Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Mon, 13 Nov 2023 22:12:08 -0700
Subject: [PATCH 29/38] [Feature Fix] Tunics stolen by like likes now removed
 from the item buttons (#3375)

* Extends `Assignable Boots and Tunics` functionality to check for and remove Goron and Zora tunics from item buttons when like likes steal them.

* Comment documentation.
---
 soh/src/code/code_80097A00.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/soh/src/code/code_80097A00.c b/soh/src/code/code_80097A00.c
index 9e20d66aa..eb83738e3 100644
--- a/soh/src/code/code_80097A00.c
+++ b/soh/src/code/code_80097A00.c
@@ -204,6 +204,17 @@ u8 Inventory_DeleteEquipment(PlayState* play, s16 equipment) {
 
         if (equipment == EQUIP_TYPE_TUNIC) {
             gSaveContext.equips.equipment |= EQUIP_VALUE_TUNIC_KOKIRI << (EQUIP_TYPE_TUNIC * 4);
+            // non-vanilla: remove goron and zora tunics from item buttons if assignable tunics is on
+            if (CVarGetInteger("gAssignableTunicsAndBoots", 0) && equipValue != EQUIP_VALUE_TUNIC_KOKIRI) {
+                ItemID item = (equipValue == EQUIP_VALUE_TUNIC_GORON ? ITEM_TUNIC_GORON : ITEM_TUNIC_ZORA);
+                for (int i = 1; i < ARRAY_COUNT(gSaveContext.equips.buttonItems); i++) {
+                    if (gSaveContext.equips.buttonItems[i] == item) {
+                        gSaveContext.equips.buttonItems[i] = ITEM_NONE;
+                        gSaveContext.equips.cButtonSlots[i - 1] = SLOT_NONE;
+                    }
+                }
+            }
+            // end non-vanilla
         }
 
         if (equipment == EQUIP_TYPE_SWORD) {

From 4e9040d761dfcda2b0788364f76cef2ae8fe70ba Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@live.com>
Date: Tue, 14 Nov 2023 14:35:19 -0700
Subject: [PATCH 30/38] [Feature] Remove `performDelayedSave` functionality
 from Autosave (#3387)

* Removes delayed save functionality, making autosave work everywhere except Ganon and Chamber of Sages scenes.

* Change AutoSave comment to remove the scenarios we no longer block autosave in.

* handle temp B on saving outside of kaleido

---------

Co-authored-by: Adam Bird <archez39@me.com>
---
 soh/soh/Enhancements/mods.cpp | 26 +++-----------------------
 soh/src/code/z_play.c         | 20 ++++++++++++++++++++
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index 6d66ff055..0bbeff8ca 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -35,8 +35,6 @@ extern PlayState* gPlayState;
 extern void Overlay_DisplayText(float duration, const char* text);
 uint32_t ResourceMgr_IsSceneMasterQuest(s16 sceneNum);
 }
-bool performDelayedSave = false;
-bool performSave = false;
 
 // TODO: When there's more uses of something like this, create a new GI::RawAction?
 void ReloadSceneTogglingLinkAge() {
@@ -258,14 +256,12 @@ void RegisterOcarinaTimeTravel() {
 
 void AutoSave(GetItemEntry itemEntry) {
     u8 item = itemEntry.itemId;
+    bool performSave = false;
     // Don't autosave immediately after buying items from shops to prevent getting them for free!
     // Don't autosave in the Chamber of Sages since resuming from that map breaks the game
     // Don't autosave during the Ganon fight when picking up the Master Sword
-    // Don't autosave in the fishing pond to prevent getting rod on B outside of the pond
-    // Don't autosave in the bombchu bowling alley to prevent having chus on B outside of the minigame
-    // Don't autosave in grottos since resuming from grottos breaks the game.
     if ((CVarGetInteger("gAutosave", AUTOSAVE_OFF) != AUTOSAVE_OFF) && (gPlayState != NULL) && (gSaveContext.pendingSale == ITEM_NONE) &&
-        (gPlayState->gameplayFrames > 60 && gSaveContext.cutsceneIndex < 0xFFF0) && (gPlayState->sceneNum != SCENE_GANON_BOSS)) {
+        (gPlayState->gameplayFrames > 60 && gSaveContext.cutsceneIndex < 0xFFF0) && (gPlayState->sceneNum != SCENE_GANON_BOSS) && (gPlayState->sceneNum != SCENE_CHAMBER_OF_THE_SAGES)) {
         if (((CVarGetInteger("gAutosave", AUTOSAVE_OFF) == AUTOSAVE_LOCATION_AND_ALL_ITEMS) || (CVarGetInteger("gAutosave", AUTOSAVE_OFF) == AUTOSAVE_ALL_ITEMS)) && (item != ITEM_NONE)) {
             // Autosave for all items
             performSave = true;
@@ -326,25 +322,9 @@ void AutoSave(GetItemEntry itemEntry) {
                    CVarGetInteger("gAutosave", AUTOSAVE_OFF) == AUTOSAVE_LOCATION) {
             performSave = true;
         }
-        if (gPlayState->sceneNum == SCENE_FAIRYS_FOUNTAIN || gPlayState->sceneNum == SCENE_GROTTOS ||
-            gPlayState->sceneNum == SCENE_CHAMBER_OF_THE_SAGES || gPlayState->sceneNum == SCENE_FISHING_POND ||
-            gPlayState->sceneNum == SCENE_BOMBCHU_BOWLING_ALLEY) {
-            if (CVarGetInteger("gAutosave", AUTOSAVE_OFF) == AUTOSAVE_LOCATION_AND_MAJOR_ITEMS ||
-                CVarGetInteger("gAutosave", AUTOSAVE_OFF) == AUTOSAVE_LOCATION_AND_ALL_ITEMS ||
-                CVarGetInteger("gAutosave", AUTOSAVE_OFF) == AUTOSAVE_LOCATION) {
-                performSave = false;
-                return;
-            }
-            if (performSave) {
-                performSave = false;
-                performDelayedSave = true;
-            }
-            return;
-        }
-        if (performSave || performDelayedSave) {
+        if (performSave) {
             Play_PerformSave(gPlayState);
             performSave = false;
-            performDelayedSave = false;
         }
     }
 }
diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c
index bf7016884..841de8f13 100644
--- a/soh/src/code/z_play.c
+++ b/soh/src/code/z_play.c
@@ -2329,8 +2329,28 @@ void Play_PerformSave(PlayState* play) {
     if (play != NULL && gSaveContext.fileNum != 0xFF) {
         Play_SaveSceneFlags(play);
         gSaveContext.savedSceneNum = play->sceneNum;
+
+        // Track values from temp B
+        uint8_t prevB = gSaveContext.equips.buttonItems[0];
+        uint8_t prevStatus = gSaveContext.buttonStatus[0];
+
+        // Replicate the B button restore from minigames/epona that kaleido does
+        if (gSaveContext.equips.buttonItems[0] == ITEM_SLINGSHOT ||
+            gSaveContext.equips.buttonItems[0] == ITEM_BOW ||
+            gSaveContext.equips.buttonItems[0] == ITEM_BOMBCHU ||
+            gSaveContext.equips.buttonItems[0] == ITEM_FISHING_POLE ||
+            (gSaveContext.equips.buttonItems[0] == ITEM_NONE && !Flags_GetInfTable(INFTABLE_SWORDLESS))) {
+
+            gSaveContext.equips.buttonItems[0] = gSaveContext.buttonStatus[0];
+            Interface_RandoRestoreSwordless();
+        }
+
         Save_SaveFile();
 
+        // Restore temp B values back
+        gSaveContext.equips.buttonItems[0] = prevB;
+        gSaveContext.buttonStatus[0] = prevStatus;
+
         uint8_t triforceHuntCompleted =
             IS_RANDO &&
             gSaveContext.triforcePiecesCollected == Randomizer_GetSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED) &&

From bf31f2b330b53a212437cdcda9d6e0e147cc8c63 Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Tue, 14 Nov 2023 15:36:05 -0600
Subject: [PATCH 31/38] Stop hardcoding skeleton type to flex (#3397)

---
 soh/soh/resource/importer/SkeletonFactory.cpp | 54 ++++++++++---------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/soh/soh/resource/importer/SkeletonFactory.cpp b/soh/soh/resource/importer/SkeletonFactory.cpp
index 559da0cea..2ce651dee 100644
--- a/soh/soh/resource/importer/SkeletonFactory.cpp
+++ b/soh/soh/resource/importer/SkeletonFactory.cpp
@@ -103,38 +103,42 @@ void SkeletonFactoryV0::ParseFileXML(tinyxml2::XMLElement* reader, std::shared_p
 {
     std::shared_ptr<Skeleton> skel = std::static_pointer_cast<Skeleton>(resource);
 
-    std::string skeletonType = reader->Attribute("Type");
-    // std::string skeletonLimbType = reader->Attribute("LimbType");
-    int numLimbs = reader->IntAttribute("LimbCount");
-    int numDLs = reader->IntAttribute("DisplayListCount");
+    skel->type = SkeletonType::Flex; // Default to Flex for legacy reasons
+    if (reader->FindAttribute("Type")) {
+        std::string skeletonType = reader->Attribute("Type");
 
-    if (skeletonType == "Flex") {
-        skel->type = SkeletonType::Flex;
-    } else if (skeletonType == "Curve") {
-        skel->type = SkeletonType::Curve;
-    } else if (skeletonType == "Normal") {
-        skel->type = SkeletonType::Normal;
+        if (skeletonType == "Flex") {
+            skel->type = SkeletonType::Flex;
+        } else if (skeletonType == "Curve") {
+            skel->type = SkeletonType::Curve;
+        } else if (skeletonType == "Normal") {
+            skel->type = SkeletonType::Normal;
+        }
     }
 
-    skel->type = SkeletonType::Flex;
-    skel->limbType = LimbType::LOD;
+    skel->limbType = LimbType::LOD; // Default to LOD for legacy reasons
+    if (reader->FindAttribute("LimbType")) {
+        std::string skeletonLimbType = reader->Attribute("LimbType");
 
-    // if (skeletonLimbType == "Standard")
-    // skel->limbType = LimbType::Standard;
-    // else if (skeletonLimbType == "LOD")
-    // skel->limbType = LimbType::LOD;
-    // else if (skeletonLimbType == "Curve")
-    // skel->limbType = LimbType::Curve;
-    // else if (skeletonLimbType == "Skin")
-    // skel->limbType = LimbType::Skin;
-    // else if (skeletonLimbType == "Legacy")
-    // Sskel->limbType = LimbType::Legacy;
+        if (skeletonLimbType == "Standard") {
+            skel->limbType = LimbType::Standard;
+        } else if (skeletonLimbType == "LOD") {
+            skel->limbType = LimbType::LOD;
+        } else if (skeletonLimbType == "Curve") {
+            skel->limbType = LimbType::Curve;
+        } else if (skeletonLimbType == "Skin") {
+            skel->limbType = LimbType::Skin;
+        } else if (skeletonLimbType == "Legacy") {
+            skel->limbType = LimbType::Legacy;
+        }
+    }
+
+
+    skel->limbCount = reader->IntAttribute("LimbCount");
+    skel->dListCount = reader->IntAttribute("DisplayListCount");
 
     auto child = reader->FirstChildElement();
 
-    skel->limbCount = numLimbs;
-    skel->dListCount = numDLs;
-
     while (child != nullptr) {
         std::string childName = child->Name();
 

From e66eb8756d572c49101eba4c016848e93967bfdb Mon Sep 17 00:00:00 2001
From: Adam Bird <Archez@users.noreply.github.com>
Date: Tue, 14 Nov 2023 16:37:03 -0500
Subject: [PATCH 32/38] Fix: Prevent patching custom models (#3367)

* fix prevent patching custom models

* prevent patching chests textures for custom chest models

* add tooltip for cosmetic editor about custom models

* chest texture handling for alt toggles
---
 .../Enhancements/cosmetics/CosmeticsEditor.cpp   |  4 ++++
 soh/soh/OTRGlobals.cpp                           | 15 +++++++++++++++
 soh/soh/OTRGlobals.h                             |  1 +
 soh/soh/SohMenuBar.cpp                           |  2 ++
 soh/src/overlays/actors/ovl_En_Box/z_en_box.c    | 16 ++++++++++++++--
 5 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp b/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp
index 8c2707453..9c56ac32b 100644
--- a/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp
+++ b/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp
@@ -1767,6 +1767,10 @@ void CosmeticsEditorWindow::DrawElement() {
     ImGui::SameLine();
     UIWidgets::EnhancementCombobox("gCosmetics.DefaultColorScheme", colorSchemes, COLORSCHEME_N64);
     UIWidgets::EnhancementCheckbox("Advanced Mode", "gCosmetics.AdvancedMode");
+    UIWidgets::InsertHelpHoverText(
+        "Some cosmetic options may not apply if you have any mods that provide custom models for the cosmetic option.\n\n"
+        "For example, if you have custom Link model, then the Link's Hair color option will most likely not apply."
+    );
     if (CVarGetInteger("gCosmetics.AdvancedMode", 0)) {
         if (ImGui::Button("Lock All Advanced", ImVec2(ImGui::GetContentRegionAvail().x / 2, 30.0f))) {
             for (auto& [id, cosmeticOption] : cosmeticOptions) {
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index 1199a7e99..ad57d1ca5 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -1569,6 +1569,11 @@ extern "C" Gfx* ResourceMgr_LoadGfxByName(const char* path)
     return (Gfx*)&res->Instructions[0];
 }
 
+extern "C" uint8_t ResourceMgr_FileIsCustomByName(const char* path) {
+    auto res = std::static_pointer_cast<LUS::DisplayList>(GetResourceByNameHandlingMQ(path));
+    return res->GetInitData()->IsCustom;
+}
+
 typedef struct {
     int index;
     Gfx instruction;
@@ -1600,6 +1605,11 @@ extern "C" void ResourceMgr_PatchGfxByName(const char* path, const char* patchNa
     // index /= 2;
     // }
 
+    // Do not patch custom assets as they most likely do not have the same instructions as authentic assets
+    if (res->GetInitData()->IsCustom) {
+        return;
+    }
+
     Gfx* gfx = (Gfx*)&res->Instructions[index];
 
     if (!originalGfx.contains(path) || !originalGfx[path].contains(patchName)) {
@@ -1616,6 +1626,11 @@ extern "C" void ResourceMgr_PatchGfxCopyCommandByName(const char* path, const ch
     auto res = std::static_pointer_cast<LUS::DisplayList>(
         LUS::Context::GetInstance()->GetResourceManager()->LoadResource(path));
 
+    // Do not patch custom assets as they most likely do not have the same instructions as authentic assets
+    if (res->GetInitData()->IsCustom) {
+        return;
+    }
+
     Gfx* destinationGfx = (Gfx*)&res->Instructions[destinationIndex];
     Gfx sourceGfx = res->Instructions[sourceIndex];
 
diff --git a/soh/soh/OTRGlobals.h b/soh/soh/OTRGlobals.h
index 82659dbc4..e00cfecd5 100644
--- a/soh/soh/OTRGlobals.h
+++ b/soh/soh/OTRGlobals.h
@@ -101,6 +101,7 @@ AnimationHeaderCommon* ResourceMgr_LoadAnimByName(const char* path);
 char* ResourceMgr_GetNameByCRC(uint64_t crc, char* alloc);
 Gfx* ResourceMgr_LoadGfxByCRC(uint64_t crc);
 Gfx* ResourceMgr_LoadGfxByName(const char* path);
+uint8_t ResourceMgr_FileIsCustomByName(const char* path);
 void ResourceMgr_PatchGfxByName(const char* path, const char* patchName, int index, Gfx instruction);
 void ResourceMgr_UnpatchGfxByName(const char* path, const char* patchName);
 char* ResourceMgr_LoadArrayByNameAsVec3s(const char* path);
diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp
index a5fc12299..a71d2b8e3 100644
--- a/soh/soh/SohMenuBar.cpp
+++ b/soh/soh/SohMenuBar.cpp
@@ -532,6 +532,8 @@ void DrawEnhancementsMenu() {
                     " - Small keys: Small silver chest\n"
                     " - Boss keys: Vanilla size and texture\n"
                     " - Skulltula Tokens: Small skulltula chest\n"
+                    "\n"
+                    "NOTE: Textures will not apply if you are using a mod pack with a custom chest model."
                 );
                 if (CVarGetInteger("gChestSizeAndTextureMatchesContents", CSMC_DISABLED) != CSMC_DISABLED) {
                     UIWidgets::PaddedEnhancementCheckbox("Chests of Agony", "gChestSizeDependsStoneOfAgony", true, false);
diff --git a/soh/src/overlays/actors/ovl_En_Box/z_en_box.c b/soh/src/overlays/actors/ovl_En_Box/z_en_box.c
index 1e2c4d6cd..9e8705c33 100644
--- a/soh/src/overlays/actors/ovl_En_Box/z_en_box.c
+++ b/soh/src/overlays/actors/ovl_En_Box/z_en_box.c
@@ -88,6 +88,7 @@ Gfx gKeyTreasureChestChestFrontDL[128] = {0};
 Gfx gChristmasRedTreasureChestChestFrontDL[128] = {0};
 Gfx gChristmasGreenTreasureChestChestFrontDL[128] = {0};
 u8 hasCreatedRandoChestTextures = 0;
+u8 hasCustomChestDLs = 0;
 u8 hasChristmasChestTexturesAvailable = 0;
 
 void EnBox_SetupAction(EnBox* this, EnBoxActionFunc actionFunc) {
@@ -690,7 +691,7 @@ void EnBox_UpdateSizeAndTexture(EnBox* this, PlayState* play) {
     }
 
     // Change texture
-    if (!isVanilla && (csmc == CSMC_BOTH || csmc == CSMC_TEXTURE)) {
+    if (!isVanilla && hasCreatedRandoChestTextures && !hasCustomChestDLs && (csmc == CSMC_BOTH || csmc == CSMC_TEXTURE)) {
         switch (getItemCategory) {
             case ITEM_CATEGORY_MAJOR:
                 this->boxBodyDL = gGoldTreasureChestChestFrontDL;
@@ -725,7 +726,7 @@ void EnBox_UpdateSizeAndTexture(EnBox* this, PlayState* play) {
         }
     }
 
-    if (CVarGetInteger("gLetItSnow", 0) && hasChristmasChestTexturesAvailable) {
+    if (CVarGetInteger("gLetItSnow", 0) && hasChristmasChestTexturesAvailable && hasCreatedRandoChestTextures && !hasCustomChestDLs) {
         if (this->dyna.actor.scale.x == 0.01f) {
             this->boxBodyDL = gChristmasRedTreasureChestChestFrontDL;
             this->boxLidDL = gChristmasRedTreasureChestChestSideAndLidDL;
@@ -767,7 +768,18 @@ void EnBox_UpdateSizeAndTexture(EnBox* this, PlayState* play) {
 }
 
 void EnBox_CreateExtraChestTextures() {
+    // Don't patch textures for custom chest models, as they do not import textures the exact same way as vanilla chests
+    // OTRTODO: Make it so model packs can provide a unique DL per chest type, instead of us copying the brown chest and attempting to patch
+    if (ResourceMgr_FileIsCustomByName(gTreasureChestChestFrontDL) ||
+        ResourceMgr_FileIsCustomByName(gTreasureChestChestSideAndLidDL)) {
+        hasCustomChestDLs = 1;
+        return;
+    }
+
+    hasCustomChestDLs = 0;
+
     if (hasCreatedRandoChestTextures) return;
+
     Gfx gTreasureChestChestTextures[] = {
         gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gSkullTreasureChestFrontTex),
         gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gSkullTreasureChestSideAndTopTex),

From bd0672767af6b3f5e229b300b814e1d896731470 Mon Sep 17 00:00:00 2001
From: AltoXorg <56553686+Alto1772@users.noreply.github.com>
Date: Wed, 15 Nov 2023 05:37:54 +0800
Subject: [PATCH 33/38] Use substr method to determine file extension (#3390)

See https://github.com/HarbourMasters/OTRExporter/pull/12
---
 OTRExporter | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OTRExporter b/OTRExporter
index 0d8f5570a..04b85b95f 160000
--- a/OTRExporter
+++ b/OTRExporter
@@ -1 +1 @@
-Subproject commit 0d8f5570a8e57f302ec6633d65615ee21ab39454
+Subproject commit 04b85b95fab07a394b62dcd28a502a3040f08e0c

From ba987c49e2e4bfaaccdcff740709489bf59b34d5 Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Tue, 14 Nov 2023 14:46:38 -0700
Subject: [PATCH 34/38] SaveManager cleanup (#3386)

* Move threadpool initialization and `OnExitGame` registration from `SaveManager::Init` to SM's constructor.
Comment on `Init` to mention it's not an initializer for `SaveManager`.
Added check for `SaveManager::SaveSection` to prevent firing a save worker if the game is already exited from a reset.

* Removed `IsSaveLoaded` check in favor of another `ThreadPoolWait()` at the start of `SaveManager::Init()`.
---
 soh/soh/SaveManager.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp
index 14ab736dc..2d1f6e68b 100644
--- a/soh/soh/SaveManager.cpp
+++ b/soh/soh/SaveManager.cpp
@@ -65,6 +65,10 @@ SaveManager::SaveManager() {
 
     AddInitFunction(InitFileImpl);
 
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnExitGame>([this](uint32_t fileNum) { ThreadPoolWait(); });
+
+    smThreadPool = std::make_shared<BS::thread_pool>(1);
+
     for (SaveFileMetaInfo& info : fileMetaInfo) {
         info.valid = false;
         info.deaths = 0;
@@ -357,12 +361,14 @@ void SaveManager::SaveRandomizer(SaveContext* saveContext, int sectionID, bool f
     });
 }
 
+// Init() here is an extension of InitSram, and thus not truly an initializer for SaveManager itself. don't put any class initialization stuff here
 void SaveManager::Init() {
+    // Wait on saves that snuck through the Wait in OnExitGame
+    ThreadPoolWait();
     const std::filesystem::path sSavePath(LUS::Context::GetPathRelativeToAppDirectory("Save"));
     const std::filesystem::path sGlobalPath = sSavePath / std::string("global.sav");
     auto sOldSavePath = LUS::Context::GetPathRelativeToAppDirectory("oot_save.sav");
     auto sOldBackupSavePath = LUS::Context::GetPathRelativeToAppDirectory("oot_save.bak");
-    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnExitGame>([this](uint32_t fileNum) { ThreadPoolWait(); });
 
     // If the save directory does not exist, create it
     if (!std::filesystem::exists(sSavePath)) {
@@ -403,7 +409,6 @@ void SaveManager::Init() {
     } else {
         CreateDefaultGlobal();
     }
-    smThreadPool = std::make_shared<BS::thread_pool>(1);
 
     // Load files to initialize metadata
     for (int fileNum = 0; fileNum < MaxFiles; fileNum++) {

From fb45b66903b2c7449a4673a331c2117a94ce02cb Mon Sep 17 00:00:00 2001
From: Josh Bodner <30329717+jbodner09@users.noreply.github.com>
Date: Tue, 14 Nov 2023 14:08:45 -0800
Subject: [PATCH 35/38] Fix magic being zeroed out when using fast file select
 (#3389)

* Move to frame counter init to a place that fast file select also touches

* Undo removing old fix

* Reset on gameover
---
 soh/soh/Enhancements/debugconsole.cpp                      | 1 +
 soh/src/code/z_play.c                                      | 7 +++++++
 .../overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c  | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/soh/soh/Enhancements/debugconsole.cpp b/soh/soh/Enhancements/debugconsole.cpp
index 3e61505b2..88a23718e 100644
--- a/soh/soh/Enhancements/debugconsole.cpp
+++ b/soh/soh/Enhancements/debugconsole.cpp
@@ -207,6 +207,7 @@ static bool ResetHandler(std::shared_ptr<LUS::Console> Console, std::vector<std:
         return 1;
     }
 
+    gPlayState->gameplayFrames = 0;
     SET_NEXT_GAMESTATE(&gPlayState->state, TitleSetup_Init, GameState);
     gPlayState->state.running = false;
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnExitGame>(gSaveContext.fileNum);
diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c
index 841de8f13..59a5d0619 100644
--- a/soh/src/code/z_play.c
+++ b/soh/src/code/z_play.c
@@ -33,6 +33,7 @@ u64 D_801614D0[0xA00];
 #endif
 
 PlayState* gPlayState;
+s16 firstInit = 0;
 
 s16 gEnPartnerId;
 
@@ -490,6 +491,12 @@ void Play_Init(GameState* thisx) {
         }
     }
 
+    // Properly initialize the frame counter so it doesn't use garbage data
+    if (!firstInit) {
+        play->gameplayFrames = 0;
+        firstInit = 1;
+    }
+
     // Invalid entrance, so immediately exit the game to opening title
     if (gSaveContext.entranceIndex == -1) {
         gSaveContext.entranceIndex = 0;
diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
index 55a5075a6..35490f079 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
@@ -4290,6 +4290,8 @@ void KaleidoScope_Update(PlayState* play)
                         if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_ENTRANCES)) {
                             Grotto_ForceGrottoReturn();
                         }
+                        // Reset frame counter to prevent autosave on respawn
+                        play->gameplayFrames = 0;
                         gSaveContext.nextTransitionType = 2;
                         gSaveContext.health = CVarGetInteger("gFullHealthSpawn", 0) ? gSaveContext.healthCapacity : 0x30;
                         Audio_QueueSeqCmd(0xF << 28 | SEQ_PLAYER_BGM_MAIN << 24 | 0xA);

From afe032ea215215273a38b810d5c7be0705aaa460 Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Tue, 14 Nov 2023 18:46:50 -0700
Subject: [PATCH 36/38] [Feature/fix] Save to temp file first (#3376)

* Add temp file flow to `SaveManager::SaveFileThreaded`.
Add "Save finish" info log message.

* Fix WiiU/Switch
---
 soh/soh/SaveManager.cpp | 84 +++++++++++++++++++++++++++--------------
 soh/soh/SaveManager.h   |  1 +
 2 files changed, 57 insertions(+), 28 deletions(-)

diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp
index 2d1f6e68b..e61cf9223 100644
--- a/soh/soh/SaveManager.cpp
+++ b/soh/soh/SaveManager.cpp
@@ -47,6 +47,11 @@ std::filesystem::path SaveManager::GetFileName(int fileNum) {
     return sSavePath / ("file" + std::to_string(fileNum + 1) + ".sav");
 }
 
+std::filesystem::path SaveManager::GetFileTempName(int fileNum) {
+    const std::filesystem::path sSavePath(LUS::Context::GetPathRelativeToAppDirectory("Save"));
+    return sSavePath / ("file" + std::to_string(fileNum + 1) + ".temp");
+}
+
 SaveManager::SaveManager() {
     coreSectionIDsByName["base"] = SECTION_ID_BASE;
     coreSectionIDsByName["randomizer"] = SECTION_ID_RANDOMIZER;
@@ -874,6 +879,32 @@ void SaveManager::InitFileMaxed() {
     gSaveContext.sceneFlags[5].swch = 0x40000000;
 }
 
+#if defined(__WIIU__) || defined(__SWITCH__)
+// std::filesystem::copy_file doesn't work properly with the Wii U's toolchain atm
+int copy_file(const char* src, const char* dst) {
+    alignas(0x40) uint8_t buf[4096];
+    FILE* r = fopen(src, "r");
+    if (!r) {
+        return -1;
+    }
+    FILE* w = fopen(dst, "w");
+    if (!w) {
+        return -2;
+    }
+
+    size_t res;
+    while ((res = fread(buf, 1, sizeof(buf), r)) > 0) {
+        if (fwrite(buf, 1, res, w) != res) {
+            break;
+        }
+    }
+
+    fclose(r);
+    fclose(w);
+    return res >= 0 ? 0 : res;
+}
+#endif
+
 // Threaded SaveFile takes copy of gSaveContext for local unmodified storage
 
 void SaveManager::SaveFileThreaded(int fileNum, SaveContext* saveContext, int sectionID) {
@@ -915,19 +946,42 @@ void SaveManager::SaveFileThreaded(int fileNum, SaveContext* saveContext, int se
         svi.func(saveContext, sectionID, false);
     }
 
+    std::filesystem::path fileName = GetFileName(fileNum);
+    std::filesystem::path tempFile = GetFileTempName(fileNum);
+
+    if (std::filesystem::exists(tempFile)) {
+        std::filesystem::remove(tempFile);
+    }
+
 #if defined(__SWITCH__) || defined(__WIIU__)
-    FILE* w = fopen(GetFileName(fileNum).c_str(), "w");
+    FILE* w = fopen(tempFile.c_str(), "w");
     std::string json_string = saveBlock.dump(4);
     fwrite(json_string.c_str(), sizeof(char), json_string.length(), w);
     fclose(w);
 #else
-    std::ofstream output(GetFileName(fileNum));
+    std::ofstream output(tempFile);
     output << std::setw(4) << saveBlock << std::endl;
+    output.close();
 #endif
 
+    if (std::filesystem::exists(fileName)) {
+        std::filesystem::remove(fileName);
+    }
+    
+#if defined(__SWITCH__) || defined(__WIIU__)
+    copy_file(tempFile.c_str(), fileName.c_str());
+#else
+    std::filesystem::copy_file(tempFile, fileName);
+#endif
+    
+    if (std::filesystem::exists(tempFile)) {
+        std::filesystem::remove(tempFile);
+    }
+
     delete saveContext;
     InitMeta(fileNum);
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnSaveFile>(fileNum);
+    SPDLOG_INFO("Save File Finish - fileNum: {}", fileNum);
 }
 
 // SaveSection creates a copy of gSaveContext to prevent mid-save data modification, and passes its reference to SaveFileThreaded
@@ -2110,32 +2164,6 @@ void SaveManager::LoadStruct(const std::string& name, LoadStructFunc func) {
     }
 }
 
-#if defined(__WIIU__) || defined(__SWITCH__)
-// std::filesystem::copy_file doesn't work properly with the Wii U's toolchain atm
-int copy_file(const char* src, const char* dst) {
-    alignas(0x40) uint8_t buf[4096];
-    FILE* r = fopen(src, "r");
-    if (!r) {
-        return -1;
-    }
-    FILE* w = fopen(dst, "w");
-    if (!w) {
-        return -2;
-    }
-
-    size_t res;
-    while ((res = fread(buf, 1, sizeof(buf), r)) > 0) {
-        if (fwrite(buf, 1, res, w) != res) {
-            break;
-        }
-    }
-
-    fclose(r);
-    fclose(w);
-    return res >= 0 ? 0 : res;
-}
-#endif
-
 void SaveManager::CopyZeldaFile(int from, int to) {
     assert(std::filesystem::exists(GetFileName(from)));
     DeleteZeldaFile(to);
diff --git a/soh/soh/SaveManager.h b/soh/soh/SaveManager.h
index 892aec923..310ecda7d 100644
--- a/soh/soh/SaveManager.h
+++ b/soh/soh/SaveManager.h
@@ -142,6 +142,7 @@ class SaveManager {
 
   private:
     std::filesystem::path GetFileName(int fileNum);
+    std::filesystem::path GetFileTempName(int fileNum);
     nlohmann::json saveBlock;
 
     void ConvertFromUnversioned();

From 044d32a46f1ed5bd7287b78d5c52233b27c0d262 Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Tue, 14 Nov 2023 19:47:07 -0600
Subject: [PATCH 37/38] Add gFixEyesOpenWhileSleeping (#3365)

---
 soh/soh/SohMenuBar.cpp                              | 2 ++
 soh/src/overlays/actors/ovl_player_actor/z_player.c | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp
index a71d2b8e3..8db6c7703 100644
--- a/soh/soh/SohMenuBar.cpp
+++ b/soh/soh/SohMenuBar.cpp
@@ -1061,6 +1061,8 @@ void DrawEnhancementsMenu() {
             UIWidgets::Tooltip("Fixes the bushes to drop items correctly rather than spawning undefined items.");
             UIWidgets::PaddedEnhancementCheckbox("Fix falling from vine edges", "gFixVineFall", true, false); 
             UIWidgets::Tooltip("Prevents immediately falling off climbable surfaces if climbing on the edges."); 
+            UIWidgets::PaddedEnhancementCheckbox("Fix Link's eyes open while sleeping", "gFixEyesOpenWhileSleeping", true, false);
+            UIWidgets::Tooltip("Fixes Link's eyes being open in the opening cutscene when he is supposed to be sleeping.");
 
             ImGui::EndMenu();
         }
diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c
index 09e33f2e4..497935a69 100644
--- a/soh/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c
@@ -15169,6 +15169,10 @@ void func_80852C50(PlayState* play, Player* this, CsCmdActorAction* arg2) {
 
     sp24 = D_808547C4[this->unk_446];
     func_80852B4C(play, this, linkCsAction, &D_80854E50[ABS(sp24)]);
+
+    if (CVarGetInteger("gFixEyesOpenWhileSleeping", 0) && (play->csCtx.linkAction->action == 28 || play->csCtx.linkAction->action == 29)) {
+        this->skelAnime.jointTable[22].x = 8;
+    }
 }
 
 void func_80852E14(Player* this, PlayState* play) {

From 2dfbbc63e3358f4fec9c518f6cba978aa93d71db Mon Sep 17 00:00:00 2001
From: Garrett Cox <garrettjcox@gmail.com>
Date: Tue, 14 Nov 2023 20:14:47 -0600
Subject: [PATCH 38/38] Version bump to MacReady Bravo (#3398)

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0633ab80a..fccae7f36 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,8 +5,8 @@ set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use")
 
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
 
-project(Ship VERSION 8.0.0 LANGUAGES C CXX)
-set(PROJECT_BUILD_NAME "MacReady Alfa" CACHE STRING "")
+project(Ship VERSION 8.0.1 LANGUAGES C CXX)
+set(PROJECT_BUILD_NAME "MacReady Bravo" CACHE STRING "")
 set(PROJECT_TEAM "github.com/harbourmasters" CACHE STRING "")
 
 set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT soh)