X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=megaed-sv%2Fasmtools.s;h=ff780a9f403181127f9bb2ab34757cee4f7a9cec;hb=47896a18f81802501fa60e98433846b8340f1e51;hp=2ed3df71b017d0105f92d135c694a3eb9251b4da;hpb=eea25dd137e6a818db0a31e35cd57090c47dff08;p=megadrive.git

diff --git a/megaed-sv/asmtools.s b/megaed-sv/asmtools.s
index 2ed3df7..ff780a9 100644
--- a/megaed-sv/asmtools.s
+++ b/megaed-sv/asmtools.s
@@ -243,109 +243,115 @@ run_game:
     movea.l     #0xc00000, a5
     movea.l     #0xc00005, a4
     movea.l     #0xc00004, a3
-    moveq.l     #0x00, d2
+    moveq.l     #0x00, d0
+    move.b      #0x40, d1     /* d2 is tmp */
     move.b      #0xff, d3
-    move.b      #0x40, d4
-    move.b      d4, (0x09,a6) /* CtrlA */
-    move.b      d2, (0x0b,a6) /* CtrlB */
-    move.b      d2, (0x0d,a6) /* CtrlC */
-    move.b      d2, (0x13,a6) /* S-CtrlA */
+    moveq.l     #0x00, d5     /* progress cnt */
+    move.b      d1, (0x09,a6) /* CtrlA */
+    move.b      d0, (0x0b,a6) /* CtrlB */
+    move.b      d0, (0x0d,a6) /* CtrlC */
+    move.b      d0, (0x13,a6) /* S-CtrlA */
     move.b      d3, (0x0f,a6) /* TxDataA */
-    move.b      d2, (0x19,a6) /* S-CtrlB */
+    move.b      d0, (0x19,a6) /* S-CtrlB */
     move.b      d3, (0x15,a6) /* TxDataB */
-    move.b      d2, (0x1f,a6) /* S-CtrlC */
+    move.b      d0, (0x1f,a6) /* S-CtrlC */
     move.b      d3, (0x1b,a6) /* TxDataC */
 
-    /* set up for vram write */
-    move.l      #0x40000000, (a3)
-
     move.l      #0xff0000, a1
-    move.l      #0x10000/4/4-1, d0
+    move.l      #0x10000/4/4-1, d2
 0:
-    move.l      d2, (a1)+
-    move.l      d2, (a1)+
-    move.l      d2, (a1)+
-    move.l      d2, (a1)+
-    dbra        d0, 0b
-
-    move.l      #0xfffe00, a1
-    tst.l       d6
-    bne         use_tas_code
+    move.l      d0, (a1)+
+    move.l      d0, (a1)+
+    move.l      d0, (a1)+
+    move.l      d0, (a1)+
+    dbra        d2, 0b
 
     lea         (run_game_r,pc), a0
-    move.l      #(run_game_r_end - run_game_r)/2-1, d0
-    bra         0f
-use_tas_code:
-    lea         (run_game_r_tas,pc), a0
-    move.l      #(run_game_r_tas_end - run_game_r_tas)/2-1, d0
-
+    move.l      #0xffff80, a1
+    move.l      #(run_game_r_end - run_game_r)/2-1, d2
 0:
     move.w      (a0)+, (a1)+
-    dbra        d0, 0b
-    jmp         0xfffe00
-
-run_game_r:
-    move.w      #0x3210, (0xA13006)
-
-    move.w      d7, (0xA13010)
-    move.w      #0, (0xA13000)
-    
-    move.l      (0x00), a7
-    move.l      (0x04), a0
-    jmp         (a0)
-run_game_r_end:
-
-run_game_r_tas:
-    move.w      #0x3210, (0xA13006)
-    move.w      d7, (0xA13010)
-    move.w      #0, (0xA13000)
-    
-    move.l      (0x00), a7
-    move.l      (0x04), a0
+    dbra        d2, 0b
 
