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