ref: a8b025291a642d3682305df2c09c03be69651af3
parent: d72b2ec16796cba952499311e98ec3d8d654a55c
author: Jacob Moody <[email protected]>
date: Tue Feb 28 12:25:47 EST 2023
typos in exceptions and a couple more with this only some compression bugs are preventing a correct match.
--- a/except.mk
+++ b/except.mk
@@ -51,7 +51,7 @@
rgbgfx -o $target $prereq(1)
$TGFX --interleave --png $prereq(1) -o $target $target
gfx/title/logo.2bpp: gfx/title/logo.png
- rgbgfx -x2 -o $target $prereq(1)
+ rgbgfx -x4 -o $target $prereq(1)
gfx/trade/ball.2bpp: gfx/trade/ball.png
rgbgfx -o $target $prereq(1)
@@ -62,7 +62,7 @@
gfx/slots/slots_1.2bpp: gfx/slots/slots_1.png
rgbgfx -o $target $prereq(1)
- $TGFX --remove-whitespace -o $target $target
+ $TGFX --trim-whitespace -o $target $target
gfx/slots/slots_2.2bpp: gfx/slots/slots_2.png
rgbgfx -o $target $prereq(1)
$TGFX --interleave --png $prereq(1) -o $target $target
@@ -161,8 +161,8 @@
rgbgfx -h -o $target $prereq(1)
gfx/font/unused_bold_font.1bpp: gfx/font/unused_bold_font.png
- rgbgfx -o $target $prereq(1)
- $TGFX --trim-whitespace -o $target $target
+ rgbgfx -d1 -o $target $prereq(1)
+ $TGFX -d1 --trim-whitespace -o $target $target
gfx/sgb/sgb_border.2bpp: gfx/sgb/sgb_border.png
rgbgfx -o $target $prereq(1)
@@ -194,7 +194,7 @@
$TGFX --trim-whitespace -o $target $target
gfx/mobile/phone_tiles.2bpp: gfx/mobile/phone_tiles.png
rgbgfx -o $target $prereq(1)
- $TGFX --trim-whitespace -o $target $target
+ $TGFX --remove-whitespace -o $target $target
gfx/mobile/pichu_animated.2bpp: gfx/mobile/pichu_animated.png
rgbgfx -o $target $prereq(1)
$TGFX --trim-whitespace -o $target $target
--- a/mkfile
+++ b/mkfile
@@ -81,6 +81,29 @@
<anim.mk
<except.mk
+# Dewgong has an unused tile id in its last frame. The tile itself is missing.
+gfx/pokemon/dewgong/frames.asm: gfx/pokemon/dewgong/front.animated.tilemap gfx/pokemon/dewgong/front.dimensions
+ $TANIM -f $prereq > $target
+ echo ' db $4d' >> $target
+
+# Lugia has two unused tile ids in its last frame. The tiles themselves are missing.
+gfx/pokemon/lugia/frames.asm: gfx/pokemon/lugia/front.animated.tilemap gfx/pokemon/lugia/front.dimensions
+ $TANIM -f $prereq > $target
+ echo ' db $5e, $59' >> $target
+
+# Girafarig has a redundant tile after the end. It is used in two frames, so it must be injected into the generated graphics.
+# This is more involved, so it's hacked into pokemon_animation_graphics.
+gfx/pokemon/girafarig/front.animated.2bpp: gfx/pokemon/girafarig/front.2bpp gfx/pokemon/girafarig/front.dimensions
+ $TANIMG --girafarig -o $target $prereq
+gfx/pokemon/girafarig/front.animated.tilemap: gfx/pokemon/girafarig/front.2bpp gfx/pokemon/girafarig/front.dimensions
+ $TANIMG --girafarig -t $target $prereq
+
+# matching
+# LZFLAGS=--compressor multipass
+# <lz.mk
+
+LZFLAGS=
+
$TARG: $OFILES
$LD $LDFLAGS -o $target $OFILES
$FIX $FIFLAGS $target
@@ -102,7 +125,7 @@
rgbgfx -p $target $stem.png
%.lz: %
- $LZ -- $stem $target
+ $LZ $LZFLAGS -- $stem $target
clean:VQ:
for(i in $B2FILES)