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

48
soh/assets/objects/object_owl/object_owl.h
View File

@@ -3,6 +3,30 @@
#include "align_asset_macro.h"
#define dobject_owlTex_0071A8 "__OTR__objects/object_owl/object_owlTex_0071A8"
static const ALIGN_ASSET(2) char object_owlTex_0071A8[] = dobject_owlTex_0071A8;
#define dobject_owlTex_0079A8 "__OTR__objects/object_owl/object_owlTex_0079A8"
static const ALIGN_ASSET(2) char object_owlTex_0079A8[] = dobject_owlTex_0079A8;
#define dobject_owlTex_0081A8 "__OTR__objects/object_owl/object_owlTex_0081A8"
static const ALIGN_ASSET(2) char object_owlTex_0081A8[] = dobject_owlTex_0081A8;
#define dobject_owlTex_0095A8 "__OTR__objects/object_owl/object_owlTex_0095A8"
static const ALIGN_ASSET(2) char object_owlTex_0095A8[] = dobject_owlTex_0095A8;
#define dobject_owlTex_009DA8 "__OTR__objects/object_owl/object_owlTex_009DA8"
static const ALIGN_ASSET(2) char object_owlTex_009DA8[] = dobject_owlTex_009DA8;
#define dobject_owlTex_009FA8 "__OTR__objects/object_owl/object_owlTex_009FA8"
static const ALIGN_ASSET(2) char object_owlTex_009FA8[] = dobject_owlTex_009FA8;
#define dobject_owlTex_00AFA8 "__OTR__objects/object_owl/object_owlTex_00AFA8"
static const ALIGN_ASSET(2) char object_owlTex_00AFA8[] = dobject_owlTex_00AFA8;
#define dobject_owlTex_00B7A8 "__OTR__objects/object_owl/object_owlTex_00B7A8"
static const ALIGN_ASSET(2) char object_owlTex_00B7A8[] = dobject_owlTex_00B7A8;
#define dgOwlFlyingSkel "__OTR__objects/object_owl/gOwlFlyingSkel"
static const ALIGN_ASSET(2) char gOwlFlyingSkel[] = dgOwlFlyingSkel;
@@ -99,30 +123,6 @@ static const ALIGN_ASSET(2) char gObjOwlEyeHalfTex[] = dgObjOwlEyeHalfTex;
#define dgObjOwlEyeClosedTex "__OTR__objects/object_owl/gObjOwlEyeClosedTex"
static const ALIGN_ASSET(2) char gObjOwlEyeClosedTex[] = dgObjOwlEyeClosedTex;
#define dobject_owlTex_009DA8 "__OTR__objects/object_owl/object_owlTex_009DA8"
static const ALIGN_ASSET(2) char object_owlTex_009DA8[] = dobject_owlTex_009DA8;
#define dobject_owlTex_0071A8 "__OTR__objects/object_owl/object_owlTex_0071A8"
static const ALIGN_ASSET(2) char object_owlTex_0071A8[] = dobject_owlTex_0071A8;
#define dobject_owlTex_0079A8 "__OTR__objects/object_owl/object_owlTex_0079A8"
static const ALIGN_ASSET(2) char object_owlTex_0079A8[] = dobject_owlTex_0079A8;
#define dobject_owlTex_0081A8 "__OTR__objects/object_owl/object_owlTex_0081A8"
static const ALIGN_ASSET(2) char object_owlTex_0081A8[] = dobject_owlTex_0081A8;
#define dobject_owlTex_0095A8 "__OTR__objects/object_owl/object_owlTex_0095A8"
static const ALIGN_ASSET(2) char object_owlTex_0095A8[] = dobject_owlTex_0095A8;
#define dobject_owlTex_009FA8 "__OTR__objects/object_owl/object_owlTex_009FA8"
static const ALIGN_ASSET(2) char object_owlTex_009FA8[] = dobject_owlTex_009FA8;
#define dobject_owlTex_00AFA8 "__OTR__objects/object_owl/object_owlTex_00AFA8"
static const ALIGN_ASSET(2) char object_owlTex_00AFA8[] = dobject_owlTex_00AFA8;
#define dobject_owlTex_00B7A8 "__OTR__objects/object_owl/object_owlTex_00B7A8"
static const ALIGN_ASSET(2) char object_owlTex_00B7A8[] = dobject_owlTex_00B7A8;
#define dgOwlPerchingSkelLimbsLimb_00FFCCDL_00F1C0 "__OTR__objects/object_owl/gOwlPerchingSkelLimbsLimb_00FFCCDL_00F1C0"
static const ALIGN_ASSET(2) char gOwlPerchingSkelLimbsLimb_00FFCCDL_00F1C0[] = dgOwlPerchingSkelLimbsLimb_00FFCCDL_00F1C0;