Skip to content

Commit

Permalink
Update wording
Browse files Browse the repository at this point in the history
  • Loading branch information
MegaMech committed Apr 20, 2024
1 parent 3dfbc43 commit 33bb9f7
Show file tree
Hide file tree
Showing 59 changed files with 119 additions and 119 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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/%
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions assets/include/blueshell.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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) ;
Expand Down
4 changes: 2 additions & 2 deletions assets/include/bomb.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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) ;
Expand Down
8 changes: 4 additions & 4 deletions assets/include/character_portraits.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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) ;
Expand Down
2 changes: 1 addition & 1 deletion assets/include/character_select/bowser_select.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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) ;
Expand Down
2 changes: 1 addition & 1 deletion assets/include/character_select/donkeykong_select.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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) ;
Expand Down
2 changes: 1 addition & 1 deletion assets/include/character_select/luigi_select.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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) ;
Expand Down
2 changes: 1 addition & 1 deletion assets/include/character_select/mario_select.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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) ;
Expand Down
2 changes: 1 addition & 1 deletion assets/include/character_select/peach_select.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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) ;
Expand Down
2 changes: 1 addition & 1 deletion assets/include/character_select/toad_select.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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) ;
Expand Down
2 changes: 1 addition & 1 deletion assets/include/character_select/wario_select.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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) ;
Expand Down
2 changes: 1 addition & 1 deletion assets/include/character_select/yoshi_select.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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) ;
Expand Down
2 changes: 1 addition & 1 deletion assets/include/course_outlines.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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) ;
Expand Down
2 changes: 1 addition & 1 deletion assets/include/course_previews.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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) ;
Expand Down
6 changes: 3 additions & 3 deletions assets/include/courses/banshee_boardwalk.mk
Original file line number Diff line number Diff line change
Expand Up @@ -63,19 +63,19 @@ $(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)
$(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
@$(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) ;
Expand Down
4 changes: 2 additions & 2 deletions assets/include/courses/bowsers_castle.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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) ;
Expand Down
2 changes: 1 addition & 1 deletion assets/include/courses/choco_mountain.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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) ;
Expand Down
4 changes: 2 additions & 2 deletions assets/include/courses/dks_jungle_parkway.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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) ;
Expand Down
8 changes: 4 additions & 4 deletions assets/include/courses/frappe_snowland.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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) ;
Expand Down
4 changes: 2 additions & 2 deletions assets/include/courses/kalimari_desert.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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) ;
Expand Down
4 changes: 2 additions & 2 deletions assets/include/courses/koopa_troopa_beach.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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) ;
Expand Down
2 changes: 1 addition & 1 deletion assets/include/courses/luigi_raceway.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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) ;
Expand Down
4 changes: 2 additions & 2 deletions assets/include/courses/mario_raceway.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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) ;
Expand Down
10 changes: 5 additions & 5 deletions assets/include/courses/moo_moo_farm.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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) ;
Expand Down
Loading

0 comments on commit 33bb9f7

Please sign in to comment.