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

60
soh/assets/objects/object_gj/object_gj.h
View File

@@ -3,6 +3,36 @@
#include "align_asset_macro.h"
#define dobject_gjTex_003B20 "__OTR__objects/object_gj/object_gjTex_003B20"
static const ALIGN_ASSET(2) char object_gjTex_003B20[] = dobject_gjTex_003B20;
#define dobject_gjTex_003C20 "__OTR__objects/object_gj/object_gjTex_003C20"
static const ALIGN_ASSET(2) char object_gjTex_003C20[] = dobject_gjTex_003C20;
#define dobject_gjTex_003D20 "__OTR__objects/object_gj/object_gjTex_003D20"
static const ALIGN_ASSET(2) char object_gjTex_003D20[] = dobject_gjTex_003D20;
#define dobject_gjTex_003F20 "__OTR__objects/object_gj/object_gjTex_003F20"
static const ALIGN_ASSET(2) char object_gjTex_003F20[] = dobject_gjTex_003F20;
#define dobject_gjTex_004F20 "__OTR__objects/object_gj/object_gjTex_004F20"
static const ALIGN_ASSET(2) char object_gjTex_004F20[] = dobject_gjTex_004F20;
#define dobject_gjTex_005F20 "__OTR__objects/object_gj/object_gjTex_005F20"
static const ALIGN_ASSET(2) char object_gjTex_005F20[] = dobject_gjTex_005F20;
#define dobject_gjTex_006F20 "__OTR__objects/object_gj/object_gjTex_006F20"
static const ALIGN_ASSET(2) char object_gjTex_006F20[] = dobject_gjTex_006F20;
#define dobject_gjTex_007320 "__OTR__objects/object_gj/object_gjTex_007320"
static const ALIGN_ASSET(2) char object_gjTex_007320[] = dobject_gjTex_007320;
#define dobject_gjTex_007720 "__OTR__objects/object_gj/object_gjTex_007720"
static const ALIGN_ASSET(2) char object_gjTex_007720[] = dobject_gjTex_007720;
#define dobject_gjTex_007B20 "__OTR__objects/object_gj/object_gjTex_007B20"
static const ALIGN_ASSET(2) char object_gjTex_007B20[] = dobject_gjTex_007B20;
#define dgGanonsCastleRubbleAroundArenaDL "__OTR__objects/object_gj/gGanonsCastleRubbleAroundArenaDL"
static const ALIGN_ASSET(2) char gGanonsCastleRubbleAroundArenaDL[] = dgGanonsCastleRubbleAroundArenaDL;
@@ -60,34 +90,4 @@ static const ALIGN_ASSET(2) char gGanonsCastleUnusedWallTex[] = dgGanonsCastleUn
#define dgGanonsCastleUnusedTex_00A320 "__OTR__objects/object_gj/gGanonsCastleUnusedTex_00A320"
static const ALIGN_ASSET(2) char gGanonsCastleUnusedTex_00A320[] = dgGanonsCastleUnusedTex_00A320;
#define dobject_gjTex_003D20 "__OTR__objects/object_gj/object_gjTex_003D20"
static const ALIGN_ASSET(2) char object_gjTex_003D20[] = dobject_gjTex_003D20;
#define dobject_gjTex_003B20 "__OTR__objects/object_gj/object_gjTex_003B20"
static const ALIGN_ASSET(2) char object_gjTex_003B20[] = dobject_gjTex_003B20;
#define dobject_gjTex_004F20 "__OTR__objects/object_gj/object_gjTex_004F20"
static const ALIGN_ASSET(2) char object_gjTex_004F20[] = dobject_gjTex_004F20;
#define dobject_gjTex_003C20 "__OTR__objects/object_gj/object_gjTex_003C20"
static const ALIGN_ASSET(2) char object_gjTex_003C20[] = dobject_gjTex_003C20;
#define dobject_gjTex_003F20 "__OTR__objects/object_gj/object_gjTex_003F20"
static const ALIGN_ASSET(2) char object_gjTex_003F20[] = dobject_gjTex_003F20;
#define dobject_gjTex_005F20 "__OTR__objects/object_gj/object_gjTex_005F20"
static const ALIGN_ASSET(2) char object_gjTex_005F20[] = dobject_gjTex_005F20;
#define dobject_gjTex_007B20 "__OTR__objects/object_gj/object_gjTex_007B20"
static const ALIGN_ASSET(2) char object_gjTex_007B20[] = dobject_gjTex_007B20;
#define dobject_gjTex_007320 "__OTR__objects/object_gj/object_gjTex_007320"
static const ALIGN_ASSET(2) char object_gjTex_007320[] = dobject_gjTex_007320;
#define dobject_gjTex_007720 "__OTR__objects/object_gj/object_gjTex_007720"
static const ALIGN_ASSET(2) char object_gjTex_007720[] = dobject_gjTex_007720;
#define dobject_gjTex_006F20 "__OTR__objects/object_gj/object_gjTex_006F20"
static const ALIGN_ASSET(2) char object_gjTex_006F20[] = dobject_gjTex_006F20;
#endif // OBJECTS_OBJECT_GJ_H