Misc cleanups

source/redbook/autostart.asm

@@ -1,4 +1,3 @@
-
 ********************************
 *
 * APPLE II
@@ -83,7 +82,7 @@ USRADR	EQU $03F8
 NMI     EQU $03FB
 IRQLOC  EQU $3FE
 LINE1   EQU $400
-MSLOT	EQU $07FB
+MSLOT   EQU $07F8
 IOADR   EQU $C000
 KBD     EQU $C000
 KBDSTRB EQU $C010
@@ -107,7 +106,7 @@ SETAN3	EQU $C05E
 CLRAN3  EQU $C05F
 TAPEIN  EQU $C060
 PADDL0  EQU $C064
-PTRIG	EQU $CO70
+PTRIG   EQU $C070
 CLRROM  EQU $CFFF
 BASIC   EQU $E000
 BASIC2  EQU $E003
@@ -157,7 +156,7 @@ GBASCALC PHA
         ORA #$04
         STA GBASH
         PLA
-	AND #$1B
+        AND #$18
         BCC GBCALC
         ADC #$7F
 GBCALC  STA GBASL
@@ -195,7 +194,7 @@ INSDS1	LDX PCL
         LDY PCH
         JSR PRYX2
         JSR PRBLNK
-INSDS2	LDA (PLC,X)
+INSDS2  LDA (PCL,X)
         TAY
         LSR A
         BCC IEVEN
@@ -270,7 +269,7 @@ PRMN2	ASL RMNEM
         LDX #$06
 PRADR1  CPX #$03
         BEQ PRADR5
-RPADR2	ASL FORMAT
+PRADR2  ASL FORMAT
         BCC PRADR3
         LDA CHAR1-1,X
         JSR COUT
@@ -350,7 +349,7 @@ RTS2	RTS
         DFB $44
         DFB $33
         DFB $0D
-	DFB $CB
+        DFB $C8
         DFB $44
         DFB $00
         DFB $11
@@ -471,7 +470,7 @@ MNEML	DFB $1C
         DFB $69
         DFB $23
         DFB $A0
-MNEMR	DFB $DB
+MNEMR   DFB $D8
         DFB $62
         DFB $5A
         DFB $48
@@ -627,7 +626,7 @@ RDSP1	LDA #$A0
         RTS
 PWRCON  DW OLDBRK
         DFB $00,$E0,$45
-DIKID 	DFB $20,$FF,$00,$FF
+DISKID  DFB $20,$FF,$00,$FF
         DFB $03,$FF,$3C
 TITLE   DFB $C1,$D0,$D0
         DFB $CC,$C5,$A0
@@ -637,7 +636,7 @@ XLTBL	EQU *
         DFB $FF,$C3
         DFB $FF,$FF,$FF
 *  MUST ORG $FB19
-RTBL	DFB $C1,$DB,$D9
+RTBL    DFB $C1,$D8,$D9
         DFB $D0,$D3
 PREAD   LDA PTRIG
         LST ON
@@ -647,7 +646,7 @@ PREAD	LDA PTRIG
 PREAD2  LDA PADDL0,X
         BPL RTS2D
         INY
-	BNEW PREAD2
+        BNE PREAD2
         DEY
 RTS2D   RTS
 INIT    LDA #$00
@@ -725,8 +724,8 @@ ESCNEW	CMP #$CE   ; IS THIS AN N ?
         NOP
         NOP
 *    MUST ORG $FBC1
-BASCACL PHA
-	LSA A
+BASCALC PHA
+        LSR A
         AND #$03
         ORA #$04
         STA BASH
@@ -742,7 +741,7 @@ BASCLC2	STA BASL
         RTS
 BELL1   CMP #$87
         BNE RTS2B
-	LDA #$50
+        LDA #$40
         JSR WAIT
         LDY #$C0
 BELL2   LDA #$0C
@@ -797,7 +796,7 @@ ESC1	EOR #$C0   ; ESC @ ?
 CLREOP  LDY CH     ; ESC F IS CLR TO END OF PAGE
         LDA CV
 CLEOP1  PHA
-	JSR VRABZ
+        JSR VTABZ
         JSR CLEOLZ
         LDY #$00
         PLA
@@ -870,7 +869,7 @@ RTS4B	RTS
         PAGE
 HEADR   LDY #$4B
         JSR ZERDLY
-	BNE BEADR
+        BNE HEADR
         ADC #$FE
         BCS HEADR
         LDY #$21
@@ -1039,7 +1038,7 @@ STOR	STA MODE
         STA (A3L),Y
         INC A3L
         BNE RTS5
-	INA A3H
+        INC A3H
 RTS5    RTS
 SETMODE LDY YSAV
         LDA IN-1,Y
@@ -1123,7 +1122,7 @@ IOPRT2	EQU *
         NOP
 XBASIC  JMP BASIC
 BASCONT JMP BASIC2
-QO	JSR A1PC
+GO      JSR A1PC
         JSR RESTORE
         JMP (PCL)
 REGZ    JMP REGDSP
@@ -1241,7 +1240,7 @@ NXTBIT	ASL A
 NXTBAS  LDA MODE
         BNE NXTBS2
 *
-	LDA A2H,
+        LDA A2H,X
 *
         STA A1H,X
 *
@@ -1257,7 +1256,7 @@ NXTCHR	LDA IN,Y
         EOR #$B0
         CMP #$0A
         BCC DIG
-	ADC #$BB
+        ADC #$88
         CMP #$FA
         BCS DIG
         RTS
@@ -1306,7 +1305,7 @@ SUBTBL	DFB $B2
         DFB $17
         DFB $2B
         DFB $1F
-	DFB $B3
+        DFB $83
         DFB $7F
         DFB $5D
         DFB $CC

source/redbook/info.org

@@ -52,3 +52,8 @@ ftp://ftp.apple.asimov.net/pub/apple_II/documentation/programming/6502assembly/A
 
 Apple II Original ROM Information
 http://www.downloads.reactivemicro.com/Public/Users/David_Craig/Apple2OriginalROMInfo.TXT
+
+* Differences found
+The autostart ROM listing has $FFFE:FFFF pointing to IRQ ($FA40).
+The apple2+.rom file I have points to $FF59 (OLDRST).
+