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

161
soh/assets/objects/object_xc/object_xc.h
View File

@@ -3,6 +3,87 @@
#include "align_asset_macro.h"
#define dobject_xcTex_004C40 "__OTR__objects/object_xc/object_xcTex_004C40"
static const ALIGN_ASSET(2) char object_xcTex_004C40[] = dobject_xcTex_004C40;
#define dobject_xcTex_004C80 "__OTR__objects/object_xc/object_xcTex_004C80"
static const ALIGN_ASSET(2) char object_xcTex_004C80[] = dobject_xcTex_004C80;
#define dobject_xcTex_005CC0 "__OTR__objects/object_xc/object_xcTex_005CC0"
static const ALIGN_ASSET(2) char object_xcTex_005CC0[] = dobject_xcTex_005CC0;
#define dobject_xcTex_0060C0 "__OTR__objects/object_xc/object_xcTex_0060C0"
static const ALIGN_ASSET(2) char object_xcTex_0060C0[] = dobject_xcTex_0060C0;
#define dobject_xcTex_0064C0 "__OTR__objects/object_xc/object_xcTex_0064C0"
static const ALIGN_ASSET(2) char object_xcTex_0064C0[] = dobject_xcTex_0064C0;
#define dobject_xcTex_006CC0 "__OTR__objects/object_xc/object_xcTex_006CC0"
static const ALIGN_ASSET(2) char object_xcTex_006CC0[] = dobject_xcTex_006CC0;
#define dobject_xcTex_006D40 "__OTR__objects/object_xc/object_xcTex_006D40"
static const ALIGN_ASSET(2) char object_xcTex_006D40[] = dobject_xcTex_006D40;
#define dobject_xcTex_006D80 "__OTR__objects/object_xc/object_xcTex_006D80"
static const ALIGN_ASSET(2) char object_xcTex_006D80[] = dobject_xcTex_006D80;
#define dobject_xcTex_006E80 "__OTR__objects/object_xc/object_xcTex_006E80"
static const ALIGN_ASSET(2) char object_xcTex_006E80[] = dobject_xcTex_006E80;
#define dobject_xcTex_007280 "__OTR__objects/object_xc/object_xcTex_007280"
static const ALIGN_ASSET(2) char object_xcTex_007280[] = dobject_xcTex_007280;
#define dobject_xcTex_007380 "__OTR__objects/object_xc/object_xcTex_007380"
static const ALIGN_ASSET(2) char object_xcTex_007380[] = dobject_xcTex_007380;
#define dobject_xcTex_007B80 "__OTR__objects/object_xc/object_xcTex_007B80"
static const ALIGN_ASSET(2) char object_xcTex_007B80[] = dobject_xcTex_007B80;
#define dobject_xcTex_008380 "__OTR__objects/object_xc/object_xcTex_008380"
static const ALIGN_ASSET(2) char object_xcTex_008380[] = dobject_xcTex_008380;
#define dobject_xcTex_008B80 "__OTR__objects/object_xc/object_xcTex_008B80"
static const ALIGN_ASSET(2) char object_xcTex_008B80[] = dobject_xcTex_008B80;
#define dobject_xcTex_008C00 "__OTR__objects/object_xc/object_xcTex_008C00"
static const ALIGN_ASSET(2) char object_xcTex_008C00[] = dobject_xcTex_008C00;
#define dobject_xcTex_00F790 "__OTR__objects/object_xc/object_xcTex_00F790"
static const ALIGN_ASSET(2) char object_xcTex_00F790[] = dobject_xcTex_00F790;
#define dobject_xcTex_00F7D0 "__OTR__objects/object_xc/object_xcTex_00F7D0"
static const ALIGN_ASSET(2) char object_xcTex_00F7D0[] = dobject_xcTex_00F7D0;
#define dobject_xcTex_00FBD0 "__OTR__objects/object_xc/object_xcTex_00FBD0"
static const ALIGN_ASSET(2) char object_xcTex_00FBD0[] = dobject_xcTex_00FBD0;
#define dobject_xcTex_00FCD0 "__OTR__objects/object_xc/object_xcTex_00FCD0"
static const ALIGN_ASSET(2) char object_xcTex_00FCD0[] = dobject_xcTex_00FCD0;
#define dobject_xcTex_00FD10 "__OTR__objects/object_xc/object_xcTex_00FD10"
static const ALIGN_ASSET(2) char object_xcTex_00FD10[] = dobject_xcTex_00FD10;
#define dobject_xcTex_00FD90 "__OTR__objects/object_xc/object_xcTex_00FD90"
static const ALIGN_ASSET(2) char object_xcTex_00FD90[] = dobject_xcTex_00FD90;
#define dobject_xcTex_00FDD0 "__OTR__objects/object_xc/object_xcTex_00FDD0"
static const ALIGN_ASSET(2) char object_xcTex_00FDD0[] = dobject_xcTex_00FDD0;
#define dobject_xcTex_0101D0 "__OTR__objects/object_xc/object_xcTex_0101D0"
static const ALIGN_ASSET(2) char object_xcTex_0101D0[] = dobject_xcTex_0101D0;
#define dobject_xcTex_011930 "__OTR__objects/object_xc/object_xcTex_011930"
static const ALIGN_ASSET(2) char object_xcTex_011930[] = dobject_xcTex_011930;
#define dobject_xcTLUT_004840 "__OTR__objects/object_xc/object_xcTLUT_004840"
static const ALIGN_ASSET(2) char object_xcTLUT_004840[] = dobject_xcTLUT_004840;
#define dobject_xcTLUT_00F6C0 "__OTR__objects/object_xc/object_xcTLUT_00F6C0"
static const ALIGN_ASSET(2) char object_xcTLUT_00F6C0[] = dobject_xcTLUT_00F6C0;
#define dobject_xcTLUT_00F720 "__OTR__objects/object_xc/object_xcTLUT_00F720"
static const ALIGN_ASSET(2) char object_xcTLUT_00F720[] = dobject_xcTLUT_00F720;
#define dgSheikSkel "__OTR__objects/object_xc/gSheikSkel"
static const ALIGN_ASSET(2) char gSheikSkel[] = dgSheikSkel;
@@ -90,39 +171,6 @@ static const ALIGN_ASSET(2) char gSheikDL_011620[] = dgSheikDL_011620;
#define dgSheikDL_012970 "__OTR__objects/object_xc/gSheikDL_012970"
static const ALIGN_ASSET(2) char gSheikDL_012970[] = dgSheikDL_012970;
#define dobject_xcTex_00F790 "__OTR__objects/object_xc/object_xcTex_00F790"
static const ALIGN_ASSET(2) char object_xcTex_00F790[] = dobject_xcTex_00F790;
#define dobject_xcTLUT_00F6C0 "__OTR__objects/object_xc/object_xcTLUT_00F6C0"
static const ALIGN_ASSET(2) char object_xcTLUT_00F6C0[] = dobject_xcTLUT_00F6C0;
#define dobject_xcTex_00F7D0 "__OTR__objects/object_xc/object_xcTex_00F7D0"
static const ALIGN_ASSET(2) char object_xcTex_00F7D0[] = dobject_xcTex_00F7D0;
#define dobject_xcTLUT_00F720 "__OTR__objects/object_xc/object_xcTLUT_00F720"
static const ALIGN_ASSET(2) char object_xcTLUT_00F720[] = dobject_xcTLUT_00F720;
#define dobject_xcTex_00FBD0 "__OTR__objects/object_xc/object_xcTex_00FBD0"
static const ALIGN_ASSET(2) char object_xcTex_00FBD0[] = dobject_xcTex_00FBD0;
#define dobject_xcTex_00FD10 "__OTR__objects/object_xc/object_xcTex_00FD10"
static const ALIGN_ASSET(2) char object_xcTex_00FD10[] = dobject_xcTex_00FD10;
#define dobject_xcTex_00FD90 "__OTR__objects/object_xc/object_xcTex_00FD90"
static const ALIGN_ASSET(2) char object_xcTex_00FD90[] = dobject_xcTex_00FD90;
#define dobject_xcTex_00FDD0 "__OTR__objects/object_xc/object_xcTex_00FDD0"
static const ALIGN_ASSET(2) char object_xcTex_00FDD0[] = dobject_xcTex_00FDD0;
#define dobject_xcTex_0101D0 "__OTR__objects/object_xc/object_xcTex_0101D0"
static const ALIGN_ASSET(2) char object_xcTex_0101D0[] = dobject_xcTex_0101D0;
#define dobject_xcTex_00FCD0 "__OTR__objects/object_xc/object_xcTex_00FCD0"
static const ALIGN_ASSET(2) char object_xcTex_00FCD0[] = dobject_xcTex_00FCD0;
#define dobject_xcTex_011930 "__OTR__objects/object_xc/object_xcTex_011930"
static const ALIGN_ASSET(2) char object_xcTex_011930[] = dobject_xcTex_011930;
#define dgSheikSkelLimbsLimb_0129FCDL_00EA98 "__OTR__objects/object_xc/gSheikSkelLimbsLimb_0129FCDL_00EA98"
static const ALIGN_ASSET(2) char gSheikSkelLimbsLimb_0129FCDL_00EA98[] = dgSheikSkelLimbsLimb_0129FCDL_00EA98;
@@ -168,52 +216,5 @@ static const ALIGN_ASSET(2) char gSheikSkelLimbsLimb_012A98DL_00E220[] = dgSheik
#define dgSheikSkelLimbsLimb_012AA4DL_00D710 "__OTR__objects/object_xc/gSheikSkelLimbsLimb_012AA4DL_00D710"
static const ALIGN_ASSET(2) char gSheikSkelLimbsLimb_012AA4DL_00D710[] = dgSheikSkelLimbsLimb_012AA4DL_00D710;
#define dobject_xcTLUT_004840 "__OTR__objects/object_xc/object_xcTLUT_004840"
static const ALIGN_ASSET(2) char object_xcTLUT_004840[] = dobject_xcTLUT_004840;
#define dobject_xcTex_006D80 "__OTR__objects/object_xc/object_xcTex_006D80"
static const ALIGN_ASSET(2) char object_xcTex_006D80[] = dobject_xcTex_006D80;
#define dobject_xcTex_007280 "__OTR__objects/object_xc/object_xcTex_007280"
static const ALIGN_ASSET(2) char object_xcTex_007280[] = dobject_xcTex_007280;
#define dobject_xcTex_007380 "__OTR__objects/object_xc/object_xcTex_007380"
static const ALIGN_ASSET(2) char object_xcTex_007380[] = dobject_xcTex_007380;
#define dobject_xcTex_007B80 "__OTR__objects/object_xc/object_xcTex_007B80"
static const ALIGN_ASSET(2) char object_xcTex_007B80[] = dobject_xcTex_007B80;
#define dobject_xcTex_008380 "__OTR__objects/object_xc/object_xcTex_008380"
static const ALIGN_ASSET(2) char object_xcTex_008380[] = dobject_xcTex_008380;
#define dobject_xcTex_008B80 "__OTR__objects/object_xc/object_xcTex_008B80"
static const ALIGN_ASSET(2) char object_xcTex_008B80[] = dobject_xcTex_008B80;
#define dobject_xcTex_008C00 "__OTR__objects/object_xc/object_xcTex_008C00"
static const ALIGN_ASSET(2) char object_xcTex_008C00[] = dobject_xcTex_008C00;
#define dobject_xcTex_004C40 "__OTR__objects/object_xc/object_xcTex_004C40"
static const ALIGN_ASSET(2) char object_xcTex_004C40[] = dobject_xcTex_004C40;
#define dobject_xcTex_0060C0 "__OTR__objects/object_xc/object_xcTex_0060C0"
static const ALIGN_ASSET(2) char object_xcTex_0060C0[] = dobject_xcTex_0060C0;
#define dobject_xcTex_0064C0 "__OTR__objects/object_xc/object_xcTex_0064C0"
static const ALIGN_ASSET(2) char object_xcTex_0064C0[] = dobject_xcTex_0064C0;
#define dobject_xcTex_006E80 "__OTR__objects/object_xc/object_xcTex_006E80"
static const ALIGN_ASSET(2) char object_xcTex_006E80[] = dobject_xcTex_006E80;
#define dobject_xcTex_004C80 "__OTR__objects/object_xc/object_xcTex_004C80"
static const ALIGN_ASSET(2) char object_xcTex_004C80[] = dobject_xcTex_004C80;
#define dobject_xcTex_005CC0 "__OTR__objects/object_xc/object_xcTex_005CC0"
static const ALIGN_ASSET(2) char object_xcTex_005CC0[] = dobject_xcTex_005CC0;
#define dobject_xcTex_006CC0 "__OTR__objects/object_xc/object_xcTex_006CC0"
static const ALIGN_ASSET(2) char object_xcTex_006CC0[] = dobject_xcTex_006CC0;
#define dobject_xcTex_006D40 "__OTR__objects/object_xc/object_xcTex_006D40"
static const ALIGN_ASSET(2) char object_xcTex_006D40[] = dobject_xcTex_006D40;
#endif // OBJECTS_OBJECT_XC_H