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

32
soh/assets/scenes/test_levels/test01/test01_room_0.h
View File

@@ -3,26 +3,26 @@
#include "align_asset_macro.h"
#define dtest01_room_0DL_006438 "__OTR__scenes/nonmq/test01_scene/test01_room_0DL_006438"
static const ALIGN_ASSET(2) char test01_room_0DL_006438[] = dtest01_room_0DL_006438;
#define dtest01_room_0Tex_008490 "__OTR__scenes/nonmq/test01_scene/test01_room_0Tex_008490"
static const ALIGN_ASSET(2) char test01_room_0Tex_008490[] = dtest01_room_0Tex_008490;
#define dtest01_room_0Tex_007490 "__OTR__scenes/nonmq/test01_scene/test01_room_0Tex_007490"
static const ALIGN_ASSET(2) char test01_room_0Tex_007490[] = dtest01_room_0Tex_007490;
#define dtest01_room_0Tex_006C90 "__OTR__scenes/nonmq/test01_scene/test01_room_0Tex_006C90"
static const ALIGN_ASSET(2) char test01_room_0Tex_006C90[] = dtest01_room_0Tex_006C90;
#define dtest01_room_0Tex_006490 "__OTR__scenes/nonmq/test01_scene/test01_room_0Tex_006490"
#define dtest01_room_0Tex_006490 "__OTR__scenes/shared/test01_scene/test01_room_0Tex_006490"
static const ALIGN_ASSET(2) char test01_room_0Tex_006490[] = dtest01_room_0Tex_006490;
#define dtest01_room_0DL_0090D8 "__OTR__scenes/nonmq/test01_scene/test01_room_0DL_0090D8"
static const ALIGN_ASSET(2) char test01_room_0DL_0090D8[] = dtest01_room_0DL_0090D8;
#define dtest01_room_0Tex_006C90 "__OTR__scenes/shared/test01_scene/test01_room_0Tex_006C90"
static const ALIGN_ASSET(2) char test01_room_0Tex_006C90[] = dtest01_room_0Tex_006C90;
#define dtest01_room_0Tex_0090E8 "__OTR__scenes/nonmq/test01_scene/test01_room_0Tex_0090E8"
#define dtest01_room_0Tex_007490 "__OTR__scenes/shared/test01_scene/test01_room_0Tex_007490"
static const ALIGN_ASSET(2) char test01_room_0Tex_007490[] = dtest01_room_0Tex_007490;
#define dtest01_room_0Tex_008490 "__OTR__scenes/shared/test01_scene/test01_room_0Tex_008490"
static const ALIGN_ASSET(2) char test01_room_0Tex_008490[] = dtest01_room_0Tex_008490;
#define dtest01_room_0Tex_0090E8 "__OTR__scenes/shared/test01_scene/test01_room_0Tex_0090E8"
static const ALIGN_ASSET(2) char test01_room_0Tex_0090E8[] = dtest01_room_0Tex_0090E8;
#define dtest01_room_0DL_006438 "__OTR__scenes/shared/test01_scene/test01_room_0DL_006438"
static const ALIGN_ASSET(2) char test01_room_0DL_006438[] = dtest01_room_0DL_006438;
#define dtest01_room_0DL_0090D8 "__OTR__scenes/shared/test01_scene/test01_room_0DL_0090D8"
static const ALIGN_ASSET(2) char test01_room_0DL_0090D8[] = dtest01_room_0DL_0090D8;
#endif // TEST_LEVELS_TEST01_ROOM_0_H

2
soh/assets/scenes/test_levels/test01/test01_scene.h
View File

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