Skip to content

Commit 9d09334

Browse files
authored
Merge pull request #1128 from sonninnos/commodore-updates
Commodore updates
2 parents c29b92d + ea26667 commit 9d09334

2 files changed

Lines changed: 51 additions & 20 deletions

File tree

docs/library/puae.md

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ Amiga Forever and TOSEC filenames are also accepted.
7171

7272
| Filename | Amiga Forever | Description | md5sum |
7373
|--------------------|---------------------------|------------------------------------|----------------------------------|
74+
| kick31034.A1000 | amiga-os-110-ntsc.rom | Kickstart v1.1 rev 31.034 NTSC | 0b8442c311caa54fb12ec88eaaa9facf |
75+
| kick32034.A1000 | amiga-os-110-pal.rom | Kickstart v1.1 rev 32.034 PAL | 1fa1f93d3d7b51271dd1356b8b2b45a9 |
7476
| kick33180.A500 | amiga-os-120.rom | Kickstart v1.2 rev 33.180 | 85ad74194e87c08904327de1a9443b7a |
7577
| kick34005.A500 | amiga-os-130.rom | Kickstart v1.3 rev 34.005 | 82a21c1890cae844b3df741f2762d48d |
7678
| kick37175.A500 | amiga-os-204.rom | Kickstart v2.04 rev 37.175 | dc10d7bdd1b6f450773dfb558477c230 |
@@ -435,9 +437,7 @@ If you are using RDB HDF files, please use `0,0,0,512` instead of geometry numbe
435437

436438
## Core options
437439

438-
The PUAE core has the following option(s) that can be tweaked from the core options menu. The default setting is bolded.
439-
440-
Settings with (Restart) means that core has to be closed for the new setting to be applied on next launch.
440+
The PUAE core has the following option(s) that can be tweaked from the core options menu. The default setting is in bold.
441441

442442
- **Model** [puae_model] (**auto**|A500OG|A500|A500PLUS|A600|A1200OG|A1200|A2000OG|A2000|A4030|A4040|CDTV|CD32|CD32FR)
443443

@@ -461,7 +461,9 @@ Settings with (Restart) means that core has to be closed for the new setting to
461461

462462
- **Show Automatic Model Options** [puae_model_options_display] (**disabled**|enabled)
463463

464-
Show/hide default model options (Floppy/HD/CD) for 'Automatic' model. Page refresh by menu toggle required!
464+
Show/hide default model options (Floppy/HD/CD) for 'Automatic' model.
465+
466+
Available only when frontend 'Core Option Categories' is disabled.
465467

466468
- **Automatic Floppy** [puae_model_fd] (A500OG|**A500**|A500PLUS|A600|A1200OG|A1200|A2000OG|A2000|A4030|A4040)
467469

@@ -475,9 +477,11 @@ Settings with (Restart) means that core has to be closed for the new setting to
475477

476478
Default model when compact discs are launched with 'Automatic' model. Core restart required.
477479

478-
- **Kickstart ROM** [puae_kickstart] (**auto**|aros|kick33180.A500|kick34005.A500|kick37175.A500|kick37350.A600|kick40063.A600|kick39106.A1200|kick40068.A1200|kick39106.A4000|kick40068.A4000)
480+
- **Kickstart ROM** [puae_kickstart] (**auto**|aros|...)
481+
482+
'Automatic' defaults to the most compatible version for the model. 'AROS' is a built-in replacement with fair compatibility.
479483

480-
'Automatic' defaults to the most compatible version for the model. 'AROS' is a built-in replacement with fair compatibility. Core restart required.
484+
Kickstart ROMs are searched from 'system'. Core restart required.
481485

482486
- **Chip RAM** [puae_chipmem_size] (**auto**|1|2|3|4)
483487

@@ -644,6 +648,10 @@ Settings with (Restart) means that core has to be closed for the new setting to
644648
| splash | Splash (Show briefly) |
645649
| both | Config + Splash (Wait for user input) |
646650

651+
- **WHDLoad ButtonWait** [puae_use_whdload_buttonwait] (disabled|**enabled**)
652+
653+
Wait for a button press on internal loading sections if the slave supports it. Core restart required.
654+
647655
- **WHDLoad NoWriteCache** [puae_use_whdload_nowritecache] (**disabled**|enabled)
648656

649657
Write cache requires running the core a few frames after closing content to trigger WHDLoad quit and flush cache to disk.
@@ -661,7 +669,7 @@ Settings with (Restart) means that core has to be closed for the new setting to
661669

662670
- **Show Video Options** [puae_video_options_display] (**disabled**|enabled)
663671

