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

4
soh/assets/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_room_0.h
View File

@@ -3,10 +3,10 @@
#include "align_asset_macro.h"
#define dyousei_izumi_tate_room_0DL_002C10 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_room_0DL_002C10"
#define dyousei_izumi_tate_room_0DL_002C10 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_room_0DL_002C10"
static const ALIGN_ASSET(2) char yousei_izumi_tate_room_0DL_002C10[] = dyousei_izumi_tate_room_0DL_002C10;
#define dyousei_izumi_tate_room_0DL_003FB0 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_room_0DL_003FB0"
#define dyousei_izumi_tate_room_0DL_003FB0 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_room_0DL_003FB0"
static const ALIGN_ASSET(2) char yousei_izumi_tate_room_0DL_003FB0[] = dyousei_izumi_tate_room_0DL_003FB0;

63
soh/assets/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_scene.h
View File

@@ -3,37 +3,38 @@
#include "align_asset_macro.h"
#define dyousei_izumi_tate_sceneCollisionHeader_001FDC "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneCollisionHeader_001FDC"
static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneCollisionHeader_001FDC[] = dyousei_izumi_tate_sceneCollisionHeader_001FDC;
#define dyousei_izumi_tate_sceneTex_008010 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_008010"
static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_008010[] = dyousei_izumi_tate_sceneTex_008010;
#define dyousei_izumi_tate_sceneTex_005010 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_005010"
static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_005010[] = dyousei_izumi_tate_sceneTex_005010;
#define dyousei_izumi_tate_sceneTex_004810 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_004810"
static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_004810[] = dyousei_izumi_tate_sceneTex_004810;
#define dyousei_izumi_tate_sceneTex_006010 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_006010"
static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_006010[] = dyousei_izumi_tate_sceneTex_006010;
#define dyousei_izumi_tate_sceneTex_002810 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_002810"
static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_002810[] = dyousei_izumi_tate_sceneTex_002810;
#define dyousei_izumi_tate_sceneTex_005810 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_005810"
static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_005810[] = dyousei_izumi_tate_sceneTex_005810;
#define dyousei_izumi_tate_sceneTex_007810 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_007810"
static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_007810[] = dyousei_izumi_tate_sceneTex_007810;
#define dyousei_izumi_tate_sceneTex_007010 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_007010"
static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_007010[] = dyousei_izumi_tate_sceneTex_007010;
#define dyousei_izumi_tate_sceneTex_003810 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_003810"
static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_003810[] = dyousei_izumi_tate_sceneTex_003810;
#define dyousei_izumi_tate_sceneTex_002010 "__OTR__scenes/nonmq/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_002010"
#define dyousei_izumi_tate_sceneTex_002010 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_002010"
static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_002010[] = dyousei_izumi_tate_sceneTex_002010;
#define dyousei_izumi_tate_sceneTex_002810 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_002810"
static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_002810[] = dyousei_izumi_tate_sceneTex_002810;
#define dyousei_izumi_tate_sceneTex_003810 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_003810"
static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_003810[] = dyousei_izumi_tate_sceneTex_003810;
#define dyousei_izumi_tate_sceneTex_004810 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_004810"
static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_004810[] = dyousei_izumi_tate_sceneTex_004810;
#define dyousei_izumi_tate_sceneTex_005010 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_005010"
static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_005010[] = dyousei_izumi_tate_sceneTex_005010;
#define dyousei_izumi_tate_sceneTex_005810 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_005810"
static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_005810[] = dyousei_izumi_tate_sceneTex_005810;
#define dyousei_izumi_tate_sceneTex_006010 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_006010"
static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_006010[] = dyousei_izumi_tate_sceneTex_006010;
#define dyousei_izumi_tate_sceneTex_007010 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_007010"
static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_007010[] = dyousei_izumi_tate_sceneTex_007010;
#define dyousei_izumi_tate_sceneTex_007810 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_007810"
static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_007810[] = dyousei_izumi_tate_sceneTex_007810;
#define dyousei_izumi_tate_sceneTex_008010 "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_sceneTex_008010"
static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneTex_008010[] = dyousei_izumi_tate_sceneTex_008010;
#define dyousei_izumi_tate_sceneCollisionHeader_001FDC "__OTR__scenes/shared/yousei_izumi_tate_scene/yousei_izumi_tate_sceneCollisionHeader_001FDC"
static const ALIGN_ASSET(2) char yousei_izumi_tate_sceneCollisionHeader_001FDC[] = dyousei_izumi_tate_sceneCollisionHeader_001FDC;
#endif // INDOORS_YOUSEI_IZUMI_TATE_SCENE_H