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

22
soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_6.h
View File

@@ -3,11 +3,8 @@
#include "align_asset_macro.h"
#define djyasinzou_room_6DL_000340 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6DL_000340"
static const ALIGN_ASSET(2) char jyasinzou_room_6DL_000340[] = djyasinzou_room_6DL_000340;
#define djyasinzou_room_6DL_0014D0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6DL_0014D0"
static const ALIGN_ASSET(2) char jyasinzou_room_6DL_0014D0[] = djyasinzou_room_6DL_0014D0;
#define djyasinzou_room_6Tex_002BE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6Tex_002BE8"
static const ALIGN_ASSET(2) char jyasinzou_room_6Tex_002BE8[] = djyasinzou_room_6Tex_002BE8;
#define djyasinzou_room_6Tex_0033E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6Tex_0033E8"
static const ALIGN_ASSET(2) char jyasinzou_room_6Tex_0033E8[] = djyasinzou_room_6Tex_0033E8;
@@ -15,18 +12,21 @@ static const ALIGN_ASSET(2) char jyasinzou_room_6Tex_0033E8[] = djyasinzou_room_
#define djyasinzou_room_6Tex_0037E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6Tex_0037E8"
static const ALIGN_ASSET(2) char jyasinzou_room_6Tex_0037E8[] = djyasinzou_room_6Tex_0037E8;
#define djyasinzou_room_6DL_001EC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6DL_001EC8"
static const ALIGN_ASSET(2) char jyasinzou_room_6DL_001EC8[] = djyasinzou_room_6DL_001EC8;
#define djyasinzou_room_6Tex_003FE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6Tex_003FE8"
static const ALIGN_ASSET(2) char jyasinzou_room_6Tex_003FE8[] = djyasinzou_room_6Tex_003FE8;
#define djyasinzou_room_6DL_000340 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6DL_000340"
static const ALIGN_ASSET(2) char jyasinzou_room_6DL_000340[] = djyasinzou_room_6DL_000340;
#define djyasinzou_room_6DL_0014D0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6DL_0014D0"
static const ALIGN_ASSET(2) char jyasinzou_room_6DL_0014D0[] = djyasinzou_room_6DL_0014D0;
#define djyasinzou_room_6DL_001EC8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6DL_001EC8"
static const ALIGN_ASSET(2) char jyasinzou_room_6DL_001EC8[] = djyasinzou_room_6DL_001EC8;
#define djyasinzou_room_6DL_002420 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6DL_002420"
static const ALIGN_ASSET(2) char jyasinzou_room_6DL_002420[] = djyasinzou_room_6DL_002420;
#define djyasinzou_room_6Tex_002BE8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6Tex_002BE8"
static const ALIGN_ASSET(2) char jyasinzou_room_6Tex_002BE8[] = djyasinzou_room_6Tex_002BE8;
#define djyasinzou_room_6DL_002950 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_6DL_002950"
static const ALIGN_ASSET(2) char jyasinzou_room_6DL_002950[] = djyasinzou_room_6DL_002950;