[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,33 +3,33 @@
#include "align_asset_macro.h"
#define dMIZUsin_room_2Tex_002AB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_002AB8"
static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_002AB8[] = dMIZUsin_room_2Tex_002AB8;
#define dMIZUsin_room_2Tex_0032B8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_0032B8"
static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_0032B8[] = dMIZUsin_room_2Tex_0032B8;
#define dMIZUsin_room_2Tex_003AB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_003AB8"
static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_003AB8[] = dMIZUsin_room_2Tex_003AB8;
#define dMIZUsin_room_2Tex_0042B8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_0042B8"
static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_0042B8[] = dMIZUsin_room_2Tex_0042B8;
#define dMIZUsin_room_2Tex_004AB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_004AB8"
static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_004AB8[] = dMIZUsin_room_2Tex_004AB8;
#define dMIZUsin_room_2Tex_005488 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_005488"
static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_005488[] = dMIZUsin_room_2Tex_005488;
#define dMIZUsin_room_2DL_0028A0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2DL_0028A0"
static const ALIGN_ASSET(2) char MIZUsin_room_2DL_0028A0[] = dMIZUsin_room_2DL_0028A0;
#define dMIZUsin_room_2DL_001428 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2DL_001428"
static const ALIGN_ASSET(2) char MIZUsin_room_2DL_001428[] = dMIZUsin_room_2DL_001428;
#define dMIZUsin_room_2Tex_004AB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_004AB8"
static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_004AB8[] = dMIZUsin_room_2Tex_004AB8;
#define dMIZUsin_room_2Tex_003AB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_003AB8"
static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_003AB8[] = dMIZUsin_room_2Tex_003AB8;
#define dMIZUsin_room_2Tex_002AB8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_002AB8"
static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_002AB8[] = dMIZUsin_room_2Tex_002AB8;
#define dMIZUsin_room_2Tex_0042B8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_0042B8"
static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_0042B8[] = dMIZUsin_room_2Tex_0042B8;
#define dMIZUsin_room_2Tex_0032B8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_0032B8"
static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_0032B8[] = dMIZUsin_room_2Tex_0032B8;
#define dMIZUsin_room_2DL_005380 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2DL_005380"
static const ALIGN_ASSET(2) char MIZUsin_room_2DL_005380[] = dMIZUsin_room_2DL_005380;
#define dMIZUsin_room_2Tex_005488 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2Tex_005488"
static const ALIGN_ASSET(2) char MIZUsin_room_2Tex_005488[] = dMIZUsin_room_2Tex_005488;
#define dMIZUsin_room_2DL_0004E0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_2DL_0004E0"
static const ALIGN_ASSET(2) char MIZUsin_room_2DL_0004E0[] = dMIZUsin_room_2DL_0004E0;