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

23
soh/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_scene.h
View File

@@ -3,19 +3,20 @@
#include "align_asset_macro.h"
#define dHAKAdan_bs_sceneCollisionHeader_00134C "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_sceneCollisionHeader_00134C"
static const ALIGN_ASSET(2) char HAKAdan_bs_sceneCollisionHeader_00134C[] = dHAKAdan_bs_sceneCollisionHeader_00134C;
#define dHAKAdan_bs_sceneTex_001F80 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_sceneTex_001F80"
static const ALIGN_ASSET(2) char HAKAdan_bs_sceneTex_001F80[] = dHAKAdan_bs_sceneTex_001F80;
#define dHAKAdan_bs_sceneTex_001580 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_sceneTex_001580"
static const ALIGN_ASSET(2) char HAKAdan_bs_sceneTex_001580[] = dHAKAdan_bs_sceneTex_001580;
#define dHAKAdan_bs_sceneTex_001380 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_sceneTex_001380"
#define dHAKAdan_bs_sceneTex_001380 "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_sceneTex_001380"
static const ALIGN_ASSET(2) char HAKAdan_bs_sceneTex_001380[] = dHAKAdan_bs_sceneTex_001380;
#define dHAKAdan_bs_sceneTex_001780 "__OTR__scenes/nonmq/HAKAdan_bs_scene/HAKAdan_bs_sceneTex_001780"
#define dHAKAdan_bs_sceneTex_001580 "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_sceneTex_001580"
static const ALIGN_ASSET(2) char HAKAdan_bs_sceneTex_001580[] = dHAKAdan_bs_sceneTex_001580;
#define dHAKAdan_bs_sceneTex_001780 "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_sceneTex_001780"
static const ALIGN_ASSET(2) char HAKAdan_bs_sceneTex_001780[] = dHAKAdan_bs_sceneTex_001780;
#define dHAKAdan_bs_sceneTex_001F80 "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_sceneTex_001F80"
static const ALIGN_ASSET(2) char HAKAdan_bs_sceneTex_001F80[] = dHAKAdan_bs_sceneTex_001F80;
#define dHAKAdan_bs_sceneCollisionHeader_00134C "__OTR__scenes/shared/HAKAdan_bs_scene/HAKAdan_bs_sceneCollisionHeader_00134C"
static const ALIGN_ASSET(2) char HAKAdan_bs_sceneCollisionHeader_00134C[] = dHAKAdan_bs_sceneCollisionHeader_00134C;
#endif // DUNGEONS_HAKADAN_BS_SCENE_H