diff --git a/Makefile.split b/Makefile.split index 346d3d12..77c633a0 100644 --- a/Makefile.split +++ b/Makefile.split @@ -237,7 +237,7 @@ SKY_TEXTURES := $(wildcard $(TEXTURE_DIR)/sky/*.png) MACHINE_TEXTURES := $(wildcard $(TEXTURE_DIR)/machine/*.png) MOUNTAIN_TEXTURES := $(wildcard $(TEXTURE_DIR)/mountain/*.png) GRASS_TEXTURES := $(wildcard $(TEXTURE_DIR)/grass/*.png) -CUSTOM_FONT_TITLE_TEXTURES := $(wildcard $(TEXTURE_DIR)/custom_font_title/*.png) +CUSTOM_FONT_TEXTURES := $(wildcard $(TEXTURE_DIR)/custom_font/*.png) # Texture Files $(BUILD_DIR)/bin/segment2.o: $(SEGMENT2_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c) @@ -255,7 +255,7 @@ $(BUILD_DIR)/bin/sky.o: $(SKY_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c) $(BUILD_DIR)/bin/machine.o: $(MACHINE_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c) $(BUILD_DIR)/bin/mountain.o: $(MOUNTAIN_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c) $(BUILD_DIR)/bin/grass.o: $(GRASS_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c) -$(BUILD_DIR)/bin/custom_font_title.o: $(CUSTOM_FONT_TITLE_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c) +$(BUILD_DIR)/bin/custom_font.o: $(CUSTOM_FONT_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c) # Others $(BUILD_DIR)/bin/segment2.elf: SEGMENT_ADDRESS := 0x02000000 @@ -274,7 +274,7 @@ $(BUILD_DIR)/bin/sky.elf: SEGMENT_ADDRESS := 0x09000000 $(BUILD_DIR)/bin/machine.elf: SEGMENT_ADDRESS := 0x09000000 $(BUILD_DIR)/bin/mountain.elf: SEGMENT_ADDRESS := 0x09000000 $(BUILD_DIR)/bin/grass.elf: SEGMENT_ADDRESS := 0x09000000 -$(BUILD_DIR)/bin/custom_font_title.elf: SEGMENT_ADDRESS := 0x09000000 +$(BUILD_DIR)/bin/custom_font.elf: SEGMENT_ADDRESS := 0x09000000 # EU segment 19 translations $(BUILD_DIR)/bin/eu/translation_de.elf: SEGMENT_ADDRESS := 0x19000000 diff --git a/bin/custom_font.c b/bin/custom_font.c new file mode 100644 index 00000000..fde078da --- /dev/null +++ b/bin/custom_font.c @@ -0,0 +1,55 @@ +#include +#include "sm64.h" +#include "game/ingame_menu.h" +#include "make_const_nonconst.h" + +ALIGNED8 const u8 texture_font_normal[] = { +#include "textures/custom_font_title/custom_font_normal.rgba32.inc.c" +}; + +const f32 font_normal_widths[] = { +/* ! " # $ % & ' ( ) * + , - . / */ + 0.2200f, 0.3750f, 0.4375f, 0.3750f, 0.4375f, 0.5000f, 0.2500f, 0.3125f, 0.3125f, 0.3750f, 0.4375f, 0.2500f, 0.3750f, 0.2500f, 0.3125f, +/* 0 1 2 3 4 5 6 7 8 9 */ + 0.4375f, 0.3800f, 0.4200f, 0.4375f, 0.4300f, 0.4375f, 0.4375f, 0.4000f, 0.4375f, 0.4375f, +/* : ; < = > ? @ */ + 0.2000f, 0.2500f, 0.3125f, 0.3750f, 0.3125f, 0.3125f, 0.5750f, +/* A B C D E F G H I J K L M N O P Q R S T U V W X Y Z */ + 0.3750f, 0.3750f, 0.3750f, 0.3750f, 0.3750f, 0.3125f, 0.3750f, 0.3750f, 0.3125f, 0.3750f, 0.3750f, 0.3125f, 0.5000f, 0.5000f, 0.3750f, 0.3750f, 0.3750f, 0.3750f, 0.3750f, 0.3125f, 0.3750f, 0.3750f, 0.5000f, 0.4375f, 0.3750f, 0.3750f, +/* [ \ ] ^ _ ` */ + 0.3125f, 0.3125f, 0.3125f, 0.3750f, 0.3750f, 0.2500f, +/* a b c d e f g h i j k l m n o p q r s t u v w x y z */ + 0.3000f, 0.3125f, 0.3125f, 0.3125f, 0.3125f, 0.3000f, 0.3750f, 0.3125f, 0.2200f, 0.3125f, 0.3125f, 0.1700f, 0.4350f, 0.3125f, 0.3000f, 0.3000f, 0.3125f, 0.2700f, 0.3125f, 0.3125f, 0.3125f, 0.2750f, 0.4375f, 0.3750f, 0.3125f, 0.3125f, +/* { | } ~ DEL */ + 0.3125f, 0.2500f, 0.3125f, 0.5000f, 0.2000f, +}; + +////////////////////////////////////////////////////////// + +ALIGNED8 const u8 texture_font_title[] = { +#include "textures/custom_font_title/custom_font_title.rgba32.inc.c" +}; + +const f32 font_title_widths[] = { +/* ! " # $ % & ' ( ) * + , - . / */ + 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, +/* 0 1 2 3 4 5 6 7 8 9 */ + 0.45f, 0.35f, 0.45f, 0.45f, 0.45f, 0.45f, 0.45f, 0.45f, 0.45f, 0.45f, +/* : ; < = > ? @ */ + 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, +/* A B C D E F G H I J K L M N O P Q R S T U V W X Y Z */ + 0.55f, 0.50f, 0.50f, 0.50f, 0.45f, 0.45f, 0.50f, 0.55f, 0.28f, 0.60f, 0.50f, 0.45f, 0.55f, 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, 0.55f, 0.50f, 0.50f, 0.50f, 0.60f, 0.52f, 0.60f, 0.45f, +/* [ \ ] ^ _ ` */ + 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, +/* a b c d e f g h i j k l m n o p q r s t u v w x y z */ + 0.45f, 0.45f, 0.40f, 0.40f, 0.45f, 0.37f, 0.40f, 0.40f, 0.20f, 0.45f, 0.40f, 0.30f, 0.50f, 0.40f, 0.40f, 0.40f, 0.45f, 0.40f, 0.50f, 0.45f, 0.50f, 0.40f, 0.50f, 0.50f, 0.45f, 0.45f, +/* { | } ~ DEL */ + 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, +}; + +////////////////////////////////////////////////////////// + +ALIGNED8 u8 texture_selectionbox_icon[] = { +#include "textures/segment2/custom_selectionbox_icon.rgba16.inc.c" +}; + diff --git a/bin/custom_font_title.c b/bin/custom_font_title.c deleted file mode 100644 index 614781b2..00000000 --- a/bin/custom_font_title.c +++ /dev/null @@ -1,499 +0,0 @@ -#include -#include "sm64.h" -#include "game/ingame_menu.h" -#include "make_const_nonconst.h" - -ALIGNED8 static const u8 texture_font_title_char_01[] = { -#include "textures/custom_font_title/custom_font_title_01.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_02[] = { -#include "textures/custom_font_title/custom_font_title_02.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_03[] = { -#include "textures/custom_font_title/custom_font_title_03.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_04[] = { -#include "textures/custom_font_title/custom_font_title_04.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_05[] = { -#include "textures/custom_font_title/custom_font_title_05.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_06[] = { -#include "textures/custom_font_title/custom_font_title_06.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_07[] = { -#include "textures/custom_font_title/custom_font_title_07.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_08[] = { -#include "textures/custom_font_title/custom_font_title_08.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_09[] = { -#include "textures/custom_font_title/custom_font_title_09.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_10[] = { -#include "textures/custom_font_title/custom_font_title_10.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_11[] = { -#include "textures/custom_font_title/custom_font_title_11.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_12[] = { -#include "textures/custom_font_title/custom_font_title_12.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_13[] = { -#include "textures/custom_font_title/custom_font_title_13.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_14[] = { -#include "textures/custom_font_title/custom_font_title_14.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_15[] = { -#include "textures/custom_font_title/custom_font_title_15.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_16[] = { -#include "textures/custom_font_title/custom_font_title_16.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_17[] = { -#include "textures/custom_font_title/custom_font_title_17.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_18[] = { -#include "textures/custom_font_title/custom_font_title_18.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_19[] = { -#include "textures/custom_font_title/custom_font_title_19.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_20[] = { -#include "textures/custom_font_title/custom_font_title_20.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_21[] = { -#include "textures/custom_font_title/custom_font_title_21.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_22[] = { -#include "textures/custom_font_title/custom_font_title_22.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_23[] = { -#include "textures/custom_font_title/custom_font_title_23.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_24[] = { -#include "textures/custom_font_title/custom_font_title_24.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_25[] = { -#include "textures/custom_font_title/custom_font_title_25.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_26[] = { -#include "textures/custom_font_title/custom_font_title_26.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_27[] = { -#include "textures/custom_font_title/custom_font_title_27.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_28[] = { -#include "textures/custom_font_title/custom_font_title_28.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_29[] = { -#include "textures/custom_font_title/custom_font_title_29.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_30[] = { -#include "textures/custom_font_title/custom_font_title_30.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_31[] = { -#include "textures/custom_font_title/custom_font_title_31.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_32[] = { -#include "textures/custom_font_title/custom_font_title_32.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_33[] = { -#include "textures/custom_font_title/custom_font_title_33.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_34[] = { -#include "textures/custom_font_title/custom_font_title_34.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_35[] = { -#include "textures/custom_font_title/custom_font_title_35.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_36[] = { -#include "textures/custom_font_title/custom_font_title_36.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_37[] = { -#include "textures/custom_font_title/custom_font_title_37.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_38[] = { -#include "textures/custom_font_title/custom_font_title_38.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_39[] = { -#include "textures/custom_font_title/custom_font_title_39.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_40[] = { -#include "textures/custom_font_title/custom_font_title_40.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_41[] = { -#include "textures/custom_font_title/custom_font_title_41.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_42[] = { -#include "textures/custom_font_title/custom_font_title_42.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_43[] = { -#include "textures/custom_font_title/custom_font_title_43.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_44[] = { -#include "textures/custom_font_title/custom_font_title_44.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_45[] = { -#include "textures/custom_font_title/custom_font_title_45.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_46[] = { -#include "textures/custom_font_title/custom_font_title_46.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_47[] = { -#include "textures/custom_font_title/custom_font_title_47.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_48[] = { -#include "textures/custom_font_title/custom_font_title_48.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_49[] = { -#include "textures/custom_font_title/custom_font_title_49.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_50[] = { -#include "textures/custom_font_title/custom_font_title_50.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_51[] = { -#include "textures/custom_font_title/custom_font_title_51.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_52[] = { -#include "textures/custom_font_title/custom_font_title_52.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_53[] = { -#include "textures/custom_font_title/custom_font_title_53.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_54[] = { -#include "textures/custom_font_title/custom_font_title_54.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_55[] = { -#include "textures/custom_font_title/custom_font_title_55.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_56[] = { -#include "textures/custom_font_title/custom_font_title_56.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_57[] = { -#include "textures/custom_font_title/custom_font_title_57.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_58[] = { -#include "textures/custom_font_title/custom_font_title_58.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_59[] = { -#include "textures/custom_font_title/custom_font_title_59.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_60[] = { -#include "textures/custom_font_title/custom_font_title_60.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_61[] = { -#include "textures/custom_font_title/custom_font_title_61.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_62[] = { -#include "textures/custom_font_title/custom_font_title_62.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_63[] = { -#include "textures/custom_font_title/custom_font_title_63.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_64[] = { -#include "textures/custom_font_title/custom_font_title_64.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_65[] = { -#include "textures/custom_font_title/custom_font_title_65.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_66[] = { -#include "textures/custom_font_title/custom_font_title_66.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_67[] = { -#include "textures/custom_font_title/custom_font_title_67.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_68[] = { -#include "textures/custom_font_title/custom_font_title_68.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_69[] = { -#include "textures/custom_font_title/custom_font_title_69.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_70[] = { -#include "textures/custom_font_title/custom_font_title_70.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_71[] = { -#include "textures/custom_font_title/custom_font_title_71.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_72[] = { -#include "textures/custom_font_title/custom_font_title_72.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_73[] = { -#include "textures/custom_font_title/custom_font_title_73.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_74[] = { -#include "textures/custom_font_title/custom_font_title_74.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_75[] = { -#include "textures/custom_font_title/custom_font_title_75.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_76[] = { -#include "textures/custom_font_title/custom_font_title_76.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_77[] = { -#include "textures/custom_font_title/custom_font_title_77.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_78[] = { -#include "textures/custom_font_title/custom_font_title_78.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_79[] = { -#include "textures/custom_font_title/custom_font_title_79.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_80[] = { -#include "textures/custom_font_title/custom_font_title_80.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_81[] = { -#include "textures/custom_font_title/custom_font_title_81.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_82[] = { -#include "textures/custom_font_title/custom_font_title_82.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_83[] = { -#include "textures/custom_font_title/custom_font_title_83.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_84[] = { -#include "textures/custom_font_title/custom_font_title_84.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_85[] = { -#include "textures/custom_font_title/custom_font_title_85.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_86[] = { -#include "textures/custom_font_title/custom_font_title_86.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_87[] = { -#include "textures/custom_font_title/custom_font_title_87.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_88[] = { -#include "textures/custom_font_title/custom_font_title_88.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_89[] = { -#include "textures/custom_font_title/custom_font_title_89.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_90[] = { -#include "textures/custom_font_title/custom_font_title_90.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_91[] = { -#include "textures/custom_font_title/custom_font_title_91.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_92[] = { -#include "textures/custom_font_title/custom_font_title_92.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_93[] = { -#include "textures/custom_font_title/custom_font_title_93.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_94[] = { -#include "textures/custom_font_title/custom_font_title_94.rgba32.inc.c" -}; - -ALIGNED8 static const u8 texture_font_title_char_95[] = { -#include "textures/custom_font_title/custom_font_title_95.rgba32.inc.c" -}; - -const u8* const font_title_chars[] = { - texture_font_title_char_01, // ! - texture_font_title_char_02, // " - texture_font_title_char_03, // # - texture_font_title_char_04, // $ - texture_font_title_char_05, // % - texture_font_title_char_06, // & - texture_font_title_char_07, // ' - texture_font_title_char_08, // ( - texture_font_title_char_09, // ) - texture_font_title_char_10, // * - texture_font_title_char_11, // + - texture_font_title_char_12, // , - texture_font_title_char_13, // - - texture_font_title_char_14, // . - texture_font_title_char_15, // / - texture_font_title_char_16, // 0 - texture_font_title_char_17, // 1 - texture_font_title_char_18, // 2 - texture_font_title_char_19, // 3 - texture_font_title_char_20, // 4 - texture_font_title_char_21, // 5 - texture_font_title_char_22, // 6 - texture_font_title_char_23, // 7 - texture_font_title_char_24, // 8 - texture_font_title_char_25, // 9 - texture_font_title_char_26, // : - texture_font_title_char_27, // ; - texture_font_title_char_28, // < - texture_font_title_char_29, // = - texture_font_title_char_30, // > - texture_font_title_char_31, // ? - texture_font_title_char_32, // @ - texture_font_title_char_33, // A - texture_font_title_char_34, // B - texture_font_title_char_35, // C - texture_font_title_char_36, // D - texture_font_title_char_37, // E - texture_font_title_char_38, // F - texture_font_title_char_39, // G - texture_font_title_char_40, // H - texture_font_title_char_41, // I - texture_font_title_char_42, // J - texture_font_title_char_43, // K - texture_font_title_char_44, // L - texture_font_title_char_45, // M - texture_font_title_char_46, // N - texture_font_title_char_47, // O - texture_font_title_char_48, // P - texture_font_title_char_49, // Q - texture_font_title_char_50, // R - texture_font_title_char_51, // S - texture_font_title_char_52, // T - texture_font_title_char_53, // U - texture_font_title_char_54, // V - texture_font_title_char_55, // W - texture_font_title_char_56, // X - texture_font_title_char_57, // Y - texture_font_title_char_58, // Z - texture_font_title_char_59, // [ - texture_font_title_char_60, // \ // - texture_font_title_char_61, // ] - texture_font_title_char_62, // ^ - texture_font_title_char_63, // _ - texture_font_title_char_64, // ` - texture_font_title_char_65, // a - texture_font_title_char_66, // b - texture_font_title_char_67, // c - texture_font_title_char_68, // d - texture_font_title_char_69, // e - texture_font_title_char_70, // f - texture_font_title_char_71, // g - texture_font_title_char_72, // h - texture_font_title_char_73, // i - texture_font_title_char_74, // j - texture_font_title_char_75, // k - texture_font_title_char_76, // l - texture_font_title_char_77, // m - texture_font_title_char_78, // n - texture_font_title_char_79, // o - texture_font_title_char_80, // p - texture_font_title_char_81, // q - texture_font_title_char_82, // r - texture_font_title_char_83, // s - texture_font_title_char_84, // t - texture_font_title_char_85, // u - texture_font_title_char_86, // v - texture_font_title_char_87, // w - texture_font_title_char_88, // x - texture_font_title_char_89, // y - texture_font_title_char_90, // z - texture_font_title_char_91, // { - texture_font_title_char_92, // | - texture_font_title_char_93, // } - texture_font_title_char_94, // ~ - texture_font_title_char_95, // DEL -}; - -const f32 font_title_widths[] = { -/* ! " # $ % & ' ( ) * + , - . / */ - 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, -/* 0 1 2 3 4 5 6 7 8 9 */ - 0.45f, 0.35f, 0.45f, 0.45f, 0.45f, 0.45f, 0.45f, 0.45f, 0.45f, 0.45f, -/* : ; < = > ? @ */ - 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, -/* A B C D E F G H I J K L M N O P Q R S T U V W X Y Z */ - 0.55f, 0.50f, 0.50f, 0.50f, 0.45f, 0.45f, 0.50f, 0.55f, 0.28f, 0.60f, 0.50f, 0.45f, 0.55f, 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, 0.55f, 0.50f, 0.50f, 0.50f, 0.60f, 0.52f, 0.60f, 0.45f, -/* [ \ ] ^ _ ` */ - 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, -/* a b c d e f g h i j k l m n o p q r s t u v w x y z */ - 0.45f, 0.45f, 0.40f, 0.40f, 0.45f, 0.37f, 0.40f, 0.40f, 0.20f, 0.45f, 0.40f, 0.30f, 0.50f, 0.40f, 0.40f, 0.40f, 0.45f, 0.40f, 0.50f, 0.45f, 0.50f, 0.40f, 0.50f, 0.50f, 0.45f, 0.45f, -/* { | } ~ DEL */ - 0.50f, 0.50f, 0.50f, 0.50f, 0.50f, -}; diff --git a/bin/custom_textures.c b/bin/custom_textures.c new file mode 100644 index 00000000..b87e20d4 --- /dev/null +++ b/bin/custom_textures.c @@ -0,0 +1,24 @@ +#include +#include "sm64.h" +#include "game/ingame_menu.h" +#include "make_const_nonconst.h" + +ALIGNED8 const Texture texture_hud_char_luigi_head[] = { +#include "textures/segment2/custom_luigi_head.rgba16.inc.c" +}; + +ALIGNED8 const Texture texture_hud_char_toad_head[] = { +#include "textures/segment2/custom_toad_head.rgba16.inc.c" +}; + +ALIGNED8 const Texture texture_hud_char_waluigi_head[] = { +#include "textures/segment2/custom_waluigi_head.rgba16.inc.c" +}; + +ALIGNED8 const Texture texture_hud_char_wario_head[] = { +#include "textures/segment2/custom_wario_head.rgba16.inc.c" +}; + +ALIGNED8 const Texture texture_shadow_spike_ext[] = { +#include "textures/segment2/shadow_spike_custom.ia8.inc.c" +}; diff --git a/bin/segment2.c b/bin/segment2.c index 5073b86b..6aace4c0 100644 --- a/bin/segment2.c +++ b/bin/segment2.c @@ -90,7 +90,6 @@ ALIGNED8 static const u8 texture_hud_char_J[] = { #include "textures/segment2/custom_hud_j.rgba16.inc.c" }; - #if defined(VERSION_JP) || defined(VERSION_SH) ALIGNED8 const Texture texture_hud_char_J[] = { #include "textures/segment2/segment2.02600.rgba16.inc.c" @@ -221,22 +220,6 @@ ALIGNED8 const Texture texture_hud_char_mario_head[] = { #include "textures/segment2/segment2.05A00.rgba16.inc.c" }; -ALIGNED8 const Texture texture_hud_char_luigi_head[] = { -#include "textures/segment2/custom_luigi_head.rgba16.inc.c" -}; - -ALIGNED8 const Texture texture_hud_char_toad_head[] = { -#include "textures/segment2/custom_toad_head.rgba16.inc.c" -}; - -ALIGNED8 const Texture texture_hud_char_waluigi_head[] = { -#include "textures/segment2/custom_waluigi_head.rgba16.inc.c" -}; - -ALIGNED8 const Texture texture_hud_char_wario_head[] = { -#include "textures/segment2/custom_wario_head.rgba16.inc.c" -}; - ALIGNED8 const Texture texture_hud_char_star[] = { #include "textures/segment2/segment2.05C00.rgba16.inc.c" }; @@ -1829,6 +1812,12 @@ ALIGNED8 const Texture texture_hud_char_arrow_down[] = { #include "textures/segment2/segment2.081D0.rgba16.inc.c" }; +// TODO: move these out of the font +extern ALIGNED8 const Texture texture_hud_char_luigi_head[]; +extern ALIGNED8 const Texture texture_hud_char_toad_head[]; +extern ALIGNED8 const Texture texture_hud_char_waluigi_head[]; +extern ALIGNED8 const Texture texture_hud_char_wario_head[]; + // Main HUD print table 0x02008250-0x02008337 const Texture *const main_hud_lut[] = { #ifdef VERSION_EU @@ -2590,10 +2579,6 @@ ALIGNED8 const Texture texture_shadow_quarter_square[] = { #include "textures/segment2/shadow_quarter_square.ia8.inc.c" }; -ALIGNED8 const Texture texture_shadow_spike_ext[] = { -#include "textures/segment2/shadow_spike_custom.ia8.inc.c" -}; - const Texture texture_transition_star_half[] = { #include "textures/segment2/segment2.0F458.ia8.inc.c" }; @@ -2686,6 +2671,7 @@ const Gfx dl_shadow_square[] = { gsSPEndDisplayList(), }; +extern ALIGNED8 const Texture texture_shadow_spike_ext[]; const Gfx dl_shadow_spike_ext[] = { gsSPDisplayList(dl_shadow_begin), gsDPLoadTextureBlock(texture_shadow_spike_ext, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 16, 0, G_TX_WRAP | G_TX_MIRROR, G_TX_WRAP | G_TX_MIRROR, 4, 4, G_TX_NOLOD, G_TX_NOLOD), @@ -3508,31 +3494,3 @@ const s16 seg2_painting_mesh_neighbor_tris[] = { 3, 240, 242, 244, 1, 243, }; - -////////////////////////////////////////////////////////// - -ALIGNED8 const u8 texture_font_normal[] = { -#include "textures/custom_font_title/custom_font_normal.rgba32.inc.c" -}; - -const f32 font_normal_widths[] = { -/* ! " # $ % & ' ( ) * + , - . / */ - 0.2200f, 0.3750f, 0.4375f, 0.3750f, 0.4375f, 0.5000f, 0.2500f, 0.3125f, 0.3125f, 0.3750f, 0.4375f, 0.2500f, 0.3750f, 0.2500f, 0.3125f, -/* 0 1 2 3 4 5 6 7 8 9 */ - 0.4375f, 0.3800f, 0.4200f, 0.4375f, 0.4300f, 0.4375f, 0.4375f, 0.4000f, 0.4375f, 0.4375f, -/* : ; < = > ? @ */ - 0.2000f, 0.2500f, 0.3125f, 0.3750f, 0.3125f, 0.3125f, 0.5750f, -/* A B C D E F G H I J K L M N O P Q R S T U V W X Y Z */ - 0.3750f, 0.3750f, 0.3750f, 0.3750f, 0.3750f, 0.3125f, 0.3750f, 0.3750f, 0.3125f, 0.3750f, 0.3750f, 0.3125f, 0.5000f, 0.5000f, 0.3750f, 0.3750f, 0.3750f, 0.3750f, 0.3750f, 0.3125f, 0.3750f, 0.3750f, 0.5000f, 0.4375f, 0.3750f, 0.3750f, -/* [ \ ] ^ _ ` */ - 0.3125f, 0.3125f, 0.3125f, 0.3750f, 0.3750f, 0.2500f, -/* a b c d e f g h i j k l m n o p q r s t u v w x y z */ - 0.3000f, 0.3125f, 0.3125f, 0.3125f, 0.3125f, 0.3000f, 0.3750f, 0.3125f, 0.2200f, 0.3125f, 0.3125f, 0.1700f, 0.4350f, 0.3125f, 0.3000f, 0.3000f, 0.3125f, 0.2700f, 0.3125f, 0.3125f, 0.3125f, 0.2750f, 0.4375f, 0.3750f, 0.3125f, 0.3125f, -/* { | } ~ DEL */ - 0.3125f, 0.2500f, 0.3125f, 0.5000f, 0.2000f, -}; - - -ALIGNED8 u8 texture_selectionbox_icon[] = { -#include "textures/segment2/custom_selectionbox_icon.rgba16.inc.c" -}; diff --git a/src/pc/djui/djui_bind.c b/src/pc/djui/djui_bind.c index d2995e3c..3b0f5994 100644 --- a/src/pc/djui/djui_bind.c +++ b/src/pc/djui/djui_bind.c @@ -64,7 +64,7 @@ struct DjuiBind* djui_bind_create(struct DjuiBase* parent, const char* message, djui_base_set_size_type(&text->base, DJUI_SVT_RELATIVE, DJUI_SVT_RELATIVE); djui_base_set_size(&text->base, 0.3f, 1.0f); djui_text_set_alignment(text, DJUI_HALIGN_LEFT, DJUI_VALIGN_BOTTOM); - djui_text_set_drop_shadow(text, 255, 255, 255, 128); + djui_text_set_drop_shadow(text, 64, 64, 64, 100); djui_base_set_color(&text->base, 200, 200, 200, 255); bind->text = text; diff --git a/src/pc/djui/djui_button.c b/src/pc/djui/djui_button.c index f38c0800..d3332e4d 100644 --- a/src/pc/djui/djui_button.c +++ b/src/pc/djui/djui_button.c @@ -55,7 +55,7 @@ struct DjuiButton* djui_button_create(struct DjuiBase* parent, const char* messa djui_base_set_size(&text->base, 1.0f, 1.0f); djui_base_set_color(&text->base, 11, 11, 11, 255); djui_text_set_alignment(text, DJUI_HALIGN_CENTER, DJUI_VALIGN_CENTER); - djui_text_set_drop_shadow(text, 0, 0, 0, 64); + djui_text_set_drop_shadow(text, 64, 64, 64, 100); button->text = text; djui_base_set_size_type(base, DJUI_SVT_RELATIVE, DJUI_SVT_ABSOLUTE); diff --git a/src/pc/djui/djui_checkbox.c b/src/pc/djui/djui_checkbox.c index 2e27a7f4..d0cb3b52 100644 --- a/src/pc/djui/djui_checkbox.c +++ b/src/pc/djui/djui_checkbox.c @@ -63,7 +63,7 @@ struct DjuiCheckbox* djui_checkbox_create(struct DjuiBase* parent, const char* m djui_base_set_size_type(&text->base, DJUI_SVT_RELATIVE, DJUI_SVT_RELATIVE); djui_base_set_size(&text->base, 1.0f, 1.0f); djui_text_set_alignment(text, DJUI_HALIGN_LEFT, DJUI_VALIGN_BOTTOM); - djui_text_set_drop_shadow(text, 255, 255, 255, 128); + djui_text_set_drop_shadow(text, 64, 64, 64, 100); checkbox->text = text; struct DjuiRect* rect = djui_rect_create(&checkbox->base); diff --git a/src/pc/djui/djui_font.c b/src/pc/djui/djui_font.c index d75ac2a6..389e5454 100644 --- a/src/pc/djui/djui_font.c +++ b/src/pc/djui/djui_font.c @@ -38,13 +38,18 @@ static const struct DjuiFont sDjuiFontNormal = { // font 1 (custom title font) // //////////////////////////////// -static void djui_font_title_render_char(char* text) { - char c = *text; - extern const u8* const font_title_chars[]; +static void djui_font_title_render_char(char* c) { // replace undisplayable characters - if (c == ' ') { return; } - c = djui_unicode_get_base_char(text); - djui_gfx_render_texture(font_title_chars[c - '!'], 64, 64, 32); + if (*c == ' ') { return; } + + u32 index = djui_unicode_get_sprite_index(c); + if ((u8)*c < '!' || (u8)*c > '~' + 1) { index = djui_unicode_get_sprite_index("?"); } + + u32 tx = index % 16; + u32 ty = index / 16; + + extern ALIGNED8 const u8 texture_font_title[]; + djui_gfx_render_texture_tile(texture_font_title, 1024, 512, 32, tx * 64 + 1, ty * 64, 64, 64); } static f32 djui_font_title_char_width(char* text) { diff --git a/src/pc/djui/djui_gfx.c b/src/pc/djui/djui_gfx.c index 1b4a5474..c01099b7 100644 --- a/src/pc/djui/djui_gfx.c +++ b/src/pc/djui/djui_gfx.c @@ -84,7 +84,7 @@ void djui_gfx_render_texture(const u8* texture, u32 w, u32 h, u32 bitSize) { void djui_gfx_render_texture_tile(const u8* texture, u32 w, u32 h, u32 bitSize, u32 tileX, u32 tileY, u32 tileW, u32 tileH) { Vtx *vtx = alloc_display_list(sizeof(Vtx) * 4); - f32 aspect = w ? ((f32)h / (f32)w) : 1; + f32 aspect = tileH ? ((f32)tileW / (f32)tileH) : 1; vtx[0] = (Vtx) {{{ 0, -1, 0 }, 0, { ( tileX * 512) / w, ((tileY + tileH) * 512) / h }, { 0xff, 0xff, 0xff, 0xff }}}; vtx[1] = (Vtx) {{{ 1 * aspect, -1, 0 }, 0, { ((tileX + tileW) * 512) / w, ((tileY + tileH) * 512) / h }, { 0xff, 0xff, 0xff, 0xff }}}; vtx[2] = (Vtx) {{{ 1 * aspect, 0, 0 }, 0, { ((tileX + tileW) * 512) / w, ( tileY * 512) / h }, { 0xff, 0xff, 0xff, 0xff }}}; diff --git a/src/pc/djui/djui_selectionbox.c b/src/pc/djui/djui_selectionbox.c index 653107c8..4db58c2c 100644 --- a/src/pc/djui/djui_selectionbox.c +++ b/src/pc/djui/djui_selectionbox.c @@ -94,7 +94,7 @@ struct DjuiSelectionbox* djui_selectionbox_create(struct DjuiBase* parent, const djui_base_set_size_type(&text->base, DJUI_SVT_RELATIVE, DJUI_SVT_RELATIVE); djui_base_set_size(&text->base, 0.6f, 1.0f); djui_text_set_alignment(text, DJUI_HALIGN_LEFT, DJUI_VALIGN_BOTTOM); - djui_text_set_drop_shadow(text, 255, 255, 255, 128); + djui_text_set_drop_shadow(text, 64, 64, 64, 100); selectionbox->text = text; struct DjuiRect* rect = djui_rect_create(&selectionbox->base); @@ -111,7 +111,7 @@ struct DjuiSelectionbox* djui_selectionbox_create(struct DjuiBase* parent, const djui_base_set_size_type(&rectText->base, DJUI_SVT_RELATIVE, DJUI_SVT_RELATIVE); djui_base_set_size(&rectText->base, 1.0f, 1.0f); djui_text_set_alignment(rectText, DJUI_HALIGN_LEFT, DJUI_VALIGN_BOTTOM); - djui_text_set_drop_shadow(rectText, 255, 255, 255, 128); + djui_text_set_drop_shadow(rectText, 64, 64, 64, 100); selectionbox->rectText = rectText; struct DjuiImage* rectImage = djui_image_create(&rect->base, texture_selectionbox_icon, 16, 16, 16); diff --git a/src/pc/djui/djui_slider.c b/src/pc/djui/djui_slider.c index 77d8bd98..92324a97 100644 --- a/src/pc/djui/djui_slider.c +++ b/src/pc/djui/djui_slider.c @@ -116,7 +116,7 @@ struct DjuiSlider* djui_slider_create(struct DjuiBase* parent, const char* messa djui_base_set_size_type(&text->base, DJUI_SVT_RELATIVE, DJUI_SVT_RELATIVE); djui_base_set_size(&text->base, 0.6f, 1.0f); djui_text_set_alignment(text, DJUI_HALIGN_LEFT, DJUI_VALIGN_BOTTOM); - djui_text_set_drop_shadow(text, 255, 255, 255, 128); + djui_text_set_drop_shadow(text, 64, 64, 64, 100); slider->text = text; struct DjuiRect* rect = djui_rect_create(&slider->base); diff --git a/src/pc/pc_main.c b/src/pc/pc_main.c index 7f0a14a0..a1ce19f8 100644 --- a/src/pc/pc_main.c +++ b/src/pc/pc_main.c @@ -202,7 +202,7 @@ void produce_interpolation_frames_and_delay(void) { sFrameTargetTime += sFrameTime * gGameSpeed; gRenderingInterpolated = false; - printf(">>> fpt: %llu, fps: %f :: %f\n", frames, sAvgFps, fps); + //printf(">>> fpt: %llu, fps: %f :: %f\n", frames, sAvgFps, fps); } void produce_one_frame(void) { diff --git a/textures/custom_font_title/custom_font_normal.rgba32.png b/textures/custom_font/custom_font_normal.rgba32.png similarity index 100% rename from textures/custom_font_title/custom_font_normal.rgba32.png rename to textures/custom_font/custom_font_normal.rgba32.png diff --git a/textures/custom_font/custom_font_title.rgba32.png b/textures/custom_font/custom_font_title.rgba32.png new file mode 100644 index 00000000..f918147c Binary files /dev/null and b/textures/custom_font/custom_font_title.rgba32.png differ diff --git a/textures/custom_font_title/custom_font_title_01.rgba32.png b/textures/custom_font_title/custom_font_title_01.rgba32.png deleted file mode 100644 index d8a69538..00000000 Binary files a/textures/custom_font_title/custom_font_title_01.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_02.rgba32.png b/textures/custom_font_title/custom_font_title_02.rgba32.png deleted file mode 100644 index 169c69bb..00000000 Binary files a/textures/custom_font_title/custom_font_title_02.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_03.rgba32.png b/textures/custom_font_title/custom_font_title_03.rgba32.png deleted file mode 100644 index db512f96..00000000 Binary files a/textures/custom_font_title/custom_font_title_03.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_04.rgba32.png b/textures/custom_font_title/custom_font_title_04.rgba32.png deleted file mode 100644 index 5a65b247..00000000 Binary files a/textures/custom_font_title/custom_font_title_04.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_05.rgba32.png b/textures/custom_font_title/custom_font_title_05.rgba32.png deleted file mode 100644 index 08037c51..00000000 Binary files a/textures/custom_font_title/custom_font_title_05.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_06.rgba32.png b/textures/custom_font_title/custom_font_title_06.rgba32.png deleted file mode 100644 index 50222212..00000000 Binary files a/textures/custom_font_title/custom_font_title_06.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_07.rgba32.png b/textures/custom_font_title/custom_font_title_07.rgba32.png deleted file mode 100644 index da8c7a12..00000000 Binary files a/textures/custom_font_title/custom_font_title_07.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_08.rgba32.png b/textures/custom_font_title/custom_font_title_08.rgba32.png deleted file mode 100644 index 7d4fece2..00000000 Binary files a/textures/custom_font_title/custom_font_title_08.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_09.rgba32.png b/textures/custom_font_title/custom_font_title_09.rgba32.png deleted file mode 100644 index 0dbc492b..00000000 Binary files a/textures/custom_font_title/custom_font_title_09.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_10.rgba32.png b/textures/custom_font_title/custom_font_title_10.rgba32.png deleted file mode 100644 index 6b0012fc..00000000 Binary files a/textures/custom_font_title/custom_font_title_10.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_11.rgba32.png b/textures/custom_font_title/custom_font_title_11.rgba32.png deleted file mode 100644 index b1d58b89..00000000 Binary files a/textures/custom_font_title/custom_font_title_11.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_12.rgba32.png b/textures/custom_font_title/custom_font_title_12.rgba32.png deleted file mode 100644 index 3cd5fdbf..00000000 Binary files a/textures/custom_font_title/custom_font_title_12.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_13.rgba32.png b/textures/custom_font_title/custom_font_title_13.rgba32.png deleted file mode 100644 index 1ae41e51..00000000 Binary files a/textures/custom_font_title/custom_font_title_13.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_14.rgba32.png b/textures/custom_font_title/custom_font_title_14.rgba32.png deleted file mode 100644 index 28744986..00000000 Binary files a/textures/custom_font_title/custom_font_title_14.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_15.rgba32.png b/textures/custom_font_title/custom_font_title_15.rgba32.png deleted file mode 100644 index 4a955f03..00000000 Binary files a/textures/custom_font_title/custom_font_title_15.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_16.rgba32.png b/textures/custom_font_title/custom_font_title_16.rgba32.png deleted file mode 100644 index e2055c5f..00000000 Binary files a/textures/custom_font_title/custom_font_title_16.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_17.rgba32.png b/textures/custom_font_title/custom_font_title_17.rgba32.png deleted file mode 100644 index 7a4e85a7..00000000 Binary files a/textures/custom_font_title/custom_font_title_17.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_18.rgba32.png b/textures/custom_font_title/custom_font_title_18.rgba32.png deleted file mode 100644 index 66d3f3d0..00000000 Binary files a/textures/custom_font_title/custom_font_title_18.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_19.rgba32.png b/textures/custom_font_title/custom_font_title_19.rgba32.png deleted file mode 100644 index ce21e6f4..00000000 Binary files a/textures/custom_font_title/custom_font_title_19.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_20.rgba32.png b/textures/custom_font_title/custom_font_title_20.rgba32.png deleted file mode 100644 index d368ec86..00000000 Binary files a/textures/custom_font_title/custom_font_title_20.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_21.rgba32.png b/textures/custom_font_title/custom_font_title_21.rgba32.png deleted file mode 100644 index 1f871c09..00000000 Binary files a/textures/custom_font_title/custom_font_title_21.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_22.rgba32.png b/textures/custom_font_title/custom_font_title_22.rgba32.png deleted file mode 100644 index f56fb259..00000000 Binary files a/textures/custom_font_title/custom_font_title_22.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_23.rgba32.png b/textures/custom_font_title/custom_font_title_23.rgba32.png deleted file mode 100644 index 8336aa39..00000000 Binary files a/textures/custom_font_title/custom_font_title_23.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_24.rgba32.png b/textures/custom_font_title/custom_font_title_24.rgba32.png deleted file mode 100644 index ea47b003..00000000 Binary files a/textures/custom_font_title/custom_font_title_24.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_25.rgba32.png b/textures/custom_font_title/custom_font_title_25.rgba32.png deleted file mode 100644 index e4f9f752..00000000 Binary files a/textures/custom_font_title/custom_font_title_25.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_26.rgba32.png b/textures/custom_font_title/custom_font_title_26.rgba32.png deleted file mode 100644 index 9beb7055..00000000 Binary files a/textures/custom_font_title/custom_font_title_26.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_27.rgba32.png b/textures/custom_font_title/custom_font_title_27.rgba32.png deleted file mode 100644 index c89b50d5..00000000 Binary files a/textures/custom_font_title/custom_font_title_27.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_28.rgba32.png b/textures/custom_font_title/custom_font_title_28.rgba32.png deleted file mode 100644 index 95497fb9..00000000 Binary files a/textures/custom_font_title/custom_font_title_28.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_29.rgba32.png b/textures/custom_font_title/custom_font_title_29.rgba32.png deleted file mode 100644 index c568aa8f..00000000 Binary files a/textures/custom_font_title/custom_font_title_29.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_30.rgba32.png b/textures/custom_font_title/custom_font_title_30.rgba32.png deleted file mode 100644 index ba38bc7a..00000000 Binary files a/textures/custom_font_title/custom_font_title_30.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_31.rgba32.png b/textures/custom_font_title/custom_font_title_31.rgba32.png deleted file mode 100644 index 9c44179a..00000000 Binary files a/textures/custom_font_title/custom_font_title_31.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_32.rgba32.png b/textures/custom_font_title/custom_font_title_32.rgba32.png deleted file mode 100644 index 3f1b4eeb..00000000 Binary files a/textures/custom_font_title/custom_font_title_32.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_33.rgba32.png b/textures/custom_font_title/custom_font_title_33.rgba32.png deleted file mode 100644 index 249697dc..00000000 Binary files a/textures/custom_font_title/custom_font_title_33.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_34.rgba32.png b/textures/custom_font_title/custom_font_title_34.rgba32.png deleted file mode 100644 index f19f69a0..00000000 Binary files a/textures/custom_font_title/custom_font_title_34.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_35.rgba32.png b/textures/custom_font_title/custom_font_title_35.rgba32.png deleted file mode 100644 index 214ebb31..00000000 Binary files a/textures/custom_font_title/custom_font_title_35.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_36.rgba32.png b/textures/custom_font_title/custom_font_title_36.rgba32.png deleted file mode 100644 index bfd0240f..00000000 Binary files a/textures/custom_font_title/custom_font_title_36.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_37.rgba32.png b/textures/custom_font_title/custom_font_title_37.rgba32.png deleted file mode 100644 index 2deb89e8..00000000 Binary files a/textures/custom_font_title/custom_font_title_37.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_38.rgba32.png b/textures/custom_font_title/custom_font_title_38.rgba32.png deleted file mode 100644 index 4719c156..00000000 Binary files a/textures/custom_font_title/custom_font_title_38.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_39.rgba32.png b/textures/custom_font_title/custom_font_title_39.rgba32.png deleted file mode 100644 index 5fa1984f..00000000 Binary files a/textures/custom_font_title/custom_font_title_39.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_40.rgba32.png b/textures/custom_font_title/custom_font_title_40.rgba32.png deleted file mode 100644 index 887d4a62..00000000 Binary files a/textures/custom_font_title/custom_font_title_40.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_41.rgba32.png b/textures/custom_font_title/custom_font_title_41.rgba32.png deleted file mode 100644 index 59ce962a..00000000 Binary files a/textures/custom_font_title/custom_font_title_41.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_42.rgba32.png b/textures/custom_font_title/custom_font_title_42.rgba32.png deleted file mode 100644 index 533df8c8..00000000 Binary files a/textures/custom_font_title/custom_font_title_42.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_43.rgba32.png b/textures/custom_font_title/custom_font_title_43.rgba32.png deleted file mode 100644 index 03afa611..00000000 Binary files a/textures/custom_font_title/custom_font_title_43.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_44.rgba32.png b/textures/custom_font_title/custom_font_title_44.rgba32.png deleted file mode 100644 index 4a4e66cc..00000000 Binary files a/textures/custom_font_title/custom_font_title_44.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_45.rgba32.png b/textures/custom_font_title/custom_font_title_45.rgba32.png deleted file mode 100644 index 6683989c..00000000 Binary files a/textures/custom_font_title/custom_font_title_45.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_46.rgba32.png b/textures/custom_font_title/custom_font_title_46.rgba32.png deleted file mode 100644 index b7b07ac8..00000000 Binary files a/textures/custom_font_title/custom_font_title_46.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_47.rgba32.png b/textures/custom_font_title/custom_font_title_47.rgba32.png deleted file mode 100644 index 181d0863..00000000 Binary files a/textures/custom_font_title/custom_font_title_47.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_48.rgba32.png b/textures/custom_font_title/custom_font_title_48.rgba32.png deleted file mode 100644 index d0526bf0..00000000 Binary files a/textures/custom_font_title/custom_font_title_48.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_49.rgba32.png b/textures/custom_font_title/custom_font_title_49.rgba32.png deleted file mode 100644 index b61e8b78..00000000 Binary files a/textures/custom_font_title/custom_font_title_49.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_50.rgba32.png b/textures/custom_font_title/custom_font_title_50.rgba32.png deleted file mode 100644 index 61de6814..00000000 Binary files a/textures/custom_font_title/custom_font_title_50.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_51.rgba32.png b/textures/custom_font_title/custom_font_title_51.rgba32.png deleted file mode 100644 index fc8a9cee..00000000 Binary files a/textures/custom_font_title/custom_font_title_51.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_52.rgba32.png b/textures/custom_font_title/custom_font_title_52.rgba32.png deleted file mode 100644 index f475c438..00000000 Binary files a/textures/custom_font_title/custom_font_title_52.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_53.rgba32.png b/textures/custom_font_title/custom_font_title_53.rgba32.png deleted file mode 100644 index a09c8777..00000000 Binary files a/textures/custom_font_title/custom_font_title_53.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_54.rgba32.png b/textures/custom_font_title/custom_font_title_54.rgba32.png deleted file mode 100644 index 5d58d93b..00000000 Binary files a/textures/custom_font_title/custom_font_title_54.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_55.rgba32.png b/textures/custom_font_title/custom_font_title_55.rgba32.png deleted file mode 100644 index 359004ab..00000000 Binary files a/textures/custom_font_title/custom_font_title_55.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_56.rgba32.png b/textures/custom_font_title/custom_font_title_56.rgba32.png deleted file mode 100644 index 44ba1d3e..00000000 Binary files a/textures/custom_font_title/custom_font_title_56.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_57.rgba32.png b/textures/custom_font_title/custom_font_title_57.rgba32.png deleted file mode 100644 index c9e6c4ba..00000000 Binary files a/textures/custom_font_title/custom_font_title_57.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_58.rgba32.png b/textures/custom_font_title/custom_font_title_58.rgba32.png deleted file mode 100644 index 94b81c85..00000000 Binary files a/textures/custom_font_title/custom_font_title_58.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_59.rgba32.png b/textures/custom_font_title/custom_font_title_59.rgba32.png deleted file mode 100644 index 2a68e905..00000000 Binary files a/textures/custom_font_title/custom_font_title_59.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_60.rgba32.png b/textures/custom_font_title/custom_font_title_60.rgba32.png deleted file mode 100644 index f6873c4c..00000000 Binary files a/textures/custom_font_title/custom_font_title_60.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_61.rgba32.png b/textures/custom_font_title/custom_font_title_61.rgba32.png deleted file mode 100644 index 0ae2f520..00000000 Binary files a/textures/custom_font_title/custom_font_title_61.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_62.rgba32.png b/textures/custom_font_title/custom_font_title_62.rgba32.png deleted file mode 100644 index 9dd6910f..00000000 Binary files a/textures/custom_font_title/custom_font_title_62.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_63.rgba32.png b/textures/custom_font_title/custom_font_title_63.rgba32.png deleted file mode 100644 index 7c40a253..00000000 Binary files a/textures/custom_font_title/custom_font_title_63.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_64.rgba32.png b/textures/custom_font_title/custom_font_title_64.rgba32.png deleted file mode 100644 index 33a55225..00000000 Binary files a/textures/custom_font_title/custom_font_title_64.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_65.rgba32.png b/textures/custom_font_title/custom_font_title_65.rgba32.png deleted file mode 100644 index 0f9e40b4..00000000 Binary files a/textures/custom_font_title/custom_font_title_65.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_66.rgba32.png b/textures/custom_font_title/custom_font_title_66.rgba32.png deleted file mode 100644 index 9cb6a96a..00000000 Binary files a/textures/custom_font_title/custom_font_title_66.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_67.rgba32.png b/textures/custom_font_title/custom_font_title_67.rgba32.png deleted file mode 100644 index 702ba04d..00000000 Binary files a/textures/custom_font_title/custom_font_title_67.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_68.rgba32.png b/textures/custom_font_title/custom_font_title_68.rgba32.png deleted file mode 100644 index aab44334..00000000 Binary files a/textures/custom_font_title/custom_font_title_68.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_69.rgba32.png b/textures/custom_font_title/custom_font_title_69.rgba32.png deleted file mode 100644 index c960c46b..00000000 Binary files a/textures/custom_font_title/custom_font_title_69.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_70.rgba32.png b/textures/custom_font_title/custom_font_title_70.rgba32.png deleted file mode 100644 index 3b61e578..00000000 Binary files a/textures/custom_font_title/custom_font_title_70.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_71.rgba32.png b/textures/custom_font_title/custom_font_title_71.rgba32.png deleted file mode 100644 index c3539355..00000000 Binary files a/textures/custom_font_title/custom_font_title_71.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_72.rgba32.png b/textures/custom_font_title/custom_font_title_72.rgba32.png deleted file mode 100644 index 4cf43bea..00000000 Binary files a/textures/custom_font_title/custom_font_title_72.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_73.rgba32.png b/textures/custom_font_title/custom_font_title_73.rgba32.png deleted file mode 100644 index 8b7a7196..00000000 Binary files a/textures/custom_font_title/custom_font_title_73.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_74.rgba32.png b/textures/custom_font_title/custom_font_title_74.rgba32.png deleted file mode 100644 index 04edae81..00000000 Binary files a/textures/custom_font_title/custom_font_title_74.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_75.rgba32.png b/textures/custom_font_title/custom_font_title_75.rgba32.png deleted file mode 100644 index 4a543620..00000000 Binary files a/textures/custom_font_title/custom_font_title_75.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_76.rgba32.png b/textures/custom_font_title/custom_font_title_76.rgba32.png deleted file mode 100644 index e5129c9b..00000000 Binary files a/textures/custom_font_title/custom_font_title_76.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_77.rgba32.png b/textures/custom_font_title/custom_font_title_77.rgba32.png deleted file mode 100644 index cd9f670e..00000000 Binary files a/textures/custom_font_title/custom_font_title_77.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_78.rgba32.png b/textures/custom_font_title/custom_font_title_78.rgba32.png deleted file mode 100644 index 1c729d44..00000000 Binary files a/textures/custom_font_title/custom_font_title_78.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_79.rgba32.png b/textures/custom_font_title/custom_font_title_79.rgba32.png deleted file mode 100644 index 80a71bcf..00000000 Binary files a/textures/custom_font_title/custom_font_title_79.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_80.rgba32.png b/textures/custom_font_title/custom_font_title_80.rgba32.png deleted file mode 100644 index c4663762..00000000 Binary files a/textures/custom_font_title/custom_font_title_80.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_81.rgba32.png b/textures/custom_font_title/custom_font_title_81.rgba32.png deleted file mode 100644 index 0f551eb3..00000000 Binary files a/textures/custom_font_title/custom_font_title_81.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_82.rgba32.png b/textures/custom_font_title/custom_font_title_82.rgba32.png deleted file mode 100644 index 7fb05601..00000000 Binary files a/textures/custom_font_title/custom_font_title_82.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_83.rgba32.png b/textures/custom_font_title/custom_font_title_83.rgba32.png deleted file mode 100644 index 957aa720..00000000 Binary files a/textures/custom_font_title/custom_font_title_83.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_84.rgba32.png b/textures/custom_font_title/custom_font_title_84.rgba32.png deleted file mode 100644 index bf623a5c..00000000 Binary files a/textures/custom_font_title/custom_font_title_84.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_85.rgba32.png b/textures/custom_font_title/custom_font_title_85.rgba32.png deleted file mode 100644 index a4fd858a..00000000 Binary files a/textures/custom_font_title/custom_font_title_85.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_86.rgba32.png b/textures/custom_font_title/custom_font_title_86.rgba32.png deleted file mode 100644 index ff9c2bde..00000000 Binary files a/textures/custom_font_title/custom_font_title_86.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_87.rgba32.png b/textures/custom_font_title/custom_font_title_87.rgba32.png deleted file mode 100644 index e0081d70..00000000 Binary files a/textures/custom_font_title/custom_font_title_87.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_88.rgba32.png b/textures/custom_font_title/custom_font_title_88.rgba32.png deleted file mode 100644 index 53fafe77..00000000 Binary files a/textures/custom_font_title/custom_font_title_88.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_89.rgba32.png b/textures/custom_font_title/custom_font_title_89.rgba32.png deleted file mode 100644 index e35c2d47..00000000 Binary files a/textures/custom_font_title/custom_font_title_89.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_90.rgba32.png b/textures/custom_font_title/custom_font_title_90.rgba32.png deleted file mode 100644 index a3f26d36..00000000 Binary files a/textures/custom_font_title/custom_font_title_90.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_91.rgba32.png b/textures/custom_font_title/custom_font_title_91.rgba32.png deleted file mode 100644 index 61059717..00000000 Binary files a/textures/custom_font_title/custom_font_title_91.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_92.rgba32.png b/textures/custom_font_title/custom_font_title_92.rgba32.png deleted file mode 100644 index 9459ec5e..00000000 Binary files a/textures/custom_font_title/custom_font_title_92.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_93.rgba32.png b/textures/custom_font_title/custom_font_title_93.rgba32.png deleted file mode 100644 index 20cfe3f0..00000000 Binary files a/textures/custom_font_title/custom_font_title_93.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_94.rgba32.png b/textures/custom_font_title/custom_font_title_94.rgba32.png deleted file mode 100644 index af280ff3..00000000 Binary files a/textures/custom_font_title/custom_font_title_94.rgba32.png and /dev/null differ diff --git a/textures/custom_font_title/custom_font_title_95.rgba32.png b/textures/custom_font_title/custom_font_title_95.rgba32.png deleted file mode 100644 index 55fc2759..00000000 Binary files a/textures/custom_font_title/custom_font_title_95.rgba32.png and /dev/null differ