diff --git a/modules/AliceLogo/AliceLogo.c b/modules/AliceLogo/AliceLogo.c
index a6e9e9e..ed89d09 100644
--- a/modules/AliceLogo/AliceLogo.c
+++ b/modules/AliceLogo/AliceLogo.c
@@ -16,21 +16,21 @@ static void Init() {
 	
 	*var = 1;
 	
-	DEBUG_COMMAND_YET("AliceLogo.Init %d,%d,%d,%p:", p1, p2, p3, var);
+	TRACE_UNIMPLEMENTED("AliceLogo.Init %d,%d,%d,%p:", p1, p2, p3, var);
 }
 
 static void SetWaveNum() {
 	int p1 = getCaliValue();
 	int p2 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("AliceLogo.SetWaveNum %d,%d:", p1, p2);
+	TRACE_UNIMPLEMENTED("AliceLogo.SetWaveNum %d,%d:", p1, p2);
 }
 
 static void Run() {
 	int p1 = getCaliValue();
 	int p2 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("AliceLogo.Run %d,%d:", p1, p2);
+	TRACE_UNIMPLEMENTED("AliceLogo.Run %d,%d:", p1, p2);
 }
 
 static const ModuleFunc functions[] = {
diff --git a/modules/Confirm/Confirm.c b/modules/Confirm/Confirm.c
index f1aea47..ad02ca6 100644
--- a/modules/Confirm/Confirm.c
+++ b/modules/Confirm/Confirm.c
@@ -10,7 +10,7 @@
 static void Init() {
 	int p1 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Confirm.Init %d:", p1);
+	TRACE_UNIMPLEMENTED("Confirm.Init %d:", p1);
 }
 
 static void ExistKeyFile() {
@@ -20,7 +20,7 @@ static void ExistKeyFile() {
 	
 	*var = 1;
 	
-	DEBUG_COMMAND_YET("Confirm.ExistKeyFile %s,%p,%p:",p1, p2, var);
+	TRACE_UNIMPLEMENTED("Confirm.ExistKeyFile %s,%p,%p:",p1, p2, var);
 }
 
 static void CheckProtectFile() {
@@ -30,7 +30,7 @@ static void CheckProtectFile() {
 	
 	*var = 1;
 
-	DEBUG_COMMAND_YET("Confirm.CheckProtectFile %s,%p,%p:", p1,p2,var);
+	TRACE_UNIMPLEMENTED("Confirm.CheckProtectFile %s,%p,%p:", p1,p2,var);
 }
 
 static void CreateKeyFile() {
@@ -40,7 +40,7 @@ static void CreateKeyFile() {
 	
 	*var = 1;
 
-	DEBUG_COMMAND_YET("Confirm.CreateKeyFile %s,%p,%p:", p1,p2,var);
+	TRACE_UNIMPLEMENTED("Confirm.CreateKeyFile %s,%p,%p:", p1,p2,var);
 }
 
 static const ModuleFunc functions[] = {
diff --git a/modules/Gpx/Gpx.c b/modules/Gpx/Gpx.c
index 3f72c39..2a038e9 100644
--- a/modules/Gpx/Gpx.c
+++ b/modules/Gpx/Gpx.c
@@ -136,7 +136,7 @@ static void Init() {
 	// surface0 を pre_freesurfno として返さないように。
 	pre_freesurfno = 1;
 	
-	DEBUG_COMMAND("Gpx.Init %d:", p1);
+	TRACE("Gpx.Init %d:", p1);
 }
 
 static void Gpx_reset(void) {
@@ -171,7 +171,7 @@ static void Create() {
 		suf[no] = s;
 	}
 	
-	DEBUG_COMMAND("Gpx.Create %p,%d,%d,%d:", var, width, height, bpp);
+	TRACE("Gpx.Create %p,%d,%d,%d:", var, width, height, bpp);
 }
 
 static void CreatePixelOnly() {
@@ -199,7 +199,7 @@ static void CreatePixelOnly() {
 		suf[no] = s;
 	}
 	
-	DEBUG_COMMAND("Gpx.CreatePixelOnly %d,%d,%d,%d:", *var, width, height, bpp);
+	TRACE("Gpx.CreatePixelOnly %d,%d,%d,%d:", *var, width, height, bpp);
 }
 
 static void CreateAMapOnly() {
@@ -225,7 +225,7 @@ static void CreateAMapOnly() {
 		suf[no] = s;
 	}
 	
-	DEBUG_COMMAND("Gpx.CreateAMapOnly %p,%d,%d:", var, width, height);
+	TRACE("Gpx.CreateAMapOnly %p,%d,%d:", var, width, height);
 }
 
 static void IsSurface() {
@@ -240,7 +240,7 @@ static void IsSurface() {
 
 	*var = sf_get(p1) ? 1 : 0;
 
-	DEBUG_COMMAND("Gpx.IsSurface %d,%p:", p1, var);
+	TRACE("Gpx.IsSurface %d,%p:", p1, var);
 }
 
 static void IsPixel() {
@@ -262,7 +262,7 @@ static void IsPixel() {
 		*var = s->pixel ? 1 : 0;
 	}
 	
-	DEBUG_COMMAND("Gpx.IsPixel %d,%p:", p1, var);
+	TRACE("Gpx.IsPixel %d,%p:", p1, var);
 }
 
 static void IsAlpha() {
@@ -284,7 +284,7 @@ static void IsAlpha() {
 		*var = s->alpha ? 1 : 0;
 	}
 	
-	DEBUG_COMMAND("Gpx.IsAlpha %d,%p:", p1, var);
+	TRACE("Gpx.IsAlpha %d,%p:", p1, var);
 }
 
 static void GetWidth() {
@@ -306,7 +306,7 @@ static void GetWidth() {
 		*var = s->width;
 	}
 	
-	DEBUG_COMMAND("Gpx.GetWidth %d,%d:", p1, *var);
+	TRACE("Gpx.GetWidth %d,%d:", p1, *var);
 }
 
 static void GetHeight() {
@@ -328,13 +328,13 @@ static void GetHeight() {
 		*var = s->height;
 	}
 	
-	DEBUG_COMMAND("Gpx.GetHeight %d,%d:", p1, *var);
+	TRACE("Gpx.GetHeight %d,%d:", p1, *var);
 }
 
 static void GetCreatedSurface() { /* not used ? */
 	int *var = getCaliVariable();
 	
-	DEBUG_COMMAND_YET("Gpx.GetCreatedSurface %p:", var);
+	TRACE_UNIMPLEMENTED("Gpx.GetCreatedSurface %p:", var);
 }
 
 static void LoadCG() {
@@ -349,21 +349,21 @@ static void LoadCG() {
 	
 	*var = load_cg_main(p1 -1);
 	
-	DEBUG_COMMAND("Gpx.LoadCG %p,%d (%d):", var, p1, *var);
+	TRACE("Gpx.LoadCG %p,%d (%d):", var, p1, *var);
 }
 
 static void GetCGPosX() { /* not useed ? */
 	int *var = getCaliVariable();
 	int p1 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.GetCgPosX %p,%d:", var, p1);
+	TRACE_UNIMPLEMENTED("Gpx.GetCgPosX %p,%d:", var, p1);
 }
 
 static void GetCGPosY() { /* not useed ? */
 	int *var = getCaliVariable();
 	int p1 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.GetCgPosY %p,%d:", var, p1);
+	TRACE_UNIMPLEMENTED("Gpx.GetCgPosY %p,%d:", var, p1);
 }
 
 static void Free() {
@@ -374,7 +374,7 @@ static void Free() {
 	*/
 	int p1 = getCaliValue();
 	
-	DEBUG_COMMAND("Gpx.Free %d:", p1);
+	TRACE("Gpx.Free %d:", p1);
 	
 	if (p1 != 0) {
 		sf_free_one(p1);
@@ -387,7 +387,7 @@ static void FreeAll() {
 	*/
 	sf_free_all();
 	
-	DEBUG_COMMAND("Gpx.FreeAll:");
+	TRACE("Gpx.FreeAll:");
 }
 
 static void Copy() {
@@ -413,7 +413,7 @@ static void Copy() {
 	int sh = getCaliValue();
 	surface_t *src, *dst;
 	
-	DEBUG_COMMAND("Gpx.Copy %d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, ss, sx, sy, sw, sh);
+	TRACE("Gpx.Copy %d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, ss, sx, sy, sw, sh);
 	
 	src = sf_get(ss);
 	dst = sf_get(ds);
@@ -431,7 +431,7 @@ static void CopyBright() { /* not used ? */
 	int p8 = getCaliValue();
 	int p9 = getCaliValue();
 
-	DEBUG_COMMAND_YET("Gpx.CopyBright %d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9);
+	TRACE_UNIMPLEMENTED("Gpx.CopyBright %d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9);
 }
 
 static void CopyAMap() {
@@ -457,7 +457,7 @@ static void CopyAMap() {
 	int sh = getCaliValue();
 	surface_t *src, *dst;
 	
-	DEBUG_COMMAND("Gpx.CopyAMap %d,%d,%d,%d,%d,%d,%d,%d:", da, dx, dy, sa, sx, sy, sw, sh);
+	TRACE("Gpx.CopyAMap %d,%d,%d,%d,%d,%d,%d,%d:", da, dx, dy, sa, sx, sy, sw, sh);
 	
 	src = sf_get(sa);
 	dst = sf_get(da);
@@ -475,7 +475,7 @@ static void Blend() { /* not used ? */
 	int p8 = getCaliValue();
 	int p9 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.Blend %d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9);
+	TRACE_UNIMPLEMENTED("Gpx.Blend %d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9);
 }
 
 static void BlendSrcBright() { /* not used ? */
@@ -490,7 +490,7 @@ static void BlendSrcBright() { /* not used ? */
 	int p9 = getCaliValue();
 	int p10 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.BlendSrcBright %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10);
+	TRACE_UNIMPLEMENTED("Gpx.BlendSrcBright %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10);
 }
 
 static void BlendAddSatur() { /* not used ? */
@@ -503,7 +503,7 @@ static void BlendAddSatur() { /* not used ? */
 	int p7 = getCaliValue();
 	int p8 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.BlendAddStatur %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8);
+	TRACE_UNIMPLEMENTED("Gpx.BlendAddStatur %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8);
 }
 
 static void BlendAMap() {
@@ -529,7 +529,7 @@ static void BlendAMap() {
 	int sh = getCaliValue();
 	surface_t *src, *dst;
 	
-	DEBUG_COMMAND("Gpx.BlendAMap %d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, ss, sx, sy, sw, sh);
+	TRACE("Gpx.BlendAMap %d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, ss, sx, sy, sw, sh);
 	
 	src = sf_get(ss);
 	dst = sf_get(ds);
@@ -546,7 +546,7 @@ static void BlendAMapSrcOnly() { /* not used ? */
 	int p7 = getCaliValue();
 	int p8 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.BlendAMapSrcOnly %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8);
+	TRACE_UNIMPLEMENTED("Gpx.BlendAMapSrcOnly %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8);
 }
 
 static void BlendAMapColor() { /* not used ? */
@@ -562,7 +562,7 @@ static void BlendAMapColor() { /* not used ? */
 	int p10 = getCaliValue();
 	int p11 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.BlendAMapColor %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11);
+	TRACE_UNIMPLEMENTED("Gpx.BlendAMapColor %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11);
 }
 
 static void BlendAMapColorAlpha() { /* not used ? */
@@ -579,7 +579,7 @@ static void BlendAMapColorAlpha() { /* not used ? */
 	int p11 = getCaliValue();
 	int p12 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.BlendAMapColorAlpha %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12);
+	TRACE_UNIMPLEMENTED("Gpx.BlendAMapColorAlpha %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12);
 }
 
 static void BlendAMapAlpha() { /* not used ? */
@@ -593,7 +593,7 @@ static void BlendAMapAlpha() { /* not used ? */
 	int p8 = getCaliValue();
 	int p9 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.BlendAMapAlpha %d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9);
+	TRACE_UNIMPLEMENTED("Gpx.BlendAMapAlpha %d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9);
 }
 
 static void BlendAMapBright() { /* not used ? */
@@ -607,7 +607,7 @@ static void BlendAMapBright() { /* not used ? */
 	int p8 = getCaliValue();
 	int p9 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.BlendAMapBright %d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9);
+	TRACE_UNIMPLEMENTED("Gpx.BlendAMapBright %d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9);
 }
 
 static void BlendAMapAlphaSrcBright() { /* not used ? */
@@ -622,7 +622,7 @@ static void BlendAMapAlphaSrcBright() { /* not used ? */
 	int p9 = getCaliValue();
 	int p10 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.BlendAMapBright %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10);
+	TRACE_UNIMPLEMENTED("Gpx.BlendAMapBright %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10);
 }
 
 static void BlendUseAMapColor() { /* not used ? */
@@ -639,7 +639,7 @@ static void BlendUseAMapColor() { /* not used ? */
 	int p11 = getCaliValue();
 	int p12 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.BlendUseAMapColor %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12);
+	TRACE_UNIMPLEMENTED("Gpx.BlendUseAMapColor %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12);
 }
 
 static void BlendScreen() { /* not used ? */
@@ -652,7 +652,7 @@ static void BlendScreen() { /* not used ? */
 	int p7 = getCaliValue();
 	int p8 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.BlendScreen %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8);
+	TRACE_UNIMPLEMENTED("Gpx.BlendScreen %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8);
 }
 
 static void BlendMultiply() { /* not used ? */
@@ -665,7 +665,7 @@ static void BlendMultiply() { /* not used ? */
 	int p7 = getCaliValue();
 	int p8 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.BlendMultiply %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8);
+	TRACE_UNIMPLEMENTED("Gpx.BlendMultiply %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8);
 }
 
 static void BlendScreenAlpha() { /* not used ? */
@@ -679,7 +679,7 @@ static void BlendScreenAlpha() { /* not used ? */
 	int p8 = getCaliValue();
 	int p9 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.BlendScreenAlpha %d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9);
+	TRACE_UNIMPLEMENTED("Gpx.BlendScreenAlpha %d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9);
 }
 
 static void Fill() {
@@ -705,7 +705,7 @@ static void Fill() {
 	int b  = getCaliValue();
 	surface_t *dst;
 	
-	DEBUG_COMMAND("Gpx.Fill %d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, dw, dh, r, g, b);
+	TRACE("Gpx.Fill %d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, dw, dh, r, g, b);
 	
 	dst = sf_get(ds);
 	gr_fill(dst, dx, dy, dw, dh, r, g, b);
@@ -723,7 +723,7 @@ static void FillAlphaColor() { /* not used ? */
 	int lv = getCaliValue();
 	surface_t *dst;
 	
-	DEBUG_COMMAND_YET("Gpx.FillAlphaColor %d,%d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, dw, dh, r, g, b, lv);
+	TRACE("Gpx.FillAlphaColor %d,%d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, dw, dh, r, g, b, lv);
 
 	dst = sf_get(ds);
 	gr_fill_alpha_color(dst, dx, dy, dw, dh, r, g, b, lv);
@@ -737,7 +737,7 @@ static void FillAMap() { /* not used ? */
 	int p5 = getCaliValue();
 	int p6 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.FillAMap %d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6);
+	TRACE_UNIMPLEMENTED("Gpx.FillAMap %d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6);
 }
 
 static void FillAMapOverBorder() {
@@ -762,7 +762,7 @@ static void FillAMapOverBorder() {
 	int d = getCaliValue();
 	surface_t *dst;
 	
-	DEBUG_COMMAND("Gpx.FillAMapOverBorder %d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, dw, dh, s, d);
+	TRACE("Gpx.FillAMapOverBorder %d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, dw, dh, s, d);
 
 	dst = sf_get(ds);
 	gr_fill_alpha_overborder(dst, dx, dy, dw, dh, s, d);
@@ -777,7 +777,7 @@ static void FillAMapUnderBorder() { /* not used ? */
 	int p6 = getCaliValue();
 	int p7 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.FillAMapUnderBorder %d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7);
+	TRACE_UNIMPLEMENTED("Gpx.FillAMapUnderBorder %d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7);
 }
 
 static void SaturDP_DPxSA() { /* not used ? */
@@ -790,7 +790,7 @@ static void SaturDP_DPxSA() { /* not used ? */
 	int p7 = getCaliValue();
 	int p8 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.SaturDP_DPxSA %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8);
+	TRACE_UNIMPLEMENTED("Gpx.SaturDP_DPxSA %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8);
 }
 
 static void ScreenDA_DAxSA() { /* not used ? */
@@ -803,7 +803,7 @@ static void ScreenDA_DAxSA() { /* not used ? */
 	int p7 = getCaliValue();
 	int p8 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.ScreenDA_DAxSA %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8);
+	TRACE_UNIMPLEMENTED("Gpx.ScreenDA_DAxSA %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8);
 }
 
 static void AddDA_DAxSA() { /* not used ? */
@@ -816,7 +816,7 @@ static void AddDA_DAxSA() { /* not used ? */
 	int p7 = getCaliValue();
 	int p8 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.AddDA_DAxSA %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8);
+	TRACE_UNIMPLEMENTED("Gpx.AddDA_DAxSA %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8);
 }
 
 static void SpriteCopyAMap() {
@@ -844,7 +844,7 @@ static void SpriteCopyAMap() {
 	int cl = getCaliValue();
 	surface_t *src, *dst;
 	
-	DEBUG_COMMAND("Gpx.SpriteCopyAMap %d,%d,%d,%d,%d,%d,%d,%d,%d:", da, dx, dy, sa, sx, sy, sw, sh, cl);
+	TRACE("Gpx.SpriteCopyAMap %d,%d,%d,%d,%d,%d,%d,%d,%d:", da, dx, dy, sa, sx, sy, sw, sh, cl);
 	
 	src = sf_get(sa);
 	dst = sf_get(da);
@@ -871,7 +871,7 @@ static void BrightDestOnly() {
 	int r  = getCaliValue();
 	surface_t *dst;
 	
-	DEBUG_COMMAND("Gpx.BrightDestOnly %d,%d,%d,%d,%d,%d:", ds, dx, dy, dw, dh, r);
+	TRACE("Gpx.BrightDestOnly %d,%d,%d,%d,%d,%d:", ds, dx, dy, dw, dh, r);
 	
 	dst = sf_get(ds);
 	
@@ -892,7 +892,7 @@ static void CopyTextureWrap() { /* not used ? */
 	int p11 = getCaliValue();
 	int p12 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.CopyTextureWrap %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12);
+	TRACE_UNIMPLEMENTED("Gpx.CopyTextureWrap %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12);
 }
 
 static void CopyTextureWrapAlpha() { /* not used ? */
@@ -910,7 +910,7 @@ static void CopyTextureWrapAlpha() { /* not used ? */
 	int p12 = getCaliValue();
 	int p13 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.CopyTextureWrapAlpha %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13);
+	TRACE_UNIMPLEMENTED("Gpx.CopyTextureWrapAlpha %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13);
 }
 
 static void CopyStretch() {
@@ -940,7 +940,7 @@ static void CopyStretch() {
 	int sh = getCaliValue();
 	surface_t *src, *dst;
 
-	DEBUG_COMMAND_YET("Gpx.CopyStretch %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, dw, dh, ss, sx, sy, sw, sh);
+	TRACE("Gpx.CopyStretch %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, dw, dh, ss, sx, sy, sw, sh);
 	
 	src = sf_get(ss);
 	dst = sf_get(ds);
@@ -960,7 +960,7 @@ static void CopyStretchBlend() { /* not used ? */
 	int p10 = getCaliValue();
 	int p11 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.CopyStretchBlend %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11);
+	TRACE_UNIMPLEMENTED("Gpx.CopyStretchBlend %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11);
 }
 
 static void CopyStretchBlendAMap() {
@@ -990,7 +990,7 @@ static void CopyStretchBlendAMap() {
 	int sh = getCaliValue();
 	surface_t *src, *dst;
 	
-	DEBUG_COMMAND("Gpx.CopyStretchBlendAMap %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, dw, dh, ss, sx, sy, sw, sh);
+	TRACE("Gpx.CopyStretchBlendAMap %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, dw, dh, ss, sx, sy, sw, sh);
 
 	src = sf_get(ss);
 	dst = sf_get(ds);
@@ -1007,7 +1007,7 @@ static void StretchBlendScreen2x2() { /* not used ? */
 	int p7 = getCaliValue();
 	int p8 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.StretchBlendScreen2x2 %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8);
+	TRACE_UNIMPLEMENTED("Gpx.StretchBlendScreen2x2 %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8);
 }
 
 
@@ -1041,7 +1041,7 @@ static void StretchBlendScreen2x2WDS() {
 	int sh  = getCaliValue();
 	surface_t *src1, *src2, *dst;
 	
-	DEBUG_COMMAND("Gpx.StretchBlendScreen2x2WDS %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, ss1, sx1, sy1, ss2, sx2, sy2, sw, sh);
+	TRACE("Gpx.StretchBlendScreen2x2WDS %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, ss1, sx1, sy1, ss2, sx2, sy2, sw, sh);
 	
 	src1 = sf_get(ss1);
 	src2 = sf_get(ss2);
@@ -1078,7 +1078,7 @@ static void BlendScreenWDS() {
 	int sh  = getCaliValue();
 	surface_t *src1, *src2, *dst;
 	
-	DEBUG_COMMAND("Gpx.BlendScreenWDS %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, ss1, sx1, sy1, ss2, sx2, sy2, sw, sh);
+	TRACE("Gpx.BlendScreenWDS %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", ds, dx, dy, ss1, sx1, sy1, ss2, sx2, sy2, sw, sh);
 	
 	src1 = sf_get(ss1);
 	src2 = sf_get(ss2);
@@ -1141,10 +1141,10 @@ static void EffectCopy() {
 	case 11:
 	case 12:
 	case 13:
-		DEBUG_COMMAND("Gpx.EffectCopy %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%p:", no, dx, dy, ss1, sx1, sy1, ss2, sx2, sy2, sw, sh, time, var);
+		TRACE("Gpx.EffectCopy %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%p:", no, dx, dy, ss1, sx1, sy1, ss2, sx2, sy2, sw, sh, time, var);
 		break;
 	default:
-		DEBUG_COMMAND_YET("Gpx.EffectCopy %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%p:", no, dx, dy, ss1, sx1, sy1, ss2, sx2, sy2, sw, sh, time, var);
+		TRACE_UNIMPLEMENTED("Gpx.EffectCopy %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%p:", no, dx, dy, ss1, sx1, sy1, ss2, sx2, sy2, sw, sh, time, var);
 	}
 	dst = sf_get(ss1);
 	src = sf_get(ss2);
@@ -1155,7 +1155,7 @@ static void EffectCopy() {
 static void SetClickCancelFlag() { /* not used ? */
 	int p1 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("Gpx.SetClikCancelFlag %d:", p1);
+	TRACE_UNIMPLEMENTED("Gpx.SetClikCancelFlag %d:", p1);
 }
 
 static const ModuleFunc functions[] = {
diff --git a/modules/Math/Math.c b/modules/Math/Math.c
index 8c1cb88..129624b 100644
--- a/modules/Math/Math.c
+++ b/modules/Math/Math.c
@@ -42,7 +42,7 @@ static void RandMTInit() {
 	*/
 	int p1 = getCaliValue(); /* ITimer */
 	
-	DEBUG_COMMAND("Math.RandMTInit %d:", p1);
+	TRACE("Math.RandMTInit %d:", p1);
 }
 
 static void RandMTGet() {
@@ -61,7 +61,7 @@ static void RandMTGet() {
 		*var = (int)(genrand() * num) + 1;
 	}
 	
-	DEBUG_COMMAND("Math.RandMTGet %d,%p:", num, var);
+	TRACE("Math.RandMTGet %d,%p:", num, var);
 }
 
 static void RandMTMakeNumTable() {
@@ -74,7 +74,7 @@ static void RandMTMakeNumTable() {
 	
 	numtblmax = p1;
 	
-	DEBUG_COMMAND("Math.RandMTMakeNumTable %d:", p1);
+	TRACE("Math.RandMTMakeNumTable %d:", p1);
 }
 
 static void RandMTGetNumTable() {
@@ -87,7 +87,7 @@ static void RandMTGetNumTable() {
 	
 	*var = (int)(genrand() * numtblmax) + 1;
 	
-	DEBUG_COMMAND("Math.RandMTGetNumTable %d:", *var);
+	TRACE("Math.RandMTGetNumTable %d:", *var);
 }
 
 static const ModuleFunc functions[] = {
diff --git a/modules/MsgSkip/MsgSkip.c b/modules/MsgSkip/MsgSkip.c
index 4da2a0d..8aaec9d 100644
--- a/modules/MsgSkip/MsgSkip.c
+++ b/modules/MsgSkip/MsgSkip.c
@@ -26,7 +26,7 @@ static void Init() {
 	valid = true;
 	*p1 = 0;
 
-	DEBUG_COMMAND("MsgSkip.Init %p,%d,%d,%d:", p1, p2, p3, p4);
+	TRACE("MsgSkip.Init %p,%d,%d,%d:", p1, p2, p3, p4);
 }
 
 static void Start() {
@@ -39,7 +39,7 @@ static void Start() {
 	free(path);
 	free(fname_utf8);
 
-	DEBUG_COMMAND("MsgSkip.Start %p,%d:", p1, p2);
+	TRACE("MsgSkip.Start %p,%d:", p1, p2);
 }
 
 static void SetValid() {
@@ -48,7 +48,7 @@ static void SetValid() {
 	valid = p1;
 	msgskip_pause(!valid);
 
-	DEBUG_COMMAND("MsgSkip.SetValid %d:", p1);
+	TRACE("MsgSkip.SetValid %d:", p1);
 }
 
 static void GetValid() {
@@ -56,7 +56,7 @@ static void GetValid() {
 
 	*p1 = valid;
 
-	DEBUG_COMMAND("MsgSkip.GetValid %p:", p1);
+	TRACE("MsgSkip.GetValid %p:", p1);
 }
 
 static void SetAction() {
@@ -64,7 +64,7 @@ static void SetAction() {
 
 	action = p1;
 
-	DEBUG_COMMAND("MsgSkip.SetAcion %d:", p1);
+	TRACE("MsgSkip.SetAcion %d:", p1);
 }
 
 static void GetAction() {
@@ -72,19 +72,19 @@ static void GetAction() {
 
 	*p1 = action;
 
-	DEBUG_COMMAND("MsgSkip.GetAcion %p:", p1);
+	TRACE("MsgSkip.GetAcion %p:", p1);
 }
 
 static void PushStr() {
 	int p1 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("MsgSkip.PushStr %d:", p1);
+	TRACE_UNIMPLEMENTED("MsgSkip.PushStr %d:", p1);
 }
 
 static void PopStr() {
 	int p1 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("MsgSkip.PopStr %d:", p1);
+	TRACE_UNIMPLEMENTED("MsgSkip.PopStr %d:", p1);
 }
 
 static const ModuleFunc functions[] = {
diff --git a/modules/NIGHTDLL/NIGHTDLL.c b/modules/NIGHTDLL/NIGHTDLL.c
index 5c7269e..00830a1 100644
--- a/modules/NIGHTDLL/NIGHTDLL.c
+++ b/modules/NIGHTDLL/NIGHTDLL.c
@@ -36,7 +36,7 @@ static void Init(void) { /* 0 */
 	
 	*var = 1;
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.Init %p:", var);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.Init %p:", var);
 }
 
 static void NIGHTDLL_reset(void) {
@@ -62,7 +62,7 @@ static void InitGame() { /* 1 */
 	ntmsg_init();
 	nt_sstr_init();
 
-	DEBUG_COMMAND_YET("NIGHTDLL.InitGame:");
+	TRACE_UNIMPLEMENTED("NIGHTDLL.InitGame:");
 }	
 
 // メッセージの枠の表示
@@ -71,7 +71,7 @@ static void SetMsgFrame() { /* 2 */
 	
 	ntmsg_set_frame(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetMsgFram %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetMsgFram %d:", p1);
 }
 
 // メッセージの表示位置の設定
@@ -80,21 +80,21 @@ static void SetMsgPlaceMethod(void) { /* 3 */
 	                         // 2=メッセージ枠+顔つき 
 	ntmsg_set_place(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetMsgPlaceMethod %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetMsgPlaceMethod %d:", p1);
 }
 
 // 未実装?
 static void SetMsgDrawEffect(void) { /* 4 */
 	int p1 = getCaliValue(); // 0, 1, 2, 3 (実際にはどれも機能しない?)
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetMsgDrawEffect %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetMsgDrawEffect %d:", p1);
 }
 
 // 未実装?
 static void SetMsgClearEffect(void) { /* 5 */
 	int p1 = getCaliValue(); // 0, 1, 2, 4 (実際にはどれも機能しない?)
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetMsgClearEffect %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetMsgClearEffect %d:", p1);
 }
 
 // 壁紙CGの設定
@@ -103,7 +103,7 @@ static void SetWallPaper(void) { /* 6 */
 	
 	nt_gr_set_wallpaper(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetWallPaper %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetWallPaper %d:", p1);
 }
 
 // 背景CGの設定
@@ -112,7 +112,7 @@ static void SetScenery(void) { /* 7 */
 	
 	nt_gr_set_scenery(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetScenery %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetScenery %d:", p1);
 }
 
 // 顔CGの設定
@@ -121,7 +121,7 @@ static void SetFace(void) { /* 8 */
 	
 	nt_gr_set_face(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetFace %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetFace %d:", p1);
 }
 
 // 立ち絵左の設定
@@ -130,7 +130,7 @@ static void SetSpriteL(void) { /* 9 */
 	
 	nt_gr_set_spL(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetSpriteL %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetSpriteL %d:", p1);
 }
 
 // 立ち絵中央の設定
@@ -139,7 +139,7 @@ static void SetSpriteM(void) { /* 10 */
 	
 	nt_gr_set_spM(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetSpriteM %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetSpriteM %d:", p1);
 }
 
 // 立ち絵右の設定
@@ -148,7 +148,7 @@ static void SetSpriteR(void) { /* 11 */
 	
 	nt_gr_set_spR(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetSpriteR %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetSpriteR %d:", p1);
 }
 
 // 立ち絵左の設定（季節違い?)
@@ -157,7 +157,7 @@ static void SetSpriteSeasonL(void) { /* 12 */
 	
 	nt_gr_set_spsL(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetSpriteSeasonL %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetSpriteSeasonL %d:", p1);
 }
 
 // 立ち絵中央の設定（季節違い?)
@@ -166,7 +166,7 @@ static void SetSpriteSeasonM(void) { /* 13 */
 	
 	nt_gr_set_spM(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetSpriteSeasonM %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetSpriteSeasonM %d:", p1);
 }
 
 // 立ち絵右の設定（季節違い?)
@@ -175,14 +175,14 @@ static void SetSpriteSeasonR(void) { /* 14 */
 	
 	nt_gr_set_spsR(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetSpriteSeasonR %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetSpriteSeasonR %d:", p1);
 }
 
 // 改行
 static void StartNewLine(void) { /* 15 */
 	ntmsg_newline();
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.StartNewLine:");
+	TRACE_UNIMPLEMENTED("NIGHTDLL.StartNewLine:");
 }
 
 // メッセージフォントサイズの設定
@@ -191,7 +191,7 @@ static void SetFontSize(void) { /* 16 */
 	
 	night.fontsize = p1;
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetFontSize %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetFontSize %d:", p1);
 }
 
 // フォントの種類の設定
@@ -200,7 +200,7 @@ static void SetFont(void) { /* 17 */
 	
 	night.fonttype = p1;
 
-	DEBUG_COMMAND_YET("NIGHTDLL.SetFont %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetFont %d:", p1);
 }
 
 // 選択肢モード ON
@@ -209,7 +209,7 @@ static void SetSelMode(void) { /* 18 */
 	
 	night.selmode = p1;
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetSelMode %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetSelMode %d:", p1);
 }
 
 // キー入力待ち後、改ページ
@@ -218,7 +218,7 @@ static void AnalyzeMessage(void) { /* 19 */
 
 	*var = ntmsg_ana();
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.AnalyzeMessage %p:", var);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.AnalyzeMessage %p:", var);
 }
 
 // ~DRAWの効果時間
@@ -227,7 +227,7 @@ static void SetDrawTime(void) { /* 20 */
 	
 	nt_gr_set_drawtime(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetDrawTime %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetDrawTime %d:", p1);
 }
 
 // 効果つき画面更新
@@ -236,7 +236,7 @@ static void Draw(void) { /* 21 */
 	
 	nt_gr_draw(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.Draw %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.Draw %d:", p1);
 }
 
 // 音声データを再生
@@ -245,21 +245,21 @@ static void SetVoice(void) { /* 22 */
 	
 	nt_voice_set(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetVoice %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetVoice %d:", p1);
 }
 
 // 未使用
 static void WaitKey(void) { /* 23 */
 	int p1 = getCaliValue(); // 
 
-	DEBUG_COMMAND_YET("NIGHTDLL.WaitKey %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.WaitKey %d:", p1);
 }
 
 static void AddFeeling(void) { /* 24 */
 	int p1 = getCaliValue(); // person(1:新開,2:星川,3:百瀬,4:いずみ,5:鏡花,6:真言美,7:マコト	 
 	int p2 = getCaliValue(); // val
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.AddFeeling %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.AddFeeling %d:", p1);
 
 }
 
@@ -267,7 +267,7 @@ static void SubFeeling(void) { /* 25 */
 	int p1 = getCaliValue(); // person
 	int p2 = getCaliValue(); // val
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SubFeeling %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SubFeeling %d:", p1);
 }
 
 static void CallEvent(void) { /* 26 */
@@ -275,7 +275,7 @@ static void CallEvent(void) { /* 26 */
 	
 	nt_sco_callevent(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.CallEvent %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.CallEvent %d:", p1);
 }
 
 static void ScreenCG(void) { /* 27 */
@@ -294,7 +294,7 @@ static void ScreenCG(void) { /* 27 */
 	
 	nt_gr_screencg(no, x, y);
 
-	DEBUG_COMMAND_YET("NIGHTDLL.ScreenCG %d,%d,%d:", x, y, no);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.ScreenCG %d,%d,%d:", x, y, no);
 }
 
 static void RunGameMain(void) { /* 28 */
@@ -310,7 +310,7 @@ static void RunGameMain(void) { /* 28 */
 	
 	*p1 = nt_sco_main(p5);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.RunGameMain %p,%d,%d,%d,%d:", p1, p2, p3, p4, p5);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.RunGameMain %p,%d,%d,%d,%d:", p1, p2, p3, p4, p5);
 }
 
 static void CheckNewGame(void) { /* 29 */
@@ -318,21 +318,21 @@ static void CheckNewGame(void) { /* 29 */
 	
 	*p1 = 0;
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.CheckNewGame %p:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.CheckNewGame %p:", p1);
 }
 
 static void SaveStartData(void) { /* 30 */
-	DEBUG_COMMAND_YET("NIGHTDLL.SaveStartData:");
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SaveStartData:");
 }
 
 static void PrintExitSystem(void) { /* 31 */
-	DEBUG_COMMAND_YET("NIGHTDLL.PrintExitSystem:");
+	TRACE_UNIMPLEMENTED("NIGHTDLL.PrintExitSystem:");
 }
 
 static void SetCalendar(void) { /* 32 */
 	int p1 = getCaliValue(); // 0, 1, 2
 
-	DEBUG_COMMAND_YET("NIGHTDLL.SetCalendar %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetCalendar %d:", p1);
 }
 
 static void SetDate(void) { /* 33 */
@@ -344,7 +344,7 @@ static void SetDate(void) { /* 33 */
 	night.Day   = p2;
 	night.DayOfWeek = p3;
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetDate %d,%d,%d:", p1, p2, p3);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetDate %d,%d,%d:", p1, p2, p3);
 }
 
 static void GetDate(void) { /* 34 */
@@ -356,11 +356,11 @@ static void GetDate(void) { /* 34 */
 	*p2 = night.Day;
 	*p3 = night.DayOfWeek;
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.GetDate %p,%p,%p:", p1, p2, p3);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.GetDate %p,%p,%p:", p1, p2, p3);
 }
 
 static void SelectGameLevel(void) { /* 35 */
-	DEBUG_COMMAND_YET("NIGHTDLL.SelectGameLevel:");
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SelectGameLevel:");
 }
 
 static void RunEventDungeon(void) { /* 36 */
@@ -369,13 +369,13 @@ static void RunEventDungeon(void) { /* 36 */
 
 	*p1 = 1;
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.RunEventDungeon %p,%d:", p1, p2);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.RunEventDungeon %p,%d:", p1, p2);
 }
 
 static void RunEventBattle(void) { /* 37 */
 	int p1 = getCaliValue(); // 実際には機能しない？
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.RunEventBattle %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.RunEventBattle %d:", p1);
 }
 
 // CD再生開始
@@ -384,7 +384,7 @@ static void CDPlay(void) { /* 38 */
 	
 	nt_cd_play(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.CDPlay %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.CDPlay %d:", p1);
 }
 
 // CD再生停止
@@ -393,7 +393,7 @@ static void CDStop(void) { /* 39 */
 	
 	nt_cd_stop(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.CDStop %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.CDStop %d:", p1);
 }
 
 // CDのmute
@@ -402,7 +402,7 @@ static void CDMute(void) { /* 40 */
 	
 	nt_cd_mute(p1 == 0 ? FALSE : TRUE);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.CDMute %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.CDMute %d:", p1);
 }
 
 // ch に効果音番号をセット
@@ -412,7 +412,7 @@ static void SoundEffectSetWave(void) { /* 41 */
 	
 	nt_snd_setwave(p1, p2);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SoundEffectSetWave %d,%d:", p1, p2);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SoundEffectSetWave %d,%d:", p1, p2);
 }
 
 // ch にくり返し数をセット
@@ -422,7 +422,7 @@ static void SoundEffectSetLoop(void) { /* 42 */
 	
 	nt_snd_setloop(p1, p2);
        
-	DEBUG_COMMAND_YET("NIGHTDLL.SoundEffectSetLoop %d,%d:", p1, p2);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SoundEffectSetLoop %d,%d:", p1, p2);
 }
 
 // ch に音量をセット
@@ -432,7 +432,7 @@ static void SoundEffectSetVolume(void) { /* 43 */
 	
 	nt_snd_setvol(p1, p2);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SoundEffectSetVolue %d,%d:", p1, p2);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SoundEffectSetVolue %d,%d:", p1, p2);
 }
 
 // 効果音の再生を終るまで待つか待たないか？
@@ -442,7 +442,7 @@ static void SoundEffectSetSyncFlag(void) { /* 44 */
 	
 	nt_snd_waitend(p1, p2 == 0 ? FALSE : TRUE);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SoundEffectSetSyncFlag %d,%d:", p1, p2);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SoundEffectSetSyncFlag %d,%d:", p1, p2);
 }
 
 // ch の効果音を再生
@@ -451,7 +451,7 @@ static void SoundEffectPlay(void) { /* 45 */
 	
 	nt_snd_play(p1);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SoundEffectPlay %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SoundEffectPlay %d:", p1);
 }
 
 // ch の効果音を停止
@@ -461,7 +461,7 @@ static void SoundEffectStop(void) { /* 46 */
 	
 	nt_snd_stop(p1, p2);
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SoundEffectStop %d,%d:", p1,p2);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SoundEffectStop %d,%d:", p1,p2);
 }
 
 // 全てのチャンネルの再生を停止
@@ -470,86 +470,86 @@ static void SoundEffectStopAll(void) { /* 47 */
 	
 	nt_snd_stopall(p1);
 
-	DEBUG_COMMAND_YET("NIGHTDLL.SoundEffectStopAll %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SoundEffectStopAll %d:", p1);
 }
 
 static void RunSoundMode(void) { /* 48 */
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.RunSoundMode:");
+	TRACE_UNIMPLEMENTED("NIGHTDLL.RunSoundMode:");
 }
 
 static void RunMapEditor(void) { /* 49 */
 	int *p1 = getCaliVariable();
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.RunMapEditor %p:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.RunMapEditor %p:", p1);
 }
 
 static void VisualListClear(void) { /* 50 */
 
-	DEBUG_COMMAND_YET("NIGHTDLL.VisualListClear:");
+	TRACE_UNIMPLEMENTED("NIGHTDLL.VisualListClear:");
 }
 
 static void VisualListAdd(void) { /* 51 */
 	int p1 = getCaliValue();
 
-	DEBUG_COMMAND_YET("NIGHTDLL.VisualListAdd %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.VisualListAdd %d:", p1);
 }
 
 static void GetLocalCountCG(void) { /* 52 */
 	int *p1 = getCaliVariable();
 	int p2 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.GetLocalCountCG %p,%d:", p1, p2);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.GetLocalCountCG %p,%d:", p1, p2);
 }
 
 static void PlayMemory(void) { /* 53 */
 	int *p1 = getCaliVariable(); // 回想ページ
 	int *p2 = getCaliVariable(); // 回想RESULT
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.PlayMemory %p,%p:", p1, p2);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.PlayMemory %p,%p:", p1, p2);
 }
 
 static void GetEventFlagTotal(void) { /* 54 */
 	int *p1 = getCaliVariable();
 	int p2 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.GetEventFlagTotal %p,%d:", p1, p2);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.GetEventFlagTotal %p,%d:", p1, p2);
 }
 
 static void SetPlayerName(void) { /* 55 */
 	int p1 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SetPlayerName %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetPlayerName %d:", p1);
 }
 
 static void GetPlayerName(void) { /* 56 */
 	int p1 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.GetPlayerName %d:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.GetPlayerName %d:", p1);
 }
 
 static void SaveGame(void) { /* 57 */
 	int *p1 = getCaliVariable();
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.SaveGame %p:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SaveGame %p:", p1);
 }
 
 static void LoadGame(void) { /* 58 */
 	int *p1 = getCaliVariable();
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.LoadGame %p:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.LoadGame %p:", p1);
 }
 
 static void ExistSaveData(void) { /* 59 */
 	int *p1 = getCaliVariable();
 	
-	DEBUG_COMMAND_YET("NIGHTDLL.ExistSaveData %p:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.ExistSaveData %p:", p1);
 }
 
 static void ExistStartData(void) { /* 60 */
 	int *p1 = getCaliVariable();
 
-	DEBUG_COMMAND_YET("NIGHTDLL.ExistStartData %p:", p1);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.ExistStartData %p:", p1);
 }
 
 static void SetAreaData(void) { /* 61 */
@@ -557,27 +557,27 @@ static void SetAreaData(void) { /* 61 */
 	int p2 = getCaliValue();
 	int p3 = getCaliValue();
 
-	DEBUG_COMMAND_YET("NIGHTDLL.SetAreaData %d,%d,%d:", p1, p2, p3);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.SetAreaData %d,%d,%d:", p1, p2, p3);
 }
 
 static void RunBattleTest(void) { /* 62 */
-	DEBUG_COMMAND_YET("NIGHTDLL.RunBattleTest:");
+	TRACE_UNIMPLEMENTED("NIGHTDLL.RunBattleTest:");
 }
 
 static void RunTrainingTest(void) { /* 63 */
-	DEBUG_COMMAND_YET("NIGHTDLL.RunTrainingTest:");
+	TRACE_UNIMPLEMENTED("NIGHTDLL.RunTrainingTest:");
 }
 
 static void TestEventCall(void) { /* 64 */
-	DEBUG_COMMAND_YET("NIGHTDLL.TestEventCall:");
+	TRACE_UNIMPLEMENTED("NIGHTDLL.TestEventCall:");
 }
 
 static void Test(void) { /* 65 */
-	DEBUG_COMMAND_YET("NIGHTDLL.Test:");
+	TRACE_UNIMPLEMENTED("NIGHTDLL.Test:");
 }
 
 static void DebugScenario(void) { /* 66 */
-	DEBUG_COMMAND_YET("NIGHTDLL.DebugScenario:");
+	TRACE_UNIMPLEMENTED("NIGHTDLL.DebugScenario:");
 }
 
 static void GetDLLTime(void) { /* 67 */
@@ -589,7 +589,7 @@ static void GetDLLTime(void) { /* 67 */
 	int *p6 = getCaliVariable();
 	int *p7 = getCaliVariable();
 
-	DEBUG_COMMAND_YET("NIGHTDLL.GetDLLTime %p,%p,%p,%p,%p,%p,%p:", p1, p2, p3, p4, p5, p6, p7);
+	TRACE_UNIMPLEMENTED("NIGHTDLL.GetDLLTime %p,%p,%p,%p,%p,%p,%p:", p1, p2, p3, p4, p5, p6, p7);
 }
 
 static const ModuleFunc functions[] = {
diff --git a/modules/NightDemonDemo/NightDemonDemo.c b/modules/NightDemonDemo/NightDemonDemo.c
index 8c43f96..b330483 100644
--- a/modules/NightDemonDemo/NightDemonDemo.c
+++ b/modules/NightDemonDemo/NightDemonDemo.c
@@ -93,7 +93,7 @@ static void Init() {
 	
 	*var = 1;
 	
-	DEBUG_COMMAND("NightDemonDemo.Init %d,%d,%d,%p:", p1, p2, p3, var);
+	TRACE("NightDemonDemo.Init %d,%d,%d,%p:", p1, p2, p3, var);
 }
 
 static void Run() {
@@ -102,7 +102,7 @@ static void Run() {
 	
 	ndd_run(p1);
 	
-	DEBUG_COMMAND("NightDemonDemo.Run %d,%d:", p1, p2);
+	TRACE("NightDemonDemo.Run %d,%d:", p1, p2);
 }
 
 static const ModuleFunc functions[] = {
diff --git a/modules/RandMT/RandMT.c b/modules/RandMT/RandMT.c
index b15069d..4222710 100644
--- a/modules/RandMT/RandMT.c
+++ b/modules/RandMT/RandMT.c
@@ -40,7 +40,7 @@ static void Init() {
 	*/
 	int p1 = getCaliValue(); /* ITimer */
 	
-	DEBUG_COMMAND_YET("RandMT.Init %p:", p1);
+	TRACE_UNIMPLEMENTED("RandMT.Init %p:", p1);
 }
 
 static void Get() {
@@ -59,7 +59,7 @@ static void Get() {
 		*var = (int)(genrand() * num) + 1;
 	}
 	
-	DEBUG_COMMAND("RandMT.Get %d,%p:", num, var);
+	TRACE("RandMT.Get %d,%p:", num, var);
 }
 
 static void GetNoOverlap() {
@@ -69,7 +69,7 @@ static void GetNoOverlap() {
 
 	*var = (int)(genrand() * n) + min;
 
-	DEBUG_COMMAND("RandMT.GetNoOverlap %d,%d,%p:", min, n, var);
+	TRACE("RandMT.GetNoOverlap %d,%d,%p:", min, n, var);
 }
 
 static const ModuleFunc functions[] = {
diff --git a/modules/SACT/SACT.c b/modules/SACT/SACT.c
index 79f61ec..9229fe0 100644
--- a/modules/SACT/SACT.c
+++ b/modules/SACT/SACT.c
@@ -163,7 +163,7 @@ static void Init() {
 		sact.logging = FALSE;
 	}
 	
-	DEBUG_COMMAND("SACT.Init %d:", p1);
+	TRACE("SACT.Init %d:", p1);
 }
 
 /**
@@ -184,7 +184,7 @@ static void CreateSprite() {
 	
 	sp_new(wNum, wNumCG1, wNumCG2, wNumCG3, wType);
 	
-	DEBUG_COMMAND_YET("SACT.CreateSprite %d,%d,%d,%d,%d:", wNum, wNumCG1, wNumCG2, wNumCG3, wType);
+	TRACE("SACT.CreateSprite %d,%d,%d,%d,%d:", wNum, wNumCG1, wNumCG2, wNumCG3, wType);
 }
 
 /**
@@ -205,7 +205,7 @@ static void CreateTextSprite() {
 	
 	sp_new_msg(wNum, wX, wY, wWidth, wHeight);
 	
-	DEBUG_COMMAND_YET("SACT.CreateTextSprite %d,%d,%d,%d,%d:", wNum, wX, wY, wWidth, wHeight);
+	TRACE("SACT.CreateTextSprite %d,%d,%d,%d,%d:", wNum, wX, wY, wWidth, wHeight);
 }
 
 /**
@@ -218,7 +218,7 @@ static void SetWallPaper() {
 	
 	sp_set_wall_paper(wNum);
 	
-	DEBUG_COMMAND_YET("SACT.SetWallPaper %d:", wNum);
+	TRACE("SACT.SetWallPaper %d:", wNum);
 }
 
 /**
@@ -228,7 +228,7 @@ static void SetWallPaper() {
 static void Clear() {
 	sp_free_all();
 	
-	DEBUG_COMMAND_YET("SACT.Clear:");
+	TRACE("SACT.Clear:");
 }
 
 /**
@@ -241,7 +241,7 @@ static void Delete() {
 	
 	sp_free(wNum);
 	
-	DEBUG_COMMAND_YET("SACT.Delete %d:", wNum);
+	TRACE("SACT.Delete %d:", wNum);
 }
 
 /**
@@ -259,7 +259,7 @@ static void SpriteDeleteCount() {
 		sp_free(i);
 	}
 	
-	DEBUG_COMMAND_YET("SACT.SpriteDeleteCount %d,%d:", wNum, wCount);
+	TRACE("SACT.SpriteDeleteCount %d,%d:", wNum, wCount);
 }
 
 /**
@@ -269,7 +269,7 @@ static void SpriteDeleteCount() {
 static void Draw() {
 	sp_update_all(TRUE);
 
-	DEBUG_COMMAND_YET("SACT.Draw:");
+	TRACE("SACT.Draw:");
 }
 
 /**
@@ -290,7 +290,7 @@ static void DrawEffect() {
 	
 	sp_eupdate(wType, wEffectTime, wEffectkey);
 	
-	DEBUG_COMMAND_YET("SACT.DrawEffect %d,%d,%d:", wType, wEffectTime, wEffectkey);
+	TRACE("SACT.DrawEffect %d,%d,%d:", wType, wEffectTime, wEffectkey);
 }
 
 /**
@@ -307,7 +307,7 @@ static void DrawEffectAlphaMap() {
 	
 	sp_eupdate_amap(nIndexAlphaMap, wEffectTime, wEffectKey);
 	
-	DEBUG_COMMAND_YET("SACT.DrawEffectAlphaMap %d,%d,%d:", nIndexAlphaMap, wEffectTime, wEffectKey);
+	TRACE("SACT.DrawEffectAlphaMap %d,%d,%d:", nIndexAlphaMap, wEffectTime, wEffectKey);
 }
 
 /**
@@ -334,7 +334,7 @@ static void QuakeScreen() {
 	
 	sp_quake_screen(wType, wParam1, wParam2, wCount, nfKeyEnable);
 	
-	DEBUG_COMMAND_YET("SACT.QuakeScreen %d,%d,%d,%d,%d:", wType, wParam1, wParam2, wCount, nfKeyEnable);
+	TRACE("SACT.QuakeScreen %d,%d,%d,%d,%d:", wType, wParam1, wParam2, wCount, nfKeyEnable);
 }
 
 /**
@@ -350,7 +350,7 @@ static void SetOrigin() {
 	sact.origin.x = wX;
 	sact.origin.y = wY;
 	
-	DEBUG_COMMAND_YET("SACT.SetOrigin %d,%d:", wX, wY);
+	TRACE("SACT.SetOrigin %d,%d:", wX, wY);
 }
 
 /**
@@ -367,7 +367,7 @@ static void SetShow() {
 	
 	sp_set_show(wNum, wCount, wShow);
 
-	DEBUG_COMMAND_YET("SACT.SetShow %d,%d,%d:", wNum, wCount, wShow);
+	TRACE("SACT.SetShow %d,%d,%d:", wNum, wCount, wShow);
 }
 
 /**
@@ -384,7 +384,7 @@ static void SetBlendRate() {
 	
 	sp_set_blendrate(wNum, wCount, nBlendRate);
 	
-	DEBUG_COMMAND_YET("SACT.SetBlendRate %d,%d,%d:", wNum, wCount, nBlendRate);
+	TRACE("SACT.SetBlendRate %d,%d,%d:", wNum, wCount, nBlendRate);
 }
 
 /**
@@ -401,7 +401,7 @@ static void SetPos() {
 	
 	sp_set_pos(wNum, wX, wY);
 	
-	DEBUG_COMMAND_YET("SACT.SetPos %d,%d,%d:", wNum, wX, wY);
+	TRACE("SACT.SetPos %d,%d,%d:", wNum, wX, wY);
 }
 
 /**
@@ -418,7 +418,7 @@ static void SetMove() {
 	
 	sp_set_move(wNum, wX, wY);
 	
-	DEBUG_COMMAND_YET("SACT.SetMove %d,%d,%d:", wNum, wX, wY);
+	TRACE("SACT.SetMove %d,%d,%d:", wNum, wX, wY);
 }
 
 /**
@@ -433,7 +433,7 @@ static void SetMoveTime() {
 	
 	sp_set_movetime(wNum, wTime);
 	
-	DEBUG_COMMAND_YET("SACT.SetMoveTime %d,%d:", wNum, wTime);
+	TRACE("SACT.SetMoveTime %d,%d:", wNum, wTime);
 }
 
 /**
@@ -448,7 +448,7 @@ static void SetMoveSpeed() {
 	
 	sp_set_movespeed(wNum, wSpeed);
 	
-	DEBUG_COMMAND_YET("SACT.SetMoveSpeed %d,%d:", wNum, wSpeed);
+	TRACE("SACT.SetMoveSpeed %d,%d:", wNum, wSpeed);
 }
 
 /**
@@ -468,7 +468,7 @@ static void SetMoveSpeedCount() {
 		sp_set_movespeed(i, wSpeed);
 	}
 	
-	DEBUG_COMMAND_YET("SACT.SetMoveSpeedCount %d,%d,%d:", wNum, wCount, wSpeed);
+	TRACE("SACT.SetMoveSpeedCount %d,%d,%d:", wNum, wCount, wSpeed);
 }
 
 /**
@@ -488,7 +488,7 @@ static void SetSpriteAnimeTimeInterval() {
 		sp_set_animeinterval(i, nTime);
 	}
 	
-	DEBUG_COMMAND_YET("SACT.SetSpriteAnimeTimeInterval %d,%d,%d:", wNum, wCount, nTime);
+	TRACE("SACT.SetSpriteAnimeTimeInterval %d,%d,%d:", wNum, wCount, nTime);
 }
 
 /**
@@ -501,7 +501,7 @@ static void AddZKeyHideSprite() {
 	
 	sp_add_zkey_hidesprite(wNum);
 	
-	DEBUG_COMMAND_YET("SACT.AddZKeyHideSprite %d:", wNum);
+	TRACE("SACT.AddZKeyHideSprite %d:", wNum);
 }
 
 /**
@@ -511,7 +511,7 @@ static void AddZKeyHideSprite() {
 static void ClearZKeyHideSprite() {
 	sp_clear_zkey_hidesprite_all();
 	
-	DEBUG_COMMAND_YET("SACT.ClearZKeyHideSprite:");
+	TRACE("SACT.ClearZKeyHideSprite:");
 }
 
 /**
@@ -527,7 +527,7 @@ static void SpriteFreeze() {
 	
 	sp_freeze_sprite(wNum, wIndex);
 	
-	DEBUG_COMMAND_YET("SACT.SpriteFreeze %d,%d:", wNum, wIndex);
+	TRACE("SACT.SpriteFreeze %d,%d:", wNum, wIndex);
 }
 
 /**
@@ -540,7 +540,7 @@ static void SpriteThaw() {
 	
 	sp_thaw_sprite(wNum);
 
-	DEBUG_COMMAND_YET("SACT.SpriteThaw %d:", wNum);
+	TRACE("SACT.SpriteThaw %d:", wNum);
 }
 
 /**
@@ -560,7 +560,7 @@ static void SpriteFreezeCount() {
 		sp_freeze_sprite(i, wIndex);
 	}
 	
-	DEBUG_COMMAND_YET("SACT.SpriteFreezeCount %d,%d,%d:", wNum, wCount, wIndex);
+	TRACE("SACT.SpriteFreezeCount %d,%d,%d:", wNum, wCount, wIndex);
 }
 
 /**
@@ -578,7 +578,7 @@ static void SpriteThawCount() {
 		sp_thaw_sprite(i);
 	}
 	
-	DEBUG_COMMAND_YET("SACT.SpriteThawCount %d,%d:", wNum, wCount);
+	TRACE("SACT.SpriteThawCount %d,%d:", wNum, wCount);
 }
 
 /**
@@ -591,7 +591,7 @@ static void QuakeSpriteAdd() {
 	
 	sp_add_quakesprite(wNum);
 	
-	DEBUG_COMMAND_YET("SACT.QuakeSpriteAdd %d:", wNum);
+	TRACE("SACT.QuakeSpriteAdd %d:", wNum);
 }
 
 /**
@@ -600,7 +600,7 @@ static void QuakeSpriteAdd() {
  */
 static void QuakeSpriteReset() {
 	sp_clear_quakesprite_all();
-	DEBUG_COMMAND_YET("SACT.QuakeSpriteReset:");
+	TRACE("SACT.QuakeSpriteReset:");
 }
 
 /**
@@ -626,7 +626,7 @@ static void QuakeSprite() {
 	
 	sp_quake_sprite(wType, wAmplitudeX, wAmplitudeY, wCount, nfKeyEnable);
 	
-	DEBUG_COMMAND_YET("SACT.QuakeSprite %d,%d,%d,%d:", wType, wAmplitudeX, wAmplitudeY, wCount);
+	TRACE("SACT.QuakeSprite %d,%d,%d,%d:", wType, wAmplitudeX, wAmplitudeY, wCount);
 }
 
 /**
@@ -641,7 +641,7 @@ static void QuerySpriteIsExist() {
 
 	sp_query_isexist(wNum, var);
 	
-	DEBUG_COMMAND_YET("SACT.QuerySpriteIsExist %d,%p:", wNum, var);
+	TRACE("SACT.QuerySpriteIsExist %d,%p:", wNum, var);
 }
 
 /**
@@ -662,7 +662,7 @@ static void QuerySpriteInfo() {
 	
 	sp_query_info(wNum, vType, vCG1, vCG2, vCG3);
 	
-	DEBUG_COMMAND_YET("SACT.QuerySpriteInfo %d,%p,%p,%p,%p:", wNum, vType, vCG1, vCG2, vCG3);
+	TRACE("SACT.QuerySpriteInfo %d,%p,%p,%p,%p:", wNum, vType, vCG1, vCG2, vCG3);
 }
 
 /**
@@ -677,7 +677,7 @@ static void QuerySpriteShow() {
 
 	sp_query_show(wNum, vShow);
 	
-	DEBUG_COMMAND_YET("SACT.QuerySpriteShow %d,%p:", wNum, vShow);
+	TRACE("SACT.QuerySpriteShow %d,%p:", wNum, vShow);
 }
 
 /**
@@ -694,7 +694,7 @@ static void QuerySpritePos() {
 	
 	sp_query_pos(wNum, vX, vY);
 	
-	DEBUG_COMMAND_YET("SACT.QuerySpritePos %d,%p,%p:", wNum, vX, vY);
+	TRACE("SACT.QuerySpritePos %d,%p,%p:", wNum, vX, vY);
 }
 
 /**
@@ -711,7 +711,7 @@ static void QuerySpriteSize() {
 	
 	sp_query_size(wNum, vWidth, vHeight);
 	
-	DEBUG_COMMAND_YET("SACT.QuerySpriteSize %d,%p,%p:", wNum, vWidth, vHeight);
+	TRACE("SACT.QuerySpriteSize %d,%p,%p:", wNum, vWidth, vHeight);
 }
 
 /**
@@ -728,7 +728,7 @@ static void QueryTextPos() {
 	
 	sp_query_textpos(wNum, vX, vY);
 	
-	DEBUG_COMMAND_YET("SACT.QueryTextPos %d,%p,%p:", wNum, vX, vY);
+	TRACE("SACT.QueryTextPos %d,%p,%p:", wNum, vX, vY);
 }
 
 /**
@@ -738,7 +738,7 @@ static void QueryTextPos() {
 static void CG_Clear() {
 	scg_freeall();
 	
-	DEBUG_COMMAND_YET("SACT.CG_Clear:");
+	TRACE("SACT.CG_Clear:");
 }
 
 /**
@@ -751,7 +751,7 @@ static void CG_Reset() {
 	
 	scg_free(wNumCG);
 	
-	DEBUG_COMMAND_YET("SACT.CG_Reset %d:", wNumCG);
+	TRACE("SACT.CG_Reset %d:", wNumCG);
 }
 
 /**
@@ -767,7 +767,7 @@ static void CG_QueryType() {
 	
 	scg_querytype(wNumCG, vType);
 	
-	DEBUG_COMMAND_YET("SACT.CG_QueryType %d,%p:", wNumCG, vType);
+	TRACE("SACT.CG_QueryType %d,%p:", wNumCG, vType);
 }
 
 /**
@@ -784,7 +784,7 @@ static void CG_QuerySize() {
 	
 	scg_querysize(wNumCG, vWidth, vHeight);
 	
-	DEBUG_COMMAND_YET("SACT.CG_QuerySize %d,%p,%p:", wNumCG, vWidth, vHeight);
+	TRACE("SACT.CG_QuerySize %d,%p,%p:", wNumCG, vWidth, vHeight);
 }
 
 /**
@@ -799,7 +799,7 @@ static void CG_QueryBpp() {
 	
 	scg_querybpp(wNumCG, vBpp);
 	
-	DEBUG_COMMAND_YET("SACT.CG_QueryBpp %d,%p:", wNumCG, vBpp);
+	TRACE("SACT.CG_QueryBpp %d,%p:", wNumCG, vBpp);
 }
 
 /**
@@ -814,7 +814,7 @@ static void CG_ExistAlphaMap() {
 	
 	scg_existalphamap(wNumCG, vMask);
 	
-	DEBUG_COMMAND_YET("SACT.CG_ExistAlphaMap %d,%p:", wNumCG, vMask);
+	TRACE("SACT.CG_ExistAlphaMap %d,%p:", wNumCG, vMask);
 }
 
 /**
@@ -839,7 +839,7 @@ static void CG_Create() {
 	
 	scg_create(wNumCG, wWidth, wHeight, wR, wG, wB, wBlendRate);
 	
-	DEBUG_COMMAND_YET("SACT.CG_Create %d,%d,%d,%d,%d,%d,%d:", wNumCG, wWidth, wHeight, wR, wG, wB, wBlendRate);
+	TRACE("SACT.CG_Create %d,%d,%d,%d,%d,%d,%d:", wNumCG, wWidth, wHeight, wR, wG, wB, wBlendRate);
 }
 
 /**
@@ -858,7 +858,7 @@ static void CG_CreateReverse() {
 
 	scg_create_reverse(wNumCG, wNumSrcCG, wReverseX, wReverseY);
 	
-	DEBUG_COMMAND_YET("SACT.CG_CreateReverse %d,%d,%d,%d:", wNumCG, wNumSrcCG, wReverseX, wReverseY);
+	TRACE("SACT.CG_CreateReverse %d,%d,%d,%d:", wNumCG, wNumSrcCG, wReverseX, wReverseY);
 }
 
 /**
@@ -877,7 +877,7 @@ static void CG_CreateStretch() {
 
 	scg_create_stretch(wNumCG, wWidth, wHeight, wNumSrcCG);
 	
-	DEBUG_COMMAND_YET("SACT.CG_CreateStretch %d,%d,%d,%d:", wNumCG, wWidth, wHeight, wNumSrcCG);
+	TRACE("SACT.CG_CreateStretch %d,%d,%d,%d:", wNumCG, wWidth, wHeight, wNumSrcCG);
 }
 
 /**
@@ -898,7 +898,7 @@ static void CG_CreateBlend() {
 	int wNumBlendCG   = getCaliValue();
 	int wAlphaMapMode = getCaliValue();
 	
-	DEBUG_COMMAND_YET("SACT.CG_CreateBlend %d,%d,%d,%d,%d,%d:", wNumDstCG, wNumBaseCG, wX, wY, wNumBlendCG, wAlphaMapMode);
+	TRACE("SACT.CG_CreateBlend %d,%d,%d,%d,%d,%d:", wNumDstCG, wNumBaseCG, wX, wY, wNumBlendCG, wAlphaMapMode);
 	scg_create_blend(wNumDstCG, wNumBaseCG, wX, wY, wNumBlendCG, wAlphaMapMode);
 	
 }
@@ -923,7 +923,7 @@ static void CG_CreateText() {
 	
 	scg_create_text(wNumCG, wSize, wR, wG, wB, wText);
 	
-	DEBUG_COMMAND_YET("SACT.CG_CreateText %d,%d,%d,%d,%d,%d:", wNumCG, wSize, wR, wG, wB, wText);
+	TRACE("SACT.CG_CreateText %d,%d,%d,%d,%d,%d:", wNumCG, wSize, wR, wG, wB, wText);
 }
 
 /**
@@ -951,7 +951,7 @@ static void CG_CreateTextNum() {
 	
 	scg_create_textnum(wNumCG, wSize, wR, wG, wB, wFigs, wZeroPadding, wValue);
 	
-	DEBUG_COMMAND_YET("SACT.CG_CreateTextNum %d,%d,%d,%d,%d,%d,%d,%d:", wNumCG, wSize, wR, wG, wB, wFigs, wZeroPadding, wValue);
+	TRACE("SACT.CG_CreateTextNum %d,%d,%d,%d,%d,%d,%d,%d:", wNumCG, wSize, wR, wG, wB, wFigs, wZeroPadding, wValue);
 }
 
 /**
@@ -966,7 +966,7 @@ static void CG_Copy() {
 	
 	scg_copy(wNumDst, wNumSrc);
 
-	DEBUG_COMMAND_YET("SACT.CG_Copy %d,%d:", wNumDst, wNumSrc);
+	TRACE("SACT.CG_Copy %d,%d:", wNumDst, wNumSrc);
 }
 
 /**
@@ -989,7 +989,7 @@ static void CG_Cut() {
 	
 	scg_cut(wNumDstCG, wNumSrcCG, wX, wY, wWidth, wHeight);
 	
-	DEBUG_COMMAND_YET("SACT.CG_Cut %d,%d,%d,%d,%d,%d:", wNumDstCG, wNumSrcCG, wX, wY, wWidth, wHeight);
+	TRACE("SACT.CG_Cut %d,%d,%d,%d,%d,%d:", wNumDstCG, wNumSrcCG, wX, wY, wWidth, wHeight);
 }
 
 /**
@@ -1013,7 +1013,7 @@ static void CG_PartCopy() {
 	
 	scg_partcopy(wNumDstCG, wNumSrcCG, wX, wY, wWidth, wHeight);
 	
-	DEBUG_COMMAND_YET("SACT.PartCopy %d,%d,%d,%d,%d,%d:", wNumDstCG, wNumSrcCG, wX, wY, wWidth, wHeight);
+	TRACE("SACT.PartCopy %d,%d,%d,%d,%d,%d:", wNumDstCG, wNumSrcCG, wX, wY, wWidth, wHeight);
 }
 
 /**
@@ -1024,7 +1024,7 @@ static void CG_PartCopy() {
 static void WaitKeySimple() {
 	int *vKey = getCaliVariable();
 
-	DEBUG_COMMAND_YET("SACT.WaitKeySimple %d:", vKey);
+	TRACE("SACT.WaitKeySimple %d:", vKey);
 
 	// とりあえず全更新
 	sp_update_all(TRUE);
@@ -1060,7 +1060,7 @@ static void WaitKeyMessage() {
 	
 	smsg_keywait(wMessageMark1, wMessageMark2, wMessageLength);
 	
-	DEBUG_COMMAND_YET("SACT.WaitKeyMessage %d,%d,%d:", wMessageMark1, wMessageMark2, wMessageLength);
+	TRACE("SACT.WaitKeyMessage %d,%d,%d:", wMessageMark1, wMessageMark2, wMessageLength);
 }
 
 /**
@@ -1077,11 +1077,11 @@ static void WaitKeySprite() {
 	int *vRsv1 = getCaliVariable();
 	int *vRsv2 = getCaliVariable();
 	
-	DEBUG_COMMAND("SACT.WaitKeySprite %p,%p,%p,%p:", vOK, vRND, vRsv1, vRsv2);
+	TRACE("SACT.WaitKeySprite %p,%p,%p,%p:", vOK, vRND, vRsv1, vRsv2);
 	
 	sp_keywait(vOK, vRND, vRsv1, vRsv2, NULL, -1);
 	
-	DEBUG_COMMAND_YET("SACT.WaitKeySprite %d,%d,%d,%d:", *vOK, *vRND, *vRsv1, *vRsv2);
+	TRACE("SACT.WaitKeySprite %d,%d,%d,%d:", *vOK, *vRND, *vRsv1, *vRsv2);
 }
 
 /**
@@ -1093,9 +1093,8 @@ static void WaitKeySprite() {
 static void PeekKey() {
 	int nKeyCode = getCaliValue();
 	int *vResult = getCaliVariable();
-	
-	WARNING("NOT IMPLEMENTED");
-	DEBUG_COMMAND_YET("SACT.PeekKey %d,%p:", nKeyCode, vResult);
+
+	TRACE_UNIMPLEMENTED("SACT.PeekKey %d,%p:", nKeyCode, vResult);
 }
 
 /**
@@ -1103,8 +1102,7 @@ static void PeekKey() {
  *   文字送りキーが押されっぱなしの時、離されるまで待つ
  */
 static void WaitMsgSkipKeyUp() {
-	WARNING("NOT IMPLEMENTED");
-	DEBUG_COMMAND_YET("SACT.WaitMsgSkipKeyUp:");
+	TRACE_UNIMPLEMENTED("SACT.WaitMsgSkipKeyUp:");
 }
 
 /**
@@ -1133,7 +1131,7 @@ static void WaitKeySimpleTimeOut() {
 	
 	sact.waittype = KEYWAIT_NONE;
 	
-	DEBUG_COMMAND_YET("SACT.WaitKeySimpleTimeOut %p,%p,%d:", vRND, vD03, wTime);
+	TRACE("SACT.WaitKeySimpleTimeOut %p,%p,%d:", vRND, vD03, wTime);
 }
 
 /**
@@ -1156,7 +1154,7 @@ static void WaitKeySpriteTimeOut() {
 	
 	sp_keywait(vOK, vRND, vD01, vD02, vD03, wTime);
 	
-	DEBUG_COMMAND_YET("SACT.WaitKeySpriteTimeOut %p,%p,%p,%p,%p,%d:", vOK, vRND, vD01, vD02, vD03, wTime);
+	TRACE("SACT.WaitKeySpriteTimeOut %p,%p,%p,%p,%p,%d:", vOK, vRND, vD01, vD02, vD03, wTime);
 }
 
 /**
@@ -1169,7 +1167,7 @@ static void QueryMessageSkip() {
 
 	*vSkip = msgskip_isSkipping() ? 1 : 0;
 	
-	DEBUG_COMMAND_YET("SACT.QueryMessageSkip %p:", vSkip);
+	TRACE("SACT.QueryMessageSkip %p:", vSkip);
 }
 
 /**
@@ -1184,7 +1182,7 @@ static void RegistReplaceString() {
 	
 	sstr_regist_replace(sstr, dstr);
 	
-	DEBUG_COMMAND_YET("SACT.RegistReplaceString %d,%d:", sstr, dstr);
+	TRACE("SACT.RegistReplaceString %d,%d:", sstr, dstr);
 }
 
 /**
@@ -1224,7 +1222,7 @@ static void MessageOutput() {
 	
 	smsg_out(wMessageSpriteNumber, wMessageSize, wMessageColorR, wMessageColorG, wMessageColorB, wMessageFont, wMessageSpeed, wMessageLineSpace, wMessageAlign, 0, 0, 0, vMessageLength);
 	
-	DEBUG_COMMAND_YET("SACT.MessageOutput %d,%d,%d,%d,%d,%d,%d,%d,%d,%p:", wMessageSpriteNumber, wMessageSize, wMessageColorR, wMessageColorG, wMessageColorB, wMessageFont, wMessageSpeed, wMessageLineSpace, wMessageAlign, vMessageLength);
+	TRACE("SACT.MessageOutput %d,%d,%d,%d,%d,%d,%d,%d,%d,%p:", wMessageSpriteNumber, wMessageSize, wMessageColorR, wMessageColorG, wMessageColorB, wMessageFont, wMessageSpeed, wMessageLineSpace, wMessageAlign, vMessageLength);
 }
 
 /**
@@ -1268,7 +1266,7 @@ static void MessageOutputEx() {
 	
 	smsg_out(wMessageSpriteNumber, wMessageSize, wMessageColorR, wMessageColorG, wMessageColorB, wMessageFont, wMessageSpeed, wMessageLineSpace, wMessageAlign, wRubySize, wRubyFont, wRubyLineSpace, vLength);
 	
-	DEBUG_COMMAND_YET("SACT.MessageOutputEx %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%p:", wMessageSpriteNumber, wMessageSize, wMessageColorR, wMessageColorG, wMessageColorB, wMessageFont, wMessageSpeed, wMessageLineSpace,wMessageAlign, wRubySize, wRubyFont, wRubyLineSpace, vLength);
+	TRACE("SACT.MessageOutputEx %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%p:", wMessageSpriteNumber, wMessageSize, wMessageColorR, wMessageColorG, wMessageColorB, wMessageFont, wMessageSpeed, wMessageLineSpace,wMessageAlign, wRubySize, wRubyFont, wRubyLineSpace, vLength);
 }
 
 /**
@@ -1283,7 +1281,7 @@ static void MessageNewLine() {
 	
 	smsg_newline(wMessageSpriteNumber, wMessageSize);
 	
-	DEBUG_COMMAND_YET("SACT.MessageNewLine %d,%d:", wMessageSpriteNumber, wMessageSize);
+	TRACE("SACT.MessageNewLine %d,%d:", wMessageSpriteNumber, wMessageSize);
 }
 
 /**
@@ -1296,7 +1294,7 @@ static void MessageClear() {
 	
 	smsg_clear(wMessageSpriteNumber);
 	
-	DEBUG_COMMAND_YET("SACT.MessageClear %d:", wMessageSpriteNumber);
+	TRACE("SACT.MessageClear %d:", wMessageSpriteNumber);
 }
 
 /**
@@ -1309,7 +1307,7 @@ static void MessageIsEmpty() {
 
 	*wResult = smsg_is_empty();
 	
-	DEBUG_COMMAND_YET("SACT.MessageIsEmpty %p:", wResult);
+	TRACE("SACT.MessageIsEmpty %p:", wResult);
 }
 
 /**
@@ -1322,9 +1320,7 @@ static void MessagePeek() {
 	int *vCount = getCaliVariable();
 	int nTopStringNum = getCaliValue();
 
-	WARNING("NOT IMPLEMENTED");
-	
-	DEBUG_COMMAND_YET("SACT.MessagePeek %p,%d:", vCount, nTopStringNum);
+	TRACE_UNIMPLEMENTED("SACT.MessagePeek %p,%d:", vCount, nTopStringNum);
 }
 
 /**
@@ -1333,7 +1329,7 @@ static void MessagePeek() {
  */
 static void Log_Stop() {
 	sact.logging = FALSE;
-	DEBUG_COMMAND_YET("SACT.Log_Stop:");
+	TRACE("SACT.Log_Stop:");
 }
 
 /**
@@ -1342,7 +1338,7 @@ static void Log_Stop() {
  */
 static void Log_Start() {
 	sact.logging = TRUE;
-	DEBUG_COMMAND_YET("SACT.Log_Start:");
+	TRACE("SACT.Log_Start:");
 }
 
 /**
@@ -1352,7 +1348,7 @@ static void Log_Start() {
 static void MenuClear() {
 	ssel_clear();
 	
-	DEBUG_COMMAND_YET("SACT.MenuClear:");
+	TRACE("SACT.MenuClear:");
 }
 
 /**
@@ -1367,7 +1363,7 @@ static void MenuAdd() {
 
 	ssel_add(nString, wI);
 	
-	DEBUG_COMMAND_YET("SACT.MenuAdd %d,%d:", nString, wI);
+	TRACE("SACT.MenuAdd %d,%d:", nString, wI);
 }
 
 /**
@@ -1396,7 +1392,7 @@ static void MenuOpen() {
 	
 	*wMenuResult = ssel_select(wNum, wChoiceSize, wMenuOutSpc, wChoiceLineSpace, wChoiceAutoMoveCursor, nAlign);
 	
-	DEBUG_COMMAND_YET("SACT.MenuOpen %p,%d,%d,%d,%d,%d,%d:", wMenuResult, wNum, wChoiceSize, wMenuOutSpc, wChoiceLineSpace, wChoiceAutoMoveCursor, nAlign);
+	TRACE("SACT.MenuOpen %p,%d,%d,%d,%d,%d,%d:", wMenuResult, wNum, wChoiceSize, wMenuOutSpc, wChoiceLineSpace, wChoiceAutoMoveCursor, nAlign);
 }
 
 /**
@@ -1409,7 +1405,7 @@ static void PushString() {
 	
 	sstr_push(nString);
 	
-	DEBUG_COMMAND_YET("SACT.PushString %d:", nString);
+	TRACE("SACT.PushString %d:", nString);
 }
 
 /**
@@ -1422,7 +1418,7 @@ static void PopString() {
 
 	sstr_pop(nString);
 	
-	DEBUG_COMMAND_YET("SACT.PopString %d:", nString);
+	TRACE("SACT.PopString %d:", nString);
 }
 
 /**
@@ -1445,7 +1441,7 @@ static void Numeral_SetCG() {
 	
 	sp_num_setcg(nNum, nIndex, nCG);
 	
-	DEBUG_COMMAND_YET("SACT.Numeral_SetCG %d,%d,%d:", nNum, nIndex, nCG);
+	TRACE("SACT.Numeral_SetCG %d,%d,%d:", nNum, nIndex, nCG);
 }
 
 /**
@@ -1462,7 +1458,7 @@ static void Numeral_GetCG() {
 	
 	sp_num_getcg(nNum, nIndex, vCG);
 	
-	DEBUG_COMMAND_YET("SACT.Numeral_GetCG %d,%d,%p:", nNum, nIndex, vCG);
+	TRACE("SACT.Numeral_GetCG %d,%d,%p:", nNum, nIndex, vCG);
 }
 
 /**
@@ -1479,7 +1475,7 @@ static void Numeral_SetPos() {
 	
 	sp_num_setpos(nNum, nX, nY);
 	
-	DEBUG_COMMAND_YET("SACT.Numeral_SetPos %d,%d,%d:", nNum, nX, nY);
+	TRACE("SACT.Numeral_SetPos %d,%d,%d:", nNum, nX, nY);
 }
 
 /**
@@ -1496,7 +1492,7 @@ static void Numeral_GetPos() {
 	
 	sp_num_getpos(nNum, vX, vY);
 	
-	DEBUG_COMMAND_YET("SACT.Numeral_GetPos %d,%p,%p:", nNum, vX, vY);
+	TRACE("SACT.Numeral_GetPos %d,%p,%p:", nNum, vX, vY);
 }
 
 /**
@@ -1511,7 +1507,7 @@ static void Numeral_SetSpan() {
 	
 	sp_num_setspan(nNum, nSpan);
 	
-	DEBUG_COMMAND_YET("SACT.Numeral_SetSpan %d,%d:", nNum, nSpan);
+	TRACE("SACT.Numeral_SetSpan %d,%d:", nNum, nSpan);
 }
 
 /**
@@ -1526,7 +1522,7 @@ static void Numeral_GetSpan() {
 
 	sp_num_getspan(nNum, vSpan);
 	
-	DEBUG_COMMAND_YET("SACT.Numeral_GetSpan %d,%p:", nNum, vSpan);
+	TRACE("SACT.Numeral_GetSpan %d,%p:", nNum, vSpan);
 }
 
 /**
@@ -1534,7 +1530,7 @@ static void Numeral_GetSpan() {
  *   説明スプライト設定クリア
  */
 static void ExpSp_Clear() {
-	DEBUG_COMMAND_YET("SACT.ExpSp_Clear:");
+	TRACE("SACT.ExpSp_Clear:");
 
 	sp_exp_clear();
 }
@@ -1551,7 +1547,7 @@ static void ExpSp_Add() {
 	
 	sp_exp_add(wNumSP1, wNumSP2);
 	
-	DEBUG_COMMAND_YET("SACT.ExpSp_Add %d,%d:", wNumSP1, wNumSP2);
+	TRACE("SACT.ExpSp_Add %d,%d:", wNumSP1, wNumSP2);
 }
 
 /**
@@ -1564,7 +1560,7 @@ static void ExpSp_Del() {
 	
 	sp_exp_del(wNum);
 	
-	DEBUG_COMMAND_YET("SACT.ExpSp_Del %d:", wNum);
+	TRACE("SACT.ExpSp_Del %d:", wNum);
 }
 
 /**
@@ -1579,7 +1575,7 @@ static void TimerSet() {
 	
 	stimer_reset(wTimerID, wCount);
 	
-	DEBUG_COMMAND("SACT.TimerSet %d,%d:", wTimerID, wCount);
+	TRACE("SACT.TimerSet %d,%d:", wTimerID, wCount);
 }
 
 /**
@@ -1594,7 +1590,7 @@ static void TimerGet() {
 
 	*vRND = stimer_get(wTimerID);
 	
-	DEBUG_COMMAND("SACT.TimerGet %d,%p:", wTimerID, vRND);
+	TRACE("SACT.TimerGet %d,%p:", wTimerID, vRND);
 }
 
 /**
@@ -1611,7 +1607,7 @@ static void TimerWait() {
 		sys_keywait(10, KEYWAIT_NONCANCELABLE);
 	}
 	
-	DEBUG_COMMAND("SACT.TimerWait %d,%d:", wTimerID, wCount);
+	TRACE("SACT.TimerWait %d,%d:", wTimerID, wCount);
 }
 
 /**
@@ -1624,7 +1620,7 @@ static void Wait() {
 	
 	sys_keywait(wCount*10, KEYWAIT_NONCANCELABLE);
 	
-	DEBUG_COMMAND_YET("SACT.Wait %d:", wCount);
+	TRACE("SACT.Wait %d:", wCount);
 }
 
 /**
@@ -1637,7 +1633,7 @@ static void SoundPlay() {
 	
 	ssnd_play(wNum);
 	
-	DEBUG_COMMAND_YET("SACT.SoundPlay %d:", wNum);
+	TRACE("SACT.SoundPlay %d:", wNum);
 }
 
 /**
@@ -1652,7 +1648,7 @@ static void SoundStop() {
 	
 	ssnd_stop(wNum, wFadeTime);
 	
-	DEBUG_COMMAND_YET("SACT.SoundStop %d,%d:", wNum, wFadeTime);
+	TRACE("SACT.SoundStop %d,%d:", wNum, wFadeTime);
 }
 
 /**
@@ -1666,7 +1662,7 @@ static void SoundStopAll() {
 	
 	ssnd_stopall(wFadeTime);
 	
-	DEBUG_COMMAND_YET("SACT.SoundStopAll %d:", wFadeTime);
+	TRACE("SACT.SoundStopAll %d:", wFadeTime);
 }
 
 /**
@@ -1679,7 +1675,7 @@ static void SoundWait() {
 	
 	ssnd_wait(wNum);
 	
-	DEBUG_COMMAND_YET("SACT.SoundWait %d:", wNum);
+	TRACE("SACT.SoundWait %d:", wNum);
 }
 
 /**
@@ -1694,7 +1690,7 @@ static void SoundWaitKey() {
 	
 	ssnd_waitkey(wNum, vKey);
 	
-	DEBUG_COMMAND_YET("SACT.SoundWaitKey %d,%p:", wNum, vKey);
+	TRACE("SACT.SoundWaitKey %d,%p:", wNum, vKey);
 }
 
 /**
@@ -1707,7 +1703,7 @@ static void SoundPrepare() {
 	
 	ssnd_prepare(wNum);
 	
-	DEBUG_COMMAND_YET("SACT.SoundPrepare %d:", wNum);
+	TRACE("SACT.SoundPrepare %d:", wNum);
 }
 
 /**
@@ -1720,7 +1716,7 @@ static void SoundPrepareLR() {
 
 	ssnd_prepareLRrev(wNum);
 	
-	DEBUG_COMMAND_YET("SACT.SoundPrepareLR %d:", wNum);
+	TRACE("SACT.SoundPrepareLR %d:", wNum);
 }
 
 /**
@@ -1733,7 +1729,7 @@ static void SoundPlayLR() {
 	
 	ssnd_playLRrev(wNum);
 	
-	DEBUG_COMMAND_YET("SACT.SoundPlayLR %d:", wNum);
+	TRACE("SACT.SoundPlayLR %d:", wNum);
 }
 
 /**
@@ -1757,7 +1753,7 @@ static void SpriteSound() {
 		sp_sound_set(i, wNumWave1, wNumWave2, wNumWave3);
 	}
 	
-	DEBUG_COMMAND_YET("SACT.SpriteSound %d,%d,%d,%d,%d:", wNumSP, nCount, wNumWave1, wNumWave2, wNumWave3);
+	TRACE("SACT.SpriteSound %d,%d,%d,%d,%d:", wNumSP, nCount, wNumWave1, wNumWave2, wNumWave3);
 }
 
 /**
@@ -1765,7 +1761,7 @@ static void SpriteSound() {
  *   SpriteSoundで設定したすべての音の再生終了まで待つ (~SP_SOUND_WAIT)
  */
 static void SpriteSoundWait() {
-	DEBUG_COMMAND_YET("SACT.SpriteSoundWait:");
+	TRACE("SACT.SpriteSoundWait:");
 
 	sp_sound_wait();
 }
@@ -1780,7 +1776,7 @@ static void SpriteSoundOB() {
 	
 	sp_sound_ob(wNumWave);
 	
-	DEBUG_COMMAND_YET("SACT.SpriteSoundOB %d:", wNumWave);
+	TRACE("SACT.SpriteSoundOB %d:", wNumWave);
 }
 
 /**
@@ -1797,7 +1793,7 @@ static void MusicCheck() {
 	*vRND = dfile ? 1 : 0;
 	ald_freedata(dfile);
 	
-	DEBUG_COMMAND_YET("SACT.MusicCheck %d,%p:", wNum, vRND);
+	TRACE("SACT.MusicCheck %d,%p:", wNum, vRND);
 }
 
 /**
@@ -1812,7 +1808,7 @@ static void MusicGetLength() {
 	
 	*vRND = musbgm_getlen(wNum);
 	
-	DEBUG_COMMAND_YET("SACT.MusicGetLength %d,%d:", wNum, *vRND);
+	TRACE("SACT.MusicGetLength %d,%d:", wNum, *vRND);
 }
 
 /**
@@ -1827,7 +1823,7 @@ static void MusicGetPos() {
 	
 	*vRND = musbgm_getpos(wNum);
 	
-	DEBUG_COMMAND_YET("SACT.MusicGetPos %d,%d:", wNum, *vRND);
+	TRACE("SACT.MusicGetPos %d,%d:", wNum, *vRND);
 }
 
 /**
@@ -1844,7 +1840,7 @@ static void MusicPlay() {
 	
 	musbgm_play(wNum, wFadeTime, wVolume);
 	
-	DEBUG_COMMAND_YET("SACT.MusicPlay %d,%d,%d:", wNum, wFadeTime, wVolume);
+	TRACE("SACT.MusicPlay %d,%d,%d:", wNum, wFadeTime, wVolume);
 }
 
 /**
@@ -1859,7 +1855,7 @@ static void MusicStop() {
 	
 	musbgm_stop(wNum, wFadeTime);
 	
-	DEBUG_COMMAND_YET("SACT.MusicStop %d,%d:", wNum, wFadeTime);
+	TRACE("SACT.MusicStop %d,%d:", wNum, wFadeTime);
 }
 
 /**
@@ -1872,7 +1868,7 @@ static void MusicStopAll() {
 	
 	musbgm_stopall(wFadeTime);
 	
-	DEBUG_COMMAND_YET("SACT.MusicStopAll %d:", wFadeTime);
+	TRACE("SACT.MusicStopAll %d:", wFadeTime);
 }
 
 /**
@@ -1889,7 +1885,7 @@ static void MusicFade() {
 	
 	musbgm_fade(wNum, wFadeTime, wVolume);
 	
-	DEBUG_COMMAND_YET("SACT.MusicFade %d,%d,%d:", wNum, wFadeTime, wVolume);
+	TRACE("SACT.MusicFade %d,%d,%d:", wNum, wFadeTime, wVolume);
 }
 
 /**
@@ -1908,7 +1904,7 @@ static void MusicWait() {
 	
 	musbgm_wait(wNum, nTimeOut);
 	
-	DEBUG_COMMAND_YET("SACT.MusicWait %d,%d:", wNum, nTimeOut);
+	TRACE("SACT.MusicWait %d,%d:", wNum, nTimeOut);
 }
 
 /**
@@ -1921,10 +1917,8 @@ static void MusicWait() {
 static void MusicWaitPos() {
 	int wNum = getCaliValue();
 	int wIndex = getCaliValue();
-	
-	WARNING("SACT.MusicWatiPos not implemented");
-	
-	DEBUG_COMMAND_YET("SACT.MusicWaitPos %d,%d:", wNum, wIndex);
+
+	TRACE_UNIMPLEMENTED("SACT.MusicWaitPos %d,%d:", wNum, wIndex);
 }
 
 /**
@@ -1939,7 +1933,7 @@ static void SoundGetLinkNum() {
 
 	*vRND = ssnd_getlinknum(wNum);
 	
-	DEBUG_COMMAND_YET("SACT.SoundGetLinkNum %d,%p:", wNum, vRND);
+	TRACE("SACT.SoundGetLinkNum %d,%p:", wNum, vRND);
 }
 
 /**
@@ -1964,7 +1958,7 @@ static void ChartPos() {
 	
 	schart_pos(pos, pos1, pos2, val1, val2, val);
 	
-	DEBUG_COMMAND_YET("SACT.ChartPos %p,%d,%d,%d,%d,%d:", pos, pos1, pos2, val1, val2, val);
+	TRACE("SACT.ChartPos %p,%d,%d,%d,%d,%d:", pos, pos1, pos2, val1, val2, val);
 }
 
 /**
@@ -1983,7 +1977,7 @@ static void NumToStr() {
 	
 	sstr_num2str(strno, fig, zeropad, num);
 	
-	DEBUG_COMMAND_YET("SACT.NumToStr %d,%d,%d,%d:", strno, fig, zeropad, num);
+	TRACE("SACT.NumToStr %d,%d,%d,%d:", strno, fig, zeropad, num);
 }
 
 /**
@@ -1993,9 +1987,7 @@ static void Maze_Create() {
 	int p1 = getCaliValue();
 	int p2 = getCaliValue();
 
-	WARNING("NOT IMPLEMENTED");
-	
-	DEBUG_COMMAND_YET("SACT.Maze_Create %d,%d:", p1,p2);
+	TRACE_UNIMPLEMENTED("SACT.Maze_Create %d,%d:", p1,p2);
 }
 
 /**
@@ -2005,10 +1997,8 @@ static void Maze_Get() {
 	int *p1 = getCaliVariable();
 	int p2 = getCaliValue();
 	int p3 = getCaliValue();
-	
-	WARNING("NOT IMPLEMENTED");
-	
-	DEBUG_COMMAND_YET("SACT.Maze_Get %p,%d,%d:", p1,p2,p3);
+
+	TRACE_UNIMPLEMENTED("SACT.Maze_Get %p,%d,%d:", p1,p2,p3);
 }
 
 /**
@@ -2021,7 +2011,7 @@ static void EncryptWORD() {
 
 	scryp_encrypt_word(array, num, key);
 	
-	DEBUG_COMMAND_YET("SACT.EncryptWORD %p,%d,%d:", array, num, key);
+	TRACE("SACT.EncryptWORD %p,%d,%d:", array, num, key);
 }
 
 /**
@@ -2034,7 +2024,7 @@ static void DecryptWORD() {
 
 	scryp_encrypt_word(array, num, key);
 	
-	DEBUG_COMMAND_YET("SACT.DecryptWORD %p,%d,%d:", array, num, key);
+	TRACE("SACT.DecryptWORD %p,%d,%d:", array, num, key);
 }
 
 /**
@@ -2046,7 +2036,7 @@ static void EncryptString() {
 
 	scryp_encrypt_str(p1, p2);
 	
-	DEBUG_COMMAND_YET("SACT.EncryptString %d,%d:", p1,p2);
+	TRACE("SACT.EncryptString %d,%d:", p1,p2);
 }
 
 /**
@@ -2058,7 +2048,7 @@ static void DecryptString() {
 
 	scryp_decrypt_str(p1, p2);
 	
-	DEBUG_COMMAND_YET("SACT.DecryptString %d,%d:", p1,p2);
+	TRACE("SACT.DecryptString %d,%d:", p1,p2);
 }
 
 /**
@@ -2068,7 +2058,7 @@ static void DecryptString() {
 static void XMenuClear() {
 	spxm_clear();
 	
-	DEBUG_COMMAND_YET("SACT.XMenuClear:");
+	TRACE("SACT.XMenuClear:");
 }
 
 /**
@@ -2083,7 +2073,7 @@ static void XMenuRegister() {
 	
 	spxm_register(nRegiNum, nMenuID);
 	
-	DEBUG_COMMAND_YET("SACT.XMenuRegister %d,%d:", nRegiNum, nMenuID);
+	TRACE("SACT.XMenuRegister %d,%d:", nRegiNum, nMenuID);
 }
 
 /**
@@ -2098,7 +2088,7 @@ static void XMenuGetNum() {
 	
 	*vMenuID = spxm_getnum(nRegiNum);
 	
-	DEBUG_COMMAND_YET("SACT.XMenuGetNum %d,%p:", nRegiNum, vMenuID);
+	TRACE("SACT.XMenuGetNum %d,%p:", nRegiNum, vMenuID);
 }
 
 /**
@@ -2113,7 +2103,7 @@ static void XMenuGetText() {
 	
 	spxm_gettext(nRegiNum, strno);
 	
-	DEBUG_COMMAND_YET("SACT.XMenuGetText %d,%d:", nRegiNum, strno);
+	TRACE("SACT.XMenuGetText %d,%d:", nRegiNum, strno);
 }
 
 /**
@@ -2123,7 +2113,7 @@ static void XMenuGetText() {
 static void XMenuTitleRegister() {
 	spxm_titlereg();
 	
-	DEBUG_COMMAND_YET("SACT.XMenuTitleRegister:");
+	TRACE("SACT.XMenuTitleRegister:");
 }
 
 /**
@@ -2136,7 +2126,7 @@ static void XMenuTitleGet() {
 	
 	spxm_titleget(strno);
 	
-	DEBUG_COMMAND_YET("SACT.XMenuTitleGet %d:", strno);
+	TRACE("SACT.XMenuTitleGet %d:", strno);
 }
 
 static void SACT_reset(void) {
diff --git a/modules/ShArray/ShArray.c b/modules/ShArray/ShArray.c
index d91d4ce..bb9ca54 100644
--- a/modules/ShArray/ShArray.c
+++ b/modules/ShArray/ShArray.c
@@ -49,7 +49,7 @@ static void GetAtArray(void) { /* 0 */
 	int *vResult = getCaliVariable();
 	int i, j;
 
-	DEBUG_COMMAND("ShArray.GetAtArray %p,%d,%d,%p:", vAry, cnt, type, vResult);
+	TRACE("ShArray.GetAtArray %p,%d,%d,%p:", vAry, cnt, type, vResult);
 	
 	j = *vAry; vAry++;
 	for (i = 1; i < cnt; i++) {
@@ -93,7 +93,7 @@ static void AddAtArray(void) { /* 1 */
 	int cnt    = getCaliValue();
 	int i;
 	
-	DEBUG_COMMAND("ShArray.AddAtArray %p,%p,%d:", vAry1, vAry2, cnt);
+	TRACE("ShArray.AddAtArray %p,%p,%d:", vAry1, vAry2, cnt);
 	
 	for (i = 0; i < cnt; i++) {
 		int result = (*vAry1) + (*vAry2);
@@ -119,7 +119,7 @@ static void SubAtArray(void) { /* 2 */
 	int cnt    = getCaliValue();
 	int i;
 	
-	DEBUG_COMMAND("ShArray.SubAtArray %p,%p,%d:", vAry1, vAry2, cnt);
+	TRACE("ShArray.SubAtArray %p,%p,%d:", vAry1, vAry2, cnt);
 	
 	for (i = 0; i < cnt; i++) {
 		int result = (*vAry1) - (*vAry2);
@@ -145,7 +145,7 @@ static void MulAtArray(void) { /* 3 */
 	int cnt    = getCaliValue();
 	int i;
 	
-	DEBUG_COMMAND("ShArray.MulAtArray %p,%p,%d:", vAry1, vAry2, cnt);
+	TRACE("ShArray.MulAtArray %p,%p,%d:", vAry1, vAry2, cnt);
 	
 	for (i = 0; i < cnt; i++) {
 		int result = (*vAry1) * (*vAry2);
@@ -171,7 +171,7 @@ static void DivAtArray(void) { /* 4 */
 	int cnt    = getCaliValue();
 	int i;
 	
-	DEBUG_COMMAND("ShArray.DivAtArray: %d,%d,%d:", vAry1, vAry2, cnt);
+	TRACE("ShArray.DivAtArray: %d,%d,%d:", vAry1, vAry2, cnt);
 	
 	for (i = 0; i < cnt; i++) {
 		if (*vAry2 == 0) {
@@ -201,7 +201,7 @@ static void MinAtArray(void) { /* 5 */
 	int cnt    = getCaliValue();
 	int i;
 	
-	DEBUG_COMMAND("ShArray.MinAtArray: %d,%d,%d:", vAry1, vAry2, cnt);
+	TRACE("ShArray.MinAtArray: %d,%d,%d:", vAry1, vAry2, cnt);
 	
 	for (i = 0; i < cnt; i++) {
 		if (*vAry1 < *vAry2) {
@@ -224,7 +224,7 @@ static void MaxAtArray(void) { /* 6 */
 	int cnt    = getCaliValue();
 	int i;
 	
-	DEBUG_COMMAND("ShArray.MaxAtArray: %d,%d,%d:", vAry1, vAry2, cnt);
+	TRACE("ShArray.MaxAtArray: %d,%d,%d:", vAry1, vAry2, cnt);
 	
 	for (i = 0; i < cnt; i++) {
 		if (*vAry1 > *vAry2) {
@@ -247,7 +247,7 @@ static void AndNumArray(void) { /* 7 */
 	int val   = getCaliValue();
 	int i;
 	
-	DEBUG_COMMAND("ShArray.AndNumArray: %p,%d,%d:", vAry, cnt, val);
+	TRACE("ShArray.AndNumArray: %p,%d,%d:", vAry, cnt, val);
 	
 	for (i = 0; i < cnt; i++) {
 		(*vAry) &= val;
@@ -268,7 +268,7 @@ static void OrNumArray(void) { /* 8 */
 	int val   = getCaliValue();
 	int i;
 	
-	DEBUG_COMMAND_YET("ShArray.OrNumArray: %p,%d,%d:", vAry, cnt, val);
+	TRACE("ShArray.OrNumArray: %p,%d,%d:", vAry, cnt, val);
 	
 	for (i = 0; i < cnt; i++) {
 		(*vAry) |= val;
@@ -289,7 +289,7 @@ static void XorNumArray(void) { /* 9 */
 	int val   = getCaliValue();
 	int i;
 	
-	DEBUG_COMMAND("ShArray.XorNumArray %p,%d,%d:", vAry, cnt, val);
+	TRACE("ShArray.XorNumArray %p,%d,%d:", vAry, cnt, val);
 	
 	for (i = 0; i < cnt; i++) {
 		(*vAry) ^= val;
@@ -313,7 +313,7 @@ static void SetEquArray(void) { /* 10 */
 	int *vResults = getCaliVariable();
 	int i;
 	
-	DEBUG_COMMAND("ShArray.SetEquArray %p,%d,%d,%p:", vAry, cnt, val, vResults);
+	TRACE("ShArray.SetEquArray %p,%d,%d,%p:", vAry, cnt, val, vResults);
 	
 	for (i = 0; i < cnt; i++) {
 		*vResults = (*vAry == val) ? 1 : 0;
@@ -337,7 +337,7 @@ static void SetNotArray(void) { /* 11 */
 	int *vResults = getCaliVariable();
 	int i;
 	
-	DEBUG_COMMAND("ShArray.SetNotArray %p,%d,%d,%p:", vAry, cnt, val, vResults);
+	TRACE("ShArray.SetNotArray %p,%d,%d,%p:", vAry, cnt, val, vResults);
 
 	for (i = 0; i < cnt; i++) {
 		*vResults = (*vAry != val) ? 1 : 0;
@@ -360,7 +360,7 @@ static void SetLowArray(void) { /* 12 */
 	int *vResults = getCaliVariable();
 	int i;
 	
-	DEBUG_COMMAND("ShArray.SetLowArray %p,%d,%d,%p:", vAry, cnt, val, vResults);
+	TRACE("ShArray.SetLowArray %p,%d,%d,%p:", vAry, cnt, val, vResults);
 	
 	for (i = 0; i < cnt; i++) {
 		(*vResults) = ((*vAry < val) ? 1 : 0);
@@ -383,7 +383,7 @@ static void SetHighArray(void) { /* 13 */
 	int *vResults = getCaliVariable();
 	int i;
 	
-	DEBUG_COMMAND("ShArray.SetHighArray %p,%d,%d,%p:", vAry, cnt, val, vResults);
+	TRACE("ShArray.SetHighArray %p,%d,%d,%p:", vAry, cnt, val, vResults);
 	
 	for (i = 0; i < cnt; i++) {
 		(*vResults) = ((*vAry > val) ? 1 : 0);
@@ -410,7 +410,7 @@ static void SetRangeArray(void) { /* 14 */
 	int *vResults = getCaliVariable();
 	int i;
 	
-	DEBUG_COMMAND("ShArray.SetRangeArray %p,%d,%d,%d,%p:", vAry, cnt, min, max, vResults);
+	TRACE("ShArray.SetRangeArray %p,%d,%d,%d,%p:", vAry, cnt, min, max, vResults);
 	
 	for (i = 0; i < cnt; i++) {
 		*vResults = ((*vAry > min) && (*vAry < max)) ? 1 : 0;
@@ -437,7 +437,7 @@ static void SetAndEquArray(void) { /* 15 */
 	int *vResults = getCaliVariable();
 	int i;
 	
-	DEBUG_COMMAND("ShArray.SetAndEquArray: %p,%d,%d,%d,%p:", vAry, mask, cnt, val, vResults);
+	TRACE("ShArray.SetAndEquArray: %p,%d,%d,%d,%p:", vAry, mask, cnt, val, vResults);
 	
 	for (i = 0; i < cnt; i++) {
 		*vResults = ((*vAry & mask) == val) ? 1 : 0;
@@ -461,7 +461,7 @@ static void AndEquArray(void) { /* 16 */
 	int *vResults = getCaliVariable();
 	int i;
 	
-	DEBUG_COMMAND("ShArray.AndEquArray %p,%d,%d,%p:", vAry, cnt, val, vResults);
+	TRACE("ShArray.AndEquArray %p,%d,%d,%p:", vAry, cnt, val, vResults);
 	
 	for (i = 0; i < cnt; i++) {
 		*vResults &= ((*vAry == val) ? 1 : 0);
@@ -485,7 +485,7 @@ static void AndNotArray(void) { /* 17 */
 	int *vResults = getCaliVariable();
 	int i;
 	
-	DEBUG_COMMAND("ShArray.AndNotArray %p,%d,%d,%p:", vAry, cnt, val, vResults);
+	TRACE("ShArray.AndNotArray %p,%d,%d,%p:", vAry, cnt, val, vResults);
 	
 	for (i = 0; i < cnt; i++) {
 		*vResults &= ((*vAry != val) ? 1 : 0);
@@ -509,7 +509,7 @@ static void AndLowArray(void) { /* 18 */
 	int *vResults = getCaliVariable();
 	int i;
 	
-	DEBUG_COMMAND("ShArray.AndLowArray: %d,%d,%d,%d:", vAry, cnt, min, vResults);
+	TRACE("ShArray.AndLowArray: %d,%d,%d,%d:", vAry, cnt, min, vResults);
 	
 	for (i = 0; i < cnt; i++) {
 		*vResults &= ((*vAry < min) ? 1 : 0);
@@ -533,7 +533,7 @@ static void AndHighArray(void) { /* 19 */
 	int *vResults = getCaliVariable();
 	int i;
 	
-	DEBUG_COMMAND("ShArray.AndHighArray: %p,%d,%d,%p:", vAry, cnt, max, vResults);
+	TRACE("ShArray.AndHighArray: %p,%d,%d,%p:", vAry, cnt, max, vResults);
 	
 	for (i = 0; i < cnt; i++) {
 		*vResults &= ((*vAry > max) ? 1 : 0);
@@ -559,7 +559,7 @@ static void AndRangeArray(void) { /* 20 */
 	int *vResults = getCaliVariable();
 	int i;
 	
-	DEBUG_COMMAND("ShArray.AndRangeArray %d,%d,%d,%d,%d:", vAry, cnt, min, max, vResults);
+	TRACE("ShArray.AndRangeArray %d,%d,%d,%d,%d:", vAry, cnt, min, max, vResults);
 	
 	for (i = 0; i < cnt; i++) {
 		*vResults &= (((*vAry > min) && (*vAry < max)) ? 1 : 0);
@@ -586,7 +586,7 @@ static void AndAndEquArray(void) { /* 21 */
 	int *vResults = getCaliVariable();
 	int i;
 	
-	DEBUG_COMMAND("ShArray.AndAndEquArray: %d,%d,%d,%d,%d:", vAry, mask, cnt, val, vResults);
+	TRACE("ShArray.AndAndEquArray: %d,%d,%d,%d,%d:", vAry, mask, cnt, val, vResults);
 	
 	for (i = 0; i < cnt; i++) {
 		(*vResults) &= (((*vAry & mask) == val) ? 1 : 0);
@@ -600,7 +600,7 @@ static void OrEquArray(void) { /* 22 */
 	int p3 = getCaliValue();
 	int p4 = getCaliValue();
 
-	DEBUG_COMMAND_YET("ShArray.OrEquArray: %d,%d,%d,%d:", p1, p2, p3, p4);
+	TRACE_UNIMPLEMENTED("ShArray.OrEquArray: %d,%d,%d,%d:", p1, p2, p3, p4);
 }
 
 static void OrNotArray(void) { /* 23 */
@@ -618,7 +618,7 @@ static void OrNotArray(void) { /* 23 */
 	int *vResults = getCaliVariable();
 	int i;
 	
-	DEBUG_COMMAND("ShArray.OrNotArray %p,%d,%d,%p:", vAry, cnt, val, vResults);
+	TRACE("ShArray.OrNotArray %p,%d,%d,%p:", vAry, cnt, val, vResults);
 	
 	for (i = 0; i < cnt; i++) {
 		// if (*vAry != val) *vResults = 1;
@@ -633,7 +633,7 @@ static void OrLowArray(void) { /* 24 */
 	int p3 = getCaliValue();
 	int p4 = getCaliValue();
 
-	DEBUG_COMMAND_YET("ShArray.OrLowArray: %d,%d,%d,%d:", p1, p2, p3, p4);
+	TRACE_UNIMPLEMENTED("ShArray.OrLowArray: %d,%d,%d,%d:", p1, p2, p3, p4);
 }
 
 static void OrHighArray(void) { /* 25 */
@@ -642,7 +642,7 @@ static void OrHighArray(void) { /* 25 */
 	int p3 = getCaliValue();
 	int p4 = getCaliValue();
 
-	DEBUG_COMMAND_YET("ShArray.OrHighArray: %d,%d,%d,%d:", p1, p2, p3, p4);
+	TRACE_UNIMPLEMENTED("ShArray.OrHighArray: %d,%d,%d,%d:", p1, p2, p3, p4);
 }
 
 static void OrRangeArray(void) { /* 26 */
@@ -652,7 +652,7 @@ static void OrRangeArray(void) { /* 26 */
 	int p4 = getCaliValue();
 	int p5 = getCaliValue();
 
-	DEBUG_COMMAND_YET("ShArray.OrRangeArray: %d,%d,%d,%d,%d:", p1, p2, p3, p4,p5);
+	TRACE_UNIMPLEMENTED("ShArray.OrRangeArray: %d,%d,%d,%d,%d:", p1, p2, p3, p4,p5);
 }
 
 static void OrAndEquArray(void) { /* 27 */
@@ -662,7 +662,7 @@ static void OrAndEquArray(void) { /* 27 */
 	int p4 = getCaliValue();
 	int p5 = getCaliValue();
 
-	DEBUG_COMMAND_YET("ShArray.OrAndEquArray: %d,%d,%d,%d,%d:", p1, p2, p3, p4,p5);
+	TRACE_UNIMPLEMENTED("ShArray.OrAndEquArray: %d,%d,%d,%d,%d:", p1, p2, p3, p4,p5);
 }
 
 static void EnumEquArray(void) { /* 28 */
@@ -680,7 +680,7 @@ static void EnumEquArray(void) { /* 28 */
 	int *vResult = getCaliVariable();
 	int i;
 	
-	DEBUG_COMMAND("ShArray.EnumEquArray %p,%d,%d,%p:", vAry, cnt, val, vResult);
+	TRACE("ShArray.EnumEquArray %p,%d,%d,%p:", vAry, cnt, val, vResult);
 	
 	*vResult = 0;
 	
@@ -698,7 +698,7 @@ static void EnumEquArray2(void) { /* 29 */
 	int p5 = getCaliValue();
 	int p6 = getCaliValue();
 
-	DEBUG_COMMAND_YET("ShArray.EnumEquArray2: %d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6);
+	TRACE_UNIMPLEMENTED("ShArray.EnumEquArray2: %d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6);
 }
 
 static void EnumEquNotArray2(void) { /* 30 */
@@ -721,7 +721,7 @@ static void EnumEquNotArray2(void) { /* 30 */
 	int *vResult = getCaliVariable();
 	int i;
 	
-	DEBUG_COMMAND("ShArray.EnumEquNotArray2 %p,%p,%d,%d,%d,%p:", vAry1, vAry2, cnt, val1, val2, vResult);
+	TRACE("ShArray.EnumEquNotArray2 %p,%p,%d,%d,%d,%p:", vAry1, vAry2, cnt, val1, val2, vResult);
 	
 	*vResult = 0;
 	
@@ -748,7 +748,7 @@ static void EnumNotArray(void) { /* 31 */
 	int *vResult = getCaliVariable();
 	int i;
 
-	DEBUG_COMMAND("ShArray.EnumNotArray %p, %d, %d, %p:", vAry, cnt, val, vResult);
+	TRACE("ShArray.EnumNotArray %p, %d, %d, %p:", vAry, cnt, val, vResult);
 	
 	*vResult = 0;
 	
@@ -768,7 +768,7 @@ static void EnumNotArray2(void) { /* 32 */
 	int p5 = getCaliValue();
 	int p6 = getCaliValue();
 
-	DEBUG_COMMAND_YET("ShArray.EnumNotArray2: %d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6);
+	TRACE_UNIMPLEMENTED("ShArray.EnumNotArray2: %d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6);
 }
 
 static void EnumLowArray(void) { /* 33 */
@@ -777,7 +777,7 @@ static void EnumLowArray(void) { /* 33 */
 	int p3 = getCaliValue();
 	int p4 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("ShArray.EnumLowArray: %d,%d,%d,%d:", p1, p2, p3, p4);
+	TRACE_UNIMPLEMENTED("ShArray.EnumLowArray: %d,%d,%d,%d:", p1, p2, p3, p4);
 }
 
 static void EnumHighArray(void) { /* 34 */
@@ -786,7 +786,7 @@ static void EnumHighArray(void) { /* 34 */
 	int p3 = getCaliValue();
 	int p4 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("ShArray.EnumHighArray: %d,%d,%d,%d:", p1, p2, p3, p4);
+	TRACE_UNIMPLEMENTED("ShArray.EnumHighArray: %d,%d,%d,%d:", p1, p2, p3, p4);
 }
 
 static void EnumRangeArray(void) { /* 35 */
@@ -806,7 +806,7 @@ static void EnumRangeArray(void) { /* 35 */
 	int *vResult = getCaliVariable();
 	int i;
 	
-	DEBUG_COMMAND("ShArray.EnumRangeArray %d,%d,%d,%d,%d:", vAry, cnt, min, max, vResult);
+	TRACE("ShArray.EnumRangeArray %d,%d,%d,%d,%d:", vAry, cnt, min, max, vResult);
 	
 	*vResult = 0;
 	
@@ -837,7 +837,7 @@ static void GrepEquArray(void) { /* 36 */
 	int *vResult = getCaliVariable();
 	int i;
 
-	DEBUG_COMMAND("ShArray.GrepEquArray  %p,%d,%d,%p,%p:", vAry, cnt, val, vMatch, vResult);
+	TRACE("ShArray.GrepEquArray  %p,%d,%d,%p,%p:", vAry, cnt, val, vMatch, vResult);
 	
 	*vResult = 0;
 	
@@ -869,7 +869,7 @@ static void GrepNotArray(void) { /* 37 */
 	int *vResult = getCaliVariable();
 	int i;
 	
-	DEBUG_COMMAND("ShArray.GrepNotArray %p,%d,%d,%p,%p:", vAry, cnt, val, vMatch, vResult);
+	TRACE("ShArray.GrepNotArray %p,%d,%d,%p,%p:", vAry, cnt, val, vMatch, vResult);
 	
 	*vResult = 0;
 	
@@ -892,7 +892,7 @@ static void GrepEquArray2(void) { /* 38 */
 	int p6 = getCaliValue();
 	int p7 = getCaliValue();
 
-	DEBUG_COMMAND_YET("ShArray.GrepEquArray2: %d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7);
+	TRACE_UNIMPLEMENTED("ShArray.GrepEquArray2: %d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7);
 }
 
 static void GrepNotArray2(void) { /* 39 */
@@ -904,7 +904,7 @@ static void GrepNotArray2(void) { /* 39 */
 	int p6 = getCaliValue();
 	int p7 = getCaliValue();
 
-	DEBUG_COMMAND_YET("ShArray.GrepNotArray2: %d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7);
+	TRACE_UNIMPLEMENTED("ShArray.GrepNotArray2: %d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7);
 }
 
 static void GrepEquNotArray2(void) { /* 40 */
@@ -916,7 +916,7 @@ static void GrepEquNotArray2(void) { /* 40 */
 	int p6 = getCaliValue();
 	int p7 = getCaliValue();
 
-	DEBUG_COMMAND_YET("ShArray.GrepEquNotArray2: %d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7);
+	TRACE_UNIMPLEMENTED("ShArray.GrepEquNotArray2: %d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7);
 }
 
 static void GrepLowArray(void) { /* 41 */
@@ -937,7 +937,7 @@ static void GrepLowArray(void) { /* 41 */
 	int *vResult = getCaliVariable();
 	int i;
 	
-	DEBUG_COMMAND("ShArray.GrepLowArray: %p,%d,%d,%p,%p:", vAry, cnt, min, vMatch, vResult);
+	TRACE("ShArray.GrepLowArray: %p,%d,%d,%p,%p:", vAry, cnt, min, vMatch, vResult);
 	
 	*vResult = 0;
 	
@@ -969,7 +969,7 @@ static void GrepHighArray(void) { /* 42 */
 	int *vResult = getCaliVariable();
 	int i;
 	
-	DEBUG_COMMAND("ShArray.GrepHighArray: %p,%d,%d,%p,%p:", vAry, cnt, max, vMatch, vResult);
+	TRACE("ShArray.GrepHighArray: %p,%d,%d,%p,%p:", vAry, cnt, max, vMatch, vResult);
 	
 	*vResult = 0;
 	
@@ -1003,7 +1003,7 @@ static void GrepRangeArray(void) { /* 43 */
 	int *vResult    = getCaliVariable();
 	int i;
 	
-	DEBUG_COMMAND("ShArray.GrepRangeArray %p,%d,%d,%d,%p,%p:", vAry, cnt, max, min, vMatch, vResult);
+	TRACE("ShArray.GrepRangeArray %p,%d,%d,%d,%p,%p:", vAry, cnt, max, min, vMatch, vResult);
 	
 	*vResult = 0;
 	
@@ -1040,7 +1040,7 @@ static void GrepLowOrderArray(void) { /* 44 */
 	int *vResult    = getCaliVariable();
 	int i, j, k = 0;
 	
-	DEBUG_COMMAND("ShArray.GrepLowOrderArray %p,%d,%d,%d,%p,%p,%p:", vAry, cnt, min, max, v1, vLastMatch, vResult);
+	TRACE("ShArray.GrepLowOrderArray %p,%d,%d,%d,%p,%p,%p:", vAry, cnt, min, max, v1, vLastMatch, vResult);
 	
 	*vResult = 0;
 	for (i = 0; i < cnt; i++) {
@@ -1091,7 +1091,7 @@ static void GrepHighOrderArray(void) { /* 45 */
 	int *vResult    = getCaliVariable();
 	int i, j, k = 0;
 	
-	DEBUG_COMMAND("ShArray.GrepHighOrderArray %p,%d,%d,%d,%p,%p,%p:", vAry, cnt, min, max, v1, vLastMatch, vResult);
+	TRACE("ShArray.GrepHighOrderArray %p,%d,%d,%d,%p,%p,%p:", vAry, cnt, min, max, v1, vLastMatch, vResult);
 	
 	*vResult = 0;
 	for (i = 0; i < cnt; i++) {
@@ -1125,7 +1125,7 @@ static void ChangeEquArray(void) { /* 46 */
 	int dst = getCaliValue();
 	int i;
 	
-	DEBUG_COMMAND("ShArray.ChangeEquArray: %d,%d,%d,%d:", vAry, cnt, src, dst);
+	TRACE("ShArray.ChangeEquArray: %d,%d,%d,%d:", vAry, cnt, src, dst);
 	
 	for (i = 0; i < cnt; i++) {
 		if (*vAry == src) {
@@ -1141,7 +1141,7 @@ static void ChangeNotArray(void) { /* 47 */
 	int p3 = getCaliValue();
 	int p4 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("ShArray.ChangeNotArray: %d,%d,%d,%d:", p1, p2, p3, p4);
+	TRACE_UNIMPLEMENTED("ShArray.ChangeNotArray: %d,%d,%d,%d:", p1, p2, p3, p4);
 }
 
 static void ChangeLowArray(void) { /* 48 */
@@ -1150,7 +1150,7 @@ static void ChangeLowArray(void) { /* 48 */
 	int p3 = getCaliValue();
 	int p4 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("ShArray.ChangeLowArray: %d,%d,%d,%d:", p1, p2, p3, p4);
+	TRACE_UNIMPLEMENTED("ShArray.ChangeLowArray: %d,%d,%d,%d:", p1, p2, p3, p4);
 }
 
 static void ChangeHighArray(void) { /* 49 */
@@ -1159,7 +1159,7 @@ static void ChangeHighArray(void) { /* 49 */
 	int p3 = getCaliValue();
 	int p4 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("ShArray.ChangeHighArray: %d,%d,%d,%d:", p1, p2, p3, p4);
+	TRACE_UNIMPLEMENTED("ShArray.ChangeHighArray: %d,%d,%d,%d:", p1, p2, p3, p4);
 }
 
 static void ChangeRangeArray(void) { /* 50 */
@@ -1179,7 +1179,7 @@ static void ChangeRangeArray(void) { /* 50 */
 	int val   = getCaliValue();
 	int i;
 	
-	DEBUG_COMMAND("ShArray.ChangeRangeArray %p,%d,%d,%d,%d:", vAry, cnt, min, max, val);
+	TRACE("ShArray.ChangeRangeArray %p,%d,%d,%d,%d:", vAry, cnt, min, max, val);
 	
 	for (i = 0; i < cnt; i++) {
 		if ((*vAry > min) && (*vAry < max)) {
@@ -1212,7 +1212,7 @@ static void CopyArrayToRect(void) { /* 51 */
 	int dh    = getCaliValue();
 	int x, y;
 
-	DEBUG_COMMAND("ShArray.CopyArrayToRect %p,%d,%d,%d,%d,%p,%d,%d:", vSrc, sw, sh, sx, sy, vDst, dw, dh);
+	TRACE("ShArray.CopyArrayToRect %p,%d,%d,%d,%d,%p,%d,%d:", vSrc, sw, sh, sx, sy, vDst, dw, dh);
 	
 	vSrc += (sy * sw + sx);
 	for (y = 0; y < dh; y++) {
@@ -1246,7 +1246,7 @@ static void CopyRectToArray(void) { /* 52 */
 	int dy    = getCaliValue();
 	int x, y;
 	
-	DEBUG_COMMAND("ShArray.CopyRectToArray %p,%d,%d,%p,%d,%d,%d,%d:", vSrc, sw, sh, vDst, dw, dh, dx, dy);
+	TRACE("ShArray.CopyRectToArray %p,%d,%d,%p,%d,%d,%d,%d:", vSrc, sw, sh, vDst, dw, dh, dx, dy);
 	
 	vDst += (dy * dw + dx);
 	for (y = 0; y < sh; y++) {
@@ -1272,7 +1272,7 @@ static void ChangeSecretArray(void) { /* 53 */
 	int *vResult = getCaliVariable();
 	static uint16_t key[4] = { 0x7A7A, 0xADAD, 0xBCBC, 0xCECE }; /* key */
 	
-	DEBUG_COMMAND("ShArray.ChangeSecretArray %p,%d,%d,%p:", vAry, cnt, type, vResult);
+	TRACE("ShArray.ChangeSecretArray %p,%d,%d,%p:", vAry, cnt, type, vResult);
 	
 	*vResult = 0;
 	
diff --git a/modules/ShCalc/ShCalc.c b/modules/ShCalc/ShCalc.c
index 0bdf192..e7ff140 100644
--- a/modules/ShCalc/ShCalc.c
+++ b/modules/ShCalc/ShCalc.c
@@ -62,7 +62,7 @@ static void SetIntNumBase(void) { /* 0 */
 	
 	numbase = base;
 	
-	DEBUG_COMMAND("ShCalc.SetIntNumBase %d:", base);
+	TRACE("ShCalc.SetIntNumBase %d:", base);
 	
 }
 
@@ -76,13 +76,13 @@ static void SetIntNum16(void) { /* 1 */
 	
 	l_1000A0D8 = mul64(*var, numbase);
 	
-	DEBUG_COMMAND("ShCalc.SetIntNum16 %p:", var);
+	TRACE("ShCalc.SetIntNum16 %p:", var);
 }
 
 static void SetIntNum32(void) { /* 2 */
 	int p1 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("ShCalc.SetIntNum32: %d:", p1);
+	TRACE_UNIMPLEMENTED("ShCalc.SetIntNum32: %d:", p1);
 }
 
 static void GetIntNum16(void) { /* 3 */
@@ -102,13 +102,13 @@ static void GetIntNum16(void) { /* 3 */
 	
 	*var = i;
 	
-	DEBUG_COMMAND("ShCalc.GetIntNum16 %d:", var);
+	TRACE("ShCalc.GetIntNum16 %d:", var);
 }
 
 static void GetIntNum32(void) { /* 4 */
 	int p1 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("ShCalc.GetIntNum32: %d:", p1);
+	TRACE_UNIMPLEMENTED("ShCalc.GetIntNum32: %d:", p1);
 }
 
 static void AddIntNum16(void) { /* 5 */
@@ -121,25 +121,25 @@ static void AddIntNum16(void) { /* 5 */
 	
 	l_1000A0D8 += mul64(*var, numbase);
 	
-	DEBUG_COMMAND("ShCalc.AddIntNum16 %p:", var);
+	TRACE("ShCalc.AddIntNum16 %p:", var);
 }
 
 static void AddIntNum32(void) { /* 6 */
 	int p1 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("ShCalc.AddIntNum32: %d:", p1);
+	TRACE_UNIMPLEMENTED("ShCalc.AddIntNum32: %d:", p1);
 }
 
 static void SubIntNum16(void) { /* 7 */
 	int p1 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("ShCalc.SubIntNum16: %d:", p1);
+	TRACE_UNIMPLEMENTED("ShCalc.SubIntNum16: %d:", p1);
 }
 
 static void SubIntNum32(void) { /* 8 */
 	int p1 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("ShCalc.SubIntNum32: %d:", p1);
+	TRACE_UNIMPLEMENTED("ShCalc.SubIntNum32: %d:", p1);
 }
 
 static void MulIntNum16(void) {  /* 9 */
@@ -152,13 +152,13 @@ static void MulIntNum16(void) {  /* 9 */
 	
 	l_1000A0D8 *= mul64(*var, numbase);
 	
-	DEBUG_COMMAND("ShCalc.MulIntNum16: %p:", var);
+	TRACE("ShCalc.MulIntNum16: %p:", var);
 }
 
 static void MulIntNum32(void) {  /* 10 */
 	int p1 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("ShCalc.MulIntNum32: %d:", p1);
+	TRACE_UNIMPLEMENTED("ShCalc.MulIntNum32: %d:", p1);
 }
 
 static void DivIntNum16(void) { /* 11 */
@@ -175,13 +175,13 @@ static void DivIntNum16(void) { /* 11 */
 	i = mul64(l_1000A0C8, numbase);
 	l_1000A0D8 = div64(l_1000A0D8, i);
 	
-	DEBUG_COMMAND("ShCalc.DivIntNum16 %p:", var);
+	TRACE("ShCalc.DivIntNum16 %p:", var);
 }
 
 static void DivIntNum32(void) { /* 12 */
 	int p1 = getCaliValue();
 
-	DEBUG_COMMAND_YET("ShCalc.DivIntNum32: %d:", p1);
+	TRACE_UNIMPLEMENTED("ShCalc.DivIntNum32: %d:", p1);
 }
 
 static void CmpIntNum16(void) { /* 13 */
@@ -189,7 +189,7 @@ static void CmpIntNum16(void) { /* 13 */
 	int p2 = getCaliValue();
 	int p3 = getCaliValue();
 
-	DEBUG_COMMAND_YET("ShCalc.CmpIntNum16: %d,%d,%d:", p1, p2, p3);
+	TRACE_UNIMPLEMENTED("ShCalc.CmpIntNum16: %d,%d,%d:", p1, p2, p3);
 }
 
 static void CmpIntNum32(void) { /* 14 */
@@ -197,7 +197,7 @@ static void CmpIntNum32(void) { /* 14 */
 	int p2 = getCaliValue();
 	int p3 = getCaliValue();
 
-	DEBUG_COMMAND_YET("ShCalc.CmpIntNum32: %d,%d,%d:", p1, p2, p3);
+	TRACE_UNIMPLEMENTED("ShCalc.CmpIntNum32: %d,%d,%d:", p1, p2, p3);
 }
 	
 static void GetLengthNum16(void) { /* 15 */
@@ -221,14 +221,14 @@ static void GetLengthNum16(void) { /* 15 */
 		*vResult = 1;
 	}
 	
-	DEBUG_COMMAND("ShCalc.GetLengthNum16 %p,%p:", var, vResult);
+	TRACE("ShCalc.GetLengthNum16 %p,%p:", var, vResult);
 }
 
 static void GetLengthNum32(void) { /* 16 */
 	int p1 = getCaliValue();
 	int p2 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("ShCalc.GetLengthNum32: %d,%d:", p1, p2);
+	TRACE_UNIMPLEMENTED("ShCalc.GetLengthNum32: %d,%d:", p1, p2);
 }
 
 static void NumToRate(void) { /* 17 */
@@ -259,7 +259,7 @@ static void NumToRate(void) { /* 17 */
 	
 	*vResult = i;
 	
-	DEBUG_COMMAND("ShCalc.NumToRate %d,%d,%d,%d,%p:", p1, p2, p3, flag, vResult);
+	TRACE("ShCalc.NumToRate %d,%d,%d,%d,%p:", p1, p2, p3, flag, vResult);
 	
 }
 
@@ -291,7 +291,7 @@ static void NumToRateNum(void) { /* 18 */
 	
 	*vResult = i;
 	
-	DEBUG_COMMAND("ShCalc.NumToRateNum %d,%d,%d,%d,%p:", p1, p2, p3, flag, vResult);
+	TRACE("ShCalc.NumToRateNum %d,%d,%d,%d,%p:", p1, p2, p3, flag, vResult);
 }
 
 static void SetRandomSeed() {
@@ -304,7 +304,7 @@ static void SetRandomSeed() {
 
 	sgenrand(seed);
 	
-	DEBUG_COMMAND("ShCalc.SetRandomSeed %d:", seed);
+	TRACE("ShCalc.SetRandomSeed %d:", seed);
 }
 
 static void GetRandomNumA() {
@@ -317,7 +317,7 @@ static void GetRandomNumA() {
 		*var = (int)(genrand() * num) + 1;
 	}
 	
-	DEBUG_COMMAND("ShCalc.GetRandomNumA %d,%p:", num, var);
+	TRACE("ShCalc.GetRandomNumA %d,%p:", num, var);
 }
 
 static void NumToBit() {
@@ -339,7 +339,7 @@ static void NumToBit() {
 		*var = 0;
 	}
 
-	DEBUG_COMMAND("ShCalc.NumToBit %d,%p:", beki, var);
+	TRACE("ShCalc.NumToBit %d,%p:", beki, var);
 }
 
 static void BitToNum() {
@@ -358,7 +358,7 @@ static void BitToNum() {
 	int *var = getCaliVariable();
 	int i;
 	
-	DEBUG_COMMAND("ShCalc.BitToNum %d,%p:", val, var);
+	TRACE("ShCalc.BitToNum %d,%p:", val, var);
 	
 	if (val == 0) {
 		*var = 0;
diff --git a/modules/ShGraph/ShGraph.c b/modules/ShGraph/ShGraph.c
index 0556d5a..c7024b0 100644
--- a/modules/ShGraph/ShGraph.c
+++ b/modules/ShGraph/ShGraph.c
@@ -96,13 +96,13 @@ static void Init() {
 	*/
 	int p1 = getCaliValue(); /* ISurface */
 	
-	DEBUG_COMMAND("ShGraph.Init %d:", p1);
+	TRACE("ShGraph.Init %d:", p1);
 }
 
 static void GetSurfaceData() {
 	int p1 = getCaliValue(); /* ISurface */
 	
-	DEBUG_COMMAND_YET("ShGraph.GetSurfaceData %d:", p1);
+	TRACE_UNIMPLEMENTED("ShGraph.GetSurfaceData %d:", p1);
 }
 
 static void ChangeEquColor() {
@@ -114,7 +114,7 @@ static void ChangeEquColor() {
 	int *p6 = getCaliVariable();
 	int p7 = getCaliValue(); /* ISurface */
 	
-	DEBUG_COMMAND_YET("ShGraph.ChangeEquColor %d,%d,%d,%d,%p,%p,%d:", p1, p2, p3, p4, p5, p6, p7);
+	TRACE_UNIMPLEMENTED("ShGraph.ChangeEquColor %d,%d,%d,%d,%p,%p,%d:", p1, p2, p3, p4, p5, p6, p7);
 }
 
 static void ChangeNotColor() {
@@ -139,7 +139,7 @@ static void ChangeNotColor() {
 	int x, y;
 	uint8_t *dp;
 	
-	DEBUG_COMMAND("ShGraph.ChangeNotColor %d,%d,%d,%d,%p,%p,%d:", x0, y0, width, height, src, dst, p7);
+	TRACE("ShGraph.ChangeNotColor %d,%d,%d,%d,%p,%p,%d:", x0, y0, width, height, src, dst, p7);
 	
 	ags_check_param(&x0, &y0, &width, &height);
 	
@@ -222,7 +222,7 @@ static void ResetAnimeData() {
 	*/
 	int no = getCaliValue();
 	
-	DEBUG_COMMAND("ShGraph.ResetAnimeData %d:", no);
+	TRACE("ShGraph.ResetAnimeData %d:", no);
 	
 	if (no > 0 && no <= SLOT) {
 		memset(&src[no-1], 0, sizeof(struct animsrc));
@@ -262,7 +262,7 @@ static void SetAnimeSrc() {
 	int *pal = getCaliVariable();
 	int r, g, b;
 	
-	DEBUG_COMMAND("ShGraph.SetAnimeSrc %d,%d,%d,%d,%d,%d,%d,%p:", no, x0, y0, w, h, uw, uh, pal);
+	TRACE("ShGraph.SetAnimeSrc %d,%d,%d,%d,%d,%d,%d,%p:", no, x0, y0, w, h, uw, uh, pal);
 
 	if (no <= 0 || no > SLOT) return;
 	
@@ -302,7 +302,7 @@ static void SetAnimeDst() {
 	int p5 = getCaliValue();
 	int p6 = getCaliValue();
 	
-	DEBUG_COMMAND("ShGraph.SetAnimeDst %d,%p,%p,%d,%d,%d,%d:", no, p1, p2, p3, p4, p5, p6);
+	TRACE("ShGraph.SetAnimeDst %d,%p,%p,%d,%d,%d,%d:", no, p1, p2, p3, p4, p5, p6);
 	
 	if (no <= 0 || no > SLOT) return;
 	
@@ -336,7 +336,7 @@ static void AddAnimeData() {
 	int p6 = getCaliValue();
 	int i;
 	
-	DEBUG_COMMAND("ShGraph.AddAnimeData %d,%d,%d,%d,%p,%d:", no, p2, p3, p4, p5, p6);
+	TRACE("ShGraph.AddAnimeData %d,%d,%d,%d,%p,%d:", no, p2, p3, p4, p5, p6);
 	
 	if (no <= 0 || no > SLOT) return;
 	
@@ -370,7 +370,7 @@ static void AddAnimeRemain() {
 	int no = getCaliValue();
 	int i, _max = 0;
 	
-       	DEBUG_COMMAND("ShGraph.AddAnimeRemain %d:", no);
+       	TRACE("ShGraph.AddAnimeRemain %d:", no);
 	
 	if (no <= 0 || no > SLOT) return;
 	
@@ -401,7 +401,7 @@ static void SetAnimeRect() {
 	int w = getCaliValue();
 	int h = getCaliValue();
 	
-	DEBUG_COMMAND("ShGraph.SetAnimeRect %d,%d,%d,%d:", x, y, w, h);
+	TRACE("ShGraph.SetAnimeRect %d,%d,%d,%d:", x, y, w, h);
 	
 	maprect.x = x;
 	maprect.y = y;
@@ -427,7 +427,7 @@ static void SetAnimeBack() {
 	int p5 = getCaliValue();
 	int p6 = getCaliValue();
 	
-	DEBUG_COMMAND("ShGraph.SetAnimeBack %d,%d,%d,%d,%d,%d:", sx, sy, w, h, p5, p6);
+	TRACE("ShGraph.SetAnimeBack %d,%d,%d,%d,%d,%d:", sx, sy, w, h, p5, p6);
 
 	mapback.x = sx;
 	mapback.y = sy;
@@ -455,7 +455,7 @@ static void PlayAnimeData() {
 	boolean is_backcopied;
 	agsurface_t *dib;
 	
-	DEBUG_COMMAND("ShGraph.PlayAnimeData %d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6);
+	TRACE("ShGraph.PlayAnimeData %d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6);
 	
 	interval = p2 * 10;
 	
diff --git a/modules/ShPort/ShPort.c b/modules/ShPort/ShPort.c
index dd01bab..481e779 100644
--- a/modules/ShPort/ShPort.c
+++ b/modules/ShPort/ShPort.c
@@ -60,7 +60,7 @@ static void OutputMessageBox(void) { /* 0 */
 	free(title_utf8);
 	free(msg_utf8);
 
-	DEBUG_COMMAND("ShPort.OutputMessageBox: %d,%d,%d,%d,%p,%d:", p1, p2, title, msg, res, ISys3xSystem);
+	TRACE("ShPort.OutputMessageBox: %d,%d,%d,%d,%p,%d:", p1, p2, title, msg, res, ISys3xSystem);
 }
 
 static void InputListNum(void) { /* 1 */
@@ -88,7 +88,7 @@ static void InputListNum(void) { /* 1 */
 	}
 
 	free(ni_param.title);
-	DEBUG_COMMAND("ShPort.InputListNum: %d,%d,%p,%d,%d,%p,%d:", flags, title, val, minval, maxval, res, ISys3xSystem);
+	TRACE("ShPort.InputListNum: %d,%d,%p,%d,%d,%p,%d:", flags, title, val, minval, maxval, res, ISys3xSystem);
 }
 
 /**
@@ -99,7 +99,7 @@ static void InputListNum(void) { /* 1 */
 static void Init(void) {
 	int p1 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("ShPort.Init: %d:", p1);
+	TRACE_UNIMPLEMENTED("ShPort.Init: %d:", p1);
 }
 
 /**
@@ -121,7 +121,7 @@ static void InitKeyStatus(void) {
 		memset(keymap[no -1], 0, 256);
 	}
 	
-	DEBUG_COMMAND("ShPort.InitKeyStatus: %d:", no);
+	TRACE("ShPort.InitKeyStatus: %d:", no);
 }
 
 /**
@@ -143,7 +143,7 @@ static void SetKeyStatus(void) {
 	
 	keymap[no -1][key] = func;
 	
-	DEBUG_COMMAND("ShPort.SetKeyStatus: %d,%d,%d:", no, key, func);
+	TRACE("ShPort.SetKeyStatus: %d,%d,%d:", no, key, func);
 }
 
 /**
@@ -167,7 +167,7 @@ static void GetKeyStatus(void) {
 		*var |= (keymap[no -1][i] * RawKeyInfo[i]);
 	}
 	
-	DEBUG_COMMAND("ShPort.GetKeyStatus: %d,%p:", no, var);
+	TRACE("ShPort.GetKeyStatus: %d,%p:", no, var);
 }
 
 static void InputListString(void) {
@@ -179,7 +179,7 @@ static void InputListString(void) {
 	int p6 = getCaliValue();
 	int p7 = getCaliValue();
 
-	DEBUG_COMMAND_YET("ShPort.InputListString: %d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p3, p4, p5, p6, p7);
+	TRACE_UNIMPLEMENTED("ShPort.InputListString: %d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p3, p4, p5, p6, p7);
 }
 
 static void InputOpenFile(void) {
@@ -191,7 +191,7 @@ static void InputOpenFile(void) {
 	int p6 = getCaliValue();
 	int p7 = getCaliValue();
 
-	DEBUG_COMMAND_YET("ShPort.InputOpenFile: %d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p3, p4, p5, p6, p7);
+	TRACE_UNIMPLEMENTED("ShPort.InputOpenFile: %d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p3, p4, p5, p6, p7);
 }
 
 static void InputSaveFile(void) {
@@ -203,7 +203,7 @@ static void InputSaveFile(void) {
 	int p6 = getCaliValue();
 	int p7 = getCaliValue();
 
-	DEBUG_COMMAND_YET("ShPort.InputSaveFile: %d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p3, p4, p5, p6, p7);
+	TRACE_UNIMPLEMENTED("ShPort.InputSaveFile: %d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p3, p4, p5, p6, p7);
 }
 
 static const ModuleFunc functions[] = {
diff --git a/modules/ShSound/ShSound.c b/modules/ShSound/ShSound.c
index 4e9bca6..170e5b8 100644
--- a/modules/ShSound/ShSound.c
+++ b/modules/ShSound/ShSound.c
@@ -54,7 +54,7 @@ static void Init() {
 	*/
 	int p1 = getCaliValue(); /* ISys3x */
 	
-	DEBUG_COMMAND("ShSound.Init %d:", p1);
+	TRACE("ShSound.Init %d:", p1);
 }
 
 static void wavLoad() {
@@ -67,7 +67,7 @@ static void wavLoad() {
 	int slot = getCaliValue();
 	int no   = getCaliValue();
 	
-	DEBUG_COMMAND("ShSound.wavLoad %d,%d:", slot, no);
+	TRACE("ShSound.wavLoad %d,%d:", slot, no);
 	
 	mus_wav_load(slot, no);
 }
@@ -82,7 +82,7 @@ static void wavUnload() {
 	
 	mus_wav_unload(slot);
 	
-	DEBUG_COMMAND("ShSound.wavUnload %d:",slot);
+	TRACE("ShSound.wavUnload %d:",slot);
 }
 
 static void wavUnloadRange() {
@@ -100,7 +100,7 @@ static void wavUnloadRange() {
 		mus_wav_unload(i);
 	}
 	
-	DEBUG_COMMAND("ShSound.wavUnloadRange %d,%d:", slot, range);
+	TRACE("ShSound.wavUnloadRange %d,%d:", slot, range);
 }
 
 static void wavUnloadAll() {
@@ -113,7 +113,7 @@ static void wavUnloadAll() {
 		mus_wav_unload(i);
 	}
 	
-	DEBUG_COMMAND("ShSound.wavUnloadAll:");
+	TRACE("ShSound.wavUnloadAll:");
 }
 
 static void wavLoadMemory() {
@@ -142,7 +142,7 @@ static void wavLoadMemory() {
 		return;
 	}
 	
-	DEBUG_COMMAND("ShSound.wavLoadMemory %d:", no);
+	TRACE("ShSound.wavLoadMemory %d:", no);
 }
 
 static void wavSendMemory() {
@@ -186,7 +186,7 @@ static void wavSendMemory() {
 	free_memory_wav();
 	free(wav_buf);
 	
-	DEBUG_COMMAND("ShSound.wavSendMemory %d:", slot);
+	TRACE("ShSound.wavSendMemory %d:", slot);
 }
 
 static void wavFadeVolumeMemory() {
@@ -220,7 +220,7 @@ static void wavFadeVolumeMemory() {
 	// 残りは無音
 	memset(buf, 0, memwav.buf + memwav.len - (uint8_t*)buf);
 	
-	DEBUG_COMMAND("ShSound.wavFadeVolumeMemory %d,%d:", start, range);
+	TRACE("ShSound.wavFadeVolumeMemory %d,%d:", start, range);
 }
 
 static void wavReversePanMemory() {
@@ -240,7 +240,7 @@ static void wavReversePanMemory() {
 		buf += 2;
 	}
 	
-	DEBUG_COMMAND("ShSound.wavReversePanMemory:");
+	TRACE("ShSound.wavReversePanMemory:");
 }
 
 static void wavPlay() {
@@ -255,7 +255,7 @@ static void wavPlay() {
 	
 	mus_wav_play(slot, loop == 0 ? 1 : -1);
 	
-	DEBUG_COMMAND("ShSound.wavPlay %d, %d:", slot, loop);
+	TRACE("ShSound.wavPlay %d, %d:", slot, loop);
 }
 
 static void wavPlayRing() {
@@ -273,7 +273,7 @@ static void wavPlayRing() {
 	mus_wav_play(start + (*cur % cnt), 1);
 	*cur = (*cur + 1) % cnt;
 	
-	DEBUG_COMMAND("ShSound.wavPlayRing %d,%d,%d:", start, cnt, *cur);
+	TRACE("ShSound.wavPlayRing %d,%d,%d:", start, cnt, *cur);
 }
 
 static void wavStop() {
@@ -284,7 +284,7 @@ static void wavStop() {
 	*/
 	int slot = getCaliValue();
 	
-	DEBUG_COMMAND("ShSound.wavStop %d:", slot);
+	TRACE("ShSound.wavStop %d:", slot);
 	
 	mus_wav_stop(slot);
 }
@@ -299,7 +299,7 @@ static void wavStopAll() {
 		mus_wav_stop(i);
 	}
 	
-	DEBUG_COMMAND("ShSound.wavStopAll:");
+	TRACE("ShSound.wavStopAll:");
 }
 
 static void wavPause() {
@@ -310,7 +310,7 @@ static void wavPause() {
 	*/
 	int slot = getCaliValue();
 	
-	DEBUG_COMMAND_YET("ShSound.wavPause %d:", slot);
+	TRACE_UNIMPLEMENTED("ShSound.wavPause %d:", slot);
 }
 
 static void wavIsPlay() {
@@ -325,7 +325,7 @@ static void wavIsPlay() {
 	
 	*result = mus_wav_get_playposition(slot);
 	
-	DEBUG_COMMAND("ShSound.wavIsPlay %d,%p:", slot, result);
+	TRACE("ShSound.wavIsPlay %d,%p:", slot, result);
 }
 
 static void wavIsPlayRange() {
@@ -347,7 +347,7 @@ static void wavIsPlayRange() {
 	
 	*result = ret;
 	
-	DEBUG_COMMAND("ShSound.wavIsPlayRange %d,%d,%p:", slot, range, result);
+	TRACE("ShSound.wavIsPlayRange %d,%d,%p:", slot, range, result);
 }
 
 static const ModuleFunc functions[] = {
diff --git a/modules/ShString/ShString.c b/modules/ShString/ShString.c
index 3ffb4b5..1f97b10 100644
--- a/modules/ShString/ShString.c
+++ b/modules/ShString/ShString.c
@@ -46,35 +46,35 @@ static void ExchangeString(void) {
 	int pat    = getCaliValue();
 	int patr   = getCaliValue();
 	svar_replaceAll(target, pat, patr);
-	DEBUG_COMMAND("ShString.ExchangeString: %d,%d,%d:", target, pat, patr);
+	TRACE("ShString.ExchangeString: %d,%d,%d:", target, pat, patr);
 }
 
 static void SetNum16String(void) { /* 1 */
 	int p1 = getCaliValue();
 	int p2 = getCaliValue();
 
-	DEBUG_COMMAND_YET("ShString.SetNum16String: %d,%d:", p1, p2);
+	TRACE_UNIMPLEMENTED("ShString.SetNum16String: %d,%d:", p1, p2);
 }
 
 static void SetNum16HalfString(void) { /* 2 */
 	int p1 = getCaliValue();
 	int p2 = getCaliValue();
 
-	DEBUG_COMMAND_YET("ShString.SetNum16HalfString: %d,%d:", p1, p2);
+	TRACE_UNIMPLEMENTED("ShString.SetNum16HalfString: %d,%d:", p1, p2);
 }
 
 static void SetNum32String(void) { /* 3 */
 	int p1 = getCaliValue();
 	int p2 = getCaliValue();
 
-	DEBUG_COMMAND_YET("ShString.SetNum32String: %d,%d:", p1, p2);
+	TRACE_UNIMPLEMENTED("ShString.SetNum32String: %d,%d:", p1, p2);
 }
 
 static void SetNum32HalfString(void) { /* 4 */
 	int p1 = getCaliValue();
 	int p2 = getCaliValue();
 
-	DEBUG_COMMAND_YET("ShString.SetNum32HalfString: %d,%d:", p1, p2);
+	TRACE_UNIMPLEMENTED("ShString.SetNum32HalfString: %d,%d:", p1, p2);
 }
 
 static void GetArrayString(void) { /* 5 */
@@ -82,7 +82,7 @@ static void GetArrayString(void) { /* 5 */
 	int p2 = getCaliValue();
 	int p3 = getCaliValue();
 
-	DEBUG_COMMAND_YET("ShString.GetArrayString: %d,%d,%d:", p1, p2, p3);
+	TRACE_UNIMPLEMENTED("ShString.GetArrayString: %d,%d,%d:", p1, p2, p3);
 }
 
 static void SetWindowTitle(void) { /* 6 */
@@ -93,7 +93,7 @@ static void SetWindowTitle(void) { /* 6 */
 	ags_setWindowTitle(title_utf8);
 	free(title_utf8);
 	
-	DEBUG_COMMAND("ShString.SetWindowTitle: %d,%d:", strno, p2);
+	TRACE("ShString.SetWindowTitle: %d,%d:", strno, p2);
 }
 
 static void FillString() {
@@ -115,7 +115,7 @@ static void FillString() {
 			svar_set(st + i, svar_get(src));
 	}
 	
-	DEBUG_COMMAND("ShString.FillString: %d,%d,%d,%d:", st, cnt, src, p4);
+	TRACE("ShString.FillString: %d,%d,%d,%d:", st, cnt, src, p4);
 }
 
 static void SetStringNum16(void) {
@@ -132,7 +132,7 @@ static void SetStringNum16(void) {
 	char _dst[100];
 	char *dst = _dst;
 	
-	DEBUG_COMMAND("ShString.SetStringNum16: %d,%p:", st, var);
+	TRACE("ShString.SetStringNum16: %d,%p:", st, var);
 	
 	
 	while(*str) {
@@ -162,7 +162,7 @@ static void SetStringNum32(void) {
 	int p1 = getCaliValue();
 	int *p2 = getCaliVariable();
 	
-	DEBUG_COMMAND_YET("ShString.SetStringNum32: %d,%p:", p1, p2);
+	TRACE_UNIMPLEMENTED("ShString.SetStringNum32: %d,%p:", p1, p2);
 }
 
 static const ModuleFunc functions[] = {
diff --git a/modules/dDemo/dDemo.c b/modules/dDemo/dDemo.c
index 4c25acd..777d349 100644
--- a/modules/dDemo/dDemo.c
+++ b/modules/dDemo/dDemo.c
@@ -29,24 +29,24 @@ static void Init() {
 	dd.alk = alk_new("/home/masaki-c/game/daiakuji/dDemo.alk");
 #endif
 	
-	DEBUG_COMMAND_YET("dDemo.Init %d,%d,%d,%p:", p1, p2, p3, var);
+	TRACE_UNIMPLEMENTED("dDemo.Init %d,%d,%d,%p:", p1, p2, p3, var);
 }
 
 static void SetKeyCancelFlag() {
 	int cancelflag = getCaliValue();
 	
-	DEBUG_COMMAND_YET("dDemo.SetKeyCancelFlag %d:", cancelflag);
+	TRACE_UNIMPLEMENTED("dDemo.SetKeyCancelFlag %d:", cancelflag);
 }
 
 static void SetLoopFlag() {
 	/* Loop Flag */
 	int loopflag = getCaliValue(); /* 0 なら無限繰り返し */
 	
-	DEBUG_COMMAND_YET("dDemo.SetLoopFlag %d:", loopflag);
+	TRACE_UNIMPLEMENTED("dDemo.SetLoopFlag %d:", loopflag);
 }
 
 static void Run() {
-	DEBUG_COMMAND_YET("dDemo.Run:");
+	TRACE_UNIMPLEMENTED("dDemo.Run:");
 	
 #ifdef DDEMODEV
 	muscd_start(13, 1);
diff --git a/modules/eDemo/eDemo.c b/modules/eDemo/eDemo.c
index 7bb1af1..02c21e7 100644
--- a/modules/eDemo/eDemo.c
+++ b/modules/eDemo/eDemo.c
@@ -17,31 +17,31 @@ static void Init() {
         
         *var = 1;
         
-        DEBUG_COMMAND_YET("eDEMO.Init %d,%d,%d,%p:", p1, p2, p3, var);
+        TRACE_UNIMPLEMENTED("eDEMO.Init %d,%d,%d,%p:", p1, p2, p3, var);
 }
 
 static void SetKeyCancelFlag() {
         int cancelflag = getCaliValue();
         
-        DEBUG_COMMAND_YET("eDEMO.SetKeyCancelFlag %d:", cancelflag);
+        TRACE_UNIMPLEMENTED("eDEMO.SetKeyCancelFlag %d:", cancelflag);
 }
 
 static void SetLoopFlag() {
         /* Loop Flag */
         int loopflag = getCaliValue(); /* 0 なら無限繰り返し */
         
-        DEBUG_COMMAND_YET("eDEMO.SetLoopFlag %d:", loopflag);
+        TRACE_UNIMPLEMENTED("eDEMO.SetLoopFlag %d:", loopflag);
 }
 
 static void SetDrawStaffFlag() {
         /* Loop Flag */
         int staffflag = getCaliValue();
         
-        DEBUG_COMMAND_YET("eDEMO.SetDrawStaffFlag %d:", staffflag);
+        TRACE_UNIMPLEMENTED("eDEMO.SetDrawStaffFlag %d:", staffflag);
 }
 
 static void Run() {
-        DEBUG_COMMAND_YET("eDEMO.Run:");
+        TRACE_UNIMPLEMENTED("eDEMO.Run:");
 }
 
 static const ModuleFunc functions[] = {
diff --git a/modules/eeDemo/eeDemo.c b/modules/eeDemo/eeDemo.c
index 37164e9..df57037 100644
--- a/modules/eeDemo/eeDemo.c
+++ b/modules/eeDemo/eeDemo.c
@@ -17,26 +17,26 @@ static void Init() {
         
         *var = 1;
         
-        DEBUG_COMMAND_YET("eeDEMO.Init %d,%d,%d,%p:", p1, p2, p3, var);
+        TRACE_UNIMPLEMENTED("eeDEMO.Init %d,%d,%d,%p:", p1, p2, p3, var);
 }
 
 static void SetKeyCancelFlag() {
         int cancelflag = getCaliValue();
         
-        DEBUG_COMMAND_YET("eeDEMO.SetKeyCancelFlag %d:", cancelflag);
+        TRACE_UNIMPLEMENTED("eeDEMO.SetKeyCancelFlag %d:", cancelflag);
 }
 
 static void SetLoopFlag() {
         /* Loop Flag */
         int loopflag = getCaliValue(); /* 0 なら無限繰り返し */
         
-        DEBUG_COMMAND_YET("eeDEMO.SetLoopFlag %d:", loopflag);
+        TRACE_UNIMPLEMENTED("eeDEMO.SetLoopFlag %d:", loopflag);
 }
 
 static void Run() {
         int p1 = getCaliValue();
 	
-        DEBUG_COMMAND_YET("eeDEMO.Run %d:", p1);
+        TRACE_UNIMPLEMENTED("eeDEMO.Run %d:", p1);
 }
 
 static const ModuleFunc functions[] = {
diff --git a/modules/nDEMO/nDEMO.c b/modules/nDEMO/nDEMO.c
index 6a5395b..8557616 100644
--- a/modules/nDEMO/nDEMO.c
+++ b/modules/nDEMO/nDEMO.c
@@ -16,23 +16,23 @@ static void Init() {
 	
 	*var = 0;
 	
-	DEBUG_COMMAND_YET("nDEMO.Init %p:", var);
+	TRACE_UNIMPLEMENTED("nDEMO.Init %p:", var);
 }
 
 static void SetKeyCancelFlag() {
 	int p1 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("nDEMO.SetKeyCancelFlag %d:", p1);
+	TRACE_UNIMPLEMENTED("nDEMO.SetKeyCancelFlag %d:", p1);
 }
 
 static void SetLoopFlag() {
 	int p1 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("nDEMO.SetLoopFlag %d:", p1);
+	TRACE_UNIMPLEMENTED("nDEMO.SetLoopFlag %d:", p1);
 }
 
 static void Run() {
-	DEBUG_COMMAND_YET("nDEMO.Run:");
+	TRACE_UNIMPLEMENTED("nDEMO.Run:");
 }
 
 static const ModuleFunc functions[] = {
diff --git a/modules/nDEMOE/nDEMOE.c b/modules/nDEMOE/nDEMOE.c
index 98d443f..9e54c4a 100644
--- a/modules/nDEMOE/nDEMOE.c
+++ b/modules/nDEMOE/nDEMOE.c
@@ -14,17 +14,17 @@ static void Init() {
 	int p3 = getCaliValue();
 	int *var = getCaliVariable();
 	
-	DEBUG_COMMAND_YET("nDEMOE.Init %p:", var);
+	TRACE_UNIMPLEMENTED("nDEMOE.Init %p:", var);
 }
 
 static void SetKeyCancelFlag() {
 	int p1 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("nDEMOE.SetKeyCancelFlag %d:", p1);
+	TRACE_UNIMPLEMENTED("nDEMOE.SetKeyCancelFlag %d:", p1);
 }
 
 static void Run() {
-	DEBUG_COMMAND_YET("nDEMOE.Run:");
+	TRACE_UNIMPLEMENTED("nDEMOE.Run:");
 }
 
 static const ModuleFunc functions[] = {
diff --git a/modules/oDEMO/oDEMO.c b/modules/oDEMO/oDEMO.c
index 97b3e94..2e5d225 100644
--- a/modules/oDEMO/oDEMO.c
+++ b/modules/oDEMO/oDEMO.c
@@ -17,24 +17,24 @@ static void Init() {
 	
 	*var = 1;
 	
-	DEBUG_COMMAND_YET("oDEMO.Init %d,%d,%d,%p:", p1, p2, p3, var);
+	TRACE_UNIMPLEMENTED("oDEMO.Init %d,%d,%d,%p:", p1, p2, p3, var);
 }
 
 static void SetKeyCancelFlag() {
 	int cancelflag = getCaliValue();
 	
-	DEBUG_COMMAND_YET("oDEMO.SetKeyCancelFlag %d:", cancelflag);
+	TRACE_UNIMPLEMENTED("oDEMO.SetKeyCancelFlag %d:", cancelflag);
 }
 
 static void SetLoopFlag() {
 	/* Loop Flag */
 	int loopflag = getCaliValue(); /* 0 なら無限繰り返し */
 	
-	DEBUG_COMMAND_YET("oDEMO.SetLoopFlag %d:", loopflag);
+	TRACE_UNIMPLEMENTED("oDEMO.SetLoopFlag %d:", loopflag);
 }
 
 static void Run() {
-	DEBUG_COMMAND_YET("oDEMO.Run:");
+	TRACE_UNIMPLEMENTED("oDEMO.Run:");
 }
 
 static const ModuleFunc functions[] = {
diff --git a/modules/oujimisc/oujimisc.c b/modules/oujimisc/oujimisc.c
index 13d02f3..4158f0c 100644
--- a/modules/oujimisc/oujimisc.c
+++ b/modules/oujimisc/oujimisc.c
@@ -54,7 +54,7 @@ static void MakeMapSetParam() {
 	window_height = p3;
 	map_width = p4;
 
-	DEBUG_COMMAND("oujimisc.MakeMapSetParam %d,%d,%d,%d:", p1,p2,p3,p4);
+	TRACE("oujimisc.MakeMapSetParam %d,%d,%d,%d:", p1,p2,p3,p4);
 }
 
 static void MakeMapSetChipParam() {
@@ -74,7 +74,7 @@ static void MakeMapSetChipParam() {
 	r->w = p3;
 	r->h = p4;
 
-	DEBUG_COMMAND("oujimisc.MakeMapSeChipParam %d,%d,%d,%d,%d:", p1,p2,p3,p4,p5);
+	TRACE("oujimisc.MakeMapSeChipParam %d,%d,%d,%d,%d:", p1,p2,p3,p4,p5);
 }
 
 static void MakeMapDraw() {
@@ -106,13 +106,13 @@ static void MakeMapDraw() {
 		}
 	}
 
-	DEBUG_COMMAND("oujimisc.MakeMapDraw %d,%d,%d,%d,%d,%p,%p,%p:", p1,dstX,dstY,posX,posY,a1,a2,a3);
+	TRACE("oujimisc.MakeMapDraw %d,%d,%d,%d,%d,%p,%p,%p:", p1,dstX,dstY,posX,posY,a1,a2,a3);
 }
 
 static void MakeMapInit() {
 	int p1 = getCaliValue(); /* ISys3x */
 	
-	DEBUG_COMMAND_YET("oujimisc.MakeMapInit %d:", p1);
+	TRACE_UNIMPLEMENTED("oujimisc.MakeMapInit %d:", p1);
 }	
 
 static void DrawNumber() {
@@ -137,7 +137,7 @@ static void DrawNumber() {
 		dstX += width;
 	}
 
-	DEBUG_COMMAND("oujimisc.DrawNumber %d,%d,%d,%d,%d,%d,%d,%d:", p1,srcX,srcY,width,height,dstX,dstY,num);
+	TRACE("oujimisc.DrawNumber %d,%d,%d,%d,%d,%d,%d,%d:", p1,srcX,srcY,width,height,dstX,dstY,num);
 }
 
 static void TempMapCreateShadow() {
@@ -153,14 +153,14 @@ static void TempMapCreateShadow() {
 		ald_freedata(dfile);
 	}
 
-	DEBUG_COMMAND("oujimisc.TempMapCreateShadow:");
+	TRACE("oujimisc.TempMapCreateShadow:");
 }
 
 static void TempMapInit() {
 	int p1 = getCaliValue(); /* ISys3x */
 	int p2 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("oujimisc.TempMapInit %d,%d:", p1,p2);
+	TRACE_UNIMPLEMENTED("oujimisc.TempMapInit %d,%d:", p1,p2);
 }
 
 static void TempMapLoadToShadow() {
@@ -189,7 +189,7 @@ static void TempMapLoadToShadow() {
 	for (int i = 0; i < size; i++)
 		*a3++ = SDL_SwapLE16(*p++);
 
-	DEBUG_COMMAND("oujimisc.TempMapLoadToShadow %d,%p,%p,%p,%d:", map,a1,a2,a3,size);
+	TRACE("oujimisc.TempMapLoadToShadow %d,%p,%p,%p,%d:", map,a1,a2,a3,size);
 }
 
 static void TempMapSaveToShadow() {
@@ -218,7 +218,7 @@ static void TempMapSaveToShadow() {
 	for (int i = 0; i < size; i++)
 		*p++ = SDL_SwapLE16(*a3++);
 
-	DEBUG_COMMAND("oujimisc.TempMapSaveToShadow %d,%p,%p,%p,%d:", map,a1,a2,a3,size);
+	TRACE("oujimisc.TempMapSaveToShadow %d,%p,%p,%p,%d:", map,a1,a2,a3,size);
 }
 
 static void TempMapFileSave() {
@@ -250,7 +250,7 @@ static void TempMapFileSave() {
 	}
 	fclose(fp);
 
-	DEBUG_COMMAND("oujimisc.TempMapFileSave %d:", p1);
+	TRACE("oujimisc.TempMapFileSave %d:", p1);
 }
 
 static void TempMapFileLoad() {
@@ -292,7 +292,7 @@ static void TempMapFileLoad() {
 	}
 	fclose(fp);
 
-	DEBUG_COMMAND("oujimisc.TempMapFileLoad %d:", p1);
+	TRACE("oujimisc.TempMapFileLoad %d:", p1);
 }
 
 static void CalcMoveDiffer() {
@@ -322,7 +322,7 @@ static void CalcMoveDiffer() {
 
 	*pt = t >= duration ? 1 : 0;
 
-	DEBUG_COMMAND("oujimisc.CalcMoveDiffer %p,%p,%d,%d,%d,%d,%p,%d:", dx,dy,moveL,moveU,moveR,moveD,pt,duration);
+	TRACE("oujimisc.CalcMoveDiffer %p,%p,%d,%d,%d,%d,%p,%d:", dx,dy,moveL,moveU,moveR,moveD,pt,duration);
 }
 
 static const ModuleFunc functions[] = {
diff --git a/modules/tDemo/tDemo.c b/modules/tDemo/tDemo.c
index e18ad04..689093d 100644
--- a/modules/tDemo/tDemo.c
+++ b/modules/tDemo/tDemo.c
@@ -46,20 +46,20 @@ static void Init() {
 	
 	*var = 1;
 	
-	DEBUG_COMMAND("tDemo.Init %d,%d,%d,%p:", p1, p2, p3, var);
+	TRACE("tDemo.Init %d,%d,%d,%p:", p1, p2, p3, var);
 }
 
 static void SetKeyCancelFlag() {
 	int cancelflag = getCaliValue();
 	
-	DEBUG_COMMAND_YET("tDemo.SetKeyCancelFlag %d:", cancelflag);
+	TRACE_UNIMPLEMENTED("tDemo.SetKeyCancelFlag %d:", cancelflag);
 }
 
 static void SetLoopFlag() {
 	/* Loop Flag */
 	int loopflag = getCaliValue(); /* 0 なら無限繰り返し */
 	
-	DEBUG_COMMAND_YET("tDemo.SetLoopFlag %d:", loopflag);
+	TRACE_UNIMPLEMENTED("tDemo.SetLoopFlag %d:", loopflag);
 }
 
 static void Run() {
@@ -103,7 +103,7 @@ static void Run() {
 
 	alk_free(alk);
 
-	DEBUG_COMMAND("tDemo.Run:");
+	TRACE("tDemo.Run:");
 }
 
 static const ModuleFunc functions[] = {
diff --git a/src/cmd2F.c b/src/cmd2F.c
index a48273d..ad70f7d 100644
--- a/src/cmd2F.c
+++ b/src/cmd2F.c
@@ -66,13 +66,13 @@ static fncall_table fnctbl[FCTBL_MAX];
 void commands2F00() {
 	/* テキストカラーをスタックからポップして設定する */
 	sl_popState(STACK_TEXTCOLOR);
-	DEBUG_COMMAND("TOC:");
+	TRACE("TOC:");
 }
 
 void commands2F01() {
 	/* テキストフォントサイズをスタックからポップして設定する */
 	sl_popState(STACK_TEXTSIZE);
-	DEBUG_COMMAND("TOS:");
+	TRACE("TOS:");
 }
 
 void commands2F02() {
@@ -83,7 +83,7 @@ void commands2F02() {
 	case 1: sl_pushTextColor(type, nact->sel.MsgFontColor); break;
 	default: WARNING("TPC: unknown type %d", type); break;
 	}
-	DEBUG_COMMAND("TPC %d", exp);
+	TRACE("TPC %d", exp);
 }
 
 void commands2F03() {
@@ -94,13 +94,13 @@ void commands2F03() {
 	case 1: sl_pushTextSize(type, nact->sel.MsgFontSize); break;
 	default: WARNING("TPS: unknown type %d", type); break;
 	}
-	DEBUG_COMMAND("TPS %d", exp);
+	TRACE("TPS %d", exp);
 }
 
 void commands2F04() {
 	/* テキスト表示位置をスタックからポップして設定する */
 	sl_popState(STACK_TEXTLOC);
-	DEBUG_COMMAND("TOP:");
+	TRACE("TOP:");
 }
 
 void commands2F05() {
@@ -108,7 +108,7 @@ void commands2F05() {
 	MyPoint loc;
 	msg_getMessageLocation(&loc);
 	sl_pushTextLoc(loc.x, loc.y);
-	DEBUG_COMMAND("TPP:");
+	TRACE("TPP:");
 }
 
 void commands2F08() {
@@ -117,7 +117,7 @@ void commands2F08() {
 	
 	ags_setAntialiasedStringMode(exp == 1);
 	
-	DEBUG_COMMAND("TAA %d:", exp);
+	TRACE("TAA %d:", exp);
 }
 
 void commands2F09() {
@@ -126,7 +126,7 @@ void commands2F09() {
 
 	*var = ags_getAntialiasedStringMode() ? 1 : 0;
 	
-	DEBUG_COMMAND("TAB %d:", *var);
+	TRACE("TAB %d:", *var);
 }
 
 void commands2F0A() {
@@ -136,7 +136,7 @@ void commands2F0A() {
 
 	mus_wav_load(eCh, eLinkNum);
 	
-	DEBUG_COMMAND("wavLoad %d, %d:", eCh, eLinkNum);
+	TRACE("wavLoad %d, %d:", eCh, eLinkNum);
 }
 
 void commands2F0B() {
@@ -146,7 +146,7 @@ void commands2F0B() {
 
 	mus_wav_play(eCh, eLoopFlag);
 	
-	DEBUG_COMMAND("wavPlay %d, %d", eCh, eLoopFlag);
+	TRACE("wavPlay %d, %d", eCh, eLoopFlag);
 }
 
 void commands2F0C() {
@@ -154,7 +154,7 @@ void commands2F0C() {
 	
 	mus_wav_stop(eCh);
 	
-	DEBUG_COMMAND("wavStop %d", eCh);
+	TRACE("wavStop %d", eCh);
 }
 
 void commands2F0D() {
@@ -162,7 +162,7 @@ void commands2F0D() {
 	
 	mus_wav_unload(eCh);
 	
-	DEBUG_COMMAND("wavUnload %d:", eCh);
+	TRACE("wavUnload %d:", eCh);
 }
 
 void commands2F0E() {
@@ -172,7 +172,7 @@ void commands2F0E() {
 	
 	*vResult = ((pos == 0 || pos == 65535) ? 0 : 1);
 	
-	DEBUG_COMMAND("wavIsPlay %d, %d:", eCh, *vResult);
+	TRACE("wavIsPlay %d, %d:", eCh, *vResult);
 }
 
 void commands2F0F() {
@@ -183,7 +183,7 @@ void commands2F0F() {
 
 	mus_wav_fadeout_start(eCh, eTime, eVolume, eStopFlag);
 	
-	DEBUG_COMMAND("wavFade %d, %d, %d, %d:", eCh, eTime, eVolume, eStopFlag);
+	TRACE("wavFade %d, %d, %d, %d:", eCh, eTime, eVolume, eStopFlag);
 }
 
 void commands2F10() {
@@ -192,7 +192,7 @@ void commands2F10() {
 	
 	*vResult = (mus_wav_fadeout_get_state(eCh) ? 1 : 0);
 	
-	DEBUG_COMMAND("wavIsFade %d, %d:", eCh, *vResult);
+	TRACE("wavIsFade %d, %d:", eCh, *vResult);
 }
 
 void commands2F11() {
@@ -200,13 +200,13 @@ void commands2F11() {
 
 	mus_wav_fadeout_stop(eCh);
 	
-	DEBUG_COMMAND("wavStopFade %d:", eCh);
+	TRACE("wavStopFade %d:", eCh);
 }
 
 void commands2F12() {
 	const char *sText = sl_getString(0);
 	
-	DEBUG_COMMAND("trace %s:", sText);
+	TRACE("trace %s:", sText);
 
 }
 
@@ -216,11 +216,11 @@ void commands2F13() {
 	int eY = getCaliValue();
 	int eZ = getCaliValue();
 
-	DEBUG_COMMAND_YET("wav3DSetPos %d, %d, %d, %d:", eCh, eX, eY, eZ);
+	TRACE_UNIMPLEMENTED("wav3DSetPos %d, %d, %d, %d:", eCh, eX, eY, eZ);
 }
 
 void commands2F14() {
-	DEBUG_COMMAND_YET("wav3DCommit:");
+	TRACE_UNIMPLEMENTED("wav3DCommit:");
 }
 
 void commands2F15() {
@@ -232,7 +232,7 @@ void commands2F15() {
 	*eX = 0;
 	*eY = 0;
 	*eZ = 0;
-	DEBUG_COMMAND_YET("wav3DGetPos %d, %d, %d, %d:", eCh, *eX, *eY, *eZ);
+	TRACE_UNIMPLEMENTED("wav3DGetPos %d, %d, %d, %d:", eCh, *eX, *eY, *eZ);
 }
 
 void commands2F16() {
@@ -240,7 +240,7 @@ void commands2F16() {
 	int eY = getCaliValue();
 	int eZ = getCaliValue();
 	
-	DEBUG_COMMAND_YET("wav3DSetPosL %d, %d, %d:", eX, eY, eZ);
+	TRACE_UNIMPLEMENTED("wav3DSetPosL %d, %d, %d:", eX, eY, eZ);
 }
 
 void commands2F17() {
@@ -251,7 +251,7 @@ void commands2F17() {
 	*vX = 0;
 	*vY = 0;
 	*vZ = 0;
-	DEBUG_COMMAND_YET("wav3DGetPosL %d, %d, %d:%s", *vX, *vY, *vZ);
+	TRACE_UNIMPLEMENTED("wav3DGetPosL %d, %d, %d:%s", *vX, *vY, *vZ);
 }
 
 void commands2F18() {
@@ -261,7 +261,7 @@ void commands2F18() {
 	int eY = getCaliValue();
 	int eZ = getCaliValue();
 
-	DEBUG_COMMAND_YET("wav3DFadePos %d, %d, %d, %d, %d:", eCh, eTime, eX, eY, eZ);
+	TRACE_UNIMPLEMENTED("wav3DFadePos %d, %d, %d, %d, %d:", eCh, eTime, eX, eY, eZ);
 }
 
 void commands2F19() {
@@ -269,13 +269,13 @@ void commands2F19() {
 	int *vResult = getCaliVariable();
 
 	*vResult = 0;
-	DEBUG_COMMAND_YET("wav3DIsFadePos %d, %d:", eCh, *vResult);
+	TRACE_UNIMPLEMENTED("wav3DIsFadePos %d, %d:", eCh, *vResult);
 }
 
 void commands2F1A() {
 	int eCh = getCaliValue();
 
-	DEBUG_COMMAND_YET("wav3DStopFadePos %d:", eCh);
+	TRACE_UNIMPLEMENTED("wav3DStopFadePos %d:", eCh);
 }
 
 void commands2F1B() {
@@ -284,18 +284,18 @@ void commands2F1B() {
 	int eY = getCaliValue();
 	int eZ = getCaliValue();
 
-	DEBUG_COMMAND_YET("wav3DFadePosL %d, %d, %d, %d:", eTime, eX, eY, eZ);
+	TRACE_UNIMPLEMENTED("wav3DFadePosL %d, %d, %d, %d:", eTime, eX, eY, eZ);
 }
 
 void commands2F1C() {
 	int *vResult = getCaliVariable();
 	
 	*vResult = 0;
-	DEBUG_COMMAND_YET("wav3DIsFadePosL %d:", *vResult);
+	TRACE_UNIMPLEMENTED("wav3DIsFadePosL %d:", *vResult);
 }
 
 void commands2F1D() {
-	DEBUG_COMMAND_YET("wav3DStopFadePosL");
+	TRACE_UNIMPLEMENTED("wav3DStopFadePosL");
 }
 
 void commands2F1E() {
@@ -306,13 +306,13 @@ void commands2F1E() {
 		mus_pcm_start(eLinkNum , eLoop);
 	}
 	
-	DEBUG_COMMAND("sndPlay %d, %d:", eLinkNum, eLoop);
+	TRACE("sndPlay %d, %d:", eLinkNum, eLoop);
 }
 
 void commands2F1F() {
 	mus_pcm_stop(0);
 	
-	DEBUG_COMMAND("sndStop:");
+	TRACE("sndStop:");
 }
 
 void commands2F20() {
@@ -320,7 +320,7 @@ void commands2F20() {
 	
 	mus_pcm_get_playposition(vResult);
 	
-	DEBUG_COMMAND("sndIsPlay %d:", *vResult);
+	TRACE("sndIsPlay %d:", *vResult);
 }
 
 void commands2F21() {
@@ -338,7 +338,7 @@ void commands2F23() {
 	sysVar[0] = cg_load_with_filename(fname_utf8, x, y);
 	free(fname_utf8);
 	
-	DEBUG_COMMAND("LC(new) %d, %d, %s:", x, y, vFileName);
+	TRACE("LC(new) %d, %d, %s:", x, y, vFileName);
 }
 
 void commands2F24() {
@@ -368,7 +368,7 @@ void commands2F24() {
 	}
 	free(fname_utf8);
 	
-	DEBUG_COMMAND("LE(new) %d, %s, %d, %d:", type, file_name, var, cnt);
+	TRACE("LE(new) %d, %s, %d, %d:", type, file_name, var, cnt);
 }
 
 void commands2F25() {
@@ -376,7 +376,7 @@ void commands2F25() {
 	const char *title = sl_getString(0);
 	const char *filter = sl_getString(0);
 
-	DEBUG_COMMAND_YET("LXG %d, %s, %s:", file_name, title, filter);
+	TRACE_UNIMPLEMENTED("LXG %d, %s, %s:", file_name, title, filter);
 }
 
 void commands2F26() {
@@ -407,7 +407,7 @@ void commands2F26() {
 	free(t2);
 	free(t3);
 	
-	DEBUG_COMMAND("MI(new) %d, %d, %s:", dst_no, max_len, title);
+	TRACE("MI(new) %d, %d, %s:", dst_no, max_len, title);
 }
 
 void commands2F27() {
@@ -415,7 +415,7 @@ void commands2F27() {
 	const char *string = sl_getString(0);
 
 	svar_set(num, string);
-	DEBUG_COMMAND("MS(new) %d, %s:", num, string);
+	TRACE("MS(new) %d, %s:", num, string);
 }
 
 void commands2F28() {
@@ -429,7 +429,7 @@ void commands2F28() {
 
 	enable_hack_by_title(nact->game_title_utf8);
 
-	DEBUG_COMMAND("MT(new) %s:",title);
+	TRACE("MT(new) %s:",title);
 }
 
 /* defined in cmdn.c */
@@ -444,7 +444,7 @@ void commands2F29() {
 	t = toUTF8(title);
 	ni_param.title = t;
 	
-	DEBUG_COMMAND("NT(new) %s:", title);
+	TRACE("NT(new) %s:", title);
 }
 
 void commands2F2A() {
@@ -474,7 +474,7 @@ void commands2F2A() {
 	}
 	free(fname_utf8);
 
-	DEBUG_COMMAND("QE(new) %d, %s, %d, %d:", type, file_name, var, cnt);
+	TRACE("QE(new) %d, %s, %d, %d:", type, file_name, var, cnt);
 }
 
 void commands2F2B() {
@@ -482,7 +482,7 @@ void commands2F2B() {
 	const char *work_dir = sl_getString(0);
 	const char *file_name = sl_getString(0);
 
-	DEBUG_COMMAND_YET("UP(new) %d, %s, %s:", type, work_dir, file_name);
+	TRACE_UNIMPLEMENTED("UP(new) %d, %s, %s:", type, work_dir, file_name);
 }
 
 void commands2F2D() {
@@ -492,7 +492,7 @@ void commands2F2D() {
 	/* 該当する eCh が演奏中の場合 eTime だけ wait をいれる */
 	mus_wav_waittime(eCh, eTime);
 	
-	DEBUG_COMMAND("wavWaitTime %d, %d:", eCh, eTime);
+	TRACE("wavWaitTime %d, %d:", eCh, eTime);
 }
 
 void commands2F2E() {
@@ -501,7 +501,7 @@ void commands2F2E() {
 	
 	*vTime = mus_wav_get_playposition(eCh);
 	
-	DEBUG_COMMAND("wavGetPlayPos %d, %d:", eCh, *vTime);
+	TRACE("wavGetPlayPos %d, %d:", eCh, *vTime);
 }
 
 void commands2F2F() {
@@ -511,7 +511,7 @@ void commands2F2F() {
 	/* ただし、無限ループの場合は１回目終了時まで */
 	mus_wav_waitend(eCh);
 	
-	DEBUG_COMMAND("wavWaitEnd %d:", eCh);
+	TRACE("wavWaitEnd %d:", eCh);
 }
 
 void commands2F30() {
@@ -520,7 +520,7 @@ void commands2F30() {
 	
 	*vTime = mus_wav_wavtime(eCh);
 	
-	DEBUG_COMMAND("wavGetWavTime %d, %d:", eCh, *vTime);
+	TRACE("wavGetWavTime %d, %d:", eCh, *vTime);
 }
 
 void commands2F31() {
@@ -528,7 +528,7 @@ void commands2F31() {
 	int fIndex = sl_getaddr();
 	
 	sel_setCallback(1, fPage, fIndex);
-	DEBUG_COMMAND("menuSetCbkSelect page=%d, index=%x:", fPage, fIndex);
+	TRACE("menuSetCbkSelect page=%d, index=%x:", fPage, fIndex);
 }
 
 void commands2F32() {
@@ -536,24 +536,24 @@ void commands2F32() {
 	int fIndex = sl_getaddr();
 	
 	sel_setCallback(2, fPage, fIndex);
-	DEBUG_COMMAND("menuSetCbkCancel page=%d, index=%x:", fPage, fIndex);
+	TRACE("menuSetCbkCancel page=%d, index=%x:", fPage, fIndex);
 }
 
 void commands2F33() {
 	sel_setCallback(1, 0, 0);
-	DEBUG_COMMAND("menuClearCbkSelect:");
+	TRACE("menuClearCbkSelect:");
 }
 
 void commands2F34() {
 	sel_setCallback(2, 0, 0);
-	DEBUG_COMMAND("menuClearCbkCancel:");
+	TRACE("menuClearCbkCancel:");
 }
 
 void commands2F35() {
 	int eCh = getCaliValue();
 	int eMode = getCaliValue();
 	
-	DEBUG_COMMAND_YET("wav3DSetMode %d, %d:", eCh, eMode);
+	TRACE_UNIMPLEMENTED("wav3DSetMode %d, %d:", eCh, eMode);
 }
 
 void commands2F36() {
@@ -571,7 +571,7 @@ void commands2F36() {
 			   eDestX, eDestY, eDestWidth, eDestHeight, 0);
 	ags_updateArea(eDestX, eDestY, eDestWidth, eDestHeight);
 	
-	DEBUG_COMMAND("grCopyStrerch %d, %d, %d, %d, %d, %d, %d, %d, %d:",
+	TRACE("grCopyStrerch %d, %d, %d, %d, %d, %d, %d, %d, %d:",
 		      eDestX, eDestY, eDestWidth, eDestHeight,
 		      eSrcX, eSrcY, eSrcWidth, eSrcHeight, eMode);
 }
@@ -583,13 +583,13 @@ void commands2F37() {
 	int eHeight = getCaliValue();
 	int eType   = getCaliValue();
 	
-	DEBUG_COMMAND_YET("grFilterRect %d, %d, %d, %d, %d:",
+	TRACE_UNIMPLEMENTED("grFilterRect %d, %d, %d, %d, %d:",
 			  eX, eY, eWidth, eHeight, eType);
 }
 
 void commands2F38() {
 	sys_clearWheelInfo();
-	DEBUG_COMMAND("iptClearWheelCount:");
+	TRACE("iptClearWheelCount:");
 }
 
 void commands2F39() {
@@ -597,21 +597,21 @@ void commands2F39() {
 	int *vBack = getCaliVariable();
 	
 	sys_getWheelInfo(vForward, vBack);
-	DEBUG_COMMAND("iptGetWheelCount %d, %d:", *vForward, *vBack);
+	TRACE("iptGetWheelCount %d, %d:", *vForward, *vBack);
 }
 
 void commands2F3A() {
 	int *vSize = getCaliVariable();
 
 	*vSize = nact->sel.MsgFontSize;
-	DEBUG_COMMAND("menuGetFontSize %d:", *vSize);
+	TRACE("menuGetFontSize %d:", *vSize);
 }
 
 void commands2F3B() {
 	int *vSize = getCaliVariable();
 	
 	*vSize = nact->msg.MsgFontSize;
-	DEBUG_COMMAND("msgGetFontSize %d:", *vSize);
+	TRACE("msgGetFontSize %d:", *vSize);
 }	
 
 void commands2F3C() {
@@ -621,7 +621,7 @@ void commands2F3C() {
 	
 	*vResult = svar_getCharType(eNum, ePos);
 	
-	DEBUG_COMMAND("strGetCharType %d, %d, %d:", eNum, ePos, *vResult);
+	TRACE("strGetCharType %d, %d, %d:", eNum, ePos, *vResult);
 }
 
 void commands2F3D() {
@@ -630,17 +630,17 @@ void commands2F3D() {
 	
 	*vResult = svar_width(eNum);
 
-	DEBUG_COMMAND("strGetLengthASCII %d, %d:", eNum, *vResult);
+	TRACE("strGetLengthASCII %d, %d:", eNum, *vResult);
 }
 
 void commands2F3E() {
 	// no-op
-	DEBUG_COMMAND("sysWinMsgLock:");
+	TRACE("sysWinMsgLock:");
 }
 
 void commands2F3F() {
 	// no-op
-	DEBUG_COMMAND("sysWinMsgUnlock:");
+	TRACE("sysWinMsgUnlock:");
 }
 
 void commands2F40() {
@@ -650,7 +650,7 @@ void commands2F40() {
 	int *vResult = getCaliVariable();
 	int cnt = 0;
 	
-	DEBUG_COMMAND("aryCmpCount %d, %d, %d, %d:", *vAry, eCount, eNum, *vResult);
+	TRACE("aryCmpCount %d, %d, %d, %d:", *vAry, eCount, eNum, *vResult);
 	
 	while(eCount--) {
 		if (*vAry == eNum) cnt++;
@@ -668,7 +668,7 @@ void commands2F41() {
 	int *vResult = getCaliVariable();
 	int cnt = 0;
 	
-	DEBUG_COMMAND("aryCmpTrans %d, %d, %d, %d, %d, %d:", 
+	TRACE("aryCmpTrans %d, %d, %d, %d, %d, %d:", 
 		      *vAry, eNumof, eNum, eTransNum, eMaxTrans, *vResult);
 	
 	while(eNumof--) {
@@ -693,7 +693,7 @@ void commands2F42() {
 	int eSrcRate  = getCaliValue();
 	int eType     = getCaliValue();
 
-	DEBUG_COMMAND_YET("grBlendColorRect %d, %d, %d, %d, %d, %d, %d, %d, %d:",
+	TRACE_UNIMPLEMENTED("grBlendColorRect %d, %d, %d, %d, %d, %d, %d, %d, %d:",
 			  eDestX, eDestY, eWidth, eHeight, eDestRate,
 			  eSrcX, eSrcY, eSrcRate, eType);
 }
@@ -707,7 +707,7 @@ void commands2F43() {
 	sdl_fillCircle(eX, eY, eLength, eColor);
 	ags_updateArea(eX, eY, eLength, eLength);
 
-	DEBUG_COMMAND("grDrawFillCircle %d, %d, %d, %d:", eX, eY, eLength, eColor);
+	TRACE("grDrawFillCircle %d, %d, %d, %d:", eX, eY, eLength, eColor);
 }
 
 void commands2F44() {
@@ -718,7 +718,7 @@ void commands2F44() {
 
 	svar_set(num1, format_number(num2, fig, buf));
 	
-	DEBUG_COMMAND("MHH %d, %d, %d:", num1, fig, num2);
+	TRACE("MHH %d, %d, %d:", num1, fig, num2);
 }
 
 void commands2F45() {
@@ -728,12 +728,12 @@ void commands2F45() {
 	cb_sel_init_page    = fPage;
 	cb_sel_init_address = fIndex;
 	
-	DEBUG_COMMAND("menuSetCbkInit page=%d, index=%x:", fPage, fIndex);
+	TRACE("menuSetCbkInit page=%d, index=%x:", fPage, fIndex);
 }
 
 void commands2F46() {
 	cb_sel_init_page = 0;
-	DEBUG_COMMAND("menuClearCbkInit:");
+	TRACE("menuClearCbkInit:");
 }
 
 void commands2F47() {
@@ -741,34 +741,34 @@ void commands2F47() {
 		sl_jmpNear(sl_getIndex());
 		sl_callFar2(cb_sel_init_page -1, cb_sel_init_address);
 	}
-	DEBUG_COMMAND("new ]:");
+	TRACE("new ]:");
 }
 
 void commands2F48() {
 	const char *sText = sl_getString(0);
 	
-	DEBUG_COMMAND_YET("sysOpenShell %s:", sText);
+	TRACE_UNIMPLEMENTED("sysOpenShell %s:", sText);
 }
 
 void commands2F49() {
 	const char *sTitle = sl_getString(0);
 	const char *sUrl = sl_getString(0);
 	
-	DEBUG_COMMAND_YET("sysAddWebMenu %s, %s:", sTitle, sUrl);
+	TRACE_UNIMPLEMENTED("sysAddWebMenu %s, %s:", sTitle, sUrl);
 }
 
 void commands2F4A() {
 	int eTime = getCaliValue();
 	
 	ags_setCursorMoveTime(eTime);
-	DEBUG_COMMAND("iptSetMoveCursorTime %d:", eTime);
+	TRACE("iptSetMoveCursorTime %d:", eTime);
 }
 
 void commands2F4B() {
 	int *vTime = getCaliVariable();
 	
 	*vTime = ags_getCursorMoveTime();
-	DEBUG_COMMAND("iptGetMoveCursorTime %d:", *vTime);
+	TRACE("iptGetMoveCursorTime %d:", *vTime);
 }
 
 void commands2F4C() {
@@ -784,7 +784,7 @@ void commands2F4C() {
 	
 	sdl_updateArea(&r, &p);
 	
-	DEBUG_COMMAND("grBlt %d, %d, %d, %d, %d, %d:",
+	TRACE("grBlt %d, %d, %d, %d, %d, %d:",
 		      eX, eY, eSrcX, eSrcY, eWidth, eHeight);
 }
 
@@ -792,21 +792,21 @@ void commands2F4D() {
 	int eNum = getCaliValue();
 	const char *sText = sl_getString(0);
 
-	DEBUG_COMMAND_YET("LXWT %d, %s:", eNum, sText);
+	TRACE_UNIMPLEMENTED("LXWT %d, %s:", eNum, sText);
 }
 
 void commands2F4E() {
 	int eNum = getCaliValue();
 	int eTextNum = getCaliValue();
 
-	DEBUG_COMMAND_YET("LXWS %d, %d:", eNum, eTextNum);
+	TRACE_UNIMPLEMENTED("LXWS %d, %d:", eNum, eTextNum);
 }
 
 void commands2F4F() {
 	int eNum = getCaliValue();
 	int eType = getCaliValue();
 
-	DEBUG_COMMAND_YET("LXWE %d, %d:", eNum, eType);
+	TRACE_UNIMPLEMENTED("LXWE %d, %d:", eNum, eType);
 }
 
 void commands2F50() {
@@ -814,7 +814,7 @@ void commands2F50() {
 	int nFlg = sl_getc();
 	int eNum = getCaliValue();
 
-	DEBUG_COMMAND_YET("LXWH %d, %d, %d:", eFile, nFlg, eNum);
+	TRACE_UNIMPLEMENTED("LXWH %d, %d, %d:", eFile, nFlg, eNum);
 }
 
 void commands2F51() {
@@ -822,7 +822,7 @@ void commands2F51() {
 	int nFlg  = sl_getc();
 	int eNum  = getCaliValue();
 
-	DEBUG_COMMAND_YET("LXWHH %d, %d, %d:", eFile, nFlg, eNum);
+	TRACE_UNIMPLEMENTED("LXWHH %d, %d, %d:", eFile, nFlg, eNum);
 }
 
 void commands2F52() {
@@ -831,7 +831,7 @@ void commands2F52() {
 
 	const char *s = SDL_GetPlatform();
 	svar_set(eNum, s);
-	DEBUG_COMMAND("sysGetOSName %d: %s", eNum, s);
+	TRACE("sysGetOSName %d: %s", eNum, s);
 }
 
 void commands2F53() {
@@ -839,7 +839,7 @@ void commands2F53() {
 	
 	nact->patch_ec = eFlag;
 	
-	DEBUG_COMMAND("patchEC %d:", eFlag);
+	TRACE("patchEC %d:", eFlag);
 }
 
 void commands2F54() {
@@ -848,7 +848,7 @@ void commands2F54() {
 	int eWidth = getCaliValue();
 	int eHeight = getCaliValue();
 	
-	DEBUG_COMMAND_YET("mathSetClipWindow %d, %d, %d, %d:", eX, eY, eWidth, eHeight);
+	TRACE_UNIMPLEMENTED("mathSetClipWindow %d, %d, %d, %d:", eX, eY, eWidth, eHeight);
 }
 
 void commands2F55() {
@@ -859,7 +859,7 @@ void commands2F55() {
 	int *vWidth  = getCaliVariable();
 	int *vHeight = getCaliVariable();
 	
-	DEBUG_COMMAND_YET("mathClip %d, %d, %d, %d, %d, %d:",
+	TRACE_UNIMPLEMENTED("mathClip %d, %d, %d, %d, %d, %d:",
 			  *vDx, *vDy, *vSx, *vSy, *vWidth, *vHeight);
 }
 
@@ -868,7 +868,7 @@ void commands2F56() {
 	const char *title = sl_getString(0);
 	const char *folder = sl_getString(0);
 
-	DEBUG_COMMAND_YET("LXF %d, %s, %s:", file_name, title, folder);
+	TRACE_UNIMPLEMENTED("LXF %d, %s, %s:", file_name, title, folder);
 }
 
 void commands2F57() {
@@ -897,7 +897,7 @@ void commands2F57() {
 	}
 	free(t1);
 	free(t2);
-	DEBUG_COMMAND("strInputDlg %s, %d, %d, %d:",
+	TRACE("strInputDlg %s, %d, %d, %d:",
 		      sTitle, eStrVar, eLength, *vResult);
 }
 
@@ -907,7 +907,7 @@ void commands2F58() {
 	
 	*vResult = sjis_has_hankaku(svar_get(eNum)) ? 1 : 0;
 	
-	DEBUG_COMMAND("strCheckASCII %d, %d:", eNum, *vResult);
+	TRACE("strCheckASCII %d, %d:", eNum, *vResult);
 }
 
 void commands2F59() {
@@ -916,7 +916,7 @@ void commands2F59() {
 	
 	*vResult = sjis_has_zenkaku(svar_get(eNum)) ? 1 : 0;
 	
-	DEBUG_COMMAND("strCheckSJIS %d, %d:", eNum, *vResult);
+	TRACE("strCheckSJIS %d, %d:", eNum, *vResult);
 }
 
 void commands2F5A() {
@@ -927,7 +927,7 @@ void commands2F5A() {
 	menu_msgbox_open(t1);
 	free(t1);
 	
-	DEBUG_COMMAND("strMessageBox %s:", sText);
+	TRACE("strMessageBox %s:", sText);
 }
 
 void commands2F5B() {
@@ -938,7 +938,7 @@ void commands2F5B() {
 	menu_msgbox_open(t1);
 	free(t1);
 	
-	DEBUG_COMMAND("strMessageBoxStr %d:", eNum);
+	TRACE("strMessageBoxStr %d:", eNum);
 }
 
 void commands2F5C() {
@@ -951,7 +951,7 @@ void commands2F5C() {
 	int eAlpha = getCaliValue();
 	
 	ags_copyArea_shadow_withrate(eSrcX, eSrcY, eWidth, eHeight, eDestX, eDestY, eAlpha);
-	DEBUG_COMMAND("grCopyUseAMapUseA %d, %d, %d, %d, %d, %d, %d:",
+	TRACE("grCopyUseAMapUseA %d, %d, %d, %d, %d, %d, %d:",
 		      eDestX, eDestY, eSrcX, eSrcY, eWidth, eHeight, eAlpha);
 }
 
@@ -959,7 +959,7 @@ void commands2F5D() {
 	int eNum = getCaliValue();
 	int eData = getCaliValue();
 	
-	DEBUG_COMMAND_YET("grSetCEParam %d, %d:", eNum, eData);
+	TRACE_UNIMPLEMENTED("grSetCEParam %d, %d:", eNum, eData);
 }
 
 struct grEffectMoveView_data {
@@ -990,24 +990,24 @@ void commands2F5E() {
 		.target_y = eY
 	};
 	ags_runEffect(eTime, eFlag, grEffectMoveView_step, &data);
-	DEBUG_COMMAND("grEffectMoveView %d, %d, %d, %d:", eX, eY, eTime, eFlag);
+	TRACE("grEffectMoveView %d, %d, %d, %d:", eX, eY, eTime, eFlag);
 }
 
 void commands2F5F() {
 	int eSize = getCaliValue();
 	
-	DEBUG_COMMAND_YET("cgSetCacheSize %d:", eSize);
+	TRACE_UNIMPLEMENTED("cgSetCacheSize %d:", eSize);
 }
 
 void commands2F61() {
 	int eChar = getCaliValue();
 	int eCGNum = getCaliValue();
 	
-	DEBUG_COMMAND_YET("gaijiSet %d, %d:", eChar, eCGNum);
+	TRACE_UNIMPLEMENTED("gaijiSet %d, %d:", eChar, eCGNum);
 }
 
 void commands2F62() {
-	DEBUG_COMMAND_YET("gaijiClearAll:");
+	TRACE_UNIMPLEMENTED("gaijiClearAll:");
 }
 
 void commands2F63() {
@@ -1015,7 +1015,7 @@ void commands2F63() {
 	
 	*vSelect = sel_getLastElement();
 
-	DEBUG_COMMAND("menuGetLatestSelect %d:", *vSelect);
+	TRACE("menuGetLatestSelect %d:", *vSelect);
 }
 
 void commands2F64() {
@@ -1055,7 +1055,7 @@ void commands2F64() {
 	
 	ald_freedata(dfile);
 	
-	DEBUG_COMMAND("lnkIsLink %d, %d, %d:", eType, eNum, *vResult);
+	TRACE("lnkIsLink %d, %d, %d:", eType, eNum, *vResult);
 }
 
 void commands2F65() {
@@ -1096,7 +1096,7 @@ void commands2F65() {
 	
 	ald_freedata(dfile);
 	
-	DEBUG_COMMAND("lnkIsData %d, %d, %d:", eType, eNum, *vResult);
+	TRACE("lnkIsData %d, %d, %d:", eType, eNum, *vResult);
 }
 
 void commands2F66() {
@@ -1104,7 +1104,7 @@ void commands2F66() {
 	int page  = sl_getw();
 	int index = sl_getdw();
 	
-	DEBUG_COMMAND("fncSetTable %d, %d,%d:", eNum, page, index);
+	TRACE("fncSetTable %d, %d,%d:", eNum, page, index);
 
 	if (eNum >= FCTBL_MAX) {
 		WARNING("fncSetTable: too many table number %d", eNum);
@@ -1131,13 +1131,13 @@ void commands2F67() {
 	
 	*vResult = (i == nact->ain.fncnum) ? 0 : !0;
 	
-	DEBUG_COMMAND("fncSetTableFromStr %d, %d, %d:", eNum, eStrNum, *vResult);
+	TRACE("fncSetTableFromStr %d, %d, %d:", eNum, eStrNum, *vResult);
 }
 
 void commands2F68() {
 	int eNum = getCaliValue();
 	
-	DEBUG_COMMAND("fncClearTable %d:", eNum);
+	TRACE("fncClearTable %d:", eNum);
 	
 	if (eNum >= FCTBL_MAX) {
 		WARNING("fncClearTable: too many table number %d", eNum);
@@ -1151,7 +1151,7 @@ void commands2F68() {
 void commands2F69() {
 	int eNum = getCaliValue();
 	
-	DEBUG_COMMAND("fncCall %d:", eNum);
+	TRACE("fncCall %d:", eNum);
 	
 	if (eNum >= FCTBL_MAX) {
 		WARNING("fncClearTable: too many table number %d", eNum);
@@ -1170,7 +1170,7 @@ void commands2F6A() {
 
 	nact->fnc_return_value = eNum;
 	
-	DEBUG_COMMAND("fncSetReturnCode %d:", eNum);
+	TRACE("fncSetReturnCode %d:", eNum);
 }
 
 void commands2F6B() {
@@ -1178,7 +1178,7 @@ void commands2F6B() {
 	
 	*vNum = nact->fnc_return_value;
 	
-	DEBUG_COMMAND("fncGetReturnCode %d:", *vNum);
+	TRACE("fncGetReturnCode %d:", *vNum);
 }
 
 void commands2F6C() {
@@ -1186,7 +1186,7 @@ void commands2F6C() {
 	
 	nact->is_msg_out = eFlag != 0 ? TRUE : FALSE;
 	
-	DEBUG_COMMAND("msgSetOutputFlag %d:", eFlag);
+	TRACE("msgSetOutputFlag %d:", eFlag);
 }
 
 void commands2F6D() {
@@ -1195,13 +1195,13 @@ void commands2F6D() {
 
 	*vResult = save_delete_file(eNum -1);
 	
-	DEBUG_COMMAND("saveDeleteFile %d, %d:", eNum, *vResult);
+	TRACE("saveDeleteFile %d, %d:", eNum, *vResult);
 }
 
 void commands2F6E() {
 	int eFlag = getCaliValue();
 	
-	DEBUG_COMMAND_YET("wav3DSetUseFlag %d:", eFlag);
+	TRACE_UNIMPLEMENTED("wav3DSetUseFlag %d:", eFlag);
 }
 
 void commands2F6F() {
@@ -1212,7 +1212,7 @@ void commands2F6F() {
 	
 	mus_wav_fadeout_start(eCh, eTime, eVolume, eStopFlag);
 	
-	DEBUG_COMMAND("wavFadeVolume %d, %d, %d, %d:", eCh, eTime, eVolume, eStopFlag);
+	TRACE("wavFadeVolume %d, %d, %d, %d:", eCh, eTime, eVolume, eStopFlag);
 }
 
 void commands2F70() {
@@ -1220,7 +1220,7 @@ void commands2F70() {
 	
 	nact->patch_emen = eFlag;
 	
-	DEBUG_COMMAND("patchEMEN %d:", eFlag);
+	TRACE("patchEMEN %d:", eFlag);
 }
 
 void commands2F71() {
@@ -1228,13 +1228,13 @@ void commands2F71() {
 
 	msgskip_enableMenu(eFlag);
 
-	DEBUG_COMMAND("wmenuEnableMsgSkip %d:", eFlag);
+	TRACE("wmenuEnableMsgSkip %d:", eFlag);
 }
 
 void commands2F72() {
 	int *vFlag = getCaliVariable();
 	
-	DEBUG_COMMAND_YET("winGetFlipFlag %p:", vFlag);
+	TRACE_UNIMPLEMENTED("winGetFlipFlag %p:", vFlag);
 }
 
 void commands2F73() {
@@ -1242,14 +1242,14 @@ void commands2F73() {
 	
 	*vTrack = muscd_get_maxtrack();
 	
-	DEBUG_COMMAND("cdGetMaxTrack %d:", *vTrack);
+	TRACE("cdGetMaxTrack %d:", *vTrack);
 }
 
 void commands2F74() {
 	const char *str1 = sl_getString(0);
 	int *var   = getCaliVariable();
 	
-	DEBUG_COMMAND_YET("dlgErrorOkCancel %s,%d:", str1, *var);
+	TRACE_UNIMPLEMENTED("dlgErrorOkCancel %s,%d:", str1, *var);
 }
 
 void commands2F75() {
@@ -1257,7 +1257,7 @@ void commands2F75() {
 	
 	sel_reduce(eNumof);
 	
-	DEBUG_COMMAND("menuReduce %d:", eNumof);
+	TRACE("menuReduce %d:", eNumof);
 }
 
 void commands2F76() {
@@ -1265,8 +1265,8 @@ void commands2F76() {
 
 	*var = sel_getnumberof();
 	
-	//DEBUG_COMMAND("menuGetNumof %p:", var);
-	DEBUG_COMMAND("menuGetNumof %d:", *var);
+	//TRACE("menuGetNumof %p:", var);
+	TRACE("menuGetNumof %d:", *var);
 }
 
 void commands2F77() {
@@ -1275,7 +1275,7 @@ void commands2F77() {
 	
 	svar_set(eStrNum, sel_gettext(eSelectNum));
 	
-	DEBUG_COMMAND("menuGetText %d,%d:", eStrNum, eSelectNum);
+	TRACE("menuGetText %d,%d:", eStrNum, eSelectNum);
 }
 
 void commands2F78() {
@@ -1284,7 +1284,7 @@ void commands2F78() {
 
 	sel_goto(eSelectNum, eClearFlag);
 	
-	DEBUG_COMMAND("menuGoto %d,%d:", eSelectNum, eClearFlag);
+	TRACE("menuGoto %d,%d:", eSelectNum, eClearFlag);
 }
 
 void commands2F79() {
@@ -1293,17 +1293,17 @@ void commands2F79() {
 	
 	sel_returengoto(eSelectNum, eClearFlag);
 	
-	DEBUG_COMMAND("menuReturnGoto %d,%d:", eSelectNum, eClearFlag);
+	TRACE("menuReturnGoto %d,%d:", eSelectNum, eClearFlag);
 }
 
 void commands2F7A() {
 	// no-op
-	DEBUG_COMMAND("menuFreeShelterDIB:");
+	TRACE("menuFreeShelterDIB:");
 }
 
 void commands2F7B() {
 	// no-op
-	DEBUG_COMMAND("msgFreeShelterDIB:");
+	TRACE("msgFreeShelterDIB:");
 }
 
 void commands2F7C() {
@@ -1323,7 +1323,7 @@ void commands2F7C() {
 	sys_addMsg(nact->ain.msg[index]);
 	msgskip_onAinMessage(index);
 
-	DEBUG_COMMAND("2F7C %d:", index);
+	TRACE("2F7C %d:", index);
 }
 
 void commands2F7D() {
@@ -1332,7 +1332,7 @@ void commands2F7D() {
 	commandH();
 	msgskip_onAinMessage(index);
 
-	DEBUG_COMMAND("2F7D %d:", index);
+	TRACE("2F7D %d:", index);
 }
 
 void commands2F7E() {
@@ -1341,7 +1341,7 @@ void commands2F7E() {
 	commandHH();
 	msgskip_onAinMessage(index);
 
-	DEBUG_COMMAND("2F7E %d:", index);
+	TRACE("2F7E %d:", index);
 }
 
 void commands2F7F() {
@@ -1351,7 +1351,7 @@ void commands2F7F() {
 	sys_addMsg(svar_get(p1));
 	msgskip_onAinMessage(index);
 
-	DEBUG_COMMAND("2F7F %d, %d(%s):", index, p1, svar_get(p1));
+	TRACE("2F7F %d, %d(%s):", index, p1, svar_get(p1));
 }
 
 void commands2F80() {
@@ -1362,7 +1362,7 @@ void commands2F80() {
 		WARNING("dataSetPointer set failed");
 	}
 	
-	DEBUG_COMMAND("dataSetPointer %d,%x", page, index);
+	TRACE("dataSetPointer %d,%x", page, index);
 }
 
 void commands2F81() {
@@ -1379,7 +1379,7 @@ void commands2F81() {
 	
 	nact->datatbl_addr = p;
 	
-	DEBUG_COMMAND("dataGetWORD %p,%d(%p):", vData, eNumof, nact->datatbl_addr);
+	TRACE("dataGetWORD %p,%d(%p):", vData, eNumof, nact->datatbl_addr);
 }
 
 void commands2F82() {
@@ -1388,7 +1388,7 @@ void commands2F82() {
 	int i;
 	char *p = (char *)nact->datatbl_addr;
 	
-	DEBUG_COMMAND("dataGetString %d,%d:", eStrNum, eNumof);
+	TRACE("dataGetString %d,%d:", eStrNum, eNumof);
 	
 	for (i = 0; i < eNumof; i++) {
 		svar_set(eStrNum + i, p);
@@ -1406,7 +1406,7 @@ void commands2F83() {
 
 	nact->datatbl_addr = p;
 	
-	DEBUG_COMMAND("dataSkipWORD %d:", eNumof);
+	TRACE("dataSkipWORD %d:", eNumof);
 }
 
 void commands2F84() {
@@ -1420,7 +1420,7 @@ void commands2F84() {
 	
 	nact->datatbl_addr = p;
 	
-	DEBUG_COMMAND("dataSkipString %d:", eNumof);
+	TRACE("dataSkipString %d:", eNumof);
 }
 
 void commands2F85() {
@@ -1428,7 +1428,7 @@ void commands2F85() {
 	
 	*vResult = nact->ain.varnum;
 	
-	DEBUG_COMMAND("varGetNumof %p:", vResult);
+	TRACE("varGetNumof %p:", vResult);
 }
 
 void commands2F86() {
@@ -1436,7 +1436,7 @@ void commands2F86() {
 	
 	nact->patch_g0 = eFlag;
 	
-	DEBUG_COMMAND("patchG0 %d:", eFlag);
+	TRACE("patchG0 %d:", eFlag);
 }
 
 void commands2F87() {
@@ -1450,7 +1450,7 @@ void commands2F87() {
 	svar_set(eResultStrNum, REGREADSTRING_RESULT);
 	*vResult = 1;
 	
-	DEBUG_COMMAND("regReadString %d,%d,%d,%d:",
+	TRACE("regReadString %d,%d,%d,%d:",
 		      eSubKeyStrNum, eBaneStrNum, eResultStrNum, *vResult);
 }
 
@@ -1469,7 +1469,7 @@ void commands2F88() {
 		free(fname_utf8);
 	}
 	
-	DEBUG_COMMAND("fileCheckExist %d,%d:", eFileNameStrNum, *vResult);
+	TRACE("fileCheckExist %d,%d:", eFileNameStrNum, *vResult);
 }
 
 void commands2F89() {
@@ -1478,14 +1478,14 @@ void commands2F89() {
 	int eData = getCaliValue();
 	int *vResult = getCaliVariable();
 	
-	DEBUG_COMMAND_YET("timeCheckCurDate %d,%d,%d,%p:", eYear, eMonth, eData, vResult);
+	TRACE_UNIMPLEMENTED("timeCheckCurDate %d,%d,%d,%p:", eYear, eMonth, eData, vResult);
 }
 
 void commands2F8A() {
 	const char *s2 = sl_getConstString();
 	const char *s3 = sl_getConstString();
 
-	DEBUG_COMMAND_YET("dlgManualProtect %s,%s:", s2, s3);
+	TRACE_UNIMPLEMENTED("dlgManualProtect %s,%s:", s2, s3);
 }
 
 void commands2F8B() {
@@ -1497,11 +1497,11 @@ void commands2F8B() {
 
 	*c7 = 1;
 	
-	DEBUG_COMMAND_YET("fileCheckDVD %s,%d,%d,%s,%p:", s2, c3, c4, s6, c7);
+	TRACE_UNIMPLEMENTED("fileCheckDVD %s,%d,%d,%s,%p:", s2, c3, c4, s6, c7);
 }
 
 void commands2F8C() {
-	DEBUG_COMMAND("sysReset:");
+	TRACE("sysReset:");
 	nact_quit(TRUE);
 }
 
diff --git a/src/cmd_check.c b/src/cmd_check.c
index ef39ff4..b9cd8c5 100644
--- a/src/cmd_check.c
+++ b/src/cmd_check.c
@@ -174,7 +174,7 @@ static void message(int c0) {
 }
 
 void exec_command(void) {
-	DEBUG_MESSAGE("%d:%x\n", sl_getPage(), sl_getIndex());
+	TRACE_MESSAGE("%d:%x\n", sl_getPage(), sl_getIndex());
 
 	int page, index;
 	int c0 = sl_getc();
@@ -535,7 +535,7 @@ void exec_command(void) {
 		/* hit Any Key */
 		sys_hit_any_key();
 		msg_nextPage(TRUE);
-		DEBUG_COMMAND("A");
+		TRACE("A");
 		break;
 	case 'B':
 		switch(sl_getc()) {
@@ -949,7 +949,7 @@ void exec_command(void) {
 		break;
 	case 'R':
 		/* 改行 */
-		DEBUG_MESSAGE("\n");
+		TRACE_MESSAGE("\n");
 		msg_nextLine();
 		break;
 	case 'S':
@@ -1085,7 +1085,7 @@ void exec_command(void) {
 	{
 		int num=getCaliValue();
 		sys_addMsg(svar_get(num));
-		DEBUG_COMMAND("X %d:", num);
+		TRACE("X %d:", num);
 	}
 		break;
 	case 'Y':
diff --git a/src/cmdb.c b/src/cmdb.c
index 3a0d951..2c909a1 100644
--- a/src/cmdb.c
+++ b/src/cmdb.c
@@ -43,7 +43,7 @@ void commandB0() {
 		break;
 	}
 
-	DEBUG_COMMAND("B0 %d:", num);
+	TRACE("B0 %d:", num);
 }
 
 void commandB1() {
@@ -64,7 +64,7 @@ void commandB1() {
 	nact->sel.wininfo[num].height = Y2;
 	nact->sel.wininfo[num].save = (V == 0) ? false : true;
 	
-	DEBUG_COMMAND("B1 %d,%d,%d,%d,%d,%d:", num, X1, Y1, X2, Y2, V);
+	TRACE("B1 %d,%d,%d,%d,%d,%d:", num, X1, Y1, X2, Y2, V);
 }
 
 void commandB2() {
@@ -89,7 +89,7 @@ void commandB2() {
 	nact->sel.FrameCgNoBot = C3;
 	nact->sel.Framedot = W == 0 ? 0 : W == 1 ? 8 : dot ;
 	
-	DEBUG_COMMAND("B2 %d,%d,%d,%d,%d,%d:", num, W, C1, C2, C3, dot);
+	TRACE("B2 %d,%d,%d,%d,%d,%d:", num, W, C1, C2, C3, dot);
 }
 
 void commandB3() {
@@ -110,7 +110,7 @@ void commandB3() {
 	nact->msg.wininfo[num].height = Y2;
 	nact->msg.wininfo[num].save = (V == 0) ? FALSE : TRUE;
 	
-	DEBUG_COMMAND("B3 %d,%d,%d,%d,%d,%d:", num, X1, Y1, X2, Y2, V);
+	TRACE("B3 %d,%d,%d,%d,%d,%d:", num, X1, Y1, X2, Y2, V);
 }
 
 void commandB4() {
@@ -130,7 +130,7 @@ void commandB4() {
 	nact->msg.win = &nact->msg.wininfo[num];
 	msg_openWindow(W, C1, C2, N, M);
 	
-	DEBUG_COMMAND("B4 %d,%d,%d,%d,%d,%d:", num, W, C1, C2, N, M);
+	TRACE("B4 %d,%d,%d,%d,%d,%d:", num, W, C1, C2, N, M);
 }
 
 void commandB10() {
@@ -141,7 +141,7 @@ void commandB10() {
 	msg_getMessageLocation(&p);
 	*x_var = p.x;
 	*y_var = p.y;
-	DEBUG_COMMAND("B10 %d,%d:", *x_var, *y_var);
+	TRACE("B10 %d,%d:", *x_var, *y_var);
 }
 
 void commandB11() {
@@ -151,28 +151,28 @@ void commandB11() {
 	*sel_no_var = nact->sel.winno;
 	*msg_no_var = nact->msg.winno;
 	
-	DEBUG_COMMAND("B11 %d,%d:", *sel_no_var, *msg_no_var);
+	TRACE("B11 %d,%d:", *sel_no_var, *msg_no_var);
 }
 
 void commandB12() {
 	int *var = getCaliVariable();
 	
 	*var = sel_getRegistoredElementNumber();
-	DEBUG_COMMAND("B12 %d:", *var);
+	TRACE("B12 %d:", *var);
 }
 
 void commandB13() {
 	int *var = getCaliVariable();
 	
 	*var = sel_getRegistoredElementWidth(); 
-	DEBUG_COMMAND("B13 %d:", *var);
+	TRACE("B13 %d:", *var);
 }
 
 void commandB14() {
 	int *var = getCaliVariable();
 	
 	*var = sel_getRegistoredElement_strlen(); 
-	DEBUG_COMMAND("B14 %d:", *var);
+	TRACE("B14 %d:", *var);
 }
 
 void commandB21() {
@@ -183,7 +183,7 @@ void commandB21() {
 	*x_var = nact->sel.win->x;
 	*y_var = nact->sel.win->y;
 	
-	DEBUG_COMMAND("B21 %d,%d,%d:", no, *x_var, *y_var);
+	TRACE("B21 %d,%d,%d:", no, *x_var, *y_var);
 }
 
 void commandB22() {
@@ -194,7 +194,7 @@ void commandB22() {
 	*x_var = nact->sel.win->width;
 	*y_var = nact->sel.win->height;
 	
-	DEBUG_COMMAND("B22 %d,%d,%d:", no, *x_var, *y_var);
+	TRACE("B22 %d,%d,%d:", no, *x_var, *y_var);
 }
 
 void commandB23() {
@@ -205,7 +205,7 @@ void commandB23() {
 	*x_var = nact->msg.win->x;
 	*y_var = nact->msg.win->y;
 	
-	DEBUG_COMMAND("B23 %d,%d,%d:", no, *x_var, *y_var);
+	TRACE("B23 %d,%d,%d:", no, *x_var, *y_var);
 }
 
 void commandB24() {
@@ -216,7 +216,7 @@ void commandB24() {
 	*x_var_size = nact->msg.win->width;
 	*y_var_size = nact->msg.win->height;
 	
-	DEBUG_COMMAND("B24 %d,%d,%d:", no, *x_var_size, *y_var_size);
+	TRACE("B24 %d,%d,%d:", no, *x_var_size, *y_var_size);
 }
 
 void commandB31() {
@@ -228,7 +228,7 @@ void commandB31() {
 	*x_var = nact->sel.wininfo[no].x;
 	*y_var = nact->sel.wininfo[no].y;
 	
-	DEBUG_COMMAND("B31 %d,%d,%d:", no, *x_var, *y_var);
+	TRACE("B31 %d,%d,%d:", no, *x_var, *y_var);
 }
 
 void commandB32() {
@@ -239,7 +239,7 @@ void commandB32() {
 	*x_var_size = nact->sel.wininfo[no].width;
 	*y_var_size = nact->sel.wininfo[no].height;
 	
-	DEBUG_COMMAND("B32 %d,%d,%d:", no, *x_var_size, *y_var_size);
+	TRACE("B32 %d,%d,%d:", no, *x_var_size, *y_var_size);
 }
 
 void commandB33() {
@@ -249,7 +249,7 @@ void commandB33() {
 
 	*x_var = nact->msg.wininfo[no].x;
 	*y_var = nact->msg.wininfo[no].y;
-	DEBUG_COMMAND("B33 %d,%d,%d:", no, *x_var, *y_var);
+	TRACE("B33 %d,%d,%d:", no, *x_var, *y_var);
 }
 
 void commandB34() {
@@ -259,6 +259,6 @@ void commandB34() {
 
 	*x_var_size = nact->msg.wininfo[no].width;
 	*y_var_size = nact->msg.wininfo[no].height;
-	DEBUG_COMMAND("B34 %d,%d,%d:", no, *x_var_size, *y_var_size);
+	TRACE("B34 %d,%d,%d:", no, *x_var_size, *y_var_size);
 }
 
diff --git a/src/cmdc.c b/src/cmdc.c
index 196ffd0..3d005f0 100644
--- a/src/cmdc.c
+++ b/src/cmdc.c
@@ -40,7 +40,7 @@ void commandCC() {
 	ags_copyArea(src_x, src_y, width, height, dst_x, dst_y);
 	ags_updateArea(dst_x, dst_y, width, height);
 	
-	DEBUG_COMMAND("CC %d,%d,%d,%d,%d,%d:", src_x, src_y, width, height, dst_x, dst_y);
+	TRACE("CC %d,%d,%d,%d,%d,%d:", src_x, src_y, width, height, dst_x, dst_y);
 }
 
 void commandCS() {
@@ -55,7 +55,7 @@ void commandCS() {
 	ags_copyAreaSP(src_x, src_y, width, height, dst_x, dst_y, sprite);
 	ags_updateArea(dst_x, dst_y, width, height);
 
-	DEBUG_COMMAND("CS %d,%d,%d,%d,%d,%d,%d:", src_x, src_y, width, height, dst_x, dst_y, sprite);
+	TRACE("CS %d,%d,%d,%d,%d,%d,%d:", src_x, src_y, width, height, dst_x, dst_y, sprite);
 }
 
 void commandCX() {
@@ -101,12 +101,12 @@ void commandCX() {
 		ags_copyToAlpha(src_x, src_y, width, height, dst_x, dst_y, col == 1 ? FROM_24R : col == 2 ? FROM_24G : FROM_24B);
 		break;
 	case 6:
-		DEBUG_COMMAND_YET("CX %d,%d,%d,%d,%d,%d,%d,%d:", mode, src_x, src_y, width, height, dst_x, dst_y, col);
+		TRACE_UNIMPLEMENTED("CX %d,%d,%d,%d,%d,%d,%d,%d:", mode, src_x, src_y, width, height, dst_x, dst_y, col);
 		break;
 	}
 	daiakuji_cx_hack = false;
 
-	DEBUG_COMMAND("CX %d,%d,%d,%d,%d,%d,%d,%d:", mode, src_x, src_y, width, height, dst_x, dst_y, col);
+	TRACE("CX %d,%d,%d,%d,%d,%d,%d,%d:", mode, src_x, src_y, width, height, dst_x, dst_y, col);
 }
 
 void commandCM() {
@@ -123,7 +123,7 @@ void commandCM() {
 	ags_scaledCopyArea(src_x, src_y, src_width, src_height, dst_x, dst_y, dst_width, dst_height, mirror_sw);
 	ags_updateArea(dst_x, dst_y, dst_width, dst_height);
 	
-	DEBUG_COMMAND("CM %d,%d,%d,%d,%d,%d,%d,%d,%d:", src_x, src_y, src_width, src_height, dst_x, dst_y, dst_width, dst_height, mirror_sw);
+	TRACE("CM %d,%d,%d,%d,%d,%d,%d,%d,%d:", src_x, src_y, src_width, src_height, dst_x, dst_y, dst_width, dst_height, mirror_sw);
 }
 
 void commandCE() {
@@ -148,10 +148,10 @@ void commandCE() {
 	case 54:
 	case 1000:
 	case 1001:
-		DEBUG_COMMAND_YET("CE %d,%d,%d,%d,%d,%d,%d,%d,%d:", src_x, src_y, width, height, dst_x, dst_y, effect_sw, option, wait_flag);
+		TRACE_UNIMPLEMENTED("CE %d,%d,%d,%d,%d,%d,%d,%d,%d:", src_x, src_y, width, height, dst_x, dst_y, effect_sw, option, wait_flag);
 		break;
 	default:
-		DEBUG_COMMAND("CE %d,%d,%d,%d,%d,%d,%d,%d,%d:", src_x, src_y, width, height, dst_x, dst_y, effect_sw, option, wait_flag);
+		TRACE("CE %d,%d,%d,%d,%d,%d,%d,%d,%d:", src_x, src_y, width, height, dst_x, dst_y, effect_sw, option, wait_flag);
 	}
 }
 
@@ -189,10 +189,10 @@ void commandCD() {
 	case 1000:
 	case 2000:
 	case 2001:
-		DEBUG_COMMAND_YET("CD %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", src_x, src_y, width, height, dst_x, dst_y, effect_sw, option, wait_flag, color);
+		TRACE_UNIMPLEMENTED("CD %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", src_x, src_y, width, height, dst_x, dst_y, effect_sw, option, wait_flag, color);
 		break;
 	default:
-		DEBUG_COMMAND("CD %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", src_x, src_y, width, height, dst_x, dst_y, effect_sw, option, wait_flag, color);
+		TRACE("CD %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", src_x, src_y, width, height, dst_x, dst_y, effect_sw, option, wait_flag, color);
 	}
 }
 
@@ -211,14 +211,14 @@ void commandCK() {
 	case 1:
 		ags_wrapColor(x, y, width, height, d1, d2); break;
 	case 2:
-		DEBUG_COMMAND_YET("CK %d,%d,%d,%d,%d,%d,%d,%d,%d:", no, x, y, width, height, d1, d2, d3, d4); break;
+		TRACE_UNIMPLEMENTED("CK %d,%d,%d,%d,%d,%d,%d,%d,%d:", no, x, y, width, height, d1, d2, d3, d4); break;
 	case 3: /* from T2 */
 		ags_changeColorArea(x, y, width, height, d1, d2, d3); break;
 	default:
 		WARNING("Unknown CK Command %d", no);
 	}
 	ags_updateArea(x, y, width, height);
-	DEBUG_COMMAND("CK %d,%d,%d,%d,%d,%d,%d,%d,%d:", no, x, y, width, height, d1, d2, d3, d4);
+	TRACE("CK %d,%d,%d,%d,%d,%d,%d,%d,%d:", no, x, y, width, height, d1, d2, d3, d4);
 }
 
 void commandCL() {
@@ -231,7 +231,7 @@ void commandCL() {
 	ags_drawLine(x0, y0, x1, y1, color);
 	ags_updateArea(min(x0, x1), min(y0, y1), abs(x1 - x0) + 1, abs(y1 - y0) + 1); 
 	
-	DEBUG_COMMAND("CL %d,%d,%d,%d,%d:", x0, y0, x1, y1, color);
+	TRACE("CL %d,%d,%d,%d,%d:", x0, y0, x1, y1, color);
 }
 
 void commandCB() {
@@ -244,7 +244,7 @@ void commandCB() {
 	ags_drawRectangle(x, y, width, height, color);
 	ags_updateArea   (x, y, width, height);
 	
-	DEBUG_COMMAND("CB %d,%d,%d,%d,%d:", x, y, width, height, color);
+	TRACE("CB %d,%d,%d,%d,%d:", x, y, width, height, color);
 }
 
 void commandCF() {
@@ -257,7 +257,7 @@ void commandCF() {
 	ags_fillRectangle(x, y, width, height, color);
 	ags_updateArea   (x, y, width, height);
 
-	DEBUG_COMMAND("CF %d,%d,%d,%d,%d:", x, y, width, height, color);
+	TRACE("CF %d,%d,%d,%d,%d:", x, y, width, height, color);
 }
 
 void commandCP() {
@@ -269,7 +269,7 @@ void commandCP() {
 	if (!SDL_RectEmpty(&rec))
 		ags_updateArea(rec.x, rec.y, rec.w, rec.h);
 
-	DEBUG_COMMAND("CP %d,%d,%d:", x, y, color);
+	TRACE("CP %d,%d,%d:", x, y, color);
 }
 
 void commandCT() {
@@ -279,7 +279,7 @@ void commandCT() {
 	int y     = getCaliValue();
 
 	ags_alpha_getPixel(x, y, var);
-	DEBUG_COMMAND("CT %d,%d,%d:", *var, x, y);
+	TRACE("CT %d,%d,%d:", *var, x, y);
 }
 
 void commandCU() {
@@ -292,7 +292,7 @@ void commandCU() {
 	int set    = getCaliValue();
 	
 	ags_alpha_lowercut(x, y, width, height, border, set);
-	DEBUG_COMMAND("CU %d,%d,%d,%d,%d,%d:", x, y, width, height, border, set);
+	TRACE("CU %d,%d,%d,%d,%d,%d:", x, y, width, height, border, set);
 }
 
 void commandCV() {
@@ -305,7 +305,7 @@ void commandCV() {
 	int set    = getCaliValue();
 	
 	ags_alpha_uppercut(x, y, width, height, border, set);
-	DEBUG_COMMAND("CV %d,%d,%d,%d,%d,%d:", x, y, width, height, border, set);
+	TRACE("CV %d,%d,%d,%d,%d,%d:", x, y, width, height, border, set);
 }
 
 void commandCY() {
@@ -317,7 +317,7 @@ void commandCY() {
 	int lv = getCaliValue();
 	
 	ags_alpha_setLevel(x, y, w, h, lv);
-	DEBUG_COMMAND("CY %d,%d,%d,%d,%d:", x, y, w, h, lv);
+	TRACE("CY %d,%d,%d,%d,%d:", x, y, w, h, lv);
 }
 
 void commandCZ() {
@@ -331,5 +331,5 @@ void commandCZ() {
 	int op = getCaliValue();
 	
 	ags_alpha_copyArea(sx, sy, w, h, dx, dy);
-	DEBUG_COMMAND("CZ %d,%d,%d,%d,%d,%d,%d:", sx, sy, w, h, dx, dy, op);
+	TRACE("CZ %d,%d,%d,%d,%d,%d,%d:", sx, sy, w, h, dx, dy, op);
 }
diff --git a/src/cmdd.c b/src/cmdd.c
index c73a21c..4734284 100644
--- a/src/cmdd.c
+++ b/src/cmdd.c
@@ -34,7 +34,7 @@ void commandDC() {
 
 	if (!v_allocatePage(page, maxindex + 1, !!save))
 		WARNING("Array allocation failed: page=%d size=%d", page, maxindex);
-	DEBUG_COMMAND("DC %d,%d,%d:", page, maxindex, save);
+	TRACE("DC %d,%d,%d:", page, maxindex, save);
 }
 
 void commandDI() {
@@ -44,7 +44,7 @@ void commandDI() {
 	
 	v_getPageStatus(page, var_use, var_size);
 
-	DEBUG_COMMAND("DI %d,%p,%p:", page, var_use, var_size);
+	TRACE("DI %d,%p,%p:", page, var_use, var_size);
 }
 
 void commandDS() {
@@ -54,7 +54,7 @@ void commandDS() {
 	int offset     = getCaliValue();
 	int page       = getCaliValue();
 	
-	DEBUG_COMMAND("DS %p,%d,%d,%d:",point_var, data_var.var, offset, page);
+	TRACE("DS %p,%d,%d,%d:",point_var, data_var.var, offset, page);
 	if (!v_bindArray(data_var.var, point_var, offset, page)) {
 		WARNING("commandDS(): Array allocate failed");
 		WARNING("if you are playing 'Pastel Chime', please patch to scenario(see patch/README.TXT for detail)");
@@ -67,7 +67,7 @@ void commandDR() {
 	getCaliArray(&data_var);
 	v_unbindArray(data_var.var);
 	
-	DEBUG_COMMAND("DR %d:", data_var.var);
+	TRACE("DR %d:", data_var.var);
 }
 
 void commandDF() {
@@ -76,7 +76,7 @@ void commandDF() {
 	int cnt  = getCaliValue();
 	int data = getCaliValue();
 	
-	DEBUG_COMMAND("DF %p,%d,%d:", data_var, cnt, data);
+	TRACE("DF %p,%d,%d:", data_var, cnt, data);
 
 	if (data_var.page) {
 		int maxlen = v_sliceSize(&data_var);
diff --git a/src/cmde.c b/src/cmde.c
index 5c73d33..619ce32 100644
--- a/src/cmde.c
+++ b/src/cmde.c
@@ -49,7 +49,7 @@ void commandES() {
 	tbl[num - 1].r.h = height;
 	tbl[num - 1].pal = pal;
 	
-	DEBUG_COMMAND("ES %d,%d,%d,%d,%d,%d:", num, pal, x, y, width, height);
+	TRACE("ES %d,%d,%d,%d,%d,%d:", num, pal, x, y, width, height);
 }
 
 void commandEC() {
@@ -67,7 +67,7 @@ void commandEC() {
 		ags_fillRectangle(e->r.x, e->r.y, e->r.w + adj, e->r.h + adj, e->pal);
 		ags_updateArea(e->r.x, e->r.y, e->r.w + adj, e->r.h + adj);
 	}
-	DEBUG_COMMAND("EC %d:", num);
+	TRACE("EC %d:", num);
 }
 
 void commandEG() {
@@ -82,7 +82,7 @@ void commandEG() {
 	*width  = tbl[num -1].r.w;
 	*height = tbl[num -1].r.h;
 
-	DEBUG_COMMAND("EG %d,%d,%d,%d,%d:", num, *x, *y, *width, *height);
+	TRACE("EG %d,%d,%d,%d,%d:", num, *x, *y, *width, *height);
 }
 
 void commandEM() {
@@ -98,7 +98,7 @@ void commandEM() {
 		r.h -= 1;
 	}
 	*var = SDL_PointInRect(&p, &r) ? 1 : 0;
-	DEBUG_COMMAND("EM %d,%d,%d,%d:", num, *var, x, y);
+	TRACE("EM %d,%d,%d,%d:", num, *var, x, y);
 }
 
 void commandEN() {
@@ -121,5 +121,5 @@ void commandEN() {
 			*var = i;
 	}
 	
-	DEBUG_COMMAND("EN %d,%d,%d,%d,%d:", *var, min, max, x, y);
+	TRACE("EN %d,%d,%d,%d,%d:", *var, min, max, x, y);
 }
diff --git a/src/cmdf.c b/src/cmdf.c
index b311b99..9c71670 100644
--- a/src/cmdf.c
+++ b/src/cmdf.c
@@ -80,7 +80,7 @@ static void commandF1() {
 	int i;
 	char *p;
 	
-	DEBUG_COMMAND("F1 %d,%d:", str_number, skip);
+	TRACE("F1 %d,%d:", str_number, skip);
 	
 	p = (char *)nact->datatbl_addr;
 	for (i = 0; i < skip; i++) {
@@ -104,7 +104,7 @@ static void commandF2() {
 	p++;
 	nact->datatbl_addr = (void *)p;
 	
-	DEBUG_COMMAND("F2 %d,%d:", *read_var, skip);
+	TRACE("F2 %d,%d:", *read_var, skip);
 }
 
 static void commandF3() {
@@ -113,7 +113,7 @@ static void commandF3() {
 	
 	*read_var = LittleEndian_getW(nact->datatbl_addr, skip *2);
 	
-	DEBUG_COMMAND("F3 %d,%d:", *read_var, skip);
+	TRACE("F3 %d,%d:", *read_var, skip);
 }
 
 static void commandF4() {
@@ -130,7 +130,7 @@ static void commandF4() {
 	
 	nact->datatbl_addr = p;
 	
-	DEBUG_COMMAND("F4 %d,%d:", *read_var, count);
+	TRACE("F4 %d,%d:", *read_var, count);
 }
 
 static void commandF5() {
@@ -143,7 +143,7 @@ static void commandF5() {
 		read_var++;
 	}
 	
-	DEBUG_COMMAND("F5 %d,%d:", *read_var, count);
+	TRACE("F5 %d,%d:", *read_var, count);
 }
 
 static void commandF6() {
@@ -152,7 +152,7 @@ static void commandF6() {
 	
 	F6Index[index] = var;
 	
-	DEBUG_COMMAND("F6 %d,%d:", *var, index);
+	TRACE("F6 %d,%d:", *var, index);
 }
 
 static void commandF7() {
@@ -170,29 +170,29 @@ static void commandF7() {
 	
 	nact->datatbl_addr = p;
 	
-	DEBUG_COMMAND("F7 %d,%d", data_width, count);
+	TRACE("F7 %d,%d", data_width, count);
 }
 
 static void commandF8() {
 	int snum = getCaliValue();
 	int scnt = getCaliValue();
-	DEBUG_COMMAND_YET("F8 %d,%d:", snum, scnt);
+	TRACE_UNIMPLEMENTED("F8 %d,%d:", snum, scnt);
 }
 
 static void commandF9() {
 	int snum = getCaliValue();
 	int scnt = getCaliValue();
-	DEBUG_COMMAND_YET("F9 %d,%d:", snum, scnt);
+	TRACE_UNIMPLEMENTED("F9 %d,%d:", snum, scnt);
 }
 
 static void commandF10() {
 	int snum = getCaliValue();
 	int scnt = getCaliValue();
-	DEBUG_COMMAND_YET("F10 %d,%d:", snum, scnt);
+	TRACE_UNIMPLEMENTED("F10 %d,%d:", snum, scnt);
 }
 
 static void commandF11() {
 	int snum = getCaliValue();
 	int ends = getCaliValue();
-	DEBUG_COMMAND_YET("F11 %d,%d:", snum, ends);
+	TRACE_UNIMPLEMENTED("F11 %d,%d:", snum, ends);
 }
diff --git a/src/cmdg.c b/src/cmdg.c
index 074c2f0..d127b38 100644
--- a/src/cmdg.c
+++ b/src/cmdg.c
@@ -37,7 +37,7 @@ void commandG0() {
 	
 	cg_load(num - 1, -1);
 	
-	DEBUG_COMMAND("G %d:",num);
+	TRACE("G %d:",num);
 }
 
 void commandG1() {
@@ -52,7 +52,7 @@ void commandG1() {
 	
 	cg_load(num - 1, sprite);
 	
-	DEBUG_COMMAND("G %d,%d:",num,sprite);
+	TRACE("G %d,%d:",num,sprite);
 }
 
 void commandGS() {
@@ -72,7 +72,7 @@ void commandGS() {
 	var[2] = r.w;
 	var[3] = r.h;
 	
-	DEBUG_COMMAND("GS %d,%p:",num,var);
+	TRACE("GS %d,%p:",num,var);
 }
 
 void commandGX() {
@@ -86,5 +86,5 @@ void commandGX() {
 	
 	cg_load_with_alpha(cg_num -1, shadow_num -1);
 	
-	DEBUG_COMMAND("GX %d,%d:",cg_num, shadow_num);
+	TRACE("GX %d,%d:",cg_num, shadow_num);
 }
diff --git a/src/cmdh.c b/src/cmdh.c
index 7495b5d..343c458 100644
--- a/src/cmdh.c
+++ b/src/cmdh.c
@@ -39,7 +39,7 @@ void commandH() {
 	sys_addMsg(s);
 	free(s);
 
-	DEBUG_COMMAND("H %d,%d:",fig,num);
+	TRACE("H %d,%d:",fig,num);
 }
 
 void commandHH(void) {
@@ -49,5 +49,5 @@ void commandHH(void) {
 
 	sys_addMsg(format_number(num, fig, buf));
 
-	DEBUG_COMMAND("HH %d,%d:",fig,num);
+	TRACE("HH %d,%d:",fig,num);
 }
diff --git a/src/cmdi.c b/src/cmdi.c
index 4db130b..586af44 100644
--- a/src/cmdi.c
+++ b/src/cmdi.c
@@ -43,7 +43,7 @@ void commandIK() {
 	int num = sl_getc();
 	int key;
 
-	DEBUG_COMMAND("IK %d:",num);
+	TRACE("IK %d:",num);
 	
 	/* to be fix
 	 *   IK0/1 is affected by ZI
@@ -107,7 +107,7 @@ void commandIM() {
 	sysVar[0] = sys_getMouseInfo(&p, FALSE);
 	*x_var = p.x;
 	*y_var = p.y;
-	DEBUG_COMMAND("IM %d,%d:", *x_var, *y_var);
+	TRACE("IM %d,%d:", *x_var, *y_var);
 }
 
 void commandIC() {
@@ -119,7 +119,7 @@ void commandIC() {
 	pre = cursor_num;
 	
 	ags_setCursorType(cursor_num);
-	DEBUG_COMMAND("IC %d,%p:", cursor_num, oldcursor);
+	TRACE("IC %d,%p:", cursor_num, oldcursor);
 }
 
 void commandIZ() {
@@ -128,7 +128,7 @@ void commandIZ() {
 	int y = getCaliValue();
 	
 	ags_setCursorLocation(x, y, true, false);
-	DEBUG_COMMAND("IZ %d,%d:", x, y);
+	TRACE("IZ %d,%d:", x, y);
 }
 
 void commandIX() {
@@ -136,7 +136,7 @@ void commandIX() {
 	int *var = getCaliVariable();
 	
 	*var = msgskip_isSkipping() == TRUE ? 1 : 0;
-	DEBUG_COMMAND("IX %p:",var);
+	TRACE("IX %p:",var);
 }
 
 void commandIY() {
@@ -152,7 +152,7 @@ void commandIY() {
 		msgskip_setFlags(0, MSGSKIP_STOP_ON_MENU);
 	}
 	
-	DEBUG_COMMAND("IY %d:",p1);
+	TRACE("IY %d:",p1);
 }
 
 void commandIG() { /* T2 */
@@ -167,7 +167,7 @@ void commandIG() { /* T2 */
 		var++;
 	}
 	
-	DEBUG_COMMAND("IG %p,%d,%d,%d", var, code, cnt, rsv);
+	TRACE("IG %p,%d,%d,%d", var, code, cnt, rsv);
 }
 
 void commandIE() {
@@ -175,5 +175,5 @@ void commandIE() {
 	int p2 = getCaliValue();
 	
 	ags_loadCursor(p1, p2);
-	DEBUG_COMMAND("IE %d,%d", p1, p2);
+	TRACE("IE %d,%d", p1, p2);
 }
diff --git a/src/cmdj.c b/src/cmdj.c
index 4d920d6..7661287 100644
--- a/src/cmdj.c
+++ b/src/cmdj.c
@@ -32,7 +32,7 @@ void commandJ0() {
 	int y = getCaliValue();
 	
 	cg_set_display_location(x, y, OFFSET_ABSOLUTE_GC);
-	DEBUG_COMMAND("J0 %d,%d:", x, y);
+	TRACE("J0 %d,%d:", x, y);
 }
 
 void commandJ1() {
@@ -40,7 +40,7 @@ void commandJ1() {
 	int y = getCaliValue();
 	
 	cg_set_display_location(x, y, OFFSET_RELATIVE_GC);
-	DEBUG_COMMAND("J1 %d,%d:", x, y);
+	TRACE("J1 %d,%d:", x, y);
 }
 
 void commandJ2() {
@@ -48,7 +48,7 @@ void commandJ2() {
 	int y = getCaliValue();
 
 	cg_set_display_location(x, y, OFFSET_ABSOLUTE_JC);
-	DEBUG_COMMAND("J2:%d,%d", x, y);
+	TRACE("J2:%d,%d", x, y);
 }
 
 void commandJ3() {
@@ -56,10 +56,10 @@ void commandJ3() {
 	int y = getCaliValue();
 	
 	cg_set_display_location(x, y, OFFSET_RELATIVE_JC);
-	DEBUG_COMMAND("J3:%d,%d", x, y);
+	TRACE("J3:%d,%d", x, y);
 }
 
 void commandJ4() {
 	cg_set_display_location(0, 0, OFFSET_NOMOVE);
-	DEBUG_COMMAND("J4 :");
+	TRACE("J4 :");
 }
diff --git a/src/cmdk.c b/src/cmdk.c
index aea5890..2cd19e1 100644
--- a/src/cmdk.c
+++ b/src/cmdk.c
@@ -34,7 +34,7 @@ void commandKI() {
 	
 	*var = network_create_channel(port_num, user_max);
 	
-	DEBUG_COMMAND_YET("KI %d,%d,%d:", *var, port_num, user_max);
+	TRACE_UNIMPLEMENTED("KI %d,%d,%d:", *var, port_num, user_max);
 	return;
 }
 
@@ -44,7 +44,7 @@ void commandKK() {
 
 	network_close(use_num);
 	
-	DEBUG_COMMAND_YET("KK %d:", use_num);
+	TRACE_UNIMPLEMENTED("KK %d:", use_num);
 	return;
 }
 
@@ -54,7 +54,7 @@ void commandKN() {
 
 	*var = network_get_channel();
 	
-	DEBUG_COMMAND_YET("KN %d:", *var);
+	TRACE_UNIMPLEMENTED("KN %d:", *var);
 	return;
 }
 
@@ -64,7 +64,7 @@ void commandKP() {
 	
 	*var = network_check_buffer();
 	
-	DEBUG_COMMAND_YET("KP %d:", *var);
+	TRACE_UNIMPLEMENTED("KP %d:", *var);
 	return;
 }
 
@@ -75,7 +75,7 @@ void commandKQ() {
 	
 	*var = network_get_user_state(user_num);
 	
-	DEBUG_COMMAND_YET("KQ %d,%d:", *var, user_num);
+	TRACE_UNIMPLEMENTED("KQ %d,%d:", *var, user_num);
 	return;
 }
 
@@ -85,7 +85,7 @@ void commandKR() {
 	
 	network_read_buffer(var);
 	
-	DEBUG_COMMAND_YET("KR %d:", *var);
+	TRACE_UNIMPLEMENTED("KR %d:", *var);
 	return;
 }
 
@@ -96,6 +96,6 @@ void commandKW() {
 
 	network_write_buffer(var, num);
 	
-	DEBUG_COMMAND_YET("KR %d,%d:", *var, num);
+	TRACE_UNIMPLEMENTED("KR %d,%d:", *var, num);
 	return;
 }
diff --git a/src/cmdl.c b/src/cmdl.c
index 5146978..31b4031 100644
--- a/src/cmdl.c
+++ b/src/cmdl.c
@@ -46,7 +46,7 @@ void commandLD() {
 	} else {
 		sysVar[0] = save_loadAll(num - 1);
 	}
-	DEBUG_COMMAND("LD %d:",num);
+	TRACE("LD %d:",num);
 }
 
 void commandLP() {
@@ -61,7 +61,7 @@ void commandLP() {
 	} else {
 		sysVar[0] = save_loadPartial(num - 1, &point, cnt);
 	}
-	DEBUG_COMMAND("LP %d,%d,%d:",num, point.var, cnt);
+	TRACE("LP %d,%d,%d:",num, point.var, cnt);
 }
 
 void commandLT() {
@@ -103,7 +103,7 @@ void commandLT() {
 		var[5] = lc->tm_sec;
 		sysVar[0]  = 0;
 	}
-	DEBUG_COMMAND("LT %d,%p",num, var);
+	TRACE("LT %d,%p",num, var);
 }
 
 void commandLE() {
@@ -133,7 +133,7 @@ void commandLE() {
 	}
 	free(fname_utf8);
 	
-	DEBUG_COMMAND("LE %d,%s,%d,%d:",type, filename, var, cnt);
+	TRACE("LE %d,%s,%d,%d:",type, filename, var, cnt);
 }
 
 void commandLL() {
@@ -158,7 +158,7 @@ void commandLL() {
 		var = getCaliVariable();
 		num  = getCaliValue();
 
-		DEBUG_COMMAND("LL %d,%d,%d,%d:",type, link_no, _var, num);
+		TRACE("LL %d,%d,%d,%d:",type, link_no, _var, num);
 		
 		if (dfile->size < num * sizeof(uint16_t)) {
 			WARNING("data shortage (link_no = %d, requested %d, loaded %d)", link_no, num, dfile->size/ sizeof(uint16_t));
@@ -174,7 +174,7 @@ void commandLL() {
 	case 1:
 		_var = getCaliValue();
 		num  = getCaliValue();
-		DEBUG_COMMAND_YET("LL1 not yet %d, %d", _var, num);
+		TRACE_UNIMPLEMENTED("LL1 not yet %d, %d", _var, num);
 		sysVar[0] = 255;
 		goto out;
 		break;
@@ -197,7 +197,7 @@ void commandLHD() {
 	// X版では全てをHDDに置くのでサポートしない
 	
 	sysVar[0] = 255;
-	DEBUG_COMMAND("LHD %d,%d:",p1,no);
+	TRACE("LHD %d,%d:",p1,no);
 }
 
 void commandLHG() {
@@ -221,7 +221,7 @@ void commandLHG() {
 		sysVar[0] = (no == last_registered) ? 1 : 0;
 		break;
 	}
-	DEBUG_COMMAND("LHG %d,%d:",p1,no);
+	TRACE("LHG %d,%d:",p1,no);
 }
 
 void commandLHM() {
@@ -231,7 +231,7 @@ void commandLHM() {
 	// X版では全てをHDDに置くのでサポートしない
 	
 	sysVar[0] = 255;
-	DEBUG_COMMAND("LHM %d,%d:",p1,no);
+	TRACE("LHM %d,%d:",p1,no);
 }
 
 void commandLHS() {
@@ -241,7 +241,7 @@ void commandLHS() {
 	// X版では全てをHDDに置くのでサポートしない
 	
 	sysVar[0] = 255;
-	DEBUG_COMMAND("LHS %d,%d:",p1,no);
+	TRACE("LHS %d,%d:",p1,no);
 }
 
 void commandLHW() {
@@ -251,7 +251,7 @@ void commandLHW() {
 	// X版では全てをHDDに置くのでサポートしない
 	
 	sysVar[0] = 255;
-	DEBUG_COMMAND("LHW %d,%d:",p1,no);
+	TRACE("LHW %d,%d:",p1,no);
 }
 
 void commandLC() {
@@ -263,7 +263,7 @@ void commandLC() {
 	sysVar[0] = cg_load_with_filename(fname_utf8, x, y);
 	free(fname_utf8);
 	
-	DEBUG_COMMAND("LC %d,%d,%s:", x, y, filename);
+	TRACE("LC %d,%d,%s:", x, y, filename);
 }
 
 void commandLXG() {
@@ -272,7 +272,7 @@ void commandLXG() {
 	const char *title = sl_getString(':');
 	const char *filter = sl_getString(':');
 
-	DEBUG_COMMAND_YET("LXG %d,%s,%s:", file_name, title, filter);
+	TRACE_UNIMPLEMENTED("LXG %d,%s,%s:", file_name, title, filter);
 }
 
 void commandLXO() {
@@ -282,14 +282,14 @@ void commandLXO() {
 	int how_to_create = getCaliValue();
 
 	sysVar[0]=255;
-	DEBUG_COMMAND_YET("LXO %d,%d,%d:",num,file_name,how_to_create);
+	TRACE_UNIMPLEMENTED("LXO %d,%d,%d:",num,file_name,how_to_create);
 }
 
 void commandLXC() {
 	/* ファイルをクローズする */
 	int num = getCaliValue();
 	
-	DEBUG_COMMAND_YET("LXC %d:",num);
+	TRACE_UNIMPLEMENTED("LXC %d:",num);
 }
 
 void commandLXL() {
@@ -298,7 +298,7 @@ void commandLXL() {
 	int y         = getCaliValue();
 	int file_name = getCaliValue();
 	
-	DEBUG_COMMAND_YET("LXL %d,%d,%d:",x,y,file_name);
+	TRACE_UNIMPLEMENTED("LXL %d,%d,%d:",x,y,file_name);
 }
 
 void commandLXS() {
@@ -307,7 +307,7 @@ void commandLXS() {
 	int *hi = getCaliVariable();
 	int *lo = getCaliVariable();
 	
-	DEBUG_COMMAND_YET("LXS %d,%d,%d:", num, *hi, *lo);
+	TRACE_UNIMPLEMENTED("LXS %d,%d,%d:", num, *hi, *lo);
 }
 
 void commandLXP() {
@@ -316,7 +316,7 @@ void commandLXP() {
 	int hi  = getCaliValue();
 	int lo  = getCaliValue();
 	
-	DEBUG_COMMAND_YET("LXP %d,%d,%d:",num,hi,lo);
+	TRACE_UNIMPLEMENTED("LXP %d,%d,%d:",num,hi,lo);
 }
 
 void commandLXR() {
@@ -325,7 +325,7 @@ void commandLXR() {
 	int *var = getCaliVariable();
 	int size = getCaliValue();
 	
-	DEBUG_COMMAND_YET("LXR %d,%d,%d:",num,*var,size);
+	TRACE_UNIMPLEMENTED("LXR %d,%d,%d:",num,*var,size);
 }
 
 void commandLXW() {
@@ -334,7 +334,7 @@ void commandLXW() {
 	int *var = getCaliVariable();
 	int size = getCaliValue();
 	
-	DEBUG_COMMAND_YET("LXW %d,%d,%d:",num,*var,size);
+	TRACE_UNIMPLEMENTED("LXW %d,%d,%d:",num,*var,size);
 }
 
 void commandLXX() {
@@ -370,9 +370,9 @@ void commandLXX() {
 	case 4: // data
 	case 6: // resource
 	default:
-		DEBUG_COMMAND_YET("LXX %d,%d,%d:", type, num, *var);
+		TRACE_UNIMPLEMENTED("LXX %d,%d,%d:", type, num, *var);
 		return;
 	}
 
-	DEBUG_COMMAND("LXX %d,%d,%d:", type, num, *var);
+	TRACE("LXX %d,%d,%d:", type, num, *var);
 }
diff --git a/src/cmdm.c b/src/cmdm.c
index e79a0dd..2bbb151 100644
--- a/src/cmdm.c
+++ b/src/cmdm.c
@@ -44,7 +44,7 @@ void commandMS() {
 	const char *str = sl_getString(':');
 	
 	svar_set(num, str);
-	DEBUG_COMMAND("MS %d,%s:",num,str);
+	TRACE("MS %d,%s:",num,str);
 }
 
 void commandMP() {
@@ -85,7 +85,7 @@ void commandMP() {
 	}
 
 	sys_addMsg(str);
-	DEBUG_COMMAND("MP %d,%d:",num1,num2);
+	TRACE("MP %d,%d:",num1,num2);
 	
 	free(str);
 }
@@ -118,7 +118,7 @@ void commandMI() { /* T2 */
 	free(t1);
 	free(t2);
 	free(t3);
-	DEBUG_COMMAND("MI %d,%d,%s:",dst_no,max_len, title);
+	TRACE("MI %d,%d,%s:",dst_no,max_len, title);
 }
 
 void commandMA() {
@@ -134,7 +134,7 @@ void commandMA() {
 		svar_append(num1, svar_get(num2));
 	}
 	
-	DEBUG_COMMAND("MA %d,%d:",num1,num2);
+	TRACE("MA %d,%d:",num1,num2);
 }
 
 void commandMC() {
@@ -144,7 +144,7 @@ void commandMC() {
 	
 	sysVar[0] = strcmp(svar_get(num1), svar_get(num2)) == 0 ? 1 : 0;
 	
-	DEBUG_COMMAND("MC %d,%d:",num1,num2);
+	TRACE("MC %d,%d:",num1,num2);
 }
 
 void commandMT() {
@@ -158,7 +158,7 @@ void commandMT() {
 	
 	enable_hack_by_title(nact->game_title_utf8);
 
-	DEBUG_COMMAND("MT %s:",str);
+	TRACE("MT %s:",str);
 }
 
 void commandMM() {
@@ -169,7 +169,7 @@ void commandMM() {
 	if (num1 != num2)
 		svar_set(num1, svar_get(num2));
 	
-	DEBUG_COMMAND("MM %d,%d:",num1, num2);
+	TRACE("MM %d,%d:",num1, num2);
 }
 
 void commandMH() {
@@ -183,7 +183,7 @@ void commandMH() {
 	svar_set(num1, s);
 	free(s);
 
-	DEBUG_COMMAND("MH %d,%d,%d:",num1,fig,num2);
+	TRACE("MH %d,%d,%d:",num1,fig,num2);
 }
 
 void commandMV() {
@@ -191,7 +191,7 @@ void commandMV() {
 	int version = getCaliValue();
 
 	nact->scenario_version = version;
-	DEBUG_COMMAND("MV %d:",version);
+	TRACE("MV %d:",version);
 }
 
 void commandML() {
@@ -201,7 +201,7 @@ void commandML() {
 	
 	*var = svar_length(str_no);
 	
-	DEBUG_COMMAND("ML %p,%d:",var, str_no);
+	TRACE("ML %p,%d:",var, str_no);
 }
 
 void commandMD() {
@@ -212,7 +212,7 @@ void commandMD() {
 	
 	svar_copy(dst_str_no, 0, src_str_no, 0, len);
 	
-	DEBUG_COMMAND("MD %d,%d,%d:",dst_str_no, src_str_no, len);
+	TRACE("MD %d,%d,%d:",dst_str_no, src_str_no, len);
 }
 
 void commandME() {
@@ -225,7 +225,7 @@ void commandME() {
 	
 	svar_copy(dst_str_no, dst_pos, src_str_no, src_pos, len);
 	
-	DEBUG_COMMAND("ME %d,%d,%d,%d,%d:",dst_str_no, dst_pos, src_str_no, src_pos, len);
+	TRACE("ME %d,%d,%d,%d,%d:",dst_str_no, dst_pos, src_str_no, src_pos, len);
 }
 
 void commandMF() {
@@ -244,7 +244,7 @@ void commandMF() {
 		sysVar[0] = 0;
 	}
 	
-	DEBUG_COMMAND("MF %p,%d,%d,%d:",var, dst_no, key_no, start_pos);
+	TRACE("MF %p,%d,%d,%d:",var, dst_no, key_no, start_pos);
 }
 
 void commandMZ0() {
@@ -253,7 +253,7 @@ void commandMZ0() {
 	int max_num = getCaliValue();
 	int rsv     = getCaliValue();
 	
-	DEBUG_COMMAND("MZ0 %d,%d,%d:",max_len, max_num, rsv);
+	TRACE("MZ0 %d,%d,%d:",max_len, max_num, rsv);
 	
 	svar_init(max_num);
 }
@@ -306,7 +306,7 @@ void commandMG() {
 		break;
 	}
 
-	DEBUG_COMMAND("MG %d,%d:",no, sw);
+	TRACE("MG %d,%d:",no, sw);
 }
 
 void commandMJ() {
@@ -335,7 +335,7 @@ void commandMJ() {
 
 	free(t1);
 	free(t2);
-	DEBUG_COMMAND("MJ %d,%d,%d,%d,%d:", num, x, y, h, max_len);
+	TRACE("MJ %d,%d,%d,%d,%d:", num, x, y, h, max_len);
 }
 
 void commandMN() {
@@ -355,5 +355,5 @@ void commandMN() {
 	default:
 		WARNING("UnKnown MN command(%d)", no);
 	}
-	DEBUG_COMMAND("MN %d,%d,%d:",no, num, *var);
+	TRACE("MN %d,%d,%d:",no, num, *var);
 }
diff --git a/src/cmdn.c b/src/cmdn.c
index d057316..217374a 100644
--- a/src/cmdn.c
+++ b/src/cmdn.c
@@ -51,7 +51,7 @@ void commandNB() {
 		return;
 	}
 	
-	DEBUG_COMMAND("NB %d,%d,%d:", *var1, *var2, cnt);
+	TRACE("NB %d,%d,%d:", *var1, *var2, cnt);
 	while(cnt--) {
 		*var1 = *var2; var1++; var2++;
 	}
@@ -62,7 +62,7 @@ void commandNC() {
 	int *var1 = getCaliVariable();
 	int cnt   = getCaliValue();
 	
-	DEBUG_COMMAND("NC %d,%d:", *var1, cnt);
+	TRACE("NC %d,%d:", *var1, cnt);
 	
 	while(cnt--) {
 		*var1++ = 0;
@@ -76,7 +76,7 @@ void commandNR() {
 	int *var2 = getCaliVariable();
 	
 	*var2 = (int)sqrtf(var1);
-	DEBUG_COMMAND("NR %d,%d:", var1, *var2);
+	TRACE("NR %d,%d:", var1, *var2);
 }
 
 void commandN_ADD() {
@@ -85,7 +85,7 @@ void commandN_ADD() {
 	int num   = getCaliValue();
 	int cnt   = getCaliValue();
 	
-	DEBUG_COMMAND("N+ %d,%d,%d:", *var1, num, cnt);
+	TRACE("N+ %d,%d,%d:", *var1, num, cnt);
 	while(cnt--) {
 		*var1 = (uint16_t)(*var1 + num); var1++;
 		// *var1 += num; var1++;
@@ -98,7 +98,7 @@ void commandN_SUB() {
 	int num  = getCaliValue();
 	int cnt  = getCaliValue();
 	
-	DEBUG_COMMAND("N- %d,%d,%d:", *var1, num, cnt);
+	TRACE("N- %d,%d,%d:", *var1, num, cnt);
 	while(cnt--) {
 		*var1 = max(0, *var1 - num); var1++;
 		// *var1 -= num; var1++;
@@ -111,7 +111,7 @@ void commandN_MUL() {
 	int num   = getCaliValue();
 	int cnt   = getCaliValue();
 	
-	DEBUG_COMMAND("N* %d,%d,%d:", *var1, num, cnt);
+	TRACE("N* %d,%d,%d:", *var1, num, cnt);
 	while(cnt--) {
 		*var1 = (uint16_t)(*var1 * num); var1++;
 		// *var1 *= num; var1++;
@@ -124,7 +124,7 @@ void commandN_DIV() {
 	int num   = getCaliValue();
 	int cnt   = getCaliValue();
 	
-	DEBUG_COMMAND("N/ %d,%d,%d:", *var1, num, cnt);
+	TRACE("N/ %d,%d,%d:", *var1, num, cnt);
 	while(cnt--) {
 		// *var1 = (unsigned short)(*var1)/num; var1++;
 		*var1 /= num; var1++;
@@ -140,7 +140,7 @@ void commandN_GT() {
 	int cnt   = getCaliValue();
 	int *var2 = getCaliVariable();
 	
-	DEBUG_COMMAND("N> %d,%d,%d,%d:", *var1, num, cnt, *var2);
+	TRACE("N> %d,%d,%d,%d:", *var1, num, cnt, *var2);
 	while (cnt--) {
 		*var2 = *var1 > num ? 1 : 0; var1++; var2++;
 	}
@@ -155,7 +155,7 @@ void commandN_LT() {
 	int cnt   = getCaliValue();
 	int *var2 = getCaliVariable();
 	
-	DEBUG_COMMAND("N< %p,%d,%d,%p:", var1, num, cnt, var2);
+	TRACE("N< %p,%d,%d,%p:", var1, num, cnt, var2);
 	while(cnt--) {
 		*var2 = *var1 < num ? 1 : 0; var1++; var2++;
 	}
@@ -170,7 +170,7 @@ void commandN_EQ() {
 	int cnt   = getCaliValue();
 	int *var2 = getCaliVariable();
 	
-	DEBUG_COMMAND("N= %p,%d,%d,%p:", var1, num, cnt, var2);
+	TRACE("N= %p,%d,%d,%p:", var1, num, cnt, var2);
 	while(cnt--) {
 		*var2 = *var1 == num ? 1 : 0; var1++; var2++;
 	}
@@ -181,7 +181,7 @@ void commandN_NE() {
 	int *var1 = getCaliVariable();
 	int cnt   = getCaliValue();
 	
-	DEBUG_COMMAND("N\\ %p,%d:", var1, cnt);
+	TRACE("N\\ %p,%d:", var1, cnt);
 	while(cnt--) {
 		*var1 ^= 1; var1++;
 	}
@@ -193,7 +193,7 @@ void commandN_AND() {
 	int cnt   = getCaliValue();
 	int *var2 = getCaliVariable();
 	
-	DEBUG_COMMAND("N& %p,%d,%p:", var1, cnt, var2);
+	TRACE("N& %p,%d,%p:", var1, cnt, var2);
 	while(cnt--) {
 		*var2 &= *var1; var1++; var2++;
 	}
@@ -205,7 +205,7 @@ void commandN_OR() {
 	int cnt   = getCaliValue();
 	int *var2 = getCaliVariable();
 	
-	DEBUG_COMMAND("N| %p,%d,%p:", var1, cnt, var2);
+	TRACE("N| %p,%d,%p:", var1, cnt, var2);
 	while(cnt--) {
 		*var2 |= *var1; var1++; var2++;
 	}
@@ -217,7 +217,7 @@ void commandN_XOR() {
 	int cnt   = getCaliValue();
 	int *var2 = getCaliVariable();
 	
-	DEBUG_COMMAND("N^ %p,%d,%p:", var1, cnt, var2);
+	TRACE("N^ %p,%d,%p:", var1, cnt, var2);
 	while(cnt--) {
 		*var2 ^= *var1; var1++; var2++;
 	}
@@ -228,7 +228,7 @@ void commandN_NOT() {
 	int *var = getCaliVariable();
 	int cnt  = getCaliValue();
 	
-	DEBUG_COMMAND("N~ %p,%d", var, cnt);
+	TRACE("N~ %p,%d", var, cnt);
 	while(cnt--) {
 		*var ^= 0xffff; var++;
 	}
@@ -262,7 +262,7 @@ void commandNO() { /* T2 */
 		WARNING("Unknown NO %d command", p1);
 	}
 	
-	DEBUG_COMMAND("NO %d,%p,%p,%d:", p1, src_var, dst_var, cnt);
+	TRACE("NO %d,%p,%p,%d:", p1, src_var, dst_var, cnt);
 }
 
 void commandNDC() {
@@ -271,7 +271,7 @@ void commandNDC() {
 	int num  = getCaliValue();
 	longVar[w64n] = num;
 	
-	DEBUG_COMMAND("NDC %d,%d:", w64n, num);
+	TRACE("NDC %d,%d:", w64n, num);
 }
 
 void commandNDD() {
@@ -280,7 +280,7 @@ void commandNDD() {
 	int w64n = getCaliValue();
 	*var = (int)longVar[w64n];
 	
-	DEBUG_COMMAND("NDD %p,%d:", var, w64n);
+	TRACE("NDD %p,%d:", var, w64n);
 }
 
 void commandNDM() {
@@ -288,7 +288,7 @@ void commandNDM() {
 	int str  = getCaliValue();
 	int w64n = getCaliValue();
 	
-	DEBUG_COMMAND_YET("NDM %d,%d:", str, w64n);
+	TRACE_UNIMPLEMENTED("NDM %d,%d:", str, w64n);
 }
 
 void commandNDA() { 
@@ -296,7 +296,7 @@ void commandNDA() {
 	int str  = getCaliValue();
 	int w64n = getCaliValue();
 	
-	DEBUG_COMMAND_YET("NDA %d,%d:", str, w64n);
+	TRACE_UNIMPLEMENTED("NDA %d,%d:", str, w64n);
 }
 
 void commandNDH() {
@@ -304,7 +304,7 @@ void commandNDH() {
 	int str  = getCaliValue();
 	int w64n = getCaliValue();
 	
-	DEBUG_COMMAND_YET("NDH %d,%d:", str, w64n);
+	TRACE_UNIMPLEMENTED("NDH %d,%d:", str, w64n);
 }
 
 void commandND_ADD() {
@@ -315,7 +315,7 @@ void commandND_ADD() {
 	
 	longVar[w64n1] = longVar[w64n2] + longVar[w64n3];
 	
-	DEBUG_COMMAND("ND+ %d,%d,%d:", w64n1, w64n2);
+	TRACE("ND+ %d,%d,%d:", w64n1, w64n2);
 }
 
 void commandND_SUB() {
@@ -326,7 +326,7 @@ void commandND_SUB() {
 	
 	longVar[w64n1] = longVar[w64n2] - longVar[w64n3];
 	
-	DEBUG_COMMAND("ND- %d,%d,%d:", w64n1, w64n2, w64n3);
+	TRACE("ND- %d,%d,%d:", w64n1, w64n2, w64n3);
 }
 
 void commandND_MUL() {
@@ -337,7 +337,7 @@ void commandND_MUL() {
 	
 	longVar[w64n1] = longVar[w64n2] * longVar[w64n3];
 	
-	DEBUG_COMMAND("ND* %d,%d,%d:", w64n1, w64n2, w64n3);
+	TRACE("ND* %d,%d,%d:", w64n1, w64n2, w64n3);
 }
 
 void commandND_DIV() {
@@ -348,7 +348,7 @@ void commandND_DIV() {
 	
 	longVar[w64n1] = longVar[w64n2] / longVar[w64n3];
 	
-	DEBUG_COMMAND("ND/ %d,%d,%d:", w64n1, w64n2, w64n3);
+	TRACE("ND/ %d,%d,%d:", w64n1, w64n2, w64n3);
 }
 
 void commandNI() { /* From Panyo */
@@ -373,7 +373,7 @@ void commandNI() { /* From Panyo */
 		sysVar[0] = 0;
 	}
 	
-	DEBUG_COMMAND("NI %p,%d,%d,%d:", var, def, _min, _max);
+	TRACE("NI %p,%d,%d,%d:", var, def, _min, _max);
 }
 
 void commandNT() { /* From Panyo */
@@ -383,7 +383,7 @@ void commandNT() { /* From Panyo */
 	free(ni_param.title);
 	ni_param.title = toUTF8(str);
 	
-	DEBUG_COMMAND("NT %p:", str);
+	TRACE("NT %p:", str);
 }
 
 void commandNP() {
@@ -393,7 +393,7 @@ void commandNP() {
 	int count   = getCaliValue();
 	int *result = getCaliVariable();
 	
-	DEBUG_COMMAND("NP %d,%d,%d,%d:", *var1, *var2, count, *result);
+	TRACE("NP %d,%d,%d,%d:", *var1, *var2, count, *result);
 
 	while(count--) {
 		if (*var1 != *var2) {
diff --git a/src/cmdp.c b/src/cmdp.c
index 70bd8ab..0b55308 100644
--- a/src/cmdp.c
+++ b/src/cmdp.c
@@ -32,7 +32,7 @@ void commandPN() {
 	/* num 番のＣＧを表示する時、カラーパレットを展開しないようにする。*/
 	int num = getCaliValue();
 	
-	DEBUG_COMMAND_YET("PN %d:",num);
+	TRACE_UNIMPLEMENTED("PN %d:",num);
 }
 
 void commandPF() {
@@ -60,7 +60,7 @@ void commandPF() {
 		sysVar[0] = nact->waitcancel_key; break;
 	}
 	
-	DEBUG_COMMAND("PF %d,%d,%d:", p1, num, cancel_enabled);
+	TRACE("PF %d,%d,%d:", p1, num, cancel_enabled);
 }
 
 void commandPW() {
@@ -88,7 +88,7 @@ void commandPW() {
 		sysVar[0] = nact->waitcancel_key; break;
 	}
 	
-	DEBUG_COMMAND("PW %d,%d,%d:", p1, num, cancel_enabled);
+	TRACE("PW %d,%d,%d:", p1, num, cancel_enabled);
 }
 
 void commandPS() {
@@ -101,7 +101,7 @@ void commandPS() {
 
 	ags_setPalette(Plane, Red, Green, Blue);
 	ags_setPaletteToSystem(Plane, 1);
-	DEBUG_COMMAND("PS %d,%d,%d,%d:", Plane, Red, Green, Blue);
+	TRACE("PS %d,%d,%d,%d:", Plane, Red, Green, Blue);
 }
 
 void commandPG() { /* T2 */
@@ -116,7 +116,7 @@ void commandPG() { /* T2 */
 		*var++ = nact->ags.pal[num1 + i].g;
 		*var++ = nact->ags.pal[num1 + i].b;
 	}
-	DEBUG_COMMAND("PG %p,%d,%d:", var, num1, num2);
+	TRACE("PG %p,%d,%d:", var, num1, num2);
 }
 
 void commandPP() { /* T2 */
@@ -130,7 +130,7 @@ void commandPP() { /* T2 */
 		ags_setPalette(num1 + i, *var, *(var +1), *(var +2)); var+=3;
 	}
 	ags_setPaletteToSystem(num1, num2);
-	DEBUG_COMMAND("PP %p,%d,%d:", var, num1, num2);
+	TRACE("PP %p,%d,%d:", var, num1, num2);
 }
 
 void commandPC() {
@@ -139,7 +139,7 @@ void commandPC() {
 
 	cg_fflg = num;
 	
-	DEBUG_COMMAND("PC %d:",num);
+	TRACE("PC %d:",num);
 }
 
 void commandPD() {
@@ -148,7 +148,7 @@ void commandPD() {
 	
 	cg_brightness = num;
 	
-	DEBUG_COMMAND("PD %d:",num);
+	TRACE("PD %d:",num);
 }
 
 void commandPT0() {
@@ -161,7 +161,7 @@ void commandPT0() {
 	ags_getPixel(x, y, &cell);
 	*var = cell.pixel;
 	
-	DEBUG_COMMAND("PT0 %p,%d,%d:", var, x, y);
+	TRACE("PT0 %p,%d,%d:", var, x, y);
 }
 
 void commandPT1() {
@@ -178,7 +178,7 @@ void commandPT1() {
 	*g_var = cell.g;
 	*b_var = cell.b;
 
-	DEBUG_COMMAND("PT1 %p,%p,%p,%d,%d:", r_var, g_var, b_var, x, y);
+	TRACE("PT1 %p,%p,%p,%d,%d:", r_var, g_var, b_var, x, y);
 }
 
 void commandPT2() {
@@ -200,5 +200,5 @@ void commandPT2() {
 	*hi_var  = pic >> 8;
 	*low_var = pic & 0xff;
 	
-	DEBUG_COMMAND("PT2 %p,%p,%d,%d:", hi_var, low_var, x, y);
+	TRACE("PT2 %p,%p,%d,%d:", hi_var, low_var, x, y);
 }
diff --git a/src/cmdq.c b/src/cmdq.c
index f7d33b9..a80f09e 100644
--- a/src/cmdq.c
+++ b/src/cmdq.c
@@ -42,7 +42,7 @@ void commandQD() {
 	
 	if (sysVar[0] > 200) WARNING("Failed to save (%d)", sysVar[0]);
 	
-	DEBUG_COMMAND("QD %d:",num);
+	TRACE("QD %d:",num);
 }
 
 void commandQP() {
@@ -60,7 +60,7 @@ void commandQP() {
 	
 	if (sysVar[0] > 200) WARNING("Failed to save (%d)", sysVar[0]);
 	
-	DEBUG_COMMAND("QP %d,%d,%d:", num, point.var, cnt);
+	TRACE("QP %d,%d,%d:", num, point.var, cnt);
 }
 
 void commandQC() {
@@ -76,7 +76,7 @@ void commandQC() {
 	
 	if (sysVar[0] > 200) WARNING("Failed to save (%d)", sysVar[0]);
 	
-	DEBUG_COMMAND("QC %d,%d:",num1,num2);
+	TRACE("QC %d,%d:",num1,num2);
 }
 
 void commandQE() {
@@ -107,5 +107,5 @@ void commandQE() {
 	free(fname_utf8);
 	if (sysVar[0] > 200) WARNING("Failed to save (%d)", sysVar[0]);
 	
-	DEBUG_COMMAND("QE %d,%s,%d,%d:", type, filename, var, cnt);
+	TRACE("QE %d,%s,%d,%d:", type, filename, var, cnt);
 }
diff --git a/src/cmds.c b/src/cmds.c
index 05d1a9b..3916c34 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -37,7 +37,7 @@ void commandSS() {
 	/* 音楽演奏を開始する（ＣＤのみ）*/
 	int num = getCaliValue();
 	
-	DEBUG_COMMAND("SS %d:",num);
+	TRACE("SS %d:",num);
 	
 	if (num == 0) {
 		muscd_stop();
@@ -65,7 +65,7 @@ void commandSC() {
 		*var++ = 999;
 	}
 	
-	DEBUG_COMMAND("SC %p:",var);
+	TRACE("SC %p:",var);
 }
 
 void commandSD() {
@@ -73,7 +73,7 @@ void commandSD() {
 	int num1 = getCaliValue();
 	int num2 = getCaliValue();
 	
-	DEBUG_COMMAND_YET("SD %d,%d:",num1,num2);
+	TRACE_UNIMPLEMENTED("SD %d,%d:",num1,num2);
 }
 
 void commandSR() {
@@ -112,7 +112,7 @@ void commandSR() {
 		*var = st.play_no;
 	}
 	
-	DEBUG_COMMAND("SR %d,%p:",num, var);
+	TRACE("SR %d,%p:",num, var);
 }
 
 void commandSL() {
@@ -121,7 +121,7 @@ void commandSL() {
 	
 	next_cdrom_loopcnt = num;
 	
-	DEBUG_COMMAND("SL %d:",num);
+	TRACE("SL %d:",num);
 }
 
 void commandSI() {
@@ -137,7 +137,7 @@ void commandSI() {
 		*var = muscd_is_available() ? 1 : 0;
 	}
 	
-	DEBUG_COMMAND("SI %d,%d:",type,*var);
+	TRACE("SI %d,%d:",type,*var);
 }
 
 void commandSG() {
@@ -152,7 +152,7 @@ void commandSG() {
 		/* 演奏中のＭＩＤＩを停止する */
 		num = getCaliValue();
 		mus_midi_stop();
-		DEBUG_COMMAND("SG0 %d:", num);
+		TRACE("SG0 %d:", num);
 		break;
 	case 1:
 		/* ＭＩＤＩを演奏する */
@@ -162,14 +162,14 @@ void commandSG() {
 		} else {
 			mus_midi_start(num, loopcnt);
 		}
-		DEBUG_COMMAND("SG1 %d:", num);
+		TRACE("SG1 %d:", num);
 		break;
 	case 2:
 		/* ＭＩＤＩ演奏位置を1/100秒単位で取得する */
 		var = getCaliVariable();
 		mus_midi_get_playposition(&st);
 		*var = st.loc_ms / 10;
-		DEBUG_COMMAND("SG2 %p:", var);
+		TRACE("SG2 %p:", var);
 		break;
 	case 3:
 		num = getCaliValue();
@@ -180,40 +180,40 @@ void commandSG() {
 			/* 一時停止中のＭＩＤＩの一時停止を解除する */
 			mus_midi_unpause();
 		}
-		DEBUG_COMMAND("SG3 %d:", num);
+		TRACE("SG3 %d:", num);
 		break;
 	case 4:
 		num = getCaliValue();
 		/* 次のSG1コマンドでのMIDI演奏の繰り返し回数指定 */
 		loopcnt = num;
-		DEBUG_COMMAND("SG4 %d:", num);
+		TRACE("SG4 %d:", num);
 		break;
 	case 5:
 		fnum = getCaliValue() & 0x7f;
 		num  = getCaliValue();
 		mus_midi_set_flag(0, fnum, num);
 		
-		DEBUG_COMMAND("SG5 %d,%d:", fnum, num);
+		TRACE("SG5 %d,%d:", fnum, num);
 		break;
 	case 6:
 		fnum = getCaliValue() & 0x7f;
 		num  = getCaliValue();
 		mus_midi_set_flag(1, fnum, num);
 		
-		DEBUG_COMMAND("SG6 %d,%d:", fnum, num);
+		TRACE("SG6 %d,%d:", fnum, num);
 		break;
 	case 7:
 		fnum = getCaliValue() & 0x7f;
 		var  = getCaliVariable();
 		*var = mus_midi_get_flag(0, fnum);
 		
-		DEBUG_COMMAND("SG7 %d,%d:", fnum, *var);
+		TRACE("SG7 %d,%d:", fnum, *var);
 		break;
 	case 8: {
 		fnum = getCaliValue() & 0x7f;
 		var  = getCaliVariable();
 		*var = mus_midi_get_flag(1, fnum);
-		DEBUG_COMMAND("SG8 %d,%p:", fnum, var);
+		TRACE("SG8 %d,%p:", fnum, var);
 		break;
 	}
 	default:
@@ -227,7 +227,7 @@ void commandSP() {
 	int no = getCaliValue();
 	int loop = getCaliValue();
 
-	DEBUG_COMMAND("SP %d,%d:",no,loop);
+	TRACE("SP %d,%d:",no,loop);
 	
 	if (!mus_pcm_get_state()) {
 		dummy_pcm_in_play = TRUE;
@@ -245,7 +245,7 @@ void commandST() {
 	/* ＰＣＭデータの演奏を停止する。 */
 	int time = getCaliValue();
 	
-	DEBUG_COMMAND("ST %d:",time);
+	TRACE("ST %d:",time);
 	
 	if (!mus_pcm_get_state()) { 
 		dummy_pcm_in_play = FALSE;
@@ -277,7 +277,7 @@ void commandSU() {
 		*var1 = *var2 = 0;
 	}
 	
-	DEBUG_COMMAND("SU %d,%d:",*var1, *var2);
+	TRACE("SU %d,%d:",*var1, *var2);
 }
 
 void commandSV() {
@@ -286,7 +286,7 @@ void commandSV() {
 	int volume = getCaliValue();
 	mus_mixer_set_level(device, volume);
 
-	DEBUG_COMMAND("SV %d,%d", device, volume);
+	TRACE("SV %d,%d", device, volume);
 }
 
 void commandSQ() {
@@ -295,7 +295,7 @@ void commandSQ() {
 	int noR  = getCaliValue();
 	int loop = getCaliValue();
 	
-	DEBUG_COMMAND("SQ %d,%d,%d:", noL, noR, loop);
+	TRACE("SQ %d,%d,%d:", noL, noR, loop);
 		     
 	if (!mus_pcm_get_state()) {
 		dummy_pcm_in_play = TRUE;
@@ -313,7 +313,7 @@ void commandSO() {
 	// ＰＣＭデバイスのサポート情報を取得
 	int *var = getCaliVariable();
 	
-	DEBUG_COMMAND_YET("SO %p:",var);
+	TRACE_UNIMPLEMENTED("SO %p:",var);
 }
 
 void commandSW() {
@@ -338,13 +338,13 @@ void commandSW() {
 		*var = 0;
 	}
 	
-	DEBUG_COMMAND("SW %p,%d,%d,%d:",var, channel, Srate, bit);
+	TRACE("SW %p,%d,%d,%d:",var, channel, Srate, bit);
 }
 
 void commandSM() {
 	/* ＰＣＭデータをメモリ上に乗せる。*/
 	int no = getCaliValue();
-	DEBUG_COMMAND("SM %d:",no);
+	TRACE("SM %d:",no);
 	
 	mus_pcm_load(no);
 }
@@ -360,7 +360,7 @@ void commandSX() {
 		int volume = getCaliValue();
 		int stop   = getCaliValue();
 		mus_mixer_fadeout_start(device, time, volume, stop);
-		DEBUG_COMMAND("SX %d,%d,%d,%d,%d:", device, sw, time, volume, stop);
+		TRACE("SX %d,%d,%d,%d,%d:", device, sw, time, volume, stop);
 		break;
 	}
 	case 2: {
@@ -369,20 +369,20 @@ void commandSX() {
 		boolean st;
 		st = mus_mixer_fadeout_get_state(device);
 		*var = (st ? 0 : 1);
-		DEBUG_COMMAND("SX %d,%d:", device, sw);
+		TRACE("SX %d,%d:", device, sw);
 		break;
 	}
 	case 3: {
 		/*  フェード強制終了 */
 		mus_mixer_fadeout_stop(device);
-		DEBUG_COMMAND("SX %d,%d:", device, sw);
+		TRACE("SX %d,%d:", device, sw);
 		break;
 	}
 	case 4: {
 		/* ボリューム取得 */
 		int *var   = getCaliVariable();
 		*var = mus_mixer_get_level(device);
-		DEBUG_COMMAND("SX %d,%d:", device, sw);
+		TRACE("SX %d,%d:", device, sw);
 		break;
 	}
 	default:
diff --git a/src/cmdt.c b/src/cmdt.c
index 90e0eaa..171b20e 100644
--- a/src/cmdt.c
+++ b/src/cmdt.c
@@ -33,5 +33,5 @@ void commandT() {
 	int y = getCaliValue();
 	msg_setMessageLocation(x, y);
 	
-	DEBUG_COMMAND("T %d,%d:",x,y);
+	TRACE("T %d,%d:",x,y);
 }
diff --git a/src/cmdu.c b/src/cmdu.c
index a81b663..2ede1fb 100644
--- a/src/cmdu.c
+++ b/src/cmdu.c
@@ -45,7 +45,7 @@ void commandUC() { /* 王道勇者 */
 		sl_clearStack(false);
 		break;
 	}
-	DEBUG_COMMAND("UC %d,%d:",mode,num);
+	TRACE("UC %d,%d:",mode,num);
 }
 
 void commandUD() {
@@ -60,7 +60,7 @@ void commandUD() {
 		WARNING("UnKnown UD command %d", mode);
 	}
 	
-	DEBUG_COMMAND("UD %d:",mode);
+	TRACE("UD %d:",mode);
 }
 
 void commandUR() {
@@ -76,7 +76,7 @@ void commandUR() {
 	var[4] = info.label_calls_after_page_call;
 	var[5] = info.var_pushes_after_call;
 	
-	DEBUG_COMMAND("UR %p:",var);
+	TRACE("UR %p:",var);
 }
 
 void commandUS() {
@@ -86,7 +86,7 @@ void commandUS() {
 	int cnt = getCaliValue();
 	
 	sl_pushVar(&vref, cnt);
-	DEBUG_COMMAND("US %d,%d:", vref.var, cnt);
+	TRACE("US %d,%d:", vref.var, cnt);
 }
 
 void commandUG() {
@@ -96,7 +96,7 @@ void commandUG() {
 	int cnt = getCaliValue();
 	
 	sl_popVar(&vref, cnt);
-	DEBUG_COMMAND("UG %p,%d:", vref.var, cnt);
+	TRACE("UG %p,%d:", vref.var, cnt);
 }
 
 void commandUP0() {
@@ -104,7 +104,7 @@ void commandUP0() {
 	int no = getCaliValue();
 	int mode = getCaliValue();
 	
-	DEBUG_COMMAND_YET("UP0 %d,%d:",no,mode);
+	TRACE_UNIMPLEMENTED("UP0 %d,%d:",no,mode);
 }
 
 void commandUP1() {
@@ -112,7 +112,7 @@ void commandUP1() {
 	const char *str = sl_getString(':');
 	int mode = getCaliValue();
 	
-	DEBUG_COMMAND_YET("UP1 %s,%d:",str,mode);
+	TRACE_UNIMPLEMENTED("UP1 %s,%d:",str,mode);
 }
 
 void commandUP3() {
@@ -120,5 +120,5 @@ void commandUP3() {
 	const char *str1 = sl_getString(':');
 	const char *str2 = sl_getString(':');
 	
-	DEBUG_COMMAND_YET("UP3 %s,%s:",str1,str2);
+	TRACE_UNIMPLEMENTED("UP3 %s,%s:",str1,str2);
 }
diff --git a/src/cmdv.c b/src/cmdv.c
index b157e15..db4ed30 100644
--- a/src/cmdv.c
+++ b/src/cmdv.c
@@ -148,7 +148,7 @@ void commandVC() { /* from Rance4 */
 	cxUnit   = getCaliValue();
 	cyUnit   = getCaliValue();
 	
-	DEBUG_COMMAND("VC %d,%d,%d,%d,%d,%d,%d:",nPageNum, x0Map, y0Map, cxMap, cyMap, cxUnit, cyUnit);
+	TRACE("VC %d,%d,%d,%d,%d,%d,%d:",nPageNum, x0Map, y0Map, cxMap, cyMap, cxUnit, cyUnit);
 	
 	if (NULL != UnitMap ) {
 		free(UnitMap);
@@ -186,7 +186,7 @@ void commandVP() { /* from T2 */
 	int nyUnit = getCaliValue();
 	int bSpCol = getCaliValue();
 	
-	DEBUG_COMMAND("VP %d,%d,%d,%d,%d,%d:",nPage, x0Unit, y0Unit, nxUnit, nyUnit, bSpCol);
+	TRACE("VP %d,%d,%d,%d,%d,%d:",nPage, x0Unit, y0Unit, nxUnit, nyUnit, bSpCol);
 	
 	if (nPage >= nPageNum) {
 		WARNING("VP nPage too large %d", nPage);
@@ -209,7 +209,7 @@ void commandVS() { /* from Rance4 */
 	int y     = getCaliValue();
 	int wData = getCaliValue();
 	
-	DEBUG_COMMAND("VS %d,%d,%d,%d,%d:",nPage, nType, x, y, wData);
+	TRACE("VS %d,%d,%d,%d,%d:",nPage, nType, x, y, wData);
 	
 	if (nPage >= nPageNum) {
 		WARNING("VS nPage too large %d", nPage);
@@ -259,7 +259,7 @@ void commandVG() { /* from Rance4 */
 	int x = getCaliValue();
 	int y = getCaliValue();
 	
-	DEBUG_COMMAND("VG %d,%d,%d,%d:",nPage, nType, x, y);
+	TRACE("VG %d,%d,%d,%d:",nPage, nType, x, y);
 
 	if (nPage >= nPageNum) {
 		WARNING("VG nPage too large %d", nPage);
@@ -303,7 +303,7 @@ void commandVH() { /* from Rance4 */
 	int xx, yy, i, n;
 	int maxfoot, lmtx, lmty, lmtw, lmth;
 	
-	DEBUG_COMMAND("VH %d,%d,%d,%d,%d,%d:",nPage, x, y, width, height, _max);
+	TRACE("VH %d,%d,%d,%d,%d,%d:",nPage, x, y, width, height, _max);
 	
 	if (nPage >= nPageNum) {
 		WARNING("VH nPage too large %d", nPage);
@@ -445,14 +445,14 @@ void commandVF() { /* from Panyo */
 	}
 	
 	ags_updateArea(x0Map, y0Map, cxMap * cxUnit, cyMap * cyUnit);
-	DEBUG_COMMAND("VF:");
+	TRACE("VF:");
 }
 
 void commandVV() { /* from T2 */
 	int nPage   = getCaliValue();
 	int fEnable = getCaliValue();
 	
-	DEBUG_COMMAND("VV %d,%d:",nPage, fEnable);
+	TRACE("VV %d,%d:",nPage, fEnable);
 	
 	srcimg[nPage].fEnable = (fEnable == 1 ? TRUE : FALSE);
 }
@@ -463,7 +463,7 @@ void commandVR() { /* from Rance4 */
 	int *var  = getCaliVariable();
 	int *dst;
 	
-	DEBUG_COMMAND("VR %d,%d,%p:",nPage, nType, var);
+	TRACE("VR %d,%d,%p:",nPage, nType, var);
 	
 	if (nPage >= nPageNum) {
 		WARNING("VR nPage too large %d", nPage);
@@ -493,7 +493,7 @@ void commandVW() { /* from Rance4 */
 	int *var  = getCaliVariable();
 	int *src;
 	
-	DEBUG_COMMAND("VW %d,%d,%p:",nPage, nType, var);
+	TRACE("VW %d,%d,%p:",nPage, nType, var);
 	
 	if (nPage >= nPageNum) {
 		WARNING("VW nPage too large %d", nPage);
@@ -528,7 +528,7 @@ void commandVE() { /* from T2 */
 	int unit, unit_x, unit_y;
 	UnitMapSrcImg *img;
 	
-	DEBUG_COMMAND("VE %d,%d,%d,%d,%d,%d:", x, y, width, height, out_ptn, flag);
+	TRACE("VE %d,%d,%d,%d,%d,%d:", x, y, width, height, out_ptn, flag);
 	if (flag == 1) {
 		WARNING("VE flag1 is not yet");
 	}
@@ -567,7 +567,7 @@ void commandVZ() { /* from T2 */
 	int p2 = getCaliValue();
 	int p3 = getCaliValue();
 	
-	DEBUG_COMMAND("VZ %d,%d,%d:", p1, p2, p3);
+	TRACE("VZ %d,%d,%d:", p1, p2, p3);
 	
 	switch(p1) {
 	case 0:
@@ -593,7 +593,7 @@ void commandVX() { /* from T2 */
 	int p3 = getCaliValue();
 	int p4 = getCaliValue();
 	
-	DEBUG_COMMAND("VX %d,%d,%d,%d:", p1, p2, p3, p4);
+	TRACE("VX %d,%d,%d,%d:", p1, p2, p3, p4);
 	
 	switch(p1) {
 	case 0:
@@ -653,7 +653,7 @@ void commandVT() { /* from Panyo */
 		}
 	}
 	
-	DEBUG_COMMAND("VT %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", sp, sa, sx, sy, width, height, dp, da, dx, dy);
+	TRACE("VT %d,%d,%d,%d,%d,%d,%d,%d,%d,%d:", sp, sa, sx, sy, width, height, dp, da, dx, dy);
 }
 
 void commandVB() {
@@ -665,7 +665,7 @@ void commandVB() {
 	int y_size = getCaliValue();
 	int data   = getCaliValue();
 	
-	DEBUG_COMMAND_YET("VB %d,%d,%d,%d,%d,%d,%d:", page, type, x_pos, y_pos, x_size, y_size, data);
+	TRACE_UNIMPLEMENTED("VB %d,%d,%d,%d,%d,%d,%d:", page, type, x_pos, y_pos, x_size, y_size, data);
 }
 
 void commandVIC() { /* from Panyo */
@@ -677,7 +677,7 @@ void commandVIC() { /* from Panyo */
 	int x, y, i;
 	UnitMapSrcImg *img;
 
-	DEBUG_COMMAND("VIC %d,%d,%d,%d:", sx, sy, width, height);
+	TRACE("VIC %d,%d,%d,%d:", sx, sy, width, height);
 	
 	for (i = 0; i < nPageNum; i++) {
 		img = &srcimg[i];
@@ -706,7 +706,7 @@ void commandVIP() {
 	int width  = getCaliValue();
 	int height = getCaliValue();
 	
-	DEBUG_COMMAND_YET("VIP %d,%d,%d,%d:", x, y, width, height);
+	TRACE_UNIMPLEMENTED("VIP %d,%d,%d,%d:", x, y, width, height);
 }
 
 void commandVJ() {
@@ -716,7 +716,7 @@ void commandVJ() {
 	int y     = getCaliValue();
 	int max   = getCaliValue();
 	
-	DEBUG_COMMAND_YET("VJ %d,%d,%d,%d:", page, x, y, max);
+	TRACE_UNIMPLEMENTED("VJ %d,%d,%d,%d:", page, x, y, max);
 }
 
 static void throttle() {
@@ -737,11 +737,11 @@ void commandVA() { /* from Panyo */
 	if (no >= 10) {
 		var1 = getCaliVariable();
 		var2 = getCaliVariable();
-		DEBUG_COMMAND("VA %d,%d,%p,%p:", no, p1, var1, var2);
+		TRACE("VA %d,%d,%p,%p:", no, p1, var1, var2);
 	} else {
 		p2 = getCaliValue();
 		p3 = getCaliValue();
-		DEBUG_COMMAND("VA %d,%d,%d,%d:", no, p1, p2, p3);
+		TRACE("VA %d,%d,%d,%d:", no, p1, p2, p3);
 	}
 	
 	if (p1 > VACMD_MAX) {
diff --git a/src/cmdw.c b/src/cmdw.c
index d07eda1..61f4a9b 100644
--- a/src/cmdw.c
+++ b/src/cmdw.c
@@ -35,7 +35,7 @@ void commandWW() {
 	
 	ags_setWorldSize(x_size, y_size, color);
 	
-        DEBUG_COMMAND("WW %d,%d,%d:",x_size, y_size, color);
+        TRACE("WW %d,%d,%d:",x_size, y_size, color);
 }
 
 void commandWV() {
@@ -48,7 +48,7 @@ void commandWV() {
 	ags_setViewArea(start_x, start_y, size_x, size_y);
 	ags_updateFull();
 	
-	DEBUG_COMMAND("WV %d,%d,%d,%d:",start_x,start_y,size_x, size_y);
+	TRACE("WV %d,%d,%d,%d:",start_x,start_y,size_x, size_y);
 }
 
 void commandWZ() {
@@ -70,7 +70,7 @@ void commandWZ() {
 	default:
 		break;
 	}
-	DEBUG_COMMAND("WZ %d,%d:", p1, sw);
+	TRACE("WZ %d,%d:", p1, sw);
 }
 
 void commandWX() {
@@ -83,5 +83,5 @@ void commandWX() {
 	ags_setExposeSwitch(TRUE);
 	ags_updateArea(x0, y0, cx, cy);
 	
-	DEBUG_COMMAND("WX %d,%d,%d,%d:", x0, y0, cx, cy);
+	TRACE("WX %d,%d,%d,%d:", x0, y0, cx, cy);
 }
diff --git a/src/cmdy.c b/src/cmdy.c
index 9d40c53..cfc32fe 100644
--- a/src/cmdy.c
+++ b/src/cmdy.c
@@ -155,5 +155,5 @@ void commandY() {
 		WARNING("Y undefined command %d", p1);
 		break;
 	}
-	DEBUG_COMMAND("Y %d,%d:",p1,p2);
+	TRACE("Y %d,%d:",p1,p2);
 }
diff --git a/src/cmdz.c b/src/cmdz.c
index 23aa849..652efc7 100644
--- a/src/cmdz.c
+++ b/src/cmdz.c
@@ -85,7 +85,7 @@ void commandZC() {
 		WARNING("commandZC(): Unknown Command (%d)", m); break;
 	}
 	
-	DEBUG_COMMAND("ZC %d,%d:",m,n);
+	TRACE("ZC %d,%d:",m,n);
 }
 
 void commandZM() {
@@ -99,7 +99,7 @@ void commandZM() {
 	
 	nact->msg.MsgFontSize = size;
 
-	DEBUG_COMMAND("ZM %d:",size);
+	TRACE("ZM %d:",size);
 }
 
 void commandZS() {
@@ -108,7 +108,7 @@ void commandZS() {
 	
 	nact->sel.MsgFontSize = size;
 	
-	DEBUG_COMMAND("ZS %d:",size);
+	TRACE("ZS %d:",size);
 }
 
 void commandZB() {
@@ -118,7 +118,7 @@ void commandZB() {
 	if (nact->ags.enable_zb)
 		nact->ags.font_weight = weight;
 
-	DEBUG_COMMAND("ZB %d:", weight);
+	TRACE("ZB %d:", weight);
 }
 
 void commandZH() {
@@ -127,7 +127,7 @@ void commandZH() {
 	
 	sys_setHankakuMode(sw);
 	
-	DEBUG_COMMAND("ZH %d:",sw);
+	TRACE("ZH %d:",sw);
 }
 
 void commandZW() {
@@ -142,7 +142,7 @@ void commandZW() {
 		nact->messagewait_cancel = (sw & 0x200) ? TRUE : FALSE;
 	}
 	
-	DEBUG_COMMAND("ZW %d:", sw);
+	TRACE("ZW %d:", sw);
 }
 
 void commandZL() {
@@ -151,7 +151,7 @@ void commandZL() {
 	
 	nact->msg.LineIncrement = line;
 	
-	DEBUG_COMMAND("ZL %d:",line);
+	TRACE("ZL %d:",line);
 }
 
 void commandZE() {
@@ -160,7 +160,7 @@ void commandZE() {
 	
 	nact->sel.ClearMsgWindow = sw == 0 ? FALSE : TRUE;
 	
-	DEBUG_COMMAND("ZE %d:", sw);
+	TRACE("ZE %d:", sw);
 }
 
 void commandZF() {
@@ -178,7 +178,7 @@ void commandZF() {
 		nact->sel.WinResizeWidth =  TRUE;  break;
 	}
 	
-	DEBUG_COMMAND("ZF %d:", sw);
+	TRACE("ZF %d:", sw);
 }
 
 void commandZD() {
@@ -205,7 +205,7 @@ void commandZD() {
 		var = getCaliVariable(); *var = 0; break;
 	}
 	
-	DEBUG_COMMAND("ZD %d,%d:", c0, sw);
+	TRACE("ZD %d,%d:", c0, sw);
 }
 
 void commandZT0() {
@@ -236,7 +236,7 @@ void commandZT0() {
 	*(var + 5) =        lc->tm_sec;
 	*(var + 6) = 1    + lc->tm_wday;
 	
-	DEBUG_COMMAND("ZT0 %p:", var);
+	TRACE("ZT0 %p:", var);
 }
 
 void commandZT1() {
@@ -245,7 +245,7 @@ void commandZT1() {
 	
 	reset_counter(0, 1, n);
 	
-	DEBUG_COMMAND("ZT1 %d:", n);
+	TRACE("ZT1 %d:", n);
 }
 
 void commandZT2() {
@@ -255,7 +255,7 @@ void commandZT2() {
 	
 	*var = val & 0xffff;
 	
-	DEBUG_COMMAND("ZT2 %p:", var);
+	TRACE("ZT2 %p:", var);
 }
 
 void commandZT3() {
@@ -265,7 +265,7 @@ void commandZT3() {
 	
 	*var = val & 0xffff;
 	
-	DEBUG_COMMAND("ZT3 %p:", var);
+	TRACE("ZT3 %p:", var);
 }
 
 void commandZT4() {
@@ -275,7 +275,7 @@ void commandZT4() {
 	
 	*var = val & 0xffff;
 	
-	DEBUG_COMMAND("ZT4 %p:", var);
+	TRACE("ZT4 %p:", var);
 }
 
 void commandZT5() {
@@ -285,7 +285,7 @@ void commandZT5() {
 	
 	*var = val & 0xffff;
 	
-	DEBUG_COMMAND("ZT5 %d:", val);
+	TRACE("ZT5 %d:", val);
 }
 
 void commandZT10() {
@@ -303,7 +303,7 @@ void commandZT10() {
 		reset_counter(num, base, count);
 	}
 	
-	DEBUG_COMMAND("ZT10 %d,%d,%d:", num, base, count);
+	TRACE("ZT10 %d,%d,%d:", num, base, count);
 }
 
 void commandZT11() {
@@ -317,7 +317,7 @@ void commandZT11() {
 	else
 		*var = (get_counter(num) / divisor) & 0xffff;
 
-	DEBUG_COMMAND("ZT11 %d,%d:", num, *var);
+	TRACE("ZT11 %d,%d:", num, *var);
 }
 
 void commandZT20() {
@@ -325,7 +325,7 @@ void commandZT20() {
 	int p1  = getCaliValue();
 	
 	sysVar[0] = sys_keywait(p1, KEYWAIT_NONCANCELABLE);
-	DEBUG_COMMAND("ZT20 %d:",p1);
+	TRACE("ZT20 %d:",p1);
 }
 
 void commandZT21() {
@@ -334,14 +334,14 @@ void commandZT21() {
 	
 	sysVar[0] = sys_keywait(p1, KEYWAIT_CANCELABLE);
 	
-	DEBUG_COMMAND("ZT21 %d:",p1);
+	TRACE("ZT21 %d:",p1);
 }
 
 void commandZZ0() {
 	/* ＳＹＳＴＥＭ３．５を終了する */
 	int sw = getCaliValue();
 	
-	DEBUG_COMMAND("ZZ0 %d:",sw);
+	TRACE("ZZ0 %d:",sw);
 	
 	if (sw == 0) {
 #ifdef __EMSCRIPTEN__
@@ -367,7 +367,7 @@ void commandZZ1() {
 	*var = 6;
 #endif
 #endif
-	DEBUG_COMMAND("ZZ1 %p:",var);
+	TRACE("ZZ1 %p:",var);
 }
 
 void commandZZ2() {
@@ -392,7 +392,7 @@ void commandZZ2() {
 #endif
 	svar_set(num, str);
 
-	DEBUG_COMMAND("ZZ2 %d:",num);
+	TRACE("ZZ2 %d:",num);
 }
 
 void commandZZ3() {
@@ -405,7 +405,7 @@ void commandZZ3() {
 	*(var + 1) = info.height;
 	*(var + 2) = info.depth;
 	
-	DEBUG_COMMAND("ZZ3 %p:",var);
+	TRACE("ZZ3 %p:",var);
 }
 
 void commandZZ4() {
@@ -418,7 +418,7 @@ void commandZZ4() {
 	*(var + 1) = info.height;
 	*(var + 2) = info.depth;
 	
-	DEBUG_COMMAND("ZZ4 %p:",var);
+	TRACE("ZZ4 %p:",var);
 }
 
 void commandZZ5() {
@@ -431,7 +431,7 @@ void commandZZ5() {
 	*(var + 1) = info.height;
 	*(var + 2) = info.depth;
 	
-	DEBUG_COMMAND("ZZ5 %p:",var);
+	TRACE("ZZ5 %p:",var);
 }
 
 void commandZZ7() {
@@ -440,14 +440,14 @@ void commandZZ7() {
 	
 	*var = 65535;
 	
-	DEBUG_COMMAND("ZZ7 %p:",var);
+	TRACE("ZZ7 %p:",var);
 }
 
 void commandZZ8() {
 	// メモリオンバッファの残り容量を得る
 	int *var = getCaliVariable();
 	
-	DEBUG_COMMAND_YET("ZZ8 %p:",var);
+	TRACE_UNIMPLEMENTED("ZZ8 %p:",var);
 }
 
 void commandZZ9() {
@@ -460,7 +460,7 @@ void commandZZ9() {
 	*(var + 1) = info.height;
 	*(var + 2) = info.depth;
 	
-	DEBUG_COMMAND("ZZ9 %p:",var);
+	TRACE("ZZ9 %p:",var);
 }
 
 void commandZZ10() {
@@ -469,7 +469,7 @@ void commandZZ10() {
 
 	*var = sdl_isFullscreen() ? 1 : 0;
 	
-	DEBUG_COMMAND("ZZ10 %d:",*var);
+	TRACE("ZZ10 %d:",*var);
 }
 
 void commandZZ13() {
@@ -483,7 +483,7 @@ void commandZZ13() {
 #endif
 	nact->msg.MsgFont = num;
 	
-	DEBUG_COMMAND("ZZ13 %d:",num);
+	TRACE("ZZ13 %d:",num);
 }
 
 void commandZZ14() {
@@ -499,7 +499,7 @@ void commandZZ14() {
 	if (no <= 0) return;
 	svar_set(no, s);
 	
-	DEBUG_COMMAND("ZZ14 %d:", no);
+	TRACE("ZZ14 %d:", no);
 }
 
 void commandZG() {
@@ -508,7 +508,7 @@ void commandZG() {
 	
 	cg_loadCountVar = var;
 	
-	DEBUG_COMMAND("ZG %p:",var);
+	TRACE("ZG %p:",var);
 }
 
 void commandZI() { /* T2 */
@@ -518,7 +518,7 @@ void commandZI() { /* T2 */
 	
 	set_hak_keymode(key, mode);
 	
-	DEBUG_COMMAND("ZI %d,%d:", key, mode);
+	TRACE("ZI %d,%d:", key, mode);
 }
 
 void commandZA() { /* T2 */
@@ -538,7 +538,7 @@ void commandZA() { /* T2 */
 		WARNING("Unknown ZA comannd %d, %d", p1, p2);
 	}
 	
-	DEBUG_COMMAND("ZA %d,%d:", p1, p2);
+	TRACE("ZA %d,%d:", p1, p2);
 }
 
 void commandZK() {
@@ -547,7 +547,7 @@ void commandZK() {
 	int p2 = getCaliValue();
 	const char *str = sl_getString(':');
 	
-	DEBUG_COMMAND("ZK %d,%d,%s:", p1, p2, str);
+	TRACE("ZK %d,%d,%s:", p1, p2, str);
 }
 
 void commandZR() {
@@ -561,7 +561,7 @@ void commandZR() {
 		*var = (int)(genrand() * num) +1;
 	}
 	
-	DEBUG_COMMAND("ZR %d,%d:", num, *var);
+	TRACE("ZR %d,%d:", num, *var);
 }
 
 void commandZU() {
@@ -571,7 +571,7 @@ void commandZU() {
 	if (sw <= CHARACTER_ENCODING_MAX)
 		sys_setCharacterEncoding(sw);
 
-	DEBUG_COMMAND("ZU %d:",sw);
+	TRACE("ZU %d:",sw);
 }
 
 void cmdz_reset(void) {
diff --git a/src/nact.c b/src/nact.c
index 9c858d3..0d92ae1 100644
--- a/src/nact.c
+++ b/src/nact.c
@@ -90,7 +90,7 @@ void sys_addMsg(const char *str) {
 		sel_addElement(msg);
 	} else {
 		// 通常のメッセージ
-		DEBUG_MESSAGE("%s", msg);
+		TRACE_MESSAGE("%s", msg);
 		if (nact->is_msg_out) {
 			msg_putMessage(msg);
 		}
diff --git a/src/scenario.c b/src/scenario.c
index bd58596..911a875 100644
--- a/src/scenario.c
+++ b/src/scenario.c
@@ -201,7 +201,7 @@ boolean sl_jmpFar2(int page, int address) {
 	
 	dfile = ald_getdata(DRIFILE_SCO, page);
 	if (dfile == NULL) {
-		DEBUG_MESSAGE("ald_getdata fail\n");
+		TRACE_MESSAGE("ald_getdata fail\n");
 		return FALSE;
 	}
 	sl_sco   = dfile->data;
diff --git a/src/scenario.h b/src/scenario.h
index c45072f..0636ed6 100644
--- a/src/scenario.h
+++ b/src/scenario.h
@@ -100,16 +100,16 @@ static inline int sl_getIndex(void) { return sl_index; }
 static inline int sl_getPage(void) { return sl_page; }
 static inline int sl_getc(void) { return sl_sco[sl_index++]; }
 
+#define TRACE_UNIMPLEMENTED(fmt, ...) \
+	sys_message(2, "Unimplemented: " fmt "\n", ##__VA_ARGS__)
+
 #ifdef DEBUG
-#define DEBUG_COMMAND_YET(fmt, ...) \
-	sys_message(2, "%d,%x: " fmt "\n", sl_getPage(), sl_getIndex(), ##__VA_ARGS__)
-#define DEBUG_COMMAND(fmt, ...) \
-	sys_message(5, "%d,%x: " fmt "\n", sl_getPage(), sl_getIndex(), ##__VA_ARGS__)
-#define DEBUG_MESSAGE(...) sys_message(6, __VA_ARGS__)
+#define TRACE(fmt, ...) \
+	sys_message(5, fmt "\n", ##__VA_ARGS__)
+#define TRACE_MESSAGE(...) sys_message(6, __VA_ARGS__)
 #else
-#define DEBUG_COMMAND(...)
-#define DEBUG_COMMAND_YET(...)
-#define DEBUG_MESSAGE(...)
+#define TRACE(...)
+#define TRACE_MESSAGE(...)
 #endif
 
 #endif /* !__SCENARIO_ */
diff --git a/src/selection.c b/src/selection.c
index fb3d0d1..998f6f5 100644
--- a/src/selection.c
+++ b/src/selection.c
@@ -303,7 +303,7 @@ static void init_selwindow() {
 	}
 	ags_setFontWithWeight(FONT_GOTHIC, sel.MsgFontSize, nact->ags.font_weight);
 	for (i = 0; i < regnum; i++) {
-		DEBUG_MESSAGE("%d:%s\n", i +1, elm[i]);
+		TRACE_MESSAGE("%d:%s\n", i +1, elm[i]);
 		ags_drawString(r.x +2, r.y + i * (sel.MsgFontSize +2) +1, elm[i], sel.MsgFontColor);
 	}
 	ags_updateArea(saveArea.x, saveArea.y, saveArea.w, saveArea.h);