1
0
mirror of https://github.com/dschmenk/PLASMA.git synced 2025-08-09 01:25:00 +00:00

Merge fixes

This commit is contained in:
David Schmenk
2017-11-27 14:10:15 -08:00
parent 75ecdc237e
commit 5c66505e04
2 changed files with 7 additions and 8 deletions

Binary file not shown.

View File

@@ -49,15 +49,14 @@ ALTRDON = $C003
ALTWROFF= $C004 ALTWROFF= $C004
ALTWRON = $C005 ALTWRON = $C005
!SOURCE "vmsrc/plvmzp.inc" !SOURCE "vmsrc/plvmzp.inc"
OP16IDX = FETCHOP+4
OP16PAGE= OP16IDX+1
DROP16 = $EE DROP16 = $EE
NEXTOP16= $EF NEXTOP16= $EF
FETCHOP16= NEXTOP16+3 FETCHOP16= NEXTOP16+3
IP16 = $F3 IP16 = $F3
IP16L = $F3 IP16L = $F3
IP16H = IP16L+1 IP16H = IP16L+1
OP16TBL = $F7 OP16IDX = FETCHOP16+4
OP16PAGE= OP16IDX+1
HWSP = TMPH+1 HWSP = TMPH+1
; ;
; BUFFER ADDRESSES ; BUFFER ADDRESSES
@@ -390,7 +389,7 @@ PAGE0 = *
NEXTOPH SEP #$20 ; SET 8 BIT MODE NEXTOPH SEP #$20 ; SET 8 BIT MODE
INC IP16H INC IP16H
REP #$20 ; SET 16 BIT MODE REP #$20 ; SET 16 BIT MODE
BRA FETCHOP BRA FETCHOP16
} }
PAGE3 = * PAGE3 = *
;* ;*
@@ -661,12 +660,12 @@ ZERO LDA #$0000
PHA PHA
JMP NEXTOP16 JMP NEXTOP16
CFFB +INC_IP CFFB +INC_IP
LDA (IP),Y LDA (IP16),Y
ORA #$FF00 ORA #$FF00
PHA PHA
JMP NEXTOP16 JMP NEXTOP16
CB +INC_IP CB +INC_IP
LDA (IP),Y LDA (IP16),Y
AND #$00FF AND #$00FF
PHA PHA
JMP NEXTOP16 JMP NEXTOP16
@@ -676,7 +675,7 @@ CB +INC_IP
LA = * LA = *
CW DEX CW DEX
+INC_IP +INC_IP
LDA (IP),Y LDA (IP16),Y
PHA PHA
+INC_IP +INC_IP
JMP NEXTOP16 JMP NEXTOP16
@@ -689,7 +688,7 @@ CS +INC_IP
ADC IP16 ADC IP16
STA IP16 STA IP16
PHA PHA
LDA (IP),Y LDA (IP16),Y
TAY TAY
JMP NEXTOP16 JMP NEXTOP16
; ;