version 1.11

Shaw02 · Sep 16, 2013 · 7bba32b · 7bba32b
1 parent fc7b6a7
commit 7bba32b
Show file tree

Hide file tree

Showing 118 changed files with 1,545 additions and 1,625 deletions.
diff --git a/bin/nsc.exe b/bin/nsc.exe
diff --git a/bin/nsd.bin b/bin/nsd.bin
diff --git a/bin/nsd_all.bin b/bin/nsd_all.bin
diff --git a/bin/nsd_all2.bin b/bin/nsd_all2.bin
diff --git a/bin/nsd_fds.bin b/bin/nsd_fds.bin
diff --git a/bin/nsd_hfe4.bin b/bin/nsd_hfe4.bin
diff --git a/bin/nsd_hfx4.bin b/bin/nsd_hfx4.bin
diff --git a/bin/nsd_mmc5.bin b/bin/nsd_mmc5.bin
diff --git a/bin/nsd_n163.bin b/bin/nsd_n163.bin
diff --git a/bin/nsd_oall.bin b/bin/nsd_oall.bin
diff --git a/bin/nsd_opll.bin b/bin/nsd_opll.bin
diff --git a/bin/nsd_s5b.bin b/bin/nsd_s5b.bin
diff --git a/bin/nsd_vrc6.bin b/bin/nsd_vrc6.bin
diff --git a/bin/nsd_vrc7.bin b/bin/nsd_vrc7.bin
diff --git a/doc/nsdl.chm b/doc/nsdl.chm
diff --git a/doc/readme.txt b/doc/readme.txt
@@ -1,6 +1,6 @@
 +-----------------------------------------------------------------------------
 | �^�C�g�� | NES Sound Driver Library
-|�t�@�C����| NSDL110.ZIP
+|�t�@�C����| NSDL111.ZIP
 | �J�e�S�� | Sound Driver for NES
 | ����@�� | NES (Nintendo Entertainment System)
 |�O��\�t�g| cc65 (Complete cross development package for 65(C)02 systems.)
@@ -28,4 +28,4 @@ This is developed as object library, and user application can control it.
 �Emixi		http://mixi.jp/show_profile.pl?id=16558
 ========================================================================
 
-����̃t�@�C���́yNSDL110.ZIP�z�ł��B
+����̃t�@�C���́yNSDL111.ZIP�z�ł��B
diff --git a/include/nsd.inc b/include/nsd.inc
@@ -230,9 +230,11 @@
 	_ptr		.word					;00 General pointer value
 	_tmp		.word					;02 General value
 	channel		.byte					;04 channel (x resister)
-	flag		.byte					;05 flag
+;	flag		.byte					;05 flag
 	Sequence_ptr	.word			nsd::Track	;06 Address of playing sequence
-	Length		.tag	NSD_Length_Cnt	nsd::Track	;16 Length Counter
+.ifndef	HFX4
+	LengthCnt	.tag	NSD_Length_Cnt	nsd::Track	;16 Length Counter
+.endif
 	Envelop		.tag	NSD_Envelop	nsd::Track	;26 Envelop counter
 .Endstruct
 
@@ -244,20 +246,21 @@
 .scope	nsd_flag
 	BGM	= $01
 	SE	= $02
+	Disable	= $80
 .endscope
 
 ;Zero Page Works
 .define	__ptr		nsd_work_zp + NSD_work_zp::_ptr
 .define	__tmp		nsd_work_zp + NSD_work_zp::_tmp
-.define	__flag		nsd_work_zp + NSD_work_zp::flag
+;.define	__flag		nsd_work_zp + NSD_work_zp::flag
 .define	__channel	nsd_work_zp + NSD_work_zp::channel
 .define	__Sequence_ptr	nsd_work_zp + NSD_work_zp::Sequence_ptr
-.define	__Length_ctr	nsd_work_zp + NSD_work_zp::Length + NSD_Length_Cnt::counter
-.define	__Gate		nsd_work_zp + NSD_work_zp::Length + NSD_Length_Cnt::gate
+
 .define	__Envelop_V	nsd_work_zp + NSD_work_zp::Envelop + NSD_Envelop::V	;upper 4bit Voice / lower 4bit:Volume
 .define	__Envelop_F	nsd_work_zp + NSD_work_zp::Envelop + NSD_Envelop::F	;upper 4bit:Note  / lower 4bit:Frequency
 
