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

96
soh/assets/objects/object_blkobj/object_blkobj.h
View File

@@ -3,17 +3,8 @@
#include "align_asset_macro.h"
#define dgIllusionRoomCol "__OTR__objects/object_blkobj/gIllusionRoomCol"
static const ALIGN_ASSET(2) char gIllusionRoomCol[] = dgIllusionRoomCol;
#define dgIllusionRoomNormalDL "__OTR__objects/object_blkobj/gIllusionRoomNormalDL"
static const ALIGN_ASSET(2) char gIllusionRoomNormalDL[] = dgIllusionRoomNormalDL;
#define dgIllusionRoomIllusionDL "__OTR__objects/object_blkobj/gIllusionRoomIllusionDL"
static const ALIGN_ASSET(2) char gIllusionRoomIllusionDL[] = dgIllusionRoomIllusionDL;
#define dgIllusionRoomTreeDL "__OTR__objects/object_blkobj/gIllusionRoomTreeDL"
static const ALIGN_ASSET(2) char gIllusionRoomTreeDL[] = dgIllusionRoomTreeDL;
#define dobject_blkobjTex_008090 "__OTR__objects/object_blkobj/object_blkobjTex_008090"
static const ALIGN_ASSET(2) char object_blkobjTex_008090[] = dobject_blkobjTex_008090;
#define dobject_blkobjTex_008890 "__OTR__objects/object_blkobj/object_blkobjTex_008890"
static const ALIGN_ASSET(2) char object_blkobjTex_008890[] = dobject_blkobjTex_008890;
@@ -21,50 +12,41 @@ static const ALIGN_ASSET(2) char object_blkobjTex_008890[] = dobject_blkobjTex_0
#define dobject_blkobjTex_009090 "__OTR__objects/object_blkobj/object_blkobjTex_009090"
static const ALIGN_ASSET(2) char object_blkobjTex_009090[] = dobject_blkobjTex_009090;
#define dobject_blkobjTex_00C090 "__OTR__objects/object_blkobj/object_blkobjTex_00C090"
static const ALIGN_ASSET(2) char object_blkobjTex_00C090[] = dobject_blkobjTex_00C090;
#define dobject_blkobjTex_00D090 "__OTR__objects/object_blkobj/object_blkobjTex_00D090"
static const ALIGN_ASSET(2) char object_blkobjTex_00D090[] = dobject_blkobjTex_00D090;
#define dobject_blkobjTex_009890 "__OTR__objects/object_blkobj/object_blkobjTex_009890"
static const ALIGN_ASSET(2) char object_blkobjTex_009890[] = dobject_blkobjTex_009890;
#define dobject_blkobjTex_00B890 "__OTR__objects/object_blkobj/object_blkobjTex_00B890"
static const ALIGN_ASSET(2) char object_blkobjTex_00B890[] = dobject_blkobjTex_00B890;
#define dobject_blkobjTex_00C890 "__OTR__objects/object_blkobj/object_blkobjTex_00C890"
static const ALIGN_ASSET(2) char object_blkobjTex_00C890[] = dobject_blkobjTex_00C890;
#define dobject_blkobjTex_00B090 "__OTR__objects/object_blkobj/object_blkobjTex_00B090"
static const ALIGN_ASSET(2) char object_blkobjTex_00B090[] = dobject_blkobjTex_00B090;
#define dobject_blkobjTex_00E090 "__OTR__objects/object_blkobj/object_blkobjTex_00E090"
static const ALIGN_ASSET(2) char object_blkobjTex_00E090[] = dobject_blkobjTex_00E090;
#define dobject_blkobjTex_008090 "__OTR__objects/object_blkobj/object_blkobjTex_008090"
static const ALIGN_ASSET(2) char object_blkobjTex_008090[] = dobject_blkobjTex_008090;
#define dobject_blkobjTex_00A890 "__OTR__objects/object_blkobj/object_blkobjTex_00A890"
static const ALIGN_ASSET(2) char object_blkobjTex_00A890[] = dobject_blkobjTex_00A890;
#define dobject_blkobjTex_00D890 "__OTR__objects/object_blkobj/object_blkobjTex_00D890"
static const ALIGN_ASSET(2) char object_blkobjTex_00D890[] = dobject_blkobjTex_00D890;
#define dobject_blkobjTex_00A090 "__OTR__objects/object_blkobj/object_blkobjTex_00A090"
static const ALIGN_ASSET(2) char object_blkobjTex_00A090[] = dobject_blkobjTex_00A090;
#define dobject_blkobjTex_00A890 "__OTR__objects/object_blkobj/object_blkobjTex_00A890"
static const ALIGN_ASSET(2) char object_blkobjTex_00A890[] = dobject_blkobjTex_00A890;
#define dobject_blkobjTex_00B090 "__OTR__objects/object_blkobj/object_blkobjTex_00B090"
static const ALIGN_ASSET(2) char object_blkobjTex_00B090[] = dobject_blkobjTex_00B090;
#define dobject_blkobjTex_00B890 "__OTR__objects/object_blkobj/object_blkobjTex_00B890"
static const ALIGN_ASSET(2) char object_blkobjTex_00B890[] = dobject_blkobjTex_00B890;
#define dobject_blkobjTex_00C090 "__OTR__objects/object_blkobj/object_blkobjTex_00C090"
static const ALIGN_ASSET(2) char object_blkobjTex_00C090[] = dobject_blkobjTex_00C090;
#define dobject_blkobjTex_00C890 "__OTR__objects/object_blkobj/object_blkobjTex_00C890"
static const ALIGN_ASSET(2) char object_blkobjTex_00C890[] = dobject_blkobjTex_00C890;
#define dobject_blkobjTex_00D090 "__OTR__objects/object_blkobj/object_blkobjTex_00D090"
static const ALIGN_ASSET(2) char object_blkobjTex_00D090[] = dobject_blkobjTex_00D090;
#define dobject_blkobjTex_00D890 "__OTR__objects/object_blkobj/object_blkobjTex_00D890"
static const ALIGN_ASSET(2) char object_blkobjTex_00D890[] = dobject_blkobjTex_00D890;
#define dobject_blkobjTex_00E090 "__OTR__objects/object_blkobj/object_blkobjTex_00E090"
static const ALIGN_ASSET(2) char object_blkobjTex_00E090[] = dobject_blkobjTex_00E090;
#define dobject_blkobjTex_00E890 "__OTR__objects/object_blkobj/object_blkobjTex_00E890"
static const ALIGN_ASSET(2) char object_blkobjTex_00E890[] = dobject_blkobjTex_00E890;
#define dobject_blkobjTex_013090 "__OTR__objects/object_blkobj/object_blkobjTex_013090"
static const ALIGN_ASSET(2) char object_blkobjTex_013090[] = dobject_blkobjTex_013090;
#define dobject_blkobjTex_012890 "__OTR__objects/object_blkobj/object_blkobjTex_012890"
static const ALIGN_ASSET(2) char object_blkobjTex_012890[] = dobject_blkobjTex_012890;
#define dobject_blkobjTex_012090 "__OTR__objects/object_blkobj/object_blkobjTex_012090"
static const ALIGN_ASSET(2) char object_blkobjTex_012090[] = dobject_blkobjTex_012090;
#define dobject_blkobjTex_00F890 "__OTR__objects/object_blkobj/object_blkobjTex_00F890"
static const ALIGN_ASSET(2) char object_blkobjTex_00F890[] = dobject_blkobjTex_00F890;
#define dobject_blkobjTex_010090 "__OTR__objects/object_blkobj/object_blkobjTex_010090"
static const ALIGN_ASSET(2) char object_blkobjTex_010090[] = dobject_blkobjTex_010090;
@@ -78,7 +60,25 @@ static const ALIGN_ASSET(2) char object_blkobjTex_011090[] = dobject_blkobjTex_0
#define dobject_blkobjTex_011890 "__OTR__objects/object_blkobj/object_blkobjTex_011890"
static const ALIGN_ASSET(2) char object_blkobjTex_011890[] = dobject_blkobjTex_011890;
#define dobject_blkobjTex_00F890 "__OTR__objects/object_blkobj/object_blkobjTex_00F890"
static const ALIGN_ASSET(2) char object_blkobjTex_00F890[] = dobject_blkobjTex_00F890;
#define dobject_blkobjTex_012090 "__OTR__objects/object_blkobj/object_blkobjTex_012090"
static const ALIGN_ASSET(2) char object_blkobjTex_012090[] = dobject_blkobjTex_012090;
#define dobject_blkobjTex_012890 "__OTR__objects/object_blkobj/object_blkobjTex_012890"
static const ALIGN_ASSET(2) char object_blkobjTex_012890[] = dobject_blkobjTex_012890;
#define dobject_blkobjTex_013090 "__OTR__objects/object_blkobj/object_blkobjTex_013090"
static const ALIGN_ASSET(2) char object_blkobjTex_013090[] = dobject_blkobjTex_013090;
#define dgIllusionRoomCol "__OTR__objects/object_blkobj/gIllusionRoomCol"
static const ALIGN_ASSET(2) char gIllusionRoomCol[] = dgIllusionRoomCol;
#define dgIllusionRoomNormalDL "__OTR__objects/object_blkobj/gIllusionRoomNormalDL"
static const ALIGN_ASSET(2) char gIllusionRoomNormalDL[] = dgIllusionRoomNormalDL;
#define dgIllusionRoomIllusionDL "__OTR__objects/object_blkobj/gIllusionRoomIllusionDL"
static const ALIGN_ASSET(2) char gIllusionRoomIllusionDL[] = dgIllusionRoomIllusionDL;
#define dgIllusionRoomTreeDL "__OTR__objects/object_blkobj/gIllusionRoomTreeDL"
static const ALIGN_ASSET(2) char gIllusionRoomTreeDL[] = dgIllusionRoomTreeDL;
#endif // OBJECTS_OBJECT_BLKOBJ_H