From 1317eedc78f86a85942572864c9d25449beb92be Mon Sep 17 00:00:00 2001
From: boldowa <boldowa.q@gmail.com>
Date: Tue, 10 Jan 2017 22:07:16 +0900
Subject: [PATCH] Fix sub-command problem / fix tempo init / v0.92

---
 mmlc/mmlc.h         | 2 +-
 spc/include/var.inc | 3 +--
 spc/main.s          | 2 +-
 spc/music.s         | 4 ++--
 spc/seqcmd.s        | 4 ++--
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/mmlc/mmlc.h b/mmlc/mmlc.h
index 06b596b..5deeda1 100644
--- a/mmlc/mmlc.h
+++ b/mmlc/mmlc.h
@@ -7,7 +7,7 @@
 #define _MMLCONV_H_
 
 /* define version */
-#define MMLCONV_VERSION "0.91"
+#define MMLCONV_VERSION "0.92"
 
 /* define Option struct */
 typedef struct tag_Option{
diff --git a/spc/include/var.inc b/spc/include/var.inc
index 35b8132..20b9979 100644
--- a/spc/include/var.inc
+++ b/spc/include/var.inc
@@ -19,8 +19,7 @@
 
 ;-- spc engine
 .define SND_TEMPO            56
-;.define MUSIC_TEMPO_DEFAULT  54
-.define MUSIC_TEMPO_DEFAULT  10
+.define MUSIC_TEMPO_DEFAULT  60
 .define SPECIAL_WAV_FREQ 12
 
 .endif
diff --git a/spc/main.s b/spc/main.s
index b1ff473..34eb5e8 100644
--- a/spc/main.s
+++ b/spc/main.s
@@ -15,7 +15,7 @@
 .bank 2 slot 2
 .orga __CODE_START__ - 34
 	.db	"VER "
-	.db	$00, $91
+	.db	$00, $92
 	.db	"DIR "
 	.dw	DirTbl
 	.db	"ESA "
diff --git a/spc/music.s b/spc/music.s
index 6f92d2c..2871707 100644
--- a/spc/music.s
+++ b/spc/music.s
@@ -1017,9 +1017,9 @@ InitSequenceData:
 	bmi	-
 
 	; 全体データの初期化
-	mov	musicTempo, #MUSIC_TEMPO_DEFAULT		; 音楽テンポの初期値をセットします
 	mov	musicGlobalVolume, a
-	mov	musicTempo, #60
+	mov	musicTempo, #MUSIC_TEMPO_DEFAULT		; 音楽テンポの初期値をセットします
+	mov	musicTempoLo, #0
 	mov	eVolRatio, #0
 	mov	specialWavFreq, #SPECIAL_WAV_FREQ
 
diff --git a/spc/seqcmd.s b/spc/seqcmd.s
index eded268..f9a81ab 100644
--- a/spc/seqcmd.s
+++ b/spc/seqcmd.s
@@ -74,8 +74,8 @@ CmdLengthTable:
 	.db	0	; CmdEchoOff
 	.db	0	; CmdPortamentoOn
 	.db	0	; CmdPortamentoOff
-	.db	0	; CmdCmdCall(Arg:0)
-	.db	1	; CmdCmdCall(Arg:1)
+	.db	1	; CmdCmdCall(Arg:0)
+	.db	2	; CmdCmdCall(Arg:1)
 
 ;--------------------------------------------------
 ; Sub Command