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

36
soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_24.h
View File

@@ -3,44 +3,44 @@
#include "align_asset_macro.h"
#define djyasinzou_room_24DL_000A30 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24DL_000A30"
static const ALIGN_ASSET(2) char jyasinzou_room_24DL_000A30[] = djyasinzou_room_24DL_000A30;
#define djyasinzou_room_24Tex_001B38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_001B38"
static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_001B38[] = djyasinzou_room_24Tex_001B38;
#define djyasinzou_room_24Tex_004B38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_004B38"
static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_004B38[] = djyasinzou_room_24Tex_004B38;
#define djyasinzou_room_24Tex_002B38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_002B38"
static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_002B38[] = djyasinzou_room_24Tex_002B38;
#define djyasinzou_room_24Tex_003338 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_003338"
static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_003338[] = djyasinzou_room_24Tex_003338;
#define djyasinzou_room_24Tex_004338 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_004338"
static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_004338[] = djyasinzou_room_24Tex_004338;
#define djyasinzou_room_24Tex_003B38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_003B38"
static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_003B38[] = djyasinzou_room_24Tex_003B38;
#define djyasinzou_room_24Tex_003F38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_003F38"
static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_003F38[] = djyasinzou_room_24Tex_003F38;
#define djyasinzou_room_24Tex_004338 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_004338"
static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_004338[] = djyasinzou_room_24Tex_004338;
#define djyasinzou_room_24Tex_004B38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_004B38"
static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_004B38[] = djyasinzou_room_24Tex_004B38;
#define djyasinzou_room_24Tex_0054D0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_0054D0"
static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_0054D0[] = djyasinzou_room_24Tex_0054D0;
#define djyasinzou_room_24DL_000A30 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24DL_000A30"
static const ALIGN_ASSET(2) char jyasinzou_room_24DL_000A30[] = djyasinzou_room_24DL_000A30;
#define djyasinzou_room_24DL_001390 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24DL_001390"
static const ALIGN_ASSET(2) char jyasinzou_room_24DL_001390[] = djyasinzou_room_24DL_001390;
#define djyasinzou_room_24Tex_001B38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_001B38"
static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_001B38[] = djyasinzou_room_24Tex_001B38;
#define djyasinzou_room_24Tex_003B38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_003B38"
static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_003B38[] = djyasinzou_room_24Tex_003B38;
#define djyasinzou_room_24DL_001610 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24DL_001610"
static const ALIGN_ASSET(2) char jyasinzou_room_24DL_001610[] = djyasinzou_room_24DL_001610;
#define djyasinzou_room_24DL_001950 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24DL_001950"
static const ALIGN_ASSET(2) char jyasinzou_room_24DL_001950[] = djyasinzou_room_24DL_001950;
#define djyasinzou_room_24Tex_002B38 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_002B38"
static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_002B38[] = djyasinzou_room_24Tex_002B38;
#define djyasinzou_room_24DL_005400 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24DL_005400"
static const ALIGN_ASSET(2) char jyasinzou_room_24DL_005400[] = djyasinzou_room_24DL_005400;
#define djyasinzou_room_24Tex_0054D0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_24Tex_0054D0"
static const ALIGN_ASSET(2) char jyasinzou_room_24Tex_0054D0[] = djyasinzou_room_24Tex_0054D0;
#endif // DUNGEONS_JYASINZOU_ROOM_24_H