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

32
soh/assets/scenes/overworld/spot10/spot10_room_3.h
View File

@@ -3,34 +3,34 @@
#include "align_asset_macro.h"
#define dspot10_room_3DL_0028C0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_3DL_0028C0"
static const ALIGN_ASSET(2) char spot10_room_3DL_0028C0[] = dspot10_room_3DL_0028C0;
#define dspot10_room_3Tex_0038F8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_3Tex_0038F8"
static const ALIGN_ASSET(2) char spot10_room_3Tex_0038F8[] = dspot10_room_3Tex_0038F8;
#define dspot10_room_3Tex_0028F8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_3Tex_0028F8"
#define dspot10_room_3Tex_0028F8 "__OTR__scenes/shared/spot10_scene/spot10_room_3Tex_0028F8"
static const ALIGN_ASSET(2) char spot10_room_3Tex_0028F8[] = dspot10_room_3Tex_0028F8;
#define dspot10_room_3Tex_0048F8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_3Tex_0048F8"
#define dspot10_room_3Tex_0038F8 "__OTR__scenes/shared/spot10_scene/spot10_room_3Tex_0038F8"
static const ALIGN_ASSET(2) char spot10_room_3Tex_0038F8[] = dspot10_room_3Tex_0038F8;
#define dspot10_room_3Tex_0048F8 "__OTR__scenes/shared/spot10_scene/spot10_room_3Tex_0048F8"
static const ALIGN_ASSET(2) char spot10_room_3Tex_0048F8[] = dspot10_room_3Tex_0048F8;
#define dspot10_room_3DL_005298 "__OTR__scenes/nonmq/spot10_scene/spot10_room_3DL_005298"
static const ALIGN_ASSET(2) char spot10_room_3DL_005298[] = dspot10_room_3DL_005298;
#define dspot10_room_3Tex_0052A8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_3Tex_0052A8"
#define dspot10_room_3Tex_0052A8 "__OTR__scenes/shared/spot10_scene/spot10_room_3Tex_0052A8"
static const ALIGN_ASSET(2) char spot10_room_3Tex_0052A8[] = dspot10_room_3Tex_0052A8;
#define dspot10_room_3Set_000150DL_0028C0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_3Set_000150DL_0028C0"
#define dspot10_room_3DL_0028C0 "__OTR__scenes/shared/spot10_scene/spot10_room_3DL_0028C0"
static const ALIGN_ASSET(2) char spot10_room_3DL_0028C0[] = dspot10_room_3DL_0028C0;
#define dspot10_room_3DL_005298 "__OTR__scenes/shared/spot10_scene/spot10_room_3DL_005298"
static const ALIGN_ASSET(2) char spot10_room_3DL_005298[] = dspot10_room_3DL_005298;
#define dspot10_room_3Set_000150DL_0028C0 "__OTR__scenes/shared/spot10_scene/spot10_room_3Set_000150DL_0028C0"
static const ALIGN_ASSET(2) char spot10_room_3Set_000150DL_0028C0[] = dspot10_room_3Set_000150DL_0028C0;
#define dspot10_room_3Set_000150DL_005298 "__OTR__scenes/nonmq/spot10_scene/spot10_room_3Set_000150DL_005298"
#define dspot10_room_3Set_000150DL_005298 "__OTR__scenes/shared/spot10_scene/spot10_room_3Set_000150DL_005298"
static const ALIGN_ASSET(2) char spot10_room_3Set_000150DL_005298[] = dspot10_room_3Set_000150DL_005298;
#define dspot10_room_3Set_000210DL_0028C0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_3Set_000210DL_0028C0"
#define dspot10_room_3Set_000210DL_0028C0 "__OTR__scenes/shared/spot10_scene/spot10_room_3Set_000210DL_0028C0"
static const ALIGN_ASSET(2) char spot10_room_3Set_000210DL_0028C0[] = dspot10_room_3Set_000210DL_0028C0;
#define dspot10_room_3Set_000210DL_005298 "__OTR__scenes/nonmq/spot10_scene/spot10_room_3Set_000210DL_005298"
#define dspot10_room_3Set_000210DL_005298 "__OTR__scenes/shared/spot10_scene/spot10_room_3Set_000210DL_005298"
static const ALIGN_ASSET(2) char spot10_room_3Set_000210DL_005298[] = dspot10_room_3Set_000210DL_005298;