X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=Pico%2Fsound%2Fym2612.c;h=4b64fb491b8a966a0df33fb56a88b7dfa9c89166;hb=a6e5aa41816d1d46889012331eeeee6c5ba1dd1e;hp=59bb0cc83ef9349153fdf934e4a5cba1c7fba301;hpb=e4fb433cd685d06ddbf0ec367c19a38b75d6ac68;p=picodrive.git

diff --git a/Pico/sound/ym2612.c b/Pico/sound/ym2612.c
index 59bb0cc..4b64fb4 100644
--- a/Pico/sound/ym2612.c
+++ b/Pico/sound/ym2612.c
@@ -561,6 +561,7 @@ INLINE void FM_KEYON(int c , int s )
 		SLOT->key = 1;
 		SLOT->phase = 0;		/* restart Phase Generator */
 		SLOT->state = EG_ATT;	/* phase -> Attack */
+		SLOT->volume = MAX_ATT_INDEX;    /* fix Ecco 2 splash sound */
 		ym2612.slot_mask |= (1<<s) << (c*4);
 	}
 }
@@ -1668,6 +1669,8 @@ void YM2612Init_(int clock, int rate)
 	ym2612.OPN.ST.clock = clock;
 	ym2612.OPN.ST.rate = rate;
 
+	OPNSetPres( 6*24 );
+
 	/* Extend handler */
 	YM2612ResetChip_();
 }
@@ -1680,7 +1683,6 @@ void YM2612ResetChip_(void)
 
 	memset(ym2612.REGS, 0, sizeof(ym2612.REGS));
 
-	OPNSetPres( 6*24 );
 	set_timers( 0x30 ); /* mode 0 , timer reset */
 	ym2612.REGS[0x27] = 0x30;
 
@@ -1833,12 +1835,7 @@ int YM2612Write_(unsigned int a, unsigned int v)
 		ret = OPNWriteReg(addr, v);
 		break;
 	}
-/*
-	if(ret) {
-		extern int Scanline;
-		dprintf("ymw [%i]", Scanline);
-	}
-*/
+
 	return ret;
 }
 
@@ -2053,10 +2050,8 @@ int YM2612PicoStateLoad2(int *tat, int *tbt)
 	return 0;
 }
 
-#ifndef EXTERNAL_YM2612
 void *YM2612GetRegs(void)
 {
 	return ym2612.REGS;
 }
-#endif