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

11
soh/assets/objects/object_torch2/object_torch2.h
View File

@@ -3,15 +3,18 @@
#include "align_asset_macro.h"
#define dobject_torch2Tex_0041C0 "__OTR__objects/object_torch2/object_torch2Tex_0041C0"
static const ALIGN_ASSET(2) char object_torch2Tex_0041C0[] = dobject_torch2Tex_0041C0;
#define dobject_torch2Tex_0043C0 "__OTR__objects/object_torch2/object_torch2Tex_0043C0"
static const ALIGN_ASSET(2) char object_torch2Tex_0043C0[] = dobject_torch2Tex_0043C0;
#define dgDarkLinkSkel "__OTR__objects/object_torch2/gDarkLinkSkel"
static const ALIGN_ASSET(2) char gDarkLinkSkel[] = dgDarkLinkSkel;
#define dsDarkLinkSheathDL "__OTR__objects/object_torch2/sDarkLinkSheathDL"
static const ALIGN_ASSET(2) char sDarkLinkSheathDL[] = dsDarkLinkSheathDL;
#define dobject_torch2Tex_0041C0 "__OTR__objects/object_torch2/object_torch2Tex_0041C0"
static const ALIGN_ASSET(2) char object_torch2Tex_0041C0[] = dobject_torch2Tex_0041C0;
#define dgDarkLinkSkelLimbsLimb_0045D0FarDL_002BD0 "__OTR__objects/object_torch2/gDarkLinkSkelLimbsLimb_0045D0FarDL_002BD0"
static const ALIGN_ASSET(2) char gDarkLinkSkelLimbsLimb_0045D0FarDL_002BD0[] = dgDarkLinkSkelLimbsLimb_0045D0FarDL_002BD0;
@@ -63,7 +66,5 @@ static const ALIGN_ASSET(2) char gDarkLinkSkelLimbsLimb_0046E0FarDL_003C10[] = d
#define dgDarkLinkSkelLimbsLimb_004700FarDL_0038D0 "__OTR__objects/object_torch2/gDarkLinkSkelLimbsLimb_004700FarDL_0038D0"
static const ALIGN_ASSET(2) char gDarkLinkSkelLimbsLimb_004700FarDL_0038D0[] = dgDarkLinkSkelLimbsLimb_004700FarDL_0038D0;
#define dobject_torch2Tex_0043C0 "__OTR__objects/object_torch2/object_torch2Tex_0043C0"
static const ALIGN_ASSET(2) char object_torch2Tex_0043C0[] = dobject_torch2Tex_0043C0;
#endif // OBJECTS_OBJECT_TORCH2_H