The-Homebrew-Cloud/Genesis-Plus-GX
2
0
Fork 0
mirror of https://github.com/ekeeke/Genesis-Plus-GX.git synced 2024-11-04 18:05:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

reset SSG-EG swap flag (YM2612 MAME), Mouse IR support minor fixes

Browse Source
This commit is contained in:
ekeeke31 2008-08-14 11:54:37 +00:00
parent f674126a66
commit 19cede04f6
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/ngc/ogc_input.c
View File

@ -494,7 +494,7 @@ static void wpad_update(s8 num, u8 i, u32 exp)
/* wiimote IR */ /* wiimote IR */
struct ir_t ir; struct ir_t ir;
WPAD_IR(num, &ir); WPAD_IR(num, &ir);
//if (ir.valid) if (ir.valid)
{ {
input.analog[2][0] = ir.x - old_x; input.analog[2][0] = ir.x - old_x;
if (input.analog[2][0] > 256) if (input.analog[2][0] > 256)

20
source/sound/fm.c
View File

@ -925,6 +925,9 @@ INLINE void advance_eg_channel(FM_SLOT *SLOT)
i = 4; /* four operators per channel */ i = 4; /* four operators per channel */
do do
{ {
/* reset swap_flag (EkeEke) */
swap_flag = 0;
switch(SLOT->state) switch(SLOT->state)
{ {
case EG_ATT: /* attack phase */ case EG_ATT: /* attack phase */
@ -950,9 +953,9 @@ INLINE void advance_eg_channel(FM_SLOT *SLOT)
//SLOT->volume += 4 * eg_inc[SLOT->eg_sel_d1r + ((ym2612.OPN.eg_cnt>>SLOT->eg_sh_d1r)&7)]; //SLOT->volume += 4 * eg_inc[SLOT->eg_sel_d1r + ((ym2612.OPN.eg_cnt>>SLOT->eg_sh_d1r)&7)];
SLOT->volume += 6 * eg_inc[SLOT->eg_sel_d1r + ((ym2612.OPN.eg_cnt>>SLOT->eg_sh_d1r)&7)]; /* from Nemesis */ SLOT->volume += 6 * eg_inc[SLOT->eg_sel_d1r + ((ym2612.OPN.eg_cnt>>SLOT->eg_sh_d1r)&7)]; /* from Nemesis */
if ( SLOT->volume >= (INT32)(SLOT->sl) ) if ( SLOT->volume >= (INT32)(SLOT->sl) )
SLOT->state = EG_SUS; SLOT->state = EG_SUS;
} }
} }
else else
{ {
@ -960,9 +963,9 @@ INLINE void advance_eg_channel(FM_SLOT *SLOT)
{ {
SLOT->volume += eg_inc[SLOT->eg_sel_d1r + ((ym2612.OPN.eg_cnt>>SLOT->eg_sh_d1r)&7)]; SLOT->volume += eg_inc[SLOT->eg_sel_d1r + ((ym2612.OPN.eg_cnt>>SLOT->eg_sh_d1r)&7)];
if ( SLOT->volume >= (INT32)(SLOT->sl) ) if ( SLOT->volume >= (INT32)(SLOT->sl) )
SLOT->state = EG_SUS; SLOT->state = EG_SUS;
} }
} }
break; break;
@ -1004,12 +1007,12 @@ INLINE void advance_eg_channel(FM_SLOT *SLOT)
} }
} }
} }
} }
else else
{ {
if ( !(ym2612.OPN.eg_cnt & ((1<<SLOT->eg_sh_d2r)-1) ) ) if ( !(ym2612.OPN.eg_cnt & ((1<<SLOT->eg_sh_d2r)-1) ) )
{ {
SLOT->volume += eg_inc[SLOT->eg_sel_d2r + ((ym2612.OPN.eg_cnt>>SLOT->eg_sh_d2r)&7)]; SLOT->volume += eg_inc[SLOT->eg_sel_d2r + ((ym2612.OPN.eg_cnt>>SLOT->eg_sh_d2r)&7)];
if ( SLOT->volume >= MAX_ATT_INDEX ) if ( SLOT->volume >= MAX_ATT_INDEX )
{ {
@ -1053,7 +1056,8 @@ INLINE void advance_eg_channel(FM_SLOT *SLOT)
in next instruction */ in next instruction */
SLOT->vol_out = out; SLOT->vol_out = out;
SLOT->ssgn ^= swap_flag; /* reverse SLOT inversion flag if required */
SLOT->ssgn ^= swap_flag;
SLOT++; SLOT++;
i--; i--;