[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
This commit is contained in:
Adam Bird
2023-11-06 17:44:49 -05:00
committed by GitHub
parent 8b78cb832a
commit 460b3d02f5
602 changed files with 14934 additions and 15000 deletions

View File

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