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

12
soh/assets/objects/object_rl/object_rl.h
View File

@@ -3,6 +3,12 @@
#include "align_asset_macro.h"
#define dobject_rlTex_0033E0 "__OTR__objects/object_rl/object_rlTex_0033E0"
static const ALIGN_ASSET(2) char object_rlTex_0033E0[] = dobject_rlTex_0033E0;
#define dobject_rlTex_003420 "__OTR__objects/object_rl/object_rlTex_003420"
static const ALIGN_ASSET(2) char object_rlTex_003420[] = dobject_rlTex_003420;
#define dobject_rl_Anim_00040C "__OTR__objects/object_rl/object_rl_Anim_00040C"
static const ALIGN_ASSET(2) char object_rl_Anim_00040C[] = dobject_rl_Anim_00040C;
@@ -102,11 +108,5 @@ static const ALIGN_ASSET(2) char object_rl_Tex_007998[] = dobject_rl_Tex_007998;
#define dobject_rl_Skel_007B38 "__OTR__objects/object_rl/object_rl_Skel_007B38"
static const ALIGN_ASSET(2) char object_rl_Skel_007B38[] = dobject_rl_Skel_007B38;
#define dobject_rlTex_0033E0 "__OTR__objects/object_rl/object_rlTex_0033E0"
static const ALIGN_ASSET(2) char object_rlTex_0033E0[] = dobject_rlTex_0033E0;
#define dobject_rlTex_003420 "__OTR__objects/object_rl/object_rlTex_003420"
static const ALIGN_ASSET(2) char object_rlTex_003420[] = dobject_rlTex_003420;
#endif // OBJECTS_OBJECT_RL_H