diff --git a/assets/textures/title_static/title_static_char_set_tex.h b/assets/textures/title_static/title_static_char_set_tex.h new file mode 100644 index 0000000000..4d1d0bbaf0 --- /dev/null +++ b/assets/textures/title_static/title_static_char_set_tex.h @@ -0,0 +1,17 @@ +#ifndef TITLE_STATIC_CHAR_SET_TEX_H +#define TITLE_STATIC_CHAR_SET_TEX_H + +#include "tex_len.h" +#include "ultra64.h" + +#define gFileSelKanjiButtonTex_WIDTH 28 +#define gFileSelKanjiButtonTex_HEIGHT 16 +extern u64 gFileSelKanjiButtonTex[TEX_LEN(u64, gFileSelKanjiButtonTex_WIDTH, gFileSelKanjiButtonTex_HEIGHT, 16)]; +#define gFileSelHiraganaButtonTex_WIDTH 44 +#define gFileSelHiraganaButtonTex_HEIGHT 16 +extern u64 gFileSelHiraganaButtonTex[TEX_LEN(u64, gFileSelHiraganaButtonTex_WIDTH, gFileSelHiraganaButtonTex_HEIGHT, 16)]; +#define gFileSelKatakanaButtonTex_WIDTH 44 +#define gFileSelKatakanaButtonTex_HEIGHT 16 +extern u64 gFileSelKatakanaButtonTex[TEX_LEN(u64, gFileSelKatakanaButtonTex_WIDTH, gFileSelKatakanaButtonTex_HEIGHT, 16)]; + +#endif /* TITLE_STATIC_CHAR_SET_TEX_H */ diff --git a/assets/textures/title_static/title_static_char_set_tex.inc.c b/assets/textures/title_static/title_static_char_set_tex.inc.c new file mode 100644 index 0000000000..5a16c6a8cb --- /dev/null +++ b/assets/textures/title_static/title_static_char_set_tex.inc.c @@ -0,0 +1,11 @@ +u64 gFileSelKanjiButtonTex[TEX_LEN(u64, gFileSelKanjiButtonTex_WIDTH, gFileSelKanjiButtonTex_HEIGHT, 16)] = { +#include "assets/textures/title_static/gFileSelKanjiButtonTex.ia16.inc.c" +}; + +u64 gFileSelHiraganaButtonTex[TEX_LEN(u64, gFileSelHiraganaButtonTex_WIDTH, gFileSelHiraganaButtonTex_HEIGHT, 16)] = { +#include "assets/textures/title_static/gFileSelHiraganaButtonTex.ia16.inc.c" +}; + +u64 gFileSelKatakanaButtonTex[TEX_LEN(u64, gFileSelKatakanaButtonTex_WIDTH, gFileSelKatakanaButtonTex_HEIGHT, 16)] = { +#include "assets/textures/title_static/gFileSelKatakanaButtonTex.ia16.inc.c" +}; diff --git a/assets/textures/title_static/title_static_file_sel_file_info_box_tex.c b/assets/textures/title_static/title_static_file_sel_file_info_box_tex.inc.c similarity index 100% rename from assets/textures/title_static/title_static_file_sel_file_info_box_tex.c rename to assets/textures/title_static/title_static_file_sel_file_info_box_tex.inc.c diff --git a/assets/textures/title_static/title_static_file_sel_window_tex.c b/assets/textures/title_static/title_static_file_sel_window_tex.inc.c similarity index 100% rename from assets/textures/title_static/title_static_file_sel_window_tex.c rename to assets/textures/title_static/title_static_file_sel_window_tex.inc.c diff --git a/assets/textures/title_static/title_static_ntsc.h b/assets/textures/title_static/title_static_ntsc.h index 669daddea3..2c8b93f808 100644 --- a/assets/textures/title_static/title_static_ntsc.h +++ b/assets/textures/title_static/title_static_ntsc.h @@ -109,15 +109,9 @@ extern u64 gFileSelYesButtonJPNTex[TEX_LEN(u64, gFileSelYesButtonJPNTex_WIDTH, g #define gFileSelEraseButtonJPNTex_WIDTH 64 #define gFileSelEraseButtonJPNTex_HEIGHT 16 extern u64 gFileSelEraseButtonJPNTex[TEX_LEN(u64, gFileSelEraseButtonJPNTex_WIDTH, gFileSelEraseButtonJPNTex_HEIGHT, 16)]; -#define gFileSelKanjiButtonTex_WIDTH 28 -#define gFileSelKanjiButtonTex_HEIGHT 16 -extern u64 gFileSelKanjiButtonTex[TEX_LEN(u64, gFileSelKanjiButtonTex_WIDTH, gFileSelKanjiButtonTex_HEIGHT, 16)]; -#define gFileSelHiraganaButtonTex_WIDTH 44 -#define gFileSelHiraganaButtonTex_HEIGHT 16 -extern u64 gFileSelHiraganaButtonTex[TEX_LEN(u64, gFileSelHiraganaButtonTex_WIDTH, gFileSelHiraganaButtonTex_HEIGHT, 16)]; -#define gFileSelKatakanaButtonTex_WIDTH 44 -#define gFileSelKatakanaButtonTex_HEIGHT 16 -extern u64 gFileSelKatakanaButtonTex[TEX_LEN(u64, gFileSelKatakanaButtonTex_WIDTH, gFileSelKatakanaButtonTex_HEIGHT, 16)]; + +#include "assets/textures/title_static/title_static_char_set_tex.h" + #define gFileSelENDButtonENGTex_WIDTH 44 #define gFileSelENDButtonENGTex_HEIGHT 16 extern u64 gFileSelENDButtonENGTex[TEX_LEN(u64, gFileSelENDButtonENGTex_WIDTH, gFileSelENDButtonENGTex_HEIGHT, 16)]; diff --git a/assets/textures/title_static/title_static_ntsc.inc.c b/assets/textures/title_static/title_static_ntsc.inc.c index 76ee96f7ba..d39cad3928 100644 --- a/assets/textures/title_static/title_static_ntsc.inc.c +++ b/assets/textures/title_static/title_static_ntsc.inc.c @@ -113,7 +113,7 @@ u64 gFileSelCheckBrightnessJPNTex[TEX_LEN(u64, gFileSelCheckBrightnessJPNTex_WID #include "assets/textures/title_static/gFileSelCheckBrightnessJPNTex.ia8.inc.c" }; -#include "assets/textures/title_static/gFileSelWindowTex.inc.c" +#include "assets/textures/title_static/title_static_file_sel_window_tex.h" u64 gFileSelCopyButtonJPNTex[TEX_LEN(u64, gFileSelCopyButtonJPNTex_WIDTH, gFileSelCopyButtonJPNTex_HEIGHT, 16)] = { #include "assets/textures/title_static/gFileSelCopyButtonJPNTex.ia16.inc.c" @@ -139,17 +139,7 @@ u64 gFileSelEraseButtonJPNTex[TEX_LEN(u64, gFileSelEraseButtonJPNTex_WIDTH, gFil #include "assets/textures/title_static/gFileSelEraseButtonJPNTex.ia16.inc.c" }; -u64 gFileSelKanjiButtonTex[TEX_LEN(u64, gFileSelKanjiButtonTex_WIDTH, gFileSelKanjiButtonTex_HEIGHT, 16)] = { -#include "assets/textures/title_static/gFileSelKanjiButtonTex.ia16.inc.c" -}; - -u64 gFileSelHiraganaButtonTex[TEX_LEN(u64, gFileSelHiraganaButtonTex_WIDTH, gFileSelHiraganaButtonTex_HEIGHT, 16)] = { -#include "assets/textures/title_static/gFileSelHiraganaButtonTex.ia16.inc.c" -}; - -u64 gFileSelKatakanaButtonTex[TEX_LEN(u64, gFileSelKatakanaButtonTex_WIDTH, gFileSelKatakanaButtonTex_HEIGHT, 16)] = { -#include "assets/textures/title_static/gFileSelKatakanaButtonTex.ia16.inc.c" -}; +#include "assets/textures/title_static/title_static_char_set_tex.inc.c" u64 gFileSelENDButtonENGTex[TEX_LEN(u64, gFileSelENDButtonENGTex_WIDTH, gFileSelENDButtonENGTex_HEIGHT, 16)] = { #include "assets/textures/title_static/gFileSelENDButtonENGTex.ia16.inc.c" @@ -163,7 +153,7 @@ u64 gFileSelNameBoxTex[TEX_LEN(u64, gFileSelNameBoxTex_WIDTH, gFileSelNameBoxTex #include "assets/textures/title_static/gFileSelNameBoxTex.ia16.inc.c" }; -#include "assets/textures/title_static/gFileSelFileInfoBoxTex.inc.c" +#include "assets/textures/title_static/title_static_file_sel_file_info_box_tex.inc.c" u64 gFileSelOptionsButtonJPNTex[TEX_LEN(u64, gFileSelOptionsButtonJPNTex_WIDTH, gFileSelOptionsButtonJPNTex_HEIGHT, 16)] = { #include "assets/textures/title_static/gFileSelOptionsButtonJPNTex.ia16.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 54097e594b..196b7f5503 100644 --- a/assets/textures/title_static/title_static_pal_gc.h +++ b/assets/textures/title_static/title_static_pal_gc.h @@ -15,15 +15,7 @@ #include "assets/textures/title_static/title_static_file_sel_window_tex.h" // Character set select buttons -#define gFileSelKanjiButtonTex_WIDTH 28 -#define gFileSelKanjiButtonTex_HEIGHT 16 -extern u64 gFileSelKanjiButtonTex[TEX_LEN(u64, gFileSelKanjiButtonTex_WIDTH, gFileSelKanjiButtonTex_HEIGHT, 16)]; -#define gFileSelHiraganaButtonTex_WIDTH 44 -#define gFileSelHiraganaButtonTex_HEIGHT 16 -extern u64 gFileSelHiraganaButtonTex[TEX_LEN(u64, gFileSelHiraganaButtonTex_WIDTH, gFileSelHiraganaButtonTex_HEIGHT, 16)]; -#define gFileSelKatakanaButtonTex_WIDTH 44 -#define gFileSelKatakanaButtonTex_HEIGHT 16 -extern u64 gFileSelKatakanaButtonTex[TEX_LEN(u64, gFileSelKatakanaButtonTex_WIDTH, gFileSelKatakanaButtonTex_HEIGHT, 16)]; +#include "assets/textures/title_static/title_static_char_set_tex.h" #define gFileSelConnectorTex_WIDTH 24 #define gFileSelConnectorTex_HEIGHT 16 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 d3d30a6d87..17e258f376 100644 --- a/assets/textures/title_static/title_static_pal_gc.inc.c +++ b/assets/textures/title_static/title_static_pal_gc.inc.c @@ -9,19 +9,9 @@ u64 gFileSelConnectorTex[TEX_LEN(u64, gFileSelConnectorTex_WIDTH, gFileSelConnec #include "assets/textures/title_static/title_static_medallion_tex.inc.c" -#include "assets/textures/title_static/gFileSelWindowTex.inc.c" +#include "assets/textures/title_static/title_static_file_sel_window_tex.inc.c" -u64 gFileSelKanjiButtonTex[TEX_LEN(u64, gFileSelKanjiButtonTex_WIDTH, gFileSelKanjiButtonTex_HEIGHT, 16)] = { -#include "assets/textures/title_static/gFileSelKanjiButtonTex.ia16.inc.c" -}; - -u64 gFileSelHiraganaButtonTex[TEX_LEN(u64, gFileSelHiraganaButtonTex_WIDTH, gFileSelHiraganaButtonTex_HEIGHT, 16)] = { -#include "assets/textures/title_static/gFileSelHiraganaButtonTex.ia16.inc.c" -}; - -u64 gFileSelKatakanaButtonTex[TEX_LEN(u64, gFileSelKatakanaButtonTex_WIDTH, gFileSelKatakanaButtonTex_HEIGHT, 16)] = { -#include "assets/textures/title_static/gFileSelKatakanaButtonTex.ia16.inc.c" -}; +#include "assets/textures/title_static/title_static_char_set_tex.inc.c" u64 gFileSelENDButtonENGTex[TEX_LEN(u64, gFileSelENDButtonENGTex_WIDTH, gFileSelENDButtonENGTex_HEIGHT, 16)] = { #include "assets/textures/title_static/gFileSelENDButtonENGTex.ia16.inc.c" @@ -43,7 +33,7 @@ u64 gFileSelNameBoxTex[TEX_LEN(u64, gFileSelNameBoxTex_WIDTH, gFileSelNameBoxTex #include "assets/textures/title_static/gFileSelNameBoxTex.ia16.inc.c" }; -#include "assets/textures/title_static/gFileSelFileInfoBoxTex.inc.c" +#include "assets/textures/title_static/title_static_file_sel_file_info_box_tex.inc.c" u64 gFileSelDISKButtonTex[TEX_LEN(u64, gFileSelDISKButtonTex_WIDTH, gFileSelDISKButtonTex_HEIGHT, 16)] = { #include "assets/textures/title_static/gFileSelDISKButtonTex.ia16.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 ef41083029..779ac2831a 100644 --- a/assets/textures/title_static/title_static_pal_n64.h +++ b/assets/textures/title_static/title_static_pal_n64.h @@ -94,15 +94,8 @@ extern u64 gFileSelLanguageFRATex[TEX_LEN(u64, gFileSelLanguageFRATex_WIDTH, gFi #include "assets/textures/title_static/title_static_file_sel_window_tex.h" -#define gFileSelKanjiButtonTex_WIDTH 28 -#define gFileSelKanjiButtonTex_HEIGHT 16 -extern u64 gFileSelKanjiButtonTex[TEX_LEN(u64, gFileSelKanjiButtonTex_WIDTH, gFileSelKanjiButtonTex_HEIGHT, 16)]; -#define gFileSelHiraganaButtonTex_WIDTH 44 -#define gFileSelHiraganaButtonTex_HEIGHT 16 -extern u64 gFileSelHiraganaButtonTex[TEX_LEN(u64, gFileSelHiraganaButtonTex_WIDTH, gFileSelHiraganaButtonTex_HEIGHT, 16)]; -#define gFileSelKatakanaButtonTex_WIDTH 44 -#define gFileSelKatakanaButtonTex_HEIGHT 16 -extern u64 gFileSelKatakanaButtonTex[TEX_LEN(u64, gFileSelKatakanaButtonTex_WIDTH, gFileSelKatakanaButtonTex_HEIGHT, 16)]; +#include "assets/textures/title_static/title_static_char_set_tex.h" + #define gFileSelENDButtonENGTex_WIDTH 44 #define gFileSelENDButtonENGTex_HEIGHT 16 extern u64 gFileSelENDButtonENGTex[TEX_LEN(u64, gFileSelENDButtonENGTex_WIDTH, gFileSelENDButtonENGTex_HEIGHT, 16)]; @@ -366,7 +359,6 @@ extern u64 gFileSelInitialLanguageChoiceFRATex[TEX_LEN(u64, gFileSelInitialLangu #define gFileSelSelectYourLanguageTex_WIDTH 160 #define gFileSelSelectYourLanguageTex_HEIGHT 60 extern u64 gFileSelSelectYourLanguageTex[TEX_LEN(u64, gFileSelSelectYourLanguageTex_WIDTH, gFileSelSelectYourLanguageTex_HEIGHT, 8)]; -extern u8 title_static_unaccounted_04C680[]; #define gFileSelInitialLanguageCursorTex_WIDTH 48 #define gFileSelInitialLanguageCursorTex_HEIGHT 48 extern u64 gFileSelInitialLanguageCursorTex[TEX_LEN(u64, gFileSelInitialLanguageCursorTex_WIDTH, gFileSelInitialLanguageCursorTex_HEIGHT, 4)]; 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 adaeab43b8..865c7cd4b7 100644 --- a/assets/textures/title_static/title_static_pal_n64.inc.c +++ b/assets/textures/title_static/title_static_pal_n64.inc.c @@ -117,19 +117,9 @@ u64 gFileSelLanguageFRATex[TEX_LEN(u64, gFileSelLanguageFRATex_WIDTH, gFileSelLa #include "assets/textures/title_static/gFileSelLanguageFRATex.ia8.inc.c" }; -#include "assets/textures/title_static/gFileSelWindowTex.inc.c" +#include "assets/textures/title_static/title_static_file_sel_window_tex.inc.c" -u64 gFileSelKanjiButtonTex[TEX_LEN(u64, gFileSelKanjiButtonTex_WIDTH, gFileSelKanjiButtonTex_HEIGHT, 16)] = { -#include "assets/textures/title_static/gFileSelKanjiButtonTex.ia16.inc.c" -}; - -u64 gFileSelHiraganaButtonTex[TEX_LEN(u64, gFileSelHiraganaButtonTex_WIDTH, gFileSelHiraganaButtonTex_HEIGHT, 16)] = { -#include "assets/textures/title_static/gFileSelHiraganaButtonTex.ia16.inc.c" -}; - -u64 gFileSelKatakanaButtonTex[TEX_LEN(u64, gFileSelKatakanaButtonTex_WIDTH, gFileSelKatakanaButtonTex_HEIGHT, 16)] = { -#include "assets/textures/title_static/gFileSelKatakanaButtonTex.ia16.inc.c" -}; +#include "assets/textures/title_static/title_static_char_set_tex.inc.c" u64 gFileSelENDButtonENGTex[TEX_LEN(u64, gFileSelENDButtonENGTex_WIDTH, gFileSelENDButtonENGTex_HEIGHT, 16)] = { #include "assets/textures/title_static/gFileSelENDButtonENGTex.ia16.inc.c" @@ -151,7 +141,7 @@ u64 gFileSelNameBoxTex[TEX_LEN(u64, gFileSelNameBoxTex_WIDTH, gFileSelNameBoxTex #include "assets/textures/title_static/gFileSelNameBoxTex.ia16.inc.c" }; -#include "assets/textures/title_static/gFileSelFileInfoBoxTex.inc.c" +#include "assets/textures/title_static/title_static_file_sel_file_info_box_tex.inc.c" u64 gFileSelDISKButtonTex[TEX_LEN(u64, gFileSelDISKButtonTex_WIDTH, gFileSelDISKButtonTex_HEIGHT, 16)] = { #include "assets/textures/title_static/gFileSelDISKButtonTex.ia16.inc.c"