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