From f05b9e25f6add8b6f8b6bb2f278fb8679fd3f065 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Sun, 26 Dec 2021 20:49:43 -0500 Subject: [PATCH] kerrek: sprites fixed (for reals this time?) --- games/peasant/kerrek_actions.s | 11 ++++++++--- games/peasant/peasant1.s | 6 ++++++ games/peasant/peasant4.s | 6 ++++++ games/peasant/sprites/Makefile | 6 +++--- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/games/peasant/kerrek_actions.s b/games/peasant/kerrek_actions.s index b0e78355..0476db85 100644 --- a/games/peasant/kerrek_actions.s +++ b/games/peasant/kerrek_actions.s @@ -118,6 +118,7 @@ kerrek_draw_head_right_common: ldx KERREK_X inx + inx jmp kerrek_draw_head_common kerrek_draw_head_left: @@ -147,14 +148,13 @@ kerrek_draw_head_left_common: ldx KERREK_X dex - stx CURSOR_X - kerrek_draw_head_common: + stx CURSOR_X lda KERREK_Y clc - adc #6 + adc #4 sta CURSOR_Y jsr hgr_draw_sprite @@ -237,6 +237,11 @@ kerrek_row4: rts + ;======================= + ;======================= + ; kerrek warning sting + ;======================= + ;======================= ; not sure about this one ; GFED? diff --git a/games/peasant/peasant1.s b/games/peasant/peasant1.s index d4e07088..328b89a4 100644 --- a/games/peasant/peasant1.s +++ b/games/peasant/peasant1.s @@ -126,6 +126,12 @@ new_location: ;==================== ; handle kerrek + ;==================== + + ; clear out old state otherwise kerrek can follow us around + + lda #0 + sta KERREK_STATE lda MAP_LOCATION cmp #LOCATION_KERREK_1 diff --git a/games/peasant/peasant4.s b/games/peasant/peasant4.s index 32008f8f..f532b28f 100644 --- a/games/peasant/peasant4.s +++ b/games/peasant/peasant4.s @@ -162,6 +162,12 @@ not_necessary_cottage: ;==================== ; handle kerrek + ;==================== + + ; clear out state + + lda #0 + sta KERREK_STATE lda MAP_LOCATION cmp #LOCATION_KERREK_2 diff --git a/games/peasant/sprites/Makefile b/games/peasant/sprites/Makefile index ddcab61d..53f91011 100644 --- a/games/peasant/sprites/Makefile +++ b/games/peasant/sprites/Makefile @@ -118,10 +118,10 @@ 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_l2_head_sprite kerrek_sprites.png 42 6 48 12 >> kerrek_sprites.inc + $(HGR_SPRITE) -s -l kerrek_r1_sprite kerrek_sprites.png 7 56 20 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_sprite kerrek_sprites.png 42 56 55 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