From a71c570dce9f158186ed881882be9a3abc607177 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Fri, 26 Jun 2020 17:02:10 -0500 Subject: [PATCH] Added fonts to assets folder --- Makefile | 12 ++++++++++-- asm/assets/assets.s | 7 +++++-- extract-ver/dkr-us-1.0.extract-config | 9 ++++----- .../extract-fonts/fonts-us-1.0.extract-config | 6 ++++++ 4 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 extract-ver/extract-fonts/fonts-us-1.0.extract-config diff --git a/Makefile b/Makefile index 4ed82078..8d18579c 100755 --- a/Makefile +++ b/Makefile @@ -59,7 +59,7 @@ CHEAT_ENCRYPTOR = $(TOOLS_DIR)/dkr_cheats_encryptor ASM_DIRS := asm asm/boot asm/assets SRC_DIRS := src -ASSETS_DIRS := animations audio billboards bin cheats levels objects particles text textures textures/2d textures/3d tt_ghosts ucode +ASSETS_DIRS := animations audio billboards bin cheats fonts levels objects particles text textures textures/2d textures/3d tt_ghosts ucode S_FILES := $(foreach dir,$(ASM_DIRS),$(wildcard $(dir)/*.s)) @@ -101,6 +101,11 @@ CHEATS_OUT_DIR = $(BUILD_DIR)/cheats CHEATS = $(wildcard $(CHEATS_IN_DIR)/*.cheats) CHEATS_BUILT := $(patsubst %.cheats,%.bin,$(patsubst $(CHEATS_IN_DIR)/%.cheats,$(CHEATS_OUT_DIR)/%.cheats,$(CHEATS))) +FONTS_IN_DIR = $(ASSETS_DIR)/fonts +FONTS_OUT_DIR = $(BUILD_DIR)/fonts +FONTS = $(wildcard $(FONTS_IN_DIR)/*.bin) +FONTS_BUILT := $(patsubst $(FONTS_IN_DIR)/%.bin,$(FONTS_OUT_DIR)/%.bin,$(FONTS)) + LEVELS_IN_DIR = $(ASSETS_DIR)/levels LEVELS_OUT_DIR = $(BUILD_DIR)/levels LEVELS = $(wildcard $(LEVELS_IN_DIR)/*.bin $(LEVELS_IN_DIR)/*.cbin) @@ -146,7 +151,7 @@ UCODE_OUT_DIR = $(BUILD_DIR)/ucode UCODE = $(wildcard $(UCODE_IN_DIR)/*.bin) UCODE_BUILT := $(patsubst $(UCODE_IN_DIR)/%.bin,$(UCODE_OUT_DIR)/%.bin,$(UCODE)) -ALL_ASSETS_BUILT := $(ANIMATIONS_BUILT) $(AUDIO_BUILT) $(BILLBOARDS_BUILT) $(BINS_BUILT) $(CHEATS_BUILT) $(LEVELS_BUILT) $(OBJECTS_BUILT) $(TEXTURES_BUILT) $(PARTICLES_BUILT) $(TEXT_BUILT) $(TT_GHOSTS_BUILT) $(UCODE_BUILT) +ALL_ASSETS_BUILT := $(ANIMATIONS_BUILT) $(AUDIO_BUILT) $(BILLBOARDS_BUILT) $(BINS_BUILT) $(CHEATS_BUILT) $(FONTS_BUILT) $(LEVELS_BUILT) $(OBJECTS_BUILT) $(TEXTURES_BUILT) $(PARTICLES_BUILT) $(TEXT_BUILT) $(TT_GHOSTS_BUILT) $(UCODE_BUILT) ######################## Targets ############################# @@ -187,6 +192,9 @@ $(BINS_OUT_DIR)/%.bin: $(BINS_IN_DIR)/%.bin $(CHEATS_OUT_DIR)/%.bin: $(CHEATS_IN_DIR)/%.cheats $(CHEAT_ENCRYPTOR) $^ $@ +$(FONTS_OUT_DIR)/%.bin: $(FONTS_IN_DIR)/%.bin + $(ASSETS_OBJCOPY) $^ $@ + $(LEVELS_OUT_DIR)/%.bin: $(LEVELS_IN_DIR)/%.bin $(ASSETS_OBJCOPY) $^ $@ diff --git a/asm/assets/assets.s b/asm/assets/assets.s index 54f07047..0ff1aeeb 100755 --- a/asm/assets/assets.s +++ b/asm/assets/assets.s @@ -4170,8 +4170,11 @@ .incbin "./build/particles/particleBehavior48.aa9920.bin" .incbin "./build/particles/particleBehavior49.aa99c0.bin" .incbin "./build/particles/particleBehavior4a.aa9a60.bin" -.incbin "./build/bin/unknown.aa9b00.bin" -.incbin "./build/bin/unknown_4bpp_font_192x732.aaab10.bin" +.incbin "./build/fonts/FunFont.aa9b00.bin" +.incbin "./build/fonts/SmallFont.aa9f00.bin" +.incbin "./build/fonts/BigFont.aaa300.bin" +.incbin "./build/fonts/SubtitleFont.aaa700.bin" +.incbin "./build/fonts/unknown_4bpp_fontsheet_192x732.aaab00.bin" .incbin "./build/bin/unknown.abbda0.bin" .incbin "./build/tt_ghosts/ttGhostsHeader.abbdc0.bin" .incbin "./build/tt_ghosts/ttGhost_FossilCanyon.abbe70.bin" diff --git a/extract-ver/dkr-us-1.0.extract-config b/extract-ver/dkr-us-1.0.extract-config index f1955e4b..f57c15a4 100755 --- a/extract-ver/dkr-us-1.0.extract-config +++ b/extract-ver/dkr-us-1.0.extract-config @@ -186,14 +186,13 @@ include: "extract-particles/particles-us-1.0.extract-config" [0x140]: "Binary", "particle_behaviors_lut", "particles" # [0xAA6C20, 0xAA9B00] = Unknown. -# [0x2EE0]: "Binary", "particle_behaviors", "particles" include: "extract-particles/particle_behaviors-us-1.0.extract-config" -# [0xAA9B00, 0xAAAB10] = Unknown. -[0x1010]: "Binary", "unknown", "bin" +# [0xAA9B00, 0xAAAB00] = Unknown. +include: "extract-fonts/fonts-us-1.0.extract-config" -# [0xAAAB10, 0xABBDA0] = Unused font? -[0x11290]: "Binary", "unknown_4bpp_font_192x732", "bin" +# [0xAAAB00, 0xABBDA0] = Unused fontsheet? +[0x112A0]: "Binary", "unknown_4bpp_fontsheet_192x732", "fonts" # [0xABBDA0, 0xABBDC0] = Unknown. [0x20]: "Binary", "unknown", "bin" diff --git a/extract-ver/extract-fonts/fonts-us-1.0.extract-config b/extract-ver/extract-fonts/fonts-us-1.0.extract-config new file mode 100644 index 00000000..0d09e7ff --- /dev/null +++ b/extract-ver/extract-fonts/fonts-us-1.0.extract-config @@ -0,0 +1,6 @@ +# Part of the "Diddy Kong Racing (USA v1.0)" config + +[0x400]: "Binary", "FunFont", "fonts" +[0x400]: "Binary", "SmallFont", "fonts" +[0x400]: "Binary", "BigFont", "fonts" +[0x400]: "Binary", "SubtitleFont", "fonts"