[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,14 +3,23 @@
#include "align_asset_macro.h"
#define dHAKAdan_room_8DL_000E70 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8DL_000E70"
static const ALIGN_ASSET(2) char HAKAdan_room_8DL_000E70[] = dHAKAdan_room_8DL_000E70;
#define dHAKAdan_room_8Tex_003098 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8Tex_003098"
static const ALIGN_ASSET(2) char HAKAdan_room_8Tex_003098[] = dHAKAdan_room_8Tex_003098;
#define dHAKAdan_room_8Tex_003298 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8Tex_003298"
static const ALIGN_ASSET(2) char HAKAdan_room_8Tex_003298[] = dHAKAdan_room_8Tex_003298;
#define dHAKAdan_room_8Tex_004298 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8Tex_004298"
static const ALIGN_ASSET(2) char HAKAdan_room_8Tex_004298[] = dHAKAdan_room_8Tex_004298;
#define dHAKAdan_room_8Tex_004A98 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8Tex_004A98"
static const ALIGN_ASSET(2) char HAKAdan_room_8Tex_004A98[] = dHAKAdan_room_8Tex_004A98;
#define dHAKAdan_room_8Tex_004C98 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8Tex_004C98"
static const ALIGN_ASSET(2) char HAKAdan_room_8Tex_004C98[] = dHAKAdan_room_8Tex_004C98;
#define dHAKAdan_room_8Tex_003098 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8Tex_003098"
static const ALIGN_ASSET(2) char HAKAdan_room_8Tex_003098[] = dHAKAdan_room_8Tex_003098;
#define dHAKAdan_room_8DL_000E70 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8DL_000E70"
static const ALIGN_ASSET(2) char HAKAdan_room_8DL_000E70[] = dHAKAdan_room_8DL_000E70;
#define dHAKAdan_room_8DL_002418 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8DL_002418"
static const ALIGN_ASSET(2) char HAKAdan_room_8DL_002418[] = dHAKAdan_room_8DL_002418;
@@ -18,17 +27,8 @@ static const ALIGN_ASSET(2) char HAKAdan_room_8DL_002418[] = dHAKAdan_room_8DL_0
#define dHAKAdan_room_8DL_002CC8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8DL_002CC8"
static const ALIGN_ASSET(2) char HAKAdan_room_8DL_002CC8[] = dHAKAdan_room_8DL_002CC8;
#define dHAKAdan_room_8Tex_004A98 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8Tex_004A98"
static const ALIGN_ASSET(2) char HAKAdan_room_8Tex_004A98[] = dHAKAdan_room_8Tex_004A98;
#define dHAKAdan_room_8Tex_003298 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8Tex_003298"
static const ALIGN_ASSET(2) char HAKAdan_room_8Tex_003298[] = dHAKAdan_room_8Tex_003298;
#define dHAKAdan_room_8DL_001CE8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8DL_001CE8"
static const ALIGN_ASSET(2) char HAKAdan_room_8DL_001CE8[] = dHAKAdan_room_8DL_001CE8;
#define dHAKAdan_room_8Tex_004298 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_8Tex_004298"
static const ALIGN_ASSET(2) char HAKAdan_room_8Tex_004298[] = dHAKAdan_room_8Tex_004298;
#endif // DUNGEONS_HAKADAN_ROOM_8_H