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

47
soh/assets/objects/object_skj/object_skj.h
View File

@@ -3,6 +3,30 @@
#include "align_asset_macro.h"
#define dobject_skjTex_005300 "__OTR__objects/object_skj/object_skjTex_005300"
static const ALIGN_ASSET(2) char object_skjTex_005300[] = dobject_skjTex_005300;
#define dobject_skjTex_005500 "__OTR__objects/object_skj/object_skjTex_005500"
static const ALIGN_ASSET(2) char object_skjTex_005500[] = dobject_skjTex_005500;
#define dobject_skjTex_005700 "__OTR__objects/object_skj/object_skjTex_005700"
static const ALIGN_ASSET(2) char object_skjTex_005700[] = dobject_skjTex_005700;
#define dobject_skjTex_005900 "__OTR__objects/object_skj/object_skjTex_005900"
static const ALIGN_ASSET(2) char object_skjTex_005900[] = dobject_skjTex_005900;
#define dobject_skjTex_005B00 "__OTR__objects/object_skj/object_skjTex_005B00"
static const ALIGN_ASSET(2) char object_skjTex_005B00[] = dobject_skjTex_005B00;
#define dobject_skjTex_005B80 "__OTR__objects/object_skj/object_skjTex_005B80"
static const ALIGN_ASSET(2) char object_skjTex_005B80[] = dobject_skjTex_005B80;
#define dobject_skjTex_005D80 "__OTR__objects/object_skj/object_skjTex_005D80"
static const ALIGN_ASSET(2) char object_skjTex_005D80[] = dobject_skjTex_005D80;
#define dobject_skjTex_005DA0 "__OTR__objects/object_skj/object_skjTex_005DA0"
static const ALIGN_ASSET(2) char object_skjTex_005DA0[] = dobject_skjTex_005DA0;
#define dgSkullKidNeedleDL "__OTR__objects/object_skj/gSkullKidNeedleDL"
static const ALIGN_ASSET(2) char gSkullKidNeedleDL[] = dgSkullKidNeedleDL;
@@ -123,28 +147,5 @@ static const ALIGN_ASSET(2) char gSkullKidUnkLimb_5E2CDL_0036A0[] = dgSkullKidUn
#define dgSkullKidUnkLimb_5E38DL_003E48 "__OTR__objects/object_skj/gSkullKidUnkLimb_5E38DL_003E48"
static const ALIGN_ASSET(2) char gSkullKidUnkLimb_5E38DL_003E48[] = dgSkullKidUnkLimb_5E38DL_003E48;
#define dobject_skjTex_005700 "__OTR__objects/object_skj/object_skjTex_005700"
static const ALIGN_ASSET(2) char object_skjTex_005700[] = dobject_skjTex_005700;
#define dobject_skjTex_005300 "__OTR__objects/object_skj/object_skjTex_005300"
static const ALIGN_ASSET(2) char object_skjTex_005300[] = dobject_skjTex_005300;
#define dobject_skjTex_005500 "__OTR__objects/object_skj/object_skjTex_005500"
static const ALIGN_ASSET(2) char object_skjTex_005500[] = dobject_skjTex_005500;
#define dobject_skjTex_005900 "__OTR__objects/object_skj/object_skjTex_005900"
static const ALIGN_ASSET(2) char object_skjTex_005900[] = dobject_skjTex_005900;
#define dobject_skjTex_005B00 "__OTR__objects/object_skj/object_skjTex_005B00"
static const ALIGN_ASSET(2) char object_skjTex_005B00[] = dobject_skjTex_005B00;
#define dobject_skjTex_005B80 "__OTR__objects/object_skj/object_skjTex_005B80"
static const ALIGN_ASSET(2) char object_skjTex_005B80[] = dobject_skjTex_005B80;
#define dobject_skjTex_005D80 "__OTR__objects/object_skj/object_skjTex_005D80"
static const ALIGN_ASSET(2) char object_skjTex_005D80[] = dobject_skjTex_005D80;
#define dobject_skjTex_005DA0 "__OTR__objects/object_skj/object_skjTex_005DA0"
static const ALIGN_ASSET(2) char object_skjTex_005DA0[] = dobject_skjTex_005DA0;
#endif // OBJECTS_OBJECT_SKJ_H