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

77
soh/assets/objects/object_am/object_am.h
View File

@@ -3,6 +3,45 @@
#include "align_asset_macro.h"
#define dobject_amTex_002638 "__OTR__objects/object_am/object_amTex_002638"
static const ALIGN_ASSET(2) char object_amTex_002638[] = dobject_amTex_002638;
#define dobject_amTex_002838 "__OTR__objects/object_am/object_amTex_002838"
static const ALIGN_ASSET(2) char object_amTex_002838[] = dobject_amTex_002838;
#define dobject_amTex_002938 "__OTR__objects/object_am/object_amTex_002938"
static const ALIGN_ASSET(2) char object_amTex_002938[] = dobject_amTex_002938;
#define dobject_amTex_002D38 "__OTR__objects/object_am/object_amTex_002D38"
static const ALIGN_ASSET(2) char object_amTex_002D38[] = dobject_amTex_002D38;
#define dobject_amTex_002E38 "__OTR__objects/object_am/object_amTex_002E38"
static const ALIGN_ASSET(2) char object_amTex_002E38[] = dobject_amTex_002E38;
#define dobject_amTex_003038 "__OTR__objects/object_am/object_amTex_003038"
static const ALIGN_ASSET(2) char object_amTex_003038[] = dobject_amTex_003038;
#define dobject_amTex_003238 "__OTR__objects/object_am/object_amTex_003238"
static const ALIGN_ASSET(2) char object_amTex_003238[] = dobject_amTex_003238;
#define dobject_amTex_003A38 "__OTR__objects/object_am/object_amTex_003A38"
static const ALIGN_ASSET(2) char object_amTex_003A38[] = dobject_amTex_003A38;
#define dobject_amTex_003C38 "__OTR__objects/object_am/object_amTex_003C38"
static const ALIGN_ASSET(2) char object_amTex_003C38[] = dobject_amTex_003C38;
#define dobject_amTex_004438 "__OTR__objects/object_am/object_amTex_004438"
static const ALIGN_ASSET(2) char object_amTex_004438[] = dobject_amTex_004438;
#define dobject_amTex_004C38 "__OTR__objects/object_am/object_amTex_004C38"
static const ALIGN_ASSET(2) char object_amTex_004C38[] = dobject_amTex_004C38;
#define dobject_amTex_005438 "__OTR__objects/object_am/object_amTex_005438"
static const ALIGN_ASSET(2) char object_amTex_005438[] = dobject_amTex_005438;
#define dobject_amTex_005478 "__OTR__objects/object_am/object_amTex_005478"
static const ALIGN_ASSET(2) char object_amTex_005478[] = dobject_amTex_005478;
#define dgArmosSkel "__OTR__objects/object_am/gArmosSkel"
static const ALIGN_ASSET(2) char gArmosSkel[] = dgArmosSkel;
@@ -30,43 +69,5 @@ static const ALIGN_ASSET(2) char gArmosSkelLimbsLimb_0058E4DL_002278[] = dgArmos
#define dgArmosSkelLimbsLimb_005908DL_0005D0 "__OTR__objects/object_am/gArmosSkelLimbsLimb_005908DL_0005D0"
static const ALIGN_ASSET(2) char gArmosSkelLimbsLimb_005908DL_0005D0[] = dgArmosSkelLimbsLimb_005908DL_0005D0;
#define dobject_amTex_002638 "__OTR__objects/object_am/object_amTex_002638"
static const ALIGN_ASSET(2) char object_amTex_002638[] = dobject_amTex_002638;
#define dobject_amTex_003C38 "__OTR__objects/object_am/object_amTex_003C38"
static const ALIGN_ASSET(2) char object_amTex_003C38[] = dobject_amTex_003C38;
#define dobject_amTex_003238 "__OTR__objects/object_am/object_amTex_003238"
static const ALIGN_ASSET(2) char object_amTex_003238[] = dobject_amTex_003238;
#define dobject_amTex_002838 "__OTR__objects/object_am/object_amTex_002838"
static const ALIGN_ASSET(2) char object_amTex_002838[] = dobject_amTex_002838;
#define dobject_amTex_004C38 "__OTR__objects/object_am/object_amTex_004C38"
static const ALIGN_ASSET(2) char object_amTex_004C38[] = dobject_amTex_004C38;
#define dobject_amTex_003A38 "__OTR__objects/object_am/object_amTex_003A38"
static const ALIGN_ASSET(2) char object_amTex_003A38[] = dobject_amTex_003A38;
#define dobject_amTex_003038 "__OTR__objects/object_am/object_amTex_003038"
static const ALIGN_ASSET(2) char object_amTex_003038[] = dobject_amTex_003038;
#define dobject_amTex_004438 "__OTR__objects/object_am/object_amTex_004438"
static const ALIGN_ASSET(2) char object_amTex_004438[] = dobject_amTex_004438;
#define dobject_amTex_002938 "__OTR__objects/object_am/object_amTex_002938"
static const ALIGN_ASSET(2) char object_amTex_002938[] = dobject_amTex_002938;
#define dobject_amTex_002D38 "__OTR__objects/object_am/object_amTex_002D38"
static const ALIGN_ASSET(2) char object_amTex_002D38[] = dobject_amTex_002D38;
#define dobject_amTex_002E38 "__OTR__objects/object_am/object_amTex_002E38"
static const ALIGN_ASSET(2) char object_amTex_002E38[] = dobject_amTex_002E38;
#define dobject_amTex_005478 "__OTR__objects/object_am/object_amTex_005478"
static const ALIGN_ASSET(2) char object_amTex_005478[] = dobject_amTex_005478;
#define dobject_amTex_005438 "__OTR__objects/object_am/object_amTex_005438"
static const ALIGN_ASSET(2) char object_amTex_005438[] = dobject_amTex_005438;
#endif // OBJECTS_OBJECT_AM_H