[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,8 +3,8 @@
#include "align_asset_macro.h"
#define dHAKAdanCH_room_6DL_000C30 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_6DL_000C30"
static const ALIGN_ASSET(2) char HAKAdanCH_room_6DL_000C30[] = dHAKAdanCH_room_6DL_000C30;
#define dHAKAdanCH_room_6Tex_000EA0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_6Tex_000EA0"
static const ALIGN_ASSET(2) char HAKAdanCH_room_6Tex_000EA0[] = dHAKAdanCH_room_6Tex_000EA0;
#define dHAKAdanCH_room_6Tex_0016A0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_6Tex_0016A0"
static const ALIGN_ASSET(2) char HAKAdanCH_room_6Tex_0016A0[] = dHAKAdanCH_room_6Tex_0016A0;
@@ -12,11 +12,11 @@ static const ALIGN_ASSET(2) char HAKAdanCH_room_6Tex_0016A0[] = dHAKAdanCH_room_
#define dHAKAdanCH_room_6Tex_0026A0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_6Tex_0026A0"
static const ALIGN_ASSET(2) char HAKAdanCH_room_6Tex_0026A0[] = dHAKAdanCH_room_6Tex_0026A0;
#define dHAKAdanCH_room_6DL_000C30 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_6DL_000C30"
static const ALIGN_ASSET(2) char HAKAdanCH_room_6DL_000C30[] = dHAKAdanCH_room_6DL_000C30;
#define dHAKAdanCH_room_6DL_000410 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_6DL_000410"
static const ALIGN_ASSET(2) char HAKAdanCH_room_6DL_000410[] = dHAKAdanCH_room_6DL_000410;
#define dHAKAdanCH_room_6Tex_000EA0 "__OTR__scenes/nonmq/HAKAdanCH_scene/HAKAdanCH_room_6Tex_000EA0"
static const ALIGN_ASSET(2) char HAKAdanCH_room_6Tex_000EA0[] = dHAKAdanCH_room_6Tex_000EA0;
#endif // DUNGEONS_HAKADANCH_ROOM_6_H