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

24
soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_6.h
View File

@@ -3,23 +3,26 @@
#include "align_asset_macro.h"
#define dHAKAdan_room_6DL_004178 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6DL_004178"
static const ALIGN_ASSET(2) char HAKAdan_room_6DL_004178[] = dHAKAdan_room_6DL_004178;
#define dHAKAdan_room_6Tex_004BF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6Tex_004BF0"
static const ALIGN_ASSET(2) char HAKAdan_room_6Tex_004BF0[] = dHAKAdan_room_6Tex_004BF0;
#define dHAKAdan_room_6Tex_0071F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6Tex_0071F0"
static const ALIGN_ASSET(2) char HAKAdan_room_6Tex_0071F0[] = dHAKAdan_room_6Tex_0071F0;
#define dHAKAdan_room_6Tex_0053F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6Tex_0053F0"
static const ALIGN_ASSET(2) char HAKAdan_room_6Tex_0053F0[] = dHAKAdan_room_6Tex_0053F0;
#define dHAKAdan_room_6Tex_0055F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6Tex_0055F0"
static const ALIGN_ASSET(2) char HAKAdan_room_6Tex_0055F0[] = dHAKAdan_room_6Tex_0055F0;
#define dHAKAdan_room_6Tex_006DF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6Tex_006DF0"
static const ALIGN_ASSET(2) char HAKAdan_room_6Tex_006DF0[] = dHAKAdan_room_6Tex_006DF0;
#define dHAKAdan_room_6Tex_0065F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6Tex_0065F0"
static const ALIGN_ASSET(2) char HAKAdan_room_6Tex_0065F0[] = dHAKAdan_room_6Tex_0065F0;
#define dHAKAdan_room_6Tex_0053F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6Tex_0053F0"
static const ALIGN_ASSET(2) char HAKAdan_room_6Tex_0053F0[] = dHAKAdan_room_6Tex_0053F0;
#define dHAKAdan_room_6Tex_006DF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6Tex_006DF0"
static const ALIGN_ASSET(2) char HAKAdan_room_6Tex_006DF0[] = dHAKAdan_room_6Tex_006DF0;
#define dHAKAdan_room_6Tex_0071F0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6Tex_0071F0"
static const ALIGN_ASSET(2) char HAKAdan_room_6Tex_0071F0[] = dHAKAdan_room_6Tex_0071F0;
#define dHAKAdan_room_6DL_004178 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6DL_004178"
static const ALIGN_ASSET(2) char HAKAdan_room_6DL_004178[] = dHAKAdan_room_6DL_004178;
#define dHAKAdan_room_6DL_001B40 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6DL_001B40"
static const ALIGN_ASSET(2) char HAKAdan_room_6DL_001B40[] = dHAKAdan_room_6DL_001B40;
@@ -27,8 +30,5 @@ static const ALIGN_ASSET(2) char HAKAdan_room_6DL_001B40[] = dHAKAdan_room_6DL_0
#define dHAKAdan_room_6DL_004B18 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6DL_004B18"
static const ALIGN_ASSET(2) char HAKAdan_room_6DL_004B18[] = dHAKAdan_room_6DL_004B18;
#define dHAKAdan_room_6Tex_004BF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_6Tex_004BF0"
static const ALIGN_ASSET(2) char HAKAdan_room_6Tex_004BF0[] = dHAKAdan_room_6Tex_004BF0;
#endif // DUNGEONS_HAKADAN_ROOM_6_H