From 864471d582d08b7e14d62cb5a4844d9318a3f315 Mon Sep 17 00:00:00 2001
From: gimulnautti <toni@futurefly.net>
Date: Sun, 19 Feb 2023 20:10:08 +0200
Subject: [PATCH] =?UTF-8?q?Scrollin=20t=C3=B6kkiminen=20vasemmasa=20reunas?=
 =?UTF-8?q?sa=20korjattu=20siirt=C3=A4m=C3=A4ll=C3=A4=20bordereita=20sis?=
 =?UTF-8?q?=C3=A4=C3=A4np=C3=A4in.=20Teksti=20vaati=20uudelleen=20asettelu?=
 =?UTF-8?q?n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 piraatti_intro.ras | 74 +++++++++++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 34 deletions(-)

diff --git a/piraatti_intro.ras b/piraatti_intro.ras
index 5251d6a..7c64a26 100644
--- a/piraatti_intro.ras
+++ b/piraatti_intro.ras
@@ -57,9 +57,12 @@ var
 
 	@define spriteLoc $3c80
 	@define charSetCopyLoc $c000
+
+	charsetCopyBlock : array[1024] of byte = buildtable("0") at @charSetCopyLoc;
+
 	@define spriteBank 0
 	
-	spriteCopyBlock : array[63] of byte = buildtable("i") at @spriteLoc;
+	spriteCopyBlock : array[63] of byte = buildtable("0") at @spriteLoc;
 	
 	lookup3Dx : array[40] of integer = buildtable("300 * (i - 20) / 200");
 	lookup3Dy : array[25] of integer = buildtable("300 * (i - 11) / 30");
@@ -261,42 +264,43 @@ text : string = (@cmoveto, 6,10,
 	mainPartBigFont:incbin("resources/charsets/broadway_xy.bin", @mainPartBigFontLoc);
 	
 	@define numMainTextPages 6
-	mainText : string = (	@cmoveto, 0, 3, "    COMMODORELLA    ",
-							@cmoveto, 0, 4, "    EDUSKUNTAAN     ", 
-							@cmoveto, 0, 5, "       2023         ", 
+	mainText : string = (	
+							@cmoveto, 0, 3, "    COMMODORELLA",
+							@cmoveto, 0, 4, "    EDUSKUNTAAN", 
+							@cmoveto, 0, 5, "     ---------", 
+							@cmoveto, 0, 6, "       2023", 
 							@cpage,
-							@cmoveto, 0, 2, "    RADIKAALISTI    ",
-							@cmoveto, 0, 3, "      AVOINTA       ",
-							@cmoveto, 0, 4, "    DEMOKRATIAA     ",
-							@cmoveto, 0, 5, "  VALTIONHALLINNON  ",
-							@cmoveto, 0, 6, "    LIVESTREAMAUS   ",
-							@cmoveto, 0, 7, "  LAHTOKOHTAISESTI  ",
+							@cmoveto, 0, 2, "    RADIKAALISTI",
+							@cmoveto, 0, 3, "      AVOINTA",
+							@cmoveto, 0, 4, "    DEMOKRATIAA",
+							@cmoveto, 0, 5, "  VALTIONHALLINNON",
+							@cmoveto, 0, 6, "    LIVESTREAMAUS",
+							@cmoveto, 0, 7, "  LAHTOKOHTAISESTI",
 							@cpage,
-							@cmoveto, 0, 2, "  LOBBAUS NAKYVAKSI ",
-							@cmoveto, 0, 3, " LAAJA JULKISUUSLAKI",
-							@cmoveto, 0, 4, "KANSANAANESTYSALOITE",
-							@cmoveto, 0, 5, "   RAHANKERAYSLAIN  ",
-							@cmoveto, 0, 6, "      UUDISTUS      ",
-							@cmoveto, 0, 7, "     PERUSTULO      ",
+							@cmoveto, 0, 2, " LOBBAUS NAKYVAKSI",
+							@cmoveto, 0, 3, "LAAJA JULKISUUSLAKI",
+							@cmoveto, 0, 4, "KANSANAANESTYSALOI-",
+							@cmoveto, 0, 5, "TE    PERUSOIKEUDET",
+							@cmoveto, 0, 6, "YKSITYISYYDENSUOJA",
+							@cmoveto, 0, 7, "  YHDENVERTAISUUS",
+							@cpage,							
+							@cmoveto, 0, 2, " KESTAVYYSSIIRTYMA",
+							@cmoveto, 0, 3, "   VETYTALOUDEN",
+							@cmoveto, 0, 4, "  TEKNOLOGIATUKI",
+							@cmoveto, 0, 5, "  RAHANKERAYSLAIN",
+							@cmoveto, 0, 6, "    UUDISTUS",
+							@cmoveto, 0, 7, "    PERUSTULO",
 							@cpage,
-							@cmoveto, 0, 2, "    PERUSOIKEUDET   ",
-							@cmoveto, 0, 3, " YKSITYISYYDENSUOJA ",
-							@cmoveto, 0, 4, "   YHDENVERTAISUUS  ",
-							@cmoveto, 0, 5, "  KESTAVYYSSIIRTYMA ",
-							@cmoveto, 0, 6, "    VETYTALOUDEN    ",
-							@cmoveto, 0, 7, "   TEKNOLOGIATUKI   ",
+							@cmoveto, 0, 2, "HYVINVOINTIALUEIDEN",
+							@cmoveto, 0, 3, " VERONKANTO-OIKEUS",
+							@cmoveto, 0, 4, "PAIKALLISDEMOKRATIA",
+							@cmoveto, 0, 5, " LUONTO MAANKAYTTO",
+							@cmoveto, 0, 6, "    KESTAVYYS",
 							@cpage,
-							@cmoveto, 0, 2, " HYVINVOINTIALUEIDEN",
-							@cmoveto, 0, 3, " VERONKANTO-OIKEUS  ",
-							@cmoveto, 0, 4, "PAIKALLISDEMOKRATIAN",
-							@cmoveto, 0, 5, "    VAHVISTAMINEN   ",
-							@cmoveto, 0, 6, "  LUONTO MAANKAYTTO ",
-							@cmoveto, 0, 7, "      KESTAVYYS     ",
-							@cpage,
-							@cmoveto, 0, 3, "  TIETOPOLITIIKAN   ",
-							@cmoveto, 0, 4, "  VAKIINNUTTAMINEN  ",
-							@cmoveto, 0, 5, "  OSAKSI HALLINTO-  ",
-							@cmoveto, 0, 6, "     RAKENNETTA     ",
+							@cmoveto, 0, 3, " TIETOPOLITIIKAN",
+							@cmoveto, 0, 4, " VAKIINNUTTAMINEN",
+							@cmoveto, 0, 5, " OSAKSI HALLINTO-",
+							@cmoveto, 0, 6, "    RAKENNETTA",
 							@cpage, @cstop);
 	
 	mainPartAddressTable : array[25] of integer;
@@ -634,7 +638,7 @@ begin
 	begin
 		if (tp[0] = @cmoveto) then
 		begin
-			x := tp[1] * 2;
+			x := tp[1] * 2 + 1;
 			y := tp[2] * 3 - 1;
 			sp := AddressTable(#mainPartAddressTable, x, y);
 			tp += 3;
@@ -1133,6 +1137,8 @@ begin
 		
 		numLinesPtr := #numLines2;
 		
+		hideborderx(1); // avoid choppy scroll
+		
 		InitMainPart();
 	end;
 end;