diff --git a/assets/objects/gameplay_keep/gameplay_keep.h b/assets/objects/gameplay_keep/gameplay_keep.h index 8115d2f474..4cf7c9635b 100644 --- a/assets/objects/gameplay_keep/gameplay_keep.h +++ b/assets/objects/gameplay_keep/gameplay_keep.h @@ -2,7 +2,6 @@ #define GAMEPLAY_KEEP_H #include "hilite_textures.h" -#include "gameplay_keep_0x400.h" #include "link_textures.h" #include "player_pause_joint_tables.h" #include "player_anim_headers.h" diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x400.c b/assets/objects/gameplay_keep/gameplay_keep_0x400.c deleted file mode 100644 index 07e7831070..0000000000 --- a/assets/objects/gameplay_keep/gameplay_keep_0x400.c +++ /dev/null @@ -1,17 +0,0 @@ -#include "gameplay_keep_0x400.h" - -u64 gHylianShieldDesignTex[TEX_LEN(u64, gHylianShieldDesignTex_WIDTH, gHylianShieldDesignTex_HEIGHT, 16)] = { -#include "assets/objects/gameplay_keep/gHylianShieldDesignTex.rgba16.inc.c" -}; - -u64 gOcarinaofTimeDesignTex[TEX_LEN(u64, gOcarinaofTimeDesignTex_WIDTH, gOcarinaofTimeDesignTex_HEIGHT, 16)] = { -#include "assets/objects/gameplay_keep/gOcarinaofTimeDesignTex.rgba16.inc.c" -}; - -u64 gBottleGlassTex[TEX_LEN(u64, gBottleGlassTex_WIDTH, gBottleGlassTex_HEIGHT, 16)] = { -#include "assets/objects/gameplay_keep/gBottleGlassTex.rgba16.inc.c" -}; - -u64 gDekuStickTex[TEX_LEN(u64, gDekuStickTex_WIDTH, gDekuStickTex_HEIGHT, 8)] = { -#include "assets/objects/gameplay_keep/gDekuStickTex.i8.inc.c" -}; diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x400.h b/assets/objects/gameplay_keep/gameplay_keep_0x400.h deleted file mode 100644 index 8978cd1983..0000000000 --- a/assets/objects/gameplay_keep/gameplay_keep_0x400.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef GAMEPLAY_KEEP_0x400_H -#define GAMEPLAY_KEEP_0x400_H - -#include "tex_len.h" -#include "ultra64.h" - -#define gHylianShieldDesignTex_WIDTH 32 -#define gHylianShieldDesignTex_HEIGHT 64 -extern u64 gHylianShieldDesignTex[TEX_LEN(u64, gHylianShieldDesignTex_WIDTH, gHylianShieldDesignTex_HEIGHT, 16)]; -#define gOcarinaofTimeDesignTex_WIDTH 32 -#define gOcarinaofTimeDesignTex_HEIGHT 16 -extern u64 gOcarinaofTimeDesignTex[TEX_LEN(u64, gOcarinaofTimeDesignTex_WIDTH, gOcarinaofTimeDesignTex_HEIGHT, 16)]; -#define gBottleGlassTex_WIDTH 16 -#define gBottleGlassTex_HEIGHT 16 -extern u64 gBottleGlassTex[TEX_LEN(u64, gBottleGlassTex_WIDTH, gBottleGlassTex_HEIGHT, 16)]; -#define gDekuStickTex_WIDTH 8 -#define gDekuStickTex_HEIGHT 8 -extern u64 gDekuStickTex[TEX_LEN(u64, gDekuStickTex_WIDTH, gDekuStickTex_HEIGHT, 8)]; - -#endif diff --git a/assets/objects/gameplay_keep/link_textures.c b/assets/objects/gameplay_keep/link_textures.c index 472f1eb2ee..3564006310 100644 --- a/assets/objects/gameplay_keep/link_textures.c +++ b/assets/objects/gameplay_keep/link_textures.c @@ -1,5 +1,21 @@ #include "link_textures.h" +u64 gHylianShieldDesignTex[TEX_LEN(u64, gHylianShieldDesignTex_WIDTH, gHylianShieldDesignTex_HEIGHT, 16)] = { +#include "assets/objects/gameplay_keep/gHylianShieldDesignTex.rgba16.inc.c" +}; + +u64 gOcarinaofTimeDesignTex[TEX_LEN(u64, gOcarinaofTimeDesignTex_WIDTH, gOcarinaofTimeDesignTex_HEIGHT, 16)] = { +#include "assets/objects/gameplay_keep/gOcarinaofTimeDesignTex.rgba16.inc.c" +}; + +u64 gBottleGlassTex[TEX_LEN(u64, gBottleGlassTex_WIDTH, gBottleGlassTex_HEIGHT, 16)] = { +#include "assets/objects/gameplay_keep/gBottleGlassTex.rgba16.inc.c" +}; + +u64 gDekuStickTex[TEX_LEN(u64, gDekuStickTex_WIDTH, gDekuStickTex_HEIGHT, 8)] = { +#include "assets/objects/gameplay_keep/gDekuStickTex.i8.inc.c" +}; + u64 gLinkHairTex[TEX_LEN(u64, gLinkHairTex_WIDTH, gLinkHairTex_HEIGHT, 16)] = { #include "assets/objects/gameplay_keep/gLinkHairTex.rgba16.inc.c" }; diff --git a/assets/objects/gameplay_keep/link_textures.h b/assets/objects/gameplay_keep/link_textures.h index 459f32a46a..1b69ed135c 100644 --- a/assets/objects/gameplay_keep/link_textures.h +++ b/assets/objects/gameplay_keep/link_textures.h @@ -4,6 +4,18 @@ #include "tex_len.h" #include "ultra64.h" +#define gHylianShieldDesignTex_WIDTH 32 +#define gHylianShieldDesignTex_HEIGHT 64 +extern u64 gHylianShieldDesignTex[TEX_LEN(u64, gHylianShieldDesignTex_WIDTH, gHylianShieldDesignTex_HEIGHT, 16)]; +#define gOcarinaofTimeDesignTex_WIDTH 32 +#define gOcarinaofTimeDesignTex_HEIGHT 16 +extern u64 gOcarinaofTimeDesignTex[TEX_LEN(u64, gOcarinaofTimeDesignTex_WIDTH, gOcarinaofTimeDesignTex_HEIGHT, 16)]; +#define gBottleGlassTex_WIDTH 16 +#define gBottleGlassTex_HEIGHT 16 +extern u64 gBottleGlassTex[TEX_LEN(u64, gBottleGlassTex_WIDTH, gBottleGlassTex_HEIGHT, 16)]; +#define gDekuStickTex_WIDTH 8 +#define gDekuStickTex_HEIGHT 8 +extern u64 gDekuStickTex[TEX_LEN(u64, gDekuStickTex_WIDTH, gDekuStickTex_HEIGHT, 8)]; #define gLinkHairTex_WIDTH 16 #define gLinkHairTex_HEIGHT 16 extern u64 gLinkHairTex[TEX_LEN(u64, gLinkHairTex_WIDTH, gLinkHairTex_HEIGHT, 16)]; diff --git a/spec/spec b/spec/spec index 04a226269f..d8cc630766 100644 --- a/spec/spec +++ b/spec/spec @@ -998,7 +998,6 @@ beginseg compress romalign 0x1000 include "$(BUILD_DIR)/assets/objects/gameplay_keep/hilite_textures.o" - include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x400.o" include "$(BUILD_DIR)/assets/objects/gameplay_keep/link_textures.o" include "$(BUILD_DIR)/assets/objects/gameplay_keep/player_pause_joint_tables.o" include "$(BUILD_DIR)/assets/objects/gameplay_keep/player_anim_headers.o"