summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2019-08-25 09:57:50 -0500
committerdannye <33dannye@gmail.com>2019-08-25 09:57:50 -0500
commit44b9a240d4b2dd28737fa7aff37fb7d0582b25d6 (patch)
tree966f65032d33934c2364bce34ebab352aa632b02
parent8b0cd72a6095db7f1639dae81c3d8eefd5b814d8 (diff)
Make pitch_sweep pitch change argument consistent with the other signed magnitude arguments
-rw-r--r--audio/sfx/arrow_tiles_1.asm2
-rw-r--r--audio/sfx/arrow_tiles_3.asm2
-rw-r--r--audio/sfx/ball_poof.asm2
-rw-r--r--audio/sfx/battle_09.asm2
-rw-r--r--audio/sfx/battle_1e.asm2
-rw-r--r--audio/sfx/battle_24.asm2
-rw-r--r--audio/sfx/battle_32.asm2
-rw-r--r--audio/sfx/collision_1.asm2
-rw-r--r--audio/sfx/collision_3.asm2
-rw-r--r--audio/sfx/denied_1.asm2
-rw-r--r--audio/sfx/denied_3.asm2
-rw-r--r--audio/sfx/dex_page_added.asm2
-rw-r--r--audio/sfx/faint_fall.asm2
-rw-r--r--audio/sfx/faint_thud.asm2
-rw-r--r--audio/sfx/heal_ailment_1.asm2
-rw-r--r--audio/sfx/heal_ailment_2.asm2
-rw-r--r--audio/sfx/heal_ailment_3.asm2
-rw-r--r--audio/sfx/heal_hp_1.asm2
-rw-r--r--audio/sfx/heal_hp_2.asm2
-rw-r--r--audio/sfx/heal_hp_3.asm2
-rw-r--r--audio/sfx/healing_machine_1.asm2
-rw-r--r--audio/sfx/healing_machine_3.asm2
-rw-r--r--audio/sfx/intro_hip.asm2
-rw-r--r--audio/sfx/intro_hop.asm2
-rw-r--r--audio/sfx/ledge_1.asm2
-rw-r--r--audio/sfx/ledge_3.asm2
-rw-r--r--audio/sfx/poisoned_1.asm2
-rw-r--r--audio/sfx/poisoned_3.asm2
-rw-r--r--audio/sfx/psychic_m.asm2
-rw-r--r--audio/sfx/shooting_star.asm2
-rw-r--r--audio/sfx/shrink_1.asm2
-rw-r--r--audio/sfx/shrink_3.asm2
-rw-r--r--audio/sfx/teleport_enter1_1.asm2
-rw-r--r--audio/sfx/teleport_enter1_3.asm2
-rw-r--r--audio/sfx/teleport_exit1_1.asm2
-rw-r--r--audio/sfx/teleport_exit1_3.asm2
-rw-r--r--audio/sfx/teleport_exit2_1.asm2
-rw-r--r--audio/sfx/teleport_exit2_3.asm2
-rw-r--r--audio/sfx/tink_1.asm2
-rw-r--r--audio/sfx/tink_2.asm2
-rw-r--r--audio/sfx/tink_3.asm2
-rw-r--r--audio/sfx/trade_machine_1.asm2
-rw-r--r--audio/sfx/trade_machine_3.asm2
-rw-r--r--audio/sfx/withdraw_deposit_1.asm2
-rw-r--r--audio/sfx/withdraw_deposit_3.asm2
-rwxr-xr-xmacros/audio_macros.asm7
46 files changed, 51 insertions, 46 deletions
diff --git a/audio/sfx/arrow_tiles_1.asm b/audio/sfx/arrow_tiles_1.asm
index 0ab4cbe2..30d12c8b 100644
--- a/audio/sfx/arrow_tiles_1.asm
+++ b/audio/sfx/arrow_tiles_1.asm
@@ -2,5 +2,5 @@ SFX_Arrow_Tiles_1_Ch5:
duty_cycle 0
pitch_sweep 1, 7
square_note 15, 13, 2, 1792
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/arrow_tiles_3.asm b/audio/sfx/arrow_tiles_3.asm
index 787e431d..81c1774a 100644
--- a/audio/sfx/arrow_tiles_3.asm
+++ b/audio/sfx/arrow_tiles_3.asm
@@ -2,5 +2,5 @@ SFX_Arrow_Tiles_3_Ch5:
duty_cycle 0
pitch_sweep 1, 7
square_note 15, 13, 2, 1792
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/ball_poof.asm b/audio/sfx/ball_poof.asm
index 9503c570..396adf44 100644
--- a/audio/sfx/ball_poof.asm
+++ b/audio/sfx/ball_poof.asm
@@ -2,7 +2,7 @@ SFX_Ball_Poof_Ch5:
duty_cycle 2
pitch_sweep 1, 6
square_note 15, 15, 2, 1024
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/battle_09.asm b/audio/sfx/battle_09.asm
index ef3cf017..7a61373b 100644
--- a/audio/sfx/battle_09.asm
+++ b/audio/sfx/battle_09.asm
@@ -2,5 +2,5 @@ SFX_Battle_09_Ch5:
duty_cycle 1
pitch_sweep 9, 7
square_note 15, 15, 2, 1280
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/battle_1e.asm b/audio/sfx/battle_1e.asm
index ff4b0cbc..26820e8d 100644
--- a/audio/sfx/battle_1e.asm
+++ b/audio/sfx/battle_1e.asm
@@ -4,7 +4,7 @@ SFX_Battle_1E_Ch5:
square_note 4, 15, 2, 512
pitch_sweep 2, 2
square_note 8, 14, 2, 512
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/battle_24.asm b/audio/sfx/battle_24.asm
index 5b6c8e56..f99cf59a 100644
--- a/audio/sfx/battle_24.asm
+++ b/audio/sfx/battle_24.asm
@@ -2,7 +2,7 @@ SFX_Battle_24_Ch5:
duty_cycle 1
pitch_sweep 9, 7
square_note 15, 15, 2, 1792
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/battle_32.asm b/audio/sfx/battle_32.asm
index 53dfac32..c906dcac 100644
--- a/audio/sfx/battle_32.asm
+++ b/audio/sfx/battle_32.asm
@@ -2,7 +2,7 @@ SFX_Battle_32_Ch5:
duty_cycle 2
pitch_sweep 10, -7
square_note 8, 15, 1, 1792
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/collision_1.asm b/audio/sfx/collision_1.asm
index a6303265..70eb33ae 100644
--- a/audio/sfx/collision_1.asm
+++ b/audio/sfx/collision_1.asm
@@ -2,5 +2,5 @@ SFX_Collision_1_Ch5:
duty_cycle 2
pitch_sweep 5, -2
square_note 15, 15, 1, 768
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/collision_3.asm b/audio/sfx/collision_3.asm
index ae68314a..8b557bcc 100644
--- a/audio/sfx/collision_3.asm
+++ b/audio/sfx/collision_3.asm
@@ -2,5 +2,5 @@ SFX_Collision_3_Ch5:
duty_cycle 2
pitch_sweep 5, -2
square_note 15, 15, 1, 768
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/denied_1.asm b/audio/sfx/denied_1.asm
index fe822270..2c132003 100644
--- a/audio/sfx/denied_1.asm
+++ b/audio/sfx/denied_1.asm
@@ -2,7 +2,7 @@ SFX_Denied_1_Ch5:
duty_cycle 3
pitch_sweep 5, -2
square_note 4, 15, 0, 1280
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
square_note 4, 0, 0, 0
square_note 15, 15, 0, 1280
square_note 1, 0, 0, 0
diff --git a/audio/sfx/denied_3.asm b/audio/sfx/denied_3.asm
index 51b98de4..56a0753f 100644
--- a/audio/sfx/denied_3.asm
+++ b/audio/sfx/denied_3.asm
@@ -2,7 +2,7 @@ SFX_Denied_3_Ch5:
duty_cycle 3
pitch_sweep 5, -2
square_note 4, 15, 0, 1280
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
square_note 4, 0, 0, 0
square_note 15, 15, 0, 1280
square_note 1, 0, 0, 0
diff --git a/audio/sfx/dex_page_added.asm b/audio/sfx/dex_page_added.asm
index 147c3eb7..555b3beb 100644
--- a/audio/sfx/dex_page_added.asm
+++ b/audio/sfx/dex_page_added.asm
@@ -4,7 +4,7 @@ SFX_Dex_Page_Added_Ch5:
square_note 15, 15, 0, 1264
pitch_sweep 1, 7
square_note 15, 15, 2, 1616
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/faint_fall.asm b/audio/sfx/faint_fall.asm
index 6ce363e0..47f45037 100644
--- a/audio/sfx/faint_fall.asm
+++ b/audio/sfx/faint_fall.asm
@@ -2,5 +2,5 @@ SFX_Faint_Fall_Ch5:
duty_cycle 1
pitch_sweep 10, -7
square_note 15, 15, 2, 1920
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/faint_thud.asm b/audio/sfx/faint_thud.asm
index d7449c84..527e027f 100644
--- a/audio/sfx/faint_thud.asm
+++ b/audio/sfx/faint_thud.asm
@@ -1,6 +1,6 @@
SFX_Faint_Thud_Ch5:
square_note 15, 13, 1, 512
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/heal_ailment_1.asm b/audio/sfx/heal_ailment_1.asm
index a14afe1a..88a92881 100644
--- a/audio/sfx/heal_ailment_1.asm
+++ b/audio/sfx/heal_ailment_1.asm
@@ -5,5 +5,5 @@ SFX_Heal_Ailment_1_Ch5:
square_note 4, 15, 2, 1536
pitch_sweep 1, 7
square_note 15, 15, 2, 1536
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/heal_ailment_2.asm b/audio/sfx/heal_ailment_2.asm
index 81171c12..6e3e68d9 100644
--- a/audio/sfx/heal_ailment_2.asm
+++ b/audio/sfx/heal_ailment_2.asm
@@ -5,5 +5,5 @@ SFX_Heal_Ailment_2_Ch5:
square_note 4, 15, 2, 1536
pitch_sweep 1, 7
square_note 15, 15, 2, 1536
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/heal_ailment_3.asm b/audio/sfx/heal_ailment_3.asm
index b1a0a570..660d9abe 100644
--- a/audio/sfx/heal_ailment_3.asm
+++ b/audio/sfx/heal_ailment_3.asm
@@ -5,5 +5,5 @@ SFX_Heal_Ailment_3_Ch5:
square_note 4, 15, 2, 1536
pitch_sweep 1, 7
square_note 15, 15, 2, 1536
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/heal_hp_1.asm b/audio/sfx/heal_hp_1.asm
index f6413962..8dafb807 100644
--- a/audio/sfx/heal_hp_1.asm
+++ b/audio/sfx/heal_hp_1.asm
@@ -3,5 +3,5 @@ SFX_Heal_HP_1_Ch5:
pitch_sweep 1, 7
square_note 15, 15, 0, 1264
square_note 15, 15, 2, 1616
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/heal_hp_2.asm b/audio/sfx/heal_hp_2.asm
index c784c174..9eef9472 100644
--- a/audio/sfx/heal_hp_2.asm
+++ b/audio/sfx/heal_hp_2.asm
@@ -3,5 +3,5 @@ SFX_Heal_HP_2_Ch5:
pitch_sweep 1, 7
square_note 15, 15, 0, 1264
square_note 15, 15, 2, 1616
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/heal_hp_3.asm b/audio/sfx/heal_hp_3.asm
index 7ca9d73b..22651532 100644
--- a/audio/sfx/heal_hp_3.asm
+++ b/audio/sfx/heal_hp_3.asm
@@ -3,5 +3,5 @@ SFX_Heal_HP_3_Ch5:
pitch_sweep 1, 7
square_note 15, 15, 0, 1264
square_note 15, 15, 2, 1616
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/healing_machine_1.asm b/audio/sfx/healing_machine_1.asm
index 59d3f21a..9350ffd3 100644
--- a/audio/sfx/healing_machine_1.asm
+++ b/audio/sfx/healing_machine_1.asm
@@ -4,6 +4,6 @@ SFX_Healing_Machine_1_Ch5:
square_note 4, 15, 2, 1280
pitch_sweep 2, 2
square_note 2, 15, 1, 1280
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
square_note 1, 0, 0, 0
sound_ret
diff --git a/audio/sfx/healing_machine_3.asm b/audio/sfx/healing_machine_3.asm
index 3078dba5..5df3856b 100644
--- a/audio/sfx/healing_machine_3.asm
+++ b/audio/sfx/healing_machine_3.asm
@@ -4,6 +4,6 @@ SFX_Healing_Machine_3_Ch5:
square_note 4, 15, 2, 1280
pitch_sweep 2, 2
square_note 2, 15, 1, 1280
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
square_note 1, 0, 0, 0
sound_ret
diff --git a/audio/sfx/intro_hip.asm b/audio/sfx/intro_hip.asm
index 47e37c21..3d0f6642 100644
--- a/audio/sfx/intro_hip.asm
+++ b/audio/sfx/intro_hip.asm
@@ -2,5 +2,5 @@ SFX_Intro_Hip_Ch5:
duty_cycle 2
pitch_sweep 2, 6
square_note 12, 12, 2, 1856
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/intro_hop.asm b/audio/sfx/intro_hop.asm
index 1bee7a5c..9c7c1ad6 100644
--- a/audio/sfx/intro_hop.asm
+++ b/audio/sfx/intro_hop.asm
@@ -2,5 +2,5 @@ SFX_Intro_Hop_Ch5:
duty_cycle 2
pitch_sweep 2, 6
square_note 12, 12, 2, 1664
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/ledge_1.asm b/audio/sfx/ledge_1.asm
index 6cfb4d26..dd798f40 100644
--- a/audio/sfx/ledge_1.asm
+++ b/audio/sfx/ledge_1.asm
@@ -2,5 +2,5 @@ SFX_Ledge_1_Ch5:
duty_cycle 2
pitch_sweep 9, 5
square_note 15, 15, 2, 1024
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/ledge_3.asm b/audio/sfx/ledge_3.asm
index 97627116..c218ee1b 100644
--- a/audio/sfx/ledge_3.asm
+++ b/audio/sfx/ledge_3.asm
@@ -2,5 +2,5 @@ SFX_Ledge_3_Ch5:
duty_cycle 2
pitch_sweep 9, 5
square_note 15, 15, 2, 1024
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/poisoned_1.asm b/audio/sfx/poisoned_1.asm
index 2c922df7..6827147c 100644
--- a/audio/sfx/poisoned_1.asm
+++ b/audio/sfx/poisoned_1.asm
@@ -4,5 +4,5 @@ SFX_Poisoned_1_Ch5:
square_note 4, 15, 2, 1536
sound_loop 4, SFX_Poisoned_1_Ch5
square_note 15, 15, 3, 1536
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/poisoned_3.asm b/audio/sfx/poisoned_3.asm
index 2c0b58cc..fa1808c3 100644
--- a/audio/sfx/poisoned_3.asm
+++ b/audio/sfx/poisoned_3.asm
@@ -4,5 +4,5 @@ SFX_Poisoned_3_Ch5:
square_note 4, 15, 2, 1536
sound_loop 4, SFX_Poisoned_3_Ch5
square_note 15, 15, 3, 1536
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/psychic_m.asm b/audio/sfx/psychic_m.asm
index c6e11d42..ff0ab384 100644
--- a/audio/sfx/psychic_m.asm
+++ b/audio/sfx/psychic_m.asm
@@ -7,7 +7,7 @@ SFX_Psychic_M_Ch5:
square_note 8, 12, 4, 1984
square_note 15, 12, 4, 1985
square_note 15, 15, 2, 1984
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/shooting_star.asm b/audio/sfx/shooting_star.asm
index 2a125987..cbef7398 100644
--- a/audio/sfx/shooting_star.asm
+++ b/audio/sfx/shooting_star.asm
@@ -10,5 +10,5 @@ SFX_Shooting_Star_Ch5:
square_note 8, 6, 0, 2016
square_note 8, 3, 0, 2016
square_note 15, 1, 2, 2016
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/shrink_1.asm b/audio/sfx/shrink_1.asm
index ae869564..912dd3f9 100644
--- a/audio/sfx/shrink_1.asm
+++ b/audio/sfx/shrink_1.asm
@@ -6,5 +6,5 @@ SFX_Shrink_1_Ch5:
square_note 15, 8, 7, 1280
square_note 15, 4, 7, 1152
square_note 15, 1, 7, 1024
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/shrink_3.asm b/audio/sfx/shrink_3.asm
index b944680f..88da25c2 100644
--- a/audio/sfx/shrink_3.asm
+++ b/audio/sfx/shrink_3.asm
@@ -6,5 +6,5 @@ SFX_Shrink_3_Ch5:
square_note 15, 8, 7, 1280
square_note 15, 4, 7, 1152
square_note 15, 1, 7, 1024
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/teleport_enter1_1.asm b/audio/sfx/teleport_enter1_1.asm
index 4f99dae1..eddaffa6 100644
--- a/audio/sfx/teleport_enter1_1.asm
+++ b/audio/sfx/teleport_enter1_1.asm
@@ -6,5 +6,5 @@ SFX_Teleport_Enter1_1_Ch5:
square_note 15, 8, 7, 1536
square_note 15, 4, 7, 1408
square_note 15, 1, 7, 1280
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/teleport_enter1_3.asm b/audio/sfx/teleport_enter1_3.asm
index c6502a29..fc185621 100644
--- a/audio/sfx/teleport_enter1_3.asm
+++ b/audio/sfx/teleport_enter1_3.asm
@@ -6,5 +6,5 @@ SFX_Teleport_Enter1_3_Ch5:
square_note 15, 8, 7, 1536
square_note 15, 4, 7, 1408
square_note 15, 1, 7, 1280
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/teleport_exit1_1.asm b/audio/sfx/teleport_exit1_1.asm
index b2511b1f..5e27525e 100644
--- a/audio/sfx/teleport_exit1_1.asm
+++ b/audio/sfx/teleport_exit1_1.asm
@@ -6,5 +6,5 @@ SFX_Teleport_Exit1_1_Ch5:
square_note 15, 8, 7, 1536
square_note 15, 4, 7, 1664
square_note 15, 1, 7, 1792
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/teleport_exit1_3.asm b/audio/sfx/teleport_exit1_3.asm
index 6a3b2d96..350da576 100644
--- a/audio/sfx/teleport_exit1_3.asm
+++ b/audio/sfx/teleport_exit1_3.asm
@@ -6,5 +6,5 @@ SFX_Teleport_Exit1_3_Ch5:
square_note 15, 8, 7, 1536
square_note 15, 4, 7, 1664
square_note 15, 1, 7, 1792
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/teleport_exit2_1.asm b/audio/sfx/teleport_exit2_1.asm
index 23a6ea85..a2a36942 100644
--- a/audio/sfx/teleport_exit2_1.asm
+++ b/audio/sfx/teleport_exit2_1.asm
@@ -2,5 +2,5 @@ SFX_Teleport_Exit2_1_Ch5:
duty_cycle 1
pitch_sweep 1, 6
square_note 15, 13, 2, 1280
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/teleport_exit2_3.asm b/audio/sfx/teleport_exit2_3.asm
index 178a4d78..70d809c3 100644
--- a/audio/sfx/teleport_exit2_3.asm
+++ b/audio/sfx/teleport_exit2_3.asm
@@ -2,5 +2,5 @@ SFX_Teleport_Exit2_3_Ch5:
duty_cycle 1
pitch_sweep 1, 6
square_note 15, 13, 2, 1280
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/tink_1.asm b/audio/sfx/tink_1.asm
index 4e471fab..7d56a081 100644
--- a/audio/sfx/tink_1.asm
+++ b/audio/sfx/tink_1.asm
@@ -4,5 +4,5 @@ SFX_Tink_1_Ch5:
square_note 4, 15, 2, 512
pitch_sweep 2, 2
square_note 8, 14, 2, 512
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/tink_2.asm b/audio/sfx/tink_2.asm
index 077d93be..94aa8929 100644
--- a/audio/sfx/tink_2.asm
+++ b/audio/sfx/tink_2.asm
@@ -4,5 +4,5 @@ SFX_Tink_2_Ch5:
square_note 4, 15, 2, 512
pitch_sweep 2, 2
square_note 8, 14, 2, 512
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/tink_3.asm b/audio/sfx/tink_3.asm
index e06ed62e..1134fdc4 100644
--- a/audio/sfx/tink_3.asm
+++ b/audio/sfx/tink_3.asm
@@ -4,5 +4,5 @@ SFX_Tink_3_Ch5:
square_note 4, 15, 2, 512
pitch_sweep 2, 2
square_note 8, 14, 2, 512
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/trade_machine_1.asm b/audio/sfx/trade_machine_1.asm
index 050182b7..f09982eb 100644
--- a/audio/sfx/trade_machine_1.asm
+++ b/audio/sfx/trade_machine_1.asm
@@ -3,5 +3,5 @@ SFX_Trade_Machine_1_Ch5:
pitch_sweep 1, 5
square_note 15, 15, 0, 1264
square_note 15, 15, 2, 1616
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/trade_machine_3.asm b/audio/sfx/trade_machine_3.asm
index d14fc4c1..a85b717e 100644
--- a/audio/sfx/trade_machine_3.asm
+++ b/audio/sfx/trade_machine_3.asm
@@ -3,5 +3,5 @@ SFX_Trade_Machine_3_Ch5:
pitch_sweep 1, 5
square_note 15, 15, 0, 1264
square_note 15, 15, 2, 1616
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/withdraw_deposit_1.asm b/audio/sfx/withdraw_deposit_1.asm
index 9c4f2868..c7ab2447 100644
--- a/audio/sfx/withdraw_deposit_1.asm
+++ b/audio/sfx/withdraw_deposit_1.asm
@@ -8,5 +8,5 @@ SFX_Withdraw_Deposit_1_Ch5:
square_note 4, 15, 2, 1792
pitch_sweep 2, 2
square_note 15, 14, 2, 1792
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/audio/sfx/withdraw_deposit_3.asm b/audio/sfx/withdraw_deposit_3.asm
index cd881753..568f3230 100644
--- a/audio/sfx/withdraw_deposit_3.asm
+++ b/audio/sfx/withdraw_deposit_3.asm
@@ -8,5 +8,5 @@ SFX_Withdraw_Deposit_3_Ch5:
square_note 4, 15, 2, 1792
pitch_sweep 2, 2
square_note 15, 14, 2, 1792
- pitch_sweep 0, 0
+ pitch_sweep 0, 8
sound_ret
diff --git a/macros/audio_macros.asm b/macros/audio_macros.asm
index 620b61ad..643114da 100755
--- a/macros/audio_macros.asm
+++ b/macros/audio_macros.asm
@@ -32,11 +32,13 @@ ENDM
; arguments: length [0, 7], pitch change [-7, 7]
; length: length of time between pitch shifts
+; sometimes used with a value >7 in which case the MSB is ignored
; pitch change: positive value means increase in pitch, negative value means decrease in pitch
; small magnitude means quick change, large magnitude means slow change
+; in signed magnitude representation, so a value of 8 is the same as (negative) 0
pitch_sweep: MACRO
db $10
- IF \2 <= 0
+ IF \2 < 0
db (\1 << 4) | (%1000 | (\2 * -1))
ELSE
db (\1 << 4) | \2
@@ -46,6 +48,7 @@ ENDM
; arguments: length [0, 15], volume [0, 15], fade [-7, 7], frequency
; fade: positive value means decrease in volume, negative value means increase in volume
; small magnitude means quick change, large magnitude means slow change
+; in signed magnitude representation, so a value of 8 is the same as (negative) 0
square_note: MACRO
db $20 | \1
IF \3 < 0
@@ -59,6 +62,7 @@ ENDM
; arguments: length [0, 15], volume [0, 15], fade [-7, 7], frequency
; fade: positive value means decrease in volume, negative value means increase in volume
; small magnitude means quick change, large magnitude means slow change
+; in signed magnitude representation, so a value of 8 is the same as (negative) 0
noise_note: MACRO
db $20 | \1
IF \3 < 0
@@ -109,6 +113,7 @@ ENDM
; arguments: speed [0, 15], volume [0, 15], fade [-7, 7]
; fade: positive value means decrease in volume, negative value means increase in volume
; small magnitude means quick change, large magnitude means slow change
+; in signed magnitude representation, so a value of 8 is the same as (negative) 0
note_type: MACRO
db $D0 | \1
IF \3 < 0