Browse Source

Working to build

Per Mårtensson 9 months ago
parent
commit
cd0c412c66
1 changed files with 14 additions and 12 deletions
  1. 14 12
      hw/monroe_oc8820_r3.00.asm

+ 14 - 12
hw/monroe_oc8820_r3.00.asm

@@ -186,10 +186,10 @@ memtestwriteloop:
 	ld (hl),c			;00ea
 	rlc c				;00eb
 	inc l				;00ed
-	jr nz,$-memtestwriteloop			;00ee -4
+	jr nz,memtestwriteloop			;00ee -4
 	rlc c				;00f0
 	inc h				;00f2
-	jr nz,$-9memtestwriteloop			;00f3 -9
+	jr nz,memtestwriteloop			;00f3 -9
 	ld h,0c0h			;00f5
 	ld c,b				;00f7
 memtestreadloop:
@@ -199,34 +199,36 @@ memtestreadloop:
 	ld e,a				;00fb
 	rlc c				;00fc
 	inc l				;00fe
-	jr nz,$-memtestreadloop			;00ff -7
+	jr nz,memtestreadloop			;00ff -7
 	rlc c				;0101
 	inc h				;0103
-	jr nz,$-memtestreadloop			;0104 -12
+	jr nz,memtestreadloop			;0104 -12
 	rlc b				;0106
-	jr nc,$-memtestloop				;0108 -34
+	jr nc,memtestloop				;0108 -34
 	ld a,e				;010a
 	exx					;010b
 	and a				;010c
-	jr z,$+memfloppycon			;010d +10
+	jr z,memfloppycon			;010d +10
 	inc a				;010f
-	jr z,$+memfloppycon			;0110 +6
+	jr z,memfloppycon2			;0110 +6	monroe_oc8820_r3.00x.asm
+
 	or d				;0112
 	ld d,a				;0113
-	jr $+memfloppycon					;0114 +3
+	jr memfloppycon		;0114 +3
+memfloppycon2:
 	inc e				;0116
 memfloppycon:
 	ld a,b				;0117
 	cp 004h				;0118
-	jr nz,$-beginmemtest			;011a -61
+	jr nz,beginmemtest			;011a -61
 	ld a,020h			;011c
 	out (0c0h),a		;011e Floppy external control
-	jr $-beginmemtest			;0120 -67
+	jr beginmemtest			;0120 -67
 	and c				;0122
 	pop bc				;0123
 	pop hl				;0124
 	nop					;0125
-	jr nz,$+floppystart2			;0126 +66
+	jr nz,floppystart2			;0126 +66
 	ld h,b				;0128
 	add a,b				;0129
 	and b				;012a
@@ -239,7 +241,7 @@ memfloppycon:
 	xor a				;0133
 	or d				;0134
 	or e				;0135
-	jr z,$+floppystart			;0136; +43
+	jr z,floppystart			;0136; +43
 	ld ix,0013fh		;0138
 	jp 0058ch			;013c
 	ld de,03000h		;013f