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

17
soh/assets/scenes/dungeons/moribossroom/moribossroom_scene.h
View File

@@ -3,16 +3,17 @@
#include "align_asset_macro.h"
#define dmoribossroom_sceneCollisionHeader_000B1C "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_sceneCollisionHeader_000B1C"
static const ALIGN_ASSET(2) char moribossroom_sceneCollisionHeader_000B1C[] = dmoribossroom_sceneCollisionHeader_000B1C;
#define dmoribossroom_sceneTex_000CF8 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_sceneTex_000CF8"
#define dmoribossroom_sceneTex_000CF8 "__OTR__scenes/shared/moribossroom_scene/moribossroom_sceneTex_000CF8"
static const ALIGN_ASSET(2) char moribossroom_sceneTex_000CF8[] = dmoribossroom_sceneTex_000CF8;
#define dmoribossroom_sceneTLUT_000B50 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_sceneTLUT_000B50"
static const ALIGN_ASSET(2) char moribossroom_sceneTLUT_000B50[] = dmoribossroom_sceneTLUT_000B50;
#define dmoribossroom_sceneTex_0010F8 "__OTR__scenes/nonmq/moribossroom_scene/moribossroom_sceneTex_0010F8"
#define dmoribossroom_sceneTex_0010F8 "__OTR__scenes/shared/moribossroom_scene/moribossroom_sceneTex_0010F8"
static const ALIGN_ASSET(2) char moribossroom_sceneTex_0010F8[] = dmoribossroom_sceneTex_0010F8;
#define dmoribossroom_sceneTLUT_000B50 "__OTR__scenes/shared/moribossroom_scene/moribossroom_sceneTLUT_000B50"
static const ALIGN_ASSET(2) char moribossroom_sceneTLUT_000B50[] = dmoribossroom_sceneTLUT_000B50;
#define dmoribossroom_sceneCollisionHeader_000B1C "__OTR__scenes/shared/moribossroom_scene/moribossroom_sceneCollisionHeader_000B1C"
static const ALIGN_ASSET(2) char moribossroom_sceneCollisionHeader_000B1C[] = dmoribossroom_sceneCollisionHeader_000B1C;
#endif // DUNGEONS_MORIBOSSROOM_SCENE_H