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/daiyousei_izumi/daiyousei_izumi_room_0.h
View File

@@ -3,28 +3,28 @@
#include "align_asset_macro.h"
#define ddaiyousei_izumi_room_0DL_002BB8 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_room_0DL_002BB8"
#define ddaiyousei_izumi_room_0DL_002BB8 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_room_0DL_002BB8"
static const ALIGN_ASSET(2) char daiyousei_izumi_room_0DL_002BB8[] = ddaiyousei_izumi_room_0DL_002BB8;
#define ddaiyousei_izumi_room_0DL_0038F8 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_room_0DL_0038F8"
#define ddaiyousei_izumi_room_0DL_0038F8 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_room_0DL_0038F8"
static const ALIGN_ASSET(2) char daiyousei_izumi_room_0DL_0038F8[] = ddaiyousei_izumi_room_0DL_0038F8;
#define ddaiyousei_izumi_room_0Set_000160DL_002BB8 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_000160DL_002BB8"
#define ddaiyousei_izumi_room_0Set_000160DL_002BB8 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_000160DL_002BB8"
static const ALIGN_ASSET(2) char daiyousei_izumi_room_0Set_000160DL_002BB8[] = ddaiyousei_izumi_room_0Set_000160DL_002BB8;
#define ddaiyousei_izumi_room_0Set_000160DL_0038F8 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_000160DL_0038F8"
#define ddaiyousei_izumi_room_0Set_000160DL_0038F8 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_000160DL_0038F8"
static const ALIGN_ASSET(2) char daiyousei_izumi_room_0Set_000160DL_0038F8[] = ddaiyousei_izumi_room_0Set_000160DL_0038F8;
#define ddaiyousei_izumi_room_0Set_0001E0DL_002BB8 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_0001E0DL_002BB8"
#define ddaiyousei_izumi_room_0Set_0001E0DL_002BB8 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_0001E0DL_002BB8"
static const ALIGN_ASSET(2) char daiyousei_izumi_room_0Set_0001E0DL_002BB8[] = ddaiyousei_izumi_room_0Set_0001E0DL_002BB8;
#define ddaiyousei_izumi_room_0Set_0001E0DL_0038F8 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_0001E0DL_0038F8"
#define ddaiyousei_izumi_room_0Set_0001E0DL_0038F8 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_0001E0DL_0038F8"
static const ALIGN_ASSET(2) char daiyousei_izumi_room_0Set_0001E0DL_0038F8[] = ddaiyousei_izumi_room_0Set_0001E0DL_0038F8;
#define ddaiyousei_izumi_room_0Set_000260DL_002BB8 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_000260DL_002BB8"
#define ddaiyousei_izumi_room_0Set_000260DL_002BB8 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_000260DL_002BB8"
static const ALIGN_ASSET(2) char daiyousei_izumi_room_0Set_000260DL_002BB8[] = ddaiyousei_izumi_room_0Set_000260DL_002BB8;
#define ddaiyousei_izumi_room_0Set_000260DL_0038F8 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_000260DL_0038F8"
#define ddaiyousei_izumi_room_0Set_000260DL_0038F8 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_room_0Set_000260DL_0038F8"
static const ALIGN_ASSET(2) char daiyousei_izumi_room_0Set_000260DL_0038F8[] = ddaiyousei_izumi_room_0Set_000260DL_0038F8;

102
soh/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_scene.h
View File

