sync and renice makefile colors

g3headers

@@ -1 +1 @@
-Subproject commit 96f9db527ac23ab26be5614c2aeda2b1e3e5c7ab
+Subproject commit a2e68703dcfccb4ef2319f8fd79a8ea7803a63c7

makefile

@@ -95,40 +95,40 @@ SCRIPT_OBJ	:= $(SCRIPT_SRC:%.s=$(BLDPATH)/%.o)
 ALL_OBJ     := $(GEN_OBJ) $(C_OBJ) $(ASM_OBJ) $(DATA_OBJ) $(STRING_OBJ) $(SCRIPT_OBJ) $(MAP_PROJ_O) $(MAP_FILES_O) $(TS_FILES_O) $(TS_GEN_O)
 
 $(MAPMAPS)/%.s: $(MAPMAPS)/%.pmh
-	@echo "\033[96mGenerating map $<\033[0m"
+	@printf "\e[1;33mGenerating map\e[0m $<\n"
 	$(PYMAPS) -o $@ $<
 
 $(MAPTS)/%.s: $(MAPTS)/%.pts
-	@echo "\033[94mGenerating tileset $<\033[0m"
+	@printf "\e[1;33mGenerating tileset\e[0m $<\n"
 	$(PYSETS) -o $@ $<
 
 $(STRINGDIR)/%.s: $(STRINGDIR)/%.txt
-	@echo "\033[93mGenerating strings $<\033[0m"
+	@printf "\e[1;36mGenerating strings\e[0m $<\n"
 	$(STRAGB) -o $@ -i $< -t string/table.tbl -e 0xFF
 
 $(BLDPATH)/%.o: %.c $(ASSETS) $(PAGB_INCLUDE)/pokeagb/pokeagb.h
-	@echo "\033[32mCompiling $<\033[0m"		
+	@printf "\e[1;31mCompiling\e[0m $<\n"
 	$(shell mkdir -p $(dir $@))		
 	$(CC) $(CFLAGS) -c $< -o $@		
 		
 $(BLDPATH)/%.o: %.s $(PAGB_INCLUDE)/pokeagb/pokeagb.h
-	@echo "\033[32mAssembling $<\033[0m"		
-	$(shell mkdir -p $(dir $@))		
-	$(PREPROC) $< $(CHARMAP) > $*.i		
+	@printf "\e[1;31mAssembling\e[0m $<\n"
+	$(shell mkdir -p $(dir $@))
+	$(PREPROC) $< $(CHARMAP) > $*.i
 	$(CC) $(CFLAGS) -c -x assembler-with-cpp $*.i -o $@		
 	@rm -f $*.i
 
 $(MAPTS)/%.s: $(MAPTS)/%.png
-	@echo "\033[34mProcessing image (tileset) $<\033[0m"
+	@printf "\e[1;33mProcessing image (tileset)\e[0m $<\n"
 	$(GRIT) $< -o $@ -fts -gzl -pz! -pu16 -gB4 -m! -mR!
 
 generated_image/%.c generated_image/%.h: $(AUTO_ASSET_ROOT)/%.png $(AUTO_ASSET_ROOT)/%.grit
-	@echo "\033[34mProcessing image $<\033[0m"
+	@printf "\e[1;33mProcessing image\e[0m $<\n"
 	$(shell mkdir -p $(dir $@))
 	$(GRIT) $< -o $@ -ftc -ff $(<:%.png=%.grit)
 
 generated_image/%.c generated_image/%.h: $(AUTO_ASSET_ROOT)/%.png
-	@echo "\033[34mProcessing image $< (using directory grit file)\033[0m"
+	@printf "\e[1;33mProcessing image (using directory grit file)\e[0m $<\n"
 	$(shell mkdir -p $(dir $@))
 	$(GRIT) $< -o $@ -ftc -ff $(<D)/$(notdir $(<D)).grit
 
@@ -136,7 +136,7 @@ all: $(GEN_H) rom
 
 .PHONY: rom
 rom: main.asm $(MAIN_OBJ)
-	@echo "\033[1;32mCreating ROM\033[0m"
+	@printf "\e[1;30;41mCreating ROM\e[0m\n"
 	$(ARS) $<
 	$(NM) $(BLDPATH)/linked.o -n -g --defined-only | \
 		sed -e '{s/^/0x/g};{/.*\sA\s.*/d};{s/\sT\s/ /g}' > $(OUTPATH)/__symbols.sym
@@ -145,7 +145,7 @@ rom: main.asm $(MAIN_OBJ)
 	
 $(MAIN_OBJ): $(ALL_OBJ) $(SPRITES) $(MUSIC_AR) $(SMPL_AR) $(VOICE_AR) $(LIST_AR) $(CRY_AR) #$(B_ENGINE)
 	$(MAKE) -f assets.makefile
