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

56
soh/assets/scenes/overworld/spot10/spot10_room_1.h
View File

@@ -3,49 +3,49 @@
#include "align_asset_macro.h"
#define dspot10_room_1DL_003B48 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1DL_003B48"
static const ALIGN_ASSET(2) char spot10_room_1DL_003B48[] = dspot10_room_1DL_003B48;
#define dspot10_room_1Tex_003FA0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Tex_003FA0"
static const ALIGN_ASSET(2) char spot10_room_1Tex_003FA0[] = dspot10_room_1Tex_003FA0;
#define dspot10_room_1Tex_003BA0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Tex_003BA0"
#define dspot10_room_1Tex_003BA0 "__OTR__scenes/shared/spot10_scene/spot10_room_1Tex_003BA0"
static const ALIGN_ASSET(2) char spot10_room_1Tex_003BA0[] = dspot10_room_1Tex_003BA0;
#define dspot10_room_1Tex_005FA0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Tex_005FA0"
static const ALIGN_ASSET(2) char spot10_room_1Tex_005FA0[] = dspot10_room_1Tex_005FA0;
#define dspot10_room_1Tex_003FA0 "__OTR__scenes/shared/spot10_scene/spot10_room_1Tex_003FA0"
static const ALIGN_ASSET(2) char spot10_room_1Tex_003FA0[] = dspot10_room_1Tex_003FA0;
#define dspot10_room_1Tex_0067A0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Tex_0067A0"
static const ALIGN_ASSET(2) char spot10_room_1Tex_0067A0[] = dspot10_room_1Tex_0067A0;
#define dspot10_room_1Tex_006FA0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Tex_006FA0"
static const ALIGN_ASSET(2) char spot10_room_1Tex_006FA0[] = dspot10_room_1Tex_006FA0;
#define dspot10_room_1Tex_004FA0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Tex_004FA0"
static const ALIGN_ASSET(2) char spot10_room_1Tex_004FA0[] = dspot10_room_1Tex_004FA0;
#define dspot10_room_1Tex_0047A0 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Tex_0047A0"
#define dspot10_room_1Tex_0047A0 "__OTR__scenes/shared/spot10_scene/spot10_room_1Tex_0047A0"
static const ALIGN_ASSET(2) char spot10_room_1Tex_0047A0[] = dspot10_room_1Tex_0047A0;
#define dspot10_room_1DL_007C18 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1DL_007C18"
static const ALIGN_ASSET(2) char spot10_room_1DL_007C18[] = dspot10_room_1DL_007C18;
#define dspot10_room_1Tex_004FA0 "__OTR__scenes/shared/spot10_scene/spot10_room_1Tex_004FA0"
static const ALIGN_ASSET(2) char spot10_room_1Tex_004FA0[] = dspot10_room_1Tex_004FA0;
#define dspot10_room_1Tex_008030 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Tex_008030"
static const ALIGN_ASSET(2) char spot10_room_1Tex_008030[] = dspot10_room_1Tex_008030;
#define dspot10_room_1Tex_005FA0 "__OTR__scenes/shared/spot10_scene/spot10_room_1Tex_005FA0"
static const ALIGN_ASSET(2) char spot10_room_1Tex_005FA0[] = dspot10_room_1Tex_005FA0;
#define dspot10_room_1Tex_007C30 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Tex_007C30"
#define dspot10_room_1Tex_0067A0 "__OTR__scenes/shared/spot10_scene/spot10_room_1Tex_0067A0"
static const ALIGN_ASSET(2) char spot10_room_1Tex_0067A0[] = dspot10_room_1Tex_0067A0;
#define dspot10_room_1Tex_006FA0 "__OTR__scenes/shared/spot10_scene/spot10_room_1Tex_006FA0"
static const ALIGN_ASSET(2) char spot10_room_1Tex_006FA0[] = dspot10_room_1Tex_006FA0;
#define dspot10_room_1Tex_007C30 "__OTR__scenes/shared/spot10_scene/spot10_room_1Tex_007C30"
static const ALIGN_ASSET(2) char spot10_room_1Tex_007C30[] = dspot10_room_1Tex_007C30;
#define dspot10_room_1Set_000110DL_003B48 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Set_000110DL_003B48"
#define dspot10_room_1Tex_008030 "__OTR__scenes/shared/spot10_scene/spot10_room_1Tex_008030"
static const ALIGN_ASSET(2) char spot10_room_1Tex_008030[] = dspot10_room_1Tex_008030;
#define dspot10_room_1DL_003B48 "__OTR__scenes/shared/spot10_scene/spot10_room_1DL_003B48"
static const ALIGN_ASSET(2) char spot10_room_1DL_003B48[] = dspot10_room_1DL_003B48;
#define dspot10_room_1DL_007C18 "__OTR__scenes/shared/spot10_scene/spot10_room_1DL_007C18"
static const ALIGN_ASSET(2) char spot10_room_1DL_007C18[] = dspot10_room_1DL_007C18;
#define dspot10_room_1Set_000110DL_003B48 "__OTR__scenes/shared/spot10_scene/spot10_room_1Set_000110DL_003B48"
static const ALIGN_ASSET(2) char spot10_room_1Set_000110DL_003B48[] = dspot10_room_1Set_000110DL_003B48;
#define dspot10_room_1Set_000110DL_007C18 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Set_000110DL_007C18"
#define dspot10_room_1Set_000110DL_007C18 "__OTR__scenes/shared/spot10_scene/spot10_room_1Set_000110DL_007C18"
static const ALIGN_ASSET(2) char spot10_room_1Set_000110DL_007C18[] = dspot10_room_1Set_000110DL_007C18;
#define dspot10_room_1Set_0001A0DL_003B48 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Set_0001A0DL_003B48"
#define dspot10_room_1Set_0001A0DL_003B48 "__OTR__scenes/shared/spot10_scene/spot10_room_1Set_0001A0DL_003B48"
static const ALIGN_ASSET(2) char spot10_room_1Set_0001A0DL_003B48[] = dspot10_room_1Set_0001A0DL_003B48;
#define dspot10_room_1Set_0001A0DL_007C18 "__OTR__scenes/nonmq/spot10_scene/spot10_room_1Set_0001A0DL_007C18"
#define dspot10_room_1Set_0001A0DL_007C18 "__OTR__scenes/shared/spot10_scene/spot10_room_1Set_0001A0DL_007C18"
static const ALIGN_ASSET(2) char spot10_room_1Set_0001A0DL_007C18[] = dspot10_room_1Set_0001A0DL_007C18;