Skip to content

Commit f1741d6

Browse files
authored
Merge pull request #722 from BlueAnthem37510/parallel
Image to tiles + tsa
2 parents fca5f90 + 718d811 commit f1741d6

File tree

85 files changed

+506
-116
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+506
-116
lines changed

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ clean:
115115
# Remove converted songs
116116
$(RM) -f $(MID_SUBDIR)/*.s
117117
$(RM) -f $(AUTO_GEN_TARGETS)
118-
@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 {} +
118+
@find . \( -iname '*.o' -o -iname '*.obj' -o -iname '*.feimg1.bin' -o -iname '*.feimg2.bin' -o -iname '*.fetsa1.bin' -o -iname '*.fetsa2.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 {} +
119119

120120
.PHONY: clean
121121

@@ -178,6 +178,9 @@ sound/%.bin: sound/%.aif ; $(AIF2PCM) $< $@
178178
%.feimg1.bin %.fetsa1.bin: %.png
179179
$(FETSATOOL) $< $*.feimg1.bin $*.fetsa1.bin
180180

181+
%.feimg2.bin %.fetsa2.bin: %.png
182+
$(FETSATOOL) $< $*.feimg2.bin $*.fetsa2.bin
183+
181184
# Battle Animation Recipes
182185

183186
$(BANIM_OBJECT): $(shell ./scripts/arm_compressing_linker.py -t linker_script_banim.txt -m)

0 commit comments

Comments
 (0)