@@ -3,65 +3,65 @@
#include "align_asset_macro.h"
#define dgGreatFairyMagicCs "__OTR__scenes/nonmq/daiyousei_izumi_scene/gGreatFairyMagicCs"
static const ALIGN_ASSET(2) char gGreatFairyMagicCs[] = dgGreatFairyMagicCs;
#define dgGreatFairyDoubleMagicCs "__OTR__scenes/nonmq/daiyousei_izumi_scene/gGreatFairyDoubleMagicCs"
static const ALIGN_ASSET(2) char gGreatFairyDoubleMagicCs[] = dgGreatFairyDoubleMagicCs;
#define dgGreatFairyDoubleDefenseCs "__OTR__scenes/nonmq/daiyousei_izumi_scene/gGreatFairyDoubleDefenseCs"
static const ALIGN_ASSET(2) char gGreatFairyDoubleDefenseCs[] = dgGreatFairyDoubleDefenseCs;
#define ddaiyousei_izumi_sceneCollisionHeader_0043A4 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneCollisionHeader_0043A4"
static const ALIGN_ASSET(2) char daiyousei_izumi_sceneCollisionHeader_0043A4[] = ddaiyousei_izumi_sceneCollisionHeader_0043A4;
#define ddaiyousei_izumi_sceneTex_00D800 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00D800"
static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00D800[] = ddaiyousei_izumi_sceneTex_00D800;
#define ddaiyousei_izumi_sceneTex_009000 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_009000"
static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_009000[] = ddaiyousei_izumi_sceneTex_009000;
#define ddaiyousei_izumi_sceneTex_008000 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_008000"
static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_008000[] = ddaiyousei_izumi_sceneTex_008000;
#define ddaiyousei_izumi_sceneTex_007000 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_007000"
static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_007000[] = ddaiyousei_izumi_sceneTex_007000;
#define ddaiyousei_izumi_sceneTex_005000 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_005000"
static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_005000[] = ddaiyousei_izumi_sceneTex_005000;
#define ddaiyousei_izumi_sceneTex_00B000 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00B000"
static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00B000[] = ddaiyousei_izumi_sceneTex_00B000;
#define ddaiyousei_izumi_sceneTex_00D000 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00D000"
static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00D000[] = ddaiyousei_izumi_sceneTex_00D000;
#define ddaiyousei_izumi_sceneTex_00A800 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00A800"
static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00A800[] = ddaiyousei_izumi_sceneTex_00A800;
#define ddaiyousei_izumi_sceneTex_005800 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_005800"
static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_005800[] = ddaiyousei_izumi_sceneTex_005800;
#define ddaiyousei_izumi_sceneTex_004800 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_004800"
#define ddaiyousei_izumi_sceneTex_004800 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_004800"
static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_004800[] = ddaiyousei_izumi_sceneTex_004800;
#define ddaiyousei_izumi_sceneTex_00C000 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00C000"
static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00C000[] = ddaiyousei_izumi_sceneTex_00C000;
#define ddaiyousei_izumi_sceneTex_005000 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_005000"
static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_005000[] = ddaiyousei_izumi_sceneTex_005000;
#define ddaiyousei_izumi_sceneTex_00A000 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00A000"
static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00A000[] = ddaiyousei_izumi_sceneTex_00A000;
#define ddaiyousei_izumi_sceneTex_005800 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_005800"
static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_005800[] = ddaiyousei_izumi_sceneTex_005800;
#define ddaiyousei_izumi_sceneTex_00C800 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00C800"
static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00C800[] = ddaiyousei_izumi_sceneTex_00C800;
#define ddaiyousei_izumi_sceneTex_006000 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_006000"
#define ddaiyousei_izumi_sceneTex_006000 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_006000"
static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_006000[] = ddaiyousei_izumi_sceneTex_006000;
#define ddaiyousei_izumi_sceneCollisionHeader_0043A4 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneCollisionHeader_0043A4"
#define ddaiyousei_izumi_sceneTex_007000 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_007000"
static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_007000[] = ddaiyousei_izumi_sceneTex_007000;
#define ddaiyousei_izumi_sceneCollisionHeader_0043A4 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneCollisionHeader_0043A4"
#define ddaiyousei_izumi_sceneTex_008000 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_008000"
static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_008000[] = ddaiyousei_izumi_sceneTex_008000;
#define ddaiyousei_izumi_sceneCollisionHeader_0043A4 "__OTR__scenes/nonmq/daiyousei_izumi_scene/daiyousei_izumi_sceneCollisionHeader_0043A4"
#define ddaiyousei_izumi_sceneTex_009000 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_009000"
static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_009000[] = ddaiyousei_izumi_sceneTex_009000;
#define ddaiyousei_izumi_sceneTex_00A000 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00A000"
static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00A000[] = ddaiyousei_izumi_sceneTex_00A000;
#define ddaiyousei_izumi_sceneTex_00A800 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00A800"
static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00A800[] = ddaiyousei_izumi_sceneTex_00A800;
#define ddaiyousei_izumi_sceneTex_00B000 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00B000"
static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00B000[] = ddaiyousei_izumi_sceneTex_00B000;
#define ddaiyousei_izumi_sceneTex_00C000 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00C000"
static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00C000[] = ddaiyousei_izumi_sceneTex_00C000;
#define ddaiyousei_izumi_sceneTex_00C800 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00C800"
static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00C800[] = ddaiyousei_izumi_sceneTex_00C800;
#define ddaiyousei_izumi_sceneTex_00D000 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00D000"
static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00D000[] = ddaiyousei_izumi_sceneTex_00D000;
#define ddaiyousei_izumi_sceneTex_00D800 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneTex_00D800"
static const ALIGN_ASSET(2) char daiyousei_izumi_sceneTex_00D800[] = ddaiyousei_izumi_sceneTex_00D800;
#define dgGreatFairyMagicCs "__OTR__scenes/shared/daiyousei_izumi_scene/gGreatFairyMagicCs"
static const ALIGN_ASSET(2) char gGreatFairyMagicCs[] = dgGreatFairyMagicCs;
#define dgGreatFairyDoubleMagicCs "__OTR__scenes/shared/daiyousei_izumi_scene/gGreatFairyDoubleMagicCs"
static const ALIGN_ASSET(2) char gGreatFairyDoubleMagicCs[] = dgGreatFairyDoubleMagicCs;
#define dgGreatFairyDoubleDefenseCs "__OTR__scenes/shared/daiyousei_izumi_scene/gGreatFairyDoubleDefenseCs"
static const ALIGN_ASSET(2) char gGreatFairyDoubleDefenseCs[] = dgGreatFairyDoubleDefenseCs;
#define ddaiyousei_izumi_sceneCollisionHeader_0043A4 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneCollisionHeader_0043A4"
static const ALIGN_ASSET(2) char daiyousei_izumi_sceneCollisionHeader_0043A4[] = ddaiyousei_izumi_sceneCollisionHeader_0043A4;
#define ddaiyousei_izumi_sceneCollisionHeader_0043A4 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneCollisionHeader_0043A4"
#define ddaiyousei_izumi_sceneCollisionHeader_0043A4 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneCollisionHeader_0043A4"
#define ddaiyousei_izumi_sceneCollisionHeader_0043A4 "__OTR__scenes/shared/daiyousei_izumi_scene/daiyousei_izumi_sceneCollisionHeader_0043A4"
#endif // INDOORS_DAIYOUSEI_IZUMI_SCENE_H