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

20
soh/assets/scenes/dungeons/HAKAdan/HAKAdan_room_0.h
View File

@@ -3,14 +3,20 @@
#include "align_asset_macro.h"
#define dHAKAdan_room_0DL_002768 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0DL_002768"
static const ALIGN_ASSET(2) char HAKAdan_room_0DL_002768[] = dHAKAdan_room_0DL_002768;
#define dHAKAdan_room_0Tex_008230 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0Tex_008230"
static const ALIGN_ASSET(2) char HAKAdan_room_0Tex_008230[] = dHAKAdan_room_0Tex_008230;
#define dHAKAdan_room_0Tex_009230 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0Tex_009230"
static const ALIGN_ASSET(2) char HAKAdan_room_0Tex_009230[] = dHAKAdan_room_0Tex_009230;
#define dHAKAdan_room_0Tex_008230 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0Tex_008230"
static const ALIGN_ASSET(2) char HAKAdan_room_0Tex_008230[] = dHAKAdan_room_0Tex_008230;
#define dHAKAdan_room_0Tex_00A230 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0Tex_00A230"
static const ALIGN_ASSET(2) char HAKAdan_room_0Tex_00A230[] = dHAKAdan_room_0Tex_00A230;
#define dHAKAdan_room_0Tex_00AD48 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0Tex_00AD48"
static const ALIGN_ASSET(2) char HAKAdan_room_0Tex_00AD48[] = dHAKAdan_room_0Tex_00AD48;
#define dHAKAdan_room_0DL_002768 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0DL_002768"
static const ALIGN_ASSET(2) char HAKAdan_room_0DL_002768[] = dHAKAdan_room_0DL_002768;
#define dHAKAdan_room_0DL_005FF0 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0DL_005FF0"
static const ALIGN_ASSET(2) char HAKAdan_room_0DL_005FF0[] = dHAKAdan_room_0DL_005FF0;
@@ -18,9 +24,6 @@ static const ALIGN_ASSET(2) char HAKAdan_room_0DL_005FF0[] = dHAKAdan_room_0DL_0
#define dHAKAdan_room_0DL_000D00 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0DL_000D00"
static const ALIGN_ASSET(2) char HAKAdan_room_0DL_000D00[] = dHAKAdan_room_0DL_000D00;
#define dHAKAdan_room_0Tex_00A230 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0Tex_00A230"
static const ALIGN_ASSET(2) char HAKAdan_room_0Tex_00A230[] = dHAKAdan_room_0Tex_00A230;
#define dHAKAdan_room_0DL_007EC8 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0DL_007EC8"
static const ALIGN_ASSET(2) char HAKAdan_room_0DL_007EC8[] = dHAKAdan_room_0DL_007EC8;
@@ -30,8 +33,5 @@ static const ALIGN_ASSET(2) char HAKAdan_room_0DL_0045C0[] = dHAKAdan_room_0DL_0
#define dHAKAdan_room_0DL_00AC40 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0DL_00AC40"
static const ALIGN_ASSET(2) char HAKAdan_room_0DL_00AC40[] = dHAKAdan_room_0DL_00AC40;
#define dHAKAdan_room_0Tex_00AD48 "__OTR__scenes/nonmq/HAKAdan_scene/HAKAdan_room_0Tex_00AD48"
static const ALIGN_ASSET(2) char HAKAdan_room_0Tex_00AD48[] = dHAKAdan_room_0Tex_00AD48;
#endif // DUNGEONS_HAKADAN_ROOM_0_H