From edf316ac06245f44df9ae012ab7cb7614e3f3af2 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Wed, 18 Aug 2021 00:46:05 -0400
Subject: [PATCH] peasant: make edge transitions a bit better

---
 games/peasant/graphics/Makefile         |   2 +-
 games/peasant/graphics/lady_cottage.png | Bin 2672 -> 2659 bytes
 games/peasant/peasant1.s                |   3 +++
 games/peasant/peasant2.s                |   3 +++
 games/peasant/peasant3.s                |   4 ++++
 games/peasant/peasant4.s                |   5 +++++
 6 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/games/peasant/graphics/Makefile b/games/peasant/graphics/Makefile
index bbe06f64..7046e164 100644
--- a/games/peasant/graphics/Makefile
+++ b/games/peasant/graphics/Makefile
@@ -5,7 +5,7 @@ PNG2HGR = ../../../utils/hgr-utils/png2hgr
 LZSA = ~/research/lzsa/lzsa/lzsa
 B2D = ../../../utils/bmp2dhr/b2d
 
-all:	graphics_intro.inc graphics.inc \
+all:	graphics_intro.inc \
 	graphics_peasant1.inc graphics_peasant2.inc graphics_peasant3.inc \
 	graphics_peasant4.inc
 
diff --git a/games/peasant/graphics/lady_cottage.png b/games/peasant/graphics/lady_cottage.png
index fc62810272f101bd7a4ca99ef3e04e0f4b85e7d1..3294865db31609875f900f1c4704e1d2aea10933 100644
GIT binary patch
delta 2153
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

delta 2166
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

diff --git a/games/peasant/peasant1.s b/games/peasant/peasant1.s
index 5321c522..8cd9db5c 100644
--- a/games/peasant/peasant1.s
+++ b/games/peasant/peasant1.s
@@ -190,6 +190,9 @@ done_movey:
 	sta	PEASANT_Y
 
 
+	lda     GAME_OVER
+        bne     game_over
+
 
 
 	; save behind new position
diff --git a/games/peasant/peasant2.s b/games/peasant/peasant2.s
index 9ea98310..0cfd7302 100644
--- a/games/peasant/peasant2.s
+++ b/games/peasant/peasant2.s
@@ -192,6 +192,9 @@ done_movey:
 	sta	PEASANT_Y
 
 
+	lda	GAME_OVER
+	bne	game_over
+
 
 
 	; save behind new position
diff --git a/games/peasant/peasant3.s b/games/peasant/peasant3.s
index f5282512..c6d46289 100644
--- a/games/peasant/peasant3.s
+++ b/games/peasant/peasant3.s
@@ -192,6 +192,10 @@ done_movey:
 	sta	PEASANT_Y
 
 
+	lda     GAME_OVER
+        bne     game_over
+
+
 
 
 	; save behind new position
diff --git a/games/peasant/peasant4.s b/games/peasant/peasant4.s
index 6f12594f..231106de 100644
--- a/games/peasant/peasant4.s
+++ b/games/peasant/peasant4.s
@@ -193,6 +193,11 @@ done_movey:
 
 
 
+	lda     GAME_OVER
+        bne     game_over
+
+
+
 
 	; save behind new position