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

31
soh/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_scene.h
View File

@@ -3,25 +3,26 @@
#include "align_asset_macro.h"
#define dganon_sonogo_sceneCollisionHeader_0062CC "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_sceneCollisionHeader_0062CC"
static const ALIGN_ASSET(2) char ganon_sonogo_sceneCollisionHeader_0062CC[] = dganon_sonogo_sceneCollisionHeader_0062CC;
#define dganon_sonogo_sceneTex_007310 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_sceneTex_007310"
static const ALIGN_ASSET(2) char ganon_sonogo_sceneTex_007310[] = dganon_sonogo_sceneTex_007310;
#define dganon_sonogo_sceneTLUT_006300 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_sceneTLUT_006300"
static const ALIGN_ASSET(2) char ganon_sonogo_sceneTLUT_006300[] = dganon_sonogo_sceneTLUT_006300;
#define dganon_sonogo_sceneTex_006710 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_sceneTex_006710"
#define dganon_sonogo_sceneTex_006710 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_sceneTex_006710"
static const ALIGN_ASSET(2) char ganon_sonogo_sceneTex_006710[] = dganon_sonogo_sceneTex_006710;
#define dganon_sonogo_sceneTLUT_006508 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_sceneTLUT_006508"
static const ALIGN_ASSET(2) char ganon_sonogo_sceneTLUT_006508[] = dganon_sonogo_sceneTLUT_006508;
#define dganon_sonogo_sceneTex_006F10 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_sceneTex_006F10"
#define dganon_sonogo_sceneTex_006F10 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_sceneTex_006F10"
static const ALIGN_ASSET(2) char ganon_sonogo_sceneTex_006F10[] = dganon_sonogo_sceneTex_006F10;
#define dganon_sonogo_sceneTex_007710 "__OTR__scenes/nonmq/ganon_sonogo_scene/ganon_sonogo_sceneTex_007710"
#define dganon_sonogo_sceneTex_007310 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_sceneTex_007310"
static const ALIGN_ASSET(2) char ganon_sonogo_sceneTex_007310[] = dganon_sonogo_sceneTex_007310;
#define dganon_sonogo_sceneTex_007710 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_sceneTex_007710"
static const ALIGN_ASSET(2) char ganon_sonogo_sceneTex_007710[] = dganon_sonogo_sceneTex_007710;
#define dganon_sonogo_sceneTLUT_006300 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_sceneTLUT_006300"
static const ALIGN_ASSET(2) char ganon_sonogo_sceneTLUT_006300[] = dganon_sonogo_sceneTLUT_006300;
#define dganon_sonogo_sceneTLUT_006508 "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_sceneTLUT_006508"
static const ALIGN_ASSET(2) char ganon_sonogo_sceneTLUT_006508[] = dganon_sonogo_sceneTLUT_006508;
#define dganon_sonogo_sceneCollisionHeader_0062CC "__OTR__scenes/shared/ganon_sonogo_scene/ganon_sonogo_sceneCollisionHeader_0062CC"
static const ALIGN_ASSET(2) char ganon_sonogo_sceneCollisionHeader_0062CC[] = dganon_sonogo_sceneCollisionHeader_0062CC;
#endif // DUNGEONS_GANON_SONOGO_SCENE_H