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

137
soh/assets/objects/object_ps/object_ps.h
View File

@@ -3,6 +3,75 @@
#include "align_asset_macro.h"
#define dobject_psTex_0005B8 "__OTR__objects/object_ps/object_psTex_0005B8"
static const ALIGN_ASSET(2) char object_psTex_0005B8[] = dobject_psTex_0005B8;
#define dobject_psTex_0015B8 "__OTR__objects/object_ps/object_psTex_0015B8"
static const ALIGN_ASSET(2) char object_psTex_0015B8[] = dobject_psTex_0015B8;
#define dobject_psTex_0015F8 "__OTR__objects/object_ps/object_psTex_0015F8"
static const ALIGN_ASSET(2) char object_psTex_0015F8[] = dobject_psTex_0015F8;
#define dobject_psTex_0017F8 "__OTR__objects/object_ps/object_psTex_0017F8"
static const ALIGN_ASSET(2) char object_psTex_0017F8[] = dobject_psTex_0017F8;
#define dobject_psTex_001838 "__OTR__objects/object_ps/object_psTex_001838"
static const ALIGN_ASSET(2) char object_psTex_001838[] = dobject_psTex_001838;
#define dobject_psTex_001C38 "__OTR__objects/object_ps/object_psTex_001C38"
static const ALIGN_ASSET(2) char object_psTex_001C38[] = dobject_psTex_001C38;
#define dobject_psTex_001D38 "__OTR__objects/object_ps/object_psTex_001D38"
static const ALIGN_ASSET(2) char object_psTex_001D38[] = dobject_psTex_001D38;
#define dobject_psTex_001D78 "__OTR__objects/object_ps/object_psTex_001D78"
static const ALIGN_ASSET(2) char object_psTex_001D78[] = dobject_psTex_001D78;
#define dobject_psTex_001E78 "__OTR__objects/object_ps/object_psTex_001E78"
static const ALIGN_ASSET(2) char object_psTex_001E78[] = dobject_psTex_001E78;
#define dobject_psTex_001F78 "__OTR__objects/object_ps/object_psTex_001F78"
static const ALIGN_ASSET(2) char object_psTex_001F78[] = dobject_psTex_001F78;
#define dobject_psTex_002178 "__OTR__objects/object_ps/object_psTex_002178"
static const ALIGN_ASSET(2) char object_psTex_002178[] = dobject_psTex_002178;
#define dobject_psTex_002378 "__OTR__objects/object_ps/object_psTex_002378"
static const ALIGN_ASSET(2) char object_psTex_002378[] = dobject_psTex_002378;
#define dobject_psTex_002578 "__OTR__objects/object_ps/object_psTex_002578"
static const ALIGN_ASSET(2) char object_psTex_002578[] = dobject_psTex_002578;
#define dobject_psTex_002978 "__OTR__objects/object_ps/object_psTex_002978"
static const ALIGN_ASSET(2) char object_psTex_002978[] = dobject_psTex_002978;
#define dobject_psTex_007180 "__OTR__objects/object_ps/object_psTex_007180"
static const ALIGN_ASSET(2) char object_psTex_007180[] = dobject_psTex_007180;
#define dobject_psTex_0071C0 "__OTR__objects/object_ps/object_psTex_0071C0"
static const ALIGN_ASSET(2) char object_psTex_0071C0[] = dobject_psTex_0071C0;
#define dobject_psTex_0075C0 "__OTR__objects/object_ps/object_psTex_0075C0"
static const ALIGN_ASSET(2) char object_psTex_0075C0[] = dobject_psTex_0075C0;
#define dobject_psTex_007600 "__OTR__objects/object_ps/object_psTex_007600"
static const ALIGN_ASSET(2) char object_psTex_007600[] = dobject_psTex_007600;
#define dobject_psTex_007640 "__OTR__objects/object_ps/object_psTex_007640"
static const ALIGN_ASSET(2) char object_psTex_007640[] = dobject_psTex_007640;
#define dobject_psTex_007A40 "__OTR__objects/object_ps/object_psTex_007A40"
static const ALIGN_ASSET(2) char object_psTex_007A40[] = dobject_psTex_007A40;
#define dobject_psTex_007C40 "__OTR__objects/object_ps/object_psTex_007C40"
static const ALIGN_ASSET(2) char object_psTex_007C40[] = dobject_psTex_007C40;
#define dobject_psTLUT_0004B0 "__OTR__objects/object_ps/object_psTLUT_0004B0"
static const ALIGN_ASSET(2) char object_psTLUT_0004B0[] = dobject_psTLUT_0004B0;
#define dobject_psTLUT_005880 "__OTR__objects/object_ps/object_psTLUT_005880"
static const ALIGN_ASSET(2) char object_psTLUT_005880[] = dobject_psTLUT_005880;
#define dgPoeSellerIdleAnim "__OTR__objects/object_ps/gPoeSellerIdleAnim"
static const ALIGN_ASSET(2) char gPoeSellerIdleAnim[] = dgPoeSellerIdleAnim;
@@ -78,73 +147,5 @@ static const ALIGN_ASSET(2) char gPoeSellerSkelLimbsLimb_00C1DCDL_00A1D8[] = dgP
#define dgPoeSellerSkelLimbsLimb_00C1E8DL_0096C0 "__OTR__objects/object_ps/gPoeSellerSkelLimbsLimb_00C1E8DL_0096C0"
static const ALIGN_ASSET(2) char gPoeSellerSkelLimbsLimb_00C1E8DL_0096C0[] = dgPoeSellerSkelLimbsLimb_00C1E8DL_0096C0;
#define dobject_psTex_0015B8 "__OTR__objects/object_ps/object_psTex_0015B8"
static const ALIGN_ASSET(2) char object_psTex_0015B8[] = dobject_psTex_0015B8;
#define dobject_psTLUT_0004B0 "__OTR__objects/object_ps/object_psTLUT_0004B0"
static const ALIGN_ASSET(2) char object_psTLUT_0004B0[] = dobject_psTLUT_0004B0;
#define dobject_psTex_0005B8 "__OTR__objects/object_ps/object_psTex_0005B8"
static const ALIGN_ASSET(2) char object_psTex_0005B8[] = dobject_psTex_0005B8;
#define dobject_psTex_0015F8 "__OTR__objects/object_ps/object_psTex_0015F8"
static const ALIGN_ASSET(2) char object_psTex_0015F8[] = dobject_psTex_0015F8;
#define dobject_psTex_0017F8 "__OTR__objects/object_ps/object_psTex_0017F8"
static const ALIGN_ASSET(2) char object_psTex_0017F8[] = dobject_psTex_0017F8;
#define dobject_psTex_001838 "__OTR__objects/object_ps/object_psTex_001838"
static const ALIGN_ASSET(2) char object_psTex_001838[] = dobject_psTex_001838;
#define dobject_psTex_002578 "__OTR__objects/object_ps/object_psTex_002578"
static const ALIGN_ASSET(2) char object_psTex_002578[] = dobject_psTex_002578;
#define dobject_psTex_001D78 "__OTR__objects/object_ps/object_psTex_001D78"
static const ALIGN_ASSET(2) char object_psTex_001D78[] = dobject_psTex_001D78;
#define dobject_psTex_001C38 "__OTR__objects/object_ps/object_psTex_001C38"
static const ALIGN_ASSET(2) char object_psTex_001C38[] = dobject_psTex_001C38;
#define dobject_psTex_002978 "__OTR__objects/object_ps/object_psTex_002978"
static const ALIGN_ASSET(2) char object_psTex_002978[] = dobject_psTex_002978;
#define dobject_psTex_001F78 "__OTR__objects/object_ps/object_psTex_001F78"
static const ALIGN_ASSET(2) char object_psTex_001F78[] = dobject_psTex_001F78;
#define dobject_psTex_002178 "__OTR__objects/object_ps/object_psTex_002178"
static const ALIGN_ASSET(2) char object_psTex_002178[] = dobject_psTex_002178;
#define dobject_psTex_002378 "__OTR__objects/object_ps/object_psTex_002378"
static const ALIGN_ASSET(2) char object_psTex_002378[] = dobject_psTex_002378;
#define dobject_psTex_001D38 "__OTR__objects/object_ps/object_psTex_001D38"
static const ALIGN_ASSET(2) char object_psTex_001D38[] = dobject_psTex_001D38;
#define dobject_psTex_001E78 "__OTR__objects/object_ps/object_psTex_001E78"
static const ALIGN_ASSET(2) char object_psTex_001E78[] = dobject_psTex_001E78;
#define dobject_psTLUT_005880 "__OTR__objects/object_ps/object_psTLUT_005880"
static const ALIGN_ASSET(2) char object_psTLUT_005880[] = dobject_psTLUT_005880;
#define dobject_psTex_0075C0 "__OTR__objects/object_ps/object_psTex_0075C0"
static const ALIGN_ASSET(2) char object_psTex_0075C0[] = dobject_psTex_0075C0;
#define dobject_psTex_007180 "__OTR__objects/object_ps/object_psTex_007180"
static const ALIGN_ASSET(2) char object_psTex_007180[] = dobject_psTex_007180;
#define dobject_psTex_007600 "__OTR__objects/object_ps/object_psTex_007600"
static const ALIGN_ASSET(2) char object_psTex_007600[] = dobject_psTex_007600;
#define dobject_psTex_007640 "__OTR__objects/object_ps/object_psTex_007640"
static const ALIGN_ASSET(2) char object_psTex_007640[] = dobject_psTex_007640;
#define dobject_psTex_007A40 "__OTR__objects/object_ps/object_psTex_007A40"
static const ALIGN_ASSET(2) char object_psTex_007A40[] = dobject_psTex_007A40;
#define dobject_psTex_007C40 "__OTR__objects/object_ps/object_psTex_007C40"
static const ALIGN_ASSET(2) char object_psTex_007C40[] = dobject_psTex_007C40;
#define dobject_psTex_0071C0 "__OTR__objects/object_ps/object_psTex_0071C0"
static const ALIGN_ASSET(2) char object_psTex_0071C0[] = dobject_psTex_0071C0;
#endif // OBJECTS_OBJECT_PS_H