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/scenes/dungeons/jyasinboss/jyasinboss_room_3.h
View File

@@ -3,64 +3,64 @@
#include "align_asset_macro.h"
#define djyasinboss_room_3DL_003C88 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3DL_003C88"
static const ALIGN_ASSET(2) char jyasinboss_room_3DL_003C88[] = djyasinboss_room_3DL_003C88;
#define djyasinboss_room_3Tex_007F00 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_007F00"
static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_007F00[] = djyasinboss_room_3Tex_007F00;
#define djyasinboss_room_3Tex_008F00 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_008F00"
static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_008F00[] = djyasinboss_room_3Tex_008F00;
#define djyasinboss_room_3Tex_009F00 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_009F00"
static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_009F00[] = djyasinboss_room_3Tex_009F00;
#define djyasinboss_room_3TLUT_003EE0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3TLUT_003EE0"
static const ALIGN_ASSET(2) char jyasinboss_room_3TLUT_003EE0[] = djyasinboss_room_3TLUT_003EE0;
#define djyasinboss_room_3Tex_00A700 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_00A700"
static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_00A700[] = djyasinboss_room_3Tex_00A700;
#define djyasinboss_room_3Tex_00AF00 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_00AF00"
static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_00AF00[] = djyasinboss_room_3Tex_00AF00;
#define djyasinboss_room_3Tex_007700 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_007700"
static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_007700[] = djyasinboss_room_3Tex_007700;
#define djyasinboss_room_3Tex_006700 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_006700"
static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_006700[] = djyasinboss_room_3Tex_006700;
#define djyasinboss_room_3Tex_005700 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_005700"
static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_005700[] = djyasinboss_room_3Tex_005700;
#define djyasinboss_room_3TLUT_003CE0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3TLUT_003CE0"
static const ALIGN_ASSET(2) char jyasinboss_room_3TLUT_003CE0[] = djyasinboss_room_3TLUT_003CE0;
#define djyasinboss_room_3Tex_004700 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_004700"
static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_004700[] = djyasinboss_room_3Tex_004700;
#define djyasinboss_room_3Tex_004F00 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_004F00"
static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_004F00[] = djyasinboss_room_3Tex_004F00;
#define djyasinboss_room_3Tex_003F00 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_003F00"
#define djyasinboss_room_3Tex_003F00 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_003F00"
static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_003F00[] = djyasinboss_room_3Tex_003F00;
#define djyasinboss_room_3Tex_005300 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_005300"
static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_005300[] = djyasinboss_room_3Tex_005300;
#define djyasinboss_room_3Tex_004300 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_004300"
#define djyasinboss_room_3Tex_004300 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_004300"
static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_004300[] = djyasinboss_room_3Tex_004300;
#define djyasinboss_room_3Tex_005F00 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Tex_005F00"
#define djyasinboss_room_3Tex_004700 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_004700"
static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_004700[] = djyasinboss_room_3Tex_004700;
#define djyasinboss_room_3Tex_004F00 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_004F00"
static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_004F00[] = djyasinboss_room_3Tex_004F00;
#define djyasinboss_room_3Tex_005300 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_005300"
static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_005300[] = djyasinboss_room_3Tex_005300;
#define djyasinboss_room_3Tex_005700 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_005700"
static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_005700[] = djyasinboss_room_3Tex_005700;
#define djyasinboss_room_3Tex_005F00 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_005F00"
static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_005F00[] = djyasinboss_room_3Tex_005F00;
#define djyasinboss_room_3Set_0000A0DL_003C88 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Set_0000A0DL_003C88"
#define djyasinboss_room_3Tex_006700 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_006700"
static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_006700[] = djyasinboss_room_3Tex_006700;
#define djyasinboss_room_3Tex_007700 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_007700"
static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_007700[] = djyasinboss_room_3Tex_007700;
#define djyasinboss_room_3Tex_007F00 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_007F00"
static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_007F00[] = djyasinboss_room_3Tex_007F00;
#define djyasinboss_room_3Tex_008F00 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_008F00"
static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_008F00[] = djyasinboss_room_3Tex_008F00;
#define djyasinboss_room_3Tex_009F00 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_009F00"
static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_009F00[] = djyasinboss_room_3Tex_009F00;
#define djyasinboss_room_3Tex_00A700 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_00A700"
static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_00A700[] = djyasinboss_room_3Tex_00A700;
#define djyasinboss_room_3Tex_00AF00 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Tex_00AF00"
static const ALIGN_ASSET(2) char jyasinboss_room_3Tex_00AF00[] = djyasinboss_room_3Tex_00AF00;
#define djyasinboss_room_3TLUT_003CE0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3TLUT_003CE0"
static const ALIGN_ASSET(2) char jyasinboss_room_3TLUT_003CE0[] = djyasinboss_room_3TLUT_003CE0;
#define djyasinboss_room_3TLUT_003EE0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3TLUT_003EE0"
static const ALIGN_ASSET(2) char jyasinboss_room_3TLUT_003EE0[] = djyasinboss_room_3TLUT_003EE0;
#define djyasinboss_room_3DL_003C88 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3DL_003C88"
static const ALIGN_ASSET(2) char jyasinboss_room_3DL_003C88[] = djyasinboss_room_3DL_003C88;
#define djyasinboss_room_3Set_0000A0DL_003C88 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Set_0000A0DL_003C88"
static const ALIGN_ASSET(2) char jyasinboss_room_3Set_0000A0DL_003C88[] = djyasinboss_room_3Set_0000A0DL_003C88;
#define djyasinboss_room_3Set_000100DL_003C88 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Set_000100DL_003C88"
#define djyasinboss_room_3Set_000100DL_003C88 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Set_000100DL_003C88"
static const ALIGN_ASSET(2) char jyasinboss_room_3Set_000100DL_003C88[] = djyasinboss_room_3Set_000100DL_003C88;
#define djyasinboss_room_3Set_000160DL_003C88 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_3Set_000160DL_003C88"
#define djyasinboss_room_3Set_000160DL_003C88 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_3Set_000160DL_003C88"
static const ALIGN_ASSET(2) char jyasinboss_room_3Set_000160DL_003C88[] = djyasinboss_room_3Set_000160DL_003C88;