github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-26 08:05:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[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
commit 460b3d02f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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/misc/shrine_r/shrine_r_room_0.h
View file

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

2
soh/assets/scenes/misc/shrine_r/shrine_r_scene.h
View file

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