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

72
soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_0.h
View File

@@ -3,38 +3,50 @@
#include "align_asset_macro.h"
#define djyasinzou_room_0DL_004820 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0DL_004820"
static const ALIGN_ASSET(2) char jyasinzou_room_0DL_004820[] = djyasinzou_room_0DL_004820;
#define djyasinzou_room_0Tex_00C9D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00C9D8"
static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00C9D8[] = djyasinzou_room_0Tex_00C9D8;
#define djyasinzou_room_0Tex_00F9D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00F9D8"
static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00F9D8[] = djyasinzou_room_0Tex_00F9D8;
#define djyasinzou_room_0Tex_00DDD8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00DDD8"
static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00DDD8[] = djyasinzou_room_0Tex_00DDD8;
#define djyasinzou_room_0Tex_00E9D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00E9D8"
static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00E9D8[] = djyasinzou_room_0Tex_00E9D8;
#define djyasinzou_room_0Tex_00E1D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00E1D8"
static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00E1D8[] = djyasinzou_room_0Tex_00E1D8;
#define djyasinzou_room_0Tex_00D5D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00D5D8"
static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00D5D8[] = djyasinzou_room_0Tex_00D5D8;
#define djyasinzou_room_0Tex_00A9D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00A9D8"
static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00A9D8[] = djyasinzou_room_0Tex_00A9D8;
#define djyasinzou_room_0Tex_00B1D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00B1D8"
static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00B1D8[] = djyasinzou_room_0Tex_00B1D8;
#define djyasinzou_room_0DL_005CB0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0DL_005CB0"
static const ALIGN_ASSET(2) char jyasinzou_room_0DL_005CB0[] = djyasinzou_room_0DL_005CB0;
#define djyasinzou_room_0Tex_00B9D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00B9D8"
static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00B9D8[] = djyasinzou_room_0Tex_00B9D8;
#define djyasinzou_room_0Tex_00C1D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00C1D8"
static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00C1D8[] = djyasinzou_room_0Tex_00C1D8;
#define djyasinzou_room_0Tex_00B9D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00B9D8"
static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00B9D8[] = djyasinzou_room_0Tex_00B9D8;
#define djyasinzou_room_0Tex_00C9D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00C9D8"
static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00C9D8[] = djyasinzou_room_0Tex_00C9D8;
#define djyasinzou_room_0Tex_00D1D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00D1D8"
static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00D1D8[] = djyasinzou_room_0Tex_00D1D8;
#define djyasinzou_room_0Tex_00D5D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00D5D8"
static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00D5D8[] = djyasinzou_room_0Tex_00D5D8;
#define djyasinzou_room_0Tex_00DDD8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00DDD8"
static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00DDD8[] = djyasinzou_room_0Tex_00DDD8;
#define djyasinzou_room_0Tex_00E1D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00E1D8"
static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00E1D8[] = djyasinzou_room_0Tex_00E1D8;
#define djyasinzou_room_0Tex_00E9D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00E9D8"
static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00E9D8[] = djyasinzou_room_0Tex_00E9D8;
#define djyasinzou_room_0Tex_00F1D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00F1D8"
static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00F1D8[] = djyasinzou_room_0Tex_00F1D8;
#define djyasinzou_room_0Tex_00F9D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00F9D8"
static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00F9D8[] = djyasinzou_room_0Tex_00F9D8;
#define djyasinzou_room_0Tex_0107E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_0107E8"
static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_0107E8[] = djyasinzou_room_0Tex_0107E8;
#define djyasinzou_room_0DL_004820 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0DL_004820"
static const ALIGN_ASSET(2) char jyasinzou_room_0DL_004820[] = djyasinzou_room_0DL_004820;
#define djyasinzou_room_0DL_005CB0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0DL_005CB0"
static const ALIGN_ASSET(2) char jyasinzou_room_0DL_005CB0[] = djyasinzou_room_0DL_005CB0;
#define djyasinzou_room_0DL_007248 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0DL_007248"
static const ALIGN_ASSET(2) char jyasinzou_room_0DL_007248[] = djyasinzou_room_0DL_007248;
@@ -51,9 +63,6 @@ static const ALIGN_ASSET(2) char jyasinzou_room_0DL_008200[] = djyasinzou_room_0
#define djyasinzou_room_0DL_008AE0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0DL_008AE0"
static const ALIGN_ASSET(2) char jyasinzou_room_0DL_008AE0[] = djyasinzou_room_0DL_008AE0;
#define djyasinzou_room_0Tex_00A9D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00A9D8"
static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00A9D8[] = djyasinzou_room_0Tex_00A9D8;
#define djyasinzou_room_0DL_006768 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0DL_006768"
static const ALIGN_ASSET(2) char jyasinzou_room_0DL_006768[] = djyasinzou_room_0DL_006768;
@@ -66,18 +75,9 @@ static const ALIGN_ASSET(2) char jyasinzou_room_0DL_009A08[] = djyasinzou_room_0
#define djyasinzou_room_0DL_0030A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0DL_0030A0"
static const ALIGN_ASSET(2) char jyasinzou_room_0DL_0030A0[] = djyasinzou_room_0DL_0030A0;
#define djyasinzou_room_0Tex_00D1D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00D1D8"
static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00D1D8[] = djyasinzou_room_0Tex_00D1D8;
#define djyasinzou_room_0Tex_00F1D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_00F1D8"
static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_00F1D8[] = djyasinzou_room_0Tex_00F1D8;
#define djyasinzou_room_0DL_010468 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0DL_010468"
static const ALIGN_ASSET(2) char jyasinzou_room_0DL_010468[] = djyasinzou_room_0DL_010468;
#define djyasinzou_room_0Tex_0107E8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0Tex_0107E8"
static const ALIGN_ASSET(2) char jyasinzou_room_0Tex_0107E8[] = djyasinzou_room_0Tex_0107E8;
#define djyasinzou_room_0DL_00A2B0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_0DL_00A2B0"
static const ALIGN_ASSET(2) char jyasinzou_room_0DL_00A2B0[] = djyasinzou_room_0DL_00A2B0;