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

34
soh/assets/scenes/overworld/spot10/spot10_room_9.h
View File

@@ -3,34 +3,34 @@
#include "align_asset_macro.h"
#define dspot10_room_9DL_001EC0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_9DL_001EC0"
static const ALIGN_ASSET(2) char spot10_room_9DL_001EC0[] = dspot10_room_9DL_001EC0;
#define dspot10_room_9Tex_0026F8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_9Tex_0026F8"
static const ALIGN_ASSET(2) char spot10_room_9Tex_0026F8[] = dspot10_room_9Tex_0026F8;
#define dspot10_room_9Tex_001EF8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_9Tex_001EF8"
#define dspot10_room_9Tex_001EF8 "__OTR__scenes/shared/spot10_scene/spot10_room_9Tex_001EF8"
static const ALIGN_ASSET(2) char spot10_room_9Tex_001EF8[] = dspot10_room_9Tex_001EF8;
#define dspot10_room_9DL_0033C0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_9DL_0033C0"
static const ALIGN_ASSET(2) char spot10_room_9DL_0033C0[] = dspot10_room_9DL_0033C0;
#define dspot10_room_9Tex_0026F8 "__OTR__scenes/shared/spot10_scene/spot10_room_9Tex_0026F8"
static const ALIGN_ASSET(2) char spot10_room_9Tex_0026F8[] = dspot10_room_9Tex_0026F8;
#define dspot10_room_9Tex_0037D8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_9Tex_0037D8"
static const ALIGN_ASSET(2) char spot10_room_9Tex_0037D8[] = dspot10_room_9Tex_0037D8;
#define dspot10_room_9Tex_0033D8 "__OTR__scenes/nonmq/spot10_scene/spot10_room_9Tex_0033D8"
#define dspot10_room_9Tex_0033D8 "__OTR__scenes/shared/spot10_scene/spot10_room_9Tex_0033D8"
static const ALIGN_ASSET(2) char spot10_room_9Tex_0033D8[] = dspot10_room_9Tex_0033D8;
#define dspot10_room_9Set_0000B0DL_001EC0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_9Set_0000B0DL_001EC0"
#define dspot10_room_9Tex_0037D8 "__OTR__scenes/shared/spot10_scene/spot10_room_9Tex_0037D8"
static const ALIGN_ASSET(2) char spot10_room_9Tex_0037D8[] = dspot10_room_9Tex_0037D8;
#define dspot10_room_9DL_001EC0 "__OTR__scenes/shared/spot10_scene/spot10_room_9DL_001EC0"
static const ALIGN_ASSET(2) char spot10_room_9DL_001EC0[] = dspot10_room_9DL_001EC0;
#define dspot10_room_9DL_0033C0 "__OTR__scenes/shared/spot10_scene/spot10_room_9DL_0033C0"
static const ALIGN_ASSET(2) char spot10_room_9DL_0033C0[] = dspot10_room_9DL_0033C0;
#define dspot10_room_9Set_0000B0DL_001EC0 "__OTR__scenes/shared/spot10_scene/spot10_room_9Set_0000B0DL_001EC0"
static const ALIGN_ASSET(2) char spot10_room_9Set_0000B0DL_001EC0[] = dspot10_room_9Set_0000B0DL_001EC0;
#define dspot10_room_9Set_0000B0DL_0033C0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_9Set_0000B0DL_0033C0"
#define dspot10_room_9Set_0000B0DL_0033C0 "__OTR__scenes/shared/spot10_scene/spot10_room_9Set_0000B0DL_0033C0"
static const ALIGN_ASSET(2) char spot10_room_9Set_0000B0DL_0033C0[] = dspot10_room_9Set_0000B0DL_0033C0;
#define dspot10_room_9Set_000140DL_001EC0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_9Set_000140DL_001EC0"
#define dspot10_room_9Set_000140DL_001EC0 "__OTR__scenes/shared/spot10_scene/spot10_room_9Set_000140DL_001EC0"
static const ALIGN_ASSET(2) char spot10_room_9Set_000140DL_001EC0[] = dspot10_room_9Set_000140DL_001EC0;
#define dspot10_room_9Set_000140DL_0033C0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_9Set_000140DL_0033C0"
#define dspot10_room_9Set_000140DL_0033C0 "__OTR__scenes/shared/spot10_scene/spot10_room_9Set_000140DL_0033C0"
static const ALIGN_ASSET(2) char spot10_room_9Set_000140DL_0033C0[] = dspot10_room_9Set_000140DL_0033C0;