Merge pull request #673 from MokhaLeee/tsa

Match TSAs: EfxSkill and EfxMagic DemonLightBG

.gitignore

@@ -74,6 +74,14 @@ tools/agbcc
 *.fk
 data/banim/*.bin
 
+*.feimg1.bin
+*.feimg2.bin
+*.feimg3.bin
+
+*.fetsa1.bin
+*.fetsa2.bin
+*.fetsa3.bin
+
 # =========================
 # Dump Scripts Output
 # =========================

Makefile

@@ -33,6 +33,7 @@ AIF2PCM    := tools/aif2pcm/aif2pcm$(EXE)
 MID2AGB    := tools/mid2agb/mid2agb$(EXE)
 TEXTENCODE := tools/textencode/textencode$(EXE)
 JSONPROC   := tools/jsonproc/jsonproc$(EXE)
+FETSATOOL  := tools/gfxtools/tsa_generator.py
 
 ifeq ($(UNAME),Darwin)
 	SED := sed -i ''
@@ -110,7 +111,7 @@ clean:
 	# Remove converted songs
 	$(RM) -f $(MID_SUBDIR)/*.s
 	$(RM) -f $(AUTO_GEN_TARGETS)
-	find . \( -iname '*.o' -o -iname '*.obj' -o -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.fk' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} +
+	@find . \( -iname '*.o' -o -iname '*.obj' -o -iname '*.feimg1.bin' -o -iname '*.fetsa1.bin' -o -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.fk' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} +
 
 .PHONY: clean
 
@@ -152,6 +153,9 @@ sound/%.bin: sound/%.aif ; $(AIF2PCM) $< $@
 %.4bpp.h: %.4bpp
 	$(BIN2C) $< $(subst .,_,$(notdir $<)) | sed 's/^const //' > $@
 
+%.feimg1.bin %.fetsa1.bin: %.png
+	$(FETSATOOL) $< $*.feimg1.bin $*.fetsa1.bin
+
 # Battle Animation Recipes
 
 $(BANIM_OBJECT): $(shell ./scripts/arm_compressing_linker.py -t linker_script_banim.txt -m)