From 3dfbc43d8760c4583c8f4d310b7e340c885590ae Mon Sep 17 00:00:00 2001 From: coco875 <59367621+coco875@users.noreply.github.com> Date: Thu, 18 Apr 2024 16:20:39 +0200 Subject: [PATCH 1/2] reduce verbose of command --- Makefile | 45 ++++++++++--------- assets/include/blueshell.mk | 12 ++--- assets/include/bomb.mk | 10 +++-- assets/include/character_portraits.mk | 16 ++++--- .../include/character_select/bowser_select.mk | 9 ++-- .../character_select/donkeykong_select.mk | 9 ++-- .../include/character_select/luigi_select.mk | 9 ++-- .../include/character_select/mario_select.mk | 9 ++-- .../include/character_select/peach_select.mk | 9 ++-- .../include/character_select/toad_select.mk | 9 ++-- .../include/character_select/wario_select.mk | 9 ++-- .../include/character_select/yoshi_select.mk | 9 ++-- assets/include/course_outlines.mk | 9 ++-- assets/include/course_previews.mk | 9 ++-- assets/include/courses/banshee_boardwalk.mk | 17 ++++--- assets/include/courses/bowsers_castle.mk | 10 +++-- assets/include/courses/choco_mountain.mk | 7 +-- assets/include/courses/dks_jungle_parkway.mk | 12 ++--- assets/include/courses/frappe_snowland.mk | 18 +++++--- assets/include/courses/kalimari_desert.mk | 12 ++--- assets/include/courses/koopa_troopa_beach.mk | 10 +++-- assets/include/courses/luigi_raceway.mk | 7 +-- assets/include/courses/mario_raceway.mk | 12 ++--- assets/include/courses/moo_moo_farm.mk | 21 +++++---- assets/include/courses/rainbow_road.mk | 31 ++++++++----- assets/include/courses/royal_raceway.mk | 7 +-- assets/include/courses/sherbet_land.mk | 10 +++-- assets/include/courses/toads_turnpike.mk | 7 +-- assets/include/courses/wario_stadium.mk | 7 +-- assets/include/courses/yoshi_valley.mk | 10 +++-- assets/include/debug_font.mk | 10 +++-- assets/include/ending_ceremony.mk | 7 +-- assets/include/finish_line_banner.mk | 12 ++--- assets/include/greenshell.mk | 12 ++--- assets/include/hud_type_c.mk | 19 +++++--- assets/include/item_window.mk | 10 +++-- assets/include/karts/bowser_kart.mk | 12 ++--- assets/include/karts/donkeykong_kart.mk | 12 ++--- assets/include/karts/luigi_kart.mk | 12 ++--- assets/include/karts/mario_kart.mk | 12 ++--- assets/include/karts/peach_kart.mk | 12 ++--- assets/include/karts/toad_kart.mk | 12 ++--- assets/include/karts/wario_kart.mk | 12 ++--- assets/include/karts/yoshi_kart.mk | 12 ++--- assets/include/lakitu/bluelight.mk | 10 +++-- assets/include/lakitu/checkeredflag.mk | 10 +++-- assets/include/lakitu/finallap.mk | 10 +++-- assets/include/lakitu/fishing.mk | 10 +++-- assets/include/lakitu/nolights.mk | 10 +++-- assets/include/lakitu/redlights.mk | 10 +++-- assets/include/lakitu/reverse.mk | 10 +++-- assets/include/lakitu/secondlap.mk | 10 +++-- assets/include/minimap_icons.mk | 7 +-- assets/include/onomatopoeia.mk | 12 ++--- assets/include/other_textures.mk | 6 ++- assets/include/player_emblems.mk | 10 +++-- assets/include/startup_logo.mk | 7 +-- assets/include/trees.mk | 12 ++--- assets/include/unused_traffic_light.mk | 10 +++-- 59 files changed, 400 insertions(+), 281 deletions(-) diff --git a/Makefile b/Makefile index 1526f6f14b..7e9335c806 100644 --- a/Makefile +++ b/Makefile @@ -423,12 +423,12 @@ endif assets: @echo "Extracting torch assets..." - @$(TORCH) code $(BASEROM) - @$(TORCH) header $(BASEROM) - @$(TORCH) modding export $(BASEROM) + $(V)$(TORCH) code $(BASEROM) + $(V)$(TORCH) header $(BASEROM) + $(V)$(TORCH) modding export $(BASEROM) doc: - $(PYTHON) $(TOOLS_DIR)/doxygen_symbol_gen.py + $(V)$(PYTHON) $(TOOLS_DIR)/doxygen_symbol_gen.py doxygen @$(PRINT) "$(GREEN)Documentation generated in docs/html$(NO_COL)\n" @$(PRINT) "$(GREEN)Results can be viewed by opening docs/html/index.html in a web browser$(NO_COL)\n" @@ -438,7 +438,7 @@ clean: distclean: distclean_assets $(RM) -r $(BUILD_DIR_BASE) - ./extract_assets.py --clean + $(PYTHON) extract_assets.py --clean make -C $(TOOLS_DIR) clean distclean_assets: ; @@ -458,10 +458,11 @@ DUMMY != mkdir -p $(ALL_DIRS) # RGBA32, RGBA16, IA16, IA8, IA4, IA1, I8, I4 $(BUILD_DIR)/%: %.png - $(N64GRAPHICS) -i $@ -g $< -f $(lastword $(subst ., ,$@)) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -f $(lastword $(subst ., ,$@)) $(BUILD_DIR)/textures/%.mio0: $(BUILD_DIR)/textures/% - $(MIO0TOOL) -c $< $@ + $(V)$(MIO0TOOL) -c $< $@ ASSET_INCLUDES := $(shell find $(ASSET_DIR)/include -type f -name "*.mk") @@ -483,14 +484,14 @@ $(BUILD_DIR)/%.mio0.o: $(BUILD_DIR)/%.mio0.s $(BUILD_DIR)/%.mio0.s: $(BUILD_DIR)/%.mio0 $(call print,Generating mio0 asm:,$<,$@) - $(PRINT) ".section .data\n\n.balign 4\n\n.incbin \"$<\"\n" > $@ + $(V)$(PRINT) ".section .data\n\n.balign 4\n\n.incbin \"$<\"\n" > $@ $(BUILD_DIR)/src/crash_screen.o: src/crash_screen.c @$(PRINT) "$(GREEN)Compiling Crash Screen: $(BLUE)$@ $(NO_COL)\n" $(V)$(N64GRAPHICS) -i $(BUILD_DIR)/textures/crash_screen/crash_screen_font.ia1.inc.c -g textures/crash_screen/crash_screen_font.ia1.png -f ia1 -s u8 @$(CC_CHECK) $(CC_CHECK_CFLAGS) -MMD -MP -MT $@ -MF $(BUILD_DIR)/$*.d $< $(V)$(CC) -c $(CFLAGS) -o $@ $< - $(PYTHON) $(TOOLS_DIR)/set_o32abi_bit.py $@ + $(V)$(PYTHON) $(TOOLS_DIR)/set_o32abi_bit.py $@ #==============================================================================# # Common Textures Segment Generation # @@ -502,10 +503,12 @@ TEXTURE_FILES_TLUT := $(foreach dir,$(TEXTURE_DIRS)/tlut,$(subst .png, , $(wildc $(TEXTURE_FILES): + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $(BUILD_DIR)/$@.inc.c -g $@.png -f $(lastword $(subst ., ,$@)) -s u8 # TLUT $(TEXTURE_FILES_TLUT): + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $(BUILD_DIR)/$@.inc.c -g $@.png -f $(lastword $(subst ., ,$@)) -s u8 -c $(lastword $(subst ., ,$(subst .$(lastword $(subst ., ,$(TEXTURE_FILES_TLUT))), ,$(TEXTURE_FILES_TLUT)))) -p $(BUILD_DIR)/$@.tlut.inc.c # common textures @@ -513,7 +516,7 @@ $(BUILD_DIR)/assets/code/common_data/common_data.o: assets/code/common_data/comm @$(PRINT) "$(GREEN)Compiling Common Textures: $(BLUE)$@ $(NO_COL)\n" @$(CC_CHECK) $(CC_CHECK_CFLAGS) -MMD -MP -MT $@ -MF $(BUILD_DIR)/$*.d $< $(V)$(CC) -c $(CFLAGS) -o $@ $< - $(PYTHON) $(TOOLS_DIR)/set_o32abi_bit.py $@ + $(V)$(PYTHON) $(TOOLS_DIR)/set_o32abi_bit.py $@ @@ -565,7 +568,7 @@ COURSE_GEOGRAPHY_TARGETS := $(foreach dir,$(COURSE_DIRS),$(BUILD_DIR)/$(dir)/cou # Course vertices and displaylists are included together due to no alignment between the two files. %/course_geography.mio0.s: %/course_vertices.inc.mio0 %/course_displaylists_packed.inc.bin - $(PRINT) ".include \"macros.inc\"\n\n.section .data\n\n.balign 4\n\nglabel d_course_$(lastword $(subst /, ,$*))_vertex\n\n.incbin \"$(@D)/course_vertices.inc.mio0\"\n\n.balign 4\n\nglabel d_course_$(lastword $(subst /, ,$*))_packed\n\n.incbin \"$(@D)/course_displaylists_packed.inc.bin\"\n\n.balign 0x10\n" > $@ + $(V)$(PRINT) ".include \"macros.inc\"\n\n.section .data\n\n.balign 4\n\nglabel d_course_$(lastword $(subst /, ,$*))_vertex\n\n.incbin \"$(@D)/course_vertices.inc.mio0\"\n\n.balign 4\n\nglabel d_course_$(lastword $(subst /, ,$*))_packed\n\n.incbin \"$(@D)/course_displaylists_packed.inc.bin\"\n\n.balign 0x10\n" > $@ @@ -589,7 +592,7 @@ COURSE_DATA_TARGETS := $(foreach dir,$(COURSE_DIRS),$(BUILD_DIR)/$(dir)/course_d $(V)$(MIO0TOOL) -c $< $@ %/course_data.mio0.s: %/course_data.mio0 - $(PRINT) ".include \"macros.inc\"\n\n.section .data\n\n.balign 4\n\n.incbin \"$<\"\n\n" > $@ + $(V)$(PRINT) ".include \"macros.inc\"\n\n.section .data\n\n.balign 4\n\n.incbin \"$<\"\n\n" > $@ #==============================================================================# @@ -597,13 +600,13 @@ COURSE_DATA_TARGETS := $(foreach dir,$(COURSE_DIRS),$(BUILD_DIR)/$(dir)/course_d #==============================================================================# $(BUILD_DIR)/%.jp.c: %.c $(call print,Encoding:,$<,$@) - iconv -t EUC-JP -f UTF-8 $< > $@ + $(V)iconv -t EUC-JP -f UTF-8 $< > $@ $(BUILD_DIR)/%.o: %.c $(call print,Compiling:,$<,$@) $(V)$(CC_CHECK) $(CC_CHECK_CFLAGS) -MMD -MP -MT $@ -MF $(BUILD_DIR)/$*.d $< $(V)$(CC) -c $(CFLAGS) -o $@ $< - $(PYTHON) $(TOOLS_DIR)/set_o32abi_bit.py $@ + $(V)$(PYTHON) $(TOOLS_DIR)/set_o32abi_bit.py $@ $(BUILD_DIR)/%.o: $(BUILD_DIR)/%.c $(call print,Compiling:,$<,$@) @@ -611,7 +614,7 @@ $(BUILD_DIR)/%.o: $(BUILD_DIR)/%.c $(V)$(CC) -c $(CFLAGS) -o $@ $< $(BUILD_DIR)/%.o: %.s $(MIO0_FILES) $(RAW_TEXTURE_FILES) - $(AS) $(ASFLAGS) -o $@ $< + $(V)$(AS) $(ASFLAGS) -o $@ $< $(EUC_JP_FILES:%.c=$(BUILD_DIR)/%.jp.o): CC := $(PYTHON) $(TOOLS_DIR)/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) -- @@ -667,7 +670,7 @@ LDFLAGS += -R $(BUILD_DIR)/assets/code/ceremony_data/ceremony_data.elf $(V)$(MIO0TOOL) -c $< $@ %/ceremony_data.mio0.s: %/ceremony_data.mio0 - $(PRINT) ".include \"macros.inc\"\n\n.data\n\n.balign 4\n\nglabel ceremony_data\n\n.incbin \"$<\"\n\n.balign 16\nglabel ceremonyData_end\n" > $@ + $(V)$(PRINT) ".include \"macros.inc\"\n\n.data\n\n.balign 4\n\nglabel ceremony_data\n\n.incbin \"$<\"\n\n.balign 16\nglabel ceremonyData_end\n" > $@ #==============================================================================# @@ -687,7 +690,7 @@ LDFLAGS += -R $(BUILD_DIR)/assets/code/startup_logo/startup_logo.elf $(V)$(MIO0TOOL) -c $< $@ %/startup_logo.mio0.s: %/startup_logo.mio0 - $(PRINT) ".include \"macros.inc\"\n\n.data\n\n.balign 4\n\nglabel startup_logo\n\n.incbin \"$<\"\n\n.balign 16\n\nglabel startupLogo_end\n" > $@ + $(V)$(PRINT) ".include \"macros.inc\"\n\n.data\n\n.balign 4\n\nglabel startup_logo\n\n.incbin \"$<\"\n\n.balign 16\n\nglabel startupLogo_end\n" > $@ #==============================================================================# # Compile Common Textures # @@ -706,7 +709,7 @@ LDFLAGS += -R $(BUILD_DIR)/assets/code/common_data/common_data.elf $(V)$(MIO0TOOL) -c $< $@ %/common_data.mio0.s: %/common_data.mio0 - $(PRINT) ".include \"macros.inc\"\n\n.section .data\n\n.balign 4\n\n.incbin \"$<\"\n\n" > $@ + $(V)$(PRINT) ".include \"macros.inc\"\n\n.section .data\n\n.balign 4\n\n.incbin \"$<\"\n\n" > $@ @@ -729,13 +732,13 @@ $(ROM): $(ELF) $(call print,Building ROM:,$<,$@) $(V)$(OBJCOPY) $(OBJCOPYFLAGS) $< $(@:.z64=.bin) -O binary $(V)$(N64CKSUM) $(@:.z64=.bin) $@ - $(PYTHON) $(TOOLS_DIR)/doxygen_symbol_gen.py + $(V)$(PYTHON) $(TOOLS_DIR)/doxygen_symbol_gen.py $(BUILD_DIR)/$(TARGET).hex: $(TARGET).z64 - xxd $< > $@ + $(V)xxd $< > $@ $(BUILD_DIR)/$(TARGET).objdump: $(ELF) - $(OBJDUMP) -D $< > $@ + $(V)$(OBJDUMP) -D $< > $@ .PHONY: all clean distclean distclean_assets default diff test load assets diff --git a/assets/include/blueshell.mk b/assets/include/blueshell.mk index 8eb4456272..6d75741d4d 100644 --- a/assets/include/blueshell.mk +++ b/assets/include/blueshell.mk @@ -17,21 +17,23 @@ BLUESHELL_EXPORT_SENTINEL := $(BLUESHELL_DIR)/.export $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(BLUESHELL_FRAMES:%.png=%.mio0) $(BLUESHELL_FRAMES:%.png=%.mio0): %.mio0 : %.bin - $(MIO0TOOL) -c $< $@ + $(V)$(MIO0TOOL) -c $< $@ $(BLUESHELL_FRAMES:%.png=%.bin): %.bin : %.png - $(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(BLUESHELL_PALETTE) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(BLUESHELL_PALETTE) $(BUILD_DIR)/src/data/common_textures.o: $(BLUESHELL_PALETTE:%.png=%.inc.c) $(BLUESHELL_PALETTE:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(BLUESHELL_FRAMES) $(BLUESHELL_PALETTE): $(BLUESHELL_EXPORT_SENTINEL) ; $(BLUESHELL_EXPORT_SENTINEL): $(ASSET_DIR)/blueshell.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_blueshell distclean_blueshell: diff --git a/assets/include/bomb.mk b/assets/include/bomb.mk index 0266bf6c6d..ec237f0b9f 100644 --- a/assets/include/bomb.mk +++ b/assets/include/bomb.mk @@ -13,16 +13,18 @@ BOMB_EXPORT_SENTINEL := $(BOMB_DIR)/.export $(BUILD_DIR)/src/data/common_textures.o: $(BOMB_FRAMES:%.png=%.inc.c) $(BOMB_PALETTE:%.png=%.inc.c) $(BOMB_FRAMES:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(BOMB_PALETTE) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(BOMB_PALETTE) $(BOMB_PALETTE:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(BOMB_FRAMES) $(BOMB_PALETTE): $(BOMB_EXPORT_SENTINEL) ; $(BOMB_EXPORT_SENTINEL): $(ASSET_DIR)/bomb.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_bomb distclean_bomb: diff --git a/assets/include/character_portraits.mk b/assets/include/character_portraits.mk index 37414f8a8d..98e3be659d 100644 --- a/assets/include/character_portraits.mk +++ b/assets/include/character_portraits.mk @@ -35,22 +35,26 @@ $(BUILD_DIR)/src/data/common_textures.o: $(PORTRAIT_PNG:%.png=%.inc.c) $(PORTRAI $(BUILD_DIR)/src/data/common_textures.o: $(SPECIAL_PORTRAIT_PNG:%.png=%.inc.c) $(SPECIAL_PORTRAIT_PALETTE:%.png=%.inc.c) $(PORTRAIT_PNG:%.png=%.inc.c): $(PORTRAITS_DIR)/common_texture_portrait_%.inc.c : $(PORTRAITS_DIR)/common_texture_portrait_%.png - $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(PORTRAITS_DIR)/common_tlut_portrait_$*.png + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(PORTRAITS_DIR)/common_tlut_portrait_$*.png $(SPECIAL_PORTRAIT_PNG:%.png=%.inc.c): $(PORTRAITS_DIR)/common_texture_portrait_%.inc.c : $(PORTRAITS_DIR)/common_texture_portrait_%.png - $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(SPECIAL_PORTRAIT_PALETTE) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(SPECIAL_PORTRAIT_PALETTE) $(PORTRAIT_PALETTES:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(SPECIAL_PORTRAIT_PALETTE:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(PORTRAIT_PNG) $(SPECIAL_PORTRAIT_PNG) $(PORTRAIT_PALETTES) $(SPECIAL_PORTRAIT_PALETTE): $(PORTRAIT_EXPORT_SENTINEL) ; $(PORTRAIT_EXPORT_SENTINEL): $(ASSET_DIR)/character_portraits.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_character_portraits distclean_character_portraits: diff --git a/assets/include/character_select/bowser_select.mk b/assets/include/character_select/bowser_select.mk index 29def4fae5..bd835d9b83 100644 --- a/assets/include/character_select/bowser_select.mk +++ b/assets/include/character_select/bowser_select.mk @@ -24,16 +24,17 @@ BOWSER_SELECT_EXPORT_SENTINEL := $(BOWSER_SELECT_DIR)/.export $(BUILD_DIR)/data/course_player_selection.o: $(BOWSER_SELECT_PNG:%.png=%.mio0) $(BOWSER_SELECT_PNG:%.png=%.mio0) : %.mio0 : %.bin - $(MIO0TOOL) -c $< $@ + $(V)$(MIO0TOOL) -c $< $@ $(BOWSER_SELECT_PNG:%.png=%.bin) : %.bin : %.png - $(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(BOWSER_SELECT_PNG): $(BOWSER_SELECT_EXPORT_SENTINEL) ; $(BOWSER_SELECT_EXPORT_SENTINEL): $(ASSET_DIR)/character_select/bowser_select.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_bowser_select distclean_bowser_select: diff --git a/assets/include/character_select/donkeykong_select.mk b/assets/include/character_select/donkeykong_select.mk index fd9b1c8fa4..cdeda361d6 100644 --- a/assets/include/character_select/donkeykong_select.mk +++ b/assets/include/character_select/donkeykong_select.mk @@ -24,16 +24,17 @@ DONKEYKONG_SELECT_EXPORT_SENTINEL := $(DONKEYKONG_SELECT_DIR)/.export $(BUILD_DIR)/data/course_player_selection.o: $(DONKEYKONG_SELECT_PNG:%.png=%.mio0) $(DONKEYKONG_SELECT_PNG:%.png=%.mio0) : %.mio0 : %.bin - $(MIO0TOOL) -c $< $@ + $(V)$(MIO0TOOL) -c $< $@ $(DONKEYKONG_SELECT_PNG:%.png=%.bin) : %.bin : %.png - $(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(DONKEYKONG_SELECT_PNG): $(DONKEYKONG_SELECT_EXPORT_SENTINEL) ; $(DONKEYKONG_SELECT_EXPORT_SENTINEL): $(ASSET_DIR)/character_select/donkeykong_select.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_donkeykong_select distclean_donkeykong_select: diff --git a/assets/include/character_select/luigi_select.mk b/assets/include/character_select/luigi_select.mk index 0cff1075c4..65acce661a 100644 --- a/assets/include/character_select/luigi_select.mk +++ b/assets/include/character_select/luigi_select.mk @@ -24,16 +24,17 @@ LUIGI_SELECT_EXPORT_SENTINEL := $(LUIGI_SELECT_DIR)/.export $(BUILD_DIR)/data/course_player_selection.o: $(LUIGI_SELECT_PNG:%.png=%.mio0) $(LUIGI_SELECT_PNG:%.png=%.mio0) : %.mio0 : %.bin - $(MIO0TOOL) -c $< $@ + $(V)$(MIO0TOOL) -c $< $@ $(LUIGI_SELECT_PNG:%.png=%.bin) : %.bin : %.png - $(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(LUIGI_SELECT_PNG): $(LUIGI_SELECT_EXPORT_SENTINEL) ; $(LUIGI_SELECT_EXPORT_SENTINEL): $(ASSET_DIR)/character_select/luigi_select.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_luigi_select distclean_luigi_select: diff --git a/assets/include/character_select/mario_select.mk b/assets/include/character_select/mario_select.mk index fba5ae712a..431b8a5ddb 100644 --- a/assets/include/character_select/mario_select.mk +++ b/assets/include/character_select/mario_select.mk @@ -24,16 +24,17 @@ MARIO_SELECT_EXPORT_SENTINEL := $(MARIO_SELECT_DIR)/.export $(BUILD_DIR)/data/course_player_selection.o: $(MARIO_SELECT_PNG:%.png=%.mio0) $(MARIO_SELECT_PNG:%.png=%.mio0) : %.mio0 : %.bin - $(MIO0TOOL) -c $< $@ + $(V)$(MIO0TOOL) -c $< $@ $(MARIO_SELECT_PNG:%.png=%.bin) : %.bin : %.png - $(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(MARIO_SELECT_PNG): $(MARIO_SELECT_EXPORT_SENTINEL) ; $(MARIO_SELECT_EXPORT_SENTINEL): $(ASSET_DIR)/character_select/mario_select.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_mario_select distclean_mario_select: diff --git a/assets/include/character_select/peach_select.mk b/assets/include/character_select/peach_select.mk index 8694d51081..79745966f3 100644 --- a/assets/include/character_select/peach_select.mk +++ b/assets/include/character_select/peach_select.mk @@ -24,16 +24,17 @@ PEACH_SELECT_EXPORT_SENTINEL := $(PEACH_SELECT_DIR)/.export $(BUILD_DIR)/data/course_player_selection.o: $(PEACH_SELECT_PNG:%.png=%.mio0) $(PEACH_SELECT_PNG:%.png=%.mio0) : %.mio0 : %.bin - $(MIO0TOOL) -c $< $@ + $(V)$(MIO0TOOL) -c $< $@ $(PEACH_SELECT_PNG:%.png=%.bin) : %.bin : %.png - $(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(PEACH_SELECT_PNG): $(PEACH_SELECT_EXPORT_SENTINEL) ; $(PEACH_SELECT_EXPORT_SENTINEL): $(ASSET_DIR)/character_select/peach_select.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_peach_select distclean_peach_select: diff --git a/assets/include/character_select/toad_select.mk b/assets/include/character_select/toad_select.mk index 362b3ab5d5..c5f656edce 100644 --- a/assets/include/character_select/toad_select.mk +++ b/assets/include/character_select/toad_select.mk @@ -24,16 +24,17 @@ TOAD_SELECT_EXPORT_SENTINEL := $(TOAD_SELECT_DIR)/.export $(BUILD_DIR)/data/course_player_selection.o: $(TOAD_SELECT_PNG:%.png=%.mio0) $(TOAD_SELECT_PNG:%.png=%.mio0) : %.mio0 : %.bin - $(MIO0TOOL) -c $< $@ + $(V)$(MIO0TOOL) -c $< $@ $(TOAD_SELECT_PNG:%.png=%.bin) : %.bin : %.png - $(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(TOAD_SELECT_PNG): $(TOAD_SELECT_EXPORT_SENTINEL) ; $(TOAD_SELECT_EXPORT_SENTINEL): $(ASSET_DIR)/character_select/toad_select.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_toad_select distclean_toad_select: diff --git a/assets/include/character_select/wario_select.mk b/assets/include/character_select/wario_select.mk index a82b444af7..04ab633ae8 100644 --- a/assets/include/character_select/wario_select.mk +++ b/assets/include/character_select/wario_select.mk @@ -24,16 +24,17 @@ WARIO_SELECT_EXPORT_SENTINEL := $(WARIO_SELECT_DIR)/.export $(BUILD_DIR)/data/course_player_selection.o: $(WARIO_SELECT_PNG:%.png=%.mio0) $(WARIO_SELECT_PNG:%.png=%.mio0) : %.mio0 : %.bin - $(MIO0TOOL) -c $< $@ + $(V)$(MIO0TOOL) -c $< $@ $(WARIO_SELECT_PNG:%.png=%.bin) : %.bin : %.png - $(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(WARIO_SELECT_PNG): $(WARIO_SELECT_EXPORT_SENTINEL) ; $(WARIO_SELECT_EXPORT_SENTINEL): $(ASSET_DIR)/character_select/wario_select.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_wario_select distclean_wario_select: diff --git a/assets/include/character_select/yoshi_select.mk b/assets/include/character_select/yoshi_select.mk index a61ea6c10a..235bf3e04c 100644 --- a/assets/include/character_select/yoshi_select.mk +++ b/assets/include/character_select/yoshi_select.mk @@ -24,16 +24,17 @@ YOSHI_SELECT_EXPORT_SENTINEL := $(YOSHI_SELECT_DIR)/.export $(BUILD_DIR)/data/course_player_selection.o: $(YOSHI_SELECT_PNG:%.png=%.mio0) $(YOSHI_SELECT_PNG:%.png=%.mio0) : %.mio0 : %.bin - $(MIO0TOOL) -c $< $@ + $(V)$(MIO0TOOL) -c $< $@ $(YOSHI_SELECT_PNG:%.png=%.bin) : %.bin : %.png - $(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(YOSHI_SELECT_PNG): $(YOSHI_SELECT_EXPORT_SENTINEL) ; $(YOSHI_SELECT_EXPORT_SENTINEL): $(ASSET_DIR)/character_select/yoshi_select.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_yoshi_select distclean_yoshi_select: diff --git a/assets/include/course_outlines.mk b/assets/include/course_outlines.mk index 382255106f..f7eb3ea7a9 100644 --- a/assets/include/course_outlines.mk +++ b/assets/include/course_outlines.mk @@ -27,16 +27,17 @@ COURSE_OUTLINE_EXPORT_SENTINEL := $(COURSE_OUTLINE_DIR)/.export $(BUILD_DIR)/data/other_textures.o: $(COURSE_OUTLINE_PNG:%.png=%.mio0) $(COURSE_OUTLINE_PNG:%.png=%.mio0): %.mio0 : %.bin - $(MIO0TOOL) -c $< $@ + $(V)$(MIO0TOOL) -c $< $@ $(COURSE_OUTLINE_PNG:%.png=%.bin): %.bin : %.png - $(N64GRAPHICS) -i $@ -g $< -s raw -f i4 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f i4 $(COURSE_OUTLINE_PNG): $(COURSE_OUTLINE_EXPORT_SENTINEL) ; $(COURSE_OUTLINE_EXPORT_SENTINEL): $(ASSET_DIR)/course_outlines.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_course_outlines distclean_course_outlines: diff --git a/assets/include/course_previews.mk b/assets/include/course_previews.mk index deedcb477b..daf3ca5270 100644 --- a/assets/include/course_previews.mk +++ b/assets/include/course_previews.mk @@ -27,16 +27,17 @@ COURSE_PREVIEW_EXPORT_SENTINEL := $(COURSE_PREVIEW_DIR)/.export $(BUILD_DIR)/src/data/textures.o: $(COURSE_PREVIEW_PNG:%.png=%.mio0) $(COURSE_PREVIEW_PNG:%.png=%.mio0): %.mio0 : %.bin - $(MIO0TOOL) -c $< $@ + $(V)$(MIO0TOOL) -c $< $@ $(COURSE_PREVIEW_PNG:%.png=%.bin): %.bin : %.png - $(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(COURSE_PREVIEW_PNG): $(COURSE_PREVIEW_EXPORT_SENTINEL) ; $(COURSE_PREVIEW_EXPORT_SENTINEL): $(ASSET_DIR)/course_previews.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_course_previews distclean_course_previews: diff --git a/assets/include/courses/banshee_boardwalk.mk b/assets/include/courses/banshee_boardwalk.mk index fc8d675af5..20226665ea 100644 --- a/assets/include/courses/banshee_boardwalk.mk +++ b/assets/include/courses/banshee_boardwalk.mk @@ -49,7 +49,7 @@ BANSHEE_BOARDWALK_EXPORT_SENTINEL := $(BANSHEE_BOARDWALK_DIR)/.export $(BUILD_DIR)/data/other_textures.o: $(BANSHEE_BOARDWALK_DIR)/boo_frames.mio0 $(BANSHEE_BOARDWALK_DIR)/boo_frames.mio0: $(BANSHEE_BOARDWALK_DIR)/boo_frames.bin - $(MIO0TOOL) -c $< $@ + $(V)$(MIO0TOOL) -c $< $@ # Making a .c or .s file that includes the Boo frame data as .inc.c or .bin files, respectively, # would also work. @@ -60,28 +60,31 @@ $(BANSHEE_BOARDWALK_DIR)/boo_frames.mio0: $(BANSHEE_BOARDWALK_DIR)/boo_frames.bi CAT ?= cat $(BANSHEE_BOARDWALK_DIR)/boo_frames.bin: $(BANSHEE_BOARDWALK_BOO_FRAMES:%.png=%.bin) - $(CAT) $^ > $@ + $(V)$(CAT) $^ > $@ $(BANSHEE_BOARDWALK_BOO_FRAMES:%.png=%.bin): %.bin : %.png - $(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(BANSHEE_BOARDWALK_BOO_PALETTE) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(BANSHEE_BOARDWALK_BOO_PALETTE) $(BUILD_DIR)/courses/banshee_boardwalk/course_data.o: $(BANSHEE_BOARDWALK_BOO_PALETTE:%.png=%.inc.c) $(BUILD_DIR)/courses/banshee_boardwalk/course_data.o: $(BANSHEE_BOARDWALK_BAT_PALETTE:%.png=%.inc.c) $(BANSHEE_BOARDWALK_BAT_FRAMES:%.png=%.inc.c) $(BUILD_DIR)/courses/banshee_boardwalk/course_data.o: $(BANSHEE_BOARDWALK_PNG:%.png=%.inc.c) $(BANSHEE_BOARDWALK_BAT_FRAMES:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(BANSHEE_BOARDWALK_BAT_PALETTE) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(BANSHEE_BOARDWALK_BAT_PALETTE) $(BANSHEE_BOARDWALK_PNG:%.png=%.inc.c) $(BANSHEE_BOARDWALK_BOO_PALETTE:%.png=%.inc.c) $(BANSHEE_BOARDWALK_BAT_PALETTE:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(BANSHEE_BOARDWALK_BOO_PALETTE) $(BANSHEE_BOARDWALK_BOO_FRAMES): $(BANSHEE_BOARDWALK_EXPORT_SENTINEL) ; $(BANSHEE_BOARDWALK_BAT_PALETTE) $(BANSHEE_BOARDWALK_BAT_FRAMES): $(BANSHEE_BOARDWALK_EXPORT_SENTINEL) ; $(BANSHEE_BOARDWALK_PNG): $(BANSHEE_BOARDWALK_EXPORT_SENTINEL) ; $(BANSHEE_BOARDWALK_EXPORT_SENTINEL): $(ASSET_DIR)/courses/banshee_boardwalk.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_banshee_boardwalk distclean_banshee_boardwalk: diff --git a/assets/include/courses/bowsers_castle.mk b/assets/include/courses/bowsers_castle.mk index 15506e1bba..00b3f72ded 100644 --- a/assets/include/courses/bowsers_castle.mk +++ b/assets/include/courses/bowsers_castle.mk @@ -18,16 +18,18 @@ $(BUILD_DIR)/courses/bowsers_castle/course_data.o: $(THWOMP_FACE_FRAMES:%.png=%. $(BUILD_DIR)/courses/bowsers_castle/course_data.o: $(THOWMP_SIDE_PNG:%.png=%.inc.c) $(THOWMP_SIDE_PNG:%.png=%.inc.c) $(THWOMP_PALETTE:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(THWOMP_FACE_FRAMES:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(THWOMP_PALETTE) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(THWOMP_PALETTE) $(THWOMP_PALETTE) $(THWOMP_FACE_FRAMES) $(THOWMP_SIDE_PNG): $(BOWSERS_CASTLE_EXPORT_SENTINEL) ; $(BOWSERS_CASTLE_EXPORT_SENTINEL): $(ASSET_DIR)/courses/bowsers_castle.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_bowsers_castle distclean_bowsers_castle: diff --git a/assets/include/courses/choco_mountain.mk b/assets/include/courses/choco_mountain.mk index c3455aec7e..4a855f40b4 100644 --- a/assets/include/courses/choco_mountain.mk +++ b/assets/include/courses/choco_mountain.mk @@ -9,13 +9,14 @@ CHOCO_MOUNTAIN_EXPORT_SENTINEL := $(CHOCO_MOUNTAIN_DIR)/.export $(BUILD_DIR)/courses/choco_mountain/course_data.o: $(CHOCO_MOUNTAIN_PNG:%.png=%.inc.c) $(CHOCO_MOUNTAIN_PNG:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(CHOCO_MOUNTAIN_PNG): $(CHOCO_MOUNTAIN_EXPORT_SENTINEL) ; $(CHOCO_MOUNTAIN_EXPORT_SENTINEL): $(ASSET_DIR)/courses/choco_mountain.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_choco_mountain distclean_choco_mountain: diff --git a/assets/include/courses/dks_jungle_parkway.mk b/assets/include/courses/dks_jungle_parkway.mk index 433ef86a6e..e5c25deb40 100644 --- a/assets/include/courses/dks_jungle_parkway.mk +++ b/assets/include/courses/dks_jungle_parkway.mk @@ -27,23 +27,25 @@ DKS_JUNGLE_PARKWAY_EXPORT_SENTINEL := $(DKS_JUNGLE_PARKWAY_DIR)/.export $(BUILD_DIR)/data/other_textures.o: $(DKS_JUNGLE_PARKWAY_KIWANO_FRAMES:%.png=%.mio0) $(DKS_JUNGLE_PARKWAY_KIWANO_FRAMES:%.png=%.mio0): %.mio0 : %.bin - $(MIO0TOOL) -c $< $@ + $(V)$(MIO0TOOL) -c $< $@ $(DKS_JUNGLE_PARKWAY_KIWANO_FRAMES:%.png=%.bin): %.bin : %.png - $(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(DKS_JUNGLE_PARKWAY_KIWANO_PALETTE) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(DKS_JUNGLE_PARKWAY_KIWANO_PALETTE) $(BUILD_DIR)/courses/dks_jungle_parkway/course_data.o: $(DKS_JUNGLE_PARKWAY_KIWANO_PALETTE:%.png=%.inc.c) $(BUILD_DIR)/courses/dks_jungle_parkway/course_data.o: $(DKS_JUNGLE_PARKWAY_PNG:%.png=%.inc.c) $(DKS_JUNGLE_PARKWAY_PNG:%.png=%.inc.c) $(DKS_JUNGLE_PARKWAY_KIWANO_PALETTE:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(DKS_JUNGLE_PARKWAY_KIWANO_PALETTE) $(DKS_JUNGLE_PARKWAY_KIWANO_FRAMES): $(DKS_JUNGLE_PARKWAY_EXPORT_SENTINEL) ; $(DKS_JUNGLE_PARKWAY_PNG): $(DKS_JUNGLE_PARKWAY_EXPORT_SENTINEL) ; $(DKS_JUNGLE_PARKWAY_EXPORT_SENTINEL): $(ASSET_DIR)/courses/dks_jungle_parkway.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_dks_junk_parkway distclean_dks_junk_parkway: diff --git a/assets/include/courses/frappe_snowland.mk b/assets/include/courses/frappe_snowland.mk index 9f0df49b2c..e187ee3f6e 100644 --- a/assets/include/courses/frappe_snowland.mk +++ b/assets/include/courses/frappe_snowland.mk @@ -22,28 +22,32 @@ $(BUILD_DIR)/courses/frappe_snowland/course_data.o: $(FRAPPE_SNOWLAND_SNOWMAN_PA $(BUILD_DIR)/courses/frappe_snowland/course_data.o: $(FRAPPE_SNOWLAND_TREE_PALETTE:%.png=%.inc.c) $(FRAPPE_SNOWLAND_SNOWMAN_PNG:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(FRAPPE_SNOWLAND_SNOWMAN_PALETTE) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(FRAPPE_SNOWLAND_SNOWMAN_PALETTE) $(FRAPPE_SNOWLAND_SNOW_PNG:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(FRAPPE_SNOWLAND_SNOW_PALETTE) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(FRAPPE_SNOWLAND_SNOW_PALETTE) $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(FRAPPE_SNOWLAND_TREE_PNG:%.png=%.mio0) $(FRAPPE_SNOWLAND_TREE_PNG:%.png=%.mio0): %.mio0 : %.bin - $(MIO0TOOL) -c $< $@ + $(V)$(MIO0TOOL) -c $< $@ $(FRAPPE_SNOWLAND_TREE_PNG:%.png=%.bin): %.bin : %.png - $(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(FRAPPE_SNOWLAND_TREE_PALETTE) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(FRAPPE_SNOWLAND_TREE_PALETTE) $(FRAPPE_SNOWLAND_SNOWMAN_PALETTE:%.png=%.inc.c) $(FRAPPE_SNOWLAND_SNOW_PALETTE:%.png=%.inc.c) $(FRAPPE_SNOWLAND_TREE_PALETTE:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(FRAPPE_SNOWLAND_SNOWMAN_PNG) $(FRAPPE_SNOWLAND_SNOW_PNG) $(FRAPPE_SNOWLAND_TREE_PNG): $(FRAPPE_SNOWLAND_EXPORT_SENTINEL) ; $(FRAPPE_SNOWLAND_SNOWMAN_PALETTE) $(FRAPPE_SNOWLAND_SNOW_PALETTE) $(FRAPPE_SNOWLAND_TREE_PALETTE): $(FRAPPE_SNOWLAND_EXPORT_SENTINEL) ; $(FRAPPE_SNOWLAND_EXPORT_SENTINEL): $(ASSET_DIR)/courses/frappe_snowland.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_frappe_snowland distclean_frappe_snowland: diff --git a/assets/include/courses/kalimari_desert.mk b/assets/include/courses/kalimari_desert.mk index 6d447c1a6a..e58b627415 100644 --- a/assets/include/courses/kalimari_desert.mk +++ b/assets/include/courses/kalimari_desert.mk @@ -43,22 +43,24 @@ KALIMARI_DESERT_EXPORT_SENTINEL := $(KALIMARI_DESERT_DIR)/.export $(BUILD_DIR)/courses/kalimari_desert/course_data.o: $(KALIMARI_DESERT_PNG:%.png=%.inc.c) $(CACTUS_PALETTE_IMPORT:%.png=%.inc.c) $(KALIMARI_DESERT_PNG:%.png=%.inc.c) $(CACTUS_PALETTE_IMPORT:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(BUILD_DIR)/data/other_textures.o: $(CACTUS_PNG:%.png=%.mio0) $(CACTUS_PNG:%.png=%.mio0): %.mio0 : %.bin - $(MIO0TOOL) -c $< $@ + $(V)$(MIO0TOOL) -c $< $@ $(CACTUS_PNG:%.png=%.bin): %.bin : %.png - $(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(CACTUS_PALETTE) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(CACTUS_PALETTE) $(CACTUS_PALETTE) $(CACTUS_PALETTE_IMPORT) $(CACTUS_PNG): $(KALIMARI_DESERT_EXPORT_SENTINEL) ; $(KALIMARI_DESERT_PNG): $(KALIMARI_DESERT_EXPORT_SENTINEL) ; $(KALIMARI_DESERT_EXPORT_SENTINEL): $(ASSET_DIR)/courses/kalimari_desert.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_kalimari_desert distclean_kalimari_desert: diff --git a/assets/include/courses/koopa_troopa_beach.mk b/assets/include/courses/koopa_troopa_beach.mk index 790cf8c043..b2121d8252 100644 --- a/assets/include/courses/koopa_troopa_beach.mk +++ b/assets/include/courses/koopa_troopa_beach.mk @@ -24,16 +24,18 @@ $(BUILD_DIR)/courses/koopa_troopa_beach/course_data.o: $(KOOPA_TROOPA_BEACH_CRAB $(BUILD_DIR)/courses/koopa_troopa_beach/course_data.o: $(KOOPA_TROOPA_BEACH_PNG:%.png=%.inc.c) $(KOOPA_TROOPA_BEACH_CRAB_FRAMES:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(KOOPA_TROOPA_BEACH_CRAB_PALETTE) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(KOOPA_TROOPA_BEACH_CRAB_PALETTE) $(KOOPA_TROOPA_BEACH_CRAB_PALETTE:%.png=%.inc.c) $(KOOPA_TROOPA_BEACH_PNG:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(KOOPA_TROOPA_BEACH_CRAB_PALETTE) $(KOOPA_TROOPA_BEACH_CRAB_FRAMES) $(KOOPA_TROOPA_BEACH_PNG): $(KOOPA_TROOPA_BEACH_EXPORT_SENTINEL) ; $(KOOPA_TROOPA_BEACH_EXPORT_SENTINEL): $(ASSET_DIR)/courses/koopa_troopa_beach.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_koopa_troopa_beach distclean_koopa_troopa_beach: diff --git a/assets/include/courses/luigi_raceway.mk b/assets/include/courses/luigi_raceway.mk index b436098826..5a01e30f92 100644 --- a/assets/include/courses/luigi_raceway.mk +++ b/assets/include/courses/luigi_raceway.mk @@ -11,13 +11,14 @@ LUIGI_RACEWAY_EXPORT_SENTINEL := $(LUIGI_RACEWAY_DIR)/.export $(BUILD_DIR)/courses/luigi_raceway/course_data.o: $(LUIGI_RACEWAY_PNG:%.png=%.inc.c) $(LUIGI_RACEWAY_PNG:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(LUIGI_RACEWAY_PNG): $(LUIGI_RACEWAY_EXPORT_SENTINEL) ; $(LUIGI_RACEWAY_EXPORT_SENTINEL): $(ASSET_DIR)/courses/luigi_raceway.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_luigi_raceway distclean_luigi_raceway: diff --git a/assets/include/courses/mario_raceway.mk b/assets/include/courses/mario_raceway.mk index 50ea257a7f..5b02570277 100644 --- a/assets/include/courses/mario_raceway.mk +++ b/assets/include/courses/mario_raceway.mk @@ -22,21 +22,23 @@ PIRANHA_PLANT_EXPORT_SENTINEL := $(MARIO_RACEWAY_DIR)/.export $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(PIRANHA_PLANT_FRAMES:%.png=%.mio0) $(PIRANHA_PLANT_FRAMES:%.png=%.mio0): %.mio0 : %.bin - $(MIO0TOOL) -c $< $@ + $(V)$(MIO0TOOL) -c $< $@ $(PIRANHA_PLANT_FRAMES:%.png=%.bin): %.bin : %.png - $(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(MARIO_RACEWAY_PIRANHA_PLANT_PALETTE) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(MARIO_RACEWAY_PIRANHA_PLANT_PALETTE) $(BUILD_DIR)/courses/mario_raceway/course_data.o: $(MARIO_RACEWAY_PIRANHA_PLANT_PALETTE:%.png=%.inc.c) $(MARIO_RACEWAY_SIGN:%.png=%.inc.c) $(MARIO_RACEWAY_PIRANHA_PLANT_PALETTE:%.png=%.inc.c) $(MARIO_RACEWAY_SIGN:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(PIRANHA_PLANT_FRAMES) $(MARIO_RACEWAY_PIRANHA_PLANT_PALETTE) $(MARIO_RACEWAY_SIGN): $(PIRANHA_PLANT_EXPORT_SENTINEL) ; $(PIRANHA_PLANT_EXPORT_SENTINEL): $(ASSET_DIR)/courses/mario_raceway.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_mario_raceway distclean_mario_raceway: diff --git a/assets/include/courses/moo_moo_farm.mk b/assets/include/courses/moo_moo_farm.mk index 45fac38708..cc366a6bfe 100644 --- a/assets/include/courses/moo_moo_farm.mk +++ b/assets/include/courses/moo_moo_farm.mk @@ -44,27 +44,32 @@ $(BUILD_DIR)/courses/moo_moo_farm/course_data.o: $(COW_PALETTE_IMPORT:%.png=%.in $(BUILD_DIR)/courses/moo_moo_farm/course_data.o: $(MOO_MOO_FARM_DIRT_PNG:%.png=%.inc.c) $(MOLE_FRAMES:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(MOLE_PALETTE) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(MOLE_PALETTE) $(MOLE_PALETTE:%.png=%.inc.c) $(COW_PALETTE_IMPORT:%.png=%.inc.c) $(MOO_MOO_FARM_DIRT_PNG:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(BUILD_DIR)/data/other_textures.o: $(COW_PNG:%.png=%.mio0) $(BUILD_DIR)/data/other_textures.o: $(MOO_MOO_FARM_SIGN_PNG:%.png=%.mio0) $(COW_PNG:%.png=%.mio0) $(MOO_MOO_FARM_SIGN_PNG:%.png=%.mio0): %.mio0 : %.bin - $(MIO0TOOL) -c $< $@ + $(V)$(MIO0TOOL) -c $< $@ $(MOO_MOO_FARM_SIGN_PNG:%.png=%.bin): %.bin : %.png - $(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(BUILD_DIR)/courses/moo_moo_farm/course_textures.linkonly.o: $(MOO_MOO_FARM_SIGN_PNG:%.png=%.inc.c) $(MOO_MOO_FARM_SIGN_PNG:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(COW_PNG:%.png=%.bin): %.bin : %.png - $(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(COW_PALETTE) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(COW_PALETTE) $(MOLE_PALETTE) $(COW_PALETTE) $(COW_PALETTE_IMPORT): $(MOO_MOO_FARM_EXPORT_SENTINEL) ; @@ -73,8 +78,8 @@ $(MOLE_FRAMES) $(COW_PNG): $(MOO_MOO_FARM_EXPORT_SENTINEL) ; $(MOO_MOO_FARM_SIGN_PNG) $(MOO_MOO_FARM_DIRT_PNG): $(MOO_MOO_FARM_EXPORT_SENTINEL) ; $(MOO_MOO_FARM_EXPORT_SENTINEL): $(ASSET_DIR)/courses/moo_moo_farm.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_moo_moo_farm distclean_moo_moo_farm: diff --git a/assets/include/courses/rainbow_road.mk b/assets/include/courses/rainbow_road.mk index f100898992..b8b3946772 100644 --- a/assets/include/courses/rainbow_road.mk +++ b/assets/include/courses/rainbow_road.mk @@ -65,31 +65,40 @@ $(BUILD_DIR)/courses/rainbow_road/course_data.o: $(RAINBOW_ROAD_CHARACTER_PALETT $(BUILD_DIR)/courses/rainbow_road/course_data.o: $(RAINBOW_ROAD_PNG:%.png=%.inc.c) $(RAINBOW_ROAD_MUSHROOM_PNG:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(RAINBOW_ROAD_DIR)/gTLUTRainbowRoadNeonMushroom4.png + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(RAINBOW_ROAD_DIR)/gTLUTRainbowRoadNeonMushroom4.png $(RAINBOW_ROAD_MARIO_PNG:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(RAINBOW_ROAD_DIR)/gTLUTRainbowRoadNeonMario5.png + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(RAINBOW_ROAD_DIR)/gTLUTRainbowRoadNeonMario5.png $(RAINBOW_ROAD_BOO_PNG:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(RAINBOW_ROAD_DIR)/gTLUTRainbowRoadNeonBoo5.png + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(RAINBOW_ROAD_DIR)/gTLUTRainbowRoadNeonBoo5.png $(RAINBOW_ROAD_CHARACTER_PNG:%.png=%.inc.c) : $(RAINBOW_ROAD_DIR)/gTextureRainbowRoadNeon%.inc.c : $(RAINBOW_ROAD_DIR)/gTextureRainbowRoadNeon%.png - $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(RAINBOW_ROAD_DIR)/gTLUTRainbowRoadNeon$*.png + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(RAINBOW_ROAD_DIR)/gTLUTRainbowRoadNeon$*.png $(RAINBOW_ROAD_MUSHROOM_PALETTES:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(RAINBOW_ROAD_MARIO_PALETTES:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(RAINBOW_ROAD_BOO_PALETTES:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(RAINBOW_ROAD_CHARACTER_PALETTES:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(RAINBOW_ROAD_PNG:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(RAINBOW_ROAD_MUSHROOM_PALETTES) $(RAINBOW_ROAD_MUSHROOM_PNG): $(RAINBOW_ROAD_EXPORT_SENTINEL) ; $(RAINBOW_ROAD_MARIO_PALETTES) $(RAINBOW_ROAD_MARIO_PNG): $(RAINBOW_ROAD_EXPORT_SENTINEL) ; @@ -98,8 +107,8 @@ $(RAINBOW_ROAD_CHARACTER_PALETTES) $(RAINBOW_ROAD_CHARACTER_PNG): $(RAINBOW_ROAD $(RAINBOW_ROAD_PNG): $(RAINBOW_ROAD_EXPORT_SENTINEL) ; $(RAINBOW_ROAD_EXPORT_SENTINEL): $(ASSET_DIR)/courses/rainbow_road.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_rainbow_road distclean_rainbow_road: diff --git a/assets/include/courses/royal_raceway.mk b/assets/include/courses/royal_raceway.mk index 7013554be0..6df86505cc 100644 --- a/assets/include/courses/royal_raceway.mk +++ b/assets/include/courses/royal_raceway.mk @@ -7,13 +7,14 @@ ROYAL_RACEWAY_EXPORT_SENTINEL := $(ROYAL_RACEWAY_DIR)/.export $(BUILD_DIR)/courses/royal_raceway/course_data.o: $(ROYAL_RACEWAY_PIRANHA_PLANT_PALETTE:%.png=%.inc.c) $(ROYAL_RACEWAY_PIRANHA_PLANT_PALETTE:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(ROYAL_RACEWAY_PIRANHA_PLANT_PALETTE): $(ROYAL_RACEWAY_EXPORT_SENTINEL) ; $(ROYAL_RACEWAY_EXPORT_SENTINEL): $(ASSET_DIR)/courses/royal_raceway.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_royal_raceway distclean_royal_raceway: diff --git a/assets/include/courses/sherbet_land.mk b/assets/include/courses/sherbet_land.mk index cb7d21b6de..627ce2525e 100644 --- a/assets/include/courses/sherbet_land.mk +++ b/assets/include/courses/sherbet_land.mk @@ -11,16 +11,18 @@ SHERBET_LAND_EXPORT_SENTINEL := $(SHERBET_LAND_DIR)/.export $(BUILD_DIR)/courses/sherbet_land/course_data.o: $(SHERBET_LAND_ICE:%.png=%.inc.c) $(PENGUIN_PNG:%.png=%.inc.c) $(SHERBET_LAND_ICE:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f ia16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f ia16 $(PENGUIN_PNG:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(SHERBET_LAND_PNG) $(PENGUIN_PNG) $(SHERBET_LAND_ICE): $(SHERBET_LAND_EXPORT_SENTINEL) ; $(SHERBET_LAND_EXPORT_SENTINEL): $(ASSET_DIR)/courses/sherbet_land.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_sherbet_land distclean_sherbet_land: diff --git a/assets/include/courses/toads_turnpike.mk b/assets/include/courses/toads_turnpike.mk index 2704e99c27..d6a7df2c60 100644 --- a/assets/include/courses/toads_turnpike.mk +++ b/assets/include/courses/toads_turnpike.mk @@ -41,13 +41,14 @@ TOADS_TURNPIKE_EXPORT_SENTINEL := $(TOADS_TURNPIKE_DIR)/.export $(BUILD_DIR)/courses/toads_turnpike/course_data.o: $(TOADS_TURNPIKE_PNG:%.png=%.inc.c) $(TOADS_TURNPIKE_PNG:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(TOADS_TURNPIKE_PNG): $(TOADS_TURNPIKE_EXPORT_SENTINEL) ; $(TOADS_TURNPIKE_EXPORT_SENTINEL): $(ASSET_DIR)/courses/toads_turnpike.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_toads_turnpike distclean_toads_turnpike: diff --git a/assets/include/courses/wario_stadium.mk b/assets/include/courses/wario_stadium.mk index 6bfb28fc25..642a23f6ea 100644 --- a/assets/include/courses/wario_stadium.mk +++ b/assets/include/courses/wario_stadium.mk @@ -11,13 +11,14 @@ WARIO_STADIUM_EXPORT_SENTINEL := $(WARIO_STADIUM_DIR)/.export $(BUILD_DIR)/courses/wario_stadium/course_data.o: $(WARIO_STADIUM_SIGN:%.png=%.inc.c) $(WARIO_STADIUM_SIGN:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(WARIO_STADIUM_SIGN): $(WARIO_STADIUM_EXPORT_SENTINEL) ; $(WARIO_STADIUM_EXPORT_SENTINEL): $(ASSET_DIR)/courses/wario_stadium.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_wario_stadium distclean_wario_stadium: diff --git a/assets/include/courses/yoshi_valley.mk b/assets/include/courses/yoshi_valley.mk index 454f9b467c..1bb11dca03 100644 --- a/assets/include/courses/yoshi_valley.mk +++ b/assets/include/courses/yoshi_valley.mk @@ -14,17 +14,19 @@ $(BUILD_DIR)/courses/yoshi_valley/course_data.o: $(YOSHI_VALLEY_HEDGEHOG_PALETTE $(BUILD_DIR)/courses/yoshi_valley/course_data.o: $(YOSHI_VALLEY_PNG:%.png=%.inc.c) $(YOSHI_VALLEY_HEDGEHOG_PNG:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(YOSHI_VALLEY_HEDGEHOG_PALETTE) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(YOSHI_VALLEY_HEDGEHOG_PALETTE) $(YOSHI_VALLEY_PNG:%.png=%.inc.c) $(YOSHI_VALLEY_HEDGEHOG_PALETTE:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(YOSHI_VALLEY_HEDGEHOG_PALETTE) $(YOSHI_VALLEY_HEDGEHOG_PNG): $(YOSHI_VALLEY_EXPORT_SENTINEL) ; $(YOSHI_VALLEY_PNG): $(YOSHI_VALLEY_EXPORT_SENTINEL) ; $(YOSHI_VALLEY_EXPORT_SENTINEL): $(ASSET_DIR)/courses/yoshi_valley.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_yoshi_valley distclean_yoshi_valley: diff --git a/assets/include/debug_font.mk b/assets/include/debug_font.mk index 047175d513..ea6ce7c88f 100644 --- a/assets/include/debug_font.mk +++ b/assets/include/debug_font.mk @@ -9,16 +9,18 @@ DEBUG_FONT_EXPORT_SENTINEL := $(DEBUG_FONT_DIR)/.export $(BUILD_DIR)/src/data/common_textures.o: $(DEBUG_FONT_PNG:%.png=%.inc.c) $(DEBUG_FONT_PALETTE:%.png=%.inc.c) $(DEBUG_FONT_PNG:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci4 -c rgba16 -p $(DEBUG_FONT_PALETTE) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci4 -c rgba16 -p $(DEBUG_FONT_PALETTE) $(DEBUG_FONT_PALETTE:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(DEBUG_FONT_PNG) $(DEBUG_FONT_PALETTE): $(DEBUG_FONT_EXPORT_SENTINEL) ; $(DEBUG_FONT_EXPORT_SENTINEL): $(ASSET_DIR)/debug_font.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_debug_font distclean_debug_font: diff --git a/assets/include/ending_ceremony.mk b/assets/include/ending_ceremony.mk index 1fcb971b19..50c3fca8af 100644 --- a/assets/include/ending_ceremony.mk +++ b/assets/include/ending_ceremony.mk @@ -15,13 +15,14 @@ ENDING_CEREMONY_EXPORT_SENTINEL := $(ENDING_CEREMONY)/.export $(BUILD_DIR)/src/ending/ceremony_data.o: $(TROHPY_PNG:%.png=%.inc.c) $(PODIUM_PNG:%.png=%.inc.c) $(TROHPY_PNG:%.png=%.inc.c) $(PODIUM_PNG:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(TROHPY_PNG) $(PODIUM_PNG): $(ENDING_CEREMONY_EXPORT_SENTINEL) ; $(ENDING_CEREMONY_EXPORT_SENTINEL): $(ASSET_DIR)/ending_ceremony.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_ending_ceremony distclean_ending_ceremony: diff --git a/assets/include/finish_line_banner.mk b/assets/include/finish_line_banner.mk index 504d525454..a28eff3331 100644 --- a/assets/include/finish_line_banner.mk +++ b/assets/include/finish_line_banner.mk @@ -17,21 +17,23 @@ FINISH_LINE_BANNER_EXPORT_SENTINEL := $(FINISH_LINE_BANNER_DIR)/.export $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(FINISH_LINE_BANNER_PNG:%.png=%.mio0) $(FINISH_LINE_BANNER_PNG:%.png=%.mio0): %.mio0 : %.bin - $(MIO0TOOL) -c $< $@ + $(V)$(MIO0TOOL) -c $< $@ $(FINISH_LINE_BANNER_PNG:%.png=%.bin): %.bin : %.png - $(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(FINISH_LINE_BANNER_PALETTE) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(FINISH_LINE_BANNER_PALETTE) $(BUILD_DIR)/src/data/common_textures.o: $(FINISH_LINE_BANNER_PALETTE:%.png=%.inc.c) $(FINISH_LINE_BANNER_PALETTE:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(FINISH_LINE_BANNER_PNG) $(FINISH_LINE_BANNER_PALETTE): $(FINISH_LINE_BANNER_EXPORT_SENTINEL) ; $(FINISH_LINE_BANNER_EXPORT_SENTINEL): $(ASSET_DIR)/finish_line_banner.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_finish_line_banner distclean_finish_line_banner: diff --git a/assets/include/greenshell.mk b/assets/include/greenshell.mk index ba34dbca7a..0d603bc396 100644 --- a/assets/include/greenshell.mk +++ b/assets/include/greenshell.mk @@ -17,21 +17,23 @@ GREENSHELL_EXPORT_SENTINEL := $(GREENSHELL_DIR)/.export $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(GREENSHELL_FRAMES:%.png=%.mio0) $(GREENSHELL_FRAMES:%.png=%.mio0): %.mio0 : %.bin - $(MIO0TOOL) -c $< $@ + $(V)$(MIO0TOOL) -c $< $@ $(GREENSHELL_FRAMES:%.png=%.bin): %.bin : %.png - $(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(GREENSHELL_PALETTE) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(GREENSHELL_PALETTE) $(BUILD_DIR)/src/data/common_textures.o: $(GREENSHELL_PALETTE:%.png=%.inc.c) $(GREENSHELL_PALETTE:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(GREENSHELL_FRAMES) $(GREENSHELL_PALETTE): $(GREENSHELL_EXPORT_SENTINEL) ; $(GREENSHELL_EXPORT_SENTINEL): $(ASSET_DIR)/greenshell.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_greenshell distclean_greenshell: diff --git a/assets/include/hud_type_c.mk b/assets/include/hud_type_c.mk index 9c314e7254..2db0ebb8bb 100644 --- a/assets/include/hud_type_c.mk +++ b/assets/include/hud_type_c.mk @@ -35,27 +35,32 @@ $(BUILD_DIR)/src/data/common_textures.o: $(HUD_TYPE_C_TINY_FONT_PNG:%.png=%.inc. $(BUILD_DIR)/src/data/common_textures.o: $(HUD_TYPE_C_PORTRAIT_BORDER_PNG:%.png=%.inc.c) $(HUD_TYPE_C_FONT_PNG:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(HUD_TYPE_C_FONT_PALETTE) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(HUD_TYPE_C_FONT_PALETTE) $(HUD_TYPE_C_FONT_PALETTE:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(HUD_TYPE_C_TINY_FONT_PNG:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(HUD_TYPE_C_TINY_FONT_PALETTE) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(HUD_TYPE_C_TINY_FONT_PALETTE) $(HUD_TYPE_C_TINY_FONT_PALETTE:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(HUD_TYPE_C_PORTRAIT_BORDER_PNG:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f ia4 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f ia4 $(HUD_TYPE_C_FONT_PNG) $(HUD_TYPE_C_FONT_PALETTE): $(HUD_TYPE_C_EXPORT_SENTINEL) ; $(HUD_TYPE_C_TINY_FONT_PNG) $(HUD_TYPE_C_TINY_FONT_PALETTE): $(HUD_TYPE_C_EXPORT_SENTINEL) ; $(HUD_TYPE_C_PORTRAIT_BORDER_PNG): $(HUD_TYPE_C_EXPORT_SENTINEL) ; $(HUD_TYPE_C_EXPORT_SENTINEL): $(ASSET_DIR)/hud_type_c.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_hud_type_c distclean_hud_type_c: diff --git a/assets/include/item_window.mk b/assets/include/item_window.mk index d7042b6403..39c8c53edc 100644 --- a/assets/include/item_window.mk +++ b/assets/include/item_window.mk @@ -41,16 +41,18 @@ ITEM_WINDOW_EXPORT_SENTINEL := $(ITEM_WINDOW_DIR)/.export $(BUILD_DIR)/src/data/common_textures.o: $(ITEM_WINDOW_PNG:%.png=%.inc.c) $(ITEM_WINDOW_PALETTES:%.png=%.inc.c) $(ITEM_WINDOW_DIR)/common_texture_%.inc.c: $(ITEM_WINDOW_DIR)/common_texture_%.png - $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(ITEM_WINDOW_DIR)/common_tlut_$*.png + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(ITEM_WINDOW_DIR)/common_tlut_$*.png $(ITEM_WINDOW_PALETTES:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(ITEM_WINDOW_PNG) $(ITEM_WINDOW_PALETTES): $(ITEM_WINDOW_EXPORT_SENTINEL) ; $(ITEM_WINDOW_EXPORT_SENTINEL): $(ASSET_DIR)/item_window.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_item_window distclean_item_window: diff --git a/assets/include/karts/bowser_kart.mk b/assets/include/karts/bowser_kart.mk index 301f219258..720ba8da83 100644 --- a/assets/include/karts/bowser_kart.mk +++ b/assets/include/karts/bowser_kart.mk @@ -1487,19 +1487,21 @@ BOWSER_EXPORT_SENTINEL := $(BOWSER_KART_DIR)/.export $(BUILD_DIR)/$(DATA_DIR)/karts/bowser_kart.o: $(BOWSER_KART_FRAME_PNG:%.png=%.mio0) $(BOWSER_KART_PALETTE_PNG:%.png=%.bin) $(BOWSER_KART_FRAME_PNG:%.png=%.mio0): %.mio0 : %.bin - $(MIO0TOOL) -c $< $@ + $(V)$(MIO0TOOL) -c $< $@ $(BOWSER_KART_FRAME_PNG:%.png=%.bin): %.bin : %.png - $(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $( $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $( $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(BOWSER_KART_FRAME_PNG) $(BOWSER_KART_PALETTE_PNG): $(BOWSER_EXPORT_SENTINEL) ; $(BOWSER_EXPORT_SENTINEL): $(ASSET_DIR)/karts/bowser_kart.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_bowser_kart distclean_bowser_kart: diff --git a/assets/include/karts/donkeykong_kart.mk b/assets/include/karts/donkeykong_kart.mk index a90ab5fff5..30dac5875f 100644 --- a/assets/include/karts/donkeykong_kart.mk +++ b/assets/include/karts/donkeykong_kart.mk @@ -1487,19 +1487,21 @@ DONKEYKONG_EXPORT_SENTINEL := $(DONKEYKONG_KART_DIR)/.export $(BUILD_DIR)/$(DATA_DIR)/karts/donkeykong_kart.o: $(DONKEYKONG_KART_FRAME_PNG:%.png=%.mio0) $(DONKEYKONG_KART_PALETTE_PNG:%.png=%.bin) $(DONKEYKONG_KART_FRAME_PNG:%.png=%.mio0): %.mio0 : %.bin - $(MIO0TOOL) -c $< $@ + $(V)$(MIO0TOOL) -c $< $@ $(DONKEYKONG_KART_FRAME_PNG:%.png=%.bin): %.bin : %.png - $(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $( $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $( $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(DONKEYKONG_KART_FRAME_PNG) $(DONKEYKONG_KART_PALETTE_PNG): $(DONKEYKONG_EXPORT_SENTINEL) ; $(DONKEYKONG_EXPORT_SENTINEL): $(ASSET_DIR)/karts/donkeykong_kart.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_donkeykong_kart distclean_donkeykong_kart: diff --git a/assets/include/karts/luigi_kart.mk b/assets/include/karts/luigi_kart.mk index bd2dedb694..ec5fcd852b 100644 --- a/assets/include/karts/luigi_kart.mk +++ b/assets/include/karts/luigi_kart.mk @@ -1487,19 +1487,21 @@ LUIGI_EXPORT_SENTINEL := $(LUIGI_KART_DIR)/.export $(BUILD_DIR)/$(DATA_DIR)/karts/luigi_kart.o: $(LUIGI_KART_FRAME_PNG:%.png=%.mio0) $(LUIGI_KART_PALETTE_PNG:%.png=%.bin) $(LUIGI_KART_FRAME_PNG:%.png=%.mio0): %.mio0 : %.bin - $(MIO0TOOL) -c $< $@ + $(V)$(MIO0TOOL) -c $< $@ $(LUIGI_KART_FRAME_PNG:%.png=%.bin): %.bin : %.png - $(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $( $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $( $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(LUIGI_KART_FRAME_PNG) $(LUIGI_KART_PALETTE_PNG): $(LUIGI_EXPORT_SENTINEL) ; $(LUIGI_EXPORT_SENTINEL): $(ASSET_DIR)/karts/luigi_kart.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_luigi_kart distclean_luigi_kart: diff --git a/assets/include/karts/mario_kart.mk b/assets/include/karts/mario_kart.mk index 9a3f320c48..06c5beb07c 100644 --- a/assets/include/karts/mario_kart.mk +++ b/assets/include/karts/mario_kart.mk @@ -1487,19 +1487,21 @@ MARIO_EXPORT_SENTINEL := $(MARIO_KART_DIR)/.export $(BUILD_DIR)/$(DATA_DIR)/karts/mario_kart.o: $(MARIO_KART_FRAME_PNG:%.png=%.mio0) $(MARIO_KART_PALETTE_PNG:%.png=%.bin) $(MARIO_KART_FRAME_PNG:%.png=%.mio0): %.mio0 : %.bin - $(MIO0TOOL) -c $< $@ + $(V)$(MIO0TOOL) -c $< $@ $(MARIO_KART_FRAME_PNG:%.png=%.bin): %.bin : %.png - $(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $( $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $( $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(MARIO_KART_FRAME_PNG) $(MARIO_KART_PALETTE_PNG): $(MARIO_EXPORT_SENTINEL) ; $(MARIO_EXPORT_SENTINEL): $(ASSET_DIR)/karts/mario_kart.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_mario_kart distclean_mario_kart: diff --git a/assets/include/karts/peach_kart.mk b/assets/include/karts/peach_kart.mk index 9d7504cdf8..dc098fcc0f 100644 --- a/assets/include/karts/peach_kart.mk +++ b/assets/include/karts/peach_kart.mk @@ -1487,19 +1487,21 @@ PEACH_EXPORT_SENTINEL := $(PEACH_KART_DIR)/.export $(BUILD_DIR)/$(DATA_DIR)/karts/peach_kart.o: $(PEACH_KART_FRAME_PNG:%.png=%.mio0) $(PEACH_KART_PALETTE_PNG:%.png=%.bin) $(PEACH_KART_FRAME_PNG:%.png=%.mio0): %.mio0 : %.bin - $(MIO0TOOL) -c $< $@ + $(V)$(MIO0TOOL) -c $< $@ $(PEACH_KART_FRAME_PNG:%.png=%.bin): %.bin : %.png - $(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $( $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $( $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(PEACH_KART_FRAME_PNG) $(PEACH_KART_PALETTE_PNG): $(PEACH_EXPORT_SENTINEL) ; $(PEACH_EXPORT_SENTINEL): $(ASSET_DIR)/karts/peach_kart.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_peach_kart distclean_peach_kart: diff --git a/assets/include/karts/toad_kart.mk b/assets/include/karts/toad_kart.mk index 6cb9195f14..2c88b35813 100644 --- a/assets/include/karts/toad_kart.mk +++ b/assets/include/karts/toad_kart.mk @@ -1487,19 +1487,21 @@ TOAD_EXPORT_SENTINEL := $(TOAD_KART_DIR)/.export $(BUILD_DIR)/$(DATA_DIR)/karts/toad_kart.o: $(TOAD_KART_FRAME_PNG:%.png=%.mio0) $(TOAD_KART_PALETTE_PNG:%.png=%.bin) $(TOAD_KART_FRAME_PNG:%.png=%.mio0): %.mio0 : %.bin - $(MIO0TOOL) -c $< $@ + $(V)$(MIO0TOOL) -c $< $@ $(TOAD_KART_FRAME_PNG:%.png=%.bin): %.bin : %.png - $(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $( $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $( $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(TOAD_KART_FRAME_PNG) $(TOAD_KART_PALETTE_PNG): $(TOAD_EXPORT_SENTINEL) ; $(TOAD_EXPORT_SENTINEL): $(ASSET_DIR)/karts/toad_kart.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_toad_kart distclean_toad_kart: diff --git a/assets/include/karts/wario_kart.mk b/assets/include/karts/wario_kart.mk index 6cc96c0c43..ad0d6f5210 100644 --- a/assets/include/karts/wario_kart.mk +++ b/assets/include/karts/wario_kart.mk @@ -1487,19 +1487,21 @@ WARIO_EXPORT_SENTINEL := $(WARIO_KART_DIR)/.export $(BUILD_DIR)/$(DATA_DIR)/karts/wario_kart.o: $(WARIO_KART_FRAME_PNG:%.png=%.mio0) $(WARIO_KART_PALETTE_PNG:%.png=%.bin) $(WARIO_KART_FRAME_PNG:%.png=%.mio0): %.mio0 : %.bin - $(MIO0TOOL) -c $< $@ + $(V)$(MIO0TOOL) -c $< $@ $(WARIO_KART_FRAME_PNG:%.png=%.bin): %.bin : %.png - $(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $( $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $( $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(WARIO_KART_FRAME_PNG) $(WARIO_KART_PALETTE_PNG): $(WARIO_EXPORT_SENTINEL) ; $(WARIO_EXPORT_SENTINEL): $(ASSET_DIR)/karts/wario_kart.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_wario_kart distclean_wario_kart: diff --git a/assets/include/karts/yoshi_kart.mk b/assets/include/karts/yoshi_kart.mk index 09057bd038..54bcfbeda7 100644 --- a/assets/include/karts/yoshi_kart.mk +++ b/assets/include/karts/yoshi_kart.mk @@ -1487,19 +1487,21 @@ YOSHI_EXPORT_SENTINEL := $(YOSHI_KART_DIR)/.export $(BUILD_DIR)/$(DATA_DIR)/karts/yoshi_kart.o: $(YOSHI_KART_FRAME_PNG:%.png=%.mio0) $(YOSHI_KART_PALETTE_PNG:%.png=%.bin) $(YOSHI_KART_FRAME_PNG:%.png=%.mio0): %.mio0 : %.bin - $(MIO0TOOL) -c $< $@ + $(V)$(MIO0TOOL) -c $< $@ $(YOSHI_KART_FRAME_PNG:%.png=%.bin): %.bin : %.png - $(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $( $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $( $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(YOSHI_KART_FRAME_PNG) $(YOSHI_KART_PALETTE_PNG): $(YOSHI_EXPORT_SENTINEL) ; $(YOSHI_EXPORT_SENTINEL): $(ASSET_DIR)/karts/yoshi_kart.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_yoshi_kart distclean_yoshi_kart: diff --git a/assets/include/lakitu/bluelight.mk b/assets/include/lakitu/bluelight.mk index 8735c449e9..75d390144d 100644 --- a/assets/include/lakitu/bluelight.mk +++ b/assets/include/lakitu/bluelight.mk @@ -17,18 +17,20 @@ BLUELIGHT_EXPORT_SENTINEL := $(BLUELIGHT_DIR)/.export $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(BLUELIGHT_FRAMES:%.png=%.bin) $(BLUELIGHT_FRAMES:%.png=%.bin): %.bin : %.png - $(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(BLUELIGHT_PALETTE) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(BLUELIGHT_PALETTE) $(BUILD_DIR)/src/data/common_textures.o: $(BLUELIGHT_PALETTE:%.png=%.inc.c) $(BLUELIGHT_PALETTE:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(BLUELIGHT_FRAMES) $(BLUELIGHT_PALETTE): $(BLUELIGHT_EXPORT_SENTINEL) ; $(BLUELIGHT_EXPORT_SENTINEL): assets/lakitu/bluelight.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_lakitu_bluelight distclean_lakitu_bluelight: diff --git a/assets/include/lakitu/checkeredflag.mk b/assets/include/lakitu/checkeredflag.mk index 1e1160eaaf..525933f1a6 100644 --- a/assets/include/lakitu/checkeredflag.mk +++ b/assets/include/lakitu/checkeredflag.mk @@ -41,18 +41,20 @@ CHECKEREDFLAG_EXPORT_SENTINEL := $(CHECKEREDFLAG_DIR)/.export $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(CHECKEREDFLAG_FRAMES:%.png=%.bin) $(CHECKEREDFLAG_FRAMES:%.png=%.bin): %.bin : %.png - $(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(CHECKEREDFLAG_PALETTE) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(CHECKEREDFLAG_PALETTE) $(BUILD_DIR)/src/data/common_textures.o: $(CHECKEREDFLAG_PALETTE:%.png=%.inc.c) $(CHECKEREDFLAG_PALETTE:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(CHECKEREDFLAG_FRAMES) $(CHECKEREDFLAG_PALETTE): $(CHECKEREDFLAG_EXPORT_SENTINEL) ; $(CHECKEREDFLAG_EXPORT_SENTINEL): assets/lakitu/checkeredflag.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_lakitu_checkeredflag distclean_lakitu_checkeredflag: diff --git a/assets/include/lakitu/finallap.mk b/assets/include/lakitu/finallap.mk index 2cbd7ced30..7be0a0de80 100644 --- a/assets/include/lakitu/finallap.mk +++ b/assets/include/lakitu/finallap.mk @@ -25,18 +25,20 @@ FINALLAP_EXPORT_SENTINEL := $(FINALLAP_DIR)/.export $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(FINALLAP_FRAMES:%.png=%.bin) $(FINALLAP_FRAMES:%.png=%.bin): %.bin : %.png - $(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(FINALLAP_PALETTE) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(FINALLAP_PALETTE) $(BUILD_DIR)/src/data/common_textures.o: $(FINALLAP_PALETTE:%.png=%.inc.c) $(FINALLAP_PALETTE:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(FINALLAP_FRAMES) $(FINALLAP_PALETTE): $(FINALLAP_EXPORT_SENTINEL) ; $(FINALLAP_EXPORT_SENTINEL): assets/lakitu/finallap.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_lakitu_finallap distclean_lakitu_finallap: diff --git a/assets/include/lakitu/fishing.mk b/assets/include/lakitu/fishing.mk index 0c927624ea..2a5c22937a 100644 --- a/assets/include/lakitu/fishing.mk +++ b/assets/include/lakitu/fishing.mk @@ -13,18 +13,20 @@ FISHING_EXPORT_SENTINEL := $(FISHING_DIR)/.export $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(FISHING_FRAMES:%.png=%.bin) $(FISHING_FRAMES:%.png=%.bin): %.bin : %.png - $(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(FISHING_PALETTE) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(FISHING_PALETTE) $(BUILD_DIR)/src/data/common_textures.o: $(FISHING_PALETTE:%.png=%.inc.c) $(FISHING_PALETTE:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(FISHING_FRAMES) $(FISHING_PALETTE): $(FISHING_EXPORT_SENTINEL) ; $(FISHING_EXPORT_SENTINEL): assets/lakitu/fishing.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_lakitu_fishing distclean_lakitu_fishing: diff --git a/assets/include/lakitu/nolights.mk b/assets/include/lakitu/nolights.mk index 0094d3c52f..e29a967d77 100644 --- a/assets/include/lakitu/nolights.mk +++ b/assets/include/lakitu/nolights.mk @@ -17,18 +17,20 @@ NOLIGHTS_EXPORT_SENTINEL := $(NOLIGHTS_DIR)/.export $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(NOLIGHTS_FRAMES:%.png=%.bin) $(NOLIGHTS_FRAMES:%.png=%.bin): %.bin : %.png - $(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(NOLIGHTS_PALETTE) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(NOLIGHTS_PALETTE) $(BUILD_DIR)/src/data/common_textures.o: $(NOLIGHTS_PALETTE:%.png=%.inc.c) $(NOLIGHTS_PALETTE:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(NOLIGHTS_FRAMES) $(NOLIGHTS_PALETTE): $(NOLIGHTS_EXPORT_SENTINEL) ; $(NOLIGHTS_EXPORT_SENTINEL): assets/lakitu/nolights.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_lakitu_nolights distclean_lakitu_nolights: diff --git a/assets/include/lakitu/redlights.mk b/assets/include/lakitu/redlights.mk index b34ea79454..655b70d232 100644 --- a/assets/include/lakitu/redlights.mk +++ b/assets/include/lakitu/redlights.mk @@ -25,18 +25,20 @@ REDLIGHTS_EXPORT_SENTINEL := $(REDLIGHTS_DIR)/.export $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(REDLIGHTS_FRAMES:%.png=%.bin) $(REDLIGHTS_FRAMES:%.png=%.bin): %.bin : %.png - $(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(REDLIGHTS_PALETTE) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(REDLIGHTS_PALETTE) $(BUILD_DIR)/src/data/common_textures.o: $(REDLIGHTS_PALETTE:%.png=%.inc.c) $(REDLIGHTS_PALETTE:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(REDLIGHTS_FRAMES) $(REDLIGHTS_PALETTE): $(REDLIGHTS_EXPORT_SENTINEL) ; $(REDLIGHTS_EXPORT_SENTINEL): assets/lakitu/redlights.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_lakitu_redlights distclean_lakitu_redlights: diff --git a/assets/include/lakitu/reverse.mk b/assets/include/lakitu/reverse.mk index 03c88dca3e..acacc6a0bf 100644 --- a/assets/include/lakitu/reverse.mk +++ b/assets/include/lakitu/reverse.mk @@ -25,18 +25,20 @@ REVERSE_EXPORT_SENTINEL := $(REVERSE_DIR)/.export $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(REVERSE_FRAMES:%.png=%.bin) $(REVERSE_FRAMES:%.png=%.bin): %.bin : %.png - $(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(REVERSE_PALETTE) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(REVERSE_PALETTE) $(BUILD_DIR)/src/data/common_textures.o: $(REVERSE_PALETTE:%.png=%.inc.c) $(REVERSE_PALETTE:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(REVERSE_FRAMES) $(REVERSE_PALETTE): $(REVERSE_EXPORT_SENTINEL) ; $(REVERSE_EXPORT_SENTINEL): assets/lakitu/reverse.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_lakitu_reverse distclean_lakitu_reverse: diff --git a/assets/include/lakitu/secondlap.mk b/assets/include/lakitu/secondlap.mk index 640184a9b3..7d16c40d65 100644 --- a/assets/include/lakitu/secondlap.mk +++ b/assets/include/lakitu/secondlap.mk @@ -25,18 +25,20 @@ SECONDLAP_EXPORT_SENTINEL := $(SECONDLAP_DIR)/.export $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(SECONDLAP_FRAMES:%.png=%.bin) $(SECONDLAP_FRAMES:%.png=%.bin): %.bin : %.png - $(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(SECONDLAP_PALETTE) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(SECONDLAP_PALETTE) $(BUILD_DIR)/src/data/common_textures.o: $(SECONDLAP_PALETTE:%.png=%.inc.c) $(SECONDLAP_PALETTE:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(SECONDLAP_FRAMES) $(SECONDLAP_PALETTE): $(SECONDLAP_EXPORT_SENTINEL) ; $(SECONDLAP_EXPORT_SENTINEL): assets/lakitu/secondlap.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_lakitu_secondlap distclean_lakitu_secondlap: diff --git a/assets/include/minimap_icons.mk b/assets/include/minimap_icons.mk index 554ceab4f9..a972822c6a 100644 --- a/assets/include/minimap_icons.mk +++ b/assets/include/minimap_icons.mk @@ -17,13 +17,14 @@ MINIMAP_ICONS_EXPORT_SENTINEL := $(MINIMAP_ICONS_DIR)/.export $(BUILD_DIR)/src/data/common_textures.o: $(MINIMAP_ICONS_PNG:%.png=%.inc.c) $(MINIMAP_ICONS_PNG:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(MINIMAP_ICONS_PNG): $(MINIMAP_ICONS_EXPORT_SENTINEL) ; $(MINIMAP_ICONS_EXPORT_SENTINEL): $(ASSET_DIR)/minimap_icons.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_minimap_icons distclean_minimap_icons: diff --git a/assets/include/onomatopoeia.mk b/assets/include/onomatopoeia.mk index b1d8570a3f..6e6c498db6 100644 --- a/assets/include/onomatopoeia.mk +++ b/assets/include/onomatopoeia.mk @@ -18,19 +18,21 @@ $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(ONOMATOPOEIA_PNG:%.png=%.mio0) $(BUILD_DIR)/src/data/some_data.o: $(ONOMATOPOEIA_PALETTE:%.png=%.inc.c) $(ONOMATOPOEIA_PNG:%.png=%.mio0): %.mio0 : %.bin - $(MIO0TOOL) -c $< $@ + $(V)$(MIO0TOOL) -c $< $@ $(ONOMATOPOEIA_PNG:%.png=%.bin): %.bin : %.png - $(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(ONOMATOPOEIA_PALETTE) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(ONOMATOPOEIA_PALETTE) $(ONOMATOPOEIA_PALETTE:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(ONOMATOPOEIA_PNG) $(ONOMATOPOEIA_PALETTE): $(ONOMATOPOEIA_EXPORT_SENTINEL) ; $(ONOMATOPOEIA_EXPORT_SENTINEL): $(ASSET_DIR)/onomatopoeia.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_onomatopoeia distclean_onomatopoeia: diff --git a/assets/include/other_textures.mk b/assets/include/other_textures.mk index 033e6446e6..9392b5e13e 100644 --- a/assets/include/other_textures.mk +++ b/assets/include/other_textures.mk @@ -467,7 +467,9 @@ $(BUILD_DIR)/$(OTHER_TEXTURES_DIR)/texture_67490C.rgba16.inc.c $(BUILD_DIR)/courses/big_donut/course_textures.linkonly.o: $(BIG_DONUT_TEXTURES) $(BUILD_DIR)/$(OTHER_TEXTURES_DIR)/%.rgba16.inc.c: $(OTHER_TEXTURES_DIR)/%.rgba16.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(BUILD_DIR)/$(OTHER_TEXTURES_DIR)/%.ia16.inc.c: $(OTHER_TEXTURES_DIR)/%.ia16.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f ia16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f ia16 diff --git a/assets/include/player_emblems.mk b/assets/include/player_emblems.mk index 6c9451e78b..ccd682e6e6 100644 --- a/assets/include/player_emblems.mk +++ b/assets/include/player_emblems.mk @@ -13,16 +13,18 @@ PLAYER_EMBLEM_EXPORT_SENTINEL := $(PLAYER_EMBLEM_DIR)/.export $(BUILD_DIR)/src/data/common_textures.o: $(PLAYER_EMBLEM_PNGS:%.png=%.inc.c) $(PLAYER_EMBLEM_PALETTE:%.png=%.inc.c) $(PLAYER_EMBLEM_PNGS:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(PLAYER_EMBLEM_PALETTE) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(PLAYER_EMBLEM_PALETTE) $(PLAYER_EMBLEM_PALETTE:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(PLAYER_EMBLEM_PNGS) $(PLAYER_EMBLEM_PALETTE): $(PLAYER_EMBLEM_EXPORT_SENTINEL) ; $(PLAYER_EMBLEM_EXPORT_SENTINEL): $(ASSET_DIR)/player_emblems.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_player_emblems distclean_player_emblems: diff --git a/assets/include/startup_logo.mk b/assets/include/startup_logo.mk index b8c70d485d..fbab8ffa69 100644 --- a/assets/include/startup_logo.mk +++ b/assets/include/startup_logo.mk @@ -7,13 +7,14 @@ STARTUP_LOGO_EXPORT_SENTINEL := $(STARTUP_LOGO)/.export $(BUILD_DIR)/src/data/startup_logo.o: $(REFLECTION_MAP:%.png=%.inc.c) $(REFLECTION_MAP:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(REFLECTION_MAP): $(STARTUP_LOGO_EXPORT_SENTINEL) ; $(STARTUP_LOGO_EXPORT_SENTINEL): $(ASSET_DIR)/startup_logo.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_startup_logo distclean_startup_logo: diff --git a/assets/include/trees.mk b/assets/include/trees.mk index 7c60c4bdc3..1f53ffa9ae 100644 --- a/assets/include/trees.mk +++ b/assets/include/trees.mk @@ -24,21 +24,23 @@ TREES_EXPORT_SENTINEL := $(TREES_DIR)/.export $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(TREES_PNG:%.png=%.mio0) $(TREES_PNG:%.png=%.mio0): %.mio0 : %.bin - $(MIO0TOOL) -c $< $@ + $(V)$(MIO0TOOL) -c $< $@ $(TREES_PNG:%.png=%.bin): %.bin : %.png - $(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(TREES_PALETTE) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(TREES_PALETTE) $(BUILD_DIR)/src/data/common_textures.o: $(TREES_PALETTE_IMPORT:%.png=%.inc.c) $(TREES_PALETTE:%.png=%.inc.c) $(TREES_PALETTE_IMPORT:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(TREES_PNG) $(TREES_PALETTE) $(TREES_PALETTE_IMPORT): $(TREES_EXPORT_SENTINEL) ; $(TREES_EXPORT_SENTINEL): $(ASSET_DIR)/trees.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_trees distclean_trees: diff --git a/assets/include/unused_traffic_light.mk b/assets/include/unused_traffic_light.mk index 54021a70d9..7a65b92895 100644 --- a/assets/include/unused_traffic_light.mk +++ b/assets/include/unused_traffic_light.mk @@ -19,16 +19,18 @@ UNUSED_TRAFFIC_LIGHT_EXPORT_SENTINEL := $(UNUSED_TRAFFIC_LIGHT_DIR)/.export $(BUILD_DIR)/src/data/common_textures.o: $(UNUSED_TRAFFIC_LIGHT_PNG:%.png=%.inc.c) $(UNUSED_TRAFFIC_LIGHT_PALETTE:%.png=%.inc.c) $(UNUSED_TRAFFIC_LIGHT_PNG:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(UNUSED_TRAFFIC_LIGHT_PALETTE) + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(UNUSED_TRAFFIC_LIGHT_PALETTE) $(UNUSED_TRAFFIC_LIGHT_PALETTE:%.png=%.inc.c): %.inc.c : %.png - $(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 + @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(UNUSED_TRAFFIC_LIGHT_PNG) $(UNUSED_TRAFFIC_LIGHT_PALETTE): $(UNUSED_TRAFFIC_LIGHT_EXPORT_SENTINEL) ; $(UNUSED_TRAFFIC_LIGHT_EXPORT_SENTINEL): $(ASSET_DIR)/unused_traffic_light.json - $(ASSET_EXTRACT) $(BASEROM) $< - $(TOUCH) $@ + $(V)$(ASSET_EXTRACT) $(BASEROM) $< + $(V)$(TOUCH) $@ .PHONY: distclean_unused_traffic_light distclean_unused_traffic_light: From 33bb9f79791d2b19e5708bfdcb47b24e58ad593e Mon Sep 17 00:00:00 2001 From: MegaMech Date: Fri, 19 Apr 2024 20:33:56 -0600 Subject: [PATCH 2/2] Update wording --- Makefile | 6 +++--- assets/include/blueshell.mk | 4 ++-- assets/include/bomb.mk | 4 ++-- assets/include/character_portraits.mk | 8 ++++---- .../include/character_select/bowser_select.mk | 2 +- .../character_select/donkeykong_select.mk | 2 +- .../include/character_select/luigi_select.mk | 2 +- .../include/character_select/mario_select.mk | 2 +- .../include/character_select/peach_select.mk | 2 +- assets/include/character_select/toad_select.mk | 2 +- .../include/character_select/wario_select.mk | 2 +- .../include/character_select/yoshi_select.mk | 2 +- assets/include/course_outlines.mk | 2 +- assets/include/course_previews.mk | 2 +- assets/include/courses/banshee_boardwalk.mk | 6 +++--- assets/include/courses/bowsers_castle.mk | 4 ++-- assets/include/courses/choco_mountain.mk | 2 +- assets/include/courses/dks_jungle_parkway.mk | 4 ++-- assets/include/courses/frappe_snowland.mk | 8 ++++---- assets/include/courses/kalimari_desert.mk | 4 ++-- assets/include/courses/koopa_troopa_beach.mk | 4 ++-- assets/include/courses/luigi_raceway.mk | 2 +- assets/include/courses/mario_raceway.mk | 4 ++-- assets/include/courses/moo_moo_farm.mk | 10 +++++----- assets/include/courses/rainbow_road.mk | 18 +++++++++--------- assets/include/courses/royal_raceway.mk | 2 +- assets/include/courses/sherbet_land.mk | 4 ++-- assets/include/courses/toads_turnpike.mk | 2 +- assets/include/courses/wario_stadium.mk | 2 +- assets/include/courses/yoshi_valley.mk | 4 ++-- assets/include/debug_font.mk | 4 ++-- assets/include/ending_ceremony.mk | 2 +- assets/include/finish_line_banner.mk | 4 ++-- assets/include/greenshell.mk | 4 ++-- assets/include/hud_type_c.mk | 10 +++++----- assets/include/item_window.mk | 4 ++-- assets/include/karts/bowser_kart.mk | 4 ++-- assets/include/karts/donkeykong_kart.mk | 4 ++-- assets/include/karts/luigi_kart.mk | 4 ++-- assets/include/karts/mario_kart.mk | 4 ++-- assets/include/karts/peach_kart.mk | 4 ++-- assets/include/karts/toad_kart.mk | 4 ++-- assets/include/karts/wario_kart.mk | 4 ++-- assets/include/karts/yoshi_kart.mk | 4 ++-- assets/include/lakitu/bluelight.mk | 4 ++-- assets/include/lakitu/checkeredflag.mk | 4 ++-- assets/include/lakitu/finallap.mk | 4 ++-- assets/include/lakitu/fishing.mk | 4 ++-- assets/include/lakitu/nolights.mk | 4 ++-- assets/include/lakitu/redlights.mk | 4 ++-- assets/include/lakitu/reverse.mk | 4 ++-- assets/include/lakitu/secondlap.mk | 4 ++-- assets/include/minimap_icons.mk | 2 +- assets/include/onomatopoeia.mk | 4 ++-- assets/include/other_textures.mk | 4 ++-- assets/include/player_emblems.mk | 4 ++-- assets/include/startup_logo.mk | 2 +- assets/include/trees.mk | 4 ++-- assets/include/unused_traffic_light.mk | 4 ++-- 59 files changed, 119 insertions(+), 119 deletions(-) diff --git a/Makefile b/Makefile index 7e9335c806..f1ebb109fb 100644 --- a/Makefile +++ b/Makefile @@ -458,7 +458,7 @@ DUMMY != mkdir -p $(ALL_DIRS) # RGBA32, RGBA16, IA16, IA8, IA4, IA1, I8, I4 $(BUILD_DIR)/%: %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -f $(lastword $(subst ., ,$@)) $(BUILD_DIR)/textures/%.mio0: $(BUILD_DIR)/textures/% @@ -503,12 +503,12 @@ TEXTURE_FILES_TLUT := $(foreach dir,$(TEXTURE_DIRS)/tlut,$(subst .png, , $(wildc $(TEXTURE_FILES): - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $(BUILD_DIR)/$@.inc.c -g $@.png -f $(lastword $(subst ., ,$@)) -s u8 # TLUT $(TEXTURE_FILES_TLUT): - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $(BUILD_DIR)/$@.inc.c -g $@.png -f $(lastword $(subst ., ,$@)) -s u8 -c $(lastword $(subst ., ,$(subst .$(lastword $(subst ., ,$(TEXTURE_FILES_TLUT))), ,$(TEXTURE_FILES_TLUT)))) -p $(BUILD_DIR)/$@.tlut.inc.c # common textures diff --git a/assets/include/blueshell.mk b/assets/include/blueshell.mk index 6d75741d4d..c344726ff4 100644 --- a/assets/include/blueshell.mk +++ b/assets/include/blueshell.mk @@ -20,13 +20,13 @@ $(BLUESHELL_FRAMES:%.png=%.mio0): %.mio0 : %.bin $(V)$(MIO0TOOL) -c $< $@ $(BLUESHELL_FRAMES:%.png=%.bin): %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(BLUESHELL_PALETTE) $(BUILD_DIR)/src/data/common_textures.o: $(BLUESHELL_PALETTE:%.png=%.inc.c) $(BLUESHELL_PALETTE:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(BLUESHELL_FRAMES) $(BLUESHELL_PALETTE): $(BLUESHELL_EXPORT_SENTINEL) ; diff --git a/assets/include/bomb.mk b/assets/include/bomb.mk index ec237f0b9f..65cde42cfa 100644 --- a/assets/include/bomb.mk +++ b/assets/include/bomb.mk @@ -13,11 +13,11 @@ BOMB_EXPORT_SENTINEL := $(BOMB_DIR)/.export $(BUILD_DIR)/src/data/common_textures.o: $(BOMB_FRAMES:%.png=%.inc.c) $(BOMB_PALETTE:%.png=%.inc.c) $(BOMB_FRAMES:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(BOMB_PALETTE) $(BOMB_PALETTE:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(BOMB_FRAMES) $(BOMB_PALETTE): $(BOMB_EXPORT_SENTINEL) ; diff --git a/assets/include/character_portraits.mk b/assets/include/character_portraits.mk index 98e3be659d..552b01ccae 100644 --- a/assets/include/character_portraits.mk +++ b/assets/include/character_portraits.mk @@ -35,19 +35,19 @@ $(BUILD_DIR)/src/data/common_textures.o: $(PORTRAIT_PNG:%.png=%.inc.c) $(PORTRAI $(BUILD_DIR)/src/data/common_textures.o: $(SPECIAL_PORTRAIT_PNG:%.png=%.inc.c) $(SPECIAL_PORTRAIT_PALETTE:%.png=%.inc.c) $(PORTRAIT_PNG:%.png=%.inc.c): $(PORTRAITS_DIR)/common_texture_portrait_%.inc.c : $(PORTRAITS_DIR)/common_texture_portrait_%.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(PORTRAITS_DIR)/common_tlut_portrait_$*.png $(SPECIAL_PORTRAIT_PNG:%.png=%.inc.c): $(PORTRAITS_DIR)/common_texture_portrait_%.inc.c : $(PORTRAITS_DIR)/common_texture_portrait_%.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(SPECIAL_PORTRAIT_PALETTE) $(PORTRAIT_PALETTES:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(SPECIAL_PORTRAIT_PALETTE:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(PORTRAIT_PNG) $(SPECIAL_PORTRAIT_PNG) $(PORTRAIT_PALETTES) $(SPECIAL_PORTRAIT_PALETTE): $(PORTRAIT_EXPORT_SENTINEL) ; diff --git a/assets/include/character_select/bowser_select.mk b/assets/include/character_select/bowser_select.mk index bd835d9b83..b690ada196 100644 --- a/assets/include/character_select/bowser_select.mk +++ b/assets/include/character_select/bowser_select.mk @@ -27,7 +27,7 @@ $(BOWSER_SELECT_PNG:%.png=%.mio0) : %.mio0 : %.bin $(V)$(MIO0TOOL) -c $< $@ $(BOWSER_SELECT_PNG:%.png=%.bin) : %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(BOWSER_SELECT_PNG): $(BOWSER_SELECT_EXPORT_SENTINEL) ; diff --git a/assets/include/character_select/donkeykong_select.mk b/assets/include/character_select/donkeykong_select.mk index cdeda361d6..03d042cfe4 100644 --- a/assets/include/character_select/donkeykong_select.mk +++ b/assets/include/character_select/donkeykong_select.mk @@ -27,7 +27,7 @@ $(DONKEYKONG_SELECT_PNG:%.png=%.mio0) : %.mio0 : %.bin $(V)$(MIO0TOOL) -c $< $@ $(DONKEYKONG_SELECT_PNG:%.png=%.bin) : %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(DONKEYKONG_SELECT_PNG): $(DONKEYKONG_SELECT_EXPORT_SENTINEL) ; diff --git a/assets/include/character_select/luigi_select.mk b/assets/include/character_select/luigi_select.mk index 65acce661a..9b1fba7931 100644 --- a/assets/include/character_select/luigi_select.mk +++ b/assets/include/character_select/luigi_select.mk @@ -27,7 +27,7 @@ $(LUIGI_SELECT_PNG:%.png=%.mio0) : %.mio0 : %.bin $(V)$(MIO0TOOL) -c $< $@ $(LUIGI_SELECT_PNG:%.png=%.bin) : %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(LUIGI_SELECT_PNG): $(LUIGI_SELECT_EXPORT_SENTINEL) ; diff --git a/assets/include/character_select/mario_select.mk b/assets/include/character_select/mario_select.mk index 431b8a5ddb..9d500b663c 100644 --- a/assets/include/character_select/mario_select.mk +++ b/assets/include/character_select/mario_select.mk @@ -27,7 +27,7 @@ $(MARIO_SELECT_PNG:%.png=%.mio0) : %.mio0 : %.bin $(V)$(MIO0TOOL) -c $< $@ $(MARIO_SELECT_PNG:%.png=%.bin) : %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(MARIO_SELECT_PNG): $(MARIO_SELECT_EXPORT_SENTINEL) ; diff --git a/assets/include/character_select/peach_select.mk b/assets/include/character_select/peach_select.mk index 79745966f3..8f50db4589 100644 --- a/assets/include/character_select/peach_select.mk +++ b/assets/include/character_select/peach_select.mk @@ -27,7 +27,7 @@ $(PEACH_SELECT_PNG:%.png=%.mio0) : %.mio0 : %.bin $(V)$(MIO0TOOL) -c $< $@ $(PEACH_SELECT_PNG:%.png=%.bin) : %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(PEACH_SELECT_PNG): $(PEACH_SELECT_EXPORT_SENTINEL) ; diff --git a/assets/include/character_select/toad_select.mk b/assets/include/character_select/toad_select.mk index c5f656edce..ccfb4b3c57 100644 --- a/assets/include/character_select/toad_select.mk +++ b/assets/include/character_select/toad_select.mk @@ -27,7 +27,7 @@ $(TOAD_SELECT_PNG:%.png=%.mio0) : %.mio0 : %.bin $(V)$(MIO0TOOL) -c $< $@ $(TOAD_SELECT_PNG:%.png=%.bin) : %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(TOAD_SELECT_PNG): $(TOAD_SELECT_EXPORT_SENTINEL) ; diff --git a/assets/include/character_select/wario_select.mk b/assets/include/character_select/wario_select.mk index 04ab633ae8..845723611b 100644 --- a/assets/include/character_select/wario_select.mk +++ b/assets/include/character_select/wario_select.mk @@ -27,7 +27,7 @@ $(WARIO_SELECT_PNG:%.png=%.mio0) : %.mio0 : %.bin $(V)$(MIO0TOOL) -c $< $@ $(WARIO_SELECT_PNG:%.png=%.bin) : %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(WARIO_SELECT_PNG): $(WARIO_SELECT_EXPORT_SENTINEL) ; diff --git a/assets/include/character_select/yoshi_select.mk b/assets/include/character_select/yoshi_select.mk index 235bf3e04c..3a1abd270c 100644 --- a/assets/include/character_select/yoshi_select.mk +++ b/assets/include/character_select/yoshi_select.mk @@ -27,7 +27,7 @@ $(YOSHI_SELECT_PNG:%.png=%.mio0) : %.mio0 : %.bin $(V)$(MIO0TOOL) -c $< $@ $(YOSHI_SELECT_PNG:%.png=%.bin) : %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(YOSHI_SELECT_PNG): $(YOSHI_SELECT_EXPORT_SENTINEL) ; diff --git a/assets/include/course_outlines.mk b/assets/include/course_outlines.mk index f7eb3ea7a9..067e7b4e3c 100644 --- a/assets/include/course_outlines.mk +++ b/assets/include/course_outlines.mk @@ -30,7 +30,7 @@ $(COURSE_OUTLINE_PNG:%.png=%.mio0): %.mio0 : %.bin $(V)$(MIO0TOOL) -c $< $@ $(COURSE_OUTLINE_PNG:%.png=%.bin): %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f i4 $(COURSE_OUTLINE_PNG): $(COURSE_OUTLINE_EXPORT_SENTINEL) ; diff --git a/assets/include/course_previews.mk b/assets/include/course_previews.mk index daf3ca5270..2a35cddc61 100644 --- a/assets/include/course_previews.mk +++ b/assets/include/course_previews.mk @@ -30,7 +30,7 @@ $(COURSE_PREVIEW_PNG:%.png=%.mio0): %.mio0 : %.bin $(V)$(MIO0TOOL) -c $< $@ $(COURSE_PREVIEW_PNG:%.png=%.bin): %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(COURSE_PREVIEW_PNG): $(COURSE_PREVIEW_EXPORT_SENTINEL) ; diff --git a/assets/include/courses/banshee_boardwalk.mk b/assets/include/courses/banshee_boardwalk.mk index 20226665ea..b56047e805 100644 --- a/assets/include/courses/banshee_boardwalk.mk +++ b/assets/include/courses/banshee_boardwalk.mk @@ -63,7 +63,7 @@ $(BANSHEE_BOARDWALK_DIR)/boo_frames.bin: $(BANSHEE_BOARDWALK_BOO_FRAMES:%.png=%. $(V)$(CAT) $^ > $@ $(BANSHEE_BOARDWALK_BOO_FRAMES:%.png=%.bin): %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(BANSHEE_BOARDWALK_BOO_PALETTE) $(BUILD_DIR)/courses/banshee_boardwalk/course_data.o: $(BANSHEE_BOARDWALK_BOO_PALETTE:%.png=%.inc.c) @@ -71,11 +71,11 @@ $(BUILD_DIR)/courses/banshee_boardwalk/course_data.o: $(BANSHEE_BOARDWALK_BAT_PA $(BUILD_DIR)/courses/banshee_boardwalk/course_data.o: $(BANSHEE_BOARDWALK_PNG:%.png=%.inc.c) $(BANSHEE_BOARDWALK_BAT_FRAMES:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(BANSHEE_BOARDWALK_BAT_PALETTE) $(BANSHEE_BOARDWALK_PNG:%.png=%.inc.c) $(BANSHEE_BOARDWALK_BOO_PALETTE:%.png=%.inc.c) $(BANSHEE_BOARDWALK_BAT_PALETTE:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(BANSHEE_BOARDWALK_BOO_PALETTE) $(BANSHEE_BOARDWALK_BOO_FRAMES): $(BANSHEE_BOARDWALK_EXPORT_SENTINEL) ; diff --git a/assets/include/courses/bowsers_castle.mk b/assets/include/courses/bowsers_castle.mk index 00b3f72ded..28a1159699 100644 --- a/assets/include/courses/bowsers_castle.mk +++ b/assets/include/courses/bowsers_castle.mk @@ -18,11 +18,11 @@ $(BUILD_DIR)/courses/bowsers_castle/course_data.o: $(THWOMP_FACE_FRAMES:%.png=%. $(BUILD_DIR)/courses/bowsers_castle/course_data.o: $(THOWMP_SIDE_PNG:%.png=%.inc.c) $(THOWMP_SIDE_PNG:%.png=%.inc.c) $(THWOMP_PALETTE:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(THWOMP_FACE_FRAMES:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(THWOMP_PALETTE) $(THWOMP_PALETTE) $(THWOMP_FACE_FRAMES) $(THOWMP_SIDE_PNG): $(BOWSERS_CASTLE_EXPORT_SENTINEL) ; diff --git a/assets/include/courses/choco_mountain.mk b/assets/include/courses/choco_mountain.mk index 4a855f40b4..744281e075 100644 --- a/assets/include/courses/choco_mountain.mk +++ b/assets/include/courses/choco_mountain.mk @@ -9,7 +9,7 @@ CHOCO_MOUNTAIN_EXPORT_SENTINEL := $(CHOCO_MOUNTAIN_DIR)/.export $(BUILD_DIR)/courses/choco_mountain/course_data.o: $(CHOCO_MOUNTAIN_PNG:%.png=%.inc.c) $(CHOCO_MOUNTAIN_PNG:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(CHOCO_MOUNTAIN_PNG): $(CHOCO_MOUNTAIN_EXPORT_SENTINEL) ; diff --git a/assets/include/courses/dks_jungle_parkway.mk b/assets/include/courses/dks_jungle_parkway.mk index e5c25deb40..9eef14bb20 100644 --- a/assets/include/courses/dks_jungle_parkway.mk +++ b/assets/include/courses/dks_jungle_parkway.mk @@ -30,14 +30,14 @@ $(DKS_JUNGLE_PARKWAY_KIWANO_FRAMES:%.png=%.mio0): %.mio0 : %.bin $(V)$(MIO0TOOL) -c $< $@ $(DKS_JUNGLE_PARKWAY_KIWANO_FRAMES:%.png=%.bin): %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(DKS_JUNGLE_PARKWAY_KIWANO_PALETTE) $(BUILD_DIR)/courses/dks_jungle_parkway/course_data.o: $(DKS_JUNGLE_PARKWAY_KIWANO_PALETTE:%.png=%.inc.c) $(BUILD_DIR)/courses/dks_jungle_parkway/course_data.o: $(DKS_JUNGLE_PARKWAY_PNG:%.png=%.inc.c) $(DKS_JUNGLE_PARKWAY_PNG:%.png=%.inc.c) $(DKS_JUNGLE_PARKWAY_KIWANO_PALETTE:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(DKS_JUNGLE_PARKWAY_KIWANO_PALETTE) $(DKS_JUNGLE_PARKWAY_KIWANO_FRAMES): $(DKS_JUNGLE_PARKWAY_EXPORT_SENTINEL) ; diff --git a/assets/include/courses/frappe_snowland.mk b/assets/include/courses/frappe_snowland.mk index e187ee3f6e..cf15b50ca6 100644 --- a/assets/include/courses/frappe_snowland.mk +++ b/assets/include/courses/frappe_snowland.mk @@ -22,11 +22,11 @@ $(BUILD_DIR)/courses/frappe_snowland/course_data.o: $(FRAPPE_SNOWLAND_SNOWMAN_PA $(BUILD_DIR)/courses/frappe_snowland/course_data.o: $(FRAPPE_SNOWLAND_TREE_PALETTE:%.png=%.inc.c) $(FRAPPE_SNOWLAND_SNOWMAN_PNG:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(FRAPPE_SNOWLAND_SNOWMAN_PALETTE) $(FRAPPE_SNOWLAND_SNOW_PNG:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(FRAPPE_SNOWLAND_SNOW_PALETTE) $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(FRAPPE_SNOWLAND_TREE_PNG:%.png=%.mio0) @@ -35,11 +35,11 @@ $(FRAPPE_SNOWLAND_TREE_PNG:%.png=%.mio0): %.mio0 : %.bin $(V)$(MIO0TOOL) -c $< $@ $(FRAPPE_SNOWLAND_TREE_PNG:%.png=%.bin): %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(FRAPPE_SNOWLAND_TREE_PALETTE) $(FRAPPE_SNOWLAND_SNOWMAN_PALETTE:%.png=%.inc.c) $(FRAPPE_SNOWLAND_SNOW_PALETTE:%.png=%.inc.c) $(FRAPPE_SNOWLAND_TREE_PALETTE:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(FRAPPE_SNOWLAND_SNOWMAN_PNG) $(FRAPPE_SNOWLAND_SNOW_PNG) $(FRAPPE_SNOWLAND_TREE_PNG): $(FRAPPE_SNOWLAND_EXPORT_SENTINEL) ; diff --git a/assets/include/courses/kalimari_desert.mk b/assets/include/courses/kalimari_desert.mk index e58b627415..3038f1fcbb 100644 --- a/assets/include/courses/kalimari_desert.mk +++ b/assets/include/courses/kalimari_desert.mk @@ -43,7 +43,7 @@ KALIMARI_DESERT_EXPORT_SENTINEL := $(KALIMARI_DESERT_DIR)/.export $(BUILD_DIR)/courses/kalimari_desert/course_data.o: $(KALIMARI_DESERT_PNG:%.png=%.inc.c) $(CACTUS_PALETTE_IMPORT:%.png=%.inc.c) $(KALIMARI_DESERT_PNG:%.png=%.inc.c) $(CACTUS_PALETTE_IMPORT:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(BUILD_DIR)/data/other_textures.o: $(CACTUS_PNG:%.png=%.mio0) @@ -52,7 +52,7 @@ $(CACTUS_PNG:%.png=%.mio0): %.mio0 : %.bin $(V)$(MIO0TOOL) -c $< $@ $(CACTUS_PNG:%.png=%.bin): %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(CACTUS_PALETTE) $(CACTUS_PALETTE) $(CACTUS_PALETTE_IMPORT) $(CACTUS_PNG): $(KALIMARI_DESERT_EXPORT_SENTINEL) ; diff --git a/assets/include/courses/koopa_troopa_beach.mk b/assets/include/courses/koopa_troopa_beach.mk index b2121d8252..a12e5cbc03 100644 --- a/assets/include/courses/koopa_troopa_beach.mk +++ b/assets/include/courses/koopa_troopa_beach.mk @@ -24,11 +24,11 @@ $(BUILD_DIR)/courses/koopa_troopa_beach/course_data.o: $(KOOPA_TROOPA_BEACH_CRAB $(BUILD_DIR)/courses/koopa_troopa_beach/course_data.o: $(KOOPA_TROOPA_BEACH_PNG:%.png=%.inc.c) $(KOOPA_TROOPA_BEACH_CRAB_FRAMES:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(KOOPA_TROOPA_BEACH_CRAB_PALETTE) $(KOOPA_TROOPA_BEACH_CRAB_PALETTE:%.png=%.inc.c) $(KOOPA_TROOPA_BEACH_PNG:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(KOOPA_TROOPA_BEACH_CRAB_PALETTE) $(KOOPA_TROOPA_BEACH_CRAB_FRAMES) $(KOOPA_TROOPA_BEACH_PNG): $(KOOPA_TROOPA_BEACH_EXPORT_SENTINEL) ; diff --git a/assets/include/courses/luigi_raceway.mk b/assets/include/courses/luigi_raceway.mk index 5a01e30f92..cb1deb37f1 100644 --- a/assets/include/courses/luigi_raceway.mk +++ b/assets/include/courses/luigi_raceway.mk @@ -11,7 +11,7 @@ LUIGI_RACEWAY_EXPORT_SENTINEL := $(LUIGI_RACEWAY_DIR)/.export $(BUILD_DIR)/courses/luigi_raceway/course_data.o: $(LUIGI_RACEWAY_PNG:%.png=%.inc.c) $(LUIGI_RACEWAY_PNG:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(LUIGI_RACEWAY_PNG): $(LUIGI_RACEWAY_EXPORT_SENTINEL) ; diff --git a/assets/include/courses/mario_raceway.mk b/assets/include/courses/mario_raceway.mk index 5b02570277..c896952167 100644 --- a/assets/include/courses/mario_raceway.mk +++ b/assets/include/courses/mario_raceway.mk @@ -25,13 +25,13 @@ $(PIRANHA_PLANT_FRAMES:%.png=%.mio0): %.mio0 : %.bin $(V)$(MIO0TOOL) -c $< $@ $(PIRANHA_PLANT_FRAMES:%.png=%.bin): %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(MARIO_RACEWAY_PIRANHA_PLANT_PALETTE) $(BUILD_DIR)/courses/mario_raceway/course_data.o: $(MARIO_RACEWAY_PIRANHA_PLANT_PALETTE:%.png=%.inc.c) $(MARIO_RACEWAY_SIGN:%.png=%.inc.c) $(MARIO_RACEWAY_PIRANHA_PLANT_PALETTE:%.png=%.inc.c) $(MARIO_RACEWAY_SIGN:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(PIRANHA_PLANT_FRAMES) $(MARIO_RACEWAY_PIRANHA_PLANT_PALETTE) $(MARIO_RACEWAY_SIGN): $(PIRANHA_PLANT_EXPORT_SENTINEL) ; diff --git a/assets/include/courses/moo_moo_farm.mk b/assets/include/courses/moo_moo_farm.mk index cc366a6bfe..738c439958 100644 --- a/assets/include/courses/moo_moo_farm.mk +++ b/assets/include/courses/moo_moo_farm.mk @@ -44,11 +44,11 @@ $(BUILD_DIR)/courses/moo_moo_farm/course_data.o: $(COW_PALETTE_IMPORT:%.png=%.in $(BUILD_DIR)/courses/moo_moo_farm/course_data.o: $(MOO_MOO_FARM_DIRT_PNG:%.png=%.inc.c) $(MOLE_FRAMES:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(MOLE_PALETTE) $(MOLE_PALETTE:%.png=%.inc.c) $(COW_PALETTE_IMPORT:%.png=%.inc.c) $(MOO_MOO_FARM_DIRT_PNG:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(BUILD_DIR)/data/other_textures.o: $(COW_PNG:%.png=%.mio0) @@ -58,17 +58,17 @@ $(COW_PNG:%.png=%.mio0) $(MOO_MOO_FARM_SIGN_PNG:%.png=%.mio0): %.mio0 : %.bin $(V)$(MIO0TOOL) -c $< $@ $(MOO_MOO_FARM_SIGN_PNG:%.png=%.bin): %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(BUILD_DIR)/courses/moo_moo_farm/course_textures.linkonly.o: $(MOO_MOO_FARM_SIGN_PNG:%.png=%.inc.c) $(MOO_MOO_FARM_SIGN_PNG:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(COW_PNG:%.png=%.bin): %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(COW_PALETTE) $(MOLE_PALETTE) $(COW_PALETTE) $(COW_PALETTE_IMPORT): $(MOO_MOO_FARM_EXPORT_SENTINEL) ; diff --git a/assets/include/courses/rainbow_road.mk b/assets/include/courses/rainbow_road.mk index b8b3946772..47c29bdb27 100644 --- a/assets/include/courses/rainbow_road.mk +++ b/assets/include/courses/rainbow_road.mk @@ -65,39 +65,39 @@ $(BUILD_DIR)/courses/rainbow_road/course_data.o: $(RAINBOW_ROAD_CHARACTER_PALETT $(BUILD_DIR)/courses/rainbow_road/course_data.o: $(RAINBOW_ROAD_PNG:%.png=%.inc.c) $(RAINBOW_ROAD_MUSHROOM_PNG:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(RAINBOW_ROAD_DIR)/gTLUTRainbowRoadNeonMushroom4.png $(RAINBOW_ROAD_MARIO_PNG:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(RAINBOW_ROAD_DIR)/gTLUTRainbowRoadNeonMario5.png $(RAINBOW_ROAD_BOO_PNG:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(RAINBOW_ROAD_DIR)/gTLUTRainbowRoadNeonBoo5.png $(RAINBOW_ROAD_CHARACTER_PNG:%.png=%.inc.c) : $(RAINBOW_ROAD_DIR)/gTextureRainbowRoadNeon%.inc.c : $(RAINBOW_ROAD_DIR)/gTextureRainbowRoadNeon%.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(RAINBOW_ROAD_DIR)/gTLUTRainbowRoadNeon$*.png $(RAINBOW_ROAD_MUSHROOM_PALETTES:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(RAINBOW_ROAD_MARIO_PALETTES:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(RAINBOW_ROAD_BOO_PALETTES:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(RAINBOW_ROAD_CHARACTER_PALETTES:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(RAINBOW_ROAD_PNG:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(RAINBOW_ROAD_MUSHROOM_PALETTES) $(RAINBOW_ROAD_MUSHROOM_PNG): $(RAINBOW_ROAD_EXPORT_SENTINEL) ; diff --git a/assets/include/courses/royal_raceway.mk b/assets/include/courses/royal_raceway.mk index 6df86505cc..43679f4687 100644 --- a/assets/include/courses/royal_raceway.mk +++ b/assets/include/courses/royal_raceway.mk @@ -7,7 +7,7 @@ ROYAL_RACEWAY_EXPORT_SENTINEL := $(ROYAL_RACEWAY_DIR)/.export $(BUILD_DIR)/courses/royal_raceway/course_data.o: $(ROYAL_RACEWAY_PIRANHA_PLANT_PALETTE:%.png=%.inc.c) $(ROYAL_RACEWAY_PIRANHA_PLANT_PALETTE:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(ROYAL_RACEWAY_PIRANHA_PLANT_PALETTE): $(ROYAL_RACEWAY_EXPORT_SENTINEL) ; diff --git a/assets/include/courses/sherbet_land.mk b/assets/include/courses/sherbet_land.mk index 627ce2525e..e5f395308e 100644 --- a/assets/include/courses/sherbet_land.mk +++ b/assets/include/courses/sherbet_land.mk @@ -11,11 +11,11 @@ SHERBET_LAND_EXPORT_SENTINEL := $(SHERBET_LAND_DIR)/.export $(BUILD_DIR)/courses/sherbet_land/course_data.o: $(SHERBET_LAND_ICE:%.png=%.inc.c) $(PENGUIN_PNG:%.png=%.inc.c) $(SHERBET_LAND_ICE:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f ia16 $(PENGUIN_PNG:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(SHERBET_LAND_PNG) $(PENGUIN_PNG) $(SHERBET_LAND_ICE): $(SHERBET_LAND_EXPORT_SENTINEL) ; diff --git a/assets/include/courses/toads_turnpike.mk b/assets/include/courses/toads_turnpike.mk index d6a7df2c60..cb747c360c 100644 --- a/assets/include/courses/toads_turnpike.mk +++ b/assets/include/courses/toads_turnpike.mk @@ -41,7 +41,7 @@ TOADS_TURNPIKE_EXPORT_SENTINEL := $(TOADS_TURNPIKE_DIR)/.export $(BUILD_DIR)/courses/toads_turnpike/course_data.o: $(TOADS_TURNPIKE_PNG:%.png=%.inc.c) $(TOADS_TURNPIKE_PNG:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(TOADS_TURNPIKE_PNG): $(TOADS_TURNPIKE_EXPORT_SENTINEL) ; diff --git a/assets/include/courses/wario_stadium.mk b/assets/include/courses/wario_stadium.mk index 642a23f6ea..0e738a0a5d 100644 --- a/assets/include/courses/wario_stadium.mk +++ b/assets/include/courses/wario_stadium.mk @@ -11,7 +11,7 @@ WARIO_STADIUM_EXPORT_SENTINEL := $(WARIO_STADIUM_DIR)/.export $(BUILD_DIR)/courses/wario_stadium/course_data.o: $(WARIO_STADIUM_SIGN:%.png=%.inc.c) $(WARIO_STADIUM_SIGN:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(WARIO_STADIUM_SIGN): $(WARIO_STADIUM_EXPORT_SENTINEL) ; diff --git a/assets/include/courses/yoshi_valley.mk b/assets/include/courses/yoshi_valley.mk index 1bb11dca03..6ccb72626f 100644 --- a/assets/include/courses/yoshi_valley.mk +++ b/assets/include/courses/yoshi_valley.mk @@ -14,11 +14,11 @@ $(BUILD_DIR)/courses/yoshi_valley/course_data.o: $(YOSHI_VALLEY_HEDGEHOG_PALETTE $(BUILD_DIR)/courses/yoshi_valley/course_data.o: $(YOSHI_VALLEY_PNG:%.png=%.inc.c) $(YOSHI_VALLEY_HEDGEHOG_PNG:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(YOSHI_VALLEY_HEDGEHOG_PALETTE) $(YOSHI_VALLEY_PNG:%.png=%.inc.c) $(YOSHI_VALLEY_HEDGEHOG_PALETTE:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(YOSHI_VALLEY_HEDGEHOG_PALETTE) $(YOSHI_VALLEY_HEDGEHOG_PNG): $(YOSHI_VALLEY_EXPORT_SENTINEL) ; diff --git a/assets/include/debug_font.mk b/assets/include/debug_font.mk index ea6ce7c88f..8df9f0a0a6 100644 --- a/assets/include/debug_font.mk +++ b/assets/include/debug_font.mk @@ -9,11 +9,11 @@ DEBUG_FONT_EXPORT_SENTINEL := $(DEBUG_FONT_DIR)/.export $(BUILD_DIR)/src/data/common_textures.o: $(DEBUG_FONT_PNG:%.png=%.inc.c) $(DEBUG_FONT_PALETTE:%.png=%.inc.c) $(DEBUG_FONT_PNG:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci4 -c rgba16 -p $(DEBUG_FONT_PALETTE) $(DEBUG_FONT_PALETTE:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(DEBUG_FONT_PNG) $(DEBUG_FONT_PALETTE): $(DEBUG_FONT_EXPORT_SENTINEL) ; diff --git a/assets/include/ending_ceremony.mk b/assets/include/ending_ceremony.mk index 50c3fca8af..2488d2e4e0 100644 --- a/assets/include/ending_ceremony.mk +++ b/assets/include/ending_ceremony.mk @@ -15,7 +15,7 @@ ENDING_CEREMONY_EXPORT_SENTINEL := $(ENDING_CEREMONY)/.export $(BUILD_DIR)/src/ending/ceremony_data.o: $(TROHPY_PNG:%.png=%.inc.c) $(PODIUM_PNG:%.png=%.inc.c) $(TROHPY_PNG:%.png=%.inc.c) $(PODIUM_PNG:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(TROHPY_PNG) $(PODIUM_PNG): $(ENDING_CEREMONY_EXPORT_SENTINEL) ; diff --git a/assets/include/finish_line_banner.mk b/assets/include/finish_line_banner.mk index a28eff3331..248b8bf850 100644 --- a/assets/include/finish_line_banner.mk +++ b/assets/include/finish_line_banner.mk @@ -20,13 +20,13 @@ $(FINISH_LINE_BANNER_PNG:%.png=%.mio0): %.mio0 : %.bin $(V)$(MIO0TOOL) -c $< $@ $(FINISH_LINE_BANNER_PNG:%.png=%.bin): %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(FINISH_LINE_BANNER_PALETTE) $(BUILD_DIR)/src/data/common_textures.o: $(FINISH_LINE_BANNER_PALETTE:%.png=%.inc.c) $(FINISH_LINE_BANNER_PALETTE:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(FINISH_LINE_BANNER_PNG) $(FINISH_LINE_BANNER_PALETTE): $(FINISH_LINE_BANNER_EXPORT_SENTINEL) ; diff --git a/assets/include/greenshell.mk b/assets/include/greenshell.mk index 0d603bc396..870962eb59 100644 --- a/assets/include/greenshell.mk +++ b/assets/include/greenshell.mk @@ -20,13 +20,13 @@ $(GREENSHELL_FRAMES:%.png=%.mio0): %.mio0 : %.bin $(V)$(MIO0TOOL) -c $< $@ $(GREENSHELL_FRAMES:%.png=%.bin): %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(GREENSHELL_PALETTE) $(BUILD_DIR)/src/data/common_textures.o: $(GREENSHELL_PALETTE:%.png=%.inc.c) $(GREENSHELL_PALETTE:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(GREENSHELL_FRAMES) $(GREENSHELL_PALETTE): $(GREENSHELL_EXPORT_SENTINEL) ; diff --git a/assets/include/hud_type_c.mk b/assets/include/hud_type_c.mk index 2db0ebb8bb..76944c6a6e 100644 --- a/assets/include/hud_type_c.mk +++ b/assets/include/hud_type_c.mk @@ -35,23 +35,23 @@ $(BUILD_DIR)/src/data/common_textures.o: $(HUD_TYPE_C_TINY_FONT_PNG:%.png=%.inc. $(BUILD_DIR)/src/data/common_textures.o: $(HUD_TYPE_C_PORTRAIT_BORDER_PNG:%.png=%.inc.c) $(HUD_TYPE_C_FONT_PNG:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(HUD_TYPE_C_FONT_PALETTE) $(HUD_TYPE_C_FONT_PALETTE:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(HUD_TYPE_C_TINY_FONT_PNG:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(HUD_TYPE_C_TINY_FONT_PALETTE) $(HUD_TYPE_C_TINY_FONT_PALETTE:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(HUD_TYPE_C_PORTRAIT_BORDER_PNG:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f ia4 $(HUD_TYPE_C_FONT_PNG) $(HUD_TYPE_C_FONT_PALETTE): $(HUD_TYPE_C_EXPORT_SENTINEL) ; diff --git a/assets/include/item_window.mk b/assets/include/item_window.mk index 39c8c53edc..f240cc7e30 100644 --- a/assets/include/item_window.mk +++ b/assets/include/item_window.mk @@ -41,11 +41,11 @@ ITEM_WINDOW_EXPORT_SENTINEL := $(ITEM_WINDOW_DIR)/.export $(BUILD_DIR)/src/data/common_textures.o: $(ITEM_WINDOW_PNG:%.png=%.inc.c) $(ITEM_WINDOW_PALETTES:%.png=%.inc.c) $(ITEM_WINDOW_DIR)/common_texture_%.inc.c: $(ITEM_WINDOW_DIR)/common_texture_%.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(ITEM_WINDOW_DIR)/common_tlut_$*.png $(ITEM_WINDOW_PALETTES:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(ITEM_WINDOW_PNG) $(ITEM_WINDOW_PALETTES): $(ITEM_WINDOW_EXPORT_SENTINEL) ; diff --git a/assets/include/karts/bowser_kart.mk b/assets/include/karts/bowser_kart.mk index 720ba8da83..8bb4d2077c 100644 --- a/assets/include/karts/bowser_kart.mk +++ b/assets/include/karts/bowser_kart.mk @@ -1490,11 +1490,11 @@ $(BOWSER_KART_FRAME_PNG:%.png=%.mio0): %.mio0 : %.bin $(V)$(MIO0TOOL) -c $< $@ $(BOWSER_KART_FRAME_PNG:%.png=%.bin): %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $( $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(BOWSER_KART_FRAME_PNG) $(BOWSER_KART_PALETTE_PNG): $(BOWSER_EXPORT_SENTINEL) ; diff --git a/assets/include/karts/donkeykong_kart.mk b/assets/include/karts/donkeykong_kart.mk index 30dac5875f..176b90d7d5 100644 --- a/assets/include/karts/donkeykong_kart.mk +++ b/assets/include/karts/donkeykong_kart.mk @@ -1490,11 +1490,11 @@ $(DONKEYKONG_KART_FRAME_PNG:%.png=%.mio0): %.mio0 : %.bin $(V)$(MIO0TOOL) -c $< $@ $(DONKEYKONG_KART_FRAME_PNG:%.png=%.bin): %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $( $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(DONKEYKONG_KART_FRAME_PNG) $(DONKEYKONG_KART_PALETTE_PNG): $(DONKEYKONG_EXPORT_SENTINEL) ; diff --git a/assets/include/karts/luigi_kart.mk b/assets/include/karts/luigi_kart.mk index ec5fcd852b..3379422261 100644 --- a/assets/include/karts/luigi_kart.mk +++ b/assets/include/karts/luigi_kart.mk @@ -1490,11 +1490,11 @@ $(LUIGI_KART_FRAME_PNG:%.png=%.mio0): %.mio0 : %.bin $(V)$(MIO0TOOL) -c $< $@ $(LUIGI_KART_FRAME_PNG:%.png=%.bin): %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $( $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(LUIGI_KART_FRAME_PNG) $(LUIGI_KART_PALETTE_PNG): $(LUIGI_EXPORT_SENTINEL) ; diff --git a/assets/include/karts/mario_kart.mk b/assets/include/karts/mario_kart.mk index 06c5beb07c..997d385233 100644 --- a/assets/include/karts/mario_kart.mk +++ b/assets/include/karts/mario_kart.mk @@ -1490,11 +1490,11 @@ $(MARIO_KART_FRAME_PNG:%.png=%.mio0): %.mio0 : %.bin $(V)$(MIO0TOOL) -c $< $@ $(MARIO_KART_FRAME_PNG:%.png=%.bin): %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $( $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(MARIO_KART_FRAME_PNG) $(MARIO_KART_PALETTE_PNG): $(MARIO_EXPORT_SENTINEL) ; diff --git a/assets/include/karts/peach_kart.mk b/assets/include/karts/peach_kart.mk index dc098fcc0f..0d1041309a 100644 --- a/assets/include/karts/peach_kart.mk +++ b/assets/include/karts/peach_kart.mk @@ -1490,11 +1490,11 @@ $(PEACH_KART_FRAME_PNG:%.png=%.mio0): %.mio0 : %.bin $(V)$(MIO0TOOL) -c $< $@ $(PEACH_KART_FRAME_PNG:%.png=%.bin): %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $( $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(PEACH_KART_FRAME_PNG) $(PEACH_KART_PALETTE_PNG): $(PEACH_EXPORT_SENTINEL) ; diff --git a/assets/include/karts/toad_kart.mk b/assets/include/karts/toad_kart.mk index 2c88b35813..8666b2d434 100644 --- a/assets/include/karts/toad_kart.mk +++ b/assets/include/karts/toad_kart.mk @@ -1490,11 +1490,11 @@ $(TOAD_KART_FRAME_PNG:%.png=%.mio0): %.mio0 : %.bin $(V)$(MIO0TOOL) -c $< $@ $(TOAD_KART_FRAME_PNG:%.png=%.bin): %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $( $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(TOAD_KART_FRAME_PNG) $(TOAD_KART_PALETTE_PNG): $(TOAD_EXPORT_SENTINEL) ; diff --git a/assets/include/karts/wario_kart.mk b/assets/include/karts/wario_kart.mk index ad0d6f5210..8ef796a0a9 100644 --- a/assets/include/karts/wario_kart.mk +++ b/assets/include/karts/wario_kart.mk @@ -1490,11 +1490,11 @@ $(WARIO_KART_FRAME_PNG:%.png=%.mio0): %.mio0 : %.bin $(V)$(MIO0TOOL) -c $< $@ $(WARIO_KART_FRAME_PNG:%.png=%.bin): %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $( $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(WARIO_KART_FRAME_PNG) $(WARIO_KART_PALETTE_PNG): $(WARIO_EXPORT_SENTINEL) ; diff --git a/assets/include/karts/yoshi_kart.mk b/assets/include/karts/yoshi_kart.mk index 54bcfbeda7..baa1b19236 100644 --- a/assets/include/karts/yoshi_kart.mk +++ b/assets/include/karts/yoshi_kart.mk @@ -1490,11 +1490,11 @@ $(YOSHI_KART_FRAME_PNG:%.png=%.mio0): %.mio0 : %.bin $(V)$(MIO0TOOL) -c $< $@ $(YOSHI_KART_FRAME_PNG:%.png=%.bin): %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $( $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s raw -f rgba16 $(YOSHI_KART_FRAME_PNG) $(YOSHI_KART_PALETTE_PNG): $(YOSHI_EXPORT_SENTINEL) ; diff --git a/assets/include/lakitu/bluelight.mk b/assets/include/lakitu/bluelight.mk index 75d390144d..e58e9ecb3b 100644 --- a/assets/include/lakitu/bluelight.mk +++ b/assets/include/lakitu/bluelight.mk @@ -17,13 +17,13 @@ BLUELIGHT_EXPORT_SENTINEL := $(BLUELIGHT_DIR)/.export $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(BLUELIGHT_FRAMES:%.png=%.bin) $(BLUELIGHT_FRAMES:%.png=%.bin): %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(BLUELIGHT_PALETTE) $(BUILD_DIR)/src/data/common_textures.o: $(BLUELIGHT_PALETTE:%.png=%.inc.c) $(BLUELIGHT_PALETTE:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(BLUELIGHT_FRAMES) $(BLUELIGHT_PALETTE): $(BLUELIGHT_EXPORT_SENTINEL) ; diff --git a/assets/include/lakitu/checkeredflag.mk b/assets/include/lakitu/checkeredflag.mk index 525933f1a6..def8776c87 100644 --- a/assets/include/lakitu/checkeredflag.mk +++ b/assets/include/lakitu/checkeredflag.mk @@ -41,13 +41,13 @@ CHECKEREDFLAG_EXPORT_SENTINEL := $(CHECKEREDFLAG_DIR)/.export $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(CHECKEREDFLAG_FRAMES:%.png=%.bin) $(CHECKEREDFLAG_FRAMES:%.png=%.bin): %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(CHECKEREDFLAG_PALETTE) $(BUILD_DIR)/src/data/common_textures.o: $(CHECKEREDFLAG_PALETTE:%.png=%.inc.c) $(CHECKEREDFLAG_PALETTE:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(CHECKEREDFLAG_FRAMES) $(CHECKEREDFLAG_PALETTE): $(CHECKEREDFLAG_EXPORT_SENTINEL) ; diff --git a/assets/include/lakitu/finallap.mk b/assets/include/lakitu/finallap.mk index 7be0a0de80..9a8497552b 100644 --- a/assets/include/lakitu/finallap.mk +++ b/assets/include/lakitu/finallap.mk @@ -25,13 +25,13 @@ FINALLAP_EXPORT_SENTINEL := $(FINALLAP_DIR)/.export $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(FINALLAP_FRAMES:%.png=%.bin) $(FINALLAP_FRAMES:%.png=%.bin): %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(FINALLAP_PALETTE) $(BUILD_DIR)/src/data/common_textures.o: $(FINALLAP_PALETTE:%.png=%.inc.c) $(FINALLAP_PALETTE:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(FINALLAP_FRAMES) $(FINALLAP_PALETTE): $(FINALLAP_EXPORT_SENTINEL) ; diff --git a/assets/include/lakitu/fishing.mk b/assets/include/lakitu/fishing.mk index 2a5c22937a..7acf855e1c 100644 --- a/assets/include/lakitu/fishing.mk +++ b/assets/include/lakitu/fishing.mk @@ -13,13 +13,13 @@ FISHING_EXPORT_SENTINEL := $(FISHING_DIR)/.export $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(FISHING_FRAMES:%.png=%.bin) $(FISHING_FRAMES:%.png=%.bin): %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(FISHING_PALETTE) $(BUILD_DIR)/src/data/common_textures.o: $(FISHING_PALETTE:%.png=%.inc.c) $(FISHING_PALETTE:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(FISHING_FRAMES) $(FISHING_PALETTE): $(FISHING_EXPORT_SENTINEL) ; diff --git a/assets/include/lakitu/nolights.mk b/assets/include/lakitu/nolights.mk index e29a967d77..8036dfb5d3 100644 --- a/assets/include/lakitu/nolights.mk +++ b/assets/include/lakitu/nolights.mk @@ -17,13 +17,13 @@ NOLIGHTS_EXPORT_SENTINEL := $(NOLIGHTS_DIR)/.export $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(NOLIGHTS_FRAMES:%.png=%.bin) $(NOLIGHTS_FRAMES:%.png=%.bin): %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(NOLIGHTS_PALETTE) $(BUILD_DIR)/src/data/common_textures.o: $(NOLIGHTS_PALETTE:%.png=%.inc.c) $(NOLIGHTS_PALETTE:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(NOLIGHTS_FRAMES) $(NOLIGHTS_PALETTE): $(NOLIGHTS_EXPORT_SENTINEL) ; diff --git a/assets/include/lakitu/redlights.mk b/assets/include/lakitu/redlights.mk index 655b70d232..c5c85021c6 100644 --- a/assets/include/lakitu/redlights.mk +++ b/assets/include/lakitu/redlights.mk @@ -25,13 +25,13 @@ REDLIGHTS_EXPORT_SENTINEL := $(REDLIGHTS_DIR)/.export $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(REDLIGHTS_FRAMES:%.png=%.bin) $(REDLIGHTS_FRAMES:%.png=%.bin): %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(REDLIGHTS_PALETTE) $(BUILD_DIR)/src/data/common_textures.o: $(REDLIGHTS_PALETTE:%.png=%.inc.c) $(REDLIGHTS_PALETTE:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(REDLIGHTS_FRAMES) $(REDLIGHTS_PALETTE): $(REDLIGHTS_EXPORT_SENTINEL) ; diff --git a/assets/include/lakitu/reverse.mk b/assets/include/lakitu/reverse.mk index acacc6a0bf..415962e247 100644 --- a/assets/include/lakitu/reverse.mk +++ b/assets/include/lakitu/reverse.mk @@ -25,13 +25,13 @@ REVERSE_EXPORT_SENTINEL := $(REVERSE_DIR)/.export $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(REVERSE_FRAMES:%.png=%.bin) $(REVERSE_FRAMES:%.png=%.bin): %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(REVERSE_PALETTE) $(BUILD_DIR)/src/data/common_textures.o: $(REVERSE_PALETTE:%.png=%.inc.c) $(REVERSE_PALETTE:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(REVERSE_FRAMES) $(REVERSE_PALETTE): $(REVERSE_EXPORT_SENTINEL) ; diff --git a/assets/include/lakitu/secondlap.mk b/assets/include/lakitu/secondlap.mk index 7d16c40d65..425123a790 100644 --- a/assets/include/lakitu/secondlap.mk +++ b/assets/include/lakitu/secondlap.mk @@ -25,13 +25,13 @@ SECONDLAP_EXPORT_SENTINEL := $(SECONDLAP_DIR)/.export $(BUILD_DIR)/$(DATA_DIR)/other_textures.o: $(SECONDLAP_FRAMES:%.png=%.bin) $(SECONDLAP_FRAMES:%.png=%.bin): %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(SECONDLAP_PALETTE) $(BUILD_DIR)/src/data/common_textures.o: $(SECONDLAP_PALETTE:%.png=%.inc.c) $(SECONDLAP_PALETTE:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(SECONDLAP_FRAMES) $(SECONDLAP_PALETTE): $(SECONDLAP_EXPORT_SENTINEL) ; diff --git a/assets/include/minimap_icons.mk b/assets/include/minimap_icons.mk index a972822c6a..dc3f76a687 100644 --- a/assets/include/minimap_icons.mk +++ b/assets/include/minimap_icons.mk @@ -17,7 +17,7 @@ MINIMAP_ICONS_EXPORT_SENTINEL := $(MINIMAP_ICONS_DIR)/.export $(BUILD_DIR)/src/data/common_textures.o: $(MINIMAP_ICONS_PNG:%.png=%.inc.c) $(MINIMAP_ICONS_PNG:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(MINIMAP_ICONS_PNG): $(MINIMAP_ICONS_EXPORT_SENTINEL) ; diff --git a/assets/include/onomatopoeia.mk b/assets/include/onomatopoeia.mk index 6e6c498db6..aa26b48ad9 100644 --- a/assets/include/onomatopoeia.mk +++ b/assets/include/onomatopoeia.mk @@ -21,11 +21,11 @@ $(ONOMATOPOEIA_PNG:%.png=%.mio0): %.mio0 : %.bin $(V)$(MIO0TOOL) -c $< $@ $(ONOMATOPOEIA_PNG:%.png=%.bin): %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(ONOMATOPOEIA_PALETTE) $(ONOMATOPOEIA_PALETTE:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(ONOMATOPOEIA_PNG) $(ONOMATOPOEIA_PALETTE): $(ONOMATOPOEIA_EXPORT_SENTINEL) ; diff --git a/assets/include/other_textures.mk b/assets/include/other_textures.mk index 9392b5e13e..6dcab9e92e 100644 --- a/assets/include/other_textures.mk +++ b/assets/include/other_textures.mk @@ -467,9 +467,9 @@ $(BUILD_DIR)/$(OTHER_TEXTURES_DIR)/texture_67490C.rgba16.inc.c $(BUILD_DIR)/courses/big_donut/course_textures.linkonly.o: $(BIG_DONUT_TEXTURES) $(BUILD_DIR)/$(OTHER_TEXTURES_DIR)/%.rgba16.inc.c: $(OTHER_TEXTURES_DIR)/%.rgba16.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(BUILD_DIR)/$(OTHER_TEXTURES_DIR)/%.ia16.inc.c: $(OTHER_TEXTURES_DIR)/%.ia16.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f ia16 diff --git a/assets/include/player_emblems.mk b/assets/include/player_emblems.mk index ccd682e6e6..90a828144d 100644 --- a/assets/include/player_emblems.mk +++ b/assets/include/player_emblems.mk @@ -13,11 +13,11 @@ PLAYER_EMBLEM_EXPORT_SENTINEL := $(PLAYER_EMBLEM_DIR)/.export $(BUILD_DIR)/src/data/common_textures.o: $(PLAYER_EMBLEM_PNGS:%.png=%.inc.c) $(PLAYER_EMBLEM_PALETTE:%.png=%.inc.c) $(PLAYER_EMBLEM_PNGS:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(PLAYER_EMBLEM_PALETTE) $(PLAYER_EMBLEM_PALETTE:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(PLAYER_EMBLEM_PNGS) $(PLAYER_EMBLEM_PALETTE): $(PLAYER_EMBLEM_EXPORT_SENTINEL) ; diff --git a/assets/include/startup_logo.mk b/assets/include/startup_logo.mk index fbab8ffa69..0f5b7c2ce9 100644 --- a/assets/include/startup_logo.mk +++ b/assets/include/startup_logo.mk @@ -7,7 +7,7 @@ STARTUP_LOGO_EXPORT_SENTINEL := $(STARTUP_LOGO)/.export $(BUILD_DIR)/src/data/startup_logo.o: $(REFLECTION_MAP:%.png=%.inc.c) $(REFLECTION_MAP:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(REFLECTION_MAP): $(STARTUP_LOGO_EXPORT_SENTINEL) ; diff --git a/assets/include/trees.mk b/assets/include/trees.mk index 1f53ffa9ae..05e7b13607 100644 --- a/assets/include/trees.mk +++ b/assets/include/trees.mk @@ -27,13 +27,13 @@ $(TREES_PNG:%.png=%.mio0): %.mio0 : %.bin $(V)$(MIO0TOOL) -c $< $@ $(TREES_PNG:%.png=%.bin): %.bin : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s raw -f ci8 -c rgba16 -p $(TREES_PALETTE) $(BUILD_DIR)/src/data/common_textures.o: $(TREES_PALETTE_IMPORT:%.png=%.inc.c) $(TREES_PALETTE:%.png=%.inc.c) $(TREES_PALETTE_IMPORT:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(TREES_PNG) $(TREES_PALETTE) $(TREES_PALETTE_IMPORT): $(TREES_EXPORT_SENTINEL) ; diff --git a/assets/include/unused_traffic_light.mk b/assets/include/unused_traffic_light.mk index 7a65b92895..aa33d8cb9e 100644 --- a/assets/include/unused_traffic_light.mk +++ b/assets/include/unused_traffic_light.mk @@ -19,11 +19,11 @@ UNUSED_TRAFFIC_LIGHT_EXPORT_SENTINEL := $(UNUSED_TRAFFIC_LIGHT_DIR)/.export $(BUILD_DIR)/src/data/common_textures.o: $(UNUSED_TRAFFIC_LIGHT_PNG:%.png=%.inc.c) $(UNUSED_TRAFFIC_LIGHT_PALETTE:%.png=%.inc.c) $(UNUSED_TRAFFIC_LIGHT_PNG:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -Z $@ -g $< -s u8 -f ci8 -c rgba16 -p $(UNUSED_TRAFFIC_LIGHT_PALETTE) $(UNUSED_TRAFFIC_LIGHT_PALETTE:%.png=%.inc.c): %.inc.c : %.png - @$(PRINT) "$(GREEN)N64GRAPHICS extract: $(BLUE) $< -> $@$(NO_COL)\n" + @$(PRINT) "$(GREEN)Converting: $(BLUE) $< -> $@$(NO_COL)\n" $(V)$(N64GRAPHICS) -i $@ -g $< -s u8 -f rgba16 $(UNUSED_TRAFFIC_LIGHT_PNG) $(UNUSED_TRAFFIC_LIGHT_PALETTE): $(UNUSED_TRAFFIC_LIGHT_EXPORT_SENTINEL) ;