664-
Page refresh by menu toggle required!
672+
Available only when frontend 'Core Option Categories' is disabled.
665673

666674
- **Allow PAL/NTSC Hz Change** [puae_video_allow_hz_change] (disabled|enabled|**locked**)
667675

@@ -777,7 +785,7 @@ Settings with (Restart) means that core has to be closed for the new setting to
777785

778786
- **Show Audio Options** [puae_audio_options_display] (**disabled**|enabled)
779787

780-
Page refresh by menu toggle required!
788+
Available only when frontend 'Core Option Categories' is disabled.
781789

782790
- **Stereo Separation** [puae_sound_stereo_separation] (0%|10%|20%|30%|40%|50%|60%|70%|80%|90%|**100%**)
783791

@@ -899,7 +907,7 @@ Settings with (Restart) means that core has to be closed for the new setting to
899907

900908
- **Show Mapping Options** [puae_mapping_options_display] (disabled|**enabled**)
901909

902-
Page refresh by menu toggle required!
910+
Available only when frontend 'Core Option Categories' is disabled.
903911

904912
- **Toggle Virtual Keyboard** [puae_mapper_vkbd] (**---**)
905913

docs/library/vice.md

Lines changed: 34 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,8 @@ Save disks generated by the `#SAVEDISK:` keyword are automatically assigned the
262262
- Alternative label for the next entry
263263
- `<disk>.d64:<prg>`
264264
- Load a program instead of `"*"`
265+
- `<tape>.tap:<prg>:,1,1`
266+
- Force non-basic tape load
265267
- `<disk>.d64|<label>`
266268
- Set a friendly name (shown in "Disc Control")
267269
- `<disks>.zip#<disk>.d64`
@@ -361,9 +363,7 @@ Older C64 games tend to use joystick port 1 and newer ones tend to use port 2 fo
361363

362364
## Core options
363365

364-
The VICE cores have the following option(s) that can be tweaked from the core options menu. The default setting is bolded.
365-
366-
Settings with (Restart) means that core has to be closed for the new setting to be applied on next launch.
366+
The VICE cores have the following option(s) that can be tweaked from the core options menu. The default setting is in bold.
367367

368368
#### C64 (fast/accurate/SuperCPU) specific
369369

@@ -395,6 +395,8 @@ Settings with (Restart) means that core has to be closed for the new setting to
395395

396396
- **SuperCPU Speed Switch** [vice_supercpu_speed_switch] (disabled|**enabled**)
397397

398+
Normal or Turbo 20MHz.
399+
398400
- **SuperCPU Kernal** [vice_supercpu_kernal] (**0**|1|2)
399401

400402
JiffyDOS does not work with the internal kernal!
@@ -407,28 +409,34 @@ Settings with (Restart) means that core has to be closed for the new setting to
407409

408410
- **Model** [vice_c64dtv_model] (DTV2 PAL|DTV2 NTSC|**DTV3 PAL**|DTV3 NTSC|HUMMER NTSC)
409411

412+
Changing while running resets the system!
413+
410414
#### C128 specific
411415

412416
- **Model** [vice_c128_model] (**C128 PAL auto**|C128 NTSC auto|C128 D PAL auto|C128 D NTSC auto|C128 DCR PAL auto|C128 DCR NTSC auto|C128 PAL|C128 NTSC|C128 D PAL|C128 D NTSC|C128 DCR PAL|C128 DCR NTSC)
413417

414-
'Automatic' switches region per file path tags.
418+
'Automatic' switches region per file path tags. Changing while running resets the system!
415419

416420
- **RAM Expansion Unit** [vice_c128_ram_expansion_unit] (**none**|128kB|256kB|512kB|1024kB|2048kB|4096kB|16384kB)
417421

418422
Not allowed with cartridges. Changing while running resets the system!
419423

420424
- **Video Output** [vice_c128_video_output] (**VICII**|VDC)
421425

426+
Can be toggled with the '40/80 DISPLAY' key (F7).
427+
422428
- **VDC Video RAM** [vice_c128_vdc_ram] (**default**|64)
423429

430+
VDC memory size.
431+
424432
| Value | Label |
425433
|---------|-----------------------|
426434
| default | 16kB |
427435
| 64 | 64kB |
428436

429-
- **GO64 (Restart)** [vice_c128_go64] (**disabled**|enabled)
437+
- **GO64** [vice_c128_go64] (**disabled**|enabled)
430438

431-
Start in C64 compatibility mode.
439+
Start in C64 compatibility mode. Changing while running resets the system!
432440

433441
- **JiffyDOS** [vice_jiffydos] (**disabled**|enabled)
434442

