ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix sprite variant condition

This commit is contained in:
Jeffrey Pfau 2013-05-01 23:56:59 -07:00
parent 3b3f55b14c
commit a80175e689
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gba/renderers/video-software.c
View File

@ -702,7 +702,7 @@ static void _drawSprite(struct GBAVideoSoftwareRenderer* renderer, struct GBAObj
inY = height - inY - 1; inY = height - inY - 1;
} }
unsigned charBase = BASE_TILE + sprite->tile * 0x20; unsigned charBase = BASE_TILE + sprite->tile * 0x20;
int variant = renderer->blendEffect == BLEND_NONE || renderer->blendEffect == BLEND_ALPHA || !renderer->target1Obj; int variant = renderer->target1Obj && (renderer->blendEffect == BLEND_BRIGHTEN || renderer->blendEffect == BLEND_DARKEN);
if (!sprite->multipalette) { if (!sprite->multipalette) {
if (!variant) { if (!variant) {
SPRITE_NORMAL_LOOP(16, NORMAL); SPRITE_NORMAL_LOOP(16, NORMAL);
@ -737,7 +737,7 @@ static void _drawTransformedSprite(struct GBAVideoSoftwareRenderer* renderer, st
int x = sprite->x; int x = sprite->x;
unsigned charBase = BASE_TILE + sprite->tile * 0x20; unsigned charBase = BASE_TILE + sprite->tile * 0x20;
struct GBAOAMMatrix* mat = &renderer->d.oam->mat[sprite->matIndex]; struct GBAOAMMatrix* mat = &renderer->d.oam->mat[sprite->matIndex];
int variant = renderer->blendEffect == BLEND_NONE || renderer->blendEffect == BLEND_ALPHA || !renderer->target1Obj; int variant = renderer->target1Obj && (renderer->blendEffect == BLEND_BRIGHTEN || renderer->blendEffect == BLEND_DARKEN);
if (!sprite->multipalette) { if (!sprite->multipalette) {
if (!variant) { if (!variant) {
SPRITE_TRANSFORMED_LOOP(16, NORMAL); SPRITE_TRANSFORMED_LOOP(16, NORMAL);