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/hairal_niwa_n/hairal_niwa_n_room_0.h
View File

@@ -3,10 +3,10 @@
#include "align_asset_macro.h"
#define dhairal_niwa_n_room_0DL_002FE8 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_room_0DL_002FE8"
#define dhairal_niwa_n_room_0DL_002FE8 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_room_0DL_002FE8"
static const ALIGN_ASSET(2) char hairal_niwa_n_room_0DL_002FE8[] = dhairal_niwa_n_room_0DL_002FE8;
#define dhairal_niwa_n_room_0DL_003608 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_room_0DL_003608"
#define dhairal_niwa_n_room_0DL_003608 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_room_0DL_003608"
static const ALIGN_ASSET(2) char hairal_niwa_n_room_0DL_003608[] = dhairal_niwa_n_room_0DL_003608;

77
soh/assets/scenes/indoors/hairal_niwa_n/hairal_niwa_n_scene.h
View File

@@ -3,46 +3,47 @@
#include "align_asset_macro.h"
#define dhairal_niwa_n_sceneCollisionHeader_0010C4 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneCollisionHeader_0010C4"
static const ALIGN_ASSET(2) char hairal_niwa_n_sceneCollisionHeader_0010C4[] = dhairal_niwa_n_sceneCollisionHeader_0010C4;
#define dhairal_niwa_n_sceneTex_0038F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0038F0"
static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0038F0[] = dhairal_niwa_n_sceneTex_0038F0;
#define dhairal_niwa_n_sceneTex_0010F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0010F0"
#define dhairal_niwa_n_sceneTex_0010F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0010F0"
static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0010F0[] = dhairal_niwa_n_sceneTex_0010F0;
#define dhairal_niwa_n_sceneTex_0050F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0050F0"
static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0050F0[] = dhairal_niwa_n_sceneTex_0050F0;
#define dhairal_niwa_n_sceneTex_0020F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0020F0"
static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0020F0[] = dhairal_niwa_n_sceneTex_0020F0;
#define dhairal_niwa_n_sceneTex_0068F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0068F0"
static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0068F0[] = dhairal_niwa_n_sceneTex_0068F0;
#define dhairal_niwa_n_sceneTex_0070F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0070F0"
static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0070F0[] = dhairal_niwa_n_sceneTex_0070F0;
#define dhairal_niwa_n_sceneTex_0080F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0080F0"
static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0080F0[] = dhairal_niwa_n_sceneTex_0080F0;
#define dhairal_niwa_n_sceneTex_0078F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0078F0"
static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0078F0[] = dhairal_niwa_n_sceneTex_0078F0;
#define dhairal_niwa_n_sceneTex_0058F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0058F0"
static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0058F0[] = dhairal_niwa_n_sceneTex_0058F0;
#define dhairal_niwa_n_sceneTex_0040F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0040F0"
static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0040F0[] = dhairal_niwa_n_sceneTex_0040F0;
#define dhairal_niwa_n_sceneTex_0028F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0028F0"
static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0028F0[] = dhairal_niwa_n_sceneTex_0028F0;
#define dhairal_niwa_n_sceneTex_0060F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0060F0"
static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0060F0[] = dhairal_niwa_n_sceneTex_0060F0;
#define dhairal_niwa_n_sceneTex_0018F0 "__OTR__scenes/nonmq/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0018F0"
#define dhairal_niwa_n_sceneTex_0018F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0018F0"
static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0018F0[] = dhairal_niwa_n_sceneTex_0018F0;
#define dhairal_niwa_n_sceneTex_0020F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0020F0"
static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0020F0[] = dhairal_niwa_n_sceneTex_0020F0;
#define dhairal_niwa_n_sceneTex_0028F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0028F0"
static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0028F0[] = dhairal_niwa_n_sceneTex_0028F0;
#define dhairal_niwa_n_sceneTex_0038F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0038F0"
static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0038F0[] = dhairal_niwa_n_sceneTex_0038F0;
#define dhairal_niwa_n_sceneTex_0040F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0040F0"
static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0040F0[] = dhairal_niwa_n_sceneTex_0040F0;
#define dhairal_niwa_n_sceneTex_0050F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0050F0"
static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0050F0[] = dhairal_niwa_n_sceneTex_0050F0;
#define dhairal_niwa_n_sceneTex_0058F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0058F0"
static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0058F0[] = dhairal_niwa_n_sceneTex_0058F0;
#define dhairal_niwa_n_sceneTex_0060F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0060F0"
static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0060F0[] = dhairal_niwa_n_sceneTex_0060F0;
#define dhairal_niwa_n_sceneTex_0068F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0068F0"
static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0068F0[] = dhairal_niwa_n_sceneTex_0068F0;
#define dhairal_niwa_n_sceneTex_0070F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0070F0"
static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0070F0[] = dhairal_niwa_n_sceneTex_0070F0;
#define dhairal_niwa_n_sceneTex_0078F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0078F0"
static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0078F0[] = dhairal_niwa_n_sceneTex_0078F0;
#define dhairal_niwa_n_sceneTex_0080F0 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneTex_0080F0"
static const ALIGN_ASSET(2) char hairal_niwa_n_sceneTex_0080F0[] = dhairal_niwa_n_sceneTex_0080F0;
#define dhairal_niwa_n_sceneCollisionHeader_0010C4 "__OTR__scenes/shared/hairal_niwa_n_scene/hairal_niwa_n_sceneCollisionHeader_0010C4"
static const ALIGN_ASSET(2) char hairal_niwa_n_sceneCollisionHeader_0010C4[] = dhairal_niwa_n_sceneCollisionHeader_0010C4;
#endif // INDOORS_HAIRAL_NIWA_N_SCENE_H