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/test_levels/testroom/testroom_room_2.h
View File

@@ -3,20 +3,20 @@
#include "align_asset_macro.h"
#define dtestroom_room_2DL_001590 "__OTR__scenes/nonmq/testroom_scene/testroom_room_2DL_001590"
static const ALIGN_ASSET(2) char testroom_room_2DL_001590[] = dtestroom_room_2DL_001590;
#define dtestroom_room_2Tex_001A78 "__OTR__scenes/nonmq/testroom_scene/testroom_room_2Tex_001A78"
#define dtestroom_room_2Tex_001A78 "__OTR__scenes/shared/testroom_scene/testroom_room_2Tex_001A78"
static const ALIGN_ASSET(2) char testroom_room_2Tex_001A78[] = dtestroom_room_2Tex_001A78;
#define dtestroom_room_2TLUT_001A58 "__OTR__scenes/nonmq/testroom_scene/testroom_room_2TLUT_001A58"
static const ALIGN_ASSET(2) char testroom_room_2TLUT_001A58[] = dtestroom_room_2TLUT_001A58;
#define dtestroom_room_2Tex_002278 "__OTR__scenes/nonmq/testroom_scene/testroom_room_2Tex_002278"
#define dtestroom_room_2Tex_002278 "__OTR__scenes/shared/testroom_scene/testroom_room_2Tex_002278"
static const ALIGN_ASSET(2) char testroom_room_2Tex_002278[] = dtestroom_room_2Tex_002278;
#define dtestroom_room_2Tex_002A78 "__OTR__scenes/nonmq/testroom_scene/testroom_room_2Tex_002A78"
#define dtestroom_room_2Tex_002A78 "__OTR__scenes/shared/testroom_scene/testroom_room_2Tex_002A78"
static const ALIGN_ASSET(2) char testroom_room_2Tex_002A78[] = dtestroom_room_2Tex_002A78;
#define dtestroom_room_2TLUT_001A58 "__OTR__scenes/shared/testroom_scene/testroom_room_2TLUT_001A58"
static const ALIGN_ASSET(2) char testroom_room_2TLUT_001A58[] = dtestroom_room_2TLUT_001A58;
#define dtestroom_room_2DL_001590 "__OTR__scenes/shared/testroom_scene/testroom_room_2DL_001590"
static const ALIGN_ASSET(2) char testroom_room_2DL_001590[] = dtestroom_room_2DL_001590;
#endif // TEST_LEVELS_TESTROOM_ROOM_2_H