-.define	__Tempo		nsd_work_zp + NSD_work_zp::Envelop + NSD_Envelop::V + nsd::TR_BGM3
+.define	__flag		nsd_work_zp + NSD_work_zp::Envelop + NSD_Envelop::V + nsd::TR_BGM3
+.define	__Tempo		nsd_work_zp + NSD_work_zp::Envelop + NSD_Envelop::F + nsd::TR_BGM5
 .define	__Tempo_ctr	nsd_work_zp + NSD_work_zp::Envelop + NSD_Envelop::V + nsd::TR_BGM5
 
 
@@ -340,6 +343,9 @@
 
 .Struct		NSD_work
 	Flag		.tag	NSD_Flag	nsd::Track	;flag
+.ifdef	HFX4
+	LengthCnt	.tag	NSD_Length_Cnt	nsd::Track	;16 Length Counter
+.endif
 	Length		.tag	NSD_length	nsd::Track	;note length [tick]
 	Gatetime	.tag	NSD_gatetime	nsd::Track	;gate time [tick]
 	Note		.tag	NSD_note	nsd::Track	;octave and note command
@@ -373,11 +379,13 @@
 
 .ifdef	VRC7
 	VRC7_Frequency	.byte			nsd::VRC7_Track	;VRC7 frequecny
+	VRC7_Freq_old	.byte			nsd::VRC7_Track
 	VRC7_Reg	.word					;
 .endif
 
 .ifdef	OPLL
 	OPLL_Frequency	.byte			nsd::OPLL_Track_FM	;OPLL frequency (FM)
+	OPLL_Freq_old	.byte			nsd::OPLL_Track_FM
 	OPLL_Reg	.word		
 	OPLL_Rhythm	.byte						;OPLL Rhythm
 .endif
@@ -412,6 +420,14 @@
 .endscope
 
 ;RAM Works
+.ifdef	HFX4
+.define	__Length_ctr	nsd_work + NSD_work::LengthCnt + NSD_Length_Cnt::counter
+.define	__Gate		nsd_work + NSD_work::LengthCnt + NSD_Length_Cnt::gate
+.else
+.define	__Length_ctr	nsd_work_zp + NSD_work_zp::LengthCnt + NSD_Length_Cnt::counter
+.define	__Gate		nsd_work_zp + NSD_work_zp::LengthCnt + NSD_Length_Cnt::gate
+.endif
+
 .define	__chflag	nsd_work + NSD_work::Flag + NSD_Flag::flag
 .define	__gatemode	nsd_work + NSD_work::Flag + NSD_Flag::gatemode
 .define	__tai		nsd_work + NSD_work::Length + NSD_length::tai
@@ -472,13 +488,15 @@
 
 .ifdef	VRC7
 .define	__vrc7_frequency	nsd_work + NSD_work::VRC7_Frequency
+.define	__vrc7_freq_old		nsd_work + NSD_work::VRC7_Freq_old
 .define	__vrc7_reg		nsd_work + NSD_work::VRC7_Reg
 .endif
 
 .ifdef	OPLL
 .define	__opll_frequency	nsd_work + NSD_work::OPLL_Frequency
-.define	__opll_ryhthm		nsd_work + NSD_work::OPLL_Rhythm
+.define	__opll_freq_old		nsd_work + NSD_work::OPLL_Freq_old
 .define	__opll_reg		nsd_work + NSD_work::OPLL_Reg
+.define	__opll_ryhthm		nsd_work + NSD_work::OPLL_Rhythm
 .endif
 
 .ifdef	N163

