[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,14 @@
#include "align_asset_macro.h"
#define dganontikasonogo_sceneCollisionHeader_002ACC "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_sceneCollisionHeader_002ACC"
static const ALIGN_ASSET(2) char ganontikasonogo_sceneCollisionHeader_002ACC[] = dganontikasonogo_sceneCollisionHeader_002ACC;
#define dganontikasonogo_sceneTex_002B00 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_sceneTex_002B00"
#define dganontikasonogo_sceneTex_002B00 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_sceneTex_002B00"
static const ALIGN_ASSET(2) char ganontikasonogo_sceneTex_002B00[] = dganontikasonogo_sceneTex_002B00;
#define dganontikasonogo_sceneTex_003B00 "__OTR__scenes/nonmq/ganontikasonogo_scene/ganontikasonogo_sceneTex_003B00"
#define dganontikasonogo_sceneTex_003B00 "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_sceneTex_003B00"
static const ALIGN_ASSET(2) char ganontikasonogo_sceneTex_003B00[] = dganontikasonogo_sceneTex_003B00;
#define dganontikasonogo_sceneCollisionHeader_002ACC "__OTR__scenes/shared/ganontikasonogo_scene/ganontikasonogo_sceneCollisionHeader_002ACC"
static const ALIGN_ASSET(2) char ganontikasonogo_sceneCollisionHeader_002ACC[] = dganontikasonogo_sceneCollisionHeader_002ACC;
#endif // DUNGEONS_GANONTIKASONOGO_SCENE_H