[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,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