From b87ad0ab6bb0f4fce1acd1c83f9b7ec163fcbdfb Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Wed, 13 Oct 2021 15:10:39 -0400 Subject: [PATCH] peasant: auto-generate peasant sprite file --- games/peasant/Makefile | 14 +- games/peasant/draw_peasant.s | 2 +- games/peasant/sprites/Makefile | 25 +- games/peasant/sprites/peasant_sprite.inc | 501 ----------------------- 4 files changed, 31 insertions(+), 511 deletions(-) delete mode 100644 games/peasant/sprites/peasant_sprite.inc diff --git a/games/peasant/Makefile b/games/peasant/Makefile index 93363f26..e923f313 100644 --- a/games/peasant/Makefile +++ b/games/peasant/Makefile @@ -160,7 +160,7 @@ INTRO: intro.o ld65 -o INTRO intro.o -C $(LINKER_SCRIPTS)/apple2_6000.inc intro.o: intro.s zp.inc qload.inc music.inc \ - graphics_peasantry/graphics_intro.inc sprites/peasant_sprite.inc \ + graphics_peasantry/graphics_intro.inc sprites/peasant_sprites.inc \ graphics_peasantry/priority_intro.inc \ draw_box.s hgr_rectangle.s hgr_font.s hgr_input.s \ hgr_1x28_sprite_mask.s hgr_1x5_sprite.s hgr_save_restore.s \ @@ -195,7 +195,7 @@ CLIFF: cliff.o ld65 -o CLIFF cliff.o -C $(LINKER_SCRIPTS)/apple2_6000.inc cliff.o: cliff.s zp.inc \ - graphics_cliff/cliff_graphics.inc sprites/peasant_sprite.inc \ + graphics_cliff/cliff_graphics.inc sprites/peasant_sprites.inc \ graphics_cliff/priority_cliff.inc \ draw_box.s hgr_rectangle.s hgr_font.s hgr_input.s \ hgr_1x28_sprite_mask.s hgr_1x5_sprite.s hgr_save_restore.s \ @@ -228,7 +228,7 @@ PEASANT1: peasant1.o ld65 -o PEASANT1 peasant1.o -C $(LINKER_SCRIPTS)/apple2_6000.inc peasant1.o: peasant1.s zp.inc \ - sprites/peasant_sprite.inc sprites/inventory_sprites.inc \ + sprites/peasant_sprites.inc sprites/inventory_sprites.inc \ graphics_peasantry/graphics_peasant1.inc \ graphics_peasantry/priority_peasant1.inc \ draw_box.s hgr_rectangle.s hgr_font.s hgr_input.s \ @@ -244,7 +244,7 @@ PEASANT2: peasant2.o ld65 -o PEASANT2 peasant2.o -C $(LINKER_SCRIPTS)/apple2_6000.inc peasant2.o: peasant2.s zp.inc \ - graphics_peasantry/graphics_peasant2.inc sprites/peasant_sprite.inc \ + graphics_peasantry/graphics_peasant2.inc sprites/peasant_sprites.inc \ graphics_peasantry/priority_peasant2.inc \ sprites/inventory_sprites.inc \ draw_box.s hgr_rectangle.s hgr_font.s hgr_input.s \ @@ -260,7 +260,7 @@ PEASANT3: peasant3.o ld65 -o PEASANT3 peasant3.o -C $(LINKER_SCRIPTS)/apple2_6000.inc peasant3.o: peasant3.s zp.inc \ - graphics_peasantry/graphics_peasant3.inc sprites/peasant_sprite.inc \ + graphics_peasantry/graphics_peasant3.inc sprites/peasant_sprites.inc \ graphics_peasantry/priority_peasant3.inc \ draw_box.s hgr_rectangle.s hgr_font.s hgr_input.s \ hgr_1x28_sprite_mask.s hgr_1x5_sprite.s hgr_save_restore.s \ @@ -275,7 +275,7 @@ PEASANT4: peasant4.o ld65 -o PEASANT4 peasant4.o -C $(LINKER_SCRIPTS)/apple2_6000.inc peasant4.o: peasant4.s zp.inc \ - graphics_peasantry/graphics_peasant4.inc sprites/peasant_sprite.inc \ + graphics_peasantry/graphics_peasant4.inc sprites/peasant_sprites.inc \ graphics_peasantry/priority_peasant4.inc \ draw_box.s hgr_rectangle.s hgr_font.s hgr_input.s \ hgr_1x28_sprite_mask.s hgr_1x5_sprite.s hgr_save_restore.s \ @@ -307,7 +307,7 @@ ENDING: ending.o ld65 -o ENDING ending.o -C $(LINKER_SCRIPTS)/apple2_6000.inc ending.o: ending.s zp.inc qload.inc music.inc \ - graphics_end/ending_graphics.inc sprites/peasant_sprite.inc \ + graphics_end/ending_graphics.inc sprites/peasant_sprites.inc \ sprites/ending_sprites.inc \ draw_box.s hgr_rectangle.s hgr_font.s hgr_input.s \ hgr_2x14_sprite_mask.s hgr_1x5_sprite.s \ diff --git a/games/peasant/draw_peasant.s b/games/peasant/draw_peasant.s index b5d05d47..1e0a1194 100644 --- a/games/peasant/draw_peasant.s +++ b/games/peasant/draw_peasant.s @@ -105,4 +105,4 @@ done_pick_draw: rts -.include "sprites/peasant_sprite.inc" +.include "sprites/peasant_sprites.inc" diff --git a/games/peasant/sprites/Makefile b/games/peasant/sprites/Makefile index 3ddeab8e..eb6c8d56 100644 --- a/games/peasant/sprites/Makefile +++ b/games/peasant/sprites/Makefile @@ -1,7 +1,27 @@ HGR_SPRITE = ../../../utils/hgr-utils/hgr_make_sprite all: inventory_sprites.inc ending_sprites.inc trogdor_sprites.inc \ - boat_sprites.inc + boat_sprites.inc peasant_sprites.inc + +peasant_sprites.inc: peasant_sprites.png + $(HGR_SPRITE) -l peasant_right1_sprite peasant_sprites.png 35 1 35 29 > peasant_sprites.inc + $(HGR_SPRITE) -l peasant_right1_mask peasant_sprites.png 21 1 21 29 >> peasant_sprites.inc + $(HGR_SPRITE) -l peasant_right2_sprite peasant_sprites.png 35 34 35 62 >> peasant_sprites.inc + $(HGR_SPRITE) -l peasant_right2_mask peasant_sprites.png 21 34 21 62 >> peasant_sprites.inc + $(HGR_SPRITE) -l peasant_up1_sprite peasant_sprites.png 35 68 35 96 >> peasant_sprites.inc + $(HGR_SPRITE) -l peasant_up1_mask peasant_sprites.png 21 68 21 96 >> peasant_sprites.inc + $(HGR_SPRITE) -l peasant_up2_sprite peasant_sprites.png 35 102 35 130 >> peasant_sprites.inc + $(HGR_SPRITE) -l peasant_up2_mask peasant_sprites.png 21 102 21 130 >> peasant_sprites.inc + $(HGR_SPRITE) -l peasant_left1_sprite peasant_sprites.png 84 1 90 29 >> peasant_sprites.inc + $(HGR_SPRITE) -l peasant_left1_mask peasant_sprites.png 70 1 76 29 >> peasant_sprites.inc + $(HGR_SPRITE) -l peasant_left2_sprite peasant_sprites.png 84 34 90 63 >> peasant_sprites.inc + $(HGR_SPRITE) -l peasant_left2_mask peasant_sprites.png 70 34 76 63 >> peasant_sprites.inc + $(HGR_SPRITE) -l peasant_down1_sprite peasant_sprites.png 84 68 90 97 >> peasant_sprites.inc + $(HGR_SPRITE) -l peasant_down1_mask peasant_sprites.png 70 68 76 97 >> peasant_sprites.inc + $(HGR_SPRITE) -l peasant_down2_sprite peasant_sprites.png 84 102 90 131 >> peasant_sprites.inc + $(HGR_SPRITE) -l peasant_down2_mask peasant_sprites.png 70 102 76 131 >> peasant_sprites.inc + + boat_sprites.inc: boat_sprites.png $(HGR_SPRITE) -s -l boat0 boat_sprites.png 7 1 81 45 > boat_sprites.inc @@ -84,4 +104,5 @@ trogdor_sprites.inc: trogdor_sprites.png $(HGR_SPRITE) -s -l dashing8_sprite trogdor_sprites.png 126 6 132 45 >> trogdor_sprites.inc clean: - rm -f *~ inventory_sprites.inc ending_sprites.inc trogdor_sprites.inc + rm -f *~ peasant_sprites.inc inventory_sprites.inc \ + ending_sprites.inc trogdor_sprites.inc diff --git a/games/peasant/sprites/peasant_sprite.inc b/games/peasant/sprites/peasant_sprite.inc deleted file mode 100644 index 28a90e9a..00000000 --- a/games/peasant/sprites/peasant_sprite.inc +++ /dev/null @@ -1,501 +0,0 @@ -; hgr_make_sprite ./peasant_sprites.png 35 1 35 31 - -peasant_right1_sprite: - .byte $00 - .byte $00 - .byte $00 - .byte $40 - .byte $40 - .byte $40 - .byte $70 - .byte $0C - .byte $00 - .byte $00 - .byte $00 - .byte $0C - .byte $0C - .byte $0C - .byte $1C - .byte $70 - .byte $F5 - .byte $00 - .byte $00 - .byte $00 - .byte $00 - .byte $00 - .byte $0C - .byte $3C - .byte $0F - .byte $0F - .byte $0F - .byte $1C - -; hgr_make_sprite peasant_sprites.png 21 1 21 31 -peasant_right1_mask: - .byte $03 - .byte $00 - .byte $00 - .byte $00 - .byte $00 - .byte $00 - .byte $00 - .byte $73 - .byte $70 - .byte $70 - .byte $70 - .byte $70 - .byte $70 - .byte $70 - .byte $60 - .byte $00 - .byte $00 - .byte $70 - .byte $70 - .byte $03 - .byte $03 - .byte $03 - .byte $03 - .byte $43 - .byte $70 - .byte $70 - .byte $70 - .byte $63 - -; hgr_make_sprite ./peasant_sprites.png 35 34 35 64 -peasant_right2_sprite: - .byte $80 - .byte $80 - .byte $80 - .byte $C0 - .byte $C0 - .byte $C0 - .byte $F0 - .byte $0C - .byte $00 - .byte $00 - .byte $00 - .byte $0C - .byte $0C - .byte $0D - .byte $7D - .byte $71 - .byte $95 - .byte $00 - .byte $00 - .byte $00 - .byte $80 - .byte $80 - .byte $8C - .byte $1C - .byte $67 - .byte $63 - .byte $63 - .byte $6F - -; 21 34 21 64 -peasant_right2_mask: - .byte $03 - .byte $00 - .byte $00 - .byte $00 - .byte $00 - .byte $00 - .byte $00 - .byte $73 - .byte $61 - .byte $61 - .byte $61 - .byte $61 - .byte $61 - .byte $60 - .byte $00 - .byte $00 - .byte $60 - .byte $E1 - .byte $E1 - .byte $E3 - .byte $83 - .byte $83 - .byte $83 - .byte $03 - .byte $18 - .byte $1C - .byte $1C - .byte $10 - -; 35 68 35 98 -peasant_up1_sprite: - .byte $00 - .byte $00 - .byte $00 - .byte $00 - .byte $00 - .byte $00 - .byte $00 - .byte $0C - .byte $00 - .byte $00 - .byte $00 - .byte $33 - .byte $33 - .byte $33 - .byte $33 - .byte $33 - .byte $B7 - .byte $03 - .byte $00 - .byte $00 - .byte $00 - .byte $00 - .byte $30 - .byte $33 - .byte $33 - .byte $33 - .byte $33 - .byte $03 - -; 21 68 21 98 -peasant_up1_mask: - .byte $73 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $73 - .byte $61 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $4C - .byte $4C - .byte $4C - .byte $4C - .byte $4C - .byte $7C - - -; 35 102 35 132 -peasant_up2_sprite: - .byte $00 - .byte $00 - .byte $00 - .byte $00 - .byte $00 - .byte $00 - .byte $00 - .byte $0C - .byte $00 - .byte $00 - .byte $00 - .byte $33 - .byte $33 - .byte $33 - .byte $33 - .byte $33 - .byte $B7 - .byte $30 - .byte $00 - .byte $00 - .byte $00 - .byte $00 - .byte $03 - .byte $33 - .byte $33 - .byte $33 - .byte $33 - .byte $30 - - -; 21 102 21 132 -peasant_up2_mask: - .byte $73 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $73 - .byte $61 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $4C - .byte $4C - .byte $4C - .byte $4C - .byte $4C - .byte $4F - - -; 84 1 90 31 -peasant_left1_sprite: - .byte $00 - .byte $00 - .byte $00 - .byte $01 - .byte $01 - .byte $01 - .byte $07 - .byte $18 - .byte $00 - .byte $00 - .byte $00 - .byte $18 - .byte $18 - .byte $18 - .byte $1C - .byte $07 - .byte $AB - .byte $00 - .byte $00 - .byte $00 - .byte $00 - .byte $00 - .byte $18 - .byte $1E - .byte $78 - .byte $78 - .byte $78 - .byte $1C - -; 70 1 76 31 -peasant_left1_mask: - .byte $60 - .byte $00 - .byte $00 - .byte $00 - .byte $00 - .byte $00 - .byte $00 - .byte $67 - .byte $07 - .byte $07 - .byte $07 - .byte $07 - .byte $07 - .byte $07 - .byte $03 - .byte $00 - .byte $00 - .byte $07 - .byte $07 - .byte $60 - .byte $60 - .byte $60 - .byte $60 - .byte $61 - .byte $07 - .byte $07 - .byte $07 - .byte $63 - - -; 84 34 90 65 -peasant_left2_sprite: - .byte $80 - .byte $80 - .byte $80 - .byte $81 - .byte $81 - .byte $81 - .byte $87 - .byte $18 - .byte $00 - .byte $00 - .byte $00 - .byte $18 - .byte $18 - .byte $58 - .byte $5F - .byte $47 - .byte $E8 - .byte $00 - .byte $00 - .byte $00 - .byte $80 - .byte $80 - .byte $98 - .byte $1C - .byte $73 - .byte $63 - .byte $63 - .byte $7B - -; 70 34 76 65 -peasant_left2_mask: - .byte $60 - .byte $00 - .byte $00 - .byte $00 - .byte $00 - .byte $00 - .byte $00 - .byte $67 - .byte $43 - .byte $43 - .byte $43 - .byte $43 - .byte $43 - .byte $03 - .byte $00 - .byte $00 - .byte $03 - .byte $C3 - .byte $C3 - .byte $E3 - .byte $E0 - .byte $E0 - .byte $E0 - .byte $60 - .byte $0C - .byte $1C - .byte $1C - .byte $04 - -; 84 68 90 99 -peasant_down1_sprite: - .byte $00 - .byte $00 - .byte $1E - .byte $0C - .byte $1E - .byte $12 - .byte $1E - .byte $0C - .byte $00 - .byte $00 - .byte $00 - .byte $33 - .byte $33 - .byte $33 - .byte $33 - .byte $33 - .byte $BB - .byte $03 - .byte $00 - .byte $00 - .byte $00 - .byte $00 - .byte $30 - .byte $33 - .byte $33 - .byte $33 - .byte $33 - .byte $03 - -; 70 68 76 99 -peasant_down1_mask: - .byte $73 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $73 - .byte $61 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $4C - .byte $4C - .byte $4C - .byte $4C - .byte $4C - .byte $7C - -; 84 102 90 133 -peasant_down2_sprite: - .byte $00 - .byte $00 - .byte $1E - .byte $0C - .byte $1E - .byte $12 - .byte $1E - .byte $0C - .byte $00 - .byte $00 - .byte $00 - .byte $33 - .byte $33 - .byte $33 - .byte $33 - .byte $33 - .byte $BB - .byte $30 - .byte $00 - .byte $00 - .byte $00 - .byte $00 - .byte $03 - .byte $33 - .byte $33 - .byte $33 - .byte $33 - .byte $30 - -; 70 102 76 133 -peasant_down2_mask: - .byte $73 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $73 - .byte $61 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $40 - .byte $4C - .byte $4C - .byte $4C - .byte $4C - .byte $4C - .byte $4F -