From 32d28e910379d82803e15f5469d1b4b791c6044d Mon Sep 17 00:00:00 2001
From: gimulnautti <toni@futurefly.net>
Date: Fri, 3 Mar 2023 21:32:25 +0200
Subject: [PATCH] korjaa ruudun tyhjennysrutiinit alussa

---
 piraatti_intro.ras | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/piraatti_intro.ras b/piraatti_intro.ras
index c805ca8..c38ae8c 100644
--- a/piraatti_intro.ras
+++ b/piraatti_intro.ras
@@ -223,6 +223,7 @@ text : string = (@cmoveto, 6,10,
 												26, 12, 13, 12);
 												
 	naamatNames : string = (	
+<<<<<<< HEAD
 								"RICHARD ANDERSSON - HELSINKI", @cpause,
 								"VILLE HAUTAKANGAS - HELSINKI", @cpause,
 								"SAKARI HELKE - HELSINKI", @cpause,
@@ -239,6 +240,24 @@ text : string = (@cmoveto, 6,10,
 								
 	naamatNumbers : string = (	" 2 ", " 3 ", " 4 ", " 5 ", " 6 ", " 7 ",
 								" 8 ", " 9 ", "10 ", " 11", " 12", "13 ", @cstop);
+=======
+								"JUHO KARVINEN - PIRKANMAA", @cpause,
+								"TEEMU LINDROOS - PIRKANMAA", @cpause,
+								"ARTO TAMMENOKSA - PIRKANMAA", @cpause,
+								"KLAUS TORNKVIST - PIRKANMAA", @cpause,
+								"JARNO YLTAVA - PIRKANMAA", @cpause,
+								"LEINARD KOHONEN - HAME", @cpause,
+
+								"ALEKSI LOFGREN - SAVO-KARJALA", @cpause,
+								"PEKKA MUSTONEN - SAVO-KARJALA", @cpause,
+								"TIIA MUSTONEN - SAVO-KARJALA", @cpause,
+								"JARI NIKKINEN - SAVO-KARJALA", @cpause,
+								"TAPANI PARKKINEN - KESKI-SUOMI", @cpause,
+								"CHRISTER WAREN - SATAKUNTA", @cpause, @cstop );
+								
+	naamatNumbers : string = (	"113", "114", "115", "116", "117 ", "140",
+								" 88", "89 ", " 90", "91 ", " 2 ", " 2 ", @cstop);
+>>>>>>> a6cca51 (korjaa ruudun tyhjennysrutiinit alussa)
 							   	
 
 	tab320 : array[25] of integer = buildtable("i*320");	
@@ -316,7 +335,7 @@ text : string = (@cmoveto, 6,10,
 							@cmoveto, 0, 4, "    TIETOKANNAT",
 							@cmoveto, 0, 5, "   JULKISHALLINTO",
 							@cmoveto, 0, 6, "TIETEEN TEKNOLOGIAN",
-							@cmoveto, 0, 7, "     MOOTTORINA",
+							@cmoveto, 0, 7, "    MOOTTORINA",
 							@cpage,
 							@cmoveto, 0, 3, "  TIETOPOLITIIKAN",
 							@cmoveto, 0, 4, "  VAKIINNUTTAMINEN",
@@ -1388,7 +1407,8 @@ begin
 		begin
 			fgColBefore := 0;
 			Fill(screen_char_loc, KEY_SPACE, 255);
-			FillFast(screen_char_loc + 256, KEY_SPACE, 127);
+			FillFast(screen_char_loc + 255, KEY_SPACE, 127);
+			Fill(^$06F8, KEY_SPACE, 240);
 			GoToPurpleBarRasterStart();
 			currentPartDone := true;
 			screen_fg_col := 0;
@@ -1521,7 +1541,8 @@ begin
 	CreateAddressTable(#mainPartAddressTable, $4400, 40, 25);
 	CreateAddressTable(#colorAddressTable, $d800, 40, 25);
 	
-	Fill(^$0528, KEY_SPACE, 240);
+	Fill(^$0518, KEY_SPACE, 240);
+	Fill(^$0608, KEY_SPACE, 80);
 	
 	for i := 0 to 256 do fastPlasma[i] := textPlasmaLumi[textPlasmaX[i]];