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

40
soh/assets/scenes/test_levels/syotes2/syotes2_room_0.h
View File

@@ -3,29 +3,29 @@
#include "align_asset_macro.h"
#define dsyotes2_room_0DL_0046B8 "__OTR__scenes/nonmq/syotes2_scene/syotes2_room_0DL_0046B8"
static const ALIGN_ASSET(2) char syotes2_room_0DL_0046B8[] = dsyotes2_room_0DL_0046B8;
#define dsyotes2_room_0Tex_006EF8 "__OTR__scenes/nonmq/syotes2_scene/syotes2_room_0Tex_006EF8"
static const ALIGN_ASSET(2) char syotes2_room_0Tex_006EF8[] = dsyotes2_room_0Tex_006EF8;
#define dsyotes2_room_0Tex_0056F8 "__OTR__scenes/nonmq/syotes2_scene/syotes2_room_0Tex_0056F8"
static const ALIGN_ASSET(2) char syotes2_room_0Tex_0056F8[] = dsyotes2_room_0Tex_0056F8;
#define dsyotes2_room_0Tex_004EF8 "__OTR__scenes/nonmq/syotes2_scene/syotes2_room_0Tex_004EF8"
static const ALIGN_ASSET(2) char syotes2_room_0Tex_004EF8[] = dsyotes2_room_0Tex_004EF8;
#define dsyotes2_room_0Tex_008EF8 "__OTR__scenes/nonmq/syotes2_scene/syotes2_room_0Tex_008EF8"
static const ALIGN_ASSET(2) char syotes2_room_0Tex_008EF8[] = dsyotes2_room_0Tex_008EF8;
#define dsyotes2_room_0Tex_0066F8 "__OTR__scenes/nonmq/syotes2_scene/syotes2_room_0Tex_0066F8"
static const ALIGN_ASSET(2) char syotes2_room_0Tex_0066F8[] = dsyotes2_room_0Tex_0066F8;
#define dsyotes2_room_0Tex_0046F8 "__OTR__scenes/nonmq/syotes2_scene/syotes2_room_0Tex_0046F8"
#define dsyotes2_room_0Tex_0046F8 "__OTR__scenes/shared/syotes2_scene/syotes2_room_0Tex_0046F8"
static const ALIGN_ASSET(2) char syotes2_room_0Tex_0046F8[] = dsyotes2_room_0Tex_0046F8;
#define dsyotes2_room_0Tex_007EF8 "__OTR__scenes/nonmq/syotes2_scene/syotes2_room_0Tex_007EF8"
#define dsyotes2_room_0Tex_004EF8 "__OTR__scenes/shared/syotes2_scene/syotes2_room_0Tex_004EF8"
static const ALIGN_ASSET(2) char syotes2_room_0Tex_004EF8[] = dsyotes2_room_0Tex_004EF8;
#define dsyotes2_room_0Tex_0056F8 "__OTR__scenes/shared/syotes2_scene/syotes2_room_0Tex_0056F8"
static const ALIGN_ASSET(2) char syotes2_room_0Tex_0056F8[] = dsyotes2_room_0Tex_0056F8;
#define dsyotes2_room_0Tex_0066F8 "__OTR__scenes/shared/syotes2_scene/syotes2_room_0Tex_0066F8"
static const ALIGN_ASSET(2) char syotes2_room_0Tex_0066F8[] = dsyotes2_room_0Tex_0066F8;
#define dsyotes2_room_0Tex_006EF8 "__OTR__scenes/shared/syotes2_scene/syotes2_room_0Tex_006EF8"
static const ALIGN_ASSET(2) char syotes2_room_0Tex_006EF8[] = dsyotes2_room_0Tex_006EF8;
#define dsyotes2_room_0Tex_007EF8 "__OTR__scenes/shared/syotes2_scene/syotes2_room_0Tex_007EF8"
static const ALIGN_ASSET(2) char syotes2_room_0Tex_007EF8[] = dsyotes2_room_0Tex_007EF8;
#define dsyotes2_room_0Tex_008EF8 "__OTR__scenes/shared/syotes2_scene/syotes2_room_0Tex_008EF8"
static const ALIGN_ASSET(2) char syotes2_room_0Tex_008EF8[] = dsyotes2_room_0Tex_008EF8;
#define dsyotes2_room_0DL_0046B8 "__OTR__scenes/shared/syotes2_scene/syotes2_room_0DL_0046B8"
static const ALIGN_ASSET(2) char syotes2_room_0DL_0046B8[] = dsyotes2_room_0DL_0046B8;
#endif // TEST_LEVELS_SYOTES2_ROOM_0_H

2
soh/assets/scenes/test_levels/syotes2/syotes2_scene.h
View File

@@ -3,7 +3,7 @@
#include "align_asset_macro.h"
#define dsyotes2_sceneCollisionHeader_002478 "__OTR__scenes/nonmq/syotes2_scene/syotes2_sceneCollisionHeader_002478"
#define dsyotes2_sceneCollisionHeader_002478 "__OTR__scenes/shared/syotes2_scene/syotes2_sceneCollisionHeader_002478"
static const ALIGN_ASSET(2) char syotes2_sceneCollisionHeader_002478[] = dsyotes2_sceneCollisionHeader_002478;