Korjattu Albertin vaalipiiri

PiraattiIntro.trse

@@ -29,7 +29,7 @@ override_target_settings_org = $810
 override_target_settings_ignore_sys = 0
 override_target_settings_ignore_prg = 0
 output_debug_symbols = 1
-open_files = ,piraatti_intro.asm, resources/images/piraattinaamat-2.flf, resources/images/piraattinaamat-1.flf, piraatti_intro.ras
+open_files = ,piraatti_intro.ras
 project_path = /Users/gimulnautti/piraattipuolue-github/c64-vaali-intro-2023/
 zeropage_colormemory = $fb
 dirart_flf_file = none
@@ -38,9 +38,9 @@ show_all_files = 1
 use_vice_c1541 = 0
 remove_unused_symbols = 1
 ignore_initial_jump = 0
-current_file = piraatti_intro.ras
+current_file = resources/images/piraattinaamat-2.flf
 output_type = prg
-exomizer_toggle = 0
+exomizer_toggle = 1
 use_track_19 = 1
 disable_compiler_comments = 0
 charset_ = :resources/character.rom

piraatti_intro.ras

@@ -223,22 +223,22 @@ text : string = (@cmoveto, 6,10,
 												26, 12, 13, 12);
 												
 	naamatNames : string = (	
-								"TONI AITTONIEMI - UUSIMAA", @cpause,
-								"JUHO KARVINEN - PIRKANMAA", @cpause,
-								"RIIKKA NIEMINEN - UUSIMAA", @cpause,
-								"JARI NIKKINEN - SAVO-KARJALA", @cpause,
+								"RICHARD ANDERSSON - HELSINKI", @cpause,
+								"VILLE HAUTAKANGAS - HELSINKI", @cpause,
+								"SAKARI HELKE - HELSINKI", @cpause,
 								"SATU IMMONEN - HELSINKI", @cpause,
-								"PEKKA MUSTONEN - HELSINKI", @cpause,
+								"SIMONE KALLIO - HELSINKI", @cpause,
+								"RONI KANTOLA - HELSINKI", @cpause,
 
-								"REETTA OJALA - HELSINKI", @cpause,
-								"MAREK NETSHADA - HELSINKI", @cpause,
 								"OLAVI KAUKAMIELI - HELSINKI", @cpause,
-								"JONI MAHLAMAKI - UUSIMAA", @cpause,
-								"KAUSTI RANTALAINEN - HELSINKI", @cpause,
-								"ARI-PEKKA PULKKIS - VAASA", @cpause, @cstop );
+								"TIMO KYTTA - HELSINKI", @cpause,
+								"ALBERT LAINE - HELSINKI", @cpause,
+								"JARNO LUOMA-NIRVA - HELSINKI", @cpause,
+								"MAREK NETSHADA - HELSINKI", @cpause,
+								"REETTA OJALA - HELSINKI", @cpause, @cstop );
 								
-	naamatNumbers : string = (	"123", "456", "789", " 10", "20 ", " 30",
-											" 40", "50 ", " 60", " 70", " 80", " 90", @cstop);
+	naamatNumbers : string = (	"-2-", "-3-", "-4-", "-5-", "-6-", "-7-",
+								"-8-", "-9-", "10 ", " 11", " 12", "13 ", @cstop);
 							   	
 
 	tab320 : array[25] of integer = buildtable("i*320");	
@@ -341,7 +341,7 @@ text : string = (@cmoveto, 6,10,
 	rasterLineMainScroller : byte = 240;	
 	
 	// TODO optimize spaces
-	scrollText : string = "                                                                    YARRRR SAILORS               WELCOME TO THE FINNISH PIRATE PARTY PARLIAMENTARY ELECTION 2023 INTRO        ---        VOTE FOR US         ---       WE ROCK THE WORLD IN 8 BITS AND BEYOND       ---            WRITTEN BY GIMLE IN TRSE        ---       MUSIC BY GIMLE WITH SIDFACTORY II      ---      MUCH LOVE AND GREETINGS TO THE C64 DEMOSCENE      ---      WE SALUTE SOME GROUNDBREAKING TECHNOLOGICAL PIRATES      ---     FINNISH GOLD  -  EXTEND  -  VIRTUAL DREAMS  -  FAIRLIGHT  -  BYTERAPERS  -  BLOODSUCKERS  -  ARTLINE DESIGNS  -  DEKADENCE  -  BOOZE DESIGN  -  ACCESSION  -  NOICE  -  PROXIMA  -  ORANGE  -  CNCD  -  KEWLERS  -  MFX  -  TPOLM  -  MATUREFURK  -  KATASTRO FI  -  SCOOPEX  -  TAAT  -  HEDELMAE  -  JUMALAUTA  -  KAITA FILMITUOTANTO  -  BRAINLEZ CODERS  -  SYMPTOM  -  GOTO 10  -  DAMONES  -  DA JORMAS  -  WIDE LOAD  -  HIRMU  -  LEUAT                                      ";
+	scrollText : string = "                                                                    YARRRR SAILORS               WELCOME TO THE FINNISH PIRATE PARTY PARLIAMENTARY ELECTION 2023 INTRO        ---        VOTE FOR US         ---       WE ROCK THE WORLD IN 8 BITS AND BEYOND       ---            WRITTEN BY GIMLE IN TRSE        ---       MUSIC BY GIMLE WITH SIDFACTORY II      ---      MUCH LOVE AND GREETINGS TO THE C64 DEMOSCENE      ---      WE SALUTE SOME GROUNDBREAKING TECHNOLOGICAL PIRATES      ---     FINNISH GOLD  -  EXTEND  -  VIRTUAL DREAMS  -  FAIRLIGHT  -  BYTERAPERS  -  BLOODSUCKERS  -  ARTLINE DESIGNS  -  DEKADENCE  -  BOOZE DESIGN  -  ACCESSION  -  NOICE  -  PROXIMA  -  ORANGE  -  CNCD  -  KEWLERS  -  MFX  -  TPOLM  -  MATUREFURK  -  KATASTRO FI  -  PARALLAX  -  TAAT  -  HEDELMAE  -  JUMALAUTA  -  KAITA FILMITUOTANTO  -  BRAINLEZ CODERS  -  SYMPTOM  -  GOTO 10  -  DAMONES  -  DA JORMAS  -  WIDE LOAD  -  HIRMU  -  LEUAT                                      ";
 	scrollTextOffset : integer = 0;
 	scrollTextLength : integer = 0;
 	scrollCurrent : byte = 0;
@@ -1388,7 +1388,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 +1522,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]];