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

36
soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_17.h
View File

@@ -3,6 +3,24 @@
#include "align_asset_macro.h"
#define dMIZUsin_room_17Tex_005AA8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_005AA8"
static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_005AA8[] = dMIZUsin_room_17Tex_005AA8;
#define dMIZUsin_room_17Tex_0062A8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_0062A8"
static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_0062A8[] = dMIZUsin_room_17Tex_0062A8;
#define dMIZUsin_room_17Tex_006AA8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_006AA8"
static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_006AA8[] = dMIZUsin_room_17Tex_006AA8;
#define dMIZUsin_room_17Tex_0072A8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_0072A8"
static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_0072A8[] = dMIZUsin_room_17Tex_0072A8;
#define dMIZUsin_room_17Tex_007AA8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_007AA8"
static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_007AA8[] = dMIZUsin_room_17Tex_007AA8;
#define dMIZUsin_room_17Tex_0082A8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_0082A8"
static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_0082A8[] = dMIZUsin_room_17Tex_0082A8;
#define dMIZUsin_room_17DL_003458 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17DL_003458"
static const ALIGN_ASSET(2) char MIZUsin_room_17DL_003458[] = dMIZUsin_room_17DL_003458;
@@ -12,33 +30,15 @@ static const ALIGN_ASSET(2) char MIZUsin_room_17DL_0041C8[] = dMIZUsin_room_17DL
#define dMIZUsin_room_17DL_001010 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17DL_001010"
static const ALIGN_ASSET(2) char MIZUsin_room_17DL_001010[] = dMIZUsin_room_17DL_001010;
#define dMIZUsin_room_17Tex_006AA8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_006AA8"
static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_006AA8[] = dMIZUsin_room_17Tex_006AA8;
#define dMIZUsin_room_17Tex_007AA8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_007AA8"
static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_007AA8[] = dMIZUsin_room_17Tex_007AA8;
#define dMIZUsin_room_17Tex_0072A8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_0072A8"
static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_0072A8[] = dMIZUsin_room_17Tex_0072A8;
#define dMIZUsin_room_17Tex_0082A8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_0082A8"
static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_0082A8[] = dMIZUsin_room_17Tex_0082A8;
#define dMIZUsin_room_17DL_005928 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17DL_005928"
static const ALIGN_ASSET(2) char MIZUsin_room_17DL_005928[] = dMIZUsin_room_17DL_005928;
#define dMIZUsin_room_17DL_0056E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17DL_0056E8"
static const ALIGN_ASSET(2) char MIZUsin_room_17DL_0056E8[] = dMIZUsin_room_17DL_0056E8;
#define dMIZUsin_room_17Tex_005AA8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_005AA8"
static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_005AA8[] = dMIZUsin_room_17Tex_005AA8;
#define dMIZUsin_room_17DL_0016E0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17DL_0016E0"
static const ALIGN_ASSET(2) char MIZUsin_room_17DL_0016E0[] = dMIZUsin_room_17DL_0016E0;
#define dMIZUsin_room_17Tex_0062A8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17Tex_0062A8"
static const ALIGN_ASSET(2) char MIZUsin_room_17Tex_0062A8[] = dMIZUsin_room_17Tex_0062A8;
#define dMIZUsin_room_17DL_001910 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_17DL_001910"
static const ALIGN_ASSET(2) char MIZUsin_room_17DL_001910[] = dMIZUsin_room_17DL_001910;