From 6384a76d14918967ca0f22d279607a0a62dae238 Mon Sep 17 00:00:00 2001 From: Pablo <72659707+Pepe20129@users.noreply.github.com> Date: Thu, 2 Oct 2025 20:06:35 +0200 Subject: [PATCH] More separations --- .../title_static/title_static_highlight_tex.h | 20 +++++++ .../title_static_highlight_tex.inc.c | 15 ++++++ .../title_static/title_static_medallion_tex.h | 26 ++++++++++ .../title_static_medallion_tex.inc.c | 23 ++++++++ .../textures/title_static/title_static_ntsc.h | 47 +++-------------- .../title_static/title_static_ntsc.inc.c | 52 ++----------------- .../title_static/title_static_pal_gc.h | 46 ++-------------- .../title_static/title_static_pal_gc.inc.c | 52 ++----------------- .../title_static/title_static_pal_n64.h | 47 +++-------------- .../title_static/title_static_pal_n64.inc.c | 52 ++----------------- .../title_static/title_static_stone_tex.h | 17 ++++++ .../title_static/title_static_stone_tex.inc.c | 11 ++++ 12 files changed, 140 insertions(+), 268 deletions(-) create mode 100644 assets/textures/title_static/title_static_highlight_tex.h create mode 100644 assets/textures/title_static/title_static_highlight_tex.inc.c create mode 100644 assets/textures/title_static/title_static_medallion_tex.h create mode 100644 assets/textures/title_static/title_static_medallion_tex.inc.c create mode 100644 assets/textures/title_static/title_static_stone_tex.h create mode 100644 assets/textures/title_static/title_static_stone_tex.inc.c diff --git a/assets/textures/title_static/title_static_highlight_tex.h b/assets/textures/title_static/title_static_highlight_tex.h new file mode 100644 index 0000000000..e3a0dcfa3c --- /dev/null +++ b/assets/textures/title_static/title_static_highlight_tex.h @@ -0,0 +1,20 @@ +#ifndef TITLE_STATIC_HIGHLIGHT_TEX_H +#define TITLE_STATIC_HIGHLIGHT_TEX_H + +#include "tex_len.h" +#include "ultra64.h" + +#define gFileSelBigButtonHighlightTex_WIDTH 72 +#define gFileSelBigButtonHighlightTex_HEIGHT 24 +extern u64 gFileSelBigButtonHighlightTex[TEX_LEN(u64, gFileSelBigButtonHighlightTex_WIDTH, gFileSelBigButtonHighlightTex_HEIGHT, 8)]; +#define gFileSelCharHighlightTex_WIDTH 24 +#define gFileSelCharHighlightTex_HEIGHT 24 +extern u64 gFileSelCharHighlightTex[TEX_LEN(u64, gFileSelCharHighlightTex_WIDTH, gFileSelCharHighlightTex_HEIGHT, 8)]; +#define gFileSelMediumButtonHighlightTex_WIDTH 56 +#define gFileSelMediumButtonHighlightTex_HEIGHT 24 +extern u64 gFileSelMediumButtonHighlightTex[TEX_LEN(u64, gFileSelMediumButtonHighlightTex_WIDTH, gFileSelMediumButtonHighlightTex_HEIGHT, 8)]; +#define gFileSelSmallButtonHighlightTex_WIDTH 40 +#define gFileSelSmallButtonHighlightTex_HEIGHT 24 +extern u64 gFileSelSmallButtonHighlightTex[TEX_LEN(u64, gFileSelSmallButtonHighlightTex_WIDTH, gFileSelSmallButtonHighlightTex_HEIGHT, 8)]; + +#endif /* TITLE_STATIC_HIGHLIGHT_TEX_H */ diff --git a/assets/textures/title_static/title_static_highlight_tex.inc.c b/assets/textures/title_static/title_static_highlight_tex.inc.c new file mode 100644 index 0000000000..6c90e0d351 --- /dev/null +++ b/assets/textures/title_static/title_static_highlight_tex.inc.c @@ -0,0 +1,15 @@ +u64 gFileSelBigButtonHighlightTex[TEX_LEN(u64, gFileSelBigButtonHighlightTex_WIDTH, gFileSelBigButtonHighlightTex_HEIGHT, 8)] = { +#include "assets/textures/title_static/gFileSelBigButtonHighlightTex.i8.inc.c" +}; + +u64 gFileSelCharHighlightTex[TEX_LEN(u64, gFileSelCharHighlightTex_WIDTH, gFileSelCharHighlightTex_HEIGHT, 8)] = { +#include "assets/textures/title_static/gFileSelCharHighlightTex.i8.inc.c" +}; + +u64 gFileSelMediumButtonHighlightTex[TEX_LEN(u64, gFileSelMediumButtonHighlightTex_WIDTH, gFileSelMediumButtonHighlightTex_HEIGHT, 8)] = { +#include "assets/textures/title_static/gFileSelMediumButtonHighlightTex.i8.inc.c" +}; + +u64 gFileSelSmallButtonHighlightTex[TEX_LEN(u64, gFileSelSmallButtonHighlightTex_WIDTH, gFileSelSmallButtonHighlightTex_HEIGHT, 8)] = { +#include "assets/textures/title_static/gFileSelSmallButtonHighlightTex.i8.inc.c" +}; diff --git a/assets/textures/title_static/title_static_medallion_tex.h b/assets/textures/title_static/title_static_medallion_tex.h new file mode 100644 index 0000000000..1bebf16f57 --- /dev/null +++ b/assets/textures/title_static/title_static_medallion_tex.h @@ -0,0 +1,26 @@ +#ifndef TITLE_STATIC_MEDALLION_TEX_H +#define TITLE_STATIC_MEDALLION_TEX_H + +#include "tex_len.h" +#include "ultra64.h" + +#define gFileSelForestMedallionTex_WIDTH 16 +#define gFileSelForestMedallionTex_HEIGHT 16 +extern u64 gFileSelForestMedallionTex[TEX_LEN(u64, gFileSelForestMedallionTex_WIDTH, gFileSelForestMedallionTex_HEIGHT, 8)]; +#define gFileSelFireMedallionTex_WIDTH 16 +#define gFileSelFireMedallionTex_HEIGHT 16 +extern u64 gFileSelFireMedallionTex[TEX_LEN(u64, gFileSelFireMedallionTex_WIDTH, gFileSelFireMedallionTex_HEIGHT, 8)]; +#define gFileSelWaterMedallionTex_WIDTH 16 +#define gFileSelWaterMedallionTex_HEIGHT 16 +extern u64 gFileSelWaterMedallionTex[TEX_LEN(u64, gFileSelWaterMedallionTex_WIDTH, gFileSelWaterMedallionTex_HEIGHT, 8)]; +#define gFileSelSpiritMedallionTex_WIDTH 16 +#define gFileSelSpiritMedallionTex_HEIGHT 16 +extern u64 gFileSelSpiritMedallionTex[TEX_LEN(u64, gFileSelSpiritMedallionTex_WIDTH, gFileSelSpiritMedallionTex_HEIGHT, 8)]; +#define gFileSelShadowMedallionTex_WIDTH 16 +#define gFileSelShadowMedallionTex_HEIGHT 16 +extern u64 gFileSelShadowMedallionTex[TEX_LEN(u64, gFileSelShadowMedallionTex_WIDTH, gFileSelShadowMedallionTex_HEIGHT, 8)]; +#define gFileSelLightMedallionTex_WIDTH 16 +#define gFileSelLightMedallionTex_HEIGHT 16 +extern u64 gFileSelLightMedallionTex[TEX_LEN(u64, gFileSelLightMedallionTex_WIDTH, gFileSelLightMedallionTex_HEIGHT, 8)]; + +#endif /* TITLE_STATIC_MEDALLION_TEX_H */ diff --git a/assets/textures/title_static/title_static_medallion_tex.inc.c b/assets/textures/title_static/title_static_medallion_tex.inc.c new file mode 100644 index 0000000000..7e45f75c63 --- /dev/null +++ b/assets/textures/title_static/title_static_medallion_tex.inc.c @@ -0,0 +1,23 @@ +u64 gFileSelForestMedallionTex[TEX_LEN(u64, gFileSelForestMedallionTex_WIDTH, gFileSelForestMedallionTex_HEIGHT, 8)] = { +#include "assets/textures/title_static/gFileSelForestMedallionTex.ia8.inc.c" +}; + +u64 gFileSelFireMedallionTex[TEX_LEN(u64, gFileSelFireMedallionTex_WIDTH, gFileSelFireMedallionTex_HEIGHT, 8)] = { +#include "assets/textures/title_static/gFileSelFireMedallionTex.ia8.inc.c" +}; + +u64 gFileSelWaterMedallionTex[TEX_LEN(u64, gFileSelWaterMedallionTex_WIDTH, gFileSelWaterMedallionTex_HEIGHT, 8)] = { +#include "assets/textures/title_static/gFileSelWaterMedallionTex.ia8.inc.c" +}; + +u64 gFileSelSpiritMedallionTex[TEX_LEN(u64, gFileSelSpiritMedallionTex_WIDTH, gFileSelSpiritMedallionTex_HEIGHT, 8)] = { +#include "assets/textures/title_static/gFileSelSpiritMedallionTex.ia8.inc.c" +}; + +u64 gFileSelShadowMedallionTex[TEX_LEN(u64, gFileSelShadowMedallionTex_WIDTH, gFileSelShadowMedallionTex_HEIGHT, 8)] = { +#include "assets/textures/title_static/gFileSelShadowMedallionTex.ia8.inc.c" +}; + +u64 gFileSelLightMedallionTex[TEX_LEN(u64, gFileSelLightMedallionTex_WIDTH, gFileSelLightMedallionTex_HEIGHT, 8)] = { +#include "assets/textures/title_static/gFileSelLightMedallionTex.ia8.inc.c" +}; diff --git a/assets/textures/title_static/title_static_ntsc.h b/assets/textures/title_static/title_static_ntsc.h index c455770ae6..669daddea3 100644 --- a/assets/textures/title_static/title_static_ntsc.h +++ b/assets/textures/title_static/title_static_ntsc.h @@ -22,24 +22,9 @@ extern u64 gFileSelFileInUseJPNTex[TEX_LEN(u64, gFileSelFileInUseJPNTex_WIDTH, g #define gFileSelConnectorTex_WIDTH 24 #define gFileSelConnectorTex_HEIGHT 16 extern u64 gFileSelConnectorTex[TEX_LEN(u64, gFileSelConnectorTex_WIDTH, gFileSelConnectorTex_HEIGHT, 8)]; -#define gFileSelForestMedallionTex_WIDTH 16 -#define gFileSelForestMedallionTex_HEIGHT 16 -extern u64 gFileSelForestMedallionTex[TEX_LEN(u64, gFileSelForestMedallionTex_WIDTH, gFileSelForestMedallionTex_HEIGHT, 8)]; -#define gFileSelFireMedallionTex_WIDTH 16 -#define gFileSelFireMedallionTex_HEIGHT 16 -extern u64 gFileSelFireMedallionTex[TEX_LEN(u64, gFileSelFireMedallionTex_WIDTH, gFileSelFireMedallionTex_HEIGHT, 8)]; -#define gFileSelWaterMedallionTex_WIDTH 16 -#define gFileSelWaterMedallionTex_HEIGHT 16 -extern u64 gFileSelWaterMedallionTex[TEX_LEN(u64, gFileSelWaterMedallionTex_WIDTH, gFileSelWaterMedallionTex_HEIGHT, 8)]; -#define gFileSelSpiritMedallionTex_WIDTH 16 -#define gFileSelSpiritMedallionTex_HEIGHT 16 -extern u64 gFileSelSpiritMedallionTex[TEX_LEN(u64, gFileSelSpiritMedallionTex_WIDTH, gFileSelSpiritMedallionTex_HEIGHT, 8)]; -#define gFileSelShadowMedallionTex_WIDTH 16 -#define gFileSelShadowMedallionTex_HEIGHT 16 -extern u64 gFileSelShadowMedallionTex[TEX_LEN(u64, gFileSelShadowMedallionTex_WIDTH, gFileSelShadowMedallionTex_HEIGHT, 8)]; -#define gFileSelLightMedallionTex_WIDTH 16 -#define gFileSelLightMedallionTex_HEIGHT 16 -extern u64 gFileSelLightMedallionTex[TEX_LEN(u64, gFileSelLightMedallionTex_WIDTH, gFileSelLightMedallionTex_HEIGHT, 8)]; + +#include "assets/textures/title_static/title_static_medallion_tex.h" + #define gFileSelCopyWhichFileJPNTex_WIDTH 128 #define gFileSelCopyWhichFileJPNTex_HEIGHT 16 extern u64 gFileSelCopyWhichFileJPNTex[TEX_LEN(u64, gFileSelCopyWhichFileJPNTex_WIDTH, gFileSelCopyWhichFileJPNTex_HEIGHT, 8)]; @@ -163,27 +148,11 @@ extern u64 gFileSelBrightnessCheckTex[TEX_LEN(u64, gFileSelBrightnessCheckTex_WI #define gFileSelSaveXJPNTex_WIDTH 32 #define gFileSelSaveXJPNTex_HEIGHT 16 extern u64 gFileSelSaveXJPNTex[TEX_LEN(u64, gFileSelSaveXJPNTex_WIDTH, gFileSelSaveXJPNTex_HEIGHT, 4)]; -#define gFileSelBigButtonHighlightTex_WIDTH 72 -#define gFileSelBigButtonHighlightTex_HEIGHT 24 -extern u64 gFileSelBigButtonHighlightTex[TEX_LEN(u64, gFileSelBigButtonHighlightTex_WIDTH, gFileSelBigButtonHighlightTex_HEIGHT, 8)]; -#define gFileSelCharHighlightTex_WIDTH 24 -#define gFileSelCharHighlightTex_HEIGHT 24 -extern u64 gFileSelCharHighlightTex[TEX_LEN(u64, gFileSelCharHighlightTex_WIDTH, gFileSelCharHighlightTex_HEIGHT, 8)]; -#define gFileSelMediumButtonHighlightTex_WIDTH 56 -#define gFileSelMediumButtonHighlightTex_HEIGHT 24 -extern u64 gFileSelMediumButtonHighlightTex[TEX_LEN(u64, gFileSelMediumButtonHighlightTex_WIDTH, gFileSelMediumButtonHighlightTex_HEIGHT, 8)]; -#define gFileSelSmallButtonHighlightTex_WIDTH 40 -#define gFileSelSmallButtonHighlightTex_HEIGHT 24 -extern u64 gFileSelSmallButtonHighlightTex[TEX_LEN(u64, gFileSelSmallButtonHighlightTex_WIDTH, gFileSelSmallButtonHighlightTex_HEIGHT, 8)]; -#define gFileSelKokiriEmeraldTex_WIDTH 16 -#define gFileSelKokiriEmeraldTex_HEIGHT 16 -extern u64 gFileSelKokiriEmeraldTex[TEX_LEN(u64, gFileSelKokiriEmeraldTex_WIDTH, gFileSelKokiriEmeraldTex_HEIGHT, 32)]; -#define gFileSelGoronRubyTex_WIDTH 16 -#define gFileSelGoronRubyTex_HEIGHT 16 -extern u64 gFileSelGoronRubyTex[TEX_LEN(u64, gFileSelGoronRubyTex_WIDTH, gFileSelGoronRubyTex_HEIGHT, 32)]; -#define gFileSelZoraSapphireTex_WIDTH 16 -#define gFileSelZoraSapphireTex_HEIGHT 16 -extern u64 gFileSelZoraSapphireTex[TEX_LEN(u64, gFileSelZoraSapphireTex_WIDTH, gFileSelZoraSapphireTex_HEIGHT, 32)]; + +#include "assets/textures/title_static/title_static_highlight_tex.h" + +#include "assets/textures/title_static/title_static_stone_tex.h" + #define gFileSelNoFileToCopyENGTex_WIDTH 128 #define gFileSelNoFileToCopyENGTex_HEIGHT 16 extern u64 gFileSelNoFileToCopyENGTex[TEX_LEN(u64, gFileSelNoFileToCopyENGTex_WIDTH, gFileSelNoFileToCopyENGTex_HEIGHT, 8)]; diff --git a/assets/textures/title_static/title_static_ntsc.inc.c b/assets/textures/title_static/title_static_ntsc.inc.c index 60e0ed99ce..76ee96f7ba 100644 --- a/assets/textures/title_static/title_static_ntsc.inc.c +++ b/assets/textures/title_static/title_static_ntsc.inc.c @@ -27,29 +27,7 @@ u64 gFileSelConnectorTex[TEX_LEN(u64, gFileSelConnectorTex_WIDTH, gFileSelConnec #include "assets/textures/title_static/gFileSelConnectorTex.ia8.inc.c" }; -u64 gFileSelForestMedallionTex[TEX_LEN(u64, gFileSelForestMedallionTex_WIDTH, gFileSelForestMedallionTex_HEIGHT, 8)] = { -#include "assets/textures/title_static/gFileSelForestMedallionTex.ia8.inc.c" -}; - -u64 gFileSelFireMedallionTex[TEX_LEN(u64, gFileSelFireMedallionTex_WIDTH, gFileSelFireMedallionTex_HEIGHT, 8)] = { -#include "assets/textures/title_static/gFileSelFireMedallionTex.ia8.inc.c" -}; - -u64 gFileSelWaterMedallionTex[TEX_LEN(u64, gFileSelWaterMedallionTex_WIDTH, gFileSelWaterMedallionTex_HEIGHT, 8)] = { -#include "assets/textures/title_static/gFileSelWaterMedallionTex.ia8.inc.c" -}; - -u64 gFileSelSpiritMedallionTex[TEX_LEN(u64, gFileSelSpiritMedallionTex_WIDTH, gFileSelSpiritMedallionTex_HEIGHT, 8)] = { -#include "assets/textures/title_static/gFileSelSpiritMedallionTex.ia8.inc.c" -}; - -u64 gFileSelShadowMedallionTex[TEX_LEN(u64, gFileSelShadowMedallionTex_WIDTH, gFileSelShadowMedallionTex_HEIGHT, 8)] = { -#include "assets/textures/title_static/gFileSelShadowMedallionTex.ia8.inc.c" -}; - -u64 gFileSelLightMedallionTex[TEX_LEN(u64, gFileSelLightMedallionTex_WIDTH, gFileSelLightMedallionTex_HEIGHT, 8)] = { -#include "assets/textures/title_static/gFileSelLightMedallionTex.ia8.inc.c" -}; +#include "assets/textures/title_static/title_static_medallion_tex.inc.c" u64 gFileSelCopyWhichFileJPNTex[TEX_LEN(u64, gFileSelCopyWhichFileJPNTex_WIDTH, gFileSelCopyWhichFileJPNTex_HEIGHT, 8)] = { #include "assets/textures/title_static/gFileSelCopyWhichFileJPNTex.ia8.inc.c" @@ -211,33 +189,9 @@ u64 gFileSelSaveXJPNTex[TEX_LEN(u64, gFileSelSaveXJPNTex_WIDTH, gFileSelSaveXJPN #include "assets/textures/title_static/gFileSelSaveXJPNTex.i4.inc.c" }; -u64 gFileSelBigButtonHighlightTex[TEX_LEN(u64, gFileSelBigButtonHighlightTex_WIDTH, gFileSelBigButtonHighlightTex_HEIGHT, 8)] = { -#include "assets/textures/title_static/gFileSelBigButtonHighlightTex.i8.inc.c" -}; +#include "assets/textures/title_static/title_static_highlight_tex.inc.c" -u64 gFileSelCharHighlightTex[TEX_LEN(u64, gFileSelCharHighlightTex_WIDTH, gFileSelCharHighlightTex_HEIGHT, 8)] = { -#include "assets/textures/title_static/gFileSelCharHighlightTex.i8.inc.c" -}; - -u64 gFileSelMediumButtonHighlightTex[TEX_LEN(u64, gFileSelMediumButtonHighlightTex_WIDTH, gFileSelMediumButtonHighlightTex_HEIGHT, 8)] = { -#include "assets/textures/title_static/gFileSelMediumButtonHighlightTex.i8.inc.c" -}; - -u64 gFileSelSmallButtonHighlightTex[TEX_LEN(u64, gFileSelSmallButtonHighlightTex_WIDTH, gFileSelSmallButtonHighlightTex_HEIGHT, 8)] = { -#include "assets/textures/title_static/gFileSelSmallButtonHighlightTex.i8.inc.c" -}; - -u64 gFileSelKokiriEmeraldTex[TEX_LEN(u64, gFileSelKokiriEmeraldTex_WIDTH, gFileSelKokiriEmeraldTex_HEIGHT, 32)] = { -#include "assets/textures/title_static/gFileSelKokiriEmeraldTex.rgba32.inc.c" -}; - -u64 gFileSelGoronRubyTex[TEX_LEN(u64, gFileSelGoronRubyTex_WIDTH, gFileSelGoronRubyTex_HEIGHT, 32)] = { -#include "assets/textures/title_static/gFileSelGoronRubyTex.rgba32.inc.c" -}; - -u64 gFileSelZoraSapphireTex[TEX_LEN(u64, gFileSelZoraSapphireTex_WIDTH, gFileSelZoraSapphireTex_HEIGHT, 32)] = { -#include "assets/textures/title_static/gFileSelZoraSapphireTex.rgba32.inc.c" -}; +#include "assets/textures/title_static/title_static_stone_tex.inc.c" u64 gFileSelNoFileToCopyENGTex[TEX_LEN(u64, gFileSelNoFileToCopyENGTex_WIDTH, gFileSelNoFileToCopyENGTex_HEIGHT, 8)] = { #include "assets/textures/title_static/gFileSelNoFileToCopyENGTex.ia8.inc.c" diff --git a/assets/textures/title_static/title_static_pal_gc.h b/assets/textures/title_static/title_static_pal_gc.h index 8f4aaefccd..54097e594b 100644 --- a/assets/textures/title_static/title_static_pal_gc.h +++ b/assets/textures/title_static/title_static_pal_gc.h @@ -5,47 +5,11 @@ #include "ultra64.h" // Highlights -#define gFileSelBigButtonHighlightTex_WIDTH 72 -#define gFileSelBigButtonHighlightTex_HEIGHT 24 -extern u64 gFileSelBigButtonHighlightTex[TEX_LEN(u64, gFileSelBigButtonHighlightTex_WIDTH, gFileSelBigButtonHighlightTex_HEIGHT, 8)]; -#define gFileSelCharHighlightTex_WIDTH 24 -#define gFileSelCharHighlightTex_HEIGHT 24 -extern u64 gFileSelCharHighlightTex[TEX_LEN(u64, gFileSelCharHighlightTex_WIDTH, gFileSelCharHighlightTex_HEIGHT, 8)]; -#define gFileSelMediumButtonHighlightTex_WIDTH 56 -#define gFileSelMediumButtonHighlightTex_HEIGHT 24 -extern u64 gFileSelMediumButtonHighlightTex[TEX_LEN(u64, gFileSelMediumButtonHighlightTex_WIDTH, gFileSelMediumButtonHighlightTex_HEIGHT, 8)]; -#define gFileSelSmallButtonHighlightTex_WIDTH 40 -#define gFileSelSmallButtonHighlightTex_HEIGHT 24 -extern u64 gFileSelSmallButtonHighlightTex[TEX_LEN(u64, gFileSelSmallButtonHighlightTex_WIDTH, gFileSelSmallButtonHighlightTex_HEIGHT, 8)]; +#include "assets/textures/title_static/title_static_highlight_tex.h" // Stones & Medallions -#define gFileSelForestMedallionTex_WIDTH 16 -#define gFileSelForestMedallionTex_HEIGHT 16 -extern u64 gFileSelForestMedallionTex[TEX_LEN(u64, gFileSelForestMedallionTex_WIDTH, gFileSelForestMedallionTex_HEIGHT, 8)]; -#define gFileSelFireMedallionTex_WIDTH 16 -#define gFileSelFireMedallionTex_HEIGHT 16 -extern u64 gFileSelFireMedallionTex[TEX_LEN(u64, gFileSelFireMedallionTex_WIDTH, gFileSelFireMedallionTex_HEIGHT, 8)]; -#define gFileSelWaterMedallionTex_WIDTH 16 -#define gFileSelWaterMedallionTex_HEIGHT 16 -extern u64 gFileSelWaterMedallionTex[TEX_LEN(u64, gFileSelWaterMedallionTex_WIDTH, gFileSelWaterMedallionTex_HEIGHT, 8)]; -#define gFileSelSpiritMedallionTex_WIDTH 16 -#define gFileSelSpiritMedallionTex_HEIGHT 16 -extern u64 gFileSelSpiritMedallionTex[TEX_LEN(u64, gFileSelSpiritMedallionTex_WIDTH, gFileSelSpiritMedallionTex_HEIGHT, 8)]; -#define gFileSelShadowMedallionTex_WIDTH 16 -#define gFileSelShadowMedallionTex_HEIGHT 16 -extern u64 gFileSelShadowMedallionTex[TEX_LEN(u64, gFileSelShadowMedallionTex_WIDTH, gFileSelShadowMedallionTex_HEIGHT, 8)]; -#define gFileSelLightMedallionTex_WIDTH 16 -#define gFileSelLightMedallionTex_HEIGHT 16 -extern u64 gFileSelLightMedallionTex[TEX_LEN(u64, gFileSelLightMedallionTex_WIDTH, gFileSelLightMedallionTex_HEIGHT, 8)]; -#define gFileSelKokiriEmeraldTex_WIDTH 16 -#define gFileSelKokiriEmeraldTex_HEIGHT 16 -extern u64 gFileSelKokiriEmeraldTex[TEX_LEN(u64, gFileSelKokiriEmeraldTex_WIDTH, gFileSelKokiriEmeraldTex_HEIGHT, 32)]; -#define gFileSelGoronRubyTex_WIDTH 16 -#define gFileSelGoronRubyTex_HEIGHT 16 -extern u64 gFileSelGoronRubyTex[TEX_LEN(u64, gFileSelGoronRubyTex_WIDTH, gFileSelGoronRubyTex_HEIGHT, 32)]; -#define gFileSelZoraSapphireTex_WIDTH 16 -#define gFileSelZoraSapphireTex_HEIGHT 16 -extern u64 gFileSelZoraSapphireTex[TEX_LEN(u64, gFileSelZoraSapphireTex_WIDTH, gFileSelZoraSapphireTex_HEIGHT, 32)]; +#include "assets/textures/title_static/title_static_medallion_tex.h" +#include "assets/textures/title_static/title_static_stone_tex.h" // Main window #include "assets/textures/title_static/title_static_file_sel_window_tex.h" @@ -87,10 +51,6 @@ extern u64 gFileSelBrightnessCheckTex[TEX_LEN(u64, gFileSelBrightnessCheckTex_WI #define gFileSelSaveXTex_HEIGHT 16 extern u64 gFileSelSaveXTex[TEX_LEN(u64, gFileSelSaveXTex_WIDTH, gFileSelSaveXTex_HEIGHT, 4)]; -extern Gfx gFileSelWindow1DL[67]; -extern Gfx gFileSelWindow2DL[66]; -extern Gfx gFileSelWindow3DL[34]; - // Language specific textures diff --git a/assets/textures/title_static/title_static_pal_gc.inc.c b/assets/textures/title_static/title_static_pal_gc.inc.c index c8026a7e97..d3d30a6d87 100644 --- a/assets/textures/title_static/title_static_pal_gc.inc.c +++ b/assets/textures/title_static/title_static_pal_gc.inc.c @@ -7,29 +7,7 @@ u64 gFileSelConnectorTex[TEX_LEN(u64, gFileSelConnectorTex_WIDTH, gFileSelConnec #include "assets/textures/title_static/gFileSelConnectorTex.ia8.inc.c" }; -u64 gFileSelForestMedallionTex[TEX_LEN(u64, gFileSelForestMedallionTex_WIDTH, gFileSelForestMedallionTex_HEIGHT, 8)] = { -#include "assets/textures/title_static/gFileSelForestMedallionTex.ia8.inc.c" -}; - -u64 gFileSelFireMedallionTex[TEX_LEN(u64, gFileSelFireMedallionTex_WIDTH, gFileSelFireMedallionTex_HEIGHT, 8)] = { -#include "assets/textures/title_static/gFileSelFireMedallionTex.ia8.inc.c" -}; - -u64 gFileSelWaterMedallionTex[TEX_LEN(u64, gFileSelWaterMedallionTex_WIDTH, gFileSelWaterMedallionTex_HEIGHT, 8)] = { -#include "assets/textures/title_static/gFileSelWaterMedallionTex.ia8.inc.c" -}; - -u64 gFileSelSpiritMedallionTex[TEX_LEN(u64, gFileSelSpiritMedallionTex_WIDTH, gFileSelSpiritMedallionTex_HEIGHT, 8)] = { -#include "assets/textures/title_static/gFileSelSpiritMedallionTex.ia8.inc.c" -}; - -u64 gFileSelShadowMedallionTex[TEX_LEN(u64, gFileSelShadowMedallionTex_WIDTH, gFileSelShadowMedallionTex_HEIGHT, 8)] = { -#include "assets/textures/title_static/gFileSelShadowMedallionTex.ia8.inc.c" -}; - -u64 gFileSelLightMedallionTex[TEX_LEN(u64, gFileSelLightMedallionTex_WIDTH, gFileSelLightMedallionTex_HEIGHT, 8)] = { -#include "assets/textures/title_static/gFileSelLightMedallionTex.ia8.inc.c" -}; +#include "assets/textures/title_static/title_static_medallion_tex.inc.c" #include "assets/textures/title_static/gFileSelWindowTex.inc.c" @@ -79,33 +57,9 @@ u64 gFileSelBrightnessCheckTex[TEX_LEN(u64, gFileSelBrightnessCheckTex_WIDTH, gF #include "assets/textures/title_static/gFileSelBrightnessCheckTex.ia4.inc.c" }; -u64 gFileSelBigButtonHighlightTex[TEX_LEN(u64, gFileSelBigButtonHighlightTex_WIDTH, gFileSelBigButtonHighlightTex_HEIGHT, 8)] = { -#include "assets/textures/title_static/gFileSelBigButtonHighlightTex.i8.inc.c" -}; +#include "assets/textures/title_static/title_static_highlight_tex.inc.c" -u64 gFileSelCharHighlightTex[TEX_LEN(u64, gFileSelCharHighlightTex_WIDTH, gFileSelCharHighlightTex_HEIGHT, 8)] = { -#include "assets/textures/title_static/gFileSelCharHighlightTex.i8.inc.c" -}; - -u64 gFileSelMediumButtonHighlightTex[TEX_LEN(u64, gFileSelMediumButtonHighlightTex_WIDTH, gFileSelMediumButtonHighlightTex_HEIGHT, 8)] = { -#include "assets/textures/title_static/gFileSelMediumButtonHighlightTex.i8.inc.c" -}; - -u64 gFileSelSmallButtonHighlightTex[TEX_LEN(u64, gFileSelSmallButtonHighlightTex_WIDTH, gFileSelSmallButtonHighlightTex_HEIGHT, 8)] = { -#include "assets/textures/title_static/gFileSelSmallButtonHighlightTex.i8.inc.c" -}; - -u64 gFileSelKokiriEmeraldTex[TEX_LEN(u64, gFileSelKokiriEmeraldTex_WIDTH, gFileSelKokiriEmeraldTex_HEIGHT, 32)] = { -#include "assets/textures/title_static/gFileSelKokiriEmeraldTex.rgba32.inc.c" -}; - -u64 gFileSelGoronRubyTex[TEX_LEN(u64, gFileSelGoronRubyTex_WIDTH, gFileSelGoronRubyTex_HEIGHT, 32)] = { -#include "assets/textures/title_static/gFileSelGoronRubyTex.rgba32.inc.c" -}; - -u64 gFileSelZoraSapphireTex[TEX_LEN(u64, gFileSelZoraSapphireTex_WIDTH, gFileSelZoraSapphireTex_HEIGHT, 32)] = { -#include "assets/textures/title_static/gFileSelZoraSapphireTex.rgba32.inc.c" -}; +#include "assets/textures/title_static/title_static_stone_tex.inc.c" u64 gFileSelNoFileToCopyENGTex[TEX_LEN(u64, gFileSelNoFileToCopyENGTex_WIDTH, gFileSelNoFileToCopyENGTex_HEIGHT, 8)] = { #include "assets/textures/title_static/gFileSelNoFileToCopyENGTex.ia8.inc.c" diff --git a/assets/textures/title_static/title_static_pal_n64.h b/assets/textures/title_static/title_static_pal_n64.h index f99388ba6a..ef41083029 100644 --- a/assets/textures/title_static/title_static_pal_n64.h +++ b/assets/textures/title_static/title_static_pal_n64.h @@ -7,24 +7,9 @@ #define gFileSelConnectorTex_WIDTH 24 #define gFileSelConnectorTex_HEIGHT 16 extern u64 gFileSelConnectorTex[TEX_LEN(u64, gFileSelConnectorTex_WIDTH, gFileSelConnectorTex_HEIGHT, 8)]; -#define gFileSelForestMedallionTex_WIDTH 16 -#define gFileSelForestMedallionTex_HEIGHT 16 -extern u64 gFileSelForestMedallionTex[TEX_LEN(u64, gFileSelForestMedallionTex_WIDTH, gFileSelForestMedallionTex_HEIGHT, 8)]; -#define gFileSelFireMedallionTex_WIDTH 16 -#define gFileSelFireMedallionTex_HEIGHT 16 -extern u64 gFileSelFireMedallionTex[TEX_LEN(u64, gFileSelFireMedallionTex_WIDTH, gFileSelFireMedallionTex_HEIGHT, 8)]; -#define gFileSelWaterMedallionTex_WIDTH 16 -#define gFileSelWaterMedallionTex_HEIGHT 16 -extern u64 gFileSelWaterMedallionTex[TEX_LEN(u64, gFileSelWaterMedallionTex_WIDTH, gFileSelWaterMedallionTex_HEIGHT, 8)]; -#define gFileSelSpiritMedallionTex_WIDTH 16 -#define gFileSelSpiritMedallionTex_HEIGHT 16 -extern u64 gFileSelSpiritMedallionTex[TEX_LEN(u64, gFileSelSpiritMedallionTex_WIDTH, gFileSelSpiritMedallionTex_HEIGHT, 8)]; -#define gFileSelShadowMedallionTex_WIDTH 16 -#define gFileSelShadowMedallionTex_HEIGHT 16 -extern u64 gFileSelShadowMedallionTex[TEX_LEN(u64, gFileSelShadowMedallionTex_WIDTH, gFileSelShadowMedallionTex_HEIGHT, 8)]; -#define gFileSelLightMedallionTex_WIDTH 16 -#define gFileSelLightMedallionTex_HEIGHT 16 -extern u64 gFileSelLightMedallionTex[TEX_LEN(u64, gFileSelLightMedallionTex_WIDTH, gFileSelLightMedallionTex_HEIGHT, 8)]; + +#include "assets/textures/title_static/title_static_medallion_tex.h" + #define gFileSelSurroundENGTex_WIDTH 48 #define gFileSelSurroundENGTex_HEIGHT 16 extern u64 gFileSelSurroundENGTex[TEX_LEN(u64, gFileSelSurroundENGTex_WIDTH, gFileSelSurroundENGTex_HEIGHT, 8)]; @@ -145,27 +130,11 @@ extern u64 gFileSelOptionsDividerTex[TEX_LEN(u64, gFileSelOptionsDividerTex_WIDT #define gFileSelBrightnessCheckTex_WIDTH 96 #define gFileSelBrightnessCheckTex_HEIGHT 16 extern u64 gFileSelBrightnessCheckTex[TEX_LEN(u64, gFileSelBrightnessCheckTex_WIDTH, gFileSelBrightnessCheckTex_HEIGHT, 4)]; -#define gFileSelBigButtonHighlightTex_WIDTH 72 -#define gFileSelBigButtonHighlightTex_HEIGHT 24 -extern u64 gFileSelBigButtonHighlightTex[TEX_LEN(u64, gFileSelBigButtonHighlightTex_WIDTH, gFileSelBigButtonHighlightTex_HEIGHT, 8)]; -#define gFileSelCharHighlightTex_WIDTH 24 -#define gFileSelCharHighlightTex_HEIGHT 24 -extern u64 gFileSelCharHighlightTex[TEX_LEN(u64, gFileSelCharHighlightTex_WIDTH, gFileSelCharHighlightTex_HEIGHT, 8)]; -#define gFileSelMediumButtonHighlightTex_WIDTH 56 -#define gFileSelMediumButtonHighlightTex_HEIGHT 24 -extern u64 gFileSelMediumButtonHighlightTex[TEX_LEN(u64, gFileSelMediumButtonHighlightTex_WIDTH, gFileSelMediumButtonHighlightTex_HEIGHT, 8)]; -#define gFileSelSmallButtonHighlightTex_WIDTH 40 -#define gFileSelSmallButtonHighlightTex_HEIGHT 24 -extern u64 gFileSelSmallButtonHighlightTex[TEX_LEN(u64, gFileSelSmallButtonHighlightTex_WIDTH, gFileSelSmallButtonHighlightTex_HEIGHT, 8)]; -#define gFileSelKokiriEmeraldTex_WIDTH 16 -#define gFileSelKokiriEmeraldTex_HEIGHT 16 -extern u64 gFileSelKokiriEmeraldTex[TEX_LEN(u64, gFileSelKokiriEmeraldTex_WIDTH, gFileSelKokiriEmeraldTex_HEIGHT, 32)]; -#define gFileSelGoronRubyTex_WIDTH 16 -#define gFileSelGoronRubyTex_HEIGHT 16 -extern u64 gFileSelGoronRubyTex[TEX_LEN(u64, gFileSelGoronRubyTex_WIDTH, gFileSelGoronRubyTex_HEIGHT, 32)]; -#define gFileSelZoraSapphireTex_WIDTH 16 -#define gFileSelZoraSapphireTex_HEIGHT 16 -extern u64 gFileSelZoraSapphireTex[TEX_LEN(u64, gFileSelZoraSapphireTex_WIDTH, gFileSelZoraSapphireTex_HEIGHT, 32)]; + +#include "assets/textures/title_static/title_static_highlight_tex.h" + +#include "assets/textures/title_static/title_static_stone_tex.h" + #define gFileSelNoFileToCopyENGTex_WIDTH 128 #define gFileSelNoFileToCopyENGTex_HEIGHT 16 extern u64 gFileSelNoFileToCopyENGTex[TEX_LEN(u64, gFileSelNoFileToCopyENGTex_WIDTH, gFileSelNoFileToCopyENGTex_HEIGHT, 8)]; diff --git a/assets/textures/title_static/title_static_pal_n64.inc.c b/assets/textures/title_static/title_static_pal_n64.inc.c index 8f83a1af2f..adaeab43b8 100644 --- a/assets/textures/title_static/title_static_pal_n64.inc.c +++ b/assets/textures/title_static/title_static_pal_n64.inc.c @@ -7,29 +7,7 @@ u64 gFileSelConnectorTex[TEX_LEN(u64, gFileSelConnectorTex_WIDTH, gFileSelConnec #include "assets/textures/title_static/gFileSelConnectorTex.ia8.inc.c" }; -u64 gFileSelForestMedallionTex[TEX_LEN(u64, gFileSelForestMedallionTex_WIDTH, gFileSelForestMedallionTex_HEIGHT, 8)] = { -#include "assets/textures/title_static/gFileSelForestMedallionTex.ia8.inc.c" -}; - -u64 gFileSelFireMedallionTex[TEX_LEN(u64, gFileSelFireMedallionTex_WIDTH, gFileSelFireMedallionTex_HEIGHT, 8)] = { -#include "assets/textures/title_static/gFileSelFireMedallionTex.ia8.inc.c" -}; - -u64 gFileSelWaterMedallionTex[TEX_LEN(u64, gFileSelWaterMedallionTex_WIDTH, gFileSelWaterMedallionTex_HEIGHT, 8)] = { -#include "assets/textures/title_static/gFileSelWaterMedallionTex.ia8.inc.c" -}; - -u64 gFileSelSpiritMedallionTex[TEX_LEN(u64, gFileSelSpiritMedallionTex_WIDTH, gFileSelSpiritMedallionTex_HEIGHT, 8)] = { -#include "assets/textures/title_static/gFileSelSpiritMedallionTex.ia8.inc.c" -}; - -u64 gFileSelShadowMedallionTex[TEX_LEN(u64, gFileSelShadowMedallionTex_WIDTH, gFileSelShadowMedallionTex_HEIGHT, 8)] = { -#include "assets/textures/title_static/gFileSelShadowMedallionTex.ia8.inc.c" -}; - -u64 gFileSelLightMedallionTex[TEX_LEN(u64, gFileSelLightMedallionTex_WIDTH, gFileSelLightMedallionTex_HEIGHT, 8)] = { -#include "assets/textures/title_static/gFileSelLightMedallionTex.ia8.inc.c" -}; +#include "assets/textures/title_static/title_static_medallion_tex.inc.c" u64 gFileSelSurroundENGTex[TEX_LEN(u64, gFileSelSurroundENGTex_WIDTH, gFileSelSurroundENGTex_HEIGHT, 8)] = { #include "assets/textures/title_static/gFileSelSurroundENGTex.ia8.inc.c" @@ -187,33 +165,9 @@ u64 gFileSelBrightnessCheckTex[TEX_LEN(u64, gFileSelBrightnessCheckTex_WIDTH, gF #include "assets/textures/title_static/gFileSelBrightnessCheckTex.ia4.inc.c" }; -u64 gFileSelBigButtonHighlightTex[TEX_LEN(u64, gFileSelBigButtonHighlightTex_WIDTH, gFileSelBigButtonHighlightTex_HEIGHT, 8)] = { -#include "assets/textures/title_static/gFileSelBigButtonHighlightTex.i8.inc.c" -}; +#include "assets/textures/title_static/title_static_highlight_tex.inc.c" -u64 gFileSelCharHighlightTex[TEX_LEN(u64, gFileSelCharHighlightTex_WIDTH, gFileSelCharHighlightTex_HEIGHT, 8)] = { -#include "assets/textures/title_static/gFileSelCharHighlightTex.i8.inc.c" -}; - -u64 gFileSelMediumButtonHighlightTex[TEX_LEN(u64, gFileSelMediumButtonHighlightTex_WIDTH, gFileSelMediumButtonHighlightTex_HEIGHT, 8)] = { -#include "assets/textures/title_static/gFileSelMediumButtonHighlightTex.i8.inc.c" -}; - -u64 gFileSelSmallButtonHighlightTex[TEX_LEN(u64, gFileSelSmallButtonHighlightTex_WIDTH, gFileSelSmallButtonHighlightTex_HEIGHT, 8)] = { -#include "assets/textures/title_static/gFileSelSmallButtonHighlightTex.i8.inc.c" -}; - -u64 gFileSelKokiriEmeraldTex[TEX_LEN(u64, gFileSelKokiriEmeraldTex_WIDTH, gFileSelKokiriEmeraldTex_HEIGHT, 32)] = { -#include "assets/textures/title_static/gFileSelKokiriEmeraldTex.rgba32.inc.c" -}; - -u64 gFileSelGoronRubyTex[TEX_LEN(u64, gFileSelGoronRubyTex_WIDTH, gFileSelGoronRubyTex_HEIGHT, 32)] = { -#include "assets/textures/title_static/gFileSelGoronRubyTex.rgba32.inc.c" -}; - -u64 gFileSelZoraSapphireTex[TEX_LEN(u64, gFileSelZoraSapphireTex_WIDTH, gFileSelZoraSapphireTex_HEIGHT, 32)] = { -#include "assets/textures/title_static/gFileSelZoraSapphireTex.rgba32.inc.c" -}; +#include "assets/textures/title_static/title_static_stone_tex.inc.c" u64 gFileSelNoFileToCopyENGTex[TEX_LEN(u64, gFileSelNoFileToCopyENGTex_WIDTH, gFileSelNoFileToCopyENGTex_HEIGHT, 8)] = { #include "assets/textures/title_static/gFileSelNoFileToCopyENGTex.ia8.inc.c" diff --git a/assets/textures/title_static/title_static_stone_tex.h b/assets/textures/title_static/title_static_stone_tex.h new file mode 100644 index 0000000000..09329b03d4 --- /dev/null +++ b/assets/textures/title_static/title_static_stone_tex.h @@ -0,0 +1,17 @@ +#ifndef TITLE_STATIC_STONE_TEX_H +#define TITLE_STATIC_STONE_TEX_H + +#include "tex_len.h" +#include "ultra64.h" + +#define gFileSelKokiriEmeraldTex_WIDTH 16 +#define gFileSelKokiriEmeraldTex_HEIGHT 16 +extern u64 gFileSelKokiriEmeraldTex[TEX_LEN(u64, gFileSelKokiriEmeraldTex_WIDTH, gFileSelKokiriEmeraldTex_HEIGHT, 32)]; +#define gFileSelGoronRubyTex_WIDTH 16 +#define gFileSelGoronRubyTex_HEIGHT 16 +extern u64 gFileSelGoronRubyTex[TEX_LEN(u64, gFileSelGoronRubyTex_WIDTH, gFileSelGoronRubyTex_HEIGHT, 32)]; +#define gFileSelZoraSapphireTex_WIDTH 16 +#define gFileSelZoraSapphireTex_HEIGHT 16 +extern u64 gFileSelZoraSapphireTex[TEX_LEN(u64, gFileSelZoraSapphireTex_WIDTH, gFileSelZoraSapphireTex_HEIGHT, 32)]; + +#endif /* TITLE_STATIC_STONE_TEX_H */ diff --git a/assets/textures/title_static/title_static_stone_tex.inc.c b/assets/textures/title_static/title_static_stone_tex.inc.c new file mode 100644 index 0000000000..d68284235f --- /dev/null +++ b/assets/textures/title_static/title_static_stone_tex.inc.c @@ -0,0 +1,11 @@ +u64 gFileSelKokiriEmeraldTex[TEX_LEN(u64, gFileSelKokiriEmeraldTex_WIDTH, gFileSelKokiriEmeraldTex_HEIGHT, 32)] = { +#include "assets/textures/title_static/gFileSelKokiriEmeraldTex.rgba32.inc.c" +}; + +u64 gFileSelGoronRubyTex[TEX_LEN(u64, gFileSelGoronRubyTex_WIDTH, gFileSelGoronRubyTex_HEIGHT, 32)] = { +#include "assets/textures/title_static/gFileSelGoronRubyTex.rgba32.inc.c" +}; + +u64 gFileSelZoraSapphireTex[TEX_LEN(u64, gFileSelZoraSapphireTex_WIDTH, gFileSelZoraSapphireTex_HEIGHT, 32)] = { +#include "assets/textures/title_static/gFileSelZoraSapphireTex.rgba32.inc.c" +};