--- xmil/pccore.c	2004/08/07 07:19:56	1.12
+++ xmil/pccore.c	2004/08/08 09:12:06	1.15
@@ -4,30 +4,28 @@
 #include	"soundmng.h"
 #include	"sysmng.h"
 #include	"timemng.h"
+#include	"xmilver.h"
 #include	"z80core.h"
 #include	"pccore.h"
 #include	"iocore.h"
+#include	"timing.h"
+#include	"calendar.h"
+#include	"keystat.h"
+#include	"palettes.h"
 #include	"makescrn.h"
 #include	"sound.h"
 #include	"sndctrl.h"
 #include	"font.h"
-#include	"xmilver.h"
 #include	"fddfile.h"
-#include	"calendar.h"
-#include	"timing.h"
 #include	"defrom.res"
-#include	"keystat.h"
 
 
 const OEMCHAR xmilversion[] = OEMTEXT(XMILVER_CORE);
 
-	XMILCFG		xmilcfg = {	0, 0, 1,
-							2, 0, 1,
-							22050, 1000, 0, 80,
-							0, 0,
-							0, 0,
-							0, 0, 0,
-							1, 0};
+	XMILCFG		xmilcfg = { 2, 0, 1,
+							1, 0, 0, 0,
+							22050, 500, 0, 0, 80,
+							0, 0, 0, 0};
 
 	PCCORE		pccore = {250, 0, 1, 0};
 	CORESTAT	corestat;
@@ -47,7 +45,7 @@ const OEMCHAR xmilversion[] = OEMTEXT(XM
 	IPL-ROM LOAD
 ***********************************************************************/
 
-void ipl_load(void) {
+static void ipl_load(void) {
 
 	FILEH	hdl;
 
@@ -73,7 +71,7 @@ void ipl_load(void) {
 	½é´ü²½
 ***********************************************************************/
 
-BYTE reset_x1(BYTE ROM_TYPE, BYTE SOUND_SW, BYTE DIP_SW) {
+static BRESULT reset_x1(BYTE ROM_TYPE, BYTE SOUND_SW, BYTE DIP_SW) {
 
 	pccore.HSYNC_CLK = 250;
 	pccore.ROM_TYPE = ROM_TYPE;
@@ -116,6 +114,8 @@ BYTE reset_x1(BYTE ROM_TYPE, BYTE SOUND_
 	subcpu_reset();
 	vramio_reset();
 
+	pal_reset();
+	makescrn_reset();
 	timing_reset();
 	return(SUCCESS);
 }
@@ -131,18 +131,13 @@ static	BYTE	keyintcnt = 0;
 void pccore_initialize(void) {
 
 	sndctrl_initialize();
+	makescrn_initialize();
 
-	init_draw();
 	font_load(NULL, TRUE);
 
 	crtc_initialize();
 	pcg_initialize();
 	ppi_initialize();
-
-	reset_x1(xmilcfg.ROM_TYPE, xmilcfg.SOUND_SW, xmilcfg.DIP_SW);
-
-//	keystat_initialize();
-//	keystat_reset();
 }
 
 void pccore_reset(void) {
@@ -217,7 +212,7 @@ void pccore_exec(BRESULT draw) {
 
 	while(s_cnt < 266) {
 		while(h_cnt < pccore.HSYNC_CLK) {
-#if IPTRACE
+#if defined(TRACE) && IPTRACE
 			treip[trpos & (IPTRACE - 1)] = Z80_PC;
 			trpos++;
 #endif