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_dns/object_dns.h
View File

@@ -3,6 +3,21 @@
#include "align_asset_macro.h"
#define dobject_dnsTex_0024A0 "__OTR__objects/object_dns/object_dnsTex_0024A0"
static const ALIGN_ASSET(2) char object_dnsTex_0024A0[] = dobject_dnsTex_0024A0;
#define dobject_dnsTex_002CA0 "__OTR__objects/object_dns/object_dnsTex_002CA0"
static const ALIGN_ASSET(2) char object_dnsTex_002CA0[] = dobject_dnsTex_002CA0;
#define dobject_dnsTex_002F20 "__OTR__objects/object_dns/object_dnsTex_002F20"
static const ALIGN_ASSET(2) char object_dnsTex_002F20[] = dobject_dnsTex_002F20;
#define dobject_dnsTex_002FA0 "__OTR__objects/object_dns/object_dnsTex_002FA0"
static const ALIGN_ASSET(2) char object_dnsTex_002FA0[] = dobject_dnsTex_002FA0;
#define dobject_dnsTex_003120 "__OTR__objects/object_dns/object_dnsTex_003120"
static const ALIGN_ASSET(2) char object_dnsTex_003120[] = dobject_dnsTex_003120;
#define dgDntJijiSkel "__OTR__objects/object_dns/gDntJijiSkel"
static const ALIGN_ASSET(2) char gDntJijiSkel[] = dgDntJijiSkel;
@@ -54,12 +69,6 @@ static const ALIGN_ASSET(2) char gDntJijiUnkAnim[] = dgDntJijiUnkAnim;
#define dgDntJijiWaitAnim "__OTR__objects/object_dns/gDntJijiWaitAnim"
static const ALIGN_ASSET(2) char gDntJijiWaitAnim[] = dgDntJijiWaitAnim;
#define dobject_dnsTex_0024A0 "__OTR__objects/object_dns/object_dnsTex_0024A0"
static const ALIGN_ASSET(2) char object_dnsTex_0024A0[] = dobject_dnsTex_0024A0;
#define dobject_dnsTex_003120 "__OTR__objects/object_dns/object_dnsTex_003120"
static const ALIGN_ASSET(2) char object_dnsTex_003120[] = dobject_dnsTex_003120;
#define dgDntJijiSkelLimbsLimb_003320DL_001AF0 "__OTR__objects/object_dns/gDntJijiSkelLimbsLimb_003320DL_001AF0"
static const ALIGN_ASSET(2) char gDntJijiSkelLimbsLimb_003320DL_001AF0[] = dgDntJijiSkelLimbsLimb_003320DL_001AF0;
@@ -96,13 +105,5 @@ static const ALIGN_ASSET(2) char gDntJijiSkelLimbsLimb_003398DL_001A40[] = dgDnt
#define dgDntJijiSkelLimbsLimb_0033A4DL_001990 "__OTR__objects/object_dns/gDntJijiSkelLimbsLimb_0033A4DL_001990"
static const ALIGN_ASSET(2) char gDntJijiSkelLimbsLimb_0033A4DL_001990[] = dgDntJijiSkelLimbsLimb_0033A4DL_001990;
#define dobject_dnsTex_002CA0 "__OTR__objects/object_dns/object_dnsTex_002CA0"
static const ALIGN_ASSET(2) char object_dnsTex_002CA0[] = dobject_dnsTex_002CA0;
#define dobject_dnsTex_002F20 "__OTR__objects/object_dns/object_dnsTex_002F20"
static const ALIGN_ASSET(2) char object_dnsTex_002F20[] = dobject_dnsTex_002F20;
#define dobject_dnsTex_002FA0 "__OTR__objects/object_dns/object_dnsTex_002FA0"
static const ALIGN_ASSET(2) char object_dnsTex_002FA0[] = dobject_dnsTex_002FA0;
#endif // OBJECTS_OBJECT_DNS_H