Merge branch 'develop' of https://github.com/pkali/scorch_src into develop

constants.asm

@@ -626,10 +626,13 @@ CreditsStart
 	dta d"Bocianu, Probabilitydragon, EnderDude",d","*
 	dta d"Beeblebrox, KrzysRog, lopezpb, Dracon",d","*
 	dta d"brad-colbert, archon800, nowy80",d","*
-	dta d"Shaggy the Atarian, RetroBorsuk, ZP",d"H"*
+	dta d"Shaggy the Atarian, RetroBorsuk, ZPH"
 	.IF target = 5200
-    dta d"x-usr(1536), Aking, JAC!, phaero",d"n"*
+	dta d","*
+    dta d"x-usr(1536), Aking, JAC!, phaeron",d","*
 	dta d"RB520",d"0"*
+	.ELSE
+	dta d" "*
 	.ENDIF
 	dta d" "*
 	dta d"Additional testin",d"g"*

lib/5200MACRO.ASM

@@ -74,23 +74,18 @@
 
          .ENDM
 ;-------------------------------------
-         .MACRO WAIT
+	.MACRO WAIT
 ;	WAIT
 ;	waits one frame (1/50 s(PAL) or 1/60s(NTSC))
-?zero	 LDA VCOUNT
-		cmp #$05
-		 bcc ?zero
-		 cmp #$70
-		 bcc ?WA
-		 sbc #10	; last lines correction
-?WA		 cmp VCOUNT
-		 beq ?WA
-		 bcc ?WA
-?WFRAME	 cmp VCOUNT
-		 beq ?nowait
-		 bcs ?WFRAME
-?nowait
-         .ENDM
+?ze	LDA VCOUNT
+	cmp #16	; if line<16 then wait for line>15 (long VBI protection)
+	bcc ?ze
+	sbc #10	; last lines correction
+?wa	cmp VCOUNT
+	bcc ?wa
+?wf	cmp VCOUNT
+	bcs ?wf
+	.ENDM
 ;-------------------------------------
 	.macro waitRTC
 	lda RTCLOK+1

lib/MACRO.ASM

@@ -73,23 +73,18 @@
          PLA
          .ENDM
 ;-------------------------------------
-         .MACRO WAIT
+	.MACRO WAIT
 ;	WAIT
 ;	waits one frame (1/50 s(PAL) or 1/60s(NTSC))
-?zero	 LDA VCOUNT
-		cmp #$05	; if line<5 then wait for line>4
-		 bcc ?zero
-		 cmp #$70
-		 bcc ?WA	; if line>=112 then
-		 sbc #10	; last lines correction
-?WA		 cmp VCOUNT
-		 beq ?WA
-		 bcc ?WA
-?WFRAME	 cmp VCOUNT
-		 beq ?nowait
-		 bcs ?WFRAME
-?nowait
-         .ENDM
+?ze	LDA VCOUNT
+	cmp #16	; if line<16 then wait for line>15 (long VBI protection)
+	bcc ?ze
+	sbc #10	; last lines correction
+?wa	cmp VCOUNT
+	bcc ?wa
+?wf	cmp VCOUNT
+	bcs ?wf
+	.ENDM
 ;-------------------------------------
 	.macro waitRTC
 	lda RTCLOK+2