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

42
soh/assets/objects/object_jya_obj/object_jya_obj.h
View File

@@ -3,6 +3,27 @@
#include "align_asset_macro.h"
#define dobject_jya_objTex_00B4B8 "__OTR__objects/object_jya_obj/object_jya_objTex_00B4B8"
static const ALIGN_ASSET(2) char object_jya_objTex_00B4B8[] = dobject_jya_objTex_00B4B8;
#define dobject_jya_objTex_011A80 "__OTR__objects/object_jya_obj/object_jya_objTex_011A80"
static const ALIGN_ASSET(2) char object_jya_objTex_011A80[] = dobject_jya_objTex_011A80;
#define dobject_jya_objTex_016140 "__OTR__objects/object_jya_obj/object_jya_objTex_016140"
static const ALIGN_ASSET(2) char object_jya_objTex_016140[] = dobject_jya_objTex_016140;
#define dobject_jya_objTex_017140 "__OTR__objects/object_jya_obj/object_jya_objTex_017140"
static const ALIGN_ASSET(2) char object_jya_objTex_017140[] = dobject_jya_objTex_017140;
#define dobject_jya_objTex_01B340 "__OTR__objects/object_jya_obj/object_jya_objTex_01B340"
static const ALIGN_ASSET(2) char object_jya_objTex_01B340[] = dobject_jya_objTex_01B340;
#define dobject_jya_objTex_01B740 "__OTR__objects/object_jya_obj/object_jya_objTex_01B740"
static const ALIGN_ASSET(2) char object_jya_objTex_01B740[] = dobject_jya_objTex_01B740;
#define dobject_jya_objTLUT_011A60 "__OTR__objects/object_jya_obj/object_jya_objTLUT_011A60"
static const ALIGN_ASSET(2) char object_jya_objTLUT_011A60[] = dobject_jya_objTLUT_011A60;
#define dg1fliftDL "__OTR__objects/object_jya_obj/g1fliftDL"
static const ALIGN_ASSET(2) char g1fliftDL[] = dg1fliftDL;
@@ -231,25 +252,4 @@ static const ALIGN_ASSET(2) char gZurerukabeDL[] = dgZurerukabeDL;
#define dgZurerukabeCol "__OTR__objects/object_jya_obj/gZurerukabeCol"
static const ALIGN_ASSET(2) char gZurerukabeCol[] = dgZurerukabeCol;
#define dobject_jya_objTex_017140 "__OTR__objects/object_jya_obj/object_jya_objTex_017140"
static const ALIGN_ASSET(2) char object_jya_objTex_017140[] = dobject_jya_objTex_017140;
#define dobject_jya_objTex_01B340 "__OTR__objects/object_jya_obj/object_jya_objTex_01B340"
static const ALIGN_ASSET(2) char object_jya_objTex_01B340[] = dobject_jya_objTex_01B340;
#define dobject_jya_objTex_01B740 "__OTR__objects/object_jya_obj/object_jya_objTex_01B740"
static const ALIGN_ASSET(2) char object_jya_objTex_01B740[] = dobject_jya_objTex_01B740;
#define dobject_jya_objTex_00B4B8 "__OTR__objects/object_jya_obj/object_jya_objTex_00B4B8"
static const ALIGN_ASSET(2) char object_jya_objTex_00B4B8[] = dobject_jya_objTex_00B4B8;
#define dobject_jya_objTex_016140 "__OTR__objects/object_jya_obj/object_jya_objTex_016140"
static const ALIGN_ASSET(2) char object_jya_objTex_016140[] = dobject_jya_objTex_016140;
#define dobject_jya_objTex_011A80 "__OTR__objects/object_jya_obj/object_jya_objTex_011A80"
static const ALIGN_ASSET(2) char object_jya_objTex_011A80[] = dobject_jya_objTex_011A80;
#define dobject_jya_objTLUT_011A60 "__OTR__objects/object_jya_obj/object_jya_objTLUT_011A60"
static const ALIGN_ASSET(2) char object_jya_objTLUT_011A60[] = dobject_jya_objTLUT_011A60;
#endif // OBJECTS_OBJECT_JYA_OBJ_H