-	@echo "\033[1;32mLinking ELF binary $@\033[0m"
+	@printf "\e[1;30;41mLinking ELF binary\e[0m $@\n"
 	@echo "INPUT($^)" > $(TMP_LD)
 	$(LD) $(LDFLAGS) -T $(PAGB_LINK) -T linker.ld -T bpre.sym --whole-archive -r -o $@ --start-group -T $(TMP_LD) --end-group
 	$(LD) $(LDFLAGS) -T $(PAGB_LINK) -T linker.ld -T bpre.sym --whole-archive -o $@.dbg --start-group -T $(TMP_LD) --end-group
@@ -153,7 +153,7 @@ $(MAIN_OBJ): $(ALL_OBJ) $(SPRITES) $(MUSIC_AR) $(SMPL_AR) $(VOICE_AR) $(LIST_AR)
 	@rm -f $(TMP_LD)
 
 $(MAP_PROJ_S): $(MAP_PROJ)
-	@echo "\033[91mGenerating map project $<\033[0m"
+	@printf "\e[1;33mGenerating map project\e[0m $<\n"
 	$(PYPROJS) -b sovereign_banks -f sovereign_footer -o $@ $<
 
 .PHONY: $(B_ENGINE)
@@ -191,42 +191,42 @@ clean:
 
 .PHONY: $(ASSETS)
 $(ASSETS):
-	@echo "\033[95mMaking Assets\033[0m"
+	@printf "\e[1;33mMaking Assets\e[0m\n"
 	$(MAKE) -f assets.makefile
 
 .PHONY: $(SPRITES)
 $(SPRITES):
-	@echo "\033[95mMaking Sprites\033[0m"
+	@printf "\e[1,33mMaking Sprites\e[0m\n"
 	$(MAKE) -f sprites.makefile
 
 .PHONY: $(ICONS_AR)
 $(ICONS_AR):
-	@echo "\033[95mMaking Icons\033[0m"
+	@printf "\e[1,33mMaking Icons\e[0m\n"
 	$(MAKE) -f icons.makefile
 
 .PHONY: $(MUSIC_AR)
 $(MUSIC_AR):
-	@echo "\033[95mMaking Music\033[0m"
+	@printf "\e[1,32mMaking Music\e[0m\n"
 	$(MAKE) -C $(dir $@) all
 
 .PHONY: $(SMPL_AR)
 $(SMPL_AR):
-	@echo "\033[95mMaking Sampler\033[0m"
+	@printf "\e[1,32mMaking Sampler\e[0m\n"
 	$(MAKE) -C $(dir $@) all
 
 .PHONY: $(VOICE_AR)
 $(VOICE_AR):
-	@echo "\033[95mMaking Voice\033[0m"
+	@printf "\e[1,32mMaking Voice\e[0m\n"
 	$(MAKE) -C $(dir $@) all
 
 .PHONY: $(LIST_AR)
 $(LIST_AR):
-	@echo "\033[95mMaking Songlist\033[0m"
+	@printf "\e[1,32mMaking Songlist\e[0m\n"
 	$(MAKE) -C $(dir $@) all
 
 .PHONY: $(CRY_AR)
 $(CRY_AR):
-	@echo "\033[95mMaking Cries\033[0m"
+	@printf "\e[1,32mMaking Cries\e[0m\n"
 	$(MAKE) -C $(dir $@) all
 
 .PHONY: constants

sprites.makefile

@@ -52,46 +52,46 @@ clean:
 
 
 $(SPRITES_BINARY): $(OW_OBJ) $(TS_OBJ) $(ITEM_OBJ)
-	@echo "\033[1;32mLinking $@\033[0m"
+	@printf "\e[1;30;41mLinking\e[0m $@\n"
 	@echo "INPUT($^)" > $(TMP_LD)
 	$(LD) -r -o $@ -T $(TMP_LD)
 
 # Item Targets
 $(GFX_BUILD_DIR)/item/%.o: $(GFX_BUILD_DIR)/item/%.s
-	@echo "\033[32mAssembling $<\033[0m"
+	@printf "\e[1;31mAssembling\e[0m $<\n"
 	$(AS) -o $@ $<
 
 .PRECIOUS: $(GFX_BUILD_DIR)/item/%.s
 $(GFX_BUILD_DIR)/item/%.s: $(ASSET_ROOT)/item_icons/%.png
-	@echo "\033[34mProcessing image $<\033[0m"
+	@printf "\e[1;34mProcessing image\e[0m $<\n"
 	$(GRIT) $< -fts -fh! -gt -gB4 -gzl -p -pzl -m! -pu16 -o $@
 
 # OW Targets
 $(GFX_BUILD_DIR)/overworlds/%.o: $(GFX_BUILD_DIR)/overworlds/%.s
-	@echo "\033[32mAssembling $<\033[0m"
+	@printf "\e[1;31mAssembling\e[0m $<\n"
 	$(AS) -o $@ $<
 
 .PRECIOUS: $(GFX_BUILD_DIR)/overworlds/%.s
 $(GFX_BUILD_DIR)/overworlds/%.s: $(ASSET_ROOT)/overworld/%.png
