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

2
soh/assets/scenes/shops/alley_shop/alley_shop_room_0.h
View File

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

2
soh/assets/scenes/shops/alley_shop/alley_shop_scene.h
View File

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

2
soh/assets/scenes/shops/drag/drag_room_0.h
View File

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

2
soh/assets/scenes/shops/drag/drag_scene.h
View File

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

2
soh/assets/scenes/shops/face_shop/face_shop_room_0.h
View File

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

2
soh/assets/scenes/shops/face_shop/face_shop_scene.h
View File

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

2
soh/assets/scenes/shops/golon/golon_room_0.h
View File

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

2
soh/assets/scenes/shops/golon/golon_scene.h
View File

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

2
soh/assets/scenes/shops/kokiri_shop/kokiri_shop_room_0.h
View File

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

2
soh/assets/scenes/shops/kokiri_shop/kokiri_shop_scene.h
View File

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

2
soh/assets/scenes/shops/night_shop/night_shop_room_0.h
View File

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

2
soh/assets/scenes/shops/night_shop/night_shop_scene.h
View File

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

2
soh/assets/scenes/shops/shop1/shop1_room_0.h
View File

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

2
soh/assets/scenes/shops/shop1/shop1_scene.h
View File

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

2
soh/assets/scenes/shops/zoora/zoora_room_0.h
View File

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

2
soh/assets/scenes/shops/zoora/zoora_scene.h
View File

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