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

Merge branch 'master' of https://github.com/project64/project64

This commit is contained in:
zilmar 2016-06-28 21:25:32 +10:00
parent 519ac09711 58821e380c
commit 464023091d
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Glide64/Combine.cpp
View File

@ -15799,6 +15799,8 @@ void CombineBlender()
A_BLEND(GR_BLEND_ONE, GR_BLEND_ONE);
break;
//Pokemon Stadium
case 0xc712:
// LOT in Zelda: MM
case 0xaf50:
case 0x0f5a: //clr_in * 0 + clr_mem * 1
@ -15868,9 +15870,17 @@ void CombineBlender()
A_BLEND(GR_BLEND_ONE_MINUS_SRC_ALPHA, GR_BLEND_SRC_ALPHA);
break;
case 0xFA00: // Bomberman second attack
A_BLEND(GR_BLEND_ONE, GR_BLEND_ZERO);
break;
case 0xFA00: // Bomberman second attack
A_BLEND(GR_BLEND_ONE, GR_BLEND_ZERO);
break;
//Pokemon Stadium
case 0x0F1A:
if (rdp.cycle_mode == 0)
A_BLEND(GR_BLEND_ONE, GR_BLEND_ZERO);
else
A_BLEND(GR_BLEND_ZERO, GR_BLEND_ONE);
break;
default:
A_BLEND(GR_BLEND_SRC_ALPHA, GR_BLEND_ONE_MINUS_SRC_ALPHA);