# HG changeset patch
# User Michael Pavone <pavone@retrodev.com>
# Date 1549007709 28800
# Node ID 9a74c2d056726b38cfa2bbfd91e81ba1be43ec3b
# Parent  b757ebc59851ff9c36fea017fe4dfb6bcdde3422
Fixed a few ld instructions in the new Z80 core

diff -r b757ebc59851 -r 9a74c2d05672 z80.cpu
--- a/z80.cpu	Thu Jan 31 23:33:36 2019 -0800
+++ b/z80.cpu	Thu Jan 31 23:55:09 2019 -0800
@@ -227,14 +227,14 @@
 
 00001010 ld_a_from_bc
 	lsl b 8 scratch1
-	or c scratch2 scratch1
+	or c scratch1 scratch1
 	ocall read_8
 	mov scratch1 a
 
 00011010 ld_a_from_de
 	lsl d 8 scratch1
-	or e scratch2 scratch1
-	ocall write_8
+	or e scratch1 scratch1
+	ocall read_8
 	mov scratch1 a
 
 00111010 ld_a_from_immed
@@ -318,7 +318,7 @@
 
 ed 01011011 ld_de_from_immed
 	meta low e
-	meta high c
+	meta high d
 	z80_fetch16_from_immed
 
 ed 01101011 ld_hl_from_immed_slow