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

29
soh/assets/objects/object_dnk/object_dnk.h
View File

@@ -3,6 +3,21 @@
#include "align_asset_macro.h"
#define dobject_dnkTex_001BD0 "__OTR__objects/object_dnk/object_dnkTex_001BD0"
static const ALIGN_ASSET(2) char object_dnkTex_001BD0[] = dobject_dnkTex_001BD0;
#define dobject_dnkTex_0023D0 "__OTR__objects/object_dnk/object_dnkTex_0023D0"
static const ALIGN_ASSET(2) char object_dnkTex_0023D0[] = dobject_dnkTex_0023D0;
#define dobject_dnkTex_002650 "__OTR__objects/object_dnk/object_dnkTex_002650"
static const ALIGN_ASSET(2) char object_dnkTex_002650[] = dobject_dnkTex_002650;
#define dobject_dnkTex_0026D0 "__OTR__objects/object_dnk/object_dnkTex_0026D0"
static const ALIGN_ASSET(2) char object_dnkTex_0026D0[] = dobject_dnkTex_0026D0;
#define dobject_dnkTex_002850 "__OTR__objects/object_dnk/object_dnkTex_002850"
static const ALIGN_ASSET(2) char object_dnkTex_002850[] = dobject_dnkTex_002850;
#define dgDntStageSkel "__OTR__objects/object_dnk/gDntStageSkel"
static const ALIGN_ASSET(2) char gDntStageSkel[] = dgDntStageSkel;
@@ -42,12 +57,6 @@ static const ALIGN_ASSET(2) char gDntStageNutDL[] = dgDntStageNutDL;
#define dgDntStageWaitAnim "__OTR__objects/object_dnk/gDntStageWaitAnim"
static const ALIGN_ASSET(2) char gDntStageWaitAnim[] = dgDntStageWaitAnim;
#define dobject_dnkTex_001BD0 "__OTR__objects/object_dnk/object_dnkTex_001BD0"
static const ALIGN_ASSET(2) char object_dnkTex_001BD0[] = dobject_dnkTex_001BD0;
#define dobject_dnkTex_002850 "__OTR__objects/object_dnk/object_dnkTex_002850"
static const ALIGN_ASSET(2) char object_dnkTex_002850[] = dobject_dnkTex_002850;
#define dgDntStageSkelLimbsLimb_002A50DL_0011E0 "__OTR__objects/object_dnk/gDntStageSkelLimbsLimb_002A50DL_0011E0"
static const ALIGN_ASSET(2) char gDntStageSkelLimbsLimb_002A50DL_0011E0[] = dgDntStageSkelLimbsLimb_002A50DL_0011E0;
@@ -78,13 +87,5 @@ static const ALIGN_ASSET(2) char gDntStageSkelLimbsLimb_002AB0DL_001700[] = dgDn
#define dgDntStageSkelLimbsLimb_002ABCDL_0017B0 "__OTR__objects/object_dnk/gDntStageSkelLimbsLimb_002ABCDL_0017B0"
static const ALIGN_ASSET(2) char gDntStageSkelLimbsLimb_002ABCDL_0017B0[] = dgDntStageSkelLimbsLimb_002ABCDL_0017B0;
#define dobject_dnkTex_0023D0 "__OTR__objects/object_dnk/object_dnkTex_0023D0"
static const ALIGN_ASSET(2) char object_dnkTex_0023D0[] = dobject_dnkTex_0023D0;
#define dobject_dnkTex_002650 "__OTR__objects/object_dnk/object_dnkTex_002650"
static const ALIGN_ASSET(2) char object_dnkTex_002650[] = dobject_dnkTex_002650;
#define dobject_dnkTex_0026D0 "__OTR__objects/object_dnk/object_dnkTex_0026D0"
static const ALIGN_ASSET(2) char object_dnkTex_0026D0[] = dobject_dnkTex_0026D0;
#endif // OBJECTS_OBJECT_DNK_H