diff --git a/player/main.s b/player/main.s index 2f97700..d1e3b4c 100644 --- a/player/main.s +++ b/player/main.s @@ -397,7 +397,7 @@ _op_header_hgr: ; Y register has the high byte of the W5100 address pointer in the RX socket code, so we ; can't trash this until we are ready to point back there. checkrecv: - BIT TICK ; 4 + STA TICK ; 4 LDA #3 pad cycles between tick pair; can't branch to tail STA @D+2 ; 4 @@ -1005,7 +1005,7 @@ tickident page, 8 .macro op_tick_56 page ; 4+(4+4+5+4+5+4+5+4+5+4+4+4+4)+2+4+4+3 .ident (.concat ("op_tick_56_page_", .string(page))): - BIT TICK ; 4 + STA TICK ; 4 LDA WDATA ; 4 LDY WDATA ; 4 STA page << 8,Y ; 5 @@ -1020,7 +1020,7 @@ tickident page, 8 STA @D+2 ; 4 STA dummy ; 4 - BIT TICK ; 4 + STA TICK ; 4 ; used >3 pad cycles between tick pair; can't branch to tail NOP ; 2 @@ -1034,7 +1034,7 @@ tickident page, 8 .macro op_tick_58 page ; pattern repeats from op_tick_40 ;4+(4+4+5+4+5+4+5+4+5+4+4+3+3+4)+4+4+3 .ident (.concat ("op_tick_58_page_", .string(page))): - BIT TICK ; 4 + STA TICK ; 4 LDA WDATA ; 4 LDY WDATA ; 4 STA page << 8,Y ; 5 @@ -1050,7 +1050,7 @@ tickident page, 8 STA zpdummy ; 3 STA zpdummy ; 3 - BIT TICK ; 4 + STA TICK ; 4 ; used >3 pad cycles between tick pair; can't branch to tail LDA WDATA ; 4 @@ -1062,7 +1062,7 @@ tickident page, 8 .macro op_tick_60 page ; 4+(4+4+5+4+5+4+5+4+5+4+4+4+4+4)+2+4+3 .ident (.concat ("op_tick_60_page_", .string(page))): - BIT TICK ; 4 + STA TICK ; 4 LDA WDATA ; 4 LDY WDATA ; 4 STA page << 8,Y ; 5 @@ -1079,7 +1079,7 @@ tickident page, 8 LDA WDATA ; 4 STA dummy ; 4 - BIT TICK ; 4 + STA TICK ; 4 ; used >3 pad cycles between tick pair; can't branch to tail NOP ; 2 @@ -1091,7 +1091,7 @@ tickident page, 8 .macro op_tick_62 page ;4+(4+4+5+4+5+4+5+4+5+4+4+4+3+3+4)+4+3 .ident (.concat ("op_tick_62_page_", .string(page))): - BIT TICK ; 4 + STA TICK ; 4 LDA WDATA ; 4 LDY WDATA ; 4 STA page << 8,Y ; 5 @@ -1108,7 +1108,7 @@ tickident page, 8 STA zpdummy ; 3 STA zpdummy ; 3 - BIT TICK ; 4 + STA TICK ; 4 ; used >3 pad cycles between tick pair; can't branch to tail STA @D+1 ; 4 @@ -1119,7 +1119,7 @@ tickident page, 8 .macro op_tick_64 page ;4+(4+4+5+4+5+4+5+4+5+4+4+4+4+4+4)+2+3 .ident (.concat ("op_tick_64_page_", .string(page))): - BIT TICK ; 4 + STA TICK ; 4 LDA WDATA ; 4 LDY WDATA ; 4 STA page << 8,Y ; 5 @@ -1137,7 +1137,7 @@ tickident page, 8 STA @D+1 ; 4 STA dummy ; 4 - BIT TICK ; 4 + STA TICK ; 4 NOP ; 2 @D: @@ -1147,7 +1147,7 @@ tickident page, 8 .macro op_tick_66 page ; pattern repeats from op_tick_8 ; 4+(4+4+5+4+5+4+5+4+5+4+4+4+3+4+3+4)+3 .ident (.concat ("op_tick_66_page_", .string(page))): - BIT TICK ; 4 + STA TICK ; 4 LDA WDATA ; 4 LDY WDATA ; 4 STA page << 8,Y ; 5 @@ -1166,7 +1166,7 @@ tickident page, 8 STA zpdummy ; 3 STA zpdummy ; 3 - BIT TICK ; 4 + STA TICK ; 4 @D: JMP op_nop ; 3 @@ -1293,7 +1293,7 @@ op_terminate: ; the last 4 bytes in a 2K "TCP frame". i.e. we can assume that we need to consume ; exactly 2K from the W5100 socket buffer. op_ack: - BIT TICK ; 4 + STA TICK ; 4 ; allow flip-flopping the PAGE1/PAGE2 soft switches to steer writes to MAIN/AUX screens ; actually this allows touching any $C0XX soft-switch, in case that is useful somehow @@ -1314,7 +1314,7 @@ op_ack: LDX #