From 6060bb7a01d2d45defa24dbd9cc99afadf258915 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Thu, 7 Oct 2021 00:43:44 -0400 Subject: [PATCH] peasant: add "ESC Skips" message to intro --- games/peasant/intro.s | 22 ++++++++++++++++++++++ games/peasant/intro_cottage.s | 9 +-------- games/peasant/intro_knight.s | 11 +++-------- games/peasant/intro_lake_e.s | 12 +++--------- games/peasant/intro_lake_w.s | 9 +++------ games/peasant/intro_river.s | 11 +++-------- 6 files changed, 35 insertions(+), 39 deletions(-) diff --git a/games/peasant/intro.s b/games/peasant/intro.s index 2dbd83b9..6aba0755 100644 --- a/games/peasant/intro.s +++ b/games/peasant/intro.s @@ -196,3 +196,25 @@ start_new_game: .include "graphics/graphics_intro.inc" .include "graphics/priority_intro.inc" + +skip_text: + .byte 0,2,"ESC Skips",0 + + ;=================== + ; print title +intro_print_title: + lda #peasant_text + sta OUTH + + jsr hgr_put_string + + lda #skip_text + sta OUTH + + jmp hgr_put_string ; tail call + + diff --git a/games/peasant/intro_cottage.s b/games/peasant/intro_cottage.s index 065cbd7f..a51506b5 100644 --- a/games/peasant/intro_cottage.s +++ b/games/peasant/intro_cottage.s @@ -55,14 +55,7 @@ cottage: ;=================== ; print title - lda #peasant_text - sta OUTH - - jsr hgr_put_string - -; jsr hgr_save + jsr intro_print_title ;==================== ; save background diff --git a/games/peasant/intro_knight.s b/games/peasant/intro_knight.s index 5c7f7531..13255d26 100644 --- a/games/peasant/intro_knight.s +++ b/games/peasant/intro_knight.s @@ -32,15 +32,10 @@ knight: jsr decompress_lzsa2_fast - lda #peasant_text - sta OUTH - - jsr hgr_put_string - -; jsr hgr_save + ;================== + ; print title line + jsr intro_print_title ; load priority to $400 ; indirectly as we can't trash screen holes diff --git a/games/peasant/intro_lake_e.s b/games/peasant/intro_lake_e.s index a2957825..2b807503 100644 --- a/games/peasant/intro_lake_e.s +++ b/games/peasant/intro_lake_e.s @@ -47,16 +47,10 @@ lake_east: jsr gr_copy_to_page1 + ;================ + ; print title line - lda #peasant_text - sta OUTH - - jsr hgr_put_string - -; jsr hgr_save - + jsr intro_print_title ;==================== ; save background diff --git a/games/peasant/intro_lake_w.s b/games/peasant/intro_lake_w.s index c6b7bd80..7b448121 100644 --- a/games/peasant/intro_lake_w.s +++ b/games/peasant/intro_lake_w.s @@ -31,14 +31,11 @@ lake_west: jsr decompress_lzsa2_fast - lda #peasant_text - sta OUTH + ;================ + ; print title - jsr hgr_put_string + jsr intro_print_title -; jsr hgr_save ; load priority to $400 ; indirectly as we can't trash screen holes diff --git a/games/peasant/intro_river.s b/games/peasant/intro_river.s index 0ff94ef8..a7f69d31 100644 --- a/games/peasant/intro_river.s +++ b/games/peasant/intro_river.s @@ -32,15 +32,10 @@ river: jsr decompress_lzsa2_fast - lda #peasant_text - sta OUTH - - jsr hgr_put_string - -; jsr hgr_save + ;================ + ; print title + jsr intro_print_title ; load priority to $400