diff --git a/PiraattiIntro.trse b/PiraattiIntro.trse index af7529c..a2a69b2 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 = ,resources/images/piraattinaamat-2.flf, resources/images/piraattinaamat-1.flf, piraatti_intro.ras +open_files = ,piraatti_intro.asm, 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 @@ -40,7 +40,7 @@ remove_unused_symbols = 1 ignore_initial_jump = 0 current_file = piraatti_intro.ras output_type = prg -exomizer_toggle = 0 +exomizer_toggle = 1 use_track_19 = 1 disable_compiler_comments = 0 charset_ = :resources/character.rom diff --git a/piraatti_intro.d64 b/piraatti_intro.d64 new file mode 100644 index 0000000..91aa14e Binary files /dev/null and b/piraatti_intro.d64 differ diff --git a/piraatti_intro.ras b/piraatti_intro.ras index a7c38ab..c52c5ee 100644 --- a/piraatti_intro.ras +++ b/piraatti_intro.ras @@ -279,8 +279,8 @@ text : string = (@cmoveto, 6,10, @cpage, @cmoveto, 0, 2, " LOBBAUS NAKYVAKSI", @cmoveto, 0, 3, "LAAJA JULKISUUSLAKI", - @cmoveto, 0, 4, "KANSANAANESTYSALOI-", - @cmoveto, 0, 5, "TE PERUSOIKEUDET", + @cmoveto, 0, 4, " KANSANAANESTYS", + @cmoveto, 0, 5, " PERUSOIKEUDET", @cmoveto, 0, 6, "YKSITYISYYDENSUOJA", @cmoveto, 0, 7, " YHDENVERTAISUUS", @cpage, @@ -289,12 +289,12 @@ text : string = (@cmoveto, 6,10, @cmoveto, 0, 4, " TEKNOLOGIATUKI", @cmoveto, 0, 5, "PAIKALLISDEMOKRATIA", @cmoveto, 0, 6, " LUONTO MAANKAYTTO", - @cmoveto, 0, 7, " KESTAVYYS", + @cmoveto, 0, 7, " KESTAVYYS", @cpage, @cmoveto, 0, 3, "HYVINVOINTIALUEIDEN", @cmoveto, 0, 4, " VERONKANTO-OIKEUS", @cmoveto, 0, 5, " RAHANKERAYSLAIN", - @cmoveto, 0, 6, " UUDISTUS", + @cmoveto, 0, 6, " UUDISTUS", @cmoveto, 0, 7, " PERUSTULO", @cpage, @cmoveto, 0, 2, " TAVOITTEELLINEN", @@ -304,6 +304,13 @@ text : string = (@cmoveto, 6,10, @cmoveto, 0, 6, " TYOPERAINEN", @cmoveto, 0, 7, " MAAHANMUUTTO", @cpage, + @cmoveto, 0, 2, " LAPINAKYVAT JA", + @cmoveto, 0, 3, " TURVALLISET", + @cmoveto, 0, 4, " JULKISET", + @cmoveto, 0, 5, "TIETOJARJESTELMAT", + @cmoveto, 0, 6, " OSTO-OSAAMISTA", + @cmoveto, 0, 7, " YKSITYISTAMISEEN", + @cpage, @cmoveto, 0, 3, " TIETOPOLITIIKAN", @cmoveto, 0, 4, " VAKIINNUTTAMINEN", @cmoveto, 0, 5, " OSAKSI HALLINTO-", @@ -972,7 +979,7 @@ end; interrupt RasterText(); begin startIRQ(@useKernal); - if (currentTime > 50) then UpdateText(); + UpdateText(); closeIRQ(); GoToMainRaster(); end; @@ -1517,7 +1524,7 @@ begin fgColBefore := screen_fg_col; DisableCIAInterrupts(); - CopyCharsetRomToRam($c0); + CopyCharSetFromRom(^$c000); setmemoryconfig(1,@useKernal,0); @@ -1537,7 +1544,7 @@ begin CreateAddressTable(#mainPartAddressTable, $4400, 40, 25); CreateAddressTable(#colorAddressTable, $d800, 40, 25); - Fill(^$0568, KEY_SPACE, 200); + Fill(^$0528, KEY_SPACE, 240); for i := 0 to 256 do fastPlasma[i] := textPlasmaLumi[textPlasmaX[i]]; @@ -1551,7 +1558,7 @@ begin while (true) do begin - // Main loop "work tasks" here + // Heavy main loop work tasks here if (mainWorkState = @mainText) then begin diff --git a/resources/sid/_piraattimusa.dat b/resources/sid/_piraattimusa.dat index ffe878a..11f05fe 100644 Binary files a/resources/sid/_piraattimusa.dat and b/resources/sid/_piraattimusa.dat differ diff --git a/resources/sid/piraattimusa.sid b/resources/sid/piraattimusa.sid index 6adeba6..a3ea9bb 100644 Binary files a/resources/sid/piraattimusa.sid and b/resources/sid/piraattimusa.sid differ