nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[OTR Archive] Move shared scenes out of nonmq/mq folders (#3191)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

41
soh/assets/scenes/dungeons/jyasinzou/jyasinzou_scene.h
View File

@@ -3,6 +3,27 @@
#include "align_asset_macro.h"
#define djyasinzou_sceneTex_018820 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTex_018820"
static const ALIGN_ASSET(2) char jyasinzou_sceneTex_018820[] = djyasinzou_sceneTex_018820;
#define djyasinzou_sceneTex_019120 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTex_019120"
static const ALIGN_ASSET(2) char jyasinzou_sceneTex_019120[] = djyasinzou_sceneTex_019120;
#define djyasinzou_sceneTex_019320 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTex_019320"
static const ALIGN_ASSET(2) char jyasinzou_sceneTex_019320[] = djyasinzou_sceneTex_019320;
#define djyasinzou_sceneTLUT_017BE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTLUT_017BE0"
static const ALIGN_ASSET(2) char jyasinzou_sceneTLUT_017BE0[] = djyasinzou_sceneTLUT_017BE0;
#define djyasinzou_sceneTLUT_017DE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTLUT_017DE0"
static const ALIGN_ASSET(2) char jyasinzou_sceneTLUT_017DE0[] = djyasinzou_sceneTLUT_017DE0;
#define djyasinzou_sceneTLUT_017FE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTLUT_017FE0"
static const ALIGN_ASSET(2) char jyasinzou_sceneTLUT_017FE0[] = djyasinzou_sceneTLUT_017FE0;
#define djyasinzou_sceneTLUT_018000 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTLUT_018000"
static const ALIGN_ASSET(2) char jyasinzou_sceneTLUT_018000[] = djyasinzou_sceneTLUT_018000;
#define dgSpiritTempleDayEntranceTex "__OTR__scenes/nonmq/jyasinzou_scene/gSpiritTempleDayEntranceTex"
static const ALIGN_ASSET(2) char gSpiritTempleDayEntranceTex[] = dgSpiritTempleDayEntranceTex;
@@ -12,25 +33,5 @@ static const ALIGN_ASSET(2) char gSpiritTempleNightEntranceTex[] = dgSpiritTempl
#define djyasinzou_sceneCollisionHeader_01680C "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneCollisionHeader_01680C"
static const ALIGN_ASSET(2) char jyasinzou_sceneCollisionHeader_01680C[] = djyasinzou_sceneCollisionHeader_01680C;
#define djyasinzou_sceneTLUT_017BE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTLUT_017BE0"
static const ALIGN_ASSET(2) char jyasinzou_sceneTLUT_017BE0[] = djyasinzou_sceneTLUT_017BE0;
#define djyasinzou_sceneTLUT_018000 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTLUT_018000"
static const ALIGN_ASSET(2) char jyasinzou_sceneTLUT_018000[] = djyasinzou_sceneTLUT_018000;
#define djyasinzou_sceneTex_019320 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTex_019320"
static const ALIGN_ASSET(2) char jyasinzou_sceneTex_019320[] = djyasinzou_sceneTex_019320;
#define djyasinzou_sceneTex_018820 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTex_018820"
static const ALIGN_ASSET(2) char jyasinzou_sceneTex_018820[] = djyasinzou_sceneTex_018820;
#define djyasinzou_sceneTLUT_017DE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTLUT_017DE0"
static const ALIGN_ASSET(2) char jyasinzou_sceneTLUT_017DE0[] = djyasinzou_sceneTLUT_017DE0;
#define djyasinzou_sceneTLUT_017FE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTLUT_017FE0"
static const ALIGN_ASSET(2) char jyasinzou_sceneTLUT_017FE0[] = djyasinzou_sceneTLUT_017FE0;
#define djyasinzou_sceneTex_019120 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_sceneTex_019120"
static const ALIGN_ASSET(2) char jyasinzou_sceneTex_019120[] = djyasinzou_sceneTex_019120;
#endif // DUNGEONS_JYASINZOU_SCENE_H