[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,6 +3,9 @@
#include "align_asset_macro.h"
#define dddan_sceneTLUT_011D70 "__OTR__scenes/nonmq/ddan_scene/ddan_sceneTLUT_011D70"
static const ALIGN_ASSET(2) char ddan_sceneTLUT_011D70[] = dddan_sceneTLUT_011D70;
#define dgDCDayEntranceTex "__OTR__scenes/nonmq/ddan_scene/gDCDayEntranceTex"
static const ALIGN_ASSET(2) char gDCDayEntranceTex[] = dgDCDayEntranceTex;
@@ -39,7 +42,5 @@ static const ALIGN_ASSET(2) char gDcOpeningCs[] = dgDcOpeningCs;
#define dddan_sceneCollisionHeader_011D40 "__OTR__scenes/nonmq/ddan_scene/ddan_sceneCollisionHeader_011D40"
static const ALIGN_ASSET(2) char ddan_sceneCollisionHeader_011D40[] = dddan_sceneCollisionHeader_011D40;
#define dddan_sceneTLUT_011D70 "__OTR__scenes/nonmq/ddan_scene/ddan_sceneTLUT_011D70"
static const ALIGN_ASSET(2) char ddan_sceneTLUT_011D70[] = dddan_sceneTLUT_011D70;
#endif // DUNGEONS_DDAN_SCENE_H