diff --git a/games/peasant/Makefile b/games/peasant/Makefile index 5cbd89e6..321e1605 100644 --- a/games/peasant/Makefile +++ b/games/peasant/Makefile @@ -319,6 +319,7 @@ peasant1.o: peasant1.s zp.inc inventory.inc \ text/peasant1.inc text/kerrek.inc \ kerrek_actions.s peasant_common.s \ sprites/peasant_sprites.inc sprites/inventory_sprites.inc \ + sprites/kerrek_sprites.inc \ graphics_peasantry/graphics_peasant1.inc \ graphics_peasantry/priority_peasant1.inc \ draw_box.s hgr_rectangle.s hgr_font.s hgr_input.s \ diff --git a/games/peasant/graphics_peasantry/top_prints.png b/games/peasant/graphics_peasantry/top_prints.png index 68e95cf0..ab52bdfd 100644 Binary files a/games/peasant/graphics_peasantry/top_prints.png and b/games/peasant/graphics_peasantry/top_prints.png differ diff --git a/games/peasant/kerrek_actions.s b/games/peasant/kerrek_actions.s index 7a29a92a..80eba503 100644 --- a/games/peasant/kerrek_actions.s +++ b/games/peasant/kerrek_actions.s @@ -6,6 +6,30 @@ ; if dead on this screen ; if dead not on this screen + ;======================= + ;======================= + ; kerrek draw + ;======================= + ;======================= +kerrek_draw: + + lda #kerrek_l1_sprite + sta INH + + lda KERREK_X + sta CURSOR_X + + lda KERREK_Y + sta CURSOR_Y + + + jsr hgr_draw_sprite + + + rts + ;======================= ;======================= ; kerrek setup @@ -616,3 +640,4 @@ kerrek_look_footprints: ldy #>kerrek_look_footprints_message jmp finish_parse_message +.include "sprites/kerrek_sprites.inc" diff --git a/games/peasant/peasant1.s b/games/peasant/peasant1.s index 1e1b475b..138616d0 100644 --- a/games/peasant/peasant1.s +++ b/games/peasant/peasant1.s @@ -165,6 +165,7 @@ game_loop: jsr check_keyboard + jsr kerrek_draw jsr kerrek_collision lda LEVEL_OVER @@ -243,7 +244,7 @@ game_over: .include "version.inc" - +.include "hgr_sprite.s" ; Moved to qload ;.include "decompress_fast_v2.s" diff --git a/games/peasant/peasant_move.s b/games/peasant/peasant_move.s index 9e62790a..e3bff3cb 100644 --- a/games/peasant/peasant_move.s +++ b/games/peasant/peasant_move.s @@ -36,6 +36,8 @@ really_move_peasant: pha tay + ; FIXME: should we add YADD first, like we do in peasant_move_tiny? + ldx PEASANT_Y jsr peasant_collide diff --git a/games/peasant/sprites/Makefile b/games/peasant/sprites/Makefile index 89ce524d..5365717c 100644 --- a/games/peasant/sprites/Makefile +++ b/games/peasant/sprites/Makefile @@ -2,7 +2,7 @@ HGR_SPRITE = ../../../utils/hgr-utils/hgr_make_sprite all: inventory_sprites.inc ending_sprites.inc trogdor_sprites.inc \ boat_sprites.inc peasant_sprites.inc ned_sprites.inc \ - peasant_robe_sprites.inc + peasant_robe_sprites.inc kerrek_sprites.inc peasant_sprites.inc: peasant_sprites.png $(HGR_SPRITE) -l peasant_right1_sprite peasant_sprites.png 35 1 35 29 > peasant_sprites.inc @@ -114,6 +114,15 @@ ending_sprites.inc: end_sprites.png end_boat_sprites.png $(HGR_SPRITE) -s -l foam0 end_sprites.png 155 38 165 85 >> ending_sprites.inc $(HGR_SPRITE) -s -l foam1 end_sprites.png 183 38 195 85 >> ending_sprites.inc +kerrek_sprites.inc: kerrek_sprites.png + $(HGR_SPRITE) -s -l kerrek_l1_sprite kerrek_sprites.png 14 2 27 53 > kerrek_sprites.inc + $(HGR_SPRITE) -s -l kerrek_l1_head_sprite kerrek_sprites.png 7 6 13 14 >> kerrek_sprites.inc + $(HGR_SPRITE) -s -l kerrek_l2_sprite kerrek_sprites.png 49 2 62 53 >> kerrek_sprites.inc + $(HGR_SPRITE) -s -l kerrek_l2_head_sprite kerrek_sprites.png 42 6 48 13 >> kerrek_sprites.inc + $(HGR_SPRITE) -s -l kerrek_r1_sprite kerrek_sprites.png 7 56 21 108 >> kerrek_sprites.inc + $(HGR_SPRITE) -s -l kerrek_r1_head_sprite kerrek_sprites.png 21 60 27 68 >> kerrek_sprites.inc + $(HGR_SPRITE) -s -l kerrek_r2_sprite kerrek_sprites.png 42 56 56 108 >> kerrek_sprites.inc + $(HGR_SPRITE) -s -l kerrek_r2_head_sprite kerrek_sprites.png 56 60 62 66 >> kerrek_sprites.inc trogdor_sprites.inc: trogdor_sprites.png $(HGR_SPRITE) -s -l dashing0_sprite trogdor_sprites.png 14 6 20 45 > trogdor_sprites.inc diff --git a/games/peasant/sprites/kerrek_sprites.png b/games/peasant/sprites/kerrek_sprites.png new file mode 100644 index 00000000..cf4d889d Binary files /dev/null and b/games/peasant/sprites/kerrek_sprites.png differ