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

76
soh/assets/scenes/dungeons/MIZUsin/MIZUsin_room_6.h
View File

@@ -3,11 +3,35 @@
#include "align_asset_macro.h"
#define dMIZUsin_room_6DL_0047E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6DL_0047E8"
static const ALIGN_ASSET(2) char MIZUsin_room_6DL_0047E8[] = dMIZUsin_room_6DL_0047E8;
#define dMIZUsin_room_6Tex_005100 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_005100"
static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_005100[] = dMIZUsin_room_6Tex_005100;
#define dMIZUsin_room_6DL_002908 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6DL_002908"
static const ALIGN_ASSET(2) char MIZUsin_room_6DL_002908[] = dMIZUsin_room_6DL_002908;
#define dMIZUsin_room_6Tex_005300 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_005300"
static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_005300[] = dMIZUsin_room_6Tex_005300;
#define dMIZUsin_room_6Tex_005B00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_005B00"
static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_005B00[] = dMIZUsin_room_6Tex_005B00;
#define dMIZUsin_room_6Tex_006300 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_006300"
static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_006300[] = dMIZUsin_room_6Tex_006300;
#define dMIZUsin_room_6Tex_006500 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_006500"
static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_006500[] = dMIZUsin_room_6Tex_006500;
#define dMIZUsin_room_6Tex_006700 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_006700"
static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_006700[] = dMIZUsin_room_6Tex_006700;
#define dMIZUsin_room_6Tex_006900 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_006900"
static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_006900[] = dMIZUsin_room_6Tex_006900;
#define dMIZUsin_room_6Tex_006B00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_006B00"
static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_006B00[] = dMIZUsin_room_6Tex_006B00;
#define dMIZUsin_room_6Tex_007300 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_007300"
static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_007300[] = dMIZUsin_room_6Tex_007300;
#define dMIZUsin_room_6Tex_007B00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_007B00"
static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_007B00[] = dMIZUsin_room_6Tex_007B00;
#define dMIZUsin_room_6Tex_008300 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_008300"
static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_008300[] = dMIZUsin_room_6Tex_008300;
@@ -15,57 +39,33 @@ static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_008300[] = dMIZUsin_room_6Tex
#define dMIZUsin_room_6Tex_008B00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_008B00"
static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_008B00[] = dMIZUsin_room_6Tex_008B00;
#define dMIZUsin_room_6Tex_009300 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_009300"
static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_009300[] = dMIZUsin_room_6Tex_009300;
#define dMIZUsin_room_6Tex_009B00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_009B00"
static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_009B00[] = dMIZUsin_room_6Tex_009B00;
#define dMIZUsin_room_6Tex_00A300 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_00A300"
static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_00A300[] = dMIZUsin_room_6Tex_00A300;
#define dMIZUsin_room_6Tex_00AB00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_00AB00"
static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_00AB00[] = dMIZUsin_room_6Tex_00AB00;
#define dMIZUsin_room_6Tex_005300 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_005300"
static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_005300[] = dMIZUsin_room_6Tex_005300;
#define dMIZUsin_room_6DL_0047E8 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6DL_0047E8"
static const ALIGN_ASSET(2) char MIZUsin_room_6DL_0047E8[] = dMIZUsin_room_6DL_0047E8;
#define dMIZUsin_room_6Tex_007B00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_007B00"
static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_007B00[] = dMIZUsin_room_6Tex_007B00;
#define dMIZUsin_room_6Tex_007300 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_007300"
static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_007300[] = dMIZUsin_room_6Tex_007300;
#define dMIZUsin_room_6Tex_009B00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_009B00"
static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_009B00[] = dMIZUsin_room_6Tex_009B00;
#define dMIZUsin_room_6Tex_009300 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_009300"
static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_009300[] = dMIZUsin_room_6Tex_009300;
#define dMIZUsin_room_6Tex_005B00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_005B00"
static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_005B00[] = dMIZUsin_room_6Tex_005B00;
#define dMIZUsin_room_6DL_002908 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6DL_002908"
static const ALIGN_ASSET(2) char MIZUsin_room_6DL_002908[] = dMIZUsin_room_6DL_002908;
#define dMIZUsin_room_6DL_0014D0 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6DL_0014D0"
static const ALIGN_ASSET(2) char MIZUsin_room_6DL_0014D0[] = dMIZUsin_room_6DL_0014D0;
#define dMIZUsin_room_6Tex_006300 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_006300"
static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_006300[] = dMIZUsin_room_6Tex_006300;
#define dMIZUsin_room_6Tex_006700 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_006700"
static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_006700[] = dMIZUsin_room_6Tex_006700;
#define dMIZUsin_room_6Tex_006500 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_006500"
static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_006500[] = dMIZUsin_room_6Tex_006500;
#define dMIZUsin_room_6Tex_005100 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_005100"
static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_005100[] = dMIZUsin_room_6Tex_005100;
#define dMIZUsin_room_6Tex_006900 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_006900"
static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_006900[] = dMIZUsin_room_6Tex_006900;
#define dMIZUsin_room_6DL_003450 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6DL_003450"
static const ALIGN_ASSET(2) char MIZUsin_room_6DL_003450[] = dMIZUsin_room_6DL_003450;
#define dMIZUsin_room_6DL_003898 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6DL_003898"
static const ALIGN_ASSET(2) char MIZUsin_room_6DL_003898[] = dMIZUsin_room_6DL_003898;
#define dMIZUsin_room_6Tex_006B00 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6Tex_006B00"
static const ALIGN_ASSET(2) char MIZUsin_room_6Tex_006B00[] = dMIZUsin_room_6Tex_006B00;
#define dMIZUsin_room_6DL_003D08 "__OTR__scenes/nonmq/MIZUsin_scene/MIZUsin_room_6DL_003D08"
static const ALIGN_ASSET(2) char MIZUsin_room_6DL_003D08[] = dMIZUsin_room_6DL_003D08;