[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,12 @@
#include "align_asset_macro.h"
#define dobject_gi_ghostTex_000000 "__OTR__objects/object_gi_ghost/object_gi_ghostTex_000000"
static const ALIGN_ASSET(2) char object_gi_ghostTex_000000[] = dobject_gi_ghostTex_000000;
#define dobject_gi_ghostTex_000200 "__OTR__objects/object_gi_ghost/object_gi_ghostTex_000200"
static const ALIGN_ASSET(2) char object_gi_ghostTex_000200[] = dobject_gi_ghostTex_000200;
#define dgGiPoeColorDL "__OTR__objects/object_gi_ghost/gGiPoeColorDL"
static const ALIGN_ASSET(2) char gGiPoeColorDL[] = dgGiPoeColorDL;
@@ -18,10 +24,4 @@ static const ALIGN_ASSET(2) char gGiGhostContainerGlassDL[] = dgGiGhostContainer
#define dgGiGhostContainerContentsDL "__OTR__objects/object_gi_ghost/gGiGhostContainerContentsDL"
static const ALIGN_ASSET(2) char gGiGhostContainerContentsDL[] = dgGiGhostContainerContentsDL;
#define dobject_gi_ghostTex_000000 "__OTR__objects/object_gi_ghost/object_gi_ghostTex_000000"
static const ALIGN_ASSET(2) char object_gi_ghostTex_000000[] = dobject_gi_ghostTex_000000;
#define dobject_gi_ghostTex_000200 "__OTR__objects/object_gi_ghost/object_gi_ghostTex_000200"
static const ALIGN_ASSET(2) char object_gi_ghostTex_000200[] = dobject_gi_ghostTex_000200;
#endif // OBJECTS_OBJECT_GI_GHOST_H