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