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

24
soh/assets/objects/gameplay_keep/gameplay_keep.h
View File

@@ -3,6 +3,18 @@
#include "align_asset_macro.h"
#define dgameplay_keepTex_04C540 "__OTR__objects/gameplay_keep/gameplay_keepTex_04C540"
static const ALIGN_ASSET(2) char gameplay_keepTex_04C540[] = dgameplay_keepTex_04C540;
#define dgameplay_keepTex_04C740 "__OTR__objects/gameplay_keep/gameplay_keepTex_04C740"
static const ALIGN_ASSET(2) char gameplay_keepTex_04C740[] = dgameplay_keepTex_04C740;
#define dgameplay_keepTex_04CD40 "__OTR__objects/gameplay_keep/gameplay_keepTex_04CD40"
static const ALIGN_ASSET(2) char gameplay_keepTex_04CD40[] = dgameplay_keepTex_04CD40;
#define dgameplay_keepTex_04CF40 "__OTR__objects/gameplay_keep/gameplay_keepTex_04CF40"
static const ALIGN_ASSET(2) char gameplay_keepTex_04CF40[] = dgameplay_keepTex_04CF40;
#define dgHilite1Tex "__OTR__objects/gameplay_keep/gHilite1Tex"
static const ALIGN_ASSET(2) char gHilite1Tex[] = dgHilite1Tex;
@@ -2826,18 +2838,6 @@ static const ALIGN_ASSET(2) char gEffSpark3Tex[] = dgEffSpark3Tex;
#define dgEffSpark4Tex "__OTR__objects/gameplay_keep/gEffSpark4Tex"
static const ALIGN_ASSET(2) char gEffSpark4Tex[] = dgEffSpark4Tex;
#define dgameplay_keepTex_04C540 "__OTR__objects/gameplay_keep/gameplay_keepTex_04C540"
static const ALIGN_ASSET(2) char gameplay_keepTex_04C540[] = dgameplay_keepTex_04C540;
#define dgameplay_keepTex_04CD40 "__OTR__objects/gameplay_keep/gameplay_keepTex_04CD40"
static const ALIGN_ASSET(2) char gameplay_keepTex_04CD40[] = dgameplay_keepTex_04CD40;
#define dgameplay_keepTex_04C740 "__OTR__objects/gameplay_keep/gameplay_keepTex_04C740"
static const ALIGN_ASSET(2) char gameplay_keepTex_04C740[] = dgameplay_keepTex_04C740;
#define dgameplay_keepTex_04CF40 "__OTR__objects/gameplay_keep/gameplay_keepTex_04CF40"
static const ALIGN_ASSET(2) char gameplay_keepTex_04CF40[] = dgameplay_keepTex_04CF40;
#define dgFishSkelLimbsLimb_018F98DL_018A68 "__OTR__objects/gameplay_keep/gFishSkelLimbsLimb_018F98DL_018A68"
static const ALIGN_ASSET(2) char gFishSkelLimbsLimb_018F98DL_018A68[] = dgFishSkelLimbsLimb_018F98DL_018A68;