diff options
| author | Adam Bird <Archez@users.noreply.github.com> | 2023-11-06 17:44:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-06 16:44:49 -0600 |
| commit | 460b3d02f501904ba0a1e77af8d523534cd42e62 (patch) | |
| tree | 072633adf5f76faf05f86528b929ea2822ef83e9 /soh/assets/objects/object_hakach_objects | |
| parent | 8b78cb832abdc8e764122f5de7c348f190cf20f1 (diff) | |
[OTR Archive] Move shared scenes out of nonmq/mq folders (#3191)
* 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
Diffstat (limited to 'soh/assets/objects/object_hakach_objects')
| -rw-r--r-- | soh/assets/objects/object_hakach_objects/object_hakach_objects.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/soh/assets/objects/object_hakach_objects/object_hakach_objects.h b/soh/assets/objects/object_hakach_objects/object_hakach_objects.h index caeaaf280..410f5cc06 100644 --- a/soh/assets/objects/object_hakach_objects/object_hakach_objects.h +++ b/soh/assets/objects/object_hakach_objects/object_hakach_objects.h @@ -3,6 +3,9 @@ #include "align_asset_macro.h" +#define dobject_hakach_objectsTex_0062F0 "__OTR__objects/object_hakach_objects/object_hakach_objectsTex_0062F0" +static const ALIGN_ASSET(2) char object_hakach_objectsTex_0062F0[] = dobject_hakach_objectsTex_0062F0; + #define dgBotwHoleTrap1DL "__OTR__objects/object_hakach_objects/gBotwHoleTrap1DL" static const ALIGN_ASSET(2) char gBotwHoleTrap1DL[] = dgBotwHoleTrap1DL; @@ -69,7 +72,4 @@ static const ALIGN_ASSET(2) char gBotwTex_0058F0[] = dgBotwTex_0058F0; #define dgBotwTex_0060F0 "__OTR__objects/object_hakach_objects/gBotwTex_0060F0" static const ALIGN_ASSET(2) char gBotwTex_0060F0[] = dgBotwTex_0060F0; -#define dobject_hakach_objectsTex_0062F0 "__OTR__objects/object_hakach_objects/object_hakach_objectsTex_0062F0" -static const ALIGN_ASSET(2) char object_hakach_objectsTex_0062F0[] = dobject_hakach_objectsTex_0062F0; - #endif // OBJECTS_OBJECT_HAKACH_OBJECTS_H |