Refactor Pitch/HiPitch bend logic

Dn-Programming-Core-Management · Jul 19, 2024 · d92a3a1 · d92a3a1
1 parent 8a3ee83
commit d92a3a1
Show file tree

Hide file tree

Showing 9 changed files with 2,147 additions and 2,129 deletions.
diff --git a/Source/drivers/asm/instrument.s b/Source/drivers/asm/instrument.s
@@ -175,21 +175,28 @@ ft_run_instrument:
 	ldy #$03		;;; ;; ; 050B
 	lda (var_Temp_Pointer), y
 	beq :+
+	; absolute pitch mode
+	; m_pInterface->SetPeriod(m_pInterface->TriggerNote(m_pInterface->GetNote()) + Value);
 	lda var_ch_Note, x
 	jsr ft_translate_freq_only
 
+	; relative pitch mode
+	; m_pInterface->SetPeriod(m_pInterface->GetPeriod() + Value);
 	; Check this
 :	lda #$00
-	sta var_Temp16 + 1
+	sta var_Temp16 + 1	; 0 either way
 	lda var_sequence_result
     sta var_Temp16
 	bpl @PositivePitch
 @NegativePitch:
     ;; !! !! change the sign
+	;; this is stupid, but what more can i do
+	;; we could easily just use the same addition macro
+	;; but the code explicitly checks for overflow
     lda #$FF
     eor var_Temp16
     sta var_Temp16
-    inc var_Temp16
+	inc var_Temp16
 	jsr ft_period_remove
 	jmp :+
 @PositivePitch:
@@ -213,37 +220,44 @@ ft_run_instrument:
 	sta var_ch_SequencePtr4, x
 
 	; Check this
+	;m_pInterface->SetPeriod(m_pInterface->GetPeriod() + (Value << 4));
 	lda #$00
-	sta var_Temp16 + 1
+	sta var_Temp16 + 1	; 0 either way
 	lda var_sequence_result
 	sta var_Temp16
-	ldy #$04
-:	clc
-	rol var_Temp16 						; multiply by 16
-	rol var_Temp16 + 1
-	dey
-	bne :-
-
-	lda var_sequence_result
 	bpl @PositiveHiPitch
 @NegativeHiPitch:
     ;; !! !! change the sign
-    lda #$FF
-    eor var_Temp16 + 1
-    sta var_Temp16 + 1
+	;; !! !! this is stupid, but what more can i do
     lda #$FF
     eor var_Temp16
-    clc
-    adc #$01
     sta var_Temp16
-    lda #$00
-    adc var_Temp16 + 1
-    sta var_Temp16 + 1
+	inc var_Temp16
+	; left shift 4
+	clc
+	asl var_Temp16
+	rol var_Temp16 + 1
+	asl var_Temp16
+	rol var_Temp16 + 1
+	asl var_Temp16
+	rol var_Temp16 + 1
+	asl var_Temp16
+	rol var_Temp16 + 1
 	jsr ft_period_remove
     ; check for over/underflow
     ; limitperiod()
 	jmp :+
 @PositiveHiPitch:
+	; left shift 4
+	clc
+	asl var_Temp16
+	rol var_Temp16 + 1
+	asl var_Temp16
+	rol var_Temp16 + 1
+	asl var_Temp16
+	rol var_Temp16 + 1
+	asl var_Temp16
+	rol var_Temp16 + 1
 	jsr ft_period_add
 :	jsr ft_limit_freq
 	; ^^^^^^^^^^

diff --git a/Source/drivers/drv_2a03.h b/Source/drivers/drv_2a03.h
diff --git a/Source/drivers/drv_all.h b/Source/drivers/drv_all.h
diff --git a/Source/drivers/drv_fds.h b/Source/drivers/drv_fds.h
diff --git a/Source/drivers/drv_mmc5.h b/Source/drivers/drv_mmc5.h
diff --git a/Source/drivers/drv_n163.h b/Source/drivers/drv_n163.h
diff --git a/Source/drivers/drv_s5b.h b/Source/drivers/drv_s5b.h
diff --git a/Source/drivers/drv_vrc6.h b/Source/drivers/drv_vrc6.h
diff --git a/Source/drivers/drv_vrc7.h b/Source/drivers/drv_vrc7.h