From def53563b0612f1cefe77418e75c437772217e00 Mon Sep 17 00:00:00 2001 From: Christopher RYU Date: Sat, 29 Jul 2023 06:07:45 +0900 Subject: [PATCH] Use our macro to keep this readable. --- firmware/legend.s | 105 ++++++++++------------------------------------ 1 file changed, 21 insertions(+), 84 deletions(-) diff --git a/firmware/legend.s b/firmware/legend.s index ddc904e..8a07f00 100644 --- a/firmware/legend.s +++ b/firmware/legend.s @@ -5,7 +5,7 @@ PRBL2 := $F94A HOME := $FC58 COUT := $FDED -.MACPACK apple2 +.include "screencode.h" .org $c600 ldx #$20 ; controller signature @@ -30,10 +30,8 @@ loop1: iny bne LC617 LC627: beq LC627 -info: scrcode $0d, "<--KEYBOARD" - -.ifdef MICROSCI -; ROM checksum 5ddcbbf1 +; Splash screen +; ; <--KEYBOARD U-SCI REAR--> ; ; ---------JUMPER-------- @@ -46,88 +44,27 @@ info: scrcode $0d, "<--KEYBOARD" ; ### ! ! ! ### ! ! ! ### ; XXXXXXX XXXXXXX XXXXXXX ; 3.2 INFO 3.3&PASCAL - - .byte $08 - scrcode "U-SCI" - .byte $08 - scrcode "REAR-->", $0d, $0d - .byte $08 - scrcode "---------JUMPER--------" -.else -; ROM checksum 5dfc32ca +; +; Franklin differs on the first three lines: ; <--KEYBOARD ACE 1000 REAR--> ; ; ------JUMPER------ -; ! ! ! -; V V V -; -; ### ! ! ! ### ! ! ! ### -; ### ! ! ! ### ! ! ! ### -; ### ! ! ! ### ! ! ! ### -; ### ! ! ! ### ! ! ! ### -; XXXXXXX XXXXXXX XXXXXXX -; 3.2 INFO 3.3&PASCAL - .byte $06 - scrcode "ACE 1000" - .byte $06 - scrcode "REAR-->", $0d, $0d - .byte $07 - scrcode " " - .byte $02 - scrcode "------JUMPER------" +info: screencode $0d, "<--KEYBOARD" +.ifdef MICROSCI + screencode $08, "U-SCI", $08, "REAR-->", $0d, $0d + screencode $08, "---------JUMPER--------", $0d +.else + + screencode $06, "ACE 1000", $06, "REAR-->", $0d, $0d + screencode $07, " ", $02, "------JUMPER------", $0d .endif - scrcode $0d - .byte $07 - scrcode "!" - .byte $0b - scrcode "!" - .byte $0b - scrcode "!" - scrcode $0d - .byte $07 - scrcode "V" - .byte $0b - scrcode "V" - .byte $0b - scrcode "V", $0d, $0d - .byte $06 - scrcode "### ! !" - .byte $03 - scrcode "! ### !" - .byte $03 - scrcode "! ! ###", $0d + screencode $07, "!", $0b, "!", $0b, "!", $0d + screencode $07, "V", $0b, "V", $0b, "V", $0d, $0d + screencode $06, "### ! !", $03, "! ### !", $03, "! ! ###", $0d + screencode $06, "### ! !", $03, "! ### !", $03, "! ! ###", $0d + screencode $06, "### ! !", $03, "! ### !", $03, "! ! ###", $0d + screencode $06, "### ! !", $03, "! ### !", $03, "! ! ###", $0d - .byte $06 - scrcode "### ! !" - .byte $03 - scrcode "! ### !" - .byte $03 - scrcode "! ! ###", $0d - - .byte $06 - scrcode "### ! !" - .byte $03 - scrcode "! ### !" - .byte $03 - scrcode "! ! ###", $0d - - .byte $06 - scrcode "### ! !" - .byte $03 - scrcode "! ### !" - .byte $03 - scrcode "! ! ###", $0d - - .byte $06 - scrcode "XXXXXXX" - .byte $03 - scrcode "XXXXXXX" - .byte $03 - scrcode "XXXXXXX", $0d - .byte $08 - scrcode "3.2" - .byte $06 - scrcode "INFO" - .byte $04 - scrcode "3.3&PASCAL", $0d, $0d + screencode $06, "XXXXXXX", $03, "XXXXXXX", $03, "XXXXXXX", $0d + screencode $08, "3.2", $06, "INFO", $04, "3.3&PASCAL", $0d, $0d