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_gi_niwatori/object_gi_niwatori.h
View File

@@ -3,6 +3,12 @@
#include "align_asset_macro.h"
#define dobject_gi_niwatoriTex_000000 "__OTR__objects/object_gi_niwatori/object_gi_niwatoriTex_000000"
static const ALIGN_ASSET(2) char object_gi_niwatoriTex_000000[] = dobject_gi_niwatoriTex_000000;
#define dobject_gi_niwatoriTex_000800 "__OTR__objects/object_gi_niwatori/object_gi_niwatoriTex_000800"
static const ALIGN_ASSET(2) char object_gi_niwatoriTex_000800[] = dobject_gi_niwatoriTex_000800;
#define dgGiChickenColorDL "__OTR__objects/object_gi_niwatori/gGiChickenColorDL"
static const ALIGN_ASSET(2) char gGiChickenColorDL[] = dgGiChickenColorDL;
@@ -15,10 +21,4 @@ static const ALIGN_ASSET(2) char gGiChickenDL[] = dgGiChickenDL;
#define dgGiChickenEyesDL "__OTR__objects/object_gi_niwatori/gGiChickenEyesDL"
static const ALIGN_ASSET(2) char gGiChickenEyesDL[] = dgGiChickenEyesDL;
#define dobject_gi_niwatoriTex_000000 "__OTR__objects/object_gi_niwatori/object_gi_niwatoriTex_000000"
static const ALIGN_ASSET(2) char object_gi_niwatoriTex_000000[] = dobject_gi_niwatoriTex_000000;
#define dobject_gi_niwatoriTex_000800 "__OTR__objects/object_gi_niwatori/object_gi_niwatoriTex_000800"
static const ALIGN_ASSET(2) char object_gi_niwatoriTex_000800[] = dobject_gi_niwatoriTex_000800;
#endif // OBJECTS_OBJECT_GI_NIWATORI_H