diff --git a/firmware/FIRMWARE.ZX1 b/firmware/FIRMWARE.ZX1 index 749cd31..8de6254 100644 Binary files a/firmware/FIRMWARE.ZX1 and b/firmware/FIRMWARE.ZX1 differ diff --git a/firmware/firmloader.bat b/firmware/firmloader.bat index 4254081..3807e56 100644 --- a/firmware/firmloader.bat +++ b/firmware/firmloader.bat @@ -1,5 +1,5 @@ sjasmplus firmware.asm zx7b firmware_strings.rom firmware.rom.zx7b -sjasmplus firmloader.asm -bin2hex firmloader.rom -copy /y firmloader.hex ..\cores\Spectrum\firmloader_hex.txt \ No newline at end of file +sjasmplus bootloader.asm +bin2hex bootloader.rom +copy /y bootloader.hex ..\cores\Spectrum\bootloader_hex.txt \ No newline at end of file diff --git a/firmware/firmware.asm b/firmware/firmware.asm index 3ccebb7..cb51413 100644 --- a/firmware/firmware.asm +++ b/firmware/firmware.asm @@ -536,7 +536,9 @@ star21 wreg flash_cs, 0 ; activamos spi, enviando un 0 in a, (c) wreg flash_cs, 1 ; desactivamos spi, enviando un 1 and 2 + IF zesarux=0 jr z, star21 + ENDIF xor a ENDIF @@ -1945,7 +1947,18 @@ roms27 ld hl, $0104 ;*** Upgrade Menu *** ;********************* -upgra ld bc, (menuop) +upgra + IF recovery=1 + ld ix, cad117 + ex af, af' + call prnhel +upgra0 in a, ($1f) + jr nz, upgra0 + ld de, $0401 + ld a, %01111001 ; fondo blanco tinta azul + ld l, 0 + ENDIF + ld bc, (menuop) IF vertical=0 ld h, 16 dec c @@ -2051,8 +2064,8 @@ upgr34 ld (hl), a ENDIF jr z, upgr35 inc a - ld (ix-4), cad117 & $ff - ld (ix-3), cad117 >> 8 + ld (ix-4), cad119 & $ff + ld (ix-3), cad119 >> 8 call deixl1 upgr35 ld (ix-3), $ff dec a diff --git a/firmware/header.bin b/firmware/header.bin index d178650..15b9384 100644 Binary files a/firmware/header.bin and b/firmware/header.bin differ diff --git a/firmware/make.bat b/firmware/make.bat index aa492b9..0a73493 100644 --- a/firmware/make.bat +++ b/firmware/make.bat @@ -5,6 +5,7 @@ fcut firmware_strings.rom 7e00 -7e00 strings.bin zx7b strings.bin strings.bin.zx7b sjasmplus firmware.asm fcut firmware_strings.rom 0000 4000 firmware.rom +copy /y firmware.rom FIRMWARE.ZX1 rem GenRom sm12 BIOS firmware.rom firm.TAP rem cgleches firm.tap firm.wav 3 rem firm.wav diff --git a/firmware/strings.asm b/firmware/strings.asm index fe1835c..982d7f9 100644 --- a/firmware/strings.asm +++ b/firmware/strings.asm @@ -406,7 +406,9 @@ cad116 defb 'Disable for', 0 defb 'better compa-', 0 defb 'tibility with', 0 defb 'old games', 0, 0 -cad117 defb ' Add new core', 0 +cad117 defb 'Remove jumpers', 0 + defb 'to continue', 0, 0 +cad119 defb ' Add new core', 0 ;cad199 defb 'af0000 bc0000 de0000 hl0000 sp0000 ix0000 iy0000', 0