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

65
soh/assets/objects/object_fd2/object_fd2.h
View File

@@ -3,6 +3,39 @@
#include "align_asset_macro.h"
#define dobject_fd2Tex_003308 "__OTR__objects/object_fd2/object_fd2Tex_003308"
static const ALIGN_ASSET(2) char object_fd2Tex_003308[] = dobject_fd2Tex_003308;
#define dobject_fd2Tex_003B08 "__OTR__objects/object_fd2/object_fd2Tex_003B08"
static const ALIGN_ASSET(2) char object_fd2Tex_003B08[] = dobject_fd2Tex_003B08;
#define dobject_fd2Tex_004308 "__OTR__objects/object_fd2/object_fd2Tex_004308"
static const ALIGN_ASSET(2) char object_fd2Tex_004308[] = dobject_fd2Tex_004308;
#define dobject_fd2Tex_004508 "__OTR__objects/object_fd2/object_fd2Tex_004508"
static const ALIGN_ASSET(2) char object_fd2Tex_004508[] = dobject_fd2Tex_004508;
#define dobject_fd2Tex_004708 "__OTR__objects/object_fd2/object_fd2Tex_004708"
static const ALIGN_ASSET(2) char object_fd2Tex_004708[] = dobject_fd2Tex_004708;
#define dobject_fd2Tex_004908 "__OTR__objects/object_fd2/object_fd2Tex_004908"
static const ALIGN_ASSET(2) char object_fd2Tex_004908[] = dobject_fd2Tex_004908;
#define dobject_fd2Tex_004BE8 "__OTR__objects/object_fd2/object_fd2Tex_004BE8"
static const ALIGN_ASSET(2) char object_fd2Tex_004BE8[] = dobject_fd2Tex_004BE8;
#define dobject_fd2Tex_004FA0 "__OTR__objects/object_fd2/object_fd2Tex_004FA0"
static const ALIGN_ASSET(2) char object_fd2Tex_004FA0[] = dobject_fd2Tex_004FA0;
#define dobject_fd2Tex_0051A0 "__OTR__objects/object_fd2/object_fd2Tex_0051A0"
static const ALIGN_ASSET(2) char object_fd2Tex_0051A0[] = dobject_fd2Tex_0051A0;
#define dobject_fd2Tex_0053A0 "__OTR__objects/object_fd2/object_fd2Tex_0053A0"
static const ALIGN_ASSET(2) char object_fd2Tex_0053A0[] = dobject_fd2Tex_0053A0;
#define dobject_fd2TLUT_002508 "__OTR__objects/object_fd2/object_fd2TLUT_002508"
static const ALIGN_ASSET(2) char object_fd2TLUT_002508[] = dobject_fd2TLUT_002508;
#define dgHoleVolvagiaSkel "__OTR__objects/object_fd2/gHoleVolvagiaSkel"
static const ALIGN_ASSET(2) char gHoleVolvagiaSkel[] = dgHoleVolvagiaSkel;
@@ -63,18 +96,6 @@ static const ALIGN_ASSET(2) char gHoleVolvagiaVtx_00DD80[] = dgHoleVolvagiaVtx_0
#define dgHoleVolvagiaVtx_00D000 "__OTR__objects/object_fd2/gHoleVolvagiaVtx_00D000"
static const ALIGN_ASSET(2) char gHoleVolvagiaVtx_00D000[] = dgHoleVolvagiaVtx_00D000;
#define dobject_fd2Tex_004BE8 "__OTR__objects/object_fd2/object_fd2Tex_004BE8"
static const ALIGN_ASSET(2) char object_fd2Tex_004BE8[] = dobject_fd2Tex_004BE8;
#define dobject_fd2Tex_004FA0 "__OTR__objects/object_fd2/object_fd2Tex_004FA0"
static const ALIGN_ASSET(2) char object_fd2Tex_004FA0[] = dobject_fd2Tex_004FA0;
#define dobject_fd2Tex_0053A0 "__OTR__objects/object_fd2/object_fd2Tex_0053A0"
static const ALIGN_ASSET(2) char object_fd2Tex_0053A0[] = dobject_fd2Tex_0053A0;
#define dobject_fd2Tex_0051A0 "__OTR__objects/object_fd2/object_fd2Tex_0051A0"
static const ALIGN_ASSET(2) char object_fd2Tex_0051A0[] = dobject_fd2Tex_0051A0;
#define dgHoleVolvagiaSkelLimbsLimb_011838DL_00FF70 "__OTR__objects/object_fd2/gHoleVolvagiaSkelLimbsLimb_011838DL_00FF70"
static const ALIGN_ASSET(2) char gHoleVolvagiaSkelLimbsLimb_011838DL_00FF70[] = dgHoleVolvagiaSkelLimbsLimb_011838DL_00FF70;
@@ -180,25 +201,5 @@ static const ALIGN_ASSET(2) char gHoleVolvagiaSkelLimbsLimb_0119D0DL_001308[] =
#define dgHoleVolvagiaSkelLimbsLimb_0119DCDL_001010 "__OTR__objects/object_fd2/gHoleVolvagiaSkelLimbsLimb_0119DCDL_001010"
static const ALIGN_ASSET(2) char gHoleVolvagiaSkelLimbsLimb_0119DCDL_001010[] = dgHoleVolvagiaSkelLimbsLimb_0119DCDL_001010;
#define dobject_fd2Tex_003308 "__OTR__objects/object_fd2/object_fd2Tex_003308"
static const ALIGN_ASSET(2) char object_fd2Tex_003308[] = dobject_fd2Tex_003308;
#define dobject_fd2Tex_003B08 "__OTR__objects/object_fd2/object_fd2Tex_003B08"
static const ALIGN_ASSET(2) char object_fd2Tex_003B08[] = dobject_fd2Tex_003B08;
#define dobject_fd2Tex_004308 "__OTR__objects/object_fd2/object_fd2Tex_004308"
static const ALIGN_ASSET(2) char object_fd2Tex_004308[] = dobject_fd2Tex_004308;
#define dobject_fd2Tex_004708 "__OTR__objects/object_fd2/object_fd2Tex_004708"
static const ALIGN_ASSET(2) char object_fd2Tex_004708[] = dobject_fd2Tex_004708;
#define dobject_fd2Tex_004508 "__OTR__objects/object_fd2/object_fd2Tex_004508"
static const ALIGN_ASSET(2) char object_fd2Tex_004508[] = dobject_fd2Tex_004508;
#define dobject_fd2Tex_004908 "__OTR__objects/object_fd2/object_fd2Tex_004908"
static const ALIGN_ASSET(2) char object_fd2Tex_004908[] = dobject_fd2Tex_004908;
#define dobject_fd2TLUT_002508 "__OTR__objects/object_fd2/object_fd2TLUT_002508"
static const ALIGN_ASSET(2) char object_fd2TLUT_002508[] = dobject_fd2TLUT_002508;
#endif // OBJECTS_OBJECT_FD2_H