ref: 4c480a23dc2f81323b48670612cb23516a544e86
parent: c8960dd2c8043d9a10e961379996fa18fef34033
parent: dc620c08ee43a4baee7cb4b04b22661ccf2ad60a
author: PikalaxALT <PikalaxALT@gmail.com>
date: Wed Jul 22 12:36:28 EDT 2015
Fixed a few labeling bugs
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@
.SECONDEXPANSION:
poketools := extras/pokemontools
-gfx := $(PYTHON) $(poketools)/gfx.py
+gfx := $(PYTHON) gfx.py
includes := $(PYTHON) $(poketools)/scan_includes.py
@@ -79,12 +79,13 @@
find . -iname "*.[12]bpp" -exec touch {} + find . -iname "*.lz" -exec touch {} +-%.2bpp: %.png ; @$(gfx) 2bpp $<
-%.1bpp: %.png ; @$(gfx) 1bpp $<
-%.lz: % ; @$(gfx) lz $<
+%.2bpp: %.png ; $(gfx) 2bpp $<
+%.1bpp: %.png ; $(gfx) 1bpp $<
+%.lz: % ; $(gfx) lz $<
-%.pal: ;
+%.pal: %.2bpp ;
+gfx/pics/%/normal.pal gfx/pics/%/bitmask.asm gfx/pics/%/frames.asm: gfx/pics/%/front.2bpp ;
%.bin: ;
%.blk: ;
%.tilemap: ;
--- a/engine/credits.asm
+++ b/engine/credits.asm
@@ -792,13 +792,13 @@
; 109c24 (42:5c24)
-CreditsBorderGFX: INCBIN "gfx/credits/border.w72.2bpp"
+CreditsBorderGFX: INCBIN "gfx/credits/border.2bpp"
CreditsMonsGFX:
-CreditsPichuGFX: INCBIN "gfx/credits/pichu.w32.2bpp"
-CreditsSmoochumGFX: INCBIN "gfx/credits/smoochum.w32.2bpp"
-CreditsDittoGFX: INCBIN "gfx/credits/ditto.w32.2bpp"
-CreditsIgglybuffGFX: INCBIN "gfx/credits/igglybuff.w32.2bpp"
+CreditsPichuGFX: INCBIN "gfx/credits/pichu.2bpp"
+CreditsSmoochumGFX: INCBIN "gfx/credits/smoochum.2bpp"
+CreditsDittoGFX: INCBIN "gfx/credits/ditto.2bpp"
+CreditsIgglybuffGFX: INCBIN "gfx/credits/igglybuff.2bpp"
CreditsScript: ; 10acb4
--- a/engine/pack.asm
+++ b/engine/pack.asm
@@ -1690,4 +1690,4 @@
INCBIN "gfx/misc/pack_menu.2bpp"
PackGFX:
-INCBIN "gfx/misc/pack.w40.2bpp"
+INCBIN "gfx/misc/pack.2bpp"