Some improvements to the reverse engineered source and improved firmware

Makefile

@@ -4,7 +4,7 @@ MACHINE ?= c64
 AS=ca65
 LD=ld65
 
-ASFLAGS=--include-dir core -g
+ASFLAGS=-g
 
 ifeq ($(PROJECT), cartridge)
 	ASFLAGS+=-D CART_FC3=1
@@ -27,31 +27,59 @@ else
 	endif
 endif
 
-SOURCES=core/header.s core/vectors.s core/init.s core/basic.s core/drive.s core/desktop_helper.s core/speeder.s core/monitor.s core/wrappers.s core/junk.s core/editor.s core/printer.s core/format.s core/freezer.s core/persistent.s
+SOURCES_B0=bank0/header.s bank0/vectors.s bank0/init.s bank0/basic.s bank0/drive.s bank0/desktop_helper.s bank0/speeder.s bank0/monitor.s bank0/wrappers.s bank0/editor.s bank0/printer.s bank0/format.s bank0/freezer.s bank0/persistent.s bank0/junk.s
+SOURCES_B3=bank3/freezer_entry.s bank3/freezer_reset.s bank3/freezer_game.s bank3/freezer_backup.s bank3/screenshot.s bank3/persistent.s bank3/mysterycode.s bank3/desktop_helper2.s bank3/freezer_menu.s
 
-DEPS=core/kernal.i core/persistent.i
+DEPS=core/kernal.i bank0/persistent.i
 
-OBJECTS=$(SOURCES:.s=.o)
+OBJECTS_B0=$(SOURCES_B0:.s=.o)
+OBJECTS_B3=$(SOURCES_B3:.s=.o)
 
-all: fc3.bin
+all: fc3full.crt
 
 clean:
