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

62
soh/assets/scenes/dungeons/jyasinzou/jyasinzou_room_28.h
View File

@@ -3,38 +3,47 @@
#include "align_asset_macro.h"
#define djyasinzou_room_28DL_000D00 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28DL_000D00"
static const ALIGN_ASSET(2) char jyasinzou_room_28DL_000D00[] = djyasinzou_room_28DL_000D00;
#define djyasinzou_room_28Tex_007530 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_007530"
static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_007530[] = djyasinzou_room_28Tex_007530;
#define djyasinzou_room_28Tex_005130 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_005130"
static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_005130[] = djyasinzou_room_28Tex_005130;
#define djyasinzou_room_28Tex_007E30 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_007E30"
static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_007E30[] = djyasinzou_room_28Tex_007E30;
#define djyasinzou_room_28DL_001708 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28DL_001708"
static const ALIGN_ASSET(2) char jyasinzou_room_28DL_001708[] = djyasinzou_room_28DL_001708;
#define djyasinzou_room_28Tex_008630 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_008630"
static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_008630[] = djyasinzou_room_28Tex_008630;
#define djyasinzou_room_28Tex_004130 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_004130"
static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_004130[] = djyasinzou_room_28Tex_004130;
#define djyasinzou_room_28Tex_004930 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_004930"
static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_004930[] = djyasinzou_room_28Tex_004930;
#define djyasinzou_room_28DL_0028A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28DL_0028A0"
static const ALIGN_ASSET(2) char jyasinzou_room_28DL_0028A0[] = djyasinzou_room_28DL_0028A0;
#define djyasinzou_room_28Tex_005130 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_005130"
static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_005130[] = djyasinzou_room_28Tex_005130;
#define djyasinzou_room_28Tex_005930 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_005930"
static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_005930[] = djyasinzou_room_28Tex_005930;
#define djyasinzou_room_28Tex_006130 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_006130"
static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_006130[] = djyasinzou_room_28Tex_006130;
#define djyasinzou_room_28Tex_006530 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_006530"
static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_006530[] = djyasinzou_room_28Tex_006530;
#define djyasinzou_room_28Tex_007530 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_007530"
static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_007530[] = djyasinzou_room_28Tex_007530;
#define djyasinzou_room_28Tex_007930 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_007930"
static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_007930[] = djyasinzou_room_28Tex_007930;
#define djyasinzou_room_28Tex_007A30 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_007A30"
static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_007A30[] = djyasinzou_room_28Tex_007A30;
#define djyasinzou_room_28Tex_007930 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_007930"
static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_007930[] = djyasinzou_room_28Tex_007930;
#define djyasinzou_room_28Tex_007E30 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_007E30"
static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_007E30[] = djyasinzou_room_28Tex_007E30;
#define djyasinzou_room_28Tex_008630 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_008630"
static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_008630[] = djyasinzou_room_28Tex_008630;
#define djyasinzou_room_28DL_000D00 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28DL_000D00"
static const ALIGN_ASSET(2) char jyasinzou_room_28DL_000D00[] = djyasinzou_room_28DL_000D00;
#define djyasinzou_room_28DL_001708 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28DL_001708"
static const ALIGN_ASSET(2) char jyasinzou_room_28DL_001708[] = djyasinzou_room_28DL_001708;
#define djyasinzou_room_28DL_0028A0 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28DL_0028A0"
static const ALIGN_ASSET(2) char jyasinzou_room_28DL_0028A0[] = djyasinzou_room_28DL_0028A0;
#define djyasinzou_room_28DL_0032F8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28DL_0032F8"
static const ALIGN_ASSET(2) char jyasinzou_room_28DL_0032F8[] = djyasinzou_room_28DL_0032F8;
@@ -42,17 +51,8 @@ static const ALIGN_ASSET(2) char jyasinzou_room_28DL_0032F8[] = djyasinzou_room_
#define djyasinzou_room_28DL_0035D8 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28DL_0035D8"
static const ALIGN_ASSET(2) char jyasinzou_room_28DL_0035D8[] = djyasinzou_room_28DL_0035D8;
#define djyasinzou_room_28Tex_006530 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_006530"
static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_006530[] = djyasinzou_room_28Tex_006530;
#define djyasinzou_room_28DL_003E18 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28DL_003E18"
static const ALIGN_ASSET(2) char jyasinzou_room_28DL_003E18[] = djyasinzou_room_28DL_003E18;
#define djyasinzou_room_28Tex_006130 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_006130"
static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_006130[] = djyasinzou_room_28Tex_006130;
#define djyasinzou_room_28Tex_005930 "__OTR__scenes/nonmq/jyasinzou_scene/jyasinzou_room_28Tex_005930"
static const ALIGN_ASSET(2) char jyasinzou_room_28Tex_005930[] = djyasinzou_room_28Tex_005930;
#endif // DUNGEONS_JYASINZOU_ROOM_28_H