[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,13 +3,13 @@
#include "align_asset_macro.h"
#define dspot10_room_0DL_0025B0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_0DL_0025B0"
#define dspot10_room_0DL_0025B0 "__OTR__scenes/shared/spot10_scene/spot10_room_0DL_0025B0"
static const ALIGN_ASSET(2) char spot10_room_0DL_0025B0[] = dspot10_room_0DL_0025B0;
#define dspot10_room_0Set_0000B0DL_0025B0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_0Set_0000B0DL_0025B0"
#define dspot10_room_0Set_0000B0DL_0025B0 "__OTR__scenes/shared/spot10_scene/spot10_room_0Set_0000B0DL_0025B0"
static const ALIGN_ASSET(2) char spot10_room_0Set_0000B0DL_0025B0[] = dspot10_room_0Set_0000B0DL_0025B0;
#define dspot10_room_0Set_000130DL_0025B0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_0Set_000130DL_0025B0"
#define dspot10_room_0Set_000130DL_0025B0 "__OTR__scenes/shared/spot10_scene/spot10_room_0Set_000130DL_0025B0"
static const ALIGN_ASSET(2) char spot10_room_0Set_000130DL_0025B0[] = dspot10_room_0Set_000130DL_0025B0;