-0:  /* wait for special code */
-    move.b      d4, (0x03,a6)
-    move.b      (0x03,a6), d0
-    move.b      d2, (0x03,a6)
-    move.b      (0x03,a6), d1
-    and.b       #0x3f, d0
-    cmp.b       d0, d1
-    bne         0b
-    cmp.b       #0x25, d0
-    bne         0b
+    tst.l       d6
+    beq.s       sync_hvc
 
-0:  /* wait for special code to end */
-    cmp.b       (0x03,a6), d0
-    beq         0b
+    movea.l     #0xa10003, a0
+    movea.l     d0, a7
+    bsr         sync_with_teensy  /* trashes d3 */
+    move.l      d0, (-4,a7)
+
+sync_hvc:
+    /* set up for progress vram write (x,y - tile #) */
+    /* GFX_WRITE_VRAM_ADDR(0xc000 + (x + 64 * y) * 2) */
+    /* d = d5 + '0' - 32 + 0xB000/32 - 128 = d5 + 0x510 */
+    moveq.l #0, d5
+    move.l      #(0x40000003 | ((36 + 64*1) << 17)), (a3)
+    add.w       #0x510, d5
+    move.w      d5, (a5)
+    move.w      #('/'+0x4e0), (a5)
+    move.w      #('6'+0x4e0), (a5)
 
     /* wait for active display */
-    moveq.l     #3, d0
+    moveq.l     #3, d2
 0:
-    btst        d0, (a4)      /* 8 */
+    btst        d2, (a4)      /* 8 */
     beq.s       0b            /* 10 */
 0:
-    btst        d0, (a4)
+    btst        d2, (a4)
     bne.s       0b
 
     /* flood the VDP FIFO */
 .rept 5
-    move.w      d2, (a5)
+    move.w      d0, (a5)
 .endr
 
-    /* doesn't help.. */
-.if 0
-.rept 94
-    nop
-.endr
-    move.l      #0x93049400, (a3) /* DMALEN LO/HI = 0x0008 */
-    move.l      #0x95009601, (a3) /* DMA SRC LO/MID */
-    move.l      #0x977f8114, (a3) /* DMA SRC HI/MODE, Turn off Display */
-    move.l      #0xc0000080, (a3) /* start DMA */
-.endif
+    movea.l     #0xc00008, a1
+    movea.l     #0xc00008, a1
+    btst.b      #7, (0xa10001)
+    bne         sync_hvc_pal
+
+    move.l      (a1), d3
+    cmp.l       #0xff1fff21, d3
+    bne.s       sync_hvc
+    move.l      (a1), d3
+    cmp.l       #0xff2eff2f, d3
+    bne.s       sync_hvc
+    move.l      (a1), d3
+    cmp.l       #0xff3dff3f, d3
+    bne.s       sync_hvc
+    /* move.l      (a1), d3  -> #0xff4cff4e */
+
+    move.w      d0, (-2,a7)
+
+    move.l      (a1), d3
+    cmp.l       #0xff53ff55, d3
+    bne.s       sync_hvc
+    move.l      (a1), d3
+    cmp.l       #0xff62ff63, d3
+    bne.s       sync_hvc
+
+sync_hvc_pal:
+    /* TODO */
+
+0:
+    movea.l     d0, a0
+    movea.l     #0xA13000, a1
+
+    move.b      d0, (0x09,a6) /* CtrlA */
+    move.b      d1, (0x03,a6)
+
+    jmp         0xffff80
+
+run_game_r:
+    move.w      #0x3210, (0x06,a1) /* 0xA13006 */
+    move.w      d7, (0x10,a1)      /* 0xA13010 */
+    move.w      d0, (a1)           /* 0xA13000 */
+    
+    move.l      (a0)+, a7
+    move.l      (a0),  a0
 
-    move.b      d2, (0x09,a6) /* CtrlA */
-    move.b      d4, (0x03,a6)
     jmp         (a0)
-run_game_r_tas_end:
+run_game_r_end:
 
 # vim:filetype=asmM68k:ts=4:sw=4:expandtab