Merge branch 'master' of https://github.com/pret/pokered

44 files changed, 0 insertions, 87 deletions

diff --git a/audio/sfx/cry00_4.asm b/audio/sfx/cry00_4.asm
index 87bf036e..57eb49da 100644
--- a/audio/sfx/cry00_4.asm
+++ b/audio/sfx/cry00_4.asm
@@ -5,7 +5,6 @@ SFX_Cry00_4_Ch5:
 	square_note 8, 9, 1, 1880
 	sound_ret
 
-
 SFX_Cry00_4_Ch6:
 	duty_cycle_pattern 2, 2, 0, 0
 	square_note 5, 11, 3, 1800
@@ -13,7 +12,6 @@ SFX_Cry00_4_Ch6:
 	square_note 8, 7, 1, 1864
 	sound_ret
 
-
 SFX_Cry00_4_Ch8:
 	noise_note 3, 10, 1, 28
 	noise_note 14, 9, 4, 44
diff --git a/audio/sfx/cry01_4.asm b/audio/sfx/cry01_4.asm
index 98824d06..fd4d6674 100644
--- a/audio/sfx/cry01_4.asm
+++ b/audio/sfx/cry01_4.asm
@@ -6,7 +6,6 @@ SFX_Cry01_4_Ch5:
 	square_note 8, 13, 1, 1808
 	sound_ret
 
-
 SFX_Cry01_4_Ch6:
 	duty_cycle_pattern 1, 1, 2, 2
 	square_note 5, 11, 3, 1777
@@ -15,7 +14,6 @@ SFX_Cry01_4_Ch6:
 	square_note 8, 11, 1, 1537
 	sound_ret
 
-
 SFX_Cry01_4_Ch8:
 	noise_note 3, 10, 2, 60
 	noise_note 12, 9, 4, 44
diff --git a/audio/sfx/cry02_4.asm b/audio/sfx/cry02_4.asm
index aed17087..f4160af2 100644
--- a/audio/sfx/cry02_4.asm
+++ b/audio/sfx/cry02_4.asm
@@ -5,13 +5,11 @@ SFX_Cry02_4_Ch5:
 	square_note 8, 13, 1, 1500
 	sound_ret
 
-
 SFX_Cry02_4_Ch6:
 	duty_cycle_pattern 2, 2, 1, 1
 	square_note 7, 9, 5, 1089
 	square_note 2, 8, 1, 1313
 	square_note 8, 6, 1, 1306
 
-
 SFX_Cry02_4_Ch8:
 	sound_ret
diff --git a/audio/sfx/cry03_4.asm b/audio/sfx/cry03_4.asm
index b4de22ce..c261f391 100644
--- a/audio/sfx/cry03_4.asm
+++ b/audio/sfx/cry03_4.asm
@@ -9,7 +9,6 @@ SFX_Cry03_4_Ch5:
 	square_note 8, 14, 1, 1408
 	sound_ret
 
-
 SFX_Cry03_4_Ch6:
 	duty_cycle_pattern 0, 0, 2, 2
 	square_note 4, 12, 7, 1284
@@ -21,7 +20,6 @@ SFX_Cry03_4_Ch6:
 	square_note 8, 12, 1, 1154
 	sound_ret
 
-
 SFX_Cry03_4_Ch8:
 	noise_note 12, 14, 4, 76
 	noise_note 10, 12, 7, 92
diff --git a/audio/sfx/cry04_4.asm b/audio/sfx/cry04_4.asm
index 408ab37a..78101bbd 100644
--- a/audio/sfx/cry04_4.asm
+++ b/audio/sfx/cry04_4.asm
@@ -9,7 +9,6 @@ SFX_Cry04_4_Ch5:
 	square_note 8, 11, 1, 1552
 	sound_ret
 
-
 SFX_Cry04_4_Ch6:
 	duty_cycle_pattern 1, 1, 2, 2
 	square_note 4, 14, 7, 1537
@@ -21,7 +20,6 @@ SFX_Cry04_4_Ch6:
 	square_note 8, 10, 1, 1393
 	sound_ret
 
-
 SFX_Cry04_4_Ch8:
 	noise_note 7, 13, 6, 92
 	noise_note 8, 14, 6, 76
diff --git a/audio/sfx/cry05_4.asm b/audio/sfx/cry05_4.asm
index cce656b1..56fe5e02 100644
--- a/audio/sfx/cry05_4.asm
+++ b/audio/sfx/cry05_4.asm
@@ -6,7 +6,6 @@ SFX_Cry05_4_Ch5:
 	square_note 8, 10, 1, 1376
 	sound_ret
 
