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

54
soh/assets/scenes/misc/hakaana/hakaana_room_0.h
View File

@@ -3,41 +3,41 @@
#include "align_asset_macro.h"
#define dhakaana_room_0DL_002620 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0DL_002620"
static const ALIGN_ASSET(2) char hakaana_room_0DL_002620[] = dhakaana_room_0DL_002620;
#define dhakaana_room_0Tex_005E58 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0Tex_005E58"
static const ALIGN_ASSET(2) char hakaana_room_0Tex_005E58[] = dhakaana_room_0Tex_005E58;
#define dhakaana_room_0Tex_002658 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0Tex_002658"
#define dhakaana_room_0Tex_002658 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0Tex_002658"
static const ALIGN_ASSET(2) char hakaana_room_0Tex_002658[] = dhakaana_room_0Tex_002658;
#define dhakaana_room_0Tex_005658 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0Tex_005658"
static const ALIGN_ASSET(2) char hakaana_room_0Tex_005658[] = dhakaana_room_0Tex_005658;
#define dhakaana_room_0Tex_003E58 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0Tex_003E58"
static const ALIGN_ASSET(2) char hakaana_room_0Tex_003E58[] = dhakaana_room_0Tex_003E58;
#define dhakaana_room_0Tex_004E58 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0Tex_004E58"
static const ALIGN_ASSET(2) char hakaana_room_0Tex_004E58[] = dhakaana_room_0Tex_004E58;
#define dhakaana_room_0Tex_004658 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0Tex_004658"
static const ALIGN_ASSET(2) char hakaana_room_0Tex_004658[] = dhakaana_room_0Tex_004658;
#define dhakaana_room_0Tex_002E58 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0Tex_002E58"
#define dhakaana_room_0Tex_002E58 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0Tex_002E58"
static const ALIGN_ASSET(2) char hakaana_room_0Tex_002E58[] = dhakaana_room_0Tex_002E58;
#define dhakaana_room_0Tex_003658 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0Tex_003658"
static const ALIGN_ASSET(2) char hakaana_room_0Tex_003658[] = dhakaana_room_0Tex_003658;
#define dhakaana_room_0Tex_003258 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0Tex_003258"
#define dhakaana_room_0Tex_003258 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0Tex_003258"
static const ALIGN_ASSET(2) char hakaana_room_0Tex_003258[] = dhakaana_room_0Tex_003258;
#define dhakaana_room_0DL_0068B8 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0DL_0068B8"
static const ALIGN_ASSET(2) char hakaana_room_0DL_0068B8[] = dhakaana_room_0DL_0068B8;
#define dhakaana_room_0Tex_003658 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0Tex_003658"
static const ALIGN_ASSET(2) char hakaana_room_0Tex_003658[] = dhakaana_room_0Tex_003658;
#define dhakaana_room_0Tex_0068C8 "__OTR__scenes/nonmq/hakaana_scene/hakaana_room_0Tex_0068C8"
#define dhakaana_room_0Tex_003E58 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0Tex_003E58"
static const ALIGN_ASSET(2) char hakaana_room_0Tex_003E58[] = dhakaana_room_0Tex_003E58;
#define dhakaana_room_0Tex_004658 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0Tex_004658"
static const ALIGN_ASSET(2) char hakaana_room_0Tex_004658[] = dhakaana_room_0Tex_004658;
#define dhakaana_room_0Tex_004E58 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0Tex_004E58"
static const ALIGN_ASSET(2) char hakaana_room_0Tex_004E58[] = dhakaana_room_0Tex_004E58;
#define dhakaana_room_0Tex_005658 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0Tex_005658"
static const ALIGN_ASSET(2) char hakaana_room_0Tex_005658[] = dhakaana_room_0Tex_005658;
#define dhakaana_room_0Tex_005E58 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0Tex_005E58"
static const ALIGN_ASSET(2) char hakaana_room_0Tex_005E58[] = dhakaana_room_0Tex_005E58;
#define dhakaana_room_0Tex_0068C8 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0Tex_0068C8"
static const ALIGN_ASSET(2) char hakaana_room_0Tex_0068C8[] = dhakaana_room_0Tex_0068C8;
#define dhakaana_room_0DL_002620 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0DL_002620"
static const ALIGN_ASSET(2) char hakaana_room_0DL_002620[] = dhakaana_room_0DL_002620;
#define dhakaana_room_0DL_0068B8 "__OTR__scenes/shared/hakaana_scene/hakaana_room_0DL_0068B8"
static const ALIGN_ASSET(2) char hakaana_room_0DL_0068B8[] = dhakaana_room_0DL_0068B8;
#endif // MISC_HAKAANA_ROOM_0_H

2
soh/assets/scenes/misc/hakaana/hakaana_scene.h
View File

@@ -3,7 +3,7 @@
#include "align_asset_macro.h"
#define dhakaana_sceneCollisionHeader_000A60 "__OTR__scenes/nonmq/hakaana_scene/hakaana_sceneCollisionHeader_000A60"
#define dhakaana_sceneCollisionHeader_000A60 "__OTR__scenes/shared/hakaana_scene/hakaana_sceneCollisionHeader_000A60"
static const ALIGN_ASSET(2) char hakaana_sceneCollisionHeader_000A60[] = dhakaana_sceneCollisionHeader_000A60;