diff --git a/games/peasant_mini/cliff/Makefile b/games/peasant_mini/cliff/Makefile index d2288b25..0925aab7 100644 --- a/games/peasant_mini/cliff/Makefile +++ b/games/peasant_mini/cliff/Makefile @@ -53,12 +53,11 @@ climb.o: climb.s zx02_optim.s \ cliff_graphics/cliff_base.hgr.zx02 \ sprites/enemy_sprites.inc \ zp.inc hardware.inc \ - walking_sprites.zx02 + climbing_sprites.zx02 ca65 -o climb.o climb.s -l climb.lst #### - walking_sprites.zx02: walking_sprites $(ZX02) -f walking_sprites walking_sprites.zx02 @@ -71,6 +70,21 @@ walking_sprites.o: walking_sprites.s \ ca65 -o walking_sprites.o walking_sprites.s -l walking_sprites.lst +#### + +climbing_sprites.zx02: climbing_sprites + $(ZX02) -f climbing_sprites climbing_sprites.zx02 + +climbing_sprites: climbing_sprites.o + ld65 -o climbing_sprites climbing_sprites.o -C $(LINKER_SCRIPTS)/apple2_a000.inc + +climbing_sprites.o: climbing_sprites.s \ + sprites/flame_sprites.inc \ + sprites/walk_sprites.inc + ca65 -o climbing_sprites.o climbing_sprites.s -l climbing_sprites.lst + + + #### cliff_graphics/cliff_base.hgr.zx02: @@ -83,6 +97,7 @@ sprites/enemy_sprites.inc: #### clean: - rm -f *.lst *.o CLIFF CLIMB HELLO walking_sprites *.zx02 + rm -f *.lst *.o CLIFF CLIMB HELLO \ + walking_sprites climbing_sprites *.zx02 cd cliff_graphics && make clean cd sprites && make clean diff --git a/games/peasant_mini/cliff/climbing_sprites.s b/games/peasant_mini/cliff/climbing_sprites.s new file mode 100644 index 00000000..2ef26a00 --- /dev/null +++ b/games/peasant_mini/cliff/climbing_sprites.s @@ -0,0 +1,88 @@ + + +walk_sprites_xsize: + .byte 2, 2, 2, 2, 2, 2 ; right ; 0 + .byte 2, 2, 2, 2, 2, 2 ; left ; 6 + .byte 2, 2, 2, 2, 2, 2 ; up ; 12 + .byte 2, 2, 2, 2, 2, 2 ; down ; 18 +flame_sprites_xsize: + .byte 2, 2, 2 ; right ; 24 + .byte 2, 2, 2 ; left ; 27 + .byte 2, 2, 2 ; up ; 30 + .byte 2, 2, 2 ; down ; 33 + + +walk_sprites_ysize: + .byte 30, 30, 30, 30, 30, 30 ; right + .byte 30, 30, 30, 30, 30, 30 ; left + .byte 30, 30, 30, 30, 30, 30 ; up + .byte 30, 30, 30, 30, 30, 30 ; down +flame_sprites_ysize: + .byte 9, 9, 9 ; right + .byte 9, 9, 9 ; left + .byte 9, 9, 9 ; up + .byte 9, 9, 9 ; down + +walk_sprites_data_l: + .byte walk_r0_sprite,>walk_r1_sprite,>walk_r2_sprite + .byte >walk_r3_sprite,>walk_r4_sprite,>walk_r5_sprite + .byte >walk_l0_sprite,>walk_l1_sprite,>walk_l2_sprite + .byte >walk_l3_sprite,>walk_l4_sprite,>walk_l5_sprite + .byte >walk_u0_sprite,>walk_u1_sprite,>walk_u2_sprite + .byte >walk_u3_sprite,>walk_u4_sprite,>walk_u5_sprite + .byte >walk_d0_sprite,>walk_d1_sprite,>walk_d2_sprite + .byte >walk_d3_sprite,>walk_d4_sprite,>walk_d5_sprite +flame_sprites_data_h: + .byte >flame_r0_sprite,>flame_r1_sprite,>flame_r2_sprite + .byte >flame_l0_sprite,>flame_l1_sprite,>flame_l2_sprite + .byte >flame_u0_sprite,>flame_u1_sprite,>flame_u2_sprite + .byte >flame_d0_sprite,>flame_d1_sprite,>flame_d2_sprite + +walk_mask_data_l: + .byte walk_r0_mask,>walk_r1_mask,>walk_r2_mask + .byte >walk_r3_mask,>walk_r4_mask,>walk_r5_mask + .byte >walk_l0_mask,>walk_l1_mask,>walk_l2_mask + .byte >walk_l3_mask,>walk_l4_mask,>walk_l5_mask + .byte >walk_u0_mask,>walk_u1_mask,>walk_u2_mask + .byte >walk_u3_mask,>walk_u4_mask,>walk_u5_mask + .byte >walk_d0_mask,>walk_d1_mask,>walk_d2_mask + .byte >walk_d3_mask,>walk_d4_mask,>walk_d5_mask +flame_mask_data_h: + .byte >flame_r0_mask,>flame_r1_mask,>flame_r2_mask + .byte >flame_l0_mask,>flame_r1_mask,>flame_l2_mask + .byte >flame_u0_mask,>flame_u1_mask,>flame_u2_mask + .byte >flame_d0_mask,>flame_d1_mask,>flame_d2_mask + + .include "sprites/walk_sprites.inc" + + .include "sprites/flame_sprites.inc" diff --git a/games/peasant_mini/cliff/hello.bas b/games/peasant_mini/cliff/hello.bas index 617bb64a..6efbae52 100644 --- a/games/peasant_mini/cliff/hello.bas +++ b/games/peasant_mini/cliff/hello.bas @@ -3,4 +3,4 @@ 96 PRINT 100 PRINT " ______" 110 PRINT " A \/\/\/ SOFTWARE PRODUCTION" -120 PRINT CHR$(4);"BRUN CLIFF" +120 PRINT CHR$(4);"BRUN CLIMB" diff --git a/games/peasant_mini/cliff/sprites/Makefile b/games/peasant_mini/cliff/sprites/Makefile index 82a557af..16bfd67c 100644 --- a/games/peasant_mini/cliff/sprites/Makefile +++ b/games/peasant_mini/cliff/sprites/Makefile @@ -1,6 +1,7 @@ HGR_SPRITE = ../../../../utils/hgr-utils/hgr_make_sprite -all: enemy_sprites.inc walk_sprites.inc robe_sprites.inc flame_sprites.inc +all: enemy_sprites.inc walk_sprites.inc \ + climb_sprites.inc robe_sprites.inc flame_sprites.inc enemy_sprites.inc: enemy_sprites.png $(HGR_SPRITE) -l bird0_sprite enemy_sprites.png 210 50 230 66 > enemy_sprites.inc @@ -33,6 +34,43 @@ enemy_sprites.inc: enemy_sprites.png $(HGR_SPRITE) -l smallrock_crash1_mask enemy_sprites.png 168 147 195 165 >> enemy_sprites.inc +climb_sprites.inc: climb_sprites.png + $(HGR_SPRITE) -l climb_r0_sprite climb_sprites.png 126 129 146 159 > climb_sprites.inc + $(HGR_SPRITE) -l climb_r0_mask climb_sprites.png 126 161 146 191 >> climb_sprites.inc + $(HGR_SPRITE) -l climb_r1_sprite climb_sprites.png 154 129 174 159 >> climb_sprites.inc + $(HGR_SPRITE) -l climb_r1_mask climb_sprites.png 154 161 174 191 >> climb_sprites.inc + $(HGR_SPRITE) -l climb_r2_sprite climb_sprites.png 182 129 202 159 >> climb_sprites.inc + $(HGR_SPRITE) -l climb_r2_mask climb_sprites.png 182 161 202 191 >> climb_sprites.inc + $(HGR_SPRITE) -l climb_r3_sprite climb_sprites.png 210 129 230 159 >> climb_sprites.inc + $(HGR_SPRITE) -l climb_r3_mask climb_sprites.png 210 161 230 191 >> climb_sprites.inc + $(HGR_SPRITE) -l climb_l0_sprite climb_sprites.png 126 33 146 63 > climb_sprites.inc + $(HGR_SPRITE) -l climb_l0_mask climb_sprites.png 126 65 146 95 >> climb_sprites.inc + $(HGR_SPRITE) -l climb_l1_sprite climb_sprites.png 154 129 174 159 >> climb_sprites.inc + $(HGR_SPRITE) -l climb_l1_mask climb_sprites.png 154 65 174 95 >> climb_sprites.inc + $(HGR_SPRITE) -l climb_l2_sprite climb_sprites.png 182 33 202 63 >> climb_sprites.inc + $(HGR_SPRITE) -l climb_l2_mask climb_sprites.png 182 65 202 95 >> climb_sprites.inc + $(HGR_SPRITE) -l climb_l3_sprite climb_sprites.png 210 129 230 159 >> climb_sprites.inc + $(HGR_SPRITE) -l climb_l3_mask climb_sprites.png 210 65 230 95 >> climb_sprites.inc + $(HGR_SPRITE) -l climb_u0_sprite climb_sprites.png 14 33 34 64 >> climb_sprites.inc + $(HGR_SPRITE) -l climb_u0_mask climb_sprites.png 14 66 34 97 >> climb_sprites.inc + $(HGR_SPRITE) -l climb_u1_sprite climb_sprites.png 42 33 62 64 >> climb_sprites.inc + $(HGR_SPRITE) -l climb_u1_mask climb_sprites.png 42 66 62 97 >> climb_sprites.inc + $(HGR_SPRITE) -l climb_u2_sprite climb_sprites.png 70 33 99 64 >> climb_sprites.inc + $(HGR_SPRITE) -l climb_u2_mask climb_sprites.png 70 66 90 97 >> climb_sprites.inc + $(HGR_SPRITE) -l climb_u3_sprite climb_sprites.png 98 33 118 64 >> climb_sprites.inc + $(HGR_SPRITE) -l climb_u3_mask climb_sprites.png 98 66 118 97 >> climb_sprites.inc + + + + + + + + + + + + robe_sprites.inc: robe_sprites.png $(HGR_SPRITE) -l robe_r0_sprite robe_sprites.png 14 32 27 62 > robe_sprites.inc $(HGR_SPRITE) -l robe_r0_mask robe_sprites.png 14 63 27 93 >> robe_sprites.inc @@ -172,5 +210,5 @@ flame_sprites.inc: flame_sprites.png clean: rm -f *~ enemy_sprites.inc robe_sprites.inc flame_sprites.inc \ - walk_sprites.inc + walk_sprites.inc climb_sprites.inc