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

54
soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_12.h
View File

@@ -3,38 +3,38 @@
#include "align_asset_macro.h"
#define dHAKAdan_room_12DL_002A88 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12DL_002A88"
static const ALIGN_ASSET(2) char HAKAdan_room_12DL_002A88[] = dHAKAdan_room_12DL_002A88;
#define dHAKAdan_room_12Tex_003B48 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_003B48"
static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_003B48[] = dHAKAdan_room_12Tex_003B48;
#define dHAKAdan_room_12Tex_003748 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_003748"
static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_003748[] = dHAKAdan_room_12Tex_003748;
#define dHAKAdan_room_12Tex_003D48 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_003D48"
static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_003D48[] = dHAKAdan_room_12Tex_003D48;
#define dHAKAdan_room_12DL_0014F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12DL_0014F0"
static const ALIGN_ASSET(2) char HAKAdan_room_12DL_0014F0[] = dHAKAdan_room_12DL_0014F0;
#define dHAKAdan_room_12DL_001C60 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12DL_001C60"
static const ALIGN_ASSET(2) char HAKAdan_room_12DL_001C60[] = dHAKAdan_room_12DL_001C60;
#define dHAKAdan_room_12Tex_004D48 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_004D48"
static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_004D48[] = dHAKAdan_room_12Tex_004D48;
#define dHAKAdan_room_12DL_000CF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12DL_000CF0"
static const ALIGN_ASSET(2) char HAKAdan_room_12DL_000CF0[] = dHAKAdan_room_12DL_000CF0;
#define dHAKAdan_room_12Tex_005548 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_005548"
static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_005548[] = dHAKAdan_room_12Tex_005548;
#define dHAKAdan_room_12Tex_003348 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_003348"
static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_003348[] = dHAKAdan_room_12Tex_003348;
#define dHAKAdan_room_12Tex_003548 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_003548"
static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_003548[] = dHAKAdan_room_12Tex_003548;
#define dHAKAdan_room_12Tex_003748 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_003748"
static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_003748[] = dHAKAdan_room_12Tex_003748;
#define dHAKAdan_room_12Tex_003B48 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_003B48"
static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_003B48[] = dHAKAdan_room_12Tex_003B48;
#define dHAKAdan_room_12Tex_003D48 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_003D48"
static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_003D48[] = dHAKAdan_room_12Tex_003D48;
#define dHAKAdan_room_12Tex_004D48 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_004D48"
static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_004D48[] = dHAKAdan_room_12Tex_004D48;
#define dHAKAdan_room_12Tex_005548 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12Tex_005548"
static const ALIGN_ASSET(2) char HAKAdan_room_12Tex_005548[] = dHAKAdan_room_12Tex_005548;
#define dHAKAdan_room_12DL_002A88 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12DL_002A88"
static const ALIGN_ASSET(2) char HAKAdan_room_12DL_002A88[] = dHAKAdan_room_12DL_002A88;
#define dHAKAdan_room_12DL_0014F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12DL_0014F0"
static const ALIGN_ASSET(2) char HAKAdan_room_12DL_0014F0[] = dHAKAdan_room_12DL_0014F0;
#define dHAKAdan_room_12DL_001C60 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12DL_001C60"
static const ALIGN_ASSET(2) char HAKAdan_room_12DL_001C60[] = dHAKAdan_room_12DL_001C60;
#define dHAKAdan_room_12DL_000CF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_12DL_000CF0"
static const ALIGN_ASSET(2) char HAKAdan_room_12DL_000CF0[] = dHAKAdan_room_12DL_000CF0;
#endif // DUNGEONS_HAKADAN_ROOM_12_H