@@ -457,18 +465,26 @@ Settings with (Restart) means that core has to be closed for the new setting to
457465

458466
- **Model** [vice_plus4_model] (C16 PAL|C16 NTSC|**PLUS4 PAL**|PLUS4 NTSC|V364 NTSC|232 NTSC)
459467

468+
Changing while running resets the system!
469+
460470
#### CBM-II specific
461471

462472
- **Model** [vice_cbm2_model] (**610 PAL**|610 NTSC|620 PAL|620 NTSC|620PLUS PAL|620PLUS NTSC|710 NTSC|720 NTSC|720PLUS NTSC)
463473

474+
Changing while running resets the system!
475+
464476
#### CBM-II 5x0 specific
465477

466478
- **Model** [vice_cbm5x0_model] (**510 PAL**|510 NTSC)
467479

480+
Changing while running resets the system!
481+
468482
#### PET specific
469483

470484
- **Model** [vice_pet_model] (2001|3008|3016|3032|3032B|4016|4032|4032B|**8032**|8096|8296|SUPERPET)
471485

486+
Changing while running resets the system!
487+
472488
#### Common
473489

474490
- **Printer** [vice_printer] (**disabled**|enabled)
@@ -501,7 +517,7 @@ Settings with (Restart) means that core has to be closed for the new setting to
501517

502518
- **Warp Boost** [vice_warp_boost] (**disabled**|enabled)
503519

504-
Make warp mode much faster by changing SID emulation to 'FastSID' while warping.
520+
Warp mode speedup by changing SID engine to 'FastSID' while warping. Affects audio detection during warp.
505521

506522
- **Autostart** [vice_autostart] (disabled|**enabled**|warp)
507523

@@ -545,7 +561,7 @@ Settings with (Restart) means that core has to be closed for the new setting to
545561

546562
- **Show Video Options** [vice_video_options_display] (**disabled**|enabled)
547563

548-
Page refresh by menu toggle required!
564+
Available only when frontend 'Core Option Categories' is disabled.
549565

550566
- **Pixel Aspect Ratio** [vice_aspect_ratio] (**auto**|pal|ntsc|raw)
551567

@@ -573,6 +589,8 @@ Settings with (Restart) means that core has to be closed for the new setting to
573589

574590
- **Color Depth** [vice_gfx_colors] (16bit|**24bit**)
575591

592+
Full restart required.
593+
576594
#### Color palette options
577595

578596
##### VIC-II (C64, C128, CBM-II 5x0)
@@ -697,8 +715,12 @@ Settings with (Restart) means that core has to be closed for the new setting to
697715

698716
- **CRTC Color Palette** [vice_cbm2_external_palette] (**default**|green|amber|white)
699717

718+
Native default is green.
719+
700720
- **CRTC Color Palette** [vice_pet_external_palette] (**default**|green|amber|white)
701721

722+
Native default is green.
723+
702724
### On-Screen Display options
703725

704726
- **Virtual KBD Theme** [vice_vkbd_theme] (**auto**|auto_outline|brown|brown_outline|beige|beige_outline|dark|dark_outline|light|light_outline)
@@ -735,7 +757,7 @@ Settings with (Restart) means that core has to be closed for the new setting to
735757

736758
- **Show Audio Options** [vice_audio_options_display] (**disabled**|enabled)
737759

738-
Page refresh by menu toggle required!
760+
Available only when frontend 'Core Option Categories' is disabled.
739761

740762
- **Drive Sound Emulation** [vice_drive_sound_emulation] (disabled|5%|10%|15%|**20%**|25%|30%|35%|40%|45%|50%|55%|60%|65%|70%|75%|80%|85%|90%|95%|100%)
741763

@@ -861,7 +883,8 @@ Settings with (Restart) means that core has to be closed for the new setting to
861883
| Value | Label |
862884
|-------|---------------------------------|
863885
| 1 | Joystick |
864-
| 2 | Paddles |
886+
| 2 | Paddles (Split) |
887+
| 2R | Paddles (Raw) |
865888
| 3 | Mouse (1351) |
866889
| 4 | Mouse (NEOS) |
867890
| 5 | Mouse (Amiga) |
@@ -890,7 +913,7 @@ Settings with (Restart) means that core has to be closed for the new setting to
890913

891914
- **Show Mapping Options** [vice_mapping_options_display] (disabled|**enabled**)
892915

893-
Page refresh by menu toggle required!
916+
Available only when frontend 'Core Option Categories' is disabled.
894917

895918
- **Toggle Virtual Keyboard** [vice_mapper_vkbd] (**---**)
896919

0 commit comments

Comments
 (0)