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

6
soh/assets/objects/object_gi_gloves/object_gi_gloves.h
View File

@@ -3,6 +3,9 @@
#include "align_asset_macro.h"
#define dobject_gi_glovesTex_000000 "__OTR__objects/object_gi_gloves/object_gi_glovesTex_000000"
static const ALIGN_ASSET(2) char object_gi_glovesTex_000000[] = dobject_gi_glovesTex_000000;
#define dgGiSilverGauntletsColorDL "__OTR__objects/object_gi_gloves/gGiSilverGauntletsColorDL"
static const ALIGN_ASSET(2) char gGiSilverGauntletsColorDL[] = dgGiSilverGauntletsColorDL;
@@ -21,7 +24,4 @@ static const ALIGN_ASSET(2) char gGiGauntletsDL[] = dgGiGauntletsDL;
#define dgGiGauntletsPlateDL "__OTR__objects/object_gi_gloves/gGiGauntletsPlateDL"
static const ALIGN_ASSET(2) char gGiGauntletsPlateDL[] = dgGiGauntletsPlateDL;
#define dobject_gi_glovesTex_000000 "__OTR__objects/object_gi_gloves/object_gi_glovesTex_000000"
static const ALIGN_ASSET(2) char object_gi_glovesTex_000000[] = dobject_gi_glovesTex_000000;
#endif // OBJECTS_OBJECT_GI_GLOVES_H