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

30
soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_15.h
View File

@@ -3,20 +3,20 @@
#include "align_asset_macro.h"
#define dMIZUsin_room_15DL_001990 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15DL_001990"
static const ALIGN_ASSET(2) char MIZUsin_room_15DL_001990[] = dMIZUsin_room_15DL_001990;
#define dMIZUsin_room_15Tex_002C68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_002C68"
static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_002C68[] = dMIZUsin_room_15Tex_002C68;
#define dMIZUsin_room_15Tex_006C68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_006C68"
static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_006C68[] = dMIZUsin_room_15Tex_006C68;
#define dMIZUsin_room_15Tex_003468 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_003468"
static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_003468[] = dMIZUsin_room_15Tex_003468;
#define dMIZUsin_room_15Tex_006468 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_006468"
static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_006468[] = dMIZUsin_room_15Tex_006468;
#define dMIZUsin_room_15Tex_003C68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_003C68"
static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_003C68[] = dMIZUsin_room_15Tex_003C68;
#define dMIZUsin_room_15Tex_004468 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_004468"
static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_004468[] = dMIZUsin_room_15Tex_004468;
#define dMIZUsin_room_15Tex_003468 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_003468"
static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_003468[] = dMIZUsin_room_15Tex_003468;
#define dMIZUsin_room_15Tex_004C68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_004C68"
static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_004C68[] = dMIZUsin_room_15Tex_004C68;
#define dMIZUsin_room_15Tex_005468 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_005468"
static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_005468[] = dMIZUsin_room_15Tex_005468;
@@ -24,17 +24,17 @@ static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_005468[] = dMIZUsin_room_15T
#define dMIZUsin_room_15Tex_005C68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_005C68"
static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_005C68[] = dMIZUsin_room_15Tex_005C68;
#define dMIZUsin_room_15Tex_004C68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_004C68"
static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_004C68[] = dMIZUsin_room_15Tex_004C68;
#define dMIZUsin_room_15Tex_006468 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_006468"
static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_006468[] = dMIZUsin_room_15Tex_006468;
#define dMIZUsin_room_15Tex_003C68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_003C68"
static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_003C68[] = dMIZUsin_room_15Tex_003C68;
#define dMIZUsin_room_15Tex_006C68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_006C68"
static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_006C68[] = dMIZUsin_room_15Tex_006C68;
#define dMIZUsin_room_15DL_001990 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15DL_001990"
static const ALIGN_ASSET(2) char MIZUsin_room_15DL_001990[] = dMIZUsin_room_15DL_001990;
#define dMIZUsin_room_15DL_002B98 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15DL_002B98"
static const ALIGN_ASSET(2) char MIZUsin_room_15DL_002B98[] = dMIZUsin_room_15DL_002B98;
#define dMIZUsin_room_15Tex_002C68 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_15Tex_002C68"
static const ALIGN_ASSET(2) char MIZUsin_room_15Tex_002C68[] = dMIZUsin_room_15Tex_002C68;
#endif // DUNGEONS_MIZUSIN_ROOM_15_H