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

26
soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_7.h
View File

@@ -3,8 +3,17 @@
#include "align_asset_macro.h"
#define dMIZUsin_room_7DL_0014B0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7DL_0014B0"
static const ALIGN_ASSET(2) char MIZUsin_room_7DL_0014B0[] = dMIZUsin_room_7DL_0014B0;
#define dMIZUsin_room_7Tex_002560 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7Tex_002560"
static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_002560[] = dMIZUsin_room_7Tex_002560;
#define dMIZUsin_room_7Tex_002D60 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7Tex_002D60"
static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_002D60[] = dMIZUsin_room_7Tex_002D60;
#define dMIZUsin_room_7Tex_003560 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7Tex_003560"
static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_003560[] = dMIZUsin_room_7Tex_003560;
#define dMIZUsin_room_7Tex_003D60 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7Tex_003D60"
static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_003D60[] = dMIZUsin_room_7Tex_003D60;
#define dMIZUsin_room_7Tex_004560 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7Tex_004560"
static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_004560[] = dMIZUsin_room_7Tex_004560;
@@ -12,20 +21,11 @@ static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_004560[] = dMIZUsin_room_7Tex
#define dMIZUsin_room_7Tex_004D60 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7Tex_004D60"
static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_004D60[] = dMIZUsin_room_7Tex_004D60;
#define dMIZUsin_room_7Tex_003D60 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7Tex_003D60"
static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_003D60[] = dMIZUsin_room_7Tex_003D60;
#define dMIZUsin_room_7Tex_002560 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7Tex_002560"
static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_002560[] = dMIZUsin_room_7Tex_002560;
#define dMIZUsin_room_7Tex_003560 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7Tex_003560"
static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_003560[] = dMIZUsin_room_7Tex_003560;
#define dMIZUsin_room_7DL_0014B0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7DL_0014B0"
static const ALIGN_ASSET(2) char MIZUsin_room_7DL_0014B0[] = dMIZUsin_room_7DL_0014B0;
#define dMIZUsin_room_7DL_002440 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7DL_002440"
static const ALIGN_ASSET(2) char MIZUsin_room_7DL_002440[] = dMIZUsin_room_7DL_002440;
#define dMIZUsin_room_7Tex_002D60 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_7Tex_002D60"
static const ALIGN_ASSET(2) char MIZUsin_room_7Tex_002D60[] = dMIZUsin_room_7Tex_002D60;
#endif // DUNGEONS_MIZUSIN_ROOM_7_H