From 2d399f81a29bef8c97e2dc1cc7b5edac8f348f8f Mon Sep 17 00:00:00 2001 From: David Benepe Date: Fri, 26 Jun 2020 16:37:04 -0500 Subject: [PATCH] Added T.T. Ghosts to assets directory. --- Makefile | 59 ++++++++++--------- asm/assets/assets.s | 21 +++++++ extract-ver/dkr-us-1.0.extract-config | 7 ++- .../tt_ghosts-us-1.0.extract-config | 24 ++++++++ 4 files changed, 82 insertions(+), 29 deletions(-) create mode 100644 extract-ver/extract-tt_ghosts/tt_ghosts-us-1.0.extract-config diff --git a/Makefile b/Makefile index ec19387f..4ed82078 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 ucode +ASSETS_DIRS := animations audio billboards bin cheats levels objects particles text textures textures/2d textures/3d tt_ghosts ucode S_FILES := $(foreach dir,$(ASM_DIRS),$(wildcard $(dir)/*.s)) @@ -75,21 +75,11 @@ ASSETS_DIR = assets/us_1.0 ASSETS_OBJCOPY = $(CROSS)objcopy --input-target=binary --output-target=binary -TEXTURES_IN_DIR = $(ASSETS_DIR)/textures -TEXTURES_2D_IN_DIR = $(ASSETS_DIR)/textures/2d -TEXTURES_3D_IN_DIR = $(ASSETS_DIR)/textures/3d -TEXTURES_OUT_DIR = $(BUILD_DIR)/textures -TEXTURES_2D_OUT_DIR = $(BUILD_DIR)/textures/2d -TEXTURES_3D_OUT_DIR = $(BUILD_DIR)/textures/3d -TEXTURES_BIN = $(wildcard $(TEXTURES_IN_DIR)/*.bin) -TEXTURES_2D = $(wildcard $(TEXTURES_2D_IN_DIR)/*.png) -TEXTURES_3D = $(wildcard $(TEXTURES_3D_IN_DIR)/*.png) -TEXTURES_BUILT = $(patsubst $(TEXTURES_IN_DIR)/%.bin,$(TEXTURES_OUT_DIR)/%.bin,$(TEXTURES_BIN)) -TEXTURES_BUILT += $(patsubst $(TEXTURES_2D_IN_DIR)/%.png,$(TEXTURES_2D_OUT_DIR)/%.bin,$(TEXTURES_2D)) -TEXTURES_BUILT += $(patsubst $(TEXTURES_3D_IN_DIR)/%.png,$(TEXTURES_3D_OUT_DIR)/%.bin,$(TEXTURES_3D)) -#TEXTURES_BUILT = $(TEXTURES_BIN_BUILT) $(TEXTURES_2D_BUILT) $(TEXTURES_3D_BUILT) - -#$(info TEXTURES_BUILT is $(TEXTURES_BUILT)) +ANIMATIONS_IN_DIR = $(ASSETS_DIR)/animations +ANIMATIONS_OUT_DIR = $(BUILD_DIR)/animations +ANIMATIONS = $(wildcard $(ANIMATIONS_IN_DIR)/*.bin $(ANIMATIONS_IN_DIR)/*.cbin) +ANIMATIONS_BUILT = $(patsubst $(ANIMATIONS_IN_DIR)/%.bin,$(ANIMATIONS_OUT_DIR)/%.bin,$(ANIMATIONS)) +ANIMATIONS_BUILT += $(patsubst $(ANIMATIONS_IN_DIR)/%.cbin,$(ANIMATIONS_OUT_DIR)/%.cbin,$(ANIMATIONS)) AUDIO_IN_DIR = $(ASSETS_DIR)/audio AUDIO_OUT_DIR = $(BUILD_DIR)/audio @@ -106,11 +96,10 @@ BILLBOARDS_OUT_DIR = $(BUILD_DIR)/billboards BILLBOARDS = $(wildcard $(BILLBOARDS_IN_DIR)/*.bin) BILLBOARDS_BUILT := $(patsubst $(BILLBOARDS_IN_DIR)/%.bin,$(BILLBOARDS_OUT_DIR)/%.bin,$(BILLBOARDS)) -ANIMATIONS_IN_DIR = $(ASSETS_DIR)/animations -ANIMATIONS_OUT_DIR = $(BUILD_DIR)/animations -ANIMATIONS = $(wildcard $(ANIMATIONS_IN_DIR)/*.bin $(ANIMATIONS_IN_DIR)/*.cbin) -ANIMATIONS_BUILT = $(patsubst $(ANIMATIONS_IN_DIR)/%.bin,$(ANIMATIONS_OUT_DIR)/%.bin,$(ANIMATIONS)) -ANIMATIONS_BUILT += $(patsubst $(ANIMATIONS_IN_DIR)/%.cbin,$(ANIMATIONS_OUT_DIR)/%.cbin,$(ANIMATIONS)) +CHEATS_IN_DIR = $(ASSETS_DIR)/cheats +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))) LEVELS_IN_DIR = $(ASSETS_DIR)/levels LEVELS_OUT_DIR = $(BUILD_DIR)/levels @@ -134,17 +123,30 @@ TEXT_OUT_DIR = $(BUILD_DIR)/text TEXT = $(wildcard $(TEXT_IN_DIR)/*.bin) TEXT_BUILT := $(patsubst $(TEXT_IN_DIR)/%.bin,$(TEXT_OUT_DIR)/%.bin,$(TEXT)) +TEXTURES_IN_DIR = $(ASSETS_DIR)/textures +TEXTURES_2D_IN_DIR = $(ASSETS_DIR)/textures/2d +TEXTURES_3D_IN_DIR = $(ASSETS_DIR)/textures/3d +TEXTURES_OUT_DIR = $(BUILD_DIR)/textures +TEXTURES_2D_OUT_DIR = $(BUILD_DIR)/textures/2d +TEXTURES_3D_OUT_DIR = $(BUILD_DIR)/textures/3d +TEXTURES_BIN = $(wildcard $(TEXTURES_IN_DIR)/*.bin) +TEXTURES_2D = $(wildcard $(TEXTURES_2D_IN_DIR)/*.png) +TEXTURES_3D = $(wildcard $(TEXTURES_3D_IN_DIR)/*.png) +TEXTURES_BUILT = $(patsubst $(TEXTURES_IN_DIR)/%.bin,$(TEXTURES_OUT_DIR)/%.bin,$(TEXTURES_BIN)) +TEXTURES_BUILT += $(patsubst $(TEXTURES_2D_IN_DIR)/%.png,$(TEXTURES_2D_OUT_DIR)/%.bin,$(TEXTURES_2D)) +TEXTURES_BUILT += $(patsubst $(TEXTURES_3D_IN_DIR)/%.png,$(TEXTURES_3D_OUT_DIR)/%.bin,$(TEXTURES_3D)) + +TT_GHOSTS_IN_DIR = $(ASSETS_DIR)/tt_ghosts +TT_GHOSTS_OUT_DIR = $(BUILD_DIR)/tt_ghosts +TT_GHOSTS = $(wildcard $(TT_GHOSTS_IN_DIR)/*.bin) +TT_GHOSTS_BUILT := $(patsubst $(TT_GHOSTS_IN_DIR)/%.bin,$(TT_GHOSTS_OUT_DIR)/%.bin,$(TT_GHOSTS)) + UCODE_IN_DIR = $(ASSETS_DIR)/ucode UCODE_OUT_DIR = $(BUILD_DIR)/ucode UCODE = $(wildcard $(UCODE_IN_DIR)/*.bin) UCODE_BUILT := $(patsubst $(UCODE_IN_DIR)/%.bin,$(UCODE_OUT_DIR)/%.bin,$(UCODE)) -CHEATS_IN_DIR = $(ASSETS_DIR)/cheats -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))) - -ALL_ASSETS_BUILT := $(ANIMATIONS_BUILT) $(AUDIO_BUILT) $(BILLBOARDS_BUILT) $(BINS_BUILT) $(CHEATS_BUILT) $(LEVELS_BUILT) $(OBJECTS_BUILT) $(TEXTURES_BUILT) $(PARTICLES_BUILT) $(TEXT_BUILT) $(UCODE_BUILT) +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) ######################## Targets ############################# @@ -211,6 +213,9 @@ $(PARTICLES_OUT_DIR)/%.bin: $(PARTICLES_IN_DIR)/%.bin $(TEXT_OUT_DIR)/%.bin: $(TEXT_IN_DIR)/%.bin $(ASSETS_OBJCOPY) $^ $@ + +$(TT_GHOSTS_OUT_DIR)/%.bin: $(TT_GHOSTS_IN_DIR)/%.bin + $(ASSETS_OBJCOPY) $^ $@ $(UCODE_OUT_DIR)/%.bin: $(UCODE_IN_DIR)/%.bin $(ASSETS_OBJCOPY) $^ $@ diff --git a/asm/assets/assets.s b/asm/assets/assets.s index f8740e2c..54f07047 100755 --- a/asm/assets/assets.s +++ b/asm/assets/assets.s @@ -4173,3 +4173,24 @@ .incbin "./build/bin/unknown.aa9b00.bin" .incbin "./build/bin/unknown_4bpp_font_192x732.aaab10.bin" .incbin "./build/bin/unknown.abbda0.bin" +.incbin "./build/tt_ghosts/ttGhostsHeader.abbdc0.bin" +.incbin "./build/tt_ghosts/ttGhost_FossilCanyon.abbe70.bin" +.incbin "./build/tt_ghosts/ttGhost_PirateLagoon.abc830.bin" +.incbin "./build/tt_ghosts/ttGhost_AncientLake.abd1e0.bin" +.incbin "./build/tt_ghosts/ttGhost_WalrusCove.abd920.bin" +.incbin "./build/tt_ghosts/ttGhost_HotTopVolcano.abe690.bin" +.incbin "./build/tt_ghosts/ttGhost_WhaleBay.abf070.bin" +.incbin "./build/tt_ghosts/ttGhost_SnowballValley.abf840.bin" +.incbin "./build/tt_ghosts/ttGhost_CrescentIsland.ac0020.bin" +.incbin "./build/tt_ghosts/ttGhost_EverfrostPeak.ac0ab0.bin" +.incbin "./build/tt_ghosts/ttGhost_SpaceportAlpha.ac1610.bin" +.incbin "./build/tt_ghosts/ttGhost_SpacedustAlley.ac2380.bin" +.incbin "./build/tt_ghosts/ttGhost_GreenwoodVillage.ac3070.bin" +.incbin "./build/tt_ghosts/ttGhost_BoulderCanyon.ac3b40.bin" +.incbin "./build/tt_ghosts/ttGhost_WindmillPlains.ac4a60.bin" +.incbin "./build/tt_ghosts/ttGhost_FrostyVillage.ac5b50.bin" +.incbin "./build/tt_ghosts/ttGhost_JungleFalls.ac65a0.bin" +.incbin "./build/tt_ghosts/ttGhost_TreasureCaves.ac6cb0.bin" +.incbin "./build/tt_ghosts/ttGhost_HauntedWoods.ac73d0.bin" +.incbin "./build/tt_ghosts/ttGhost_DarkmoonCaverns.ac7b50.bin" +.incbin "./build/tt_ghosts/ttGhost_StarCity.ac89b0.bin" diff --git a/extract-ver/dkr-us-1.0.extract-config b/extract-ver/dkr-us-1.0.extract-config index a1ae20f7..f1955e4b 100755 --- a/extract-ver/dkr-us-1.0.extract-config +++ b/extract-ver/dkr-us-1.0.extract-config @@ -195,8 +195,11 @@ include: "extract-particles/particle_behaviors-us-1.0.extract-config" # [0xAAAB10, 0xABBDA0] = Unused font? [0x11290]: "Binary", "unknown_4bpp_font_192x732", "bin" -# [0xABBDA0, 0xAC9630] = Unknown. -[0xD890]: "Binary", "unknown", "bin" +# [0xABBDA0, 0xABBDC0] = Unknown. +[0x20]: "Binary", "unknown", "bin" + +# [0xABBDC0, 0xAC9630] = T.T. Ghosts +include: "extract-tt_ghosts/tt_ghosts-us-1.0.extract-config" # [0xAC9630, 0xC00000] = 0xFF padding [0x1369D0]: "NoExtract" diff --git a/extract-ver/extract-tt_ghosts/tt_ghosts-us-1.0.extract-config b/extract-ver/extract-tt_ghosts/tt_ghosts-us-1.0.extract-config new file mode 100644 index 00000000..ddcafc67 --- /dev/null +++ b/extract-ver/extract-tt_ghosts/tt_ghosts-us-1.0.extract-config @@ -0,0 +1,24 @@ +# Part of the "Diddy Kong Racing (USA v1.0)" config + +[0x00B0]: "Binary", "ttGhostsHeader", "tt_ghosts" + +[0x09C0]: "Binary", "ttGhost_FossilCanyon", "tt_ghosts" +[0x09B0]: "Binary", "ttGhost_PirateLagoon", "tt_ghosts" +[0x0740]: "Binary", "ttGhost_AncientLake", "tt_ghosts" +[0x0D70]: "Binary", "ttGhost_WalrusCove", "tt_ghosts" +[0x09E0]: "Binary", "ttGhost_HotTopVolcano", "tt_ghosts" +[0x07D0]: "Binary", "ttGhost_WhaleBay", "tt_ghosts" +[0x07E0]: "Binary", "ttGhost_SnowballValley", "tt_ghosts" +[0x0A90]: "Binary", "ttGhost_CrescentIsland", "tt_ghosts" +[0x0B60]: "Binary", "ttGhost_EverfrostPeak", "tt_ghosts" +[0x0D70]: "Binary", "ttGhost_SpaceportAlpha", "tt_ghosts" +[0x0CF0]: "Binary", "ttGhost_SpacedustAlley", "tt_ghosts" +[0x0AD0]: "Binary", "ttGhost_GreenwoodVillage", "tt_ghosts" +[0x0F20]: "Binary", "ttGhost_BoulderCanyon", "tt_ghosts" +[0x10F0]: "Binary", "ttGhost_WindmillPlains", "tt_ghosts" +[0x0A50]: "Binary", "ttGhost_FrostyVillage", "tt_ghosts" +[0x0710]: "Binary", "ttGhost_JungleFalls", "tt_ghosts" +[0x0720]: "Binary", "ttGhost_TreasureCaves", "tt_ghosts" +[0x0780]: "Binary", "ttGhost_HauntedWoods", "tt_ghosts" +[0x0E60]: "Binary", "ttGhost_DarkmoonCaverns", "tt_ghosts" +[0x0C80]: "Binary", "ttGhost_StarCity", "tt_ghosts" \ No newline at end of file