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

30
soh/assets/objects/object_mo/object_mo.h
View File

@@ -3,6 +3,21 @@
#include "align_asset_macro.h"
#define dobject_moTex_000000 "__OTR__objects/object_mo/object_moTex_000000"
static const ALIGN_ASSET(2) char object_moTex_000000[] = dobject_moTex_000000;
#define dobject_moTex_000680 "__OTR__objects/object_mo/object_moTex_000680"
static const ALIGN_ASSET(2) char object_moTex_000680[] = dobject_moTex_000680;
#define dobject_moTex_004D20 "__OTR__objects/object_mo/object_moTex_004D20"
static const ALIGN_ASSET(2) char object_moTex_004D20[] = dobject_moTex_004D20;
#define dobject_moTex_005520 "__OTR__objects/object_mo/object_moTex_005520"
static const ALIGN_ASSET(2) char object_moTex_005520[] = dobject_moTex_005520;
#define dobject_moTex_005D20 "__OTR__objects/object_mo/object_moTex_005D20"
static const ALIGN_ASSET(2) char object_moTex_005D20[] = dobject_moTex_005D20;
#define dgMorphaTitleCardTex "__OTR__objects/object_mo/gMorphaTitleCardTex"
static const ALIGN_ASSET(2) char gMorphaTitleCardTex[] = dgMorphaTitleCardTex;
@@ -174,19 +189,4 @@ static const ALIGN_ASSET(2) char gMorphaVtx_006938[] = dgMorphaVtx_006938;
#define dgMorphaVtx_007BB8 "__OTR__objects/object_mo/gMorphaVtx_007BB8"
static const ALIGN_ASSET(2) char gMorphaVtx_007BB8[] = dgMorphaVtx_007BB8;
#define dobject_moTex_004D20 "__OTR__objects/object_mo/object_moTex_004D20"
static const ALIGN_ASSET(2) char object_moTex_004D20[] = dobject_moTex_004D20;
#define dobject_moTex_005D20 "__OTR__objects/object_mo/object_moTex_005D20"
static const ALIGN_ASSET(2) char object_moTex_005D20[] = dobject_moTex_005D20;
#define dobject_moTex_005520 "__OTR__objects/object_mo/object_moTex_005520"
static const ALIGN_ASSET(2) char object_moTex_005520[] = dobject_moTex_005520;
#define dobject_moTex_000000 "__OTR__objects/object_mo/object_moTex_000000"
static const ALIGN_ASSET(2) char object_moTex_000000[] = dobject_moTex_000000;
#define dobject_moTex_000680 "__OTR__objects/object_mo/object_moTex_000680"
static const ALIGN_ASSET(2) char object_moTex_000680[] = dobject_moTex_000680;
#endif // OBJECTS_OBJECT_MO_H