remove old images, move some stuff to the new image system

gfx_build/boot/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

gfx_build/char/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

gfx_build/title_screen/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

makefile

@@ -62,9 +62,8 @@ C_OBJ       := $(C_SRC:%.c=$(BLDPATH)/%.o)
 DATA_OBJ    := $(DATA_SRC:%.s=$(BLDPATH)/%.o)
 ALL_OBJ     := $(C_OBJ) $(ASM_OBJ) $(DATA_OBJ) $(GEN_OBJ) $(STRING_OBJ)
 
-
-.PRECIOUS: $(STRING_SRC)
 $(STRINGDIR)/%.s: $(STRINGDIR)/%.txt
+	@echo -e "\e[93mGenerating strings $<\e[0m"
 	$(STRAGB) -o $@ -i $< -t string/table.tbl -e 0xFF
 
 $(BLDPATH)/%.o: %.c $(ASSETS)

sots-private

@@ -1 +1 @@
-Subproject commit d188b0be724b2c158633aadc18c1e05e09d79583
+Subproject commit f8e34a8638508270743c4b0eedebaa3456b66f46

sprites.makefile

@@ -12,42 +12,6 @@ ASSET_ROOT = sots-private/assets
 
 SPRITES_BINARY = object/pkmn_sprites.o
 
