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

32
soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_2.h
View File

@@ -3,17 +3,29 @@
#include "align_asset_macro.h"
#define djyasinzou_room_2DL_0006F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2DL_0006F0"
static const ALIGN_ASSET(2) char jyasinzou_room_2DL_0006F0[] = djyasinzou_room_2DL_0006F0;
#define djyasinzou_room_2Tex_0023B0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_0023B0"
static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_0023B0[] = djyasinzou_room_2Tex_0023B0;
#define djyasinzou_room_2Tex_0033B0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_0033B0"
static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_0033B0[] = djyasinzou_room_2Tex_0033B0;
#define djyasinzou_room_2Tex_003BB0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_003BB0"
static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_003BB0[] = djyasinzou_room_2Tex_003BB0;
#define djyasinzou_room_2Tex_003FB0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_003FB0"
static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_003FB0[] = djyasinzou_room_2Tex_003FB0;
#define djyasinzou_room_2Tex_0047B0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_0047B0"
static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_0047B0[] = djyasinzou_room_2Tex_0047B0;
#define djyasinzou_room_2Tex_004BB0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_004BB0"
static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_004BB0[] = djyasinzou_room_2Tex_004BB0;
#define djyasinzou_room_2Tex_0053B0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_0053B0"
static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_0053B0[] = djyasinzou_room_2Tex_0053B0;
#define djyasinzou_room_2Tex_0033B0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_0033B0"
static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_0033B0[] = djyasinzou_room_2Tex_0033B0;
#define djyasinzou_room_2DL_0006F0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2DL_0006F0"
static const ALIGN_ASSET(2) char jyasinzou_room_2DL_0006F0[] = djyasinzou_room_2DL_0006F0;
#define djyasinzou_room_2DL_000C58 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2DL_000C58"
static const ALIGN_ASSET(2) char jyasinzou_room_2DL_000C58[] = djyasinzou_room_2DL_000C58;
@@ -21,21 +33,9 @@ static const ALIGN_ASSET(2) char jyasinzou_room_2DL_000C58[] = djyasinzou_room_2
#define djyasinzou_room_2DL_001398 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2DL_001398"
static const ALIGN_ASSET(2) char jyasinzou_room_2DL_001398[] = djyasinzou_room_2DL_001398;
#define djyasinzou_room_2Tex_004BB0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_004BB0"
static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_004BB0[] = djyasinzou_room_2Tex_004BB0;
#define djyasinzou_room_2DL_001D88 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2DL_001D88"
static const ALIGN_ASSET(2) char jyasinzou_room_2DL_001D88[] = djyasinzou_room_2DL_001D88;
#define djyasinzou_room_2Tex_003BB0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_003BB0"
static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_003BB0[] = djyasinzou_room_2Tex_003BB0;
#define djyasinzou_room_2Tex_0023B0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_0023B0"
static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_0023B0[] = djyasinzou_room_2Tex_0023B0;
#define djyasinzou_room_2Tex_003FB0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2Tex_003FB0"
static const ALIGN_ASSET(2) char jyasinzou_room_2Tex_003FB0[] = djyasinzou_room_2Tex_003FB0;
#define djyasinzou_room_2DL_002170 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_2DL_002170"
static const ALIGN_ASSET(2) char jyasinzou_room_2DL_002170[] = djyasinzou_room_2DL_002170;