[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,30 +3,42 @@
#include "align_asset_macro.h"
#define dHAKAdanCH_room_1DL_008B10 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1DL_008B10"
static const ALIGN_ASSET(2) char HAKAdanCH_room_1DL_008B10[] = dHAKAdanCH_room_1DL_008B10;
#define dHAKAdanCH_room_1Tex_00A158 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_00A158"
static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_00A158[] = dHAKAdanCH_room_1Tex_00A158;
#define dHAKAdanCH_room_1DL_005E60 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1DL_005E60"
static const ALIGN_ASSET(2) char HAKAdanCH_room_1DL_005E60[] = dHAKAdanCH_room_1DL_005E60;
#define dHAKAdanCH_room_1Tex_009758 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_009758"
static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_009758[] = dHAKAdanCH_room_1Tex_009758;
#define dHAKAdanCH_room_1Tex_008D58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_008D58"
static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_008D58[] = dHAKAdanCH_room_1Tex_008D58;
#define dHAKAdanCH_room_1Tex_008F58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_008F58"
static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_008F58[] = dHAKAdanCH_room_1Tex_008F58;
#define dHAKAdanCH_room_1Tex_009158 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_009158"
static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_009158[] = dHAKAdanCH_room_1Tex_009158;
#define dHAKAdanCH_room_1Tex_009358 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_009358"
static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_009358[] = dHAKAdanCH_room_1Tex_009358;
#define dHAKAdanCH_room_1DL_007358 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1DL_007358"
static const ALIGN_ASSET(2) char HAKAdanCH_room_1DL_007358[] = dHAKAdanCH_room_1DL_007358;
#define dHAKAdanCH_room_1Tex_009758 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_009758"
static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_009758[] = dHAKAdanCH_room_1Tex_009758;
#define dHAKAdanCH_room_1Tex_009F58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_009F58"
static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_009F58[] = dHAKAdanCH_room_1Tex_009F58;
#define dHAKAdanCH_room_1Tex_00A158 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_00A158"
static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_00A158[] = dHAKAdanCH_room_1Tex_00A158;
#define dHAKAdanCH_room_1Tex_00A558 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_00A558"
static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_00A558[] = dHAKAdanCH_room_1Tex_00A558;
#define dHAKAdanCH_room_1Tex_00AD58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_00AD58"
static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_00AD58[] = dHAKAdanCH_room_1Tex_00AD58;
#define dHAKAdanCH_room_1DL_008B10 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1DL_008B10"
static const ALIGN_ASSET(2) char HAKAdanCH_room_1DL_008B10[] = dHAKAdanCH_room_1DL_008B10;
#define dHAKAdanCH_room_1DL_005E60 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1DL_005E60"
static const ALIGN_ASSET(2) char HAKAdanCH_room_1DL_005E60[] = dHAKAdanCH_room_1DL_005E60;
#define dHAKAdanCH_room_1DL_007358 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1DL_007358"
static const ALIGN_ASSET(2) char HAKAdanCH_room_1DL_007358[] = dHAKAdanCH_room_1DL_007358;
#define dHAKAdanCH_room_1DL_007EA8 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1DL_007EA8"
static const ALIGN_ASSET(2) char HAKAdanCH_room_1DL_007EA8[] = dHAKAdanCH_room_1DL_007EA8;
@@ -42,18 +54,6 @@ static const ALIGN_ASSET(2) char HAKAdanCH_room_1DL_0018D8[] = dHAKAdanCH_room_1
#define dHAKAdanCH_room_1DL_0040C0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1DL_0040C0"
static const ALIGN_ASSET(2) char HAKAdanCH_room_1DL_0040C0[] = dHAKAdanCH_room_1DL_0040C0;
#define dHAKAdanCH_room_1Tex_00AD58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_00AD58"
static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_00AD58[] = dHAKAdanCH_room_1Tex_00AD58;
#define dHAKAdanCH_room_1Tex_009F58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_009F58"
static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_009F58[] = dHAKAdanCH_room_1Tex_009F58;
#define dHAKAdanCH_room_1Tex_008F58 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_008F58"
static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_008F58[] = dHAKAdanCH_room_1Tex_008F58;
#define dHAKAdanCH_room_1Tex_009158 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1Tex_009158"
static const ALIGN_ASSET(2) char HAKAdanCH_room_1Tex_009158[] = dHAKAdanCH_room_1Tex_009158;
#define dHAKAdanCH_room_1DL_00B040 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_1DL_00B040"
static const ALIGN_ASSET(2) char HAKAdanCH_room_1DL_00B040[] = dHAKAdanCH_room_1DL_00B040;