-PNG_TITLE_BG := $(ASSET_ROOT)/misc/title/title_tileset_background.png
-PNG_TITLE_AEON := $(ASSET_ROOT)/misc/title/title_tileset_latias_latios_deoxys.png
-PNG_TITLE_LOGO := $(ASSET_ROOT)/misc/title/title_tileset_logo_name.png
-PNG_TITLE_START := $(ASSET_ROOT)/misc/title/title_tileset_press_start.png
-PNG_TITLE_CLOUD := $(ASSET_ROOT)/misc/title/title_sprite_sky.png
-
-PNG_HERO := $(ASSET_ROOT)/misc/char/hero_backsprite.png
-PNG_HEROINE := $(ASSET_ROOT)/misc/char/heroine_backsprite.png
-PNG_HERO_B := $(ASSET_ROOT)/misc/char/hero_bag.png
-PNG_HEROINE_B := $(ASSET_ROOT)/misc/char/heroine_bag.png
-
-S_HERO := $(GFX_BUILD_DIR)/char/hero_backsprite.S
-S_HEROINE := $(GFX_BUILD_DIR)/char/heroine_backsprite.S
-S_HERO_B := $(GFX_BUILD_DIR)/char/hero_bag.S
-S_HEROINE_B := $(GFX_BUILD_DIR)/char/heroine_bag.S
-
-O_HERO := $(GFX_BUILD_DIR)/char/hero_backsprite.o
-O_HEROINE := $(GFX_BUILD_DIR)/char/heroine_backsprite.o
-O_HERO_B := $(GFX_BUILD_DIR)/char/hero_bag.o
-O_HEROINE_B := $(GFX_BUILD_DIR)/char/heroine_bag.o
-
-S_TITLE_BG := $(GFX_BUILD_DIR)/title_screen/title_tileset_background.S
-S_TITLE_AEON := $(GFX_BUILD_DIR)/title_screen/title_tileset_latias_latios_deoxys.S
-S_TITLE_LOGO := $(GFX_BUILD_DIR)/title_screen/title_tileset_logo_name.S
-S_TITLE_START := $(GFX_BUILD_DIR)/title_screen/title_tileset_press_start.S
-S_TITLE_CLOUD := $(GFX_BUILD_DIR)/title_screen/title_sprite_sky.S
-
-O_TITLE_BG := $(GFX_BUILD_DIR)/title_screen/title_tileset_background.o
-O_TITLE_AEON := $(GFX_BUILD_DIR)/title_screen/title_tileset_latias_latios_deoxys.o
-O_TITLE_LOGO := $(GFX_BUILD_DIR)/title_screen/title_tileset_logo_name.o
-O_TITLE_START := $(GFX_BUILD_DIR)/title_screen/title_tileset_press_start.o
-O_TITLE_CLOUD := $(GFX_BUILD_DIR)/title_screen/title_sprite_sky.o
-
-TITLE_OBJ := $(O_TITLE_BG) $(O_TITLE_AEON) $(O_TITLE_LOGO) $(O_TITLE_START) $(O_TITLE_CLOUD)
-HERO_OBJ := $(O_HERO) $(O_HEROINE) $(O_HERO_B) $(O_HEROINE_B)
-
 ITEM_PNG = $(sort $(wildcard $(ASSET_ROOT)/item_icons/*.png))
 ITEM_OBJ = $(addprefix $(GFX_BUILD_DIR)/item/,$(notdir $(ITEM_PNG:.png=.o)))
 
@@ -84,53 +48,15 @@ clean:
 	rm -f $(GFX_BUILD_DIR)/sprites/back_sprites/*
 	rm -f $(GFX_BUILD_DIR)/overworlds/*
 	rm -f $(GFX_BUILD_DIR)/item/*
-	rm -f $(GFX_BUILD_DIR)/char/*
 	rm -f $(GFX_BUILD_DIR)/title_screen/*
 	rm -f $(GFX_BUILD_DIR)/trainer_sprites/*
 
 
-$(SPRITES_BINARY): $(NORMAL_PAL_OBJ) $(HERO_OBJ) $(SHINY_PAL_OBJ) $(SPRITE_FRONT_OBJ) $(SPRITE_BACK_OBJ) $(NORMAL_CASTFORM_PAL_OBJ) $(SHINY_CASTFORM_PAL_OBJ) $(CASTFORM_FRONT_OBJ) $(CASTFORM_BACK_OBJ) $(OW_OBJ) $(TS_OBJ) $(ITEM_OBJ) $(TITLE_OBJ)
+$(SPRITES_BINARY): $(NORMAL_PAL_OBJ) $(SHINY_PAL_OBJ) $(SPRITE_FRONT_OBJ) $(SPRITE_BACK_OBJ) $(NORMAL_CASTFORM_PAL_OBJ) $(SHINY_CASTFORM_PAL_OBJ) $(CASTFORM_FRONT_OBJ) $(CASTFORM_BACK_OBJ) $(OW_OBJ) $(TS_OBJ) $(ITEM_OBJ)
 	@echo -e "\e[1;32mLinking $@\e[0m"
 	@echo "INPUT($^)" > $(TMP_LD)
 	$(LD) -r -o $@ -T $(TMP_LD)
 
-# Characters
-$(GFX_BUILD_DIR)/char/%.o: $(GFX_BUILD_DIR)/char/%.S
-	$(AS) -o $@ $<
-
-$(S_HERO): $(PNG_HERO)
-	$(GRIT) $< -fts -fh! -gt -gB4 -gz! -p -pzl -m! -pu16 -o $@
-
-$(S_HERO_B): $(PNG_HERO_B)
-	$(GRIT) $< -fts -fh! -gt -gB4 -gzl -p -pzl -m! -pu16 -o $@
-
-$(S_HEROINE): $(PNG_HEROINE)
-	$(GRIT) $< -fts -fh! -gt -gB4 -gz! -p -pzl -m! -pu16 -o $@
-
-$(S_HEROINE_B): $(PNG_HEROINE_B)
-	$(GRIT) $< -fts -fh! -gt -gB4 -gzl -p -pzl -m! -pu16 -o $@
-
-# Special titlescreen targets
-$(GFX_BUILD_DIR)/title_screen/%.o: $(GFX_BUILD_DIR)/title_screen/%.S
-	$(AS) -o $@ $<
-
-$(S_TITLE_BG): $(PNG_TITLE_BG)
-	$(GRIT) $< -fts -fh! -gt -gB4 -gzl -p! -pz! -m -mzl -mp 4 -mRtf -pu16 -o $@
-
-$(S_TITLE_AEON): $(PNG_TITLE_AEON)
-	$(GRIT) $< -fts -fh! -gt -gB4 -gzl -p! -pz! -m -mzl -mp 2 -mRtf -pu16 -o $@
-
-$(S_TITLE_LOGO): $(PNG_TITLE_LOGO)
-	$(GRIT) $< -fts -fh! -gt -gB8 -gzl -p! -pz! -m -mzl -mRtf -pu16 -o $@
-
-$(S_TITLE_START): $(PNG_TITLE_START)
-	$(GRIT) $< -fts -fh! -gt -gB4 -gzl -p! -pz! -m -mzl -mp 3 -mRtf -pu16 -o $@
-
-$(S_TITLE_CLOUD): $(PNG_TITLE_CLOUD)
-	$(GRIT) $< -fts -fh! -gt -gB4 -gzl -p -pz! -m! -pu16 -o $@
-
-
-
 # Item Targets
 $(GFX_BUILD_DIR)/item/%.o: $(GFX_BUILD_DIR)/item/%.s
 	@echo -e "\e[32mAssembling $<\e[0m"