diff options
| author | Rangi <remy.oukaour+rangi@gmail.com> | 2018-05-31 19:47:03 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi@gmail.com> | 2018-05-31 19:47:03 -0400 |
| commit | a7e358cd7e3bb99b3189afe753831656fcc0c354 (patch) | |
| tree | 427b19b7c18c5aed088301e854a7efb506453e4b | |
| parent | bd9e0d92c0a097c42d7fbb2ab90fdd02e0290088 (diff) | |
Keep pokemon data in data/pokemon
Don't print "Here" a lot
'make mostlyclean' needs to remove .d files in case a file was renamed
| -rw-r--r-- | Makefile | 1 | ||||
| -rwxr-xr-x | data/pokemon/palettes.inc (renamed from data/pokemon_palettes.inc) | 0 | ||||
| -rw-r--r-- | gfx.asm | 2 | ||||
| -rw-r--r-- | tools/disasm_coverage.py | 1 |
4 files changed, 2 insertions, 2 deletions
@@ -48,6 +48,7 @@ clean: .PHONY: mostlyclean mostlyclean: rm -rf $(ROMS) $(OBJS) $(ROMS:.gb=.sym) $(ROMS:.gb=.map) + find . \( -iname '*.d' \) -exec rm {} + $(ROMS): $(OBJS) $(RGBLINK) -d -n $(@:.gb=.sym) -m $(@:.gb=.map) -O $(BASEROM) -o $@ $^ diff --git a/data/pokemon_palettes.inc b/data/pokemon/palettes.inc index 41ca0d5..41ca0d5 100755 --- a/data/pokemon_palettes.inc +++ b/data/pokemon/palettes.inc @@ -26,7 +26,7 @@ PokegearGFX:: INCBIN "gfx/pokegear/pokegear.2bpp" SECTION "Super Palettes", ROMX[$5B4C], BANK[$02] -INCLUDE "data/pokemon_palettes.inc" +INCLUDE "data/pokemon/palettes.inc" INCLUDE "data/super_palettes.inc" SECTION "Unused SGB Border GFX", ROMX[$62CC], BANK[$02] diff --git a/tools/disasm_coverage.py b/tools/disasm_coverage.py index 964e394..bb5c9fd 100644 --- a/tools/disasm_coverage.py +++ b/tools/disasm_coverage.py @@ -77,7 +77,6 @@ if __name__ == "__main__": for col in row: if (0 != col): - print('Here') rgb = [255 * x for x in hls_to_rgb(120/360, 1.0 - (col/bpp * (100 - 15))/100, 100/100)] row_png_data += tuple(rgb) |