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_21.h
View File

@@ -3,8 +3,14 @@
#include "align_asset_macro.h"
#define djyasinzou_room_21DL_000A80 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21DL_000A80"
static const ALIGN_ASSET(2) char jyasinzou_room_21DL_000A80[] = djyasinzou_room_21DL_000A80;
#define djyasinzou_room_21Tex_001660 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21Tex_001660"
static const ALIGN_ASSET(2) char jyasinzou_room_21Tex_001660[] = djyasinzou_room_21Tex_001660;
#define djyasinzou_room_21Tex_002660 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21Tex_002660"
static const ALIGN_ASSET(2) char jyasinzou_room_21Tex_002660[] = djyasinzou_room_21Tex_002660;
#define djyasinzou_room_21Tex_002E60 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21Tex_002E60"
static const ALIGN_ASSET(2) char jyasinzou_room_21Tex_002E60[] = djyasinzou_room_21Tex_002E60;
#define djyasinzou_room_21Tex_003260 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21Tex_003260"
static const ALIGN_ASSET(2) char jyasinzou_room_21Tex_003260[] = djyasinzou_room_21Tex_003260;
@@ -12,21 +18,15 @@ static const ALIGN_ASSET(2) char jyasinzou_room_21Tex_003260[] = djyasinzou_room
#define djyasinzou_room_21Tex_003660 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21Tex_003660"
static const ALIGN_ASSET(2) char jyasinzou_room_21Tex_003660[] = djyasinzou_room_21Tex_003660;
#define djyasinzou_room_21Tex_002660 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21Tex_002660"
static const ALIGN_ASSET(2) char jyasinzou_room_21Tex_002660[] = djyasinzou_room_21Tex_002660;
#define djyasinzou_room_21Tex_003E60 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21Tex_003E60"
static const ALIGN_ASSET(2) char jyasinzou_room_21Tex_003E60[] = djyasinzou_room_21Tex_003E60;
#define djyasinzou_room_21DL_000A80 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21DL_000A80"
static const ALIGN_ASSET(2) char jyasinzou_room_21DL_000A80[] = djyasinzou_room_21DL_000A80;
#define djyasinzou_room_21DL_0012A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21DL_0012A0"
static const ALIGN_ASSET(2) char jyasinzou_room_21DL_0012A0[] = djyasinzou_room_21DL_0012A0;
#define djyasinzou_room_21Tex_001660 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21Tex_001660"
static const ALIGN_ASSET(2) char jyasinzou_room_21Tex_001660[] = djyasinzou_room_21Tex_001660;
#define djyasinzou_room_21Tex_002E60 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21Tex_002E60"
static const ALIGN_ASSET(2) char jyasinzou_room_21Tex_002E60[] = djyasinzou_room_21Tex_002E60;
#define djyasinzou_room_21DL_001520 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_21DL_001520"
static const ALIGN_ASSET(2) char jyasinzou_room_21DL_001520[] = djyasinzou_room_21DL_001520;