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

18
soh/assets/scenes/dungeons/jyasinboss/jyasinboss_room_2.h
View File

@@ -3,25 +3,25 @@
#include "align_asset_macro.h"
#define djyasinboss_room_2DL_0021A0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_2DL_0021A0"
static const ALIGN_ASSET(2) char jyasinboss_room_2DL_0021A0[] = djyasinboss_room_2DL_0021A0;
#define djyasinboss_room_2Tex_0021C0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_2Tex_0021C0"
#define djyasinboss_room_2Tex_0021C0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_2Tex_0021C0"
static const ALIGN_ASSET(2) char jyasinboss_room_2Tex_0021C0[] = djyasinboss_room_2Tex_0021C0;
#define djyasinboss_room_2Tex_0029C0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_2Tex_0029C0"
#define djyasinboss_room_2Tex_0029C0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_2Tex_0029C0"
static const ALIGN_ASSET(2) char jyasinboss_room_2Tex_0029C0[] = djyasinboss_room_2Tex_0029C0;
#define djyasinboss_room_2Tex_0039C0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_2Tex_0039C0"
#define djyasinboss_room_2Tex_0039C0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_2Tex_0039C0"
static const ALIGN_ASSET(2) char jyasinboss_room_2Tex_0039C0[] = djyasinboss_room_2Tex_0039C0;
#define djyasinboss_room_2Set_0000F0DL_0021A0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_2Set_0000F0DL_0021A0"
#define djyasinboss_room_2DL_0021A0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_2DL_0021A0"
static const ALIGN_ASSET(2) char jyasinboss_room_2DL_0021A0[] = djyasinboss_room_2DL_0021A0;
#define djyasinboss_room_2Set_0000F0DL_0021A0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_2Set_0000F0DL_0021A0"
static const ALIGN_ASSET(2) char jyasinboss_room_2Set_0000F0DL_0021A0[] = djyasinboss_room_2Set_0000F0DL_0021A0;
#define djyasinboss_room_2Set_000130DL_0021A0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_2Set_000130DL_0021A0"
#define djyasinboss_room_2Set_000130DL_0021A0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_2Set_000130DL_0021A0"
static const ALIGN_ASSET(2) char jyasinboss_room_2Set_000130DL_0021A0[] = djyasinboss_room_2Set_000130DL_0021A0;
#define djyasinboss_room_2Set_000170DL_0021A0 "__OTR__scenes/nonmq/jyasinboss_scene/jyasinboss_room_2Set_000170DL_0021A0"
#define djyasinboss_room_2Set_000170DL_0021A0 "__OTR__scenes/shared/jyasinboss_scene/jyasinboss_room_2Set_000170DL_0021A0"
static const ALIGN_ASSET(2) char jyasinboss_room_2Set_000170DL_0021A0[] = djyasinboss_room_2Set_000170DL_0021A0;