diff --git a/games/peasant/Makefile b/games/peasant/Makefile index 1657b883..9b4c5a2d 100644 --- a/games/peasant/Makefile +++ b/games/peasant/Makefile @@ -58,11 +58,14 @@ peasant_disk3.dsk: ./trogdor/TROGDOR ./ending/ENDING \ $(DOS33_RAW) peasant_disk3.dsk 19 0 ./ending/ENDING 0 0 $(DOS33_RAW) peasant_disk3.dsk 24 0 ./cliff_base/CLIFF_BASE 0 0 # $(DOS33_RAW) peasant_disk3.dsk 26 0 ./climb/CLIMB 0 0 -# $(DOS33_RAW) peasant_disk3.dsk 30 0 ./cliff_heights/HEIGHTS 0 0 + $(DOS33_RAW) peasant_disk3.dsk 30 0 ./cliff_heights/CLIFF_HEIGHTS 0 0 peasant.2mg: dts_block PROBOOTHD QLOAD_HD \ ./vid_logo/VID_LOGO ./title/TITLE ./intro/INTRO \ ./music/MUSIC ./copy/COPY_CHECK ./inventory/INVENTORY \ + ./map/MAP ./archery/ARCHERY ./inside/INSIDE ./inn/INN \ + ./trogdor/TROGDOR ./ending/ENDING ./cliff_base/CLIFF_BASE \ + ./cliff_heights/CLIFF_HEIGHTS \ SAVE1 SAVE2 SAVE3 PARSE_INPUT.ZX02 ./game_over/GAME_OVER $(PRODOSDIR)/mkprodosfs peasant.2mg -n PeasantsQ -b 2800 -2 $(PRODOS_RAW) peasant.2mg 0 PROBOOTHD 0 0 @@ -91,6 +94,7 @@ peasant.2mg: dts_block PROBOOTHD QLOAD_HD \ $(PRODOS_RAW) peasant.2mg `./dts_block 3 15 0` ./trogdor/TROGDOR 0 0 $(PRODOS_RAW) peasant.2mg `./dts_block 3 19 0` ./ending/ENDING 0 0 $(PRODOS_RAW) peasant.2mg `./dts_block 3 24 0` ./cliff_base/CLIFF_BASE 0 0 + $(PRODOS_RAW) peasant.2mg `./dts_block 3 30 0` ./cliff_heights/CLIFF_HEIGHTS 0 0 ### @@ -284,9 +288,12 @@ inventory/INVENTORY: #### -./cliff_base/CLIFF_BASE: DIALOG_CLIFF.ZX02 +./cliff_base/CLIFF_BASE: cd cliff_base && make +./cliff_base/CLIFF_HEIGHTS: + cd cliff_heights && make + ./archery/ARCHERY: cd archery && make diff --git a/games/peasant/cliff_base/Makefile b/games/peasant/cliff_base/Makefile index 5fc98976..2b2648b2 100644 --- a/games/peasant/cliff_base/Makefile +++ b/games/peasant/cliff_base/Makefile @@ -18,7 +18,7 @@ cliff_base.o: cliff_base.s \ ../text/DIALOG_CLIFF_BASE.ZX02 ../text/dialog_cliff_base.inc \ graphics_cliff/cliff_graphics.inc \ graphics_cliff/priority_cliff.inc \ - ../sprites/peasant_sprites.inc \ + ../sprites_peasant/robe_sprites.zx02 \ ../draw_peasant.s ../move_peasant.s \ ../gr_copy.s ../hgr_copy.s \ ../new_map_location.s \ diff --git a/games/peasant/cliff_base/cliff_base.s b/games/peasant/cliff_base/cliff_base.s index cdd471e7..9b943356 100644 --- a/games/peasant/cliff_base/cliff_base.s +++ b/games/peasant/cliff_base/cliff_base.s @@ -212,43 +212,43 @@ oops_new_location: ; new location but same file - lda MAP_LOCATION - cmp #LOCATION_CLIFF_HEIGHTS - bne not_the_cliff +; lda MAP_LOCATION +; cmp #LOCATION_CLIFF_HEIGHTS +; bne not_the_cliff - lda PREVIOUS_LOCATION - cmp #LOCATION_TROGDOR_OUTER - beq to_cliff_from_outer +; lda PREVIOUS_LOCATION +; cmp #LOCATION_TROGDOR_OUTER +; beq to_cliff_from_outer -to_cliff_from_cliff: - lda #18 - sta PEASANT_X - lda #140 - sta PEASANT_Y - bne not_the_cliff ; bra +;to_cliff_from_cliff: +; lda #18 +; sta PEASANT_X +; lda #140 +; sta PEASANT_Y +; bne not_the_cliff ; bra -to_cliff_from_outer: - lda #32 - sta PEASANT_X - lda #120 - sta PEASANT_Y - bne not_the_cliff ; bra +;to_cliff_from_outer: +; lda #32 +; sta PEASANT_X +; lda #120 +; sta PEASANT_Y +; bne not_the_cliff ; bra -not_the_cliff: +;not_the_cliff: - lda MAP_LOCATION - cmp #LOCATION_TROGDOR_OUTER - bne not_outer +; lda MAP_LOCATION +; cmp #LOCATION_TROGDOR_OUTER +; bne not_outer - lda #2 - sta PEASANT_X - lda #100 - sta PEASANT_Y +; lda #2 +; sta PEASANT_X +; lda #100 +; sta PEASANT_Y -not_outer: -just_go_there: +;not_outer: +;just_go_there: - jmp new_location +; jmp new_location ;************************ @@ -260,7 +260,6 @@ level_over: beq exiting_cliff ; new location - ; in theory this can only be TROGDOR lda #4 sta PEASANT_X diff --git a/games/peasant/cliff_base/cliff_base_actions.s b/games/peasant/cliff_base/cliff_base_actions.s index f50a6397..485dae7f 100644 --- a/games/peasant/cliff_base/cliff_base_actions.s +++ b/games/peasant/cliff_base/cliff_base_actions.s @@ -48,6 +48,13 @@ cliff_base_climb: jmp parse_common_unknown cliff_base_do_climb: + + lda #LOAD_HEIGHTS + sta WHICH_LOAD + + lda #NEW_FROM_DISK + sta LEVEL_OVER + ldx #cliff_base_climb_message jsr partial_message_step diff --git a/games/peasant/cliff_base/graphics_cliff/cliff_base.png b/games/peasant/cliff_base/graphics_cliff/cliff_base.png index 068d07a7..c6b466ab 100644 Binary files a/games/peasant/cliff_base/graphics_cliff/cliff_base.png and b/games/peasant/cliff_base/graphics_cliff/cliff_base.png differ diff --git a/games/peasant/cliff_base/graphics_cliff/cliff_base_collision.png b/games/peasant/cliff_base/graphics_cliff/cliff_base_collision.png index 7d8a93b0..ff3ed065 100644 Binary files a/games/peasant/cliff_base/graphics_cliff/cliff_base_collision.png and b/games/peasant/cliff_base/graphics_cliff/cliff_base_collision.png differ diff --git a/games/peasant/cliff_base/graphics_cliff/cliff_base.png.orig b/games/peasant/cliff_base/graphics_cliff/cliff_base_orig.png similarity index 100% rename from games/peasant/cliff_base/graphics_cliff/cliff_base.png.orig rename to games/peasant/cliff_base/graphics_cliff/cliff_base_orig.png diff --git a/games/peasant/cliff_base/graphics_cliff/cliff_base_priority.png b/games/peasant/cliff_base/graphics_cliff/cliff_base_priority.png index 3684dd6f..e126dbb9 100644 Binary files a/games/peasant/cliff_base/graphics_cliff/cliff_base_priority.png and b/games/peasant/cliff_base/graphics_cliff/cliff_base_priority.png differ diff --git a/games/peasant/cliff_heights/cliff_heights.s b/games/peasant/cliff_heights/cliff_heights.s index 0d91682b..71a16ad3 100644 --- a/games/peasant/cliff_heights/cliff_heights.s +++ b/games/peasant/cliff_heights/cliff_heights.s @@ -146,9 +146,9 @@ col_copy_loop: ; Note: to get to this point of the game you have to be ; in a robe and on fire, so we should enforce that - lda #walking_sprite_data + lda #>robe_sprite_data sta ZX0_src+1 lda #$a0 @@ -335,5 +335,5 @@ cliff_text_zx02: .include "cliff_actions.s" -walking_sprite_data: - .incbin "../sprites_peasant/walking_sprites.zx02" +robe_sprite_data: + .incbin "../sprites_peasant/robe_sprites.zx02" diff --git a/games/peasant/qload.s b/games/peasant/qload.s index b922693c..469cc8a3 100644 --- a/games/peasant/qload.s +++ b/games/peasant/qload.s @@ -76,7 +76,7 @@ length_array: .byte 64, 80, 16, 32 ; TROGDOR, ENDING, MUSIC, CLIFF_BASE .byte 16, 16, 16, 64 ; GAME_OVER, INVENTORY, PARSE_INPUT, INN .byte 64, 64, 32, 64 ; INSIDE, ARCHERY, MAP, CLIMB - .byte 48 ; HEIGHTS + .byte 64 ; HEIGHTS .byte 1,1,1 ; SAVE1, SAVE2, SAVE3 .byte 1 ; disk detect diff --git a/games/peasant/sprites_peasant/Makefile b/games/peasant/sprites_peasant/Makefile index cff077f5..dd0f68d6 100644 --- a/games/peasant/sprites_peasant/Makefile +++ b/games/peasant/sprites_peasant/Makefile @@ -4,7 +4,8 @@ LINKER_SCRIPTS = ../../../linker_scripts all: enemy_sprites.inc walk_sprites.inc climb_flame_sprites.inc \ climb_sprites.inc robe_sprites.inc flame_sprites.inc \ - walking_sprites.zx02 robe_sprites.zx02 + walking_sprites.zx02 \ + robe_sprites.zx02 robe_sprites_orange.zx02 robe_sprites_purple.zx02 #### @@ -27,9 +28,35 @@ robe_sprites: robe_sprites.o ld65 -o robe_sprites robe_sprites.o -C $(LINKER_SCRIPTS)/apple2_a000.inc robe_sprites.o: robe_sprites.s \ - flame_sprites.inc walk_sprites.inc + flame_sprites.inc robe_sprites.inc ca65 -o robe_sprites.o robe_sprites.s -l robe_sprites.lst +#### + +robe_sprites_purple.zx02: robe_sprites_purple + $(ZX02) -f robe_sprites_purple robe_sprites_purple.zx02 + +robe_sprites_purple: robe_sprites_purple.o + ld65 -o robe_sprites_purple robe_sprites_purple.o -C $(LINKER_SCRIPTS)/apple2_a000.inc + +robe_sprites_purple.o: robe_sprites_purple.s \ + flame_sprites.inc robe_sprites_purple.inc + ca65 -o robe_sprites_purple.o robe_sprites_purple.s -l robe_sprites_purple.lst + +#### + +robe_sprites_orange.zx02: robe_sprites_orange + $(ZX02) -f robe_sprites_orange robe_sprites_orange.zx02 + +robe_sprites_orange: robe_sprites_orange.o + ld65 -o robe_sprites_orange robe_sprites_orange.o -C $(LINKER_SCRIPTS)/apple2_a000.inc + +robe_sprites_orange.o: robe_sprites_orange.s \ + flame_sprites.inc robe_sprites_orange.inc + ca65 -o robe_sprites_orange.o robe_sprites_orange.s -l robe_sprites_orange.lst + + + @@ -152,6 +179,108 @@ robe_sprites.inc: robe_sprites.png $(HGR_SPRITE) -l robe_d5_sprite robe_sprites.png 266 128 279 158 >> robe_sprites.inc $(HGR_SPRITE) -l robe_d5_mask robe_sprites.png 266 159 279 189 >> robe_sprites.inc +robe_sprites_purple.inc: robe_sprites_purple.png + $(HGR_SPRITE) -l robe_r0_sprite robe_sprites_purple.png 14 32 27 62 > robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_r0_mask robe_sprites_purple.png 14 63 27 93 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_r1_sprite robe_sprites_purple.png 42 32 53 62 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_r1_mask robe_sprites_purple.png 42 63 53 93 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_r2_sprite robe_sprites_purple.png 70 32 83 62 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_r2_mask robe_sprites_purple.png 70 63 83 93 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_r3_sprite robe_sprites_purple.png 98 32 111 62 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_r3_mask robe_sprites_purple.png 98 63 111 93 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_r4_sprite robe_sprites_purple.png 126 32 139 62 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_r4_mask robe_sprites_purple.png 126 63 139 93 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_r5_sprite robe_sprites_purple.png 154 32 167 62 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_r5_mask robe_sprites_purple.png 154 63 167 93 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_l0_sprite robe_sprites_purple.png 14 128 27 158 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_l0_mask robe_sprites_purple.png 14 159 27 189 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_l1_sprite robe_sprites_purple.png 42 128 53 158 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_l1_mask robe_sprites_purple.png 42 159 53 189 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_l2_sprite robe_sprites_purple.png 70 128 83 158 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_l2_mask robe_sprites_purple.png 70 159 83 189 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_l3_sprite robe_sprites_purple.png 98 128 111 158 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_l3_mask robe_sprites_purple.png 98 159 111 189 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_l4_sprite robe_sprites_purple.png 126 128 139 158 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_l4_mask robe_sprites_purple.png 126 159 139 189 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_l5_sprite robe_sprites_purple.png 154 128 167 158 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_l5_mask robe_sprites_purple.png 154 159 167 189 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_u0_sprite robe_sprites_purple.png 182 1 195 31 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_u0_mask robe_sprites_purple.png 183 32 195 62 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_u1_sprite robe_sprites_purple.png 210 1 221 31 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_u1_mask robe_sprites_purple.png 210 32 223 62 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_u2_sprite robe_sprites_purple.png 238 1 251 31 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_u2_mask robe_sprites_purple.png 238 32 251 62 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_u3_sprite robe_sprites_purple.png 266 1 279 31 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_u3_mask robe_sprites_purple.png 266 32 279 62 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_u4_sprite robe_sprites_purple.png 182 63 195 93 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_u4_mask robe_sprites_purple.png 182 94 195 124 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_u5_sprite robe_sprites_purple.png 210 63 223 93 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_u5_mask robe_sprites_purple.png 210 94 223 124 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_d0_sprite robe_sprites_purple.png 238 63 251 93 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_d0_mask robe_sprites_purple.png 238 94 251 124 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_d1_sprite robe_sprites_purple.png 266 63 279 93 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_d1_mask robe_sprites_purple.png 266 94 279 124 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_d2_sprite robe_sprites_purple.png 182 128 195 158 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_d2_mask robe_sprites_purple.png 182 159 195 189 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_d3_sprite robe_sprites_purple.png 210 128 223 158 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_d3_mask robe_sprites_purple.png 210 159 223 189 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_d4_sprite robe_sprites_purple.png 238 128 251 158 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_d4_mask robe_sprites_purple.png 238 159 251 189 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_d5_sprite robe_sprites_purple.png 266 128 279 158 >> robe_sprites_purple.inc + $(HGR_SPRITE) -l robe_d5_mask robe_sprites_purple.png 266 159 279 189 >> robe_sprites_purple.inc + +robe_sprites_orange.inc: robe_sprites_orange.png + $(HGR_SPRITE) -l robe_r0_sprite robe_sprites_orange.png 14 32 27 62 > robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_r0_mask robe_sprites_orange.png 14 63 27 93 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_r1_sprite robe_sprites_orange.png 42 32 53 62 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_r1_mask robe_sprites_orange.png 42 63 53 93 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_r2_sprite robe_sprites_orange.png 70 32 83 62 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_r2_mask robe_sprites_orange.png 70 63 83 93 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_r3_sprite robe_sprites_orange.png 98 32 111 62 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_r3_mask robe_sprites_orange.png 98 63 111 93 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_r4_sprite robe_sprites_orange.png 126 32 139 62 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_r4_mask robe_sprites_orange.png 126 63 139 93 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_r5_sprite robe_sprites_orange.png 154 32 167 62 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_r5_mask robe_sprites_orange.png 154 63 167 93 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_l0_sprite robe_sprites_orange.png 14 128 27 158 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_l0_mask robe_sprites_orange.png 14 159 27 189 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_l1_sprite robe_sprites_orange.png 42 128 53 158 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_l1_mask robe_sprites_orange.png 42 159 53 189 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_l2_sprite robe_sprites_orange.png 70 128 83 158 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_l2_mask robe_sprites_orange.png 70 159 83 189 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_l3_sprite robe_sprites_orange.png 98 128 111 158 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_l3_mask robe_sprites_orange.png 98 159 111 189 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_l4_sprite robe_sprites_orange.png 126 128 139 158 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_l4_mask robe_sprites_orange.png 126 159 139 189 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_l5_sprite robe_sprites_orange.png 154 128 167 158 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_l5_mask robe_sprites_orange.png 154 159 167 189 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_u0_sprite robe_sprites_orange.png 182 1 195 31 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_u0_mask robe_sprites_orange.png 183 32 195 62 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_u1_sprite robe_sprites_orange.png 210 1 221 31 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_u1_mask robe_sprites_orange.png 210 32 223 62 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_u2_sprite robe_sprites_orange.png 238 1 251 31 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_u2_mask robe_sprites_orange.png 238 32 251 62 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_u3_sprite robe_sprites_orange.png 266 1 279 31 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_u3_mask robe_sprites_orange.png 266 32 279 62 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_u4_sprite robe_sprites_orange.png 182 63 195 93 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_u4_mask robe_sprites_orange.png 182 94 195 124 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_u5_sprite robe_sprites_orange.png 210 63 223 93 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_u5_mask robe_sprites_orange.png 210 94 223 124 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_d0_sprite robe_sprites_orange.png 238 63 251 93 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_d0_mask robe_sprites_orange.png 238 94 251 124 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_d1_sprite robe_sprites_orange.png 266 63 279 93 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_d1_mask robe_sprites_orange.png 266 94 279 124 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_d2_sprite robe_sprites_orange.png 182 128 195 158 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_d2_mask robe_sprites_orange.png 182 159 195 189 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_d3_sprite robe_sprites_orange.png 210 128 223 158 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_d3_mask robe_sprites_orange.png 210 159 223 189 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_d4_sprite robe_sprites_orange.png 238 128 251 158 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_d4_mask robe_sprites_orange.png 238 159 251 189 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_d5_sprite robe_sprites_orange.png 266 128 279 158 >> robe_sprites_orange.inc + $(HGR_SPRITE) -l robe_d5_mask robe_sprites_orange.png 266 159 279 189 >> robe_sprites_orange.inc + + + walk_sprites.inc: walk_sprites.png $(HGR_SPRITE) -l walk_r0_sprite walk_sprites.png 14 32 27 62 > walk_sprites.inc @@ -258,6 +387,8 @@ climb_flame_sprites.inc: climb_flame_sprites.png clean: - rm -f *~ *.zx02 enemy_sprites.inc robe_sprites.inc flame_sprites.inc \ + rm -f *~ *.zx02 enemy_sprites.inc \ + robe_sprites.inc robe_sprites_purple.inc robe_sprites_orange.inc \ + flame_sprites.inc \ walk_sprites.inc climb_sprites.inc climb_flame_sprites.inc diff --git a/games/peasant/sprites_peasant/robe_sprites.png b/games/peasant/sprites_peasant/robe_sprites.png index 080838a7..a23bf2b7 100644 Binary files a/games/peasant/sprites_peasant/robe_sprites.png and b/games/peasant/sprites_peasant/robe_sprites.png differ diff --git a/games/peasant/sprites_peasant/robe_sprites_orange.png b/games/peasant/sprites_peasant/robe_sprites_orange.png new file mode 100644 index 00000000..080838a7 Binary files /dev/null and b/games/peasant/sprites_peasant/robe_sprites_orange.png differ diff --git a/games/peasant/sprites_peasant/robe_sprites_orange.s b/games/peasant/sprites_peasant/robe_sprites_orange.s new file mode 100644 index 00000000..8ca8b149 --- /dev/null +++ b/games/peasant/sprites_peasant/robe_sprites_orange.s @@ -0,0 +1,87 @@ + +robe_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 + + +robe_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 + +robe_sprites_data_l: + .byte robe_r0_sprite,>robe_r1_sprite,>robe_r2_sprite + .byte >robe_r3_sprite,>robe_r4_sprite,>robe_r5_sprite + .byte >robe_l0_sprite,>robe_l1_sprite,>robe_l2_sprite + .byte >robe_l3_sprite,>robe_l4_sprite,>robe_l5_sprite + .byte >robe_u0_sprite,>robe_u1_sprite,>robe_u2_sprite + .byte >robe_u3_sprite,>robe_u4_sprite,>robe_u5_sprite + .byte >robe_d0_sprite,>robe_d1_sprite,>robe_d2_sprite + .byte >robe_d3_sprite,>robe_d4_sprite,>robe_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 + +robe_mask_data_l: + .byte robe_r0_mask,>robe_r1_mask,>robe_r2_mask + .byte >robe_r3_mask,>robe_r4_mask,>robe_r5_mask + .byte >robe_l0_mask,>robe_l1_mask,>robe_l2_mask + .byte >robe_l3_mask,>robe_l4_mask,>robe_l5_mask + .byte >robe_u0_mask,>robe_u1_mask,>robe_u2_mask + .byte >robe_u3_mask,>robe_u4_mask,>robe_u5_mask + .byte >robe_d0_mask,>robe_d1_mask,>robe_d2_mask + .byte >robe_d3_mask,>robe_d4_mask,>robe_d5_mask +flame_mask_data_h: + .byte >flame_r0_mask,>flame_r1_mask,>flame_r2_mask + .byte >flame_l0_mask,>flame_l1_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 "robe_sprites.inc" + + .include "flame_sprites.inc" diff --git a/games/peasant/sprites_peasant/robe_sprites_purple.png b/games/peasant/sprites_peasant/robe_sprites_purple.png new file mode 100644 index 00000000..866322e0 Binary files /dev/null and b/games/peasant/sprites_peasant/robe_sprites_purple.png differ diff --git a/games/peasant/sprites_peasant/robe_sprites_purple.s b/games/peasant/sprites_peasant/robe_sprites_purple.s new file mode 100644 index 00000000..280d10e6 --- /dev/null +++ b/games/peasant/sprites_peasant/robe_sprites_purple.s @@ -0,0 +1,87 @@ + +robe_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 + + +robe_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 + +robe_sprites_data_l: + .byte robe_r0_sprite,>robe_r1_sprite,>robe_r2_sprite + .byte >robe_r3_sprite,>robe_r4_sprite,>robe_r5_sprite + .byte >robe_l0_sprite,>robe_l1_sprite,>robe_l2_sprite + .byte >robe_l3_sprite,>robe_l4_sprite,>robe_l5_sprite + .byte >robe_u0_sprite,>robe_u1_sprite,>robe_u2_sprite + .byte >robe_u3_sprite,>robe_u4_sprite,>robe_u5_sprite + .byte >robe_d0_sprite,>robe_d1_sprite,>robe_d2_sprite + .byte >robe_d3_sprite,>robe_d4_sprite,>robe_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 + +robe_mask_data_l: + .byte robe_r0_mask,>robe_r1_mask,>robe_r2_mask + .byte >robe_r3_mask,>robe_r4_mask,>robe_r5_mask + .byte >robe_l0_mask,>robe_l1_mask,>robe_l2_mask + .byte >robe_l3_mask,>robe_l4_mask,>robe_l5_mask + .byte >robe_u0_mask,>robe_u1_mask,>robe_u2_mask + .byte >robe_u3_mask,>robe_u4_mask,>robe_u5_mask + .byte >robe_d0_mask,>robe_d1_mask,>robe_d2_mask + .byte >robe_d3_mask,>robe_d4_mask,>robe_d5_mask +flame_mask_data_h: + .byte >flame_r0_mask,>flame_r1_mask,>flame_r2_mask + .byte >flame_l0_mask,>flame_l1_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 "robe_sprites_purple.inc" + + .include "flame_sprites.inc"