-	rm -f core/*.o projects/monitor/*.o projects/speeder/*.o *.bin *.prg *.hexdump
+	rm -f bank0/*.o bank3/*.o projects/monitor/*.o projects/speeder/*.o *.bin *.prg *.hexdump fc3full.bin fc3full.crt
+	make -C bank3/disk_backload clean
+	make -C bank3/tape_backload clean
 
-test: fc3.bin
-	@dd if=bin/Final_Cartridge_3_1988-12.bin bs=16384 count=1 2> /dev/null | hexdump -C > fc3-orig.bin.hexdump
-	@hexdump -C fc3.bin > fc3.bin.hexdump
-	@diff -u fc3-orig.bin.hexdump fc3.bin.hexdump
+bank3/disk_backload/backup_loader.prg:
+	make -C bank3/disk_backload
 
-fc3.bin: $(OBJECTS) core/fc3.cfg
-	$(LD) -C core/fc3.cfg $(OBJECTS) -o $@
+bank3/tape_backload/backup_loader.prg:
+	make -C bank3/tape_backload
 
-monitor.prg: core/monitor.o projects/monitor/monitor_support.o projects/monitor/monitor.cfg
-	$(LD) -C projects/monitor/monitor.cfg core/monitor.o projects/monitor/monitor_support.o -o $@ -Ln labels.txt
+testb0: bank0.bin
+	@dd if=bin/Final_Cartridge_3_1988-12.bin bs=16384 count=1 2> /dev/null | hexdump -C > fc3b0-orig.bin.hexdump
+	@hexdump -C bank0.bin > bank0.bin.hexdump
+	@diff -u fc3b0-orig.bin.hexdump bank0.bin.hexdump
 
-speeder.prg: core/speeder.o projects/speeder/speeder_support.o projects/speeder/speeder.cfg
-	$(LD) -C projects/speeder/speeder.cfg core/speeder.o projects/speeder/speeder_support.o -o $@
+testb3: bank3.bin
+	@dd if=bin/Final_Cartridge_3_1988-12.bin bs=16384 skip=3 count=1 2> /dev/null | hexdump -C > fc3b3-orig.bin.hexdump
+	@hexdump -C bank3.bin > bank3.bin.hexdump
+	@diff -u fc3b3-orig.bin.hexdump bank3.bin.hexdump
+
+bank0.bin: $(OBJECTS_B0) bank0/bank0.cfg
+	$(LD) -mbank0.map -C bank0/bank0.cfg $(OBJECTS_B0) -o $@
+
+bank3.bin: $(OBJECTS_B3) bank3/bank3.cfg
+	$(LD) -mbank3.map -C bank3/bank3.cfg $(OBJECTS_B3) -o $@
+
+monitor.prg: bank0/monitor.o projects/monitor/monitor_support.o projects/monitor/monitor.cfg
+	$(LD) -C projects/monitor/monitor.cfg bank0/monitor.o projects/monitor/monitor_support.o -o $@ -Ln labels.txt
+
+speeder.prg: bank0/speeder.o projects/speeder/speeder_support.o projects/speeder/speeder.cfg
+	$(LD) -C projects/speeder/speeder.cfg bank0/speeder.o projects/speeder/speeder_support.o -o $@
 
 %.o: %.s $(DEPS)
 	$(AS) $(ASFLAGS) $< -o $@
 
+bank3/freezer_backup.o: bank3/freezer_backup.s bank3/disk_backload/backup_loader.prg bank3/tape_backload/backup_loader.prg $(DEPS)
+	$(AS) $(ASFLAGS) $< -o $@
+
+fc3full.bin: bank0.bin bank3.bin
+	cp bin/Final_Cartridge_3_1988-12.bin fc3full.bin
+	dd if=bank0.bin of=fc3full.bin bs=16384 count=1 conv=notrunc
+	dd if=bank3.bin of=fc3full.bin bs=16384 seek=3 count=1 conv=notrunc
+
+fc3full.crt: fc3full.bin
+	cartconv -i fc3full.bin -o fc3full.crt -t fc3

README.md

@@ -1,12 +1,16 @@
+Note: The master branch contains source code for the original Final Cartridge III. The Final Cartridge III 101% source code can be found in the development branch.
+
 # Final Cartridge
 
-This project is the reverse-engineered and documented Commodore 64 cc65/ca65/cl65 assembly source code of the first bank of the "*Final Cartridge III*".
+This project is the reverse-engineered and documented Commodore 64 cc65/ca65/cl65 assembly source code of the "*Final Cartridge III*". Currently source code of bank 0 and low part of bank 3 has been reconstructed.
 
-When assembled, the resulting binary is identical with the 1988-12 version of bank 0 of the original cartridge ROM.
+When assembled, the resulting binary is identical with the 1988-12 version of the original cartridge ROM.
 
 ## What is contained?
 
-Bank 0 contains the BASIC and editor extensions, the floppy and tape speeder, fast format, the centronics printer driver, and the monitor. This project does not contain Desktop, the freezer or the BASIC menu bar.
+Bank 0 contains the BASIC and editor extensions, the floppy and tape speeder, fast format, the centronics printer driver, and the monitor.
+
+Bank 3 contains the freezer.
 
 ## Building
 

core/fc3.cfg → bank0/bank0.cfg

@@ -1,18 +1,20 @@
 MEMORY {
 	ROM0LO:          start = $8000, size = $1E00, fill = yes, fillval = $ff, file = %O;
-	ROMIO:           start = $9E00, size = $0200, fill = yes, fillval = $ff, file = %O;
+	ROMIO:           start = $9E00, size = $01E8, fill = yes, fillval = $ff, file = %O;
+	ROMIO_BAR_IRQ:   start = $9FE8, size = $0018, fill = yes, fillval = $ff, file = %O;
 	ROM0HI:          start = $A000, size = $1FA0, fill = yes, fillval = $ff, file = %O;
 	ROM0TOP:         start = $BFA0, size = $005A, fill = yes, fillval = $ff, file = %O;
 	ULTIMAX_VECTORS: start = $BFFA, size = $0006, fill = yes, fillval = $ff, file = %O;
 
-	L0220:   start = $0220, size = $0060;
-	IO:      start = $DE00, size = $0200;
-	BASIC:   start = $0801, size = $97FF;
-	DRIVE4A: start = $0400, size = $0400;
-	DRIVE4B: start = $0400, size = $0400;
-	DRIVE5:  start = $0500, size = $0300;
-	FREEZER: start = $FFA0, size = $005A;
-	L0100:   start = $0100, size = $00FF;
+	L0220:           start = $0220, size = $0060;
+	IO:              start = $DE00, size = $01E8;
+	IO_BAR_IRQ:      start = $DFE8, size = $0018;
+	BASIC:           start = $0801, size = $97FF;
+	DRIVE4A:         start = $0400, size = $0400;
+	DRIVE4B:         start = $0400, size = $0400;
+	DRIVE5:          start = $0500, size = $0300;
+	FREEZER:         start = $FFA0, size = $005A;
+	L0100:           start = $0100, size = $00FF;
 }
 
 SEGMENTS {
@@ -35,6 +37,7 @@ SEGMENTS {
 	drive_code_load:   load = ROM0LO, run = DRIVE4B, type = ro, define = yes;
 
 	romio:             load = ROMIO, run = IO, type = ro;
+	romio_bar_irq:     load = ROMIO_BAR_IRQ, run = IO_BAR_IRQ, type = ro;
 
 	basic_vectors:     load = ROM0HI, type = ro;
 	printer:           load = ROM0HI, type = ro;
@@ -53,3 +56,7 @@ SEGMENTS {
 	freezer:           load = ROM0TOP, run = FREEZER, type = ro;
 	freezer_vectors:   load = ULTIMAX_VECTORS, type = ro;
 }
+
+SYMBOLS {
+  psettings:           type=weak, value=$BFFA;
+}