diff --git a/lib/NSD.lib b/lib/NSD.lib
diff --git a/lib/NSD_ALL.lib b/lib/NSD_ALL.lib
diff --git a/lib/NSD_ALL2.lib b/lib/NSD_ALL2.lib
diff --git a/lib/NSD_FDS.lib b/lib/NSD_FDS.lib
diff --git a/lib/NSD_HFE4.lib b/lib/NSD_HFE4.lib
diff --git a/lib/NSD_HFX4.lib b/lib/NSD_HFX4.lib
diff --git a/lib/NSD_MMC5.lib b/lib/NSD_MMC5.lib
diff --git a/lib/NSD_N163.lib b/lib/NSD_N163.lib
diff --git a/lib/NSD_OALL.lib b/lib/NSD_OALL.lib
diff --git a/lib/NSD_OPLL.lib b/lib/NSD_OPLL.lib
diff --git a/lib/NSD_VRC6.lib b/lib/NSD_VRC6.lib
diff --git a/lib/NSD_VRC7.lib b/lib/NSD_VRC7.lib
diff --git a/lib/NSD_s5b.lib b/lib/NSD_s5b.lib
diff --git a/sample/_debug/make.bat → sample/Yumipico/make.bat b/sample/_debug/make.bat → sample/Yumipico/make.bat
diff --git a/sample/Yumipico/original_v3.mml b/sample/Yumipico/original_v3.mml
@@ -0,0 +1,147 @@
+/***************************************
+ �I���W�i����
+                          MML�쐬�F���
+***************************************/
+
+// ���^��`
+#Code		"../../bin/nsd_vrc6.bin"
+#title		"�I���W�i����"
+#Copyright	"Team Kitty"
+#Composer	"���"
+#bgm		1
+#se			0
+#OffsetEv	0
+#OffsetEm	10000
+#OffsetEn 	20000
+#OffsetE@	30000
+
+
+/************************************
+ �G���x���[�v��`
+************************************/
+E(00000) { (43,15,5) (15,0,50) L 0 R L 0 }
+E(00001) { (15,10,5) L 10 R (5,0,3) L 0 }
+E(00002) { (15,0,3) L 0 }
+E(00003) { (15,8,4) (8,0,20) L 0 }
+E(10000) { 0 D22 L 1 2 3 2 1 0 -1 -2 -3 -2 -1 0 }
+E(20000) { L 0 -1 -2 -1 }
+E(20001) { (0,-24,12) L -24 }
+E(30000) { 7 L 5 }
+E(30001) { 1 2 3 2 1 2 3 2 (1,4,48) L 4 }
+
+
+/************************************
+ �}�N����`
+************************************/
+$noise_kick  { Ev2 En* v15 _4  }
+$noise_snare { Ev3 En0 v15 _-3 }
+$noise_hat   { Ev2 En* v14 _1  }
+
+
+/************************************
+ �T�u���[�`����`
+************************************/
+sub(03000) { [ cr : `cr ]8 }
+sub(03001) { [ c : r `cr ]8 }
+sub(04000) { [ $noise_kick c8   $noise_hat cc $noise_snare c8 : $noise_hat cc ]8 cc }
+sub(04001) { [ $noise_kick c8 : $noise_hat cc $noise_snare c8   $noise_hat cc ]8 $noise_snare c8c8c8 }
+sub(04002) { $noise_kick }
+sub(04003) { $noise_snare }
+sub(04004) { $noise_hat }
+sub(06000) { l8 o4 gga }
+sub(06001) { b-^2b->cd4.d4c4 }
+sub(06002) { <b-4 `c4.b-4.a4^1 }
+sub(06003) { "b-4 c1 P0,1,4,2 e4.d^2< }
+sub(06004) { d4 f4.g4.d2.. }
+sub(06005) {
+	de-f
+	l2 [ g. P0,1,4,2 a-4af g. P0,1,4,2 a-4`ca ]2 
+	g1^2.g4 g1^2^8
+}
+sub(07000) { g^2gab-4.b-4a4 }
+sub(07001) { e-2. P0,1,4,2 f4f }
+sub(07002) { P0,1,4,2 f4af }
+
+
+/************************************
+ BGM�f�[�^��`
+************************************/
+bgm(0) {
+
+TR1
+	t150
+	/* �{���̓��[�v��T�u���[�`�����g���������ǁAEC�R�}���h�̓R���p�C���������Ȃ̂ł�����Ⴄ�ƃL�`���Ɖ��t����Ȃ��񂾂��� */
+	_1 l32 o3 @1 v10 EC1,3 r-2
+	b-r
+	L
+	>drgrb-r>drgrb-r>drgrdr<b-rgrdr<b-rgrdr<
+	b-r>drgrb-r>drgrb-r>drgrdr<b-rgrdr<b-rgrdr<
+	ar>crfrar>crfrar>crfrcr<arfrcr<arfrcr<
+	ar>crfrar>crfrar>crfrcr<arfrcr<arfrcr<
+	b-r>e-rgrb-r>e-rgrb-r>e-rgre-r<b-rgre-r<b-rgre-r<
+	b-r>e-rgrb-r>e-rgrb-r>e-rgre-r<b-rgre-r<b-rgre-r<
+	>crfrar>crfrar>crfrarfrcr<arfrcr<arfr
+	drg-rar>crdrg-rar>crdrcr<arg-rdrcr<arg-r<
+	b-r>drgrb-r>drgrb-r>drgrdr<b-rgrdr<b-rgrdr<
+	b-r>drgrb-r>drgrb-r>drgrdr<b-rgrdr<b-rgrdr<
+	ar>crfrar>crfrar>crfrcr<arfrcr<arfrcr<
+	ar>crfrar>crfrar>crfrcr<arfrcr<arfrcr<
+	b-r>e-rgrb-r>e-rgrb-r>e-rgre-r<b-rgre-r<b-rgre-r<
+	ar>crfrar>crfrar>crfrcr<arfrcr<arfrcr<
+	gr>crergr>crergr>crercr<grercr<grercr<
+	grb-r>e-rgrb-r>e-rgrb-r>e-r<b-rgre-r<b-rgre-r<b-r
+	gr>cre-rgr>cre-rgr>cre-rcr<gre-rcr<gre-rcr<
+	ar>drfrar>drfrar>drfrdr<arfrdr<arfrdr<
+	b-r>e-rgrb-r>e-rgrb-r>e-rgre-r<b-rgre-r<b-rgre-r
+	crfrar>crfrar>crfrarfrcr<arfrcr<arfr<
+	drgr>crdrgr>crdrgr>cr<grdrcr<grdrcr<gr
+	drgr>crdrgr>crdrgr>cr<grdrcr<grdrcr<gr
+	drgrbr>drgrbr>drgrbrgrdr<brgrdr<brgr
+	drgrbr>drgrbr>drgrbrgrdr<brgrdr<brgr
+	b-r
+
+
+TR3
+	En1 l8 u%10 o4 c L >ccc<
+	|: S3000 >cc16c16< \ S3001 >aec< :|
+	S3000 >a16a16e16c16< S3001 >aec< S3001
+
+
+TR4
+	o6 l16 S4002 c8 S4003 c8c8c8 L
+	S4000 S4001 S4000
+	[ S4002 c8 S4004 cc S4003 : c8 S4004 cc ]8 cccc
+	S4001 S4001
+
+
+TR6
+	_1 Em0 Ev1 v13 q1 r-8     L E@0
+TR2
+	_1 Em0 Ev1 v9  q1 r-4 D-1 L @1
+TR6,2
+	S6000 S6001 S6002 S6001 S6003 S6001 S6004
+TR6
+	E@1
+TR2
+	@0
+TR6,2
+	S6005
+
+
+TR7
+	_1 Em0 Ev1 v11 q1 r-8 L E@0 l8 o4 ddf 
+	S7000 g4 a4.g4.f4^1
+	S7000 g4 a1 P0,1,4,2 `c4.a^2
+	S7000 b-4 >d4.d4.<b-2.. E@1 b->cd l2
+	S7001 ce.  S7002
+	S7001 de-. S7002
+	c1^2.c4 c-1^2^8
+
+
+TR8
+	_1 Ev0 v14 o2 q0 l16 r-2 L
+	|: [ "g8gg ]7 <gg`gg> [ "d8dd ]8 \ [ "e-8e-e- ]7 <e-e-`e-e-> [ "f8ff ]4 [ "d8dd ]3 <dde-f> :|
+	[ "e-8e-e- ]4 [ "f8ff ]4 [ "e8ee ]4 [ "e-8e-e- ]3 <e-e-`e-e-
+	q1 [ cc>cc< ]4 [ dd>dd< ]4 [ e-e->e-e-< ]4 [ ff>ff< ]4 > q0 [ "g8gg ]16
+}
+
diff --git a/sample/Yumipico/original_v3.nsf b/sample/Yumipico/original_v3.nsf
diff --git a/sample/_debug/fds_test.BAK b/sample/_debug/fds_test.BAK
diff --git a/sample/_debug/fds_test.mml b/sample/_debug/fds_test.mml
diff --git a/sample/_debug/fds_test.nsf b/sample/_debug/fds_test.nsf
diff --git a/sample/_debug/mmc5_test.mml b/sample/_debug/mmc5_test.mml
diff --git a/sample/_debug/mmc5_test.nsf b/sample/_debug/mmc5_test.nsf
diff --git a/sample/_debug/s5b_test.mml b/sample/_debug/s5b_test.mml
diff --git a/sample/_debug/s5b_test.nsf b/sample/_debug/s5b_test.nsf