-	@echo "\033[34mProcessing image $<\033[0m"
+	@printf "\e[1;34mProcessing image\e[0m $<\n"
 	$(GRIT) $< -fts -fh! -gt -gB4 -gz! -p -pz! -m! -pu16 -o $@
 
 # Trainer Sprite Targets
 $(GFX_BUILD_DIR)/trainer_sprites/%.o: $(GFX_BUILD_DIR)/trainer_sprites/%.s
-	@echo "\033[32mAssembling $<\033[0m"
+	@printf "\e[1;31mAssembling\e[0m $<\n"
 	$(AS) -o $@ $<
 
 $(GFX_BUILD_DIR)/trainer_sprites/%.s: $(ASSET_ROOT)/trainer_sprites/%.png
-	@echo "\033[34mProcessing image $<\033[0m"
+	@printf "\e[1;34mProcessing image\e[0m $<\n"
 	$(GRIT) $< -fts -fh! -gt -gB4 -gzl -p -pzl -m! -o $@
 
 # Normal Palette Targets
 $(GFX_BUILD_DIR)/sprites/normal_pal/%.o: $(GFX_BUILD_DIR)/sprites/normal_pal/%.s
-	@echo "\033[32mAssembling $<\033[0m"
+	@printf "\e[1;31mAssembling\e[0m $<\n"
 	$(AS) -o $@ $<
 
 $(GFX_BUILD_DIR)/sprites/normal_pal/%.s: $(ASSET_ROOT)/pkmn_sprites/%.png
-	@echo "\033[34mProcessing palette $< (normal)\033[0m"
+	@printf "\e[1;34mProcessing palette (normal)\e[0m $<\n"
 	$(GRIT) $< -fts -fh! -g! -gB 4 -gt -m! -p -pzl -pu16 -pn 16 \
 		-s $(shell echo $(notdir $(basename $<)) | sed "s/normal_/n_p_/g") \
 		-o $@
@@ -135,41 +135,41 @@ $(GFX_BUILD_DIR)/sprites/normal_pal/%.s: $(ASSET_ROOT)/pkmn_sprites/%.png
 
 # Misc hardcoded targets
 $(NORMAL_CASTFORM_PAL_OBJ): $(NORMAL_CASTFORM_PAL_OBJ:.o=.s)
-	@echo "\033[32mAssembling $<\033[0m"
+	@printf "\e[1;31mAssembling\e[0m $<\n"
 	$(AS) -o $@ $<
 
 $(NORMAL_CASTFORM_PAL_OBJ:.o=.s): $(CASTFORM_PNG)
-	@echo "\033[34mProcessing palette $< (normal)\033[0m"
+	@printf "\e[34mProcessing palette (normal)\e[0m $<\n"
 	$(GRIT) $< -fts -fh! -g! -gB 4 -gt -m! -p -pzl -pu16 -pn 64 \
 		-s n_p_0385 -o $@
 
 
 $(SHINY_CASTFORM_PAL_OBJ): $(SHINY_CASTFORM_PAL_OBJ:.o=.s)
-	@echo "\033[32mAssembling $<\033[0m"
+	@printf "\e[1;31mAssembling\e[0m $<\n"
 	$(AS) -o $@ $<
 
 $(SHINY_CASTFORM_PAL_OBJ:.o=.s): $(CASTFORM_PNG)
-	@echo "\033[34mProcessing palette $< (shiny)\033[0m"
+	@printf "\e[34mProcessing palette (shiny)\e[0m $<\n"
 	$(GRIT) $< -fts -fh! -g! -gB 4 -gt -m! -p -pzl -pu16 -pn 64 \
 		-s s_p_0385 -o $@
 
 
 $(CASTFORM_FRONT_OBJ): $(CASTFORM_FRONT_OBJ:.o=.s)
-	@echo "\033[32mAssembling $<\033[0m"
+	@printf "\e[1;31mAssembling\e[0m $<\n"
 	$(AS) -o $@ $<
 
 $(CASTFORM_FRONT_OBJ:.o=.s): $(CASTFORM_PNG)
-	@echo "\033[34mProcessing sprite $< (front)\033[0m"
+	@printf "\e[34mProcessing sprite (front)\e[0m $<\n"
 	$(GRIT) $< -fts -fh! -g -gB 4 -gt -gzl -al 0 -aw 256 -ah 64 -m! -p! \
 		-s front_0385 -o $@
 
 
 $(CASTFORM_BACK_OBJ): $(CASTFORM_BACK_OBJ:.o=.s)
-	@echo "\033[32mAssembling $<\033[0m"
+	@printf "\e[1;31mAssembling\e[0m $<\n"
 	$(AS) -o $@ $<
 
 $(CASTFORM_BACK_OBJ:.o=.s): $(CASTFORM_PNG)
-	@echo "\033[34mProcessing sprite $< (back)\033[0m"
+	@printf "\e[34mProcessing sprite (back)\e[0m $<\n"
 	$(GRIT) $< -fts -fh! -g -gB 4 -gt -gzl -al 0 -aw 256 -at 64 -ah 64 -m! -p! \
 		-s back_0385 -o $@