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

35
soh/assets/objects/object_hintnuts/object_hintnuts.h
View File

@@ -3,6 +3,24 @@
#include "align_asset_macro.h"
#define dobject_hintnutsTex_0015A8 "__OTR__objects/object_hintnuts/object_hintnutsTex_0015A8"
static const ALIGN_ASSET(2) char object_hintnutsTex_0015A8[] = dobject_hintnutsTex_0015A8;
#define dobject_hintnutsTex_001DA8 "__OTR__objects/object_hintnuts/object_hintnutsTex_001DA8"
static const ALIGN_ASSET(2) char object_hintnutsTex_001DA8[] = dobject_hintnutsTex_001DA8;
#define dobject_hintnutsTex_001FA8 "__OTR__objects/object_hintnuts/object_hintnutsTex_001FA8"
static const ALIGN_ASSET(2) char object_hintnutsTex_001FA8[] = dobject_hintnutsTex_001FA8;
#define dobject_hintnutsTex_002028 "__OTR__objects/object_hintnuts/object_hintnutsTex_002028"
static const ALIGN_ASSET(2) char object_hintnutsTex_002028[] = dobject_hintnutsTex_002028;
#define dobject_hintnutsTex_0020A8 "__OTR__objects/object_hintnuts/object_hintnutsTex_0020A8"
static const ALIGN_ASSET(2) char object_hintnutsTex_0020A8[] = dobject_hintnutsTex_0020A8;
#define dobject_hintnutsTex_002128 "__OTR__objects/object_hintnuts/object_hintnutsTex_002128"
static const ALIGN_ASSET(2) char object_hintnutsTex_002128[] = dobject_hintnutsTex_002128;
#define dgHintNutsSkel "__OTR__objects/object_hintnuts/gHintNutsSkel"
static const ALIGN_ASSET(2) char gHintNutsSkel[] = dgHintNutsSkel;
@@ -39,12 +57,6 @@ static const ALIGN_ASSET(2) char gHintNutsFlowerDL[] = dgHintNutsFlowerDL;
#define dgHintNutsNutDL "__OTR__objects/object_hintnuts/gHintNutsNutDL"
static const ALIGN_ASSET(2) char gHintNutsNutDL[] = dgHintNutsNutDL;
#define dobject_hintnutsTex_0015A8 "__OTR__objects/object_hintnuts/object_hintnutsTex_0015A8"
static const ALIGN_ASSET(2) char object_hintnutsTex_0015A8[] = dobject_hintnutsTex_0015A8;
#define dobject_hintnutsTex_002128 "__OTR__objects/object_hintnuts/object_hintnutsTex_002128"
static const ALIGN_ASSET(2) char object_hintnutsTex_002128[] = dobject_hintnutsTex_002128;
#define dgHintNutsSkelLimbsLimb_002328DL_000C68 "__OTR__objects/object_hintnuts/gHintNutsSkelLimbsLimb_002328DL_000C68"
static const ALIGN_ASSET(2) char gHintNutsSkelLimbsLimb_002328DL_000C68[] = dgHintNutsSkelLimbsLimb_002328DL_000C68;
@@ -72,16 +84,5 @@ static const ALIGN_ASSET(2) char gHintNutsSkelLimbsLimb_00237CDL_000E28[] = dgHi
#define dgHintNutsSkelLimbsLimb_002388DL_000EC8 "__OTR__objects/object_hintnuts/gHintNutsSkelLimbsLimb_002388DL_000EC8"
static const ALIGN_ASSET(2) char gHintNutsSkelLimbsLimb_002388DL_000EC8[] = dgHintNutsSkelLimbsLimb_002388DL_000EC8;
#define dobject_hintnutsTex_001DA8 "__OTR__objects/object_hintnuts/object_hintnutsTex_001DA8"
static const ALIGN_ASSET(2) char object_hintnutsTex_001DA8[] = dobject_hintnutsTex_001DA8;
#define dobject_hintnutsTex_001FA8 "__OTR__objects/object_hintnuts/object_hintnutsTex_001FA8"
static const ALIGN_ASSET(2) char object_hintnutsTex_001FA8[] = dobject_hintnutsTex_001FA8;
#define dobject_hintnutsTex_002028 "__OTR__objects/object_hintnuts/object_hintnutsTex_002028"
static const ALIGN_ASSET(2) char object_hintnutsTex_002028[] = dobject_hintnutsTex_002028;
#define dobject_hintnutsTex_0020A8 "__OTR__objects/object_hintnuts/object_hintnutsTex_0020A8"
static const ALIGN_ASSET(2) char object_hintnutsTex_0020A8[] = dobject_hintnutsTex_0020A8;
#endif // OBJECTS_OBJECT_HINTNUTS_H