Fixed Sys-E BG 2 vertical scroll, added dip-switches for Slap Shooter.

History.txt

@@ -2,13 +2,14 @@ S8DS revision history
 -=-=-=-=-=-=-=-=-=-=-=-
 
 
-V1.1.7 - 2023-10-31 (FluBBa)
+V1.1.7 - 2023-11-07 (FluBBa)
 	Added support for "Megumi Rescue" on System-E.
 	Added support for "Opa Opa unencrypted" on System-E.
 	Added support for "Slap Shooter" on System-E.
 	Added support for "Super Derby (satellite board)" on SG-AC (not working).
 	Added support for "Super Derby II (satellite board)" on SG-AC (not working).
 	Added new debug menu.
+	Fixed vertical scrolling for BG2 on System-E.
 	Fixed envelope handling on the AY38910.
 	Fixed pause on older Sega machines (again).
 	Better menu traversing.

README.md

@@ -42,7 +42,7 @@ Put your games on your flash card, max 768 games per folder (though shouldn't
 be a problem if you separate SMS, GG, SG & Coleco games into different
 folders). Filenames must not be longer than 127 chars. You can use zipped
 files (as long as they use the deflate compression). The emulator should also
-recognise SMS games for SEGAs MegaTech arcade machine, 3 of the SG-1000 arcade
+recognise SMS games for SEGAs MegaTech arcade machine, the SG-1000 arcade
 games and System-E (using MAME zip files).
 
 The GUI is accessed by pressing L+R (shoulder buttons) or by touching the
@@ -128,7 +128,7 @@ Some dumb info...
 
 ## Arcade roms
 
-## MegaTech
+### MegaTech
 
 * After Burner MT - mt_aftrb.zip
 * Alien Syndrom MT - mt_asyn.zip
@@ -141,15 +141,15 @@ Some dumb info...
 * Parlour Games MT - mt_parlg.zip
 * Shinobi MT - mt_shnbi.zip
 
-## SG AC
+### SG AC
 
 * Champion Boxing SG-AC - chboxing.zip
 * Champion Wrestling SG-AC - chwrestl.zip (encrypted)
 * Doki Doki Penguin SG-AC - dokidoki.zip
 * Super Derby (satellite board) SG-AC - sderbys (not working)
 * Super Derby II (satellite board) SG-AC - sderby2s (not working)
 
-## System-E
+### System-E
 
 * Astro Flash System-E - astrofl.zip (encrypted)
 * Fantasy Zone 2 System-E - fantzn2.zip (encrypted)
@@ -177,4 +177,4 @@ Fredrik Ahlström
 
 X/Twitter @TheRealFluBBa
 
-http://www.github.com/FluBBaOfWard
+https://www.github.com/FluBBaOfWard

S8DS_todo.txt

@@ -1,8 +1,6 @@
 S8DS To do
 ------------
 
-	Use new Arcade rom loading instead of RomLoading.c!
-
 	Games that crash the emulator when machine is set to 'auto' :
 	Master of darkness
 	Vampire

source/Equates.h

@@ -74,4 +74,3 @@
 #define AC_MT_KUNG_FU_KID		(0x28)
 #define AC_MT_GREAT_FOOTBALL	(0x29)
 #define AC_MT_PARLOUR_GAMES		(0x2A)
-

source/Gfx.s

@@ -1337,13 +1337,19 @@ SysEVBlHandler:
 
 	ldr vdpptr,=VDP0
 	ldrb r3,[vdpptr,#vdpYScrollBak1]
-	ldr r7,[vdpptr,#vdpScrollMask]
 	add r5,vdpptr,#scrollBuff
-	ldr r4,=yStart
-	ldrsb r4,[r4]
-	add r5,r5,r4
-	adds r3,r3,r4
-	addmi r3,r3,r7
+	ldr r7,=VDP1
+	ldrb lr,[r7,#vdpYScrollBak1]
+	add r7,r7,#scrollBuff
+
+	ldr r0,=yStart
+	ldrsb r0,[r0]
+	add r7,r7,r0
+	adds lr,lr,r0
+	addmi lr,lr,#224
+	add r5,r5,r0
+	adds r3,r3,r0
+	addmi r3,r3,#224
 
 	ldr r6,bgScaleValue
 	mul r1,r6,r3
@@ -1367,32 +1373,34 @@ noEJump:
 	cmp r1,#0
 	subne r6,r6,r6,lsl#16
 
+	mov r2,lr
 	mov r8,r3
-	ldr r2,=VDP1
-	ldrb lr,[r2,#vdpYScrollBak1]
-	add r2,r2,#scrollBuff
 	ldr r4,=DMA0Buff
-	subs r3,r3,r7
-	subpl r3,r3,r7
-	subpl r8,r8,r7
+	subs lr,lr,#224
+	subpl lr,lr,#224
+	subpl r2,r2,#224
+	subs r3,r3,#224
+	subpl r3,r3,#224
+	subpl r8,r8,#224
 	mov r10,#SCREEN_HEIGHT
 scrolELoop2:
 	ldrb r0,[r5],#1
 	add r0,r0,r8,lsl#16
 	mov r1,r0
 	mov r9,r0
-	ldrb r11,[r2],#1
-	add r11,r11,lr,lsl#16
+	ldrb r11,[r7],#1
+	add r11,r11,r2,lsl#16
 	stmia r4!,{r0-r1,r9,r11}
 	subs r6,r6,r6,lsl#16
 	subcs r6,r6,r6,lsl#16
 	adc r8,r8,#0
-	adc lr,lr,#0
 	adc r2,r2,#0
+	adc r7,r7,#0
 	adc r5,r5,#0
 	adcs r3,r3,#1
-	subcs r8,r8,r7
-	subcs lr,lr,r7
+	subcs r8,r8,#224
+	adcs lr,lr,#1
+	subcs r2,r2,#224
 	subs r10,r10,#1
 	bne scrolELoop2