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

12
soh/assets/objects/object_masterkokirihead/object_masterkokirihead.h
View File

@@ -3,6 +3,12 @@
#include "align_asset_macro.h"
#define dobject_masterkokiriheadTex_0009F0 "__OTR__objects/object_masterkokirihead/object_masterkokiriheadTex_0009F0"
static const ALIGN_ASSET(2) char object_masterkokiriheadTex_0009F0[] = dobject_masterkokiriheadTex_0009F0;
#define dobject_masterkokiriheadTex_000A30 "__OTR__objects/object_masterkokirihead/object_masterkokiriheadTex_000A30"
static const ALIGN_ASSET(2) char object_masterkokiriheadTex_000A30[] = dobject_masterkokiriheadTex_000A30;
#define dgKokiriShopkeeperHeadDL "__OTR__objects/object_masterkokirihead/gKokiriShopkeeperHeadDL"
static const ALIGN_ASSET(2) char gKokiriShopkeeperHeadDL[] = dgKokiriShopkeeperHeadDL;
@@ -33,10 +39,4 @@ static const ALIGN_ASSET(2) char gKokiriShopkeeperHatTex[] = dgKokiriShopkeeperH
#define dgKokiriShopkeeperMouthAndNoseTex "__OTR__objects/object_masterkokirihead/gKokiriShopkeeperMouthAndNoseTex"
static const ALIGN_ASSET(2) char gKokiriShopkeeperMouthAndNoseTex[] = dgKokiriShopkeeperMouthAndNoseTex;
#define dobject_masterkokiriheadTex_0009F0 "__OTR__objects/object_masterkokirihead/object_masterkokiriheadTex_0009F0"
static const ALIGN_ASSET(2) char object_masterkokiriheadTex_0009F0[] = dobject_masterkokiriheadTex_0009F0;
#define dobject_masterkokiriheadTex_000A30 "__OTR__objects/object_masterkokirihead/object_masterkokiriheadTex_000A30"
static const ALIGN_ASSET(2) char object_masterkokiriheadTex_000A30[] = dobject_masterkokiriheadTex_000A30;
#endif // OBJECTS_OBJECT_MASTERKOKIRIHEAD_H