X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fz80%2Fmain.asm;h=95cf70a9cdcb75d19c47bd3f064d595b49ef9f9d;hb=HEAD;hp=0caba8a16b44e06eedcd1c3491630131ed1c78ec;hpb=9614b850904393cc744c3e020cb86e325e30ae80;p=mdlife

diff --git a/src/z80/main.asm b/src/z80/main.asm
index 0caba8a..95cf70a 100644
--- a/src/z80/main.asm
+++ b/src/z80/main.asm
@@ -1,17 +1,19 @@
 	include "sndregs.inc"
 
 	section .vect
-	jp main
-
-	org 38h
+	jr main		; RST 0
+	dc 6,0
+	dc 6*8, 0	; RST [1, 7]
 	jp vblank_isr
 
 TESTDATA_LEN equ 43
+IPC	equ $1ffc
 
 	section .text
 main:	di
-	ld sp, $2000
+	halt	; XXX
 	im 1
+	ld sp, $1ff0
 	call init
 	; iy is left with YMADDR
 	ld (iy), YM_OPER
@@ -53,19 +55,19 @@ init:
 	ret
 
 ymwait:
-	ld hl, YMADDR
-.wait:	ld a, (hl)
+	ld a, (YMADDR)
 	bit 7, a
-	jr z, .wait
+	jr nz, ymwait
 	ret
 
-
 vblank_isr:
 	ex af, af'
 	exx
 
 	ld hl, frame
 	inc (hl)
+	ld a, (hl)
+	ld (IPC+1), a
 
 	exx
 	ex af, af'