Mercurial > repos > blastem

changeset 2230:3888c7ed4e36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix handling of sprite indices >= 64 in H32 mode
author Michael Pavone <pavone@retrodev.com>
date Wed, 07 Sep 2022 23:19:29 -0700
parents f699f9d500b4
children 8e6fb2c06024
files vdp.c
diffstat 1 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/vdp.c	Mon Sep 05 23:48:17 2022 -0700
+++ b/vdp.c	Wed Sep 07 23:19:29 2022 -0700
@@ -654,7 +654,7 @@
 		}
 		context->sprite_index &= 0x7F;
 		//TODO: Implement squirelly behavior documented by Kabuto
-		if (context->sprite_index >= context->max_sprites_frame) {
+		if (context->sprite_index >= MAX_SPRITES_FRAME) {
 			context->sprite_index = 0;
 			return;
 		}
@@ -673,7 +673,7 @@
 		if (context->sprite_index && ((uint8_t)context->slot_counter) < context->max_sprites_line)
 		{
 			//TODO: Implement squirelly behavior documented by Kabuto
-			if (context->sprite_index >= context->max_sprites_frame) {
+			if (context->sprite_index >= MAX_SPRITES_FRAME) {
 				context->sprite_index = 0;
 				return;
 			}
@@ -774,7 +774,11 @@
 				ymask = 0x1FF;
 				ymin = 128;
 			}
-			uint16_t att_addr = mode5_sat_address(context) + context->sprite_info_list[context->cur_slot].index * 8 + 4;
+			uint8_t index = context->sprite_info_list[context->cur_slot].index;
+			if (!(context->regs[REG_MODE_4] & BIT_H40)) {
+				index &= MAX_SPRITES_FRAME_H32 - 1;
+			}
+			uint16_t att_addr = mode5_sat_address(context) + index * 8 + 4;
 			uint16_t tileinfo = (context->vdpmem[att_addr] << 8) | context->vdpmem[att_addr+1];
 			uint8_t pal_priority = (tileinfo >> 9) & 0x70;
 			uint8_t row;