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

18
soh/assets/scenes/dungeons/ddan_boss/ddan_boss_room_0.h
View File

@@ -3,20 +3,20 @@
#include "align_asset_macro.h"
#define dddan_boss_room_0DL_002000 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_0DL_002000"
static const ALIGN_ASSET(2) char ddan_boss_room_0DL_002000[] = dddan_boss_room_0DL_002000;
#define dddan_boss_room_0Tex_003A28 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_0Tex_003A28"
static const ALIGN_ASSET(2) char ddan_boss_room_0Tex_003A28[] = dddan_boss_room_0Tex_003A28;
#define dddan_boss_room_0Tex_003628 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_0Tex_003628"
#define dddan_boss_room_0Tex_003628 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_room_0Tex_003628"
static const ALIGN_ASSET(2) char ddan_boss_room_0Tex_003628[] = dddan_boss_room_0Tex_003628;
#define dddan_boss_room_0Tex_003E28 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_0Tex_003E28"
#define dddan_boss_room_0Tex_003A28 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_room_0Tex_003A28"
static const ALIGN_ASSET(2) char ddan_boss_room_0Tex_003A28[] = dddan_boss_room_0Tex_003A28;
#define dddan_boss_room_0Tex_003E28 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_room_0Tex_003E28"
static const ALIGN_ASSET(2) char ddan_boss_room_0Tex_003E28[] = dddan_boss_room_0Tex_003E28;
#define dddan_boss_room_0Tex_004628 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_0Tex_004628"
#define dddan_boss_room_0Tex_004628 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_room_0Tex_004628"
static const ALIGN_ASSET(2) char ddan_boss_room_0Tex_004628[] = dddan_boss_room_0Tex_004628;
#define dddan_boss_room_0DL_002000 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_room_0DL_002000"
static const ALIGN_ASSET(2) char ddan_boss_room_0DL_002000[] = dddan_boss_room_0DL_002000;
#endif // DUNGEONS_DDAN_BOSS_ROOM_0_H

18
soh/assets/scenes/dungeons/ddan_boss/ddan_boss_room_1.h
View File

@@ -3,19 +3,19 @@
#include "align_asset_macro.h"
#define dgDodongosCavernBossLavaFloorTex "__OTR__scenes/nonmq/ddan_boss_scene/gDodongosCavernBossLavaFloorTex"
static const ALIGN_ASSET(2) char gDodongosCavernBossLavaFloorTex[] = dgDodongosCavernBossLavaFloorTex;
#define dddan_boss_room_1DL_001A38 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_1DL_001A38"
static const ALIGN_ASSET(2) char ddan_boss_room_1DL_001A38[] = dddan_boss_room_1DL_001A38;
#define dddan_boss_room_1Tex_0031D8 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_1Tex_0031D8"
#define dddan_boss_room_1Tex_0031D8 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_room_1Tex_0031D8"
static const ALIGN_ASSET(2) char ddan_boss_room_1Tex_0031D8[] = dddan_boss_room_1Tex_0031D8;
#define dddan_boss_room_1Tex_0039D8 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_1Tex_0039D8"
#define dddan_boss_room_1Tex_0039D8 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_room_1Tex_0039D8"
static const ALIGN_ASSET(2) char ddan_boss_room_1Tex_0039D8[] = dddan_boss_room_1Tex_0039D8;
#define dddan_boss_room_1DL_000A50 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_room_1DL_000A50"
#define dgDodongosCavernBossLavaFloorTex "__OTR__scenes/shared/ddan_boss_scene/gDodongosCavernBossLavaFloorTex"
static const ALIGN_ASSET(2) char gDodongosCavernBossLavaFloorTex[] = dgDodongosCavernBossLavaFloorTex;
#define dddan_boss_room_1DL_001A38 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_room_1DL_001A38"
static const ALIGN_ASSET(2) char ddan_boss_room_1DL_001A38[] = dddan_boss_room_1DL_001A38;
#define dddan_boss_room_1DL_000A50 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_room_1DL_000A50"
static const ALIGN_ASSET(2) char ddan_boss_room_1DL_000A50[] = dddan_boss_room_1DL_000A50;

27
soh/assets/scenes/dungeons/ddan_boss/ddan_boss_scene.h
View File

@@ -3,19 +3,20 @@
#include "align_asset_macro.h"
#define dddan_boss_sceneCollisionHeader_000E20 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_sceneCollisionHeader_000E20"
static const ALIGN_ASSET(2) char ddan_boss_sceneCollisionHeader_000E20[] = dddan_boss_sceneCollisionHeader_000E20;
#define dddan_boss_sceneTex_001858 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_sceneTex_001858"
static const ALIGN_ASSET(2) char ddan_boss_sceneTex_001858[] = dddan_boss_sceneTex_001858;
#define dddan_boss_sceneTLUT_000E50 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_sceneTLUT_000E50"
static const ALIGN_ASSET(2) char ddan_boss_sceneTLUT_000E50[] = dddan_boss_sceneTLUT_000E50;
#define dddan_boss_sceneTex_002058 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_sceneTex_002058"
static const ALIGN_ASSET(2) char ddan_boss_sceneTex_002058[] = dddan_boss_sceneTex_002058;
#define dddan_boss_sceneTex_001058 "__OTR__scenes/nonmq/ddan_boss_scene/ddan_boss_sceneTex_001058"
#define dddan_boss_sceneTex_001058 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_sceneTex_001058"
static const ALIGN_ASSET(2) char ddan_boss_sceneTex_001058[] = dddan_boss_sceneTex_001058;
#define dddan_boss_sceneTex_001858 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_sceneTex_001858"
static const ALIGN_ASSET(2) char ddan_boss_sceneTex_001858[] = dddan_boss_sceneTex_001858;
#define dddan_boss_sceneTex_002058 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_sceneTex_002058"
static const ALIGN_ASSET(2) char ddan_boss_sceneTex_002058[] = dddan_boss_sceneTex_002058;
#define dddan_boss_sceneTLUT_000E50 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_sceneTLUT_000E50"
static const ALIGN_ASSET(2) char ddan_boss_sceneTLUT_000E50[] = dddan_boss_sceneTLUT_000E50;
#define dddan_boss_sceneCollisionHeader_000E20 "__OTR__scenes/shared/ddan_boss_scene/ddan_boss_sceneCollisionHeader_000E20"
static const ALIGN_ASSET(2) char ddan_boss_sceneCollisionHeader_000E20[] = dddan_boss_sceneCollisionHeader_000E20;
#endif // DUNGEONS_DDAN_BOSS_SCENE_H