[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_oE1sTex_000478 "__OTR__objects/object_oE1s/object_oE1sTex_000478"
static const ALIGN_ASSET(2) char object_oE1sTex_000478[] = dobject_oE1sTex_000478;
#define dobject_oE1sTLUT_0001A8 "__OTR__objects/object_oE1s/object_oE1sTLUT_0001A8"
static const ALIGN_ASSET(2) char object_oE1sTLUT_0001A8[] = dobject_oE1sTLUT_0001A8;
#define dobject_oE1s_Anim_00007C "__OTR__objects/object_oE1s/object_oE1s_Anim_00007C"
static const ALIGN_ASSET(2) char object_oE1s_Anim_00007C[] = dobject_oE1s_Anim_00007C;
@@ -87,10 +93,5 @@ static const ALIGN_ASSET(2) char object_oE1s_DL_006340[] = dobject_oE1s_DL_00634
#define dobject_oE1s_DL_006490 "__OTR__objects/object_oE1s/object_oE1s_DL_006490"
static const ALIGN_ASSET(2) char object_oE1s_DL_006490[] = dobject_oE1s_DL_006490;
#define dobject_oE1sTex_000478 "__OTR__objects/object_oE1s/object_oE1sTex_000478"
static const ALIGN_ASSET(2) char object_oE1sTex_000478[] = dobject_oE1sTex_000478;
#define dobject_oE1sTLUT_0001A8 "__OTR__objects/object_oE1s/object_oE1sTLUT_0001A8"
static const ALIGN_ASSET(2) char object_oE1sTLUT_0001A8[] = dobject_oE1sTLUT_0001A8;
#endif // OBJECTS_OBJECT_OE1S_H