-
 SFX_Cry05_4_Ch6:
 	duty_cycle_pattern 3, 3, 1, 1
 	square_note 6, 14, 2, 1154
@@ -14,6 +13,5 @@ SFX_Cry05_4_Ch6:
 	square_note 6, 11, 2, 1250
 	square_note 8, 8, 1, 1217
 
-
 SFX_Cry05_4_Ch8:
 	sound_ret
diff --git a/audio/sfx/cry06_4.asm b/audio/sfx/cry06_4.asm
index 2fbbb161..7c652af2 100644
--- a/audio/sfx/cry06_4.asm
+++ b/audio/sfx/cry06_4.asm
@@ -7,11 +7,9 @@ SFX_Cry06_4_Ch5:
 	square_note 15, 8, 2, 549
 	square_note 15, 4, 2, 519
 
-
 SFX_Cry06_4_Ch6:
 	sound_ret
 
-
 SFX_Cry06_4_Ch8:
 	noise_note 8, 13, 4, 140
 	noise_note 4, 14, 2, 156
diff --git a/audio/sfx/cry07_4.asm b/audio/sfx/cry07_4.asm
index 7e44544f..9e177bc4 100644
--- a/audio/sfx/cry07_4.asm
+++ b/audio/sfx/cry07_4.asm
@@ -5,7 +5,6 @@ SFX_Cry07_4_Ch5:
 	square_note 8, 12, 1, 1568
 	sound_ret
 
-
 SFX_Cry07_4_Ch6:
 	duty_cycle_pattern 0, 0, 2, 2
 	square_note 3, 12, 3, 1667
@@ -13,7 +12,6 @@ SFX_Cry07_4_Ch6:
 	square_note 8, 10, 1, 1537
 	sound_ret
 
-
 SFX_Cry07_4_Ch8:
 	noise_note 4, 13, 3, 92
 	noise_note 15, 14, 6, 76
diff --git a/audio/sfx/cry08_4.asm b/audio/sfx/cry08_4.asm
index 67dcb820..0d96dffa 100644
--- a/audio/sfx/cry08_4.asm
+++ b/audio/sfx/cry08_4.asm
@@ -6,7 +6,6 @@ SFX_Cry08_4_Ch5:
 	square_note 15, 11, 2, 1340
 	sound_ret
 
-
 SFX_Cry08_4_Ch6:
 	duty_cycle_pattern 1, 1, 2, 2
 	square_note 14, 13, 6, 1283
@@ -15,7 +14,6 @@ SFX_Cry08_4_Ch6:
 	square_note 15, 10, 2, 1243
 	sound_ret
 
-
 SFX_Cry08_4_Ch8:
 	noise_note 12, 14, 6, 76
 	noise_note 11, 13, 7, 92
diff --git a/audio/sfx/cry09_4.asm b/audio/sfx/cry09_4.asm
index 7dec80d3..ebfae572 100644
--- a/audio/sfx/cry09_4.asm
+++ b/audio/sfx/cry09_4.asm
@@ -9,7 +9,6 @@ SFX_Cry09_4_Ch5:
 	square_note 15, 15, 2, 2008
 	sound_ret
 
-
 SFX_Cry09_4_Ch6:
 	duty_cycle_pattern 0, 0, 1, 1
 	square_note 2, 0, 8, 0
@@ -22,7 +21,6 @@ SFX_Cry09_4_Ch6:
 	square_note 15, 10, 2, 1751
 	sound_ret
 
-
 SFX_Cry09_4_Ch8:
 	noise_note 2, 15, 2, 60
 	noise_note 8, 14, 4, 62
diff --git a/audio/sfx/cry0a_4.asm b/audio/sfx/cry0a_4.asm
index c3cf315b..afb84c11 100644
--- a/audio/sfx/cry0a_4.asm
+++ b/audio/sfx/cry0a_4.asm
@@ -9,7 +9,6 @@ SFX_Cry0A_4_Ch5:
 	square_note 15, 10, 2, 1736
 	sound_ret
 
-
 SFX_Cry0A_4_Ch6:
 	duty_cycle_pattern 0, 0, 1, 1
 	square_note 3, 0, 8, 0
@@ -22,7 +21,6 @@ SFX_Cry0A_4_Ch6:
 	square_note 15, 7, 2, 1673
 	sound_ret
 
-
 SFX_Cry0A_4_Ch8:
 	noise_note 2, 15, 2, 60
 	noise_note 8, 14, 4, 62
diff --git a/audio/sfx/cry0b_4.asm b/audio/sfx/cry0b_4.asm
index 610e2831..c092bf9d 100644
--- a/audio/sfx/cry0b_4.asm
+++ b/audio/sfx/cry0b_4.asm
@@ -12,7 +12,6 @@ SFX_Cry0B_4_Ch5:
 	square_note 8, 11, 1, 1857
 	sound_ret
 
-
 SFX_Cry0B_4_Ch6:
 	duty_cycle_pattern 1, 0, 1, 0
 	square_note 12, 0, 8, 0
@@ -24,7 +23,6 @@ SFX_Cry0B_4_Ch6:
 	square_note 8, 13, 1, 1793
 	sound_ret
 
-
 SFX_Cry0B_4_Ch8:
 	noise_note 15, 0, 8, 0
 	noise_note 4, 0, 8, 0
diff --git a/audio/sfx/cry0c_4.asm b/audio/sfx/cry0c_4.asm
index cc8766a1..cfbe581d 100644
--- a/audio/sfx/cry0c_4.asm
+++ b/audio/sfx/cry0c_4.asm
@@ -11,7 +11,6 @@ SFX_Cry0C_4_Ch5:
 	square_note 8, 12, 1, 1568
 	sound_ret
 
-
 SFX_Cry0C_4_Ch6:
 	duty_cycle_pattern 1, 0, 1, 0
 	square_note 12, 12, 3, 1472
@@ -24,6 +23,5 @@ SFX_Cry0C_4_Ch6:
 	square_note 2, 9, 1, 1497
 	square_note 8, 9, 1, 1505
 
-
 SFX_Cry0C_4_Ch8:
 	sound_ret
diff --git a/audio/sfx/cry0d_4.asm b/audio/sfx/cry0d_4.asm
index 2119f0a9..f48cadff 100644
--- a/audio/sfx/cry0d_4.asm
+++ b/audio/sfx/cry0d_4.asm
@@ -9,7 +9,6 @@ SFX_Cry0D_4_Ch5:
 	sound_loop 2, SFX_Cry0D_4_Ch5
 	sound_ret
 
-
 SFX_Cry0D_4_Ch6:
 	duty_cycle_pattern 1, 0, 0, 0
 	square_note 4, 0, 8, 0
@@ -25,7 +24,6 @@ SFX_Cry0D_4_Ch6:
 	square_note 4, 13, 1, 1569
 	sound_ret
 
-
 SFX_Cry0D_4_Ch8:
 	noise_note 6, 13, 2, 28
 	noise_note 9, 11, 1, 44
diff --git a/audio/sfx/cry0e_4.asm b/audio/sfx/cry0e_4.asm
index 0c18e996..975c1296 100644
--- a/audio/sfx/cry0e_4.asm
+++ b/audio/sfx/cry0e_4.asm
@@ -6,7 +6,6 @@ SFX_Cry0E_4_Ch5:
 	square_note 8, 14, 1, 1536
 	sound_ret
 
-
 SFX_Cry0E_4_Ch6:
 	duty_cycle_pattern 0, 0, 2, 2
 	square_note 4, 11, 1, 1761
@@ -15,7 +14,6 @@ SFX_Cry0E_4_Ch6:
 	square_note 8, 11, 1, 1505
 	sound_ret
 
-
 SFX_Cry0E_4_Ch8:
 	noise_note 2, 6, 1, 50
 	noise_note 2, 6, 1, 33
diff --git a/audio/sfx/cry0f_4.asm b/audio/sfx/cry0f_4.asm
index 6debdb09..bf72ccb9 100644
--- a/audio/sfx/cry0f_4.asm
+++ b/audio/sfx/cry0f_4.asm
@@ -8,7 +8,6 @@ SFX_Cry0F_4_Ch5:
 	square_note 8, 12, 1, 1600
 	sound_ret
 
-
 SFX_Cry0F_4_Ch6:
 	duty_cycle_pattern 3, 0, 3, 0
 	square_note 3, 12, 7, 1921
@@ -19,7 +18,6 @@ SFX_Cry0F_4_Ch6:
 	square_note 8, 10, 1, 1538
 	sound_ret
 
-
 SFX_Cry0F_4_Ch8:
 	noise_note 3, 14, 4, 60
 	noise_note 12, 13, 6, 44
diff --git a/audio/sfx/cry10_4.asm b/audio/sfx/cry10_4.asm
index 39c374bc..c8f2e1e0 100644
--- a/audio/sfx/cry10_4.asm
+++ b/audio/sfx/cry10_4.asm
@@ -10,7 +10,6 @@ SFX_Cry10_4_Ch5:
 	square_note 15, 9, 1, 1824
 	sound_ret
 
-
 SFX_Cry10_4_Ch6:
 	duty_cycle_pattern 1, 3, 2, 1
 	square_note 10, 14, 7, 1666
@@ -23,7 +22,6 @@ SFX_Cry10_4_Ch6:
 	square_note 15, 8, 1, 1826
 	sound_ret
 
-
 SFX_Cry10_4_Ch8:
 	noise_note 4, 7, 4, 33
 	noise_note 4, 7, 4, 16
diff --git a/audio/sfx/cry11_4.asm b/audio/sfx/cry11_4.asm
index 8e75ec6a..bfff3feb 100644
--- a/audio/sfx/cry11_4.asm
+++ b/audio/sfx/cry11_4.asm
@@ -9,7 +9,6 @@ SFX_Cry11_4_Ch5:
 	square_note 8, 11, 1, 1840
 	sound_ret
 
-
 SFX_Cry11_4_Ch6:
 	duty_cycle_pattern 0, 0, 2, 2
 	square_note 4, 0, 8, 0
@@ -22,7 +21,6 @@ SFX_Cry11_4_Ch6:
 	square_note 8, 7, 1, 1752
 	sound_ret
 
-
 SFX_Cry11_4_Ch8:
 	noise_note 2, 15, 2, 76
 	noise_note 6, 14, 6, 58
diff --git a/audio/sfx/cry12_4.asm b/audio/sfx/cry12_4.asm
index 0c98bdee..478245b8 100644
--- a/audio/sfx/cry12_4.asm
+++ b/audio/sfx/cry12_4.asm
@@ -6,7 +6,6 @@ SFX_Cry12_4_Ch5:
 	square_note 8, 13, 1, 1152
 	sound_ret
 
-
 SFX_Cry12_4_Ch6:
 	duty_cycle_pattern 3, 2, 3, 2
 	square_note 11, 13, 2, 1080
@@ -15,7 +14,6 @@ SFX_Cry12_4_Ch6:
 	square_note 8, 11, 1, 1144
 	sound_ret
 
-
 SFX_Cry12_4_Ch8:
 	noise_note 10, 14, 6, 108
 	noise_note 15, 13, 2, 92
diff --git a/audio/sfx/cry13_4.asm b/audio/sfx/cry13_4.asm
index 649e1a73..f8fa39a8 100644
--- a/audio/sfx/cry13_4.asm
+++ b/audio/sfx/cry13_4.asm
@@ -8,7 +8,6 @@ SFX_Cry13_4_Ch5:
 	square_note 8, 11, 1, 1536
 	sound_ret
 
-
 SFX_Cry13_4_Ch6:
 	duty_cycle_pattern 2, 1, 2, 1
 	square_note 14, 12, 6, 1201
@@ -19,7 +18,6 @@ SFX_Cry13_4_Ch6:
 	square_note 8, 9, 1, 1265
 	sound_ret
 
-
 SFX_Cry13_4_Ch8:
 	noise_note 10, 14, 6, 92
 	noise_note 10, 13, 6, 108
diff --git a/audio/sfx/cry14_4.asm b/audio/sfx/cry14_4.asm
index b3dc1b2d..0cddc4f0 100644
--- a/audio/sfx/cry14_4.asm
+++ b/audio/sfx/cry14_4.asm
@@ -5,7 +5,6 @@ SFX_Cry14_4_Ch5:
 	square_note 8, 13, 1, 2008
 	sound_ret
 
-
 SFX_Cry14_4_Ch6:
 	duty_cycle_pattern 2, 2, 1, 1
 	square_note 10, 12, 4, 1905
@@ -13,7 +12,6 @@ SFX_Cry14_4_Ch6:
 	square_note 8, 10, 1, 1975
 	sound_ret
 
-
 SFX_Cry14_4_Ch8:
 	noise_note 8, 14, 4, 76
 	noise_note 14, 12, 4, 60
diff --git a/audio/sfx/cry15_4.asm b/audio/sfx/cry15_4.asm
index 7764d751..7ebaad94 100644
--- a/audio/sfx/cry15_4.asm
+++ b/audio/sfx/cry15_4.asm
@@ -8,7 +8,6 @@ SFX_Cry15_4_Ch5:
 	square_note 8, 12, 1, 1760
 	sound_ret
 
-
 SFX_Cry15_4_Ch6:
 	duty_cycle_pattern 1, 1, 2, 2
 	square_note 6, 12, 3, 1793
@@ -19,7 +18,6 @@ SFX_Cry15_4_Ch6:
 	square_note 8, 10, 1, 1633
 	sound_ret
 
-
 SFX_Cry15_4_Ch8:
 	noise_note 6, 14, 3, 92
 	noise_note 14, 13, 6, 76
diff --git a/audio/sfx/cry16_4.asm b/audio/sfx/cry16_4.asm
index 35ddd284..a0190bea 100644
--- a/audio/sfx/cry16_4.asm
+++ b/audio/sfx/cry16_4.asm
@@ -5,7 +5,6 @@ SFX_Cry16_4_Ch5:
 	square_note 15, 13, 2, 1856
 	sound_ret
 
-
 SFX_Cry16_4_Ch6:
 	duty_cycle_pattern 1, 1, 2, 2
 	square_note 15, 12, 7, 1875
@@ -13,7 +12,6 @@ SFX_Cry16_4_Ch6:
 	square_note 15, 12, 2, 1809
 	sound_ret
 
-
 SFX_Cry16_4_Ch8:
 	noise_note 13, 15, 6, 76
 	noise_note 4, 14, 6, 60
diff --git a/audio/sfx/cry17_4.asm b/audio/sfx/cry17_4.asm
index a5c8de8e..695060dc 100644
--- a/audio/sfx/cry17_4.asm
+++ b/audio/sfx/cry17_4.asm
@@ -6,7 +6,6 @@ SFX_Cry17_4_Ch5:
 	square_note 15, 10, 2, 1120
 	sound_ret
 
-
 SFX_Cry17_4_Ch6:
 	duty_cycle_pattern 1, 0, 1, 0
 	square_note 14, 13, 7, 1153
@@ -15,7 +14,6 @@ SFX_Cry17_4_Ch6:
 	square_note 15, 12, 2, 993
 	sound_ret
 
-
 SFX_Cry17_4_Ch8:
 	noise_note 14, 15, 7, 124
 	noise_note 12, 15, 6, 108
diff --git a/audio/sfx/cry18_4.asm b/audio/sfx/cry18_4.asm
index 2909234a..f8f0535a 100644
--- a/audio/sfx/cry18_4.asm
+++ b/audio/sfx/cry18_4.asm
@@ -10,7 +10,6 @@ SFX_Cry18_4_Ch5:
 	square_note 8, 12, 1, 1696
 	sound_ret
 
-
 SFX_Cry18_4_Ch6:
 	duty_cycle_pattern 0, 0, 3, 3
 	square_note 9, 13, 5, 1585
@@ -23,7 +22,6 @@ SFX_Cry18_4_Ch6:
 	square_note 8, 11, 1, 1617
 	sound_ret
 
-
 SFX_Cry18_4_Ch8:
 	noise_note 6, 14, 3, 76
 	noise_note 4, 12, 3, 60
diff --git a/audio/sfx/cry19_4.asm b/audio/sfx/cry19_4.asm
index 0deaf3e3..18501479 100644
--- a/audio/sfx/cry19_4.asm
+++ b/audio/sfx/cry19_4.asm
@@ -5,7 +5,6 @@ SFX_Cry19_4_Ch5:
 	square_note 15, 12, 1, 1840
 	sound_ret
 
-
 SFX_Cry19_4_Ch6:
 	duty_cycle_pattern 2, 0, 0, 1
 	square_note 2, 12, 2, 1793
@@ -13,6 +12,5 @@ SFX_Cry19_4_Ch6:
 	square_note 15, 13, 7, 1857
 	square_note 15, 10, 2, 1793
 
-
 SFX_Cry19_4_Ch8:
 	sound_ret
diff --git a/audio/sfx/cry1a_4.asm b/audio/sfx/cry1a_4.asm
index 1a1856e7..86e1ff52 100644
--- a/audio/sfx/cry1a_4.asm
+++ b/audio/sfx/cry1a_4.asm
@@ -8,7 +8,6 @@ SFX_Cry1A_4_Ch5:
 	square_note 8, 13, 1, 1952
 	sound_ret
 
-
 SFX_Cry1A_4_Ch6:
 	duty_cycle_pattern 0, 0, 2, 2
 	square_note 6, 12, 7, 1793
@@ -19,7 +18,6 @@ SFX_Cry1A_4_Ch6:
 	square_note 8, 9, 1, 1890
 	sound_ret
 
-
 SFX_Cry1A_4_Ch8:
 	noise_note 3, 14, 2, 60
 	noise_note 8, 13, 6, 76
diff --git a/audio/sfx/cry1b_4.asm b/audio/sfx/cry1b_4.asm
index f0a57d88..22917735 100644
--- a/audio/sfx/cry1b_4.asm
+++ b/audio/sfx/cry1b_4.asm
@@ -7,7 +7,6 @@ SFX_Cry1B_4_Ch5:
 	square_note 8, 13, 1, 1744
 	sound_ret
 
-
 SFX_Cry1B_4_Ch6:
 	duty_cycle_pattern 0, 0, 2, 2
 	square_note 7, 14, 6, 1665
@@ -17,7 +16,6 @@ SFX_Cry1B_4_Ch6:
 	square_note 8, 12, 1, 1681
 	sound_ret
 
-
 SFX_Cry1B_4_Ch8:
 	noise_note 10, 10, 6, 60
 	noise_note 14, 9, 4, 44
diff --git a/audio/sfx/cry1c_4.asm b/audio/sfx/cry1c_4.asm
index 2df760db..2792c227 100644
--- a/audio/sfx/cry1c_4.asm
+++ b/audio/sfx/cry1c_4.asm
@@ -10,7 +10,6 @@ SFX_Cry1C_4_Ch5:
 	square_note 8, 10, 1, 2015
 	sound_ret
 
-
 SFX_Cry1C_4_Ch6:
 	duty_cycle_pattern 1, 0, 1, 0
 	square_note 6, 12, 3, 1993
@@ -21,7 +20,6 @@ SFX_Cry1C_4_Ch6:
 	square_note 15, 10, 2, 1989
 	sound_ret
 
-
 SFX_Cry1C_4_Ch8:
 	noise_note 13, 1, -1, 124
 	noise_note 13, 15, 7, 140
diff --git a/audio/sfx/cry1d_4.asm b/audio/sfx/cry1d_4.asm
index 52f4f474..de923afd 100644
--- a/audio/sfx/cry1d_4.asm
+++ b/audio/sfx/cry1d_4.asm
@@ -8,7 +8,6 @@ SFX_Cry1D_4_Ch5:
 	square_note 8, 10, 1, 1572
 	sound_ret
 
-
 SFX_Cry1D_4_Ch6:
 	duty_cycle_pattern 0, 2, 0, 2
 	square_note 15, 11, 0, 1731
@@ -19,7 +18,6 @@ SFX_Cry1D_4_Ch6:
 	square_note 8, 6, 1, 1512
 	sound_ret
 
-
 SFX_Cry1D_4_Ch8:
 	noise_note 6, 14, 6, 76
 	noise_note 15, 13, 6, 60
diff --git a/audio/sfx/cry1e_4.asm b/audio/sfx/cry1e_4.asm
index 70bbc648..57fd5bea 100644
--- a/audio/sfx/cry1e_4.asm
+++ b/audio/sfx/cry1e_4.asm
@@ -10,7 +10,6 @@ SFX_Cry1E_4_Ch5:
 	square_note 8, 10, 1, 1984
 	sound_ret
 
-
 SFX_Cry1E_4_Ch6:
 	duty_cycle_pattern 0, 1, 0, 1
 	square_note 3, 0, 8, 1
@@ -24,7 +23,6 @@ SFX_Cry1E_4_Ch6:
 	square_note 8, 8, 1, 1921
 	sound_ret
 
-
 SFX_Cry1E_4_Ch8:
 	noise_note 6, 0, 8, 1
 	noise_note 5, 14, 2, 92
diff --git a/audio/sfx/cry1f_4.asm b/audio/sfx/cry1f_4.asm
index b0c843f2..f18364e3 100644
--- a/audio/sfx/cry1f_4.asm
+++ b/audio/sfx/cry1f_4.asm
@@ -6,7 +6,6 @@ SFX_Cry1F_4_Ch5:
 	square_note 8, 12, 1, 1818
 	sound_ret
 
-
 SFX_Cry1F_4_Ch6:
 	duty_cycle_pattern 3, 0, 3, 0
 	square_note 4, 15, 4, 1408
@@ -15,7 +14,6 @@ SFX_Cry1F_4_Ch6:
 	square_note 8, 13, 1, 1756
 	sound_ret
 
-
 SFX_Cry1F_4_Ch8:
 	noise_note 5, 12, 4, 70
 	noise_note 13, 10, 5, 68
diff --git a/audio/sfx/cry20_4.asm b/audio/sfx/cry20_4.asm
index 858fe171..c14bfae3 100644
--- a/audio/sfx/cry20_4.asm
+++ b/audio/sfx/cry20_4.asm
@@ -6,7 +6,6 @@ SFX_Cry20_4_Ch5:
 	square_note 8, 13, 1, 1297
 	sound_ret
 
-
 SFX_Cry20_4_Ch6:
 	duty_cycle_pattern 0, 1, 1, 1
 	square_note 12, 14, 1, 1292
@@ -15,7 +14,6 @@ SFX_Cry20_4_Ch6:
 	square_note 8, 12, 1, 1290
 	sound_ret
 
-
 SFX_Cry20_4_Ch8:
 	noise_note 14, 15, 2, 101
 	noise_note 13, 14, 2, 85
diff --git a/audio/sfx/cry21_4.asm b/audio/sfx/cry21_4.asm
index bc720c10..85e07050 100644
--- a/audio/sfx/cry21_4.asm
+++ b/audio/sfx/cry21_4.asm
@@ -10,7 +10,6 @@ SFX_Cry21_4_Ch5:
 	square_note 8, 13, 1, 1282
 	sound_ret
 
-
 SFX_Cry21_4_Ch6:
 	duty_cycle_pattern 3, 0, 3, 0
 	square_note 3, 13, 3, 1376
@@ -22,6 +21,5 @@ SFX_Cry21_4_Ch6:
 	square_note 3, 12, 4, 1248
 	square_note 8, 12, 1, 1280
 
-
 SFX_Cry21_4_Ch8:
 	sound_ret
diff --git a/audio/sfx/cry22_4.asm b/audio/sfx/cry22_4.asm
index e27f0770..0a0c6c32 100644
--- a/audio/sfx/cry22_4.asm
+++ b/audio/sfx/cry22_4.asm
@@ -6,7 +6,6 @@ SFX_Cry22_4_Ch5:
 	square_note 8, 9, 1, 897
 	sound_ret
 
-
 SFX_Cry22_4_Ch6:
 	duty_cycle_pattern 3, 2, 3, 2
 	square_note 2, 3, -6, 1456
@@ -15,7 +14,6 @@ SFX_Cry22_4_Ch6:
 	square_note 8, 6, 1, 1456
 	sound_ret
 
-
 SFX_Cry22_4_Ch8:
 	noise_note 2, 9, 2, 73
 	noise_note 7, 11, 5, 41
diff --git a/audio/sfx/cry23_4.asm b/audio/sfx/cry23_4.asm
index 7e087dd2..e4dcb242 100644
--- a/audio/sfx/cry23_4.asm
+++ b/audio/sfx/cry23_4.asm
@@ -7,7 +7,6 @@ SFX_Cry23_4_Ch5:
 	square_note 8, 12, 1, 1984
 	sound_ret
 
-
 SFX_Cry23_4_Ch6:
 	duty_cycle_pattern 1, 1, 3, 3
 	square_note 15, 9, 7, 1921
@@ -16,7 +15,6 @@ SFX_Cry23_4_Ch6:
 	square_note 15, 8, 3, 1921
 	sound_ret
 
-
 SFX_Cry23_4_Ch8:
 	noise_note 3, 15, 2, 60
 	noise_note 13, 14, 6, 44
diff --git a/audio/sfx/cry24_4.asm b/audio/sfx/cry24_4.asm
index e08d59f4..a70aafdd 100644
--- a/audio/sfx/cry24_4.asm
+++ b/audio/sfx/cry24_4.asm
@@ -10,7 +10,6 @@ SFX_Cry24_4_Ch5:
 	square_note 8, 12, 1, 1600
 	sound_ret
 
-
 SFX_Cry24_4_Ch6:
 	duty_cycle_pattern 0, 0, 1, 1
 	square_note 15, 11, 7, 1601
@@ -23,7 +22,6 @@ SFX_Cry24_4_Ch6:
 	square_note 8, 7, 1, 1537
 	sound_ret
 
-
 SFX_Cry24_4_Ch8:
 	noise_note 15, 14, 4, 60
 	noise_note 10, 12, 7, 76
diff --git a/audio/sfx/cry25_4.asm b/audio/sfx/cry25_4.asm
index 02af0c0a..f75663ee 100644
--- a/audio/sfx/cry25_4.asm
+++ b/audio/sfx/cry25_4.asm
@@ -7,7 +7,6 @@ SFX_Cry25_4_Ch5:
 	square_note 8, 13, 1, 1872
 	sound_ret
 
-
 SFX_Cry25_4_Ch6:
 	duty_cycle_pattern 1, 3, 1, 3
 	square_note 6, 12, 3, 1810
@@ -17,7 +16,6 @@ SFX_Cry25_4_Ch6:
 	square_note 8, 11, 1, 1842
 	sound_ret
 
-
 SFX_Cry25_4_Ch8:
 	noise_note 8, 13, 6, 44
 	noise_note 12, 12, 6, 60
diff --git a/audio/sfx/get_item1_4.asm b/audio/sfx/get_item1_4.asm
index 3fc984c5..d8900a40 100644
--- a/audio/sfx/get_item1_4.asm
+++ b/audio/sfx/get_item1_4.asm
@@ -15,7 +15,6 @@ SFX_Get_Item1_4_Ch5:
 	note E_, 4
 	sound_ret
 
-
 SFX_Get_Item1_4_Ch6:
 	execute_music
 	vibrato 8, 2, 7
@@ -29,7 +28,6 @@ SFX_Get_Item1_4_Ch6:
 	note B_, 4
 	sound_ret
 
-
 SFX_Get_Item1_4_Ch7:
 	execute_music
 	note_type 4, 1, 0
diff --git a/audio/sfx/get_item1_4_2.asm b/audio/sfx/get_item1_4_2.asm
index f2889b62..52c75cd4 100644
--- a/audio/sfx/get_item1_4_2.asm
+++ b/audio/sfx/get_item1_4_2.asm
@@ -15,7 +15,6 @@ SFX_Get_Item1_4_2_Ch5:
 	note E_, 4
 	sound_ret
 
-
 SFX_Get_Item1_4_2_Ch6:
 	execute_music
 	vibrato 8, 2, 7
@@ -29,7 +28,6 @@ SFX_Get_Item1_4_2_Ch6:
 	note B_, 4
 	sound_ret
 
-
 SFX_Get_Item1_4_2_Ch8:
 	execute_music
 	note_type 4, 1, 0
diff --git a/audio/sfx/get_item2_4.asm b/audio/sfx/get_item2_4.asm
index 33681fb2..fe414241 100644
--- a/audio/sfx/get_item2_4.asm
+++ b/audio/sfx/get_item2_4.asm
@@ -24,7 +24,6 @@ SFX_Get_Item2_4_Ch5:
 	note C_, 8
 	sound_ret
 
-
 SFX_Get_Item2_4_Ch6:
 	execute_music
 	vibrato 8, 2, 7
@@ -45,7 +44,6 @@ SFX_Get_Item2_4_Ch6:
 	note A_, 8
 	sound_ret
 
-
 SFX_Get_Item2_4_Ch7:
 	execute_music
 	note_type 5, 1, 0
diff --git a/audio/sfx/get_item2_4_2.asm b/audio/sfx/get_item2_4_2.asm
index 04ca9f21..0ce0a66e 100644
--- a/audio/sfx/get_item2_4_2.asm
+++ b/audio/sfx/get_item2_4_2.asm
@@ -24,7 +24,6 @@ SFX_Get_Item2_4_2_Ch5:
 	note C_, 8
 	sound_ret
 
-
 SFX_Get_Item2_4_2_Ch6:
 	execute_music
 	vibrato 8, 2, 7
@@ -45,7 +44,6 @@ SFX_Get_Item2_4_2_Ch6:
 	note A_, 8
 	sound_ret
 
-
 SFX_Get_Item2_4_2_Ch7:
 	execute_music
 	note_type 5, 1, 0
diff --git a/audio/sfx/swap_2.asm b/audio/sfx/swap_2.asm
index 51d0f273..c9459a76 100644
--- a/audio/sfx/swap_2.asm
+++ b/audio/sfx/swap_2.asm
@@ -3,7 +3,6 @@ SFX_Swap_2_Ch5:
 	square_note 8, 14, 1, 1856
 	sound_ret
 
-
 SFX_Swap_2_Ch6:
 	duty_cycle 2
 	square_note 2, 0, 8, 0
diff --git a/audio/sfx/unused_cry_4.asm b/audio/sfx/unused_cry_4.asm
index 72e534aa..2221e5f4 100644
--- a/audio/sfx/unused_cry_4.asm
+++ b/audio/sfx/unused_cry_4.asm
@@ -9,7 +9,6 @@ SFX_UnusedCry_4_Ch5: ; unreferenced
 	square_note 8, 7, 1, 1924
 	sound_ret
 
-
 SFX_UnusedCry_4_Ch6: ; unreferenced
 	duty_cycle_pattern 0, 0, 1, 1
 	square_note 15, 10, 0, 1857
@@ -20,7 +19,6 @@ SFX_UnusedCry_4_Ch6: ; unreferenced
 	square_note 8, 3, 1, 1862
 	sound_ret
 
-
 SFX_UnusedCry_4_Ch8: ; unreferenced
 	noise_note 2, 15, 2, 76
 	noise_note 6, 14, 0, 58