[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 dovl_Boss_SstTex_00A438 "__OTR__overlays/ovl_Boss_Sst/ovl_Boss_SstTex_00A438"
static const ALIGN_ASSET(2) char ovl_Boss_SstTex_00A438[] = dovl_Boss_SstTex_00A438;
#define dovl_Boss_SstTex_00A8F0 "__OTR__overlays/ovl_Boss_Sst/ovl_Boss_SstTex_00A8F0"
static const ALIGN_ASSET(2) char ovl_Boss_SstTex_00A8F0[] = dovl_Boss_SstTex_00A8F0;
#define dsBodyStaticDList "__OTR__overlays/ovl_Boss_Sst/sBodyStaticDList"
static const ALIGN_ASSET(2) char sBodyStaticDList[] = dsBodyStaticDList;
@@ -15,10 +21,4 @@ static const ALIGN_ASSET(2) char sIntroVanishDList[] = dsIntroVanishDList;
#define dsShadowDList "__OTR__overlays/ovl_Boss_Sst/sShadowDList"
static const ALIGN_ASSET(2) char sShadowDList[] = dsShadowDList;
#define dovl_Boss_SstTex_00A438 "__OTR__overlays/ovl_Boss_Sst/ovl_Boss_SstTex_00A438"
static const ALIGN_ASSET(2) char ovl_Boss_SstTex_00A438[] = dovl_Boss_SstTex_00A438;
#define dovl_Boss_SstTex_00A8F0 "__OTR__overlays/ovl_Boss_Sst/ovl_Boss_SstTex_00A8F0"
static const ALIGN_ASSET(2) char ovl_Boss_SstTex_00A8F0[] = dovl_Boss_SstTex_00A8F0;
#endif // OVERLAYS_OVL_BOSS_SST_H