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

53
soh/assets/objects/object_anubice/object_anubice.h
View File

@@ -3,6 +3,33 @@
#include "align_asset_macro.h"
#define dobject_anubiceTex_000F90 "__OTR__objects/object_anubice/object_anubiceTex_000F90"
static const ALIGN_ASSET(2) char object_anubiceTex_000F90[] = dobject_anubiceTex_000F90;
#define dobject_anubiceTex_001090 "__OTR__objects/object_anubice/object_anubiceTex_001090"
static const ALIGN_ASSET(2) char object_anubiceTex_001090[] = dobject_anubiceTex_001090;
#define dobject_anubiceTex_001110 "__OTR__objects/object_anubice/object_anubiceTex_001110"
static const ALIGN_ASSET(2) char object_anubiceTex_001110[] = dobject_anubiceTex_001110;
#define dobject_anubiceTex_001510 "__OTR__objects/object_anubice/object_anubiceTex_001510"
static const ALIGN_ASSET(2) char object_anubiceTex_001510[] = dobject_anubiceTex_001510;
#define dobject_anubiceTex_001590 "__OTR__objects/object_anubice/object_anubiceTex_001590"
static const ALIGN_ASSET(2) char object_anubiceTex_001590[] = dobject_anubiceTex_001590;
#define dobject_anubiceTex_001610 "__OTR__objects/object_anubice/object_anubiceTex_001610"
static const ALIGN_ASSET(2) char object_anubiceTex_001610[] = dobject_anubiceTex_001610;
#define dobject_anubiceTex_001690 "__OTR__objects/object_anubice/object_anubiceTex_001690"
static const ALIGN_ASSET(2) char object_anubiceTex_001690[] = dobject_anubiceTex_001690;
#define dobject_anubiceTex_001A90 "__OTR__objects/object_anubice/object_anubiceTex_001A90"
static const ALIGN_ASSET(2) char object_anubiceTex_001A90[] = dobject_anubiceTex_001A90;
#define dobject_anubiceTex_0036A0 "__OTR__objects/object_anubice/object_anubiceTex_0036A0"
static const ALIGN_ASSET(2) char object_anubiceTex_0036A0[] = dobject_anubiceTex_0036A0;
#define dgAnubiceSkel "__OTR__objects/object_anubice/gAnubiceSkel"
static const ALIGN_ASSET(2) char gAnubiceSkel[] = dgAnubiceSkel;
@@ -39,12 +66,6 @@ static const ALIGN_ASSET(2) char gAnubiceAnim_000A48[] = dgAnubiceAnim_000A48;
#define dgAnubiceAnim_000BAC "__OTR__objects/object_anubice/gAnubiceAnim_000BAC"
static const ALIGN_ASSET(2) char gAnubiceAnim_000BAC[] = dgAnubiceAnim_000BAC;
#define dobject_anubiceTex_001690 "__OTR__objects/object_anubice/object_anubiceTex_001690"
static const ALIGN_ASSET(2) char object_anubiceTex_001690[] = dobject_anubiceTex_001690;
#define dobject_anubiceTex_0036A0 "__OTR__objects/object_anubice/object_anubiceTex_0036A0"
static const ALIGN_ASSET(2) char object_anubiceTex_0036A0[] = dobject_anubiceTex_0036A0;
#define dgAnubiceSkelLimbsLimb_0038B8DL_002CE0 "__OTR__objects/object_anubice/gAnubiceSkelLimbsLimb_0038B8DL_002CE0"
static const ALIGN_ASSET(2) char gAnubiceSkelLimbsLimb_0038B8DL_002CE0[] = dgAnubiceSkelLimbsLimb_0038B8DL_002CE0;
@@ -69,25 +90,5 @@ static const ALIGN_ASSET(2) char gAnubiceSkelLimbsLimb_003930DL_003288[] = dgAnu
#define dgAnubiceSkelLimbsLimb_003948DL_0031A0 "__OTR__objects/object_anubice/gAnubiceSkelLimbsLimb_003948DL_0031A0"
static const ALIGN_ASSET(2) char gAnubiceSkelLimbsLimb_003948DL_0031A0[] = dgAnubiceSkelLimbsLimb_003948DL_0031A0;
#define dobject_anubiceTex_001090 "__OTR__objects/object_anubice/object_anubiceTex_001090"
static const ALIGN_ASSET(2) char object_anubiceTex_001090[] = dobject_anubiceTex_001090;
#define dobject_anubiceTex_000F90 "__OTR__objects/object_anubice/object_anubiceTex_000F90"
static const ALIGN_ASSET(2) char object_anubiceTex_000F90[] = dobject_anubiceTex_000F90;
#define dobject_anubiceTex_001110 "__OTR__objects/object_anubice/object_anubiceTex_001110"
static const ALIGN_ASSET(2) char object_anubiceTex_001110[] = dobject_anubiceTex_001110;
#define dobject_anubiceTex_001510 "__OTR__objects/object_anubice/object_anubiceTex_001510"
static const ALIGN_ASSET(2) char object_anubiceTex_001510[] = dobject_anubiceTex_001510;
#define dobject_anubiceTex_001590 "__OTR__objects/object_anubice/object_anubiceTex_001590"
static const ALIGN_ASSET(2) char object_anubiceTex_001590[] = dobject_anubiceTex_001590;
#define dobject_anubiceTex_001610 "__OTR__objects/object_anubice/object_anubiceTex_001610"
static const ALIGN_ASSET(2) char object_anubiceTex_001610[] = dobject_anubiceTex_001610;
#define dobject_anubiceTex_001A90 "__OTR__objects/object_anubice/object_anubiceTex_001A90"
static const ALIGN_ASSET(2) char object_anubiceTex_001A90[] = dobject_anubiceTex_001A90;
#endif // OBJECTS_OBJECT_ANUBICE_H