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

16
soh/assets/scenes/indoors/takaraya/takaraya_room_6.h
View File

@@ -3,17 +3,17 @@
#include "align_asset_macro.h"
#define dtakaraya_room_6DL_0012D0 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_6DL_0012D0"
static const ALIGN_ASSET(2) char takaraya_room_6DL_0012D0[] = dtakaraya_room_6DL_0012D0;
#define dtakaraya_room_6Tex_0022F8 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_6Tex_0022F8"
static const ALIGN_ASSET(2) char takaraya_room_6Tex_0022F8[] = dtakaraya_room_6Tex_0022F8;
#define dtakaraya_room_6Tex_0012F8 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_6Tex_0012F8"
#define dtakaraya_room_6Tex_0012F8 "__OTR__scenes/shared/takaraya_scene/takaraya_room_6Tex_0012F8"
static const ALIGN_ASSET(2) char takaraya_room_6Tex_0012F8[] = dtakaraya_room_6Tex_0012F8;
#define dtakaraya_room_6Tex_001AF8 "__OTR__scenes/nonmq/takaraya_scene/takaraya_room_6Tex_001AF8"
#define dtakaraya_room_6Tex_001AF8 "__OTR__scenes/shared/takaraya_scene/takaraya_room_6Tex_001AF8"
static const ALIGN_ASSET(2) char takaraya_room_6Tex_001AF8[] = dtakaraya_room_6Tex_001AF8;
#define dtakaraya_room_6Tex_0022F8 "__OTR__scenes/shared/takaraya_scene/takaraya_room_6Tex_0022F8"
static const ALIGN_ASSET(2) char takaraya_room_6Tex_0022F8[] = dtakaraya_room_6Tex_0022F8;
#define dtakaraya_room_6DL_0012D0 "__OTR__scenes/shared/takaraya_scene/takaraya_room_6DL_0012D0"
static const ALIGN_ASSET(2) char takaraya_room_6DL_0012D0[] = dtakaraya_room_6DL_0012D0;
#endif // INDOORS_TAKARAYA_ROOM_6_H