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

46
soh/assets/scenes/overworld/spot10/spot10_scene.h
View File

@@ -3,36 +3,36 @@
#include "align_asset_macro.h"
#define dspot10_sceneCollisionHeader_00AC98 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneCollisionHeader_00AC98"
static const ALIGN_ASSET(2) char spot10_sceneCollisionHeader_00AC98[] = dspot10_sceneCollisionHeader_00AC98;
#define dspot10_sceneTex_00FC30 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneTex_00FC30"
static const ALIGN_ASSET(2) char spot10_sceneTex_00FC30[] = dspot10_sceneTex_00FC30;
#define dspot10_sceneTex_00EA30 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneTex_00EA30"
static const ALIGN_ASSET(2) char spot10_sceneTex_00EA30[] = dspot10_sceneTex_00EA30;
#define dspot10_sceneTex_00DA30 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneTex_00DA30"
static const ALIGN_ASSET(2) char spot10_sceneTex_00DA30[] = dspot10_sceneTex_00DA30;
#define dspot10_sceneTex_00F430 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneTex_00F430"
static const ALIGN_ASSET(2) char spot10_sceneTex_00F430[] = dspot10_sceneTex_00F430;
#define dspot10_sceneTex_00F230 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneTex_00F230"
static const ALIGN_ASSET(2) char spot10_sceneTex_00F230[] = dspot10_sceneTex_00F230;
#define dspot10_sceneTex_00C230 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneTex_00C230"
#define dspot10_sceneTex_00C230 "__OTR__scenes/shared/spot10_scene/spot10_sceneTex_00C230"
static const ALIGN_ASSET(2) char spot10_sceneTex_00C230[] = dspot10_sceneTex_00C230;
#define dspot10_sceneTex_00CA30 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneTex_00CA30"
#define dspot10_sceneTex_00CA30 "__OTR__scenes/shared/spot10_scene/spot10_sceneTex_00CA30"
static const ALIGN_ASSET(2) char spot10_sceneTex_00CA30[] = dspot10_sceneTex_00CA30;
#define dspot10_sceneTex_00D230 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneTex_00D230"
#define dspot10_sceneTex_00D230 "__OTR__scenes/shared/spot10_scene/spot10_sceneTex_00D230"
static const ALIGN_ASSET(2) char spot10_sceneTex_00D230[] = dspot10_sceneTex_00D230;
#define dspot10_sceneCollisionHeader_00AC98 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneCollisionHeader_00AC98"
#define dspot10_sceneTex_00DA30 "__OTR__scenes/shared/spot10_scene/spot10_sceneTex_00DA30"
static const ALIGN_ASSET(2) char spot10_sceneTex_00DA30[] = dspot10_sceneTex_00DA30;
#define dspot10_sceneCollisionHeader_00AC98 "__OTR__scenes/nonmq/spot10_scene/spot10_sceneCollisionHeader_00AC98"
#define dspot10_sceneTex_00EA30 "__OTR__scenes/shared/spot10_scene/spot10_sceneTex_00EA30"
static const ALIGN_ASSET(2) char spot10_sceneTex_00EA30[] = dspot10_sceneTex_00EA30;
#define dspot10_sceneTex_00F230 "__OTR__scenes/shared/spot10_scene/spot10_sceneTex_00F230"
static const ALIGN_ASSET(2) char spot10_sceneTex_00F230[] = dspot10_sceneTex_00F230;
#define dspot10_sceneTex_00F430 "__OTR__scenes/shared/spot10_scene/spot10_sceneTex_00F430"
static const ALIGN_ASSET(2) char spot10_sceneTex_00F430[] = dspot10_sceneTex_00F430;
#define dspot10_sceneTex_00FC30 "__OTR__scenes/shared/spot10_scene/spot10_sceneTex_00FC30"
static const ALIGN_ASSET(2) char spot10_sceneTex_00FC30[] = dspot10_sceneTex_00FC30;
#define dspot10_sceneCollisionHeader_00AC98 "__OTR__scenes/shared/spot10_scene/spot10_sceneCollisionHeader_00AC98"
static const ALIGN_ASSET(2) char spot10_sceneCollisionHeader_00AC98[] = dspot10_sceneCollisionHeader_00AC98;
#define dspot10_sceneCollisionHeader_00AC98 "__OTR__scenes/shared/spot10_scene/spot10_sceneCollisionHeader_00AC98"
#define dspot10_sceneCollisionHeader_00AC98 "__OTR__scenes/shared/spot10_scene/spot10_sceneCollisionHeader_00AC98"
#endif // OVERWORLD_SPOT10_SCENE_H