diff --git a/PiraattiIntro.trse b/PiraattiIntro.trse index d2b2f18..23928c5 100644 --- a/PiraattiIntro.trse +++ b/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 = ,resources/images/piraattinaamat-2.flf, resources/images/piraattinaamat-1.flf, piraatti_intro.ras project_path = /Users/gimulnautti/piraattipuolue-github/c64-vaali-intro-2023/ zeropage_colormemory = $fb dirart_flf_file = none diff --git a/piraatti_intro.prg b/piraatti_intro.prg index 75b4de9..f9d2c51 100644 Binary files a/piraatti_intro.prg and b/piraatti_intro.prg differ diff --git a/piraatti_intro.ras b/piraatti_intro.ras index 07fc813..1229af8 100644 --- a/piraatti_intro.ras +++ b/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, - "SATU IMMONEN - HELSINKI", @cpause, - "PEKKA MUSTONEN - HELSINKI", @cpause, - - "REETTA OJALA - HELSINKI", @cpause, - "MAREK NETSHADA - HELSINKI", @cpause, - "OLAVI KAUKAMIELI - HELSINKI", @cpause, - "JONI MAHLAMAKI - UUSIMAA", @cpause, + "AKI OKSALA - HELSINKI", @cpause, + "SAMUEL PEIPONEN - HELSINKI", @cpause, + "JANNE PITKANEN - HELSINKI", @cpause, + "ARI-PEKKA PULKKIS - HELSINKI", @cpause, "KAUSTI RANTALAINEN - HELSINKI", @cpause, - "ARI-PEKKA PULKKIS - VAASA", @cpause, @cstop ); + "HANNELE REHUTTU - HELSINKI", @cpause, + + "ELIAS VARTIO - HELSINKI", @cpause, + "PIETARI VIRTANEN - HELSINKI", @cpause, + "TONI AITTONIEMI - UUSIMAA", @cpause, + "JONI MAHLAMAKI - UUSIMAA", @cpause, + "RIIKKA NIEMINEN - UUSIMAA", @cpause, + "JOONAS MAKINEN - UUSIMAA", @cpause, @cstop ); naamatNumbers : string = ( "123", "456", "789", " 10", "20 ", " 30", - " 40", "50 ", " 60", " 70", " 80", " 90", @cstop); + " 40", "50 ", " 60", " 70", " 80", " 90", @cstop); tab320 : array[25] of integer = buildtable("i*320"); diff --git a/resources/images/piraattinaamat-1.flf b/resources/images/piraattinaamat-1.flf index f8fb5d6..bca32e6 100644 Binary files a/resources/images/piraattinaamat-1.flf and b/resources/images/piraattinaamat-1.flf differ diff --git a/resources/images/piraattinaamat-1_color.bin b/resources/images/piraattinaamat-1_color.bin index e41a3a5..150109c 100644 Binary files a/resources/images/piraattinaamat-1_color.bin and b/resources/images/piraattinaamat-1_color.bin differ diff --git a/resources/images/piraattinaamat-1_data.bin b/resources/images/piraattinaamat-1_data.bin index 9734bf4..f74b6aa 100644 Binary files a/resources/images/piraattinaamat-1_data.bin and b/resources/images/piraattinaamat-1_data.bin differ diff --git a/resources/images/piraattinaamat-2.flf b/resources/images/piraattinaamat-2.flf index bf264a5..9eea9d6 100644 Binary files a/resources/images/piraattinaamat-2.flf and b/resources/images/piraattinaamat-2.flf differ diff --git a/resources/images/piraattinaamat-2_color.bin b/resources/images/piraattinaamat-2_color.bin index 498b727..840363f 100644 Binary files a/resources/images/piraattinaamat-2_color.bin and b/resources/images/piraattinaamat-2_color.bin differ diff --git a/resources/images/piraattinaamat-2_data.bin b/resources/images/piraattinaamat-2_data.bin index 872a743..c164576 100644 Binary files a/resources/images/piraattinaamat-2_data.bin and b/resources/images/piraattinaamat-2_data.bin differ