Merge git://github.com/dannye/pokeyellow into dannye-master

Conflicts:
	constants/connection_constants.asm
	constants/evolution_constants.asm
	constants/list_constants.asm
	constants/oam_constants.asm
	constants/sprite_constants.asm
	constants/type_constants.asm
	engine/bank3d/random.asm
	engine/bank3f/main.asm
	home.asm
	home/overworld.asm
	home/serial.asm
	macros.asm
	main.asm
	wram.asm

362 files changed, 577 insertions, 604 deletions

diff --git a/audio/headers/musicheaders02.asm b/audio/headers/musicheaders02.asm
index dd5b4b5b..82342c81 100644..100755
--- a/audio/headers/musicheaders02.asm
+++ b/audio/headers/musicheaders02.asm
@@ -183,4 +183,4 @@ Music_IndigoPlateau:: ; 82f1 (2:42f1)
 	db CH3
 	dw Music_IndigoPlateau_Ch4
 
-; 0x82fd
\ No newline at end of file
+; 0x82fd
diff --git a/audio/headers/musicheaders08.asm b/audio/headers/musicheaders08.asm
index b4ef7375..85cf2825 100644..100755
--- a/audio/headers/musicheaders08.asm
+++ b/audio/headers/musicheaders08.asm
@@ -54,4 +54,4 @@ Music_DefeatedGymLeader:: ; 202f4 (8:42f4)
 	db CH2
 	dw Music_DefeatedGymLeader_Ch3
 
-; 202fd
\ No newline at end of file
+; 202fd
diff --git a/audio/headers/musicheaders1f.asm b/audio/headers/musicheaders1f.asm
index beb70cf4..97b81d45 100644..100755
--- a/audio/headers/musicheaders1f.asm
+++ b/audio/headers/musicheaders1f.asm
@@ -157,4 +157,4 @@ Music_MeetMaleTrainer:: ; 7c2f4 (1f:42f4)
 	db CH2
 	dw Music_MeetMaleTrainer_Ch3
 
-; 0x7c2fd
\ No newline at end of file
+; 0x7c2fd
diff --git a/audio/headers/sfxheaders02.asm b/audio/headers/sfxheaders02.asm
index d1c185c0..22ccb1d7 100644..100755
--- a/audio/headers/sfxheaders02.asm
+++ b/audio/headers/sfxheaders02.asm
@@ -561,4 +561,4 @@ SFX_02_5f:: ; 822b (2:422b)
 	db CH4
 	dw SFX_02_5f_Ch1
 
-; 0x822e
\ No newline at end of file
+; 0x822e
diff --git a/audio/headers/sfxheaders08.asm b/audio/headers/sfxheaders08.asm
index 547c8d4a..6ee61953 100644..100755
--- a/audio/headers/sfxheaders08.asm
+++ b/audio/headers/sfxheaders08.asm
@@ -705,4 +705,4 @@ SFX_08_77:: ; 202bb (8:42bb)
 	db CH4
 	dw SFX_08_77_Ch1
 
-; 0x202be
\ No newline at end of file
+; 0x202be
diff --git a/audio/headers/sfxheaders1f.asm b/audio/headers/sfxheaders1f.asm
index 4db63a59..aa127123 100644..100755
--- a/audio/headers/sfxheaders1f.asm
+++ b/audio/headers/sfxheaders1f.asm
@@ -595,4 +595,4 @@ SFX_1f_67:: ; 7c246 (1f:4246)
 	db CH4
 	dw SFX_1f_67_Ch1
 
-; 0x7c249
\ No newline at end of file
+; 0x7c249
diff --git a/audio/sfx/sfx_02_01.asm b/audio/sfx/sfx_02_01.asm
index e92c35b8..dfae6786 100644..100755
--- a/audio/sfx/sfx_02_01.asm
+++ b/audio/sfx/sfx_02_01.asm
@@ -1,4 +1,4 @@
 SFX_02_01_Ch1: ; 82fd (2:42fd)
 	unknownnoise0x20 0, 193, 51
 	endchannel
-; 0x8301
\ No newline at end of file
+; 0x8301
diff --git a/audio/sfx/sfx_02_02.asm b/audio/sfx/sfx_02_02.asm
index ca252725..8d0f3a34 100644..100755
--- a/audio/sfx/sfx_02_02.asm
+++ b/audio/sfx/sfx_02_02.asm
@@ -1,4 +1,4 @@
 SFX_02_02_Ch1: ; 8301 (2:4301)
 	unknownnoise0x20 0, 177, 51
 	endchannel
-; 0x8305
\ No newline at end of file
+; 0x8305
diff --git a/audio/sfx/sfx_02_03.asm b/audio/sfx/sfx_02_03.asm
index 4eb687a8..9b8745e7 100644..100755
--- a/audio/sfx/sfx_02_03.asm
+++ b/audio/sfx/sfx_02_03.asm
@@ -1,4 +1,4 @@
 SFX_02_03_Ch1: ; 8305 (2:4305)
 	unknownnoise0x20 0, 161, 51
 	endchannel
-; 0x8309
\ No newline at end of file
+; 0x8309
diff --git a/audio/sfx/sfx_02_04.asm b/audio/sfx/sfx_02_04.asm
index 45caab6b..a0fe41e3 100644..100755
--- a/audio/sfx/sfx_02_04.asm
+++ b/audio/sfx/sfx_02_04.asm
@@ -1,4 +1,4 @@
 SFX_02_04_Ch1: ; 8309 (2:4309)
 	unknownnoise0x20 0, 129, 51
 	endchannel
-; 0x830d
\ No newline at end of file
+; 0x830d
diff --git a/audio/sfx/sfx_02_05.asm b/audio/sfx/sfx_02_05.asm
index 156254e5..f5df11e2 100644..100755
--- a/audio/sfx/sfx_02_05.asm
+++ b/audio/sfx/sfx_02_05.asm
@@ -6,4 +6,4 @@ SFX_02_05_Ch1: ; 830d (2:430d)
 	unknownnoise0x20 3, 130, 51
 	unknownnoise0x20 2, 129, 50
 	endchannel
-; 0x8320
\ No newline at end of file
+; 0x8320
diff --git a/audio/sfx/sfx_02_06.asm b/audio/sfx/sfx_02_06.asm
index 03f8d4aa..cccff91b 100644..100755
--- a/audio/sfx/sfx_02_06.asm
+++ b/audio/sfx/sfx_02_06.asm
@@ -1,4 +1,4 @@
 SFX_02_06_Ch1: ; 8320 (2:4320)
 	unknownnoise0x20 0, 81, 42
 	endchannel
-; 0x8324
\ No newline at end of file
+; 0x8324
diff --git a/audio/sfx/sfx_02_07.asm b/audio/sfx/sfx_02_07.asm
index 02fd9e06..d960c62e 100644..100755
--- a/audio/sfx/sfx_02_07.asm
+++ b/audio/sfx/sfx_02_07.asm
@@ -2,4 +2,4 @@ SFX_02_07_Ch1: ; 8324 (2:4324)
 	unknownnoise0x20 1, 65, 43
 	unknownnoise0x20 0, 97, 42
 	endchannel
-; 0x832b
\ No newline at end of file
+; 0x832b
diff --git a/audio/sfx/sfx_02_08.asm b/audio/sfx/sfx_02_08.asm
index 4efce48f..606587a0 100644..100755
--- a/audio/sfx/sfx_02_08.asm
+++ b/audio/sfx/sfx_02_08.asm
@@ -1,4 +1,4 @@
 SFX_02_08_Ch1: ; 832b (2:432b)
 	unknownnoise0x20 0, 129, 16
 	endchannel
-; 0x832f
\ No newline at end of file
+; 0x832f
diff --git a/audio/sfx/sfx_02_09.asm b/audio/sfx/sfx_02_09.asm
index bb04efca..6b35f5aa 100644..100755
--- a/audio/sfx/sfx_02_09.asm
+++ b/audio/sfx/sfx_02_09.asm
@@ -1,4 +1,4 @@
 SFX_02_09_Ch1: ; 832f (2:432f)
 	unknownnoise0x20 0, 130, 35
 	endchannel
-; 0x8333
\ No newline at end of file
+; 0x8333
diff --git a/audio/sfx/sfx_02_0a.asm b/audio/sfx/sfx_02_0a.asm
index 128c9a74..cf9539b6 100644..100755
--- a/audio/sfx/sfx_02_0a.asm
+++ b/audio/sfx/sfx_02_0a.asm
@@ -1,4 +1,4 @@
 SFX_02_0a_Ch1: ; 8333 (2:4333)
 	unknownnoise0x20 0, 130, 37
 	endchannel
-; 0x8337
\ No newline at end of file
+; 0x8337
diff --git a/audio/sfx/sfx_02_0b.asm b/audio/sfx/sfx_02_0b.asm
index de643bd6..f6142168 100644..100755
--- a/audio/sfx/sfx_02_0b.asm
+++ b/audio/sfx/sfx_02_0b.asm
@@ -1,4 +1,4 @@
 SFX_02_0b_Ch1: ; 8337 (2:4337)
 	unknownnoise0x20 0, 130, 38
 	endchannel
-; 0x833b
\ No newline at end of file
+; 0x833b
diff --git a/audio/sfx/sfx_02_0c.asm b/audio/sfx/sfx_02_0c.asm
index 98c4ef19..57d20bc6 100644..100755
--- a/audio/sfx/sfx_02_0c.asm
+++ b/audio/sfx/sfx_02_0c.asm
@@ -1,4 +1,4 @@
 SFX_02_0c_Ch1: ; 833b (2:433b)
 	unknownnoise0x20 0, 161, 16
 	endchannel
-; 0x833f
\ No newline at end of file
+; 0x833f
diff --git a/audio/sfx/sfx_02_0d.asm b/audio/sfx/sfx_02_0d.asm
index dfa8e738..f143024f 100644..100755
--- a/audio/sfx/sfx_02_0d.asm
+++ b/audio/sfx/sfx_02_0d.asm
@@ -1,4 +1,4 @@
 SFX_02_0d_Ch1: ; 833f (2:433f)
 	unknownnoise0x20 0, 162, 17
 	endchannel
-; 0x8343
\ No newline at end of file
+; 0x8343
diff --git a/audio/sfx/sfx_02_0e.asm b/audio/sfx/sfx_02_0e.asm
index 52b0dd4d..9ba580ae 100644..100755
--- a/audio/sfx/sfx_02_0e.asm
+++ b/audio/sfx/sfx_02_0e.asm
@@ -1,4 +1,4 @@
 SFX_02_0e_Ch1: ; 8343 (2:4343)
 	unknownnoise0x20 0, 162, 80
 	endchannel
-; 0x8347
\ No newline at end of file
+; 0x8347
diff --git a/audio/sfx/sfx_02_0f.asm b/audio/sfx/sfx_02_0f.asm
index 5a2404fc..906e27d0 100644..100755
--- a/audio/sfx/sfx_02_0f.asm
+++ b/audio/sfx/sfx_02_0f.asm
@@ -2,4 +2,4 @@ SFX_02_0f_Ch1: ; 8347 (2:4347)
 	unknownnoise0x20 0, 161, 24
 	unknownnoise0x20 0, 49, 51
 	endchannel
-; 0x834e
\ No newline at end of file
+; 0x834e
diff --git a/audio/sfx/sfx_02_10.asm b/audio/sfx/sfx_02_10.asm
index 057fd81b..04d67fba 100644..100755
--- a/audio/sfx/sfx_02_10.asm
+++ b/audio/sfx/sfx_02_10.asm
@@ -2,4 +2,4 @@ SFX_02_10_Ch1: ; 834e (2:434e)
 	unknownnoise0x20 2, 145, 40
 	unknownnoise0x20 0, 113, 24
 	endchannel
-; 0x8355
\ No newline at end of file
+; 0x8355
diff --git a/audio/sfx/sfx_02_11.asm b/audio/sfx/sfx_02_11.asm
index 3ab56c2b..34edf69a 100644..100755
--- a/audio/sfx/sfx_02_11.asm
+++ b/audio/sfx/sfx_02_11.asm
@@ -1,4 +1,4 @@
 SFX_02_11_Ch1: ; 8355 (2:4355)
 	unknownnoise0x20 0, 145, 34
 	endchannel
-; 0x8359
\ No newline at end of file
+; 0x8359
diff --git a/audio/sfx/sfx_02_12.asm b/audio/sfx/sfx_02_12.asm
index 608e341c..95ea4278 100644..100755
--- a/audio/sfx/sfx_02_12.asm
+++ b/audio/sfx/sfx_02_12.asm
@@ -1,4 +1,4 @@
 SFX_02_12_Ch1: ; 8359 (2:4359)
 	unknownnoise0x20 0, 113, 34
 	endchannel
-; 0x835d
\ No newline at end of file
+; 0x835d
diff --git a/audio/sfx/sfx_02_13.asm b/audio/sfx/sfx_02_13.asm
index 38b06431..fcf6613a 100644..100755
--- a/audio/sfx/sfx_02_13.asm
+++ b/audio/sfx/sfx_02_13.asm
@@ -1,4 +1,4 @@
 SFX_02_13_Ch1: ; 835d (2:435d)
 	unknownnoise0x20 0, 97, 34
 	endchannel
-; 0x8361
\ No newline at end of file
+; 0x8361
diff --git a/audio/sfx/sfx_02_14.asm b/audio/sfx/sfx_02_14.asm
index 70dfe276..1d0e647d 100644..100755
--- a/audio/sfx/sfx_02_14.asm
+++ b/audio/sfx/sfx_02_14.asm
@@ -19,4 +19,4 @@ SFX_02_14_Ch3: ; 89a5 (2:49a5)
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 8, 129, 28
 	endchannel
-; 0x89af
\ No newline at end of file
+; 0x89af
diff --git a/audio/sfx/sfx_02_15.asm b/audio/sfx/sfx_02_15.asm
index 619cb208..33699792 100644..100755
--- a/audio/sfx/sfx_02_15.asm
+++ b/audio/sfx/sfx_02_15.asm
@@ -22,4 +22,4 @@ SFX_02_15_Ch3: ; 8bbd (2:4bbd)
 	unknownnoise0x20 3, 130, 28
 	unknownnoise0x20 8, 113, 44
 	endchannel
-; 0x8bca
\ No newline at end of file
+; 0x8bca
diff --git a/audio/sfx/sfx_02_16.asm b/audio/sfx/sfx_02_16.asm
index 4e095a04..fb1a3755 100644..100755
--- a/audio/sfx/sfx_02_16.asm
+++ b/audio/sfx/sfx_02_16.asm
@@ -15,4 +15,4 @@ SFX_02_16_Ch2: ; 8b1b (2:4b1b)
 
 SFX_02_16_Ch3: ; 8b29 (2:4b29)
 	endchannel
-; 0x8b2a
\ No newline at end of file
+; 0x8b2a
diff --git a/audio/sfx/sfx_02_17.asm b/audio/sfx/sfx_02_17.asm
index f8b66456..cf19ce38 100644..100755
--- a/audio/sfx/sfx_02_17.asm
+++ b/audio/sfx/sfx_02_17.asm
@@ -28,4 +28,4 @@ SFX_02_17_Ch3: ; 88e4 (2:48e4)
 	unknownnoise0x20 12, 182, 76
 	unknownnoise0x20 15, 162, 92
 	endchannel
-; 0x88f1
\ No newline at end of file
+; 0x88f1
diff --git a/audio/sfx/sfx_02_18.asm b/audio/sfx/sfx_02_18.asm
index 4d546cbf..a3039556 100644..100755
--- a/audio/sfx/sfx_02_18.asm
+++ b/audio/sfx/sfx_02_18.asm
@@ -30,4 +30,4 @@ SFX_02_18_Ch3: ; 8c93 (2:4c93)
 	unknownnoise0x20 7, 195, 76
 	unknownnoise0x20 8, 161, 92
 	endchannel
-; 0x8ca6
\ No newline at end of file
+; 0x8ca6
diff --git a/audio/sfx/sfx_02_19.asm b/audio/sfx/sfx_02_19.asm
index 3cc7ae73..4ddb848d 100644..100755
--- a/audio/sfx/sfx_02_19.asm
+++ b/audio/sfx/sfx_02_19.asm
@@ -17,4 +17,4 @@ SFX_02_19_Ch2: ; 8a48 (2:4a48)
 
 SFX_02_19_Ch3: ; 8a5a (2:4a5a)
 	endchannel
-; 0x8a5b
\ No newline at end of file
+; 0x8a5b
diff --git a/audio/sfx/sfx_02_1a.asm b/audio/sfx/sfx_02_1a.asm
index 8b029d5c..efd16f9b 100644..100755
--- a/audio/sfx/sfx_02_1a.asm
+++ b/audio/sfx/sfx_02_1a.asm
@@ -20,4 +20,4 @@ SFX_02_1a_Ch3: ; 89fa (2:49fa)
 	unknownnoise0x20 15, 215, 156
 	unknownnoise0x20 15, 242, 172
 	endchannel
-; 0x8a0d
\ No newline at end of file
+; 0x8a0d
diff --git a/audio/sfx/sfx_02_1b.asm b/audio/sfx/sfx_02_1b.asm
index 8626d876..b1857d2c 100644..100755
--- a/audio/sfx/sfx_02_1b.asm
+++ b/audio/sfx/sfx_02_1b.asm
@@ -19,4 +19,4 @@ SFX_02_1b_Ch3: ; 8a2b (2:4a2b)
 	unknownnoise0x20 15, 230, 76
 	unknownnoise0x20 8, 177, 92
 	endchannel
-; 0x8a35
\ No newline at end of file
+; 0x8a35
diff --git a/audio/sfx/sfx_02_1c.asm b/audio/sfx/sfx_02_1c.asm
index d96c0eb8..a880a042 100644..100755
--- a/audio/sfx/sfx_02_1c.asm
+++ b/audio/sfx/sfx_02_1c.asm
@@ -21,4 +21,4 @@ SFX_02_1c_Ch3: ; 8c4b (2:4c4b)
 	unknownnoise0x20 11, 215, 92
 	unknownnoise0x20 15, 194, 76
 	endchannel
-; 0x8c55
\ No newline at end of file
+; 0x8c55
diff --git a/audio/sfx/sfx_02_1d.asm b/audio/sfx/sfx_02_1d.asm
index f5db0868..fa70c67c 100644..100755
--- a/audio/sfx/sfx_02_1d.asm
+++ b/audio/sfx/sfx_02_1d.asm
@@ -33,4 +33,4 @@ SFX_02_1d_Ch3: ; 876d (2:476d)
 	unknownnoise0x20 6, 212, 61
 	unknownnoise0x20 8, 193, 59
 	endchannel
-; 0x8786
\ No newline at end of file
+; 0x8786
diff --git a/audio/sfx/sfx_02_1e.asm b/audio/sfx/sfx_02_1e.asm
index 524d67d7..19ccdada 100644..100755
--- a/audio/sfx/sfx_02_1e.asm
+++ b/audio/sfx/sfx_02_1e.asm
@@ -33,4 +33,4 @@ SFX_02_1e_Ch3: ; 8c0c (2:4c0c)
 	unknownnoise0x20 3, 164, 44
 	unknownnoise0x20 8, 145, 60
 	endchannel
-; 0x8c25
\ No newline at end of file
+; 0x8c25
diff --git a/audio/sfx/sfx_02_1f.asm b/audio/sfx/sfx_02_1f.asm
index 9506fb43..0305f8bf 100644..100755
--- a/audio/sfx/sfx_02_1f.asm
+++ b/audio/sfx/sfx_02_1f.asm
@@ -35,4 +35,4 @@ SFX_02_1f_Ch3: ; 8aa5 (2:4aa5)
 	unknownnoise0x20 4, 193, 44
 	unknownnoise0x20 8, 161, 76
 	endchannel
-; 0x8abe
\ No newline at end of file
+; 0x8abe
diff --git a/audio/sfx/sfx_02_20.asm b/audio/sfx/sfx_02_20.asm
index 00923339..90e68dd0 100644..100755
--- a/audio/sfx/sfx_02_20.asm
+++ b/audio/sfx/sfx_02_20.asm
@@ -27,4 +27,4 @@ SFX_02_20_Ch2: ; 8ae5 (2:4ae5)
 
 SFX_02_20_Ch3: ; 8b0b (2:4b0b)
 	endchannel
-; 0x8b0c
\ No newline at end of file
+; 0x8b0c
diff --git a/audio/sfx/sfx_02_21.asm b/audio/sfx/sfx_02_21.asm
index 60ecb431..b454585c 100644..100755
--- a/audio/sfx/sfx_02_21.asm
+++ b/audio/sfx/sfx_02_21.asm
@@ -38,4 +38,4 @@ SFX_02_21_Ch3: ; 8b78 (2:4b78)
 	unknownnoise0x20 9, 194, 44
 	unknownnoise0x20 4, 161, 60
 	endchannel
-; 0x8b97
\ No newline at end of file
+; 0x8b97
diff --git a/audio/sfx/sfx_02_22.asm b/audio/sfx/sfx_02_22.asm
index 3f7a2783..5fb2b91c 100644..100755
--- a/audio/sfx/sfx_02_22.asm
+++ b/audio/sfx/sfx_02_22.asm
@@ -21,4 +21,4 @@ SFX_02_22_Ch3: ; 89d5 (2:49d5)
 	unknownnoise0x20 2, 97, 33
 	unknownnoise0x20 8, 97, 17
 	endchannel
-; 0x89df
\ No newline at end of file
+; 0x89df
diff --git a/audio/sfx/sfx_02_23.asm b/audio/sfx/sfx_02_23.asm
index c7e0a345..19110b45 100644..100755
--- a/audio/sfx/sfx_02_23.asm
+++ b/audio/sfx/sfx_02_23.asm
@@ -27,4 +27,4 @@ SFX_02_23_Ch3: ; 8927 (2:4927)
 	unknownnoise0x20 8, 183, 92
 	unknownnoise0x20 15, 194, 93
 	endchannel
-; 0x8937
\ No newline at end of file
+; 0x8937
diff --git a/audio/sfx/sfx_02_24.asm b/audio/sfx/sfx_02_24.asm
index f092bae9..c487c8b8 100644..100755
--- a/audio/sfx/sfx_02_24.asm
+++ b/audio/sfx/sfx_02_24.asm
@@ -29,4 +29,4 @@ SFX_02_24_Ch3: ; 897d (2:497d)
 	unknownnoise0x20 4, 116, 16
 	unknownnoise0x20 4, 113, 32
 	endchannel
-; 0x8987
\ No newline at end of file
+; 0x8987
diff --git a/audio/sfx/sfx_02_25.asm b/audio/sfx/sfx_02_25.asm
index 4025d4f7..97ed7c86 100644..100755
--- a/audio/sfx/sfx_02_25.asm
+++ b/audio/sfx/sfx_02_25.asm
@@ -32,4 +32,4 @@ SFX_02_25_Ch3: ; 8855 (2:4855)
 	unknownnoise0x20 12, 210, 61
 	unknownnoise0x20 8, 209, 44
 	endchannel
-; 0x886b
\ No newline at end of file
+; 0x886b
diff --git a/audio/sfx/sfx_02_26.asm b/audio/sfx/sfx_02_26.asm
index eae085f4..46f596d0 100644..100755
--- a/audio/sfx/sfx_02_26.asm
+++ b/audio/sfx/sfx_02_26.asm
@@ -22,4 +22,4 @@ SFX_02_26_Ch3: ; 8d51 (2:4d51)
 	unknownnoise0x20 3, 194, 108
 	unknownnoise0x20 8, 209, 92
 	endchannel
-; 0x8d5e
\ No newline at end of file
+; 0x8d5e
diff --git a/audio/sfx/sfx_02_27.asm b/audio/sfx/sfx_02_27.asm
index c019aab3..d25a4db9 100644..100755
--- a/audio/sfx/sfx_02_27.asm
+++ b/audio/sfx/sfx_02_27.asm
@@ -28,4 +28,4 @@ SFX_02_27_Ch3: ; 8d94 (2:4d94)
 	unknownnoise0x20 8, 179, 76
 	unknownnoise0x20 8, 161, 92
 	endchannel
-; 0x8da7
\ No newline at end of file
+; 0x8da7
diff --git a/audio/sfx/sfx_02_28.asm b/audio/sfx/sfx_02_28.asm
index c183df6b..f4ed88b2 100644..100755
--- a/audio/sfx/sfx_02_28.asm
+++ b/audio/sfx/sfx_02_28.asm
@@ -19,4 +19,4 @@ SFX_02_28_Ch3: ; 8dc5 (2:4dc5)
 	unknownnoise0x20 14, 196, 60
 	unknownnoise0x20 8, 209, 44
 	endchannel
-; 0x8dcf
\ No newline at end of file
+; 0x8dcf
diff --git a/audio/sfx/sfx_02_29.asm b/audio/sfx/sfx_02_29.asm
index 872fa90a..f0a86c6a 100644..100755
--- a/audio/sfx/sfx_02_29.asm
+++ b/audio/sfx/sfx_02_29.asm
@@ -28,4 +28,4 @@ SFX_02_29_Ch3: ; 8e6b (2:4e6b)
 	unknownnoise0x20 3, 162, 92
 	unknownnoise0x20 8, 177, 108
 	endchannel
-; 0x8e7e
\ No newline at end of file
+; 0x8e7e
diff --git a/audio/sfx/sfx_02_2a.asm b/audio/sfx/sfx_02_2a.asm
index f5313860..70778f03 100644..100755
--- a/audio/sfx/sfx_02_2a.asm
+++ b/audio/sfx/sfx_02_2a.asm
@@ -19,4 +19,4 @@ SFX_02_2a_Ch3: ; 8ce6 (2:4ce6)
 	unknownnoise0x20 4, 230, 60
 	unknownnoise0x20 15, 242, 76
 	endchannel
-; 0x8cf0
\ No newline at end of file
+; 0x8cf0
diff --git a/audio/sfx/sfx_02_2b.asm b/audio/sfx/sfx_02_2b.asm
index c0792c94..dfc4d66d 100644..100755
--- a/audio/sfx/sfx_02_2b.asm
+++ b/audio/sfx/sfx_02_2b.asm
@@ -22,4 +22,4 @@ SFX_02_2b_Ch3: ; 8ea4 (2:4ea4)
 	unknownnoise0x20 9, 228, 124
 	unknownnoise0x20 15, 226, 108
 	endchannel
-; 0x8eb1
\ No newline at end of file
+; 0x8eb1
diff --git a/audio/sfx/sfx_02_2c.asm b/audio/sfx/sfx_02_2c.asm
index e923c9e1..642d5fd5 100644..100755
--- a/audio/sfx/sfx_02_2c.asm
+++ b/audio/sfx/sfx_02_2c.asm
@@ -32,4 +32,4 @@ SFX_02_2c_Ch3: ; 8fd4 (2:4fd4)
 	unknownnoise0x20 6, 180, 60
 	unknownnoise0x20 8, 193, 44
 	endchannel
-; 0x8fe7
\ No newline at end of file
+; 0x8fe7
diff --git a/audio/sfx/sfx_02_2d.asm b/audio/sfx/sfx_02_2d.asm
index 70e71eb1..4c42b231 100644..100755
--- a/audio/sfx/sfx_02_2d.asm
+++ b/audio/sfx/sfx_02_2d.asm
@@ -16,4 +16,4 @@ SFX_02_2d_Ch2: ; 8cb5 (2:4cb5)
 
 SFX_02_2d_Ch3: ; 8cc7 (2:4cc7)
 	endchannel
-; 0x8cc8
\ No newline at end of file
+; 0x8cc8
diff --git a/audio/sfx/sfx_02_2e.asm b/audio/sfx/sfx_02_2e.asm
index d95bfbe3..a39964c8 100644..100755
--- a/audio/sfx/sfx_02_2e.asm
+++ b/audio/sfx/sfx_02_2e.asm
@@ -28,4 +28,4 @@ SFX_02_2e_Ch3: ; 8f35 (2:4f35)
 	unknownnoise0x20 2, 226, 60
 	unknownnoise0x20 8, 209, 44
 	endchannel
-; 0x8f48
\ No newline at end of file
+; 0x8f48
diff --git a/audio/sfx/sfx_02_2f.asm b/audio/sfx/sfx_02_2f.asm
index 08ea2788..3594ebd1 100644..100755
--- a/audio/sfx/sfx_02_2f.asm
+++ b/audio/sfx/sfx_02_2f.asm
@@ -24,4 +24,4 @@ SFX_02_2f_Ch3: ; 8d1e (2:4d1e)
 	unknownnoise0x20 5, 163, 60
 	unknownnoise0x20 8, 145, 44
 	endchannel
-; 0x8d2b
\ No newline at end of file
+; 0x8d2b
diff --git a/audio/sfx/sfx_02_30.asm b/audio/sfx/sfx_02_30.asm
index 7131fc1a..c94fbbbc 100644..100755
--- a/audio/sfx/sfx_02_30.asm
+++ b/audio/sfx/sfx_02_30.asm
@@ -29,4 +29,4 @@ SFX_02_30_Ch3: ; 8eef (2:4eef)
 	unknownnoise0x20 8, 196, 108
 	unknownnoise0x20 15, 179, 92
 	endchannel
-; 0x8eff
\ No newline at end of file
+; 0x8eff
diff --git a/audio/sfx/sfx_02_31.asm b/audio/sfx/sfx_02_31.asm
index 79d09433..543aeea9 100644..100755
--- a/audio/sfx/sfx_02_31.asm
+++ b/audio/sfx/sfx_02_31.asm
@@ -27,4 +27,4 @@ SFX_02_31_Ch3: ; 8f7e (2:4f7e)
 	unknownnoise0x20 1, 178, 91
 	unknownnoise0x20 15, 194, 76
 	endchannel
-; 0x8f8e
\ No newline at end of file
+; 0x8f8e
diff --git a/audio/sfx/sfx_02_32.asm b/audio/sfx/sfx_02_32.asm
index f2fbf611..c231ace0 100644..100755
--- a/audio/sfx/sfx_02_32.asm
+++ b/audio/sfx/sfx_02_32.asm
@@ -36,4 +36,4 @@ SFX_02_32_Ch3: ; 8e19 (2:4e19)
 	unknownnoise0x20 5, 146, 26
 	unknownnoise0x20 8, 129, 24
 	endchannel
-; 0x8e35
\ No newline at end of file
+; 0x8e35
diff --git a/audio/sfx/sfx_02_33.asm b/audio/sfx/sfx_02_33.asm
index f4387a3a..f13e35f7 100644..100755
--- a/audio/sfx/sfx_02_33.asm
+++ b/audio/sfx/sfx_02_33.asm
@@ -22,4 +22,4 @@ SFX_02_33_Ch3: ; 900d (2:500d)
 	unknownnoise0x20 8, 196, 69
 	unknownnoise0x20 8, 177, 68
 	endchannel
-; 0x901a
\ No newline at end of file
+; 0x901a
diff --git a/audio/sfx/sfx_02_34.asm b/audio/sfx/sfx_02_34.asm
index 4c2fa4cc..786ffbd4 100644..100755
--- a/audio/sfx/sfx_02_34.asm
+++ b/audio/sfx/sfx_02_34.asm
@@ -22,4 +22,4 @@ SFX_02_34_Ch3: ; 9040 (2:5040)
 	unknownnoise0x20 14, 210, 86
 	unknownnoise0x20 8, 209, 102
 	endchannel
-; 0x904d
\ No newline at end of file
+; 0x904d
diff --git a/audio/sfx/sfx_02_35.asm b/audio/sfx/sfx_02_35.asm
index 33685f61..005ea485 100644..100755
--- a/audio/sfx/sfx_02_35.asm
+++ b/audio/sfx/sfx_02_35.asm
@@ -25,4 +25,4 @@ SFX_02_35_Ch2: ; 9070 (2:5070)
 
 SFX_02_35_Ch3: ; 9092 (2:5092)
 	endchannel
-; 0x9093
\ No newline at end of file
+; 0x9093
diff --git a/audio/sfx/sfx_02_36.asm b/audio/sfx/sfx_02_36.asm
index e648e3dd..369f6a4b 100644..100755
--- a/audio/sfx/sfx_02_36.asm
+++ b/audio/sfx/sfx_02_36.asm
@@ -22,4 +22,4 @@ SFX_02_36_Ch3: ; 90b9 (2:50b9)
 	unknownnoise0x20 1, 162, 57
 	unknownnoise0x20 8, 145, 73
 	endchannel
-; 0x90c6
\ No newline at end of file
+; 0x90c6
diff --git a/audio/sfx/sfx_02_37.asm b/audio/sfx/sfx_02_37.asm
index 0fc80e1a..cc093dcd 100644..100755
--- a/audio/sfx/sfx_02_37.asm
+++ b/audio/sfx/sfx_02_37.asm
@@ -23,4 +23,4 @@ SFX_02_37_Ch3: ; 87b0 (2:47b0)
 	unknownnoise0x20 15, 215, 60
 	unknownnoise0x20 8, 193, 44
 	endchannel
-; 0x87bd
\ No newline at end of file
+; 0x87bd
diff --git a/audio/sfx/sfx_02_38.asm b/audio/sfx/sfx_02_38.asm
index 2c982a3d..5511cfb1 100644..100755
--- a/audio/sfx/sfx_02_38.asm
+++ b/audio/sfx/sfx_02_38.asm
@@ -31,4 +31,4 @@ SFX_02_38_Ch3: ; 8803 (2:4803)
 	unknownnoise0x20 12, 183, 76
 	unknownnoise0x20 15, 162, 92
 	endchannel
-; 0x8813
\ No newline at end of file
+; 0x8813
diff --git a/audio/sfx/sfx_02_39.asm b/audio/sfx/sfx_02_39.asm
index 5aa9b436..079059ec 100644..100755
--- a/audio/sfx/sfx_02_39.asm
+++ b/audio/sfx/sfx_02_39.asm
@@ -24,4 +24,4 @@ SFX_02_39_Ch3: ; 8899 (2:4899)
 	unknownnoise0x20 10, 182, 44
 	unknownnoise0x20 8, 145, 28
 	endchannel
-; 0x88a6
\ No newline at end of file
+; 0x88a6
diff --git a/audio/sfx/sfx_02_3a.asm b/audio/sfx/sfx_02_3a.asm
index 1844b2ab..b394d7c9 100644..100755
--- a/audio/sfx/sfx_02_3a.asm
+++ b/audio/sfx/sfx_02_3a.asm
@@ -45,4 +45,4 @@ SFX_02_3a_Ch3: ; ad9e (2:6d9e)
 	B_ 2
 	rest 2
 	endchannel
-; 0xadae
\ No newline at end of file
+; 0xadae
diff --git a/audio/sfx/sfx_02_3b.asm b/audio/sfx/sfx_02_3b.asm
index 9c59d670..1c2fbd50 100644..100755
--- a/audio/sfx/sfx_02_3b.asm
+++ b/audio/sfx/sfx_02_3b.asm
@@ -67,4 +67,4 @@ SFX_02_3b_Ch3: ; b34d (2:734d)
 	rest 1
 	A_ 8
 	endchannel
-; 0xb362
\ No newline at end of file
+; 0xb362
diff --git a/audio/sfx/sfx_02_3c.asm b/audio/sfx/sfx_02_3c.asm
index e695705e..24858e3e 100644..100755
--- a/audio/sfx/sfx_02_3c.asm
+++ b/audio/sfx/sfx_02_3c.asm
@@ -6,4 +6,4 @@ SFX_02_3c_Ch1: ; 840a (2:440a)
 	unknownsfx0x20 8, 226, 0, 2
 	unknownsfx0x10 8
 	endchannel
-; 0x841b
\ No newline at end of file
+; 0x841b
diff --git a/audio/sfx/sfx_02_3d.asm b/audio/sfx/sfx_02_3d.asm
index 206c0c35..35f52890 100644..100755
--- a/audio/sfx/sfx_02_3d.asm
+++ b/audio/sfx/sfx_02_3d.asm
@@ -5,4 +5,4 @@ SFX_02_3d_Ch1: ; 84b7 (2:44b7)
 	unknownsfx0x20 15, 242, 80, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x84c6
\ No newline at end of file
+; 0x84c6
diff --git a/audio/sfx/sfx_02_3e.asm b/audio/sfx/sfx_02_3e.asm
index 18d49ff3..39757272 100644..100755
--- a/audio/sfx/sfx_02_3e.asm
+++ b/audio/sfx/sfx_02_3e.asm
@@ -7,4 +7,4 @@ SFX_02_3e_Ch1: ; 84d9 (2:44d9)
 	unknownsfx0x20 15, 242, 0, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x84ee
\ No newline at end of file
+; 0x84ee
diff --git a/audio/sfx/sfx_02_3f.asm b/audio/sfx/sfx_02_3f.asm
index b7009e79..57d5feca 100644..100755
--- a/audio/sfx/sfx_02_3f.asm
+++ b/audio/sfx/sfx_02_3f.asm
@@ -2,4 +2,4 @@ SFX_02_3f_Ch1: ; 83c3 (2:43c3)
 	unknownnoise0x20 1, 226, 51
 	unknownnoise0x20 8, 225, 34
 	endchannel
-; 0x83ca
\ No newline at end of file
+; 0x83ca
diff --git a/audio/sfx/sfx_02_40.asm b/audio/sfx/sfx_02_40.asm
index a5789282..7b4edd6e 100644..100755
--- a/audio/sfx/sfx_02_40.asm
+++ b/audio/sfx/sfx_02_40.asm
@@ -5,4 +5,4 @@ SFX_02_40_Ch1: ; 8462 (2:4462)
 	unknownsfx0x20 0, 145, 192, 7
 	unknownsfx0x20 12, 161, 208, 7
 	endchannel
-; 0x8475
\ No newline at end of file
+; 0x8475
diff --git a/audio/sfx/sfx_02_41.asm b/audio/sfx/sfx_02_41.asm
index de5be1c7..e40c1fe5 100644..100755
--- a/audio/sfx/sfx_02_41.asm
+++ b/audio/sfx/sfx_02_41.asm
@@ -75,4 +75,4 @@ SFX_02_41_Ch3: ; b2f7 (2:72f7)
 	F_ 2
 	rest 2
 	endchannel
-; 0xb316
\ No newline at end of file
+; 0xb316
diff --git a/audio/sfx/sfx_02_42.asm b/audio/sfx/sfx_02_42.asm
index 5dfcb574..f31a8e26 100644..100755
--- a/audio/sfx/sfx_02_42.asm
+++ b/audio/sfx/sfx_02_42.asm
@@ -57,4 +57,4 @@ SFX_02_42_Ch3: ; b39d (2:739d)
 	F_ 4
 	D# 8
 	endchannel
-; 0xb3a7
\ No newline at end of file
+; 0xb3a7
diff --git a/audio/sfx/sfx_02_43.asm b/audio/sfx/sfx_02_43.asm
index c8f88914..3d588100 100644..100755
--- a/audio/sfx/sfx_02_43.asm
+++ b/audio/sfx/sfx_02_43.asm
@@ -6,4 +6,4 @@ SFX_02_43_Ch1: ; 84c6 (2:44c6)
 	unknownsfx0x20 15, 243, 0, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x84d9
\ No newline at end of file
+; 0x84d9
diff --git a/audio/sfx/sfx_02_44.asm b/audio/sfx/sfx_02_44.asm
index 8ecfc89b..594b4b17 100644..100755
--- a/audio/sfx/sfx_02_44.asm
+++ b/audio/sfx/sfx_02_44.asm
@@ -5,4 +5,4 @@ SFX_02_44_Ch1: ; 84ee (2:44ee)
 	unknownsfx0x20 15, 242, 80, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x84fd
\ No newline at end of file
+; 0x84fd
diff --git a/audio/sfx/sfx_02_45.asm b/audio/sfx/sfx_02_45.asm
index d06160b0..38243a99 100644..100755
--- a/audio/sfx/sfx_02_45.asm
+++ b/audio/sfx/sfx_02_45.asm
@@ -11,4 +11,4 @@ SFX_02_45_Ch1: ; 84fd (2:44fd)
 	unknownsfx0x20 3, 161, 192, 7
 	unknownsfx0x20 8, 161, 0, 7
 	endchannel
-; 0x8528
\ No newline at end of file
+; 0x8528
diff --git a/audio/sfx/sfx_02_46.asm b/audio/sfx/sfx_02_46.asm
index 64d4acce..acd5299c 100644..100755
--- a/audio/sfx/sfx_02_46.asm
+++ b/audio/sfx/sfx_02_46.asm
@@ -5,4 +5,4 @@ SFX_02_46_Ch1: ; 8528 (2:4528)
 	unknownsfx0x20 4, 240, 0, 2
 	unknownsfx0x20 1, 0, 0, 0
 	endchannel
-; 0x853b
\ No newline at end of file
+; 0x853b
diff --git a/audio/sfx/sfx_02_47.asm b/audio/sfx/sfx_02_47.asm
index afcd01eb..ee3214fa 100644..100755
--- a/audio/sfx/sfx_02_47.asm
+++ b/audio/sfx/sfx_02_47.asm
@@ -5,4 +5,4 @@ SFX_02_47_Ch1: ; 853b (2:453b)
 	unknownsfx0x20 6, 240, 0, 7
 	unknownsfx0x20 1, 0, 0, 0
 	endchannel
-; 0x854e
\ No newline at end of file
+; 0x854e
diff --git a/audio/sfx/sfx_02_48.asm b/audio/sfx/sfx_02_48.asm
index 0db1b90d..58dc2934 100644..100755
--- a/audio/sfx/sfx_02_48.asm
+++ b/audio/sfx/sfx_02_48.asm
@@ -8,4 +8,4 @@ SFX_02_48_Ch1: ; 854e (2:454e)
 	unknownsfx0x20 15, 23, 0, 4
 	unknownsfx0x10 8
 	endchannel
-; 0x8569
\ No newline at end of file
+; 0x8569
diff --git a/audio/sfx/sfx_02_49.asm b/audio/sfx/sfx_02_49.asm
index b19c3fcc..d2a9922b 100644..100755
--- a/audio/sfx/sfx_02_49.asm
+++ b/audio/sfx/sfx_02_49.asm
@@ -6,4 +6,4 @@ SFX_02_49_Ch1: ; 8569 (2:4569)
 	unknownsfx0x20 4, 241, 128, 7
 	unknownsfx0x20 4, 0, 0, 0
 	endchannel
-; 0x8580
\ No newline at end of file
+; 0x8580
diff --git a/audio/sfx/sfx_02_4a.asm b/audio/sfx/sfx_02_4a.asm
index 278c927d..f4f37ab8 100644..100755
--- a/audio/sfx/sfx_02_4a.asm
+++ b/audio/sfx/sfx_02_4a.asm
@@ -7,4 +7,4 @@ SFX_02_4a_Ch1: ; 8580 (2:4580)
 	unknownsfx0x10 8
 	unknownsfx0x20 1, 0, 0, 0
 	endchannel
-; 0x8595
\ No newline at end of file
+; 0x8595
diff --git a/audio/sfx/sfx_02_4b.asm b/audio/sfx/sfx_02_4b.asm
index 923aa8e7..5826cf25 100644..100755
--- a/audio/sfx/sfx_02_4b.asm
+++ b/audio/sfx/sfx_02_4b.asm
@@ -8,4 +8,4 @@ SFX_02_4b_Ch1: ; 8595 (2:4595)
 	unknownsfx0x20 15, 23, 0, 7
 	unknownsfx0x10 8
 	endchannel
-; 0x85b0
\ No newline at end of file
+; 0x85b0
diff --git a/audio/sfx/sfx_02_4c.asm b/audio/sfx/sfx_02_4c.asm
index b9063058..4bd47818 100644..100755
--- a/audio/sfx/sfx_02_4c.asm
+++ b/audio/sfx/sfx_02_4c.asm
@@ -8,4 +8,4 @@ SFX_02_4c_Ch1: ; 85b0 (2:45b0)
 	unknownsfx0x20 15, 23, 0, 5
 	unknownsfx0x10 8
 	endchannel
-; 0x85cb
\ No newline at end of file
+; 0x85cb
diff --git a/audio/sfx/sfx_02_4d.asm b/audio/sfx/sfx_02_4d.asm
index 1d492dde..b3028e82 100644..100755
--- a/audio/sfx/sfx_02_4d.asm
+++ b/audio/sfx/sfx_02_4d.asm
@@ -4,4 +4,4 @@ SFX_02_4d_Ch1: ; 85cb (2:45cb)
 	unknownsfx0x20 15, 210, 0, 5
 	unknownsfx0x10 8
 	endchannel
-; 0x85d6
\ No newline at end of file
+; 0x85d6
diff --git a/audio/sfx/sfx_02_4e.asm b/audio/sfx/sfx_02_4e.asm
index b690ee55..9f204e21 100644..100755
--- a/audio/sfx/sfx_02_4e.asm
+++ b/audio/sfx/sfx_02_4e.asm
@@ -4,4 +4,4 @@ SFX_02_4e_Ch1: ; 85d6 (2:45d6)
 	unknownsfx0x20 15, 242, 0, 4
 	unknownsfx0x10 8
 	endchannel
-; 0x85e1
\ No newline at end of file
+; 0x85e1
diff --git a/audio/sfx/sfx_02_4f.asm b/audio/sfx/sfx_02_4f.asm
index 32ebf8cc..268586bb 100644..100755
--- a/audio/sfx/sfx_02_4f.asm
+++ b/audio/sfx/sfx_02_4f.asm
@@ -4,4 +4,4 @@ SFX_02_4f_Ch1: ; 85e1 (2:45e1)
 	unknownnoise0x20 2, 241, 34
 	unknownnoise0x20 1, 0, 0
 	endchannel
-; 0x85ee
\ No newline at end of file
+; 0x85ee
diff --git a/audio/sfx/sfx_02_50.asm b/audio/sfx/sfx_02_50.asm
index 023b255f..3d5bf3fe 100644..100755
--- a/audio/sfx/sfx_02_50.asm
+++ b/audio/sfx/sfx_02_50.asm
@@ -16,4 +16,4 @@ SFX_02_50_Ch1: ; 85ee (2:45ee)
 	unknownnoise0x20 2, 65, 18
 	unknownnoise0x20 2, 0, 0
 	endchannel
-; 0x861f
\ No newline at end of file
+; 0x861f
diff --git a/audio/sfx/sfx_02_51.asm b/audio/sfx/sfx_02_51.asm
index 956fb558..1c039e7c 100644..100755
--- a/audio/sfx/sfx_02_51.asm
+++ b/audio/sfx/sfx_02_51.asm
@@ -16,4 +16,4 @@ SFX_02_51_Ch2: ; 8636 (2:4636)
 	unknownsfx0x20 15, 240, 1, 4
 	unknownsfx0x20 1, 0, 0, 0
 	endchannel
-; 0x8649
\ No newline at end of file
+; 0x8649
diff --git a/audio/sfx/sfx_02_52.asm b/audio/sfx/sfx_02_52.asm
index 9534b08d..6afe2bef 100644..100755
--- a/audio/sfx/sfx_02_52.asm
+++ b/audio/sfx/sfx_02_52.asm
@@ -4,4 +4,4 @@ SFX_02_52_Ch1: ; 8649 (2:4649)
 	unknownsfx0x20 15, 210, 0, 7
 	unknownsfx0x10 8
 	endchannel
-; 0x8654
\ No newline at end of file
+; 0x8654
diff --git a/audio/sfx/sfx_02_53.asm b/audio/sfx/sfx_02_53.asm
index 4b739723..dc2f6d92 100644..100755
--- a/audio/sfx/sfx_02_53.asm
+++ b/audio/sfx/sfx_02_53.asm
@@ -8,4 +8,4 @@ SFX_02_53_Ch1: ; 8654 (2:4654)
 	unknownnoise0x20 8, 244, 85
 	unknownnoise0x20 8, 241, 68
 	endchannel
-; 0x866d
\ No newline at end of file
+; 0x866d
diff --git a/audio/sfx/sfx_02_54.asm b/audio/sfx/sfx_02_54.asm
index 4f3343fb..b15a29cc 100644..100755
--- a/audio/sfx/sfx_02_54.asm
+++ b/audio/sfx/sfx_02_54.asm
@@ -20,4 +20,4 @@ SFX_02_54_Ch2: ; 868c (2:468c)
 	unknownsfx0x20 15, 240, 130, 4
 	unknownsfx0x20 15, 242, 130, 4
 	endchannel
-; 0x86ab
\ No newline at end of file
+; 0x86ab
diff --git a/audio/sfx/sfx_02_55.asm b/audio/sfx/sfx_02_55.asm
index ec138968..e4d46f3a 100644..100755
--- a/audio/sfx/sfx_02_55.asm
+++ b/audio/sfx/sfx_02_55.asm
@@ -10,4 +10,4 @@ SFX_02_55_Ch1: ; 86ab (2:46ab)
 	unknownsfx0x20 15, 226, 0, 7
 	unknownsfx0x10 8
 	endchannel
-; 0x86c8
\ No newline at end of file
+; 0x86c8
diff --git a/audio/sfx/sfx_02_56.asm b/audio/sfx/sfx_02_56.asm
index 5dfab306..ee6636e1 100644..100755
--- a/audio/sfx/sfx_02_56.asm
+++ b/audio/sfx/sfx_02_56.asm
@@ -5,4 +5,4 @@ SFX_02_56_Ch1: ; 83e1 (2:43e1)
 	unknownnoise0x20 8, 244, 85
 	unknownnoise0x20 8, 241, 68
 	endchannel
-; 0x83f1
\ No newline at end of file
+; 0x83f1
diff --git a/audio/sfx/sfx_02_57.asm b/audio/sfx/sfx_02_57.asm
index 1b7e4237..e81877d1 100644..100755
--- a/audio/sfx/sfx_02_57.asm
+++ b/audio/sfx/sfx_02_57.asm
@@ -2,4 +2,4 @@ SFX_02_57_Ch1: ; 83f1 (2:43f1)
 	unknownnoise0x20 9, 241, 68
 	unknownnoise0x20 8, 209, 67
 	endchannel
-; 0x83f8
\ No newline at end of file
+; 0x83f8
diff --git a/audio/sfx/sfx_02_58.asm b/audio/sfx/sfx_02_58.asm
index b98ad41e..bf45fc6c 100644..100755
--- a/audio/sfx/sfx_02_58.asm
+++ b/audio/sfx/sfx_02_58.asm
@@ -9,4 +9,4 @@ SFX_02_58_Ch2: ; 83ff (2:43ff)
 	unknownsfx0x20 2, 8, 0, 0
 	unknownsfx0x20 8, 177, 65, 7
 	endchannel
-; 0x840a
\ No newline at end of file
+; 0x840a
diff --git a/audio/sfx/sfx_02_59.asm b/audio/sfx/sfx_02_59.asm
index a4985d1f..3fdea72a 100644..100755
--- a/audio/sfx/sfx_02_59.asm
+++ b/audio/sfx/sfx_02_59.asm
@@ -9,4 +9,4 @@ SFX_02_59_Ch2: ; 8422 (2:4422)
 	unknownsfx0x20 1, 8, 0, 0
 	unknownsfx0x20 4, 161, 97, 7
 	endchannel
-; 0x842d
\ No newline at end of file
+; 0x842d
diff --git a/audio/sfx/sfx_02_5a.asm b/audio/sfx/sfx_02_5a.asm
index a9bb7f69..9ad8098e 100644..100755
--- a/audio/sfx/sfx_02_5a.asm
+++ b/audio/sfx/sfx_02_5a.asm
@@ -11,4 +11,4 @@ SFX_02_5a_Ch2: ; 8438 (2:4438)
 	unknownsfx0x20 4, 145, 193, 6
 	unknownsfx0x20 8, 162, 161, 7
 	endchannel
-; 0x8447
\ No newline at end of file
+; 0x8447
diff --git a/audio/sfx/sfx_02_5b.asm b/audio/sfx/sfx_02_5b.asm
index e14879ed..13144567 100644..100755
--- a/audio/sfx/sfx_02_5b.asm
+++ b/audio/sfx/sfx_02_5b.asm
@@ -4,4 +4,4 @@ SFX_02_5b_Ch1: ; 8447 (2:4447)
 	unknownsfx0x20 15, 241, 0, 3
 	unknownsfx0x10 8
 	endchannel
-; 0x8452
\ No newline at end of file
+; 0x8452
diff --git a/audio/sfx/sfx_02_5c.asm b/audio/sfx/sfx_02_5c.asm
index 34866769..4f48870b 100644..100755
--- a/audio/sfx/sfx_02_5c.asm
+++ b/audio/sfx/sfx_02_5c.asm
@@ -5,4 +5,4 @@ SFX_02_5c_Ch1: ; 8452 (2:4452)
 	unknownnoise0x20 12, 97, 35
 	unknownnoise0x20 6, 65, 84
 	endchannel
-; 0x8462
\ No newline at end of file
+; 0x8462
diff --git a/audio/sfx/sfx_02_5d.asm b/audio/sfx/sfx_02_5d.asm
index 2a05d5dd..b764b5e8 100644..100755
--- a/audio/sfx/sfx_02_5d.asm
+++ b/audio/sfx/sfx_02_5d.asm
@@ -21,4 +21,4 @@ SFX_02_5d_Ch2: ; 8494 (2:4494)
 	unknownsfx0x20 2, 196, 161, 7
 	unknownsfx0x20 15, 210, 225, 7
 	endchannel
-; 0x84b7
\ No newline at end of file
+; 0x84b7
diff --git a/audio/sfx/sfx_02_5e.asm b/audio/sfx/sfx_02_5e.asm
index ade4d200..cd04822d 100644..100755
--- a/audio/sfx/sfx_02_5e.asm
+++ b/audio/sfx/sfx_02_5e.asm
@@ -19,4 +19,4 @@ SFX_02_5e_Ch1: ; 83ca (2:43ca)
 	G_ 8
 	rest 12
 	endchannel
-; 0x83e1
\ No newline at end of file
+; 0x83e1
diff --git a/audio/sfx/sfx_02_5f.asm b/audio/sfx/sfx_02_5f.asm
index 48c6539e..0a60c2b3 100644..100755
--- a/audio/sfx/sfx_02_5f.asm
+++ b/audio/sfx/sfx_02_5f.asm
@@ -7,4 +7,4 @@ SFX_02_5f_Ch1: ; 86c8 (2:46c8)
 	unknownsfx0x20 15, 68, 0, 7
 	unknownsfx0x20 15, 36, 0, 7
 	endchannel
-; 0x86e3
\ No newline at end of file
+; 0x86e3
diff --git a/audio/sfx/sfx_02_unused.asm b/audio/sfx/sfx_02_unused.asm
index db3a8b26..919d7319 100644..100755
--- a/audio/sfx/sfx_02_unused.asm
+++ b/audio/sfx/sfx_02_unused.asm
@@ -29,4 +29,4 @@ SFX_02_unused_Ch3: ; 8719 (2:4719)
 	unknownnoise0x20 12, 125, 76
 	unknownnoise0x20 15, 211, 76
 	endchannel
-; 0x872f
\ No newline at end of file
+; 0x872f
diff --git a/audio/sfx/sfx_08_01.asm b/audio/sfx/sfx_08_01.asm
index e5e03793..ddfb484c 100644..100755
--- a/audio/sfx/sfx_08_01.asm
+++ b/audio/sfx/sfx_08_01.asm
@@ -1,4 +1,4 @@
 SFX_08_01_Ch1: ; 202fd (8:42fd)
 	unknownnoise0x20 0, 193, 51
 	endchannel
-; 0x20301
\ No newline at end of file
+; 0x20301
diff --git a/audio/sfx/sfx_08_02.asm b/audio/sfx/sfx_08_02.asm
index d86123b5..38464468 100644..100755
--- a/audio/sfx/sfx_08_02.asm
+++ b/audio/sfx/sfx_08_02.asm
@@ -1,4 +1,4 @@
 SFX_08_02_Ch1: ; 20301 (8:4301)
 	unknownnoise0x20 0, 177, 51
 	endchannel
-; 0x20305
\ No newline at end of file
+; 0x20305
diff --git a/audio/sfx/sfx_08_03.asm b/audio/sfx/sfx_08_03.asm
index 9b29488f..1e20c0ce 100644..100755
--- a/audio/sfx/sfx_08_03.asm
+++ b/audio/sfx/sfx_08_03.asm
@@ -1,4 +1,4 @@
 SFX_08_03_Ch1: ; 20305 (8:4305)
 	unknownnoise0x20 0, 161, 51
 	endchannel
-; 0x20309
\ No newline at end of file
+; 0x20309
diff --git a/audio/sfx/sfx_08_04.asm b/audio/sfx/sfx_08_04.asm
index 63c3b508..01a30723 100644..100755
--- a/audio/sfx/sfx_08_04.asm
+++ b/audio/sfx/sfx_08_04.asm
@@ -1,4 +1,4 @@
 SFX_08_04_Ch1: ; 20309 (8:4309)
 	unknownnoise0x20 0, 129, 51
 	endchannel
-; 0x2030d
\ No newline at end of file
+; 0x2030d
diff --git a/audio/sfx/sfx_08_05.asm b/audio/sfx/sfx_08_05.asm
index 6fcd5f68..1568969c 100644..100755
--- a/audio/sfx/sfx_08_05.asm
+++ b/audio/sfx/sfx_08_05.asm
@@ -6,4 +6,4 @@ SFX_08_05_Ch1: ; 2030d (8:430d)
 	unknownnoise0x20 3, 130, 51
 	unknownnoise0x20 2, 129, 50
 	endchannel
-; 0x20320
\ No newline at end of file
+; 0x20320
diff --git a/audio/sfx/sfx_08_06.asm b/audio/sfx/sfx_08_06.asm
index 6e8c2b8c..6d2d8366 100644..100755
--- a/audio/sfx/sfx_08_06.asm
+++ b/audio/sfx/sfx_08_06.asm
@@ -1,4 +1,4 @@
 SFX_08_06_Ch1: ; 20320 (8:4320)
 	unknownnoise0x20 0, 81, 42
 	endchannel
-; 0x20324
\ No newline at end of file
+; 0x20324
diff --git a/audio/sfx/sfx_08_07.asm b/audio/sfx/sfx_08_07.asm
index 5281cc7b..7392a1d8 100644..100755
--- a/audio/sfx/sfx_08_07.asm
+++ b/audio/sfx/sfx_08_07.asm
@@ -2,4 +2,4 @@ SFX_08_07_Ch1: ; 20324 (8:4324)
 	unknownnoise0x20 1, 65, 43
 	unknownnoise0x20 0, 97, 42
 	endchannel
-; 0x2032b
\ No newline at end of file
+; 0x2032b
diff --git a/audio/sfx/sfx_08_08.asm b/audio/sfx/sfx_08_08.asm
index 4d28817b..d4ab06c1 100644..100755
--- a/audio/sfx/sfx_08_08.asm
+++ b/audio/sfx/sfx_08_08.asm
@@ -1,4 +1,4 @@
 SFX_08_08_Ch1: ; 2032b (8:432b)
 	unknownnoise0x20 0, 129, 16
 	endchannel
-; 0x2032f
\ No newline at end of file
+; 0x2032f
diff --git a/audio/sfx/sfx_08_09.asm b/audio/sfx/sfx_08_09.asm
index 94eac4b0..9e801da7 100644..100755
--- a/audio/sfx/sfx_08_09.asm
+++ b/audio/sfx/sfx_08_09.asm
@@ -1,4 +1,4 @@
 SFX_08_09_Ch1: ; 2032f (8:432f)
 	unknownnoise0x20 0, 130, 35
 	endchannel
-; 0x20333
\ No newline at end of file
+; 0x20333
diff --git a/audio/sfx/sfx_08_0a.asm b/audio/sfx/sfx_08_0a.asm
index c7a3a090..6da585ac 100644..100755
--- a/audio/sfx/sfx_08_0a.asm
+++ b/audio/sfx/sfx_08_0a.asm
@@ -1,4 +1,4 @@
 SFX_08_0a_Ch1: ; 20333 (8:4333)
 	unknownnoise0x20 0, 130, 37
 	endchannel
-; 0x20337
\ No newline at end of file
+; 0x20337
diff --git a/audio/sfx/sfx_08_0b.asm b/audio/sfx/sfx_08_0b.asm
index 8010f4c9..c2d0c079 100644..100755
--- a/audio/sfx/sfx_08_0b.asm
+++ b/audio/sfx/sfx_08_0b.asm
@@ -1,4 +1,4 @@
 SFX_08_0b_Ch1: ; 20337 (8:4337)
 	unknownnoise0x20 0, 130, 38
 	endchannel
-; 0x2033b
\ No newline at end of file
+; 0x2033b
diff --git a/audio/sfx/sfx_08_0c.asm b/audio/sfx/sfx_08_0c.asm
index 8a87cf9a..9f872678 100644..100755
--- a/audio/sfx/sfx_08_0c.asm
+++ b/audio/sfx/sfx_08_0c.asm
@@ -1,4 +1,4 @@
 SFX_08_0c_Ch1: ; 2033b (8:433b)
 	unknownnoise0x20 0, 161, 16
 	endchannel
-; 0x2033f
\ No newline at end of file
+; 0x2033f
diff --git a/audio/sfx/sfx_08_0d.asm b/audio/sfx/sfx_08_0d.asm
index d5997986..245add5b 100644..100755
--- a/audio/sfx/sfx_08_0d.asm
+++ b/audio/sfx/sfx_08_0d.asm
@@ -1,4 +1,4 @@
 SFX_08_0d_Ch1: ; 2033f (8:433f)
 	unknownnoise0x20 0, 162, 17
 	endchannel
-; 0x20343
\ No newline at end of file
+; 0x20343
diff --git a/audio/sfx/sfx_08_0e.asm b/audio/sfx/sfx_08_0e.asm
index f98ceb2e..096e0a33 100644..100755
--- a/audio/sfx/sfx_08_0e.asm
+++ b/audio/sfx/sfx_08_0e.asm
@@ -1,4 +1,4 @@
 SFX_08_0e_Ch1: ; 20343 (8:4343)
 	unknownnoise0x20 0, 162, 80
 	endchannel
-; 0x20347
\ No newline at end of file
+; 0x20347
diff --git a/audio/sfx/sfx_08_0f.asm b/audio/sfx/sfx_08_0f.asm
index 22452696..b7bbfb7f 100644..100755
--- a/audio/sfx/sfx_08_0f.asm
+++ b/audio/sfx/sfx_08_0f.asm
@@ -2,4 +2,4 @@ SFX_08_0f_Ch1: ; 20347 (8:4347)
 	unknownnoise0x20 0, 161, 24
 	unknownnoise0x20 0, 49, 51
 	endchannel
-; 0x2034e
\ No newline at end of file
+; 0x2034e
diff --git a/audio/sfx/sfx_08_10.asm b/audio/sfx/sfx_08_10.asm
index cc94f730..6399a966 100644..100755
--- a/audio/sfx/sfx_08_10.asm
+++ b/audio/sfx/sfx_08_10.asm
@@ -2,4 +2,4 @@ SFX_08_10_Ch1: ; 2034e (8:434e)
 	unknownnoise0x20 2, 145, 40
 	unknownnoise0x20 0, 113, 24
 	endchannel
-; 0x20355
\ No newline at end of file
+; 0x20355
diff --git a/audio/sfx/sfx_08_11.asm b/audio/sfx/sfx_08_11.asm
index 7ac28d21..ae617471 100644..100755
--- a/audio/sfx/sfx_08_11.asm
+++ b/audio/sfx/sfx_08_11.asm
@@ -1,4 +1,4 @@
 SFX_08_11_Ch1: ; 20355 (8:4355)
 	unknownnoise0x20 0, 145, 34
 	endchannel
-; 0x20359
\ No newline at end of file
+; 0x20359
diff --git a/audio/sfx/sfx_08_12.asm b/audio/sfx/sfx_08_12.asm
index 3d5bebad..e391b0a9 100644..100755
--- a/audio/sfx/sfx_08_12.asm
+++ b/audio/sfx/sfx_08_12.asm
@@ -1,4 +1,4 @@
 SFX_08_12_Ch1: ; 20359 (8:4359)
 	unknownnoise0x20 0, 113, 34
 	endchannel
-; 0x2035d
\ No newline at end of file
+; 0x2035d
diff --git a/audio/sfx/sfx_08_13.asm b/audio/sfx/sfx_08_13.asm
index e6712805..4c478514 100644..100755
--- a/audio/sfx/sfx_08_13.asm
+++ b/audio/sfx/sfx_08_13.asm
@@ -1,4 +1,4 @@
 SFX_08_13_Ch1: ; 2035d (8:435d)
 	unknownnoise0x20 0, 97, 34
 	endchannel
-; 0x20361
\ No newline at end of file
+; 0x20361
diff --git a/audio/sfx/sfx_08_14.asm b/audio/sfx/sfx_08_14.asm
index b037b6a1..c0a7d813 100644..100755
--- a/audio/sfx/sfx_08_14.asm
+++ b/audio/sfx/sfx_08_14.asm
@@ -19,4 +19,4 @@ SFX_08_14_Ch3: ; 20c4d (8:4c4d)
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 8, 129, 28
 	endchannel
-; 0x20c57
\ No newline at end of file
+; 0x20c57
diff --git a/audio/sfx/sfx_08_15.asm b/audio/sfx/sfx_08_15.asm
index 40cacf00..ae20351d 100644..100755
--- a/audio/sfx/sfx_08_15.asm
+++ b/audio/sfx/sfx_08_15.asm
@@ -22,4 +22,4 @@ SFX_08_15_Ch3: ; 20e65 (8:4e65)
 	unknownnoise0x20 3, 130, 28
 	unknownnoise0x20 8, 113, 44
 	endchannel
-; 0x20e72
\ No newline at end of file
+; 0x20e72
diff --git a/audio/sfx/sfx_08_16.asm b/audio/sfx/sfx_08_16.asm
index bbe80ddb..d8a126ed 100644..100755
--- a/audio/sfx/sfx_08_16.asm
+++ b/audio/sfx/sfx_08_16.asm
@@ -15,4 +15,4 @@ SFX_08_16_Ch2: ; 20dc3 (8:4dc3)
 
 SFX_08_16_Ch3: ; 20dd1 (8:4dd1)
 	endchannel
-; 0x20dd2
\ No newline at end of file
+; 0x20dd2
diff --git a/audio/sfx/sfx_08_17.asm b/audio/sfx/sfx_08_17.asm
index 03587fa4..10143636 100644..100755
--- a/audio/sfx/sfx_08_17.asm
+++ b/audio/sfx/sfx_08_17.asm
@@ -28,4 +28,4 @@ SFX_08_17_Ch3: ; 20b8c (8:4b8c)
 	unknownnoise0x20 12, 182, 76
 	unknownnoise0x20 15, 162, 92
 	endchannel
-; 0x20b99
\ No newline at end of file
+; 0x20b99
diff --git a/audio/sfx/sfx_08_18.asm b/audio/sfx/sfx_08_18.asm
index b1e97f95..742edcd0 100644..100755
--- a/audio/sfx/sfx_08_18.asm
+++ b/audio/sfx/sfx_08_18.asm
@@ -30,4 +30,4 @@ SFX_08_18_Ch3: ; 20f3b (8:4f3b)
 	unknownnoise0x20 7, 195, 76
 	unknownnoise0x20 8, 161, 92
 	endchannel
-; 0x20f4e
\ No newline at end of file
+; 0x20f4e
diff --git a/audio/sfx/sfx_08_19.asm b/audio/sfx/sfx_08_19.asm
index 097796bc..af2cab57 100644..100755
--- a/audio/sfx/sfx_08_19.asm
+++ b/audio/sfx/sfx_08_19.asm
@@ -17,4 +17,4 @@ SFX_08_19_Ch2: ; 20cf0 (8:4cf0)
 
 SFX_08_19_Ch3: ; 20d02 (8:4d02)
 	endchannel
-; 0x20d03
\ No newline at end of file
+; 0x20d03
diff --git a/audio/sfx/sfx_08_1a.asm b/audio/sfx/sfx_08_1a.asm
index 089460e4..9bd8f231 100644..100755
--- a/audio/sfx/sfx_08_1a.asm
+++ b/audio/sfx/sfx_08_1a.asm
@@ -20,4 +20,4 @@ SFX_08_1a_Ch3: ; 20ca2 (8:4ca2)
 	unknownnoise0x20 15, 215, 156
 	unknownnoise0x20 15, 242, 172
 	endchannel
-; 0x20cb5
\ No newline at end of file
+; 0x20cb5
diff --git a/audio/sfx/sfx_08_1b.asm b/audio/sfx/sfx_08_1b.asm
index 1eec17f5..3ccfdd05 100644..100755
--- a/audio/sfx/sfx_08_1b.asm
+++ b/audio/sfx/sfx_08_1b.asm
@@ -19,4 +19,4 @@ SFX_08_1b_Ch3: ; 20cd3 (8:4cd3)
 	unknownnoise0x20 15, 230, 76
 	unknownnoise0x20 8, 177, 92
 	endchannel
-; 0x20cdd
\ No newline at end of file
+; 0x20cdd
diff --git a/audio/sfx/sfx_08_1c.asm b/audio/sfx/sfx_08_1c.asm
index ec6b03a7..75f74f3e 100644..100755
--- a/audio/sfx/sfx_08_1c.asm
+++ b/audio/sfx/sfx_08_1c.asm
@@ -21,4 +21,4 @@ SFX_08_1c_Ch3: ; 20ef3 (8:4ef3)
 	unknownnoise0x20 11, 215, 92
 	unknownnoise0x20 15, 194, 76
 	endchannel
-; 0x20efd
\ No newline at end of file
+; 0x20efd
diff --git a/audio/sfx/sfx_08_1d.asm b/audio/sfx/sfx_08_1d.asm
index 7162b031..44f9a64f 100644..100755
--- a/audio/sfx/sfx_08_1d.asm
+++ b/audio/sfx/sfx_08_1d.asm
@@ -33,4 +33,4 @@ SFX_08_1d_Ch3: ; 20a15 (8:4a15)
 	unknownnoise0x20 6, 212, 61
 	unknownnoise0x20 8, 193, 59
 	endchannel
-; 0x20a2e
\ No newline at end of file
+; 0x20a2e
diff --git a/audio/sfx/sfx_08_1e.asm b/audio/sfx/sfx_08_1e.asm
index 13475f11..372ecd89 100644..100755
--- a/audio/sfx/sfx_08_1e.asm
+++ b/audio/sfx/sfx_08_1e.asm
@@ -33,4 +33,4 @@ SFX_08_1e_Ch3: ; 20eb4 (8:4eb4)
 	unknownnoise0x20 3, 164, 44
 	unknownnoise0x20 8, 145, 60
 	endchannel
-; 0x20ecd
\ No newline at end of file
+; 0x20ecd
diff --git a/audio/sfx/sfx_08_1f.asm b/audio/sfx/sfx_08_1f.asm
index a882c512..6ff114ea 100644..100755
--- a/audio/sfx/sfx_08_1f.asm
+++ b/audio/sfx/sfx_08_1f.asm
@@ -35,4 +35,4 @@ SFX_08_1f_Ch3: ; 20d4d (8:4d4d)
 	unknownnoise0x20 4, 193, 44
 	unknownnoise0x20 8, 161, 76
 	endchannel
-; 0x20d66
\ No newline at end of file
+; 0x20d66
diff --git a/audio/sfx/sfx_08_20.asm b/audio/sfx/sfx_08_20.asm
index 94a54b0a..35cd9acc 100644..100755
--- a/audio/sfx/sfx_08_20.asm
+++ b/audio/sfx/sfx_08_20.asm
@@ -27,4 +27,4 @@ SFX_08_20_Ch2: ; 20d8d (8:4d8d)
 
 SFX_08_20_Ch3: ; 20db3 (8:4db3)
 	endchannel
-; 0x20db4
\ No newline at end of file
+; 0x20db4
diff --git a/audio/sfx/sfx_08_21.asm b/audio/sfx/sfx_08_21.asm
index 4bfaac76..50c0106a 100644..100755
--- a/audio/sfx/sfx_08_21.asm
+++ b/audio/sfx/sfx_08_21.asm
@@ -38,4 +38,4 @@ SFX_08_21_Ch3: ; 20e20 (8:4e20)
 	unknownnoise0x20 9, 194, 44
 	unknownnoise0x20 4, 161, 60
 	endchannel
-; 0x20e3f
\ No newline at end of file
+; 0x20e3f
diff --git a/audio/sfx/sfx_08_22.asm b/audio/sfx/sfx_08_22.asm
index b922acb3..a08f0a89 100644..100755
--- a/audio/sfx/sfx_08_22.asm
+++ b/audio/sfx/sfx_08_22.asm
@@ -21,4 +21,4 @@ SFX_08_22_Ch3: ; 20c7d (8:4c7d)
 	unknownnoise0x20 2, 97, 33
 	unknownnoise0x20 8, 97, 17
 	endchannel
-; 0x20c87
\ No newline at end of file
+; 0x20c87
diff --git a/audio/sfx/sfx_08_23.asm b/audio/sfx/sfx_08_23.asm
index 9a78abd2..8552ddc7 100644..100755
--- a/audio/sfx/sfx_08_23.asm
+++ b/audio/sfx/sfx_08_23.asm
@@ -27,4 +27,4 @@ SFX_08_23_Ch3: ; 20bcf (8:4bcf)
 	unknownnoise0x20 8, 183, 92
 	unknownnoise0x20 15, 194, 93
 	endchannel
-; 0x20bdf
\ No newline at end of file
+; 0x20bdf
diff --git a/audio/sfx/sfx_08_24.asm b/audio/sfx/sfx_08_24.asm
index 2bdc4e9d..9b4def61 100644..100755
--- a/audio/sfx/sfx_08_24.asm
+++ b/audio/sfx/sfx_08_24.asm
@@ -29,4 +29,4 @@ SFX_08_24_Ch3: ; 20c25 (8:4c25)
 	unknownnoise0x20 4, 116, 16
 	unknownnoise0x20 4, 113, 32
 	endchannel
-; 0x20c2f
\ No newline at end of file
+; 0x20c2f
diff --git a/audio/sfx/sfx_08_25.asm b/audio/sfx/sfx_08_25.asm
index 84f8f816..b305664b 100644..100755
--- a/audio/sfx/sfx_08_25.asm
+++ b/audio/sfx/sfx_08_25.asm
@@ -32,4 +32,4 @@ SFX_08_25_Ch3: ; 20afd (8:4afd)
 	unknownnoise0x20 12, 210, 61
 	unknownnoise0x20 8, 209, 44
 	endchannel
-; 0x20b13
\ No newline at end of file
+; 0x20b13
diff --git a/audio/sfx/sfx_08_26.asm b/audio/sfx/sfx_08_26.asm
index 90ae7cb9..dd5f7897 100644..100755
--- a/audio/sfx/sfx_08_26.asm
+++ b/audio/sfx/sfx_08_26.asm
@@ -22,4 +22,4 @@ SFX_08_26_Ch3: ; 20ff9 (8:4ff9)
 	unknownnoise0x20 3, 194, 108
 	unknownnoise0x20 8, 209, 92
 	endchannel
-; 0x21006
\ No newline at end of file
+; 0x21006
diff --git a/audio/sfx/sfx_08_27.asm b/audio/sfx/sfx_08_27.asm
index 6eb9474d..044e1d6f 100644..100755
--- a/audio/sfx/sfx_08_27.asm
+++ b/audio/sfx/sfx_08_27.asm
@@ -28,4 +28,4 @@ SFX_08_27_Ch3: ; 2103c (8:503c)
 	unknownnoise0x20 8, 179, 76
 	unknownnoise0x20 8, 161, 92
 	endchannel
-; 0x2104f
\ No newline at end of file
+; 0x2104f
diff --git a/audio/sfx/sfx_08_28.asm b/audio/sfx/sfx_08_28.asm
index 2d6b2a3c..c7f7e3a7 100644..100755
--- a/audio/sfx/sfx_08_28.asm
+++ b/audio/sfx/sfx_08_28.asm
@@ -19,4 +19,4 @@ SFX_08_28_Ch3: ; 2106d (8:506d)
 	unknownnoise0x20 14, 196, 60
 	unknownnoise0x20 8, 209, 44
 	endchannel
-; 0x21077
\ No newline at end of file
+; 0x21077
diff --git a/audio/sfx/sfx_08_29.asm b/audio/sfx/sfx_08_29.asm
index 66842f0a..7149e4e1 100644..100755
--- a/audio/sfx/sfx_08_29.asm
+++ b/audio/sfx/sfx_08_29.asm
@@ -28,4 +28,4 @@ SFX_08_29_Ch3: ; 21113 (8:5113)
 	unknownnoise0x20 3, 162, 92
 	unknownnoise0x20 8, 177, 108
 	endchannel
-; 0x21126
\ No newline at end of file
+; 0x21126
diff --git a/audio/sfx/sfx_08_2a.asm b/audio/sfx/sfx_08_2a.asm
index d3494708..a2b247ef 100644..100755
--- a/audio/sfx/sfx_08_2a.asm
+++ b/audio/sfx/sfx_08_2a.asm
@@ -19,4 +19,4 @@ SFX_08_2a_Ch3: ; 20f8e (8:4f8e)
 	unknownnoise0x20 4, 230, 60
 	unknownnoise0x20 15, 242, 76
 	endchannel
-; 0x20f98
\ No newline at end of file
+; 0x20f98
diff --git a/audio/sfx/sfx_08_2b.asm b/audio/sfx/sfx_08_2b.asm
index 301c9712..36411656 100644..100755
--- a/audio/sfx/sfx_08_2b.asm
+++ b/audio/sfx/sfx_08_2b.asm
@@ -22,4 +22,4 @@ SFX_08_2b_Ch3: ; 2114c (8:514c)
 	unknownnoise0x20 9, 228, 124
 	unknownnoise0x20 15, 226, 108
 	endchannel
-; 0x21159
\ No newline at end of file
+; 0x21159
diff --git a/audio/sfx/sfx_08_2c.asm b/audio/sfx/sfx_08_2c.asm
index d3844d4a..5c7d9541 100644..100755
--- a/audio/sfx/sfx_08_2c.asm
+++ b/audio/sfx/sfx_08_2c.asm
@@ -32,4 +32,4 @@ SFX_08_2c_Ch3: ; 2127c (8:527c)
 	unknownnoise0x20 6, 180, 60
 	unknownnoise0x20 8, 193, 44
 	endchannel
-; 0x2128f
\ No newline at end of file
+; 0x2128f
diff --git a/audio/sfx/sfx_08_2d.asm b/audio/sfx/sfx_08_2d.asm
index 3e28d648..44033318 100644..100755
--- a/audio/sfx/sfx_08_2d.asm
+++ b/audio/sfx/sfx_08_2d.asm
@@ -16,4 +16,4 @@ SFX_08_2d_Ch2: ; 20f5d (8:4f5d)
 
 SFX_08_2d_Ch3: ; 20f6f (8:4f6f)
 	endchannel
-; 0x20f70
\ No newline at end of file
+; 0x20f70
diff --git a/audio/sfx/sfx_08_2e.asm b/audio/sfx/sfx_08_2e.asm
index fea62a2f..617d3b8b 100644..100755
--- a/audio/sfx/sfx_08_2e.asm
+++ b/audio/sfx/sfx_08_2e.asm
@@ -28,4 +28,4 @@ SFX_08_2e_Ch3: ; 211dd (8:51dd)
 	unknownnoise0x20 2, 226, 60
 	unknownnoise0x20 8, 209, 44
 	endchannel
-; 0x211f0
\ No newline at end of file
+; 0x211f0
diff --git a/audio/sfx/sfx_08_2f.asm b/audio/sfx/sfx_08_2f.asm
index fcfa40e0..5d786f9c 100644..100755
--- a/audio/sfx/sfx_08_2f.asm
+++ b/audio/sfx/sfx_08_2f.asm
@@ -24,4 +24,4 @@ SFX_08_2f_Ch3: ; 20fc6 (8:4fc6)
 	unknownnoise0x20 5, 163, 60
 	unknownnoise0x20 8, 145, 44
 	endchannel
-; 0x20fd3
\ No newline at end of file
+; 0x20fd3
diff --git a/audio/sfx/sfx_08_30.asm b/audio/sfx/sfx_08_30.asm
index 600b72f2..8877a00f 100644..100755
--- a/audio/sfx/sfx_08_30.asm
+++ b/audio/sfx/sfx_08_30.asm
@@ -29,4 +29,4 @@ SFX_08_30_Ch3: ; 21197 (8:5197)
 	unknownnoise0x20 8, 196, 108
 	unknownnoise0x20 15, 179, 92
 	endchannel
-; 0x211a7
\ No newline at end of file
+; 0x211a7
diff --git a/audio/sfx/sfx_08_31.asm b/audio/sfx/sfx_08_31.asm
index d43791b0..5afe29c7 100644..100755
--- a/audio/sfx/sfx_08_31.asm
+++ b/audio/sfx/sfx_08_31.asm
@@ -27,4 +27,4 @@ SFX_08_31_Ch3: ; 21226 (8:5226)
 	unknownnoise0x20 1, 178, 91
 	unknownnoise0x20 15, 194, 76
 	endchannel
-; 0x21236
\ No newline at end of file
+; 0x21236
diff --git a/audio/sfx/sfx_08_32.asm b/audio/sfx/sfx_08_32.asm
index 886df035..cda5f116 100644..100755
--- a/audio/sfx/sfx_08_32.asm
+++ b/audio/sfx/sfx_08_32.asm
@@ -36,4 +36,4 @@ SFX_08_32_Ch3: ; 210c1 (8:50c1)
 	unknownnoise0x20 5, 146, 26
 	unknownnoise0x20 8, 129, 24
 	endchannel
-; 0x210dd
\ No newline at end of file
+; 0x210dd
diff --git a/audio/sfx/sfx_08_33.asm b/audio/sfx/sfx_08_33.asm
index 098dd501..21c1fd1e 100644..100755
--- a/audio/sfx/sfx_08_33.asm
+++ b/audio/sfx/sfx_08_33.asm
@@ -22,4 +22,4 @@ SFX_08_33_Ch3: ; 212b5 (8:52b5)
 	unknownnoise0x20 8, 196, 69
 	unknownnoise0x20 8, 177, 68
 	endchannel
-; 0x212c2
\ No newline at end of file
+; 0x212c2
diff --git a/audio/sfx/sfx_08_34.asm b/audio/sfx/sfx_08_34.asm
index f355ed72..4c892016 100644..100755
--- a/audio/sfx/sfx_08_34.asm
+++ b/audio/sfx/sfx_08_34.asm
@@ -22,4 +22,4 @@ SFX_08_34_Ch3: ; 212e8 (8:52e8)
 	unknownnoise0x20 14, 210, 86
 	unknownnoise0x20 8, 209, 102
 	endchannel
-; 0x212f5
\ No newline at end of file
+; 0x212f5
diff --git a/audio/sfx/sfx_08_35.asm b/audio/sfx/sfx_08_35.asm
index d55d627c..463f3597 100644..100755
--- a/audio/sfx/sfx_08_35.asm
+++ b/audio/sfx/sfx_08_35.asm
@@ -25,4 +25,4 @@ SFX_08_35_Ch2: ; 21318 (8:5318)
 
 SFX_08_35_Ch3: ; 2133a (8:533a)
 	endchannel
-; 0x2133b
\ No newline at end of file
+; 0x2133b
diff --git a/audio/sfx/sfx_08_36.asm b/audio/sfx/sfx_08_36.asm
index f51a37a0..843fa8e5 100644..100755
--- a/audio/sfx/sfx_08_36.asm
+++ b/audio/sfx/sfx_08_36.asm
@@ -22,4 +22,4 @@ SFX_08_36_Ch3: ; 21361 (8:5361)
 	unknownnoise0x20 1, 162, 57
 	unknownnoise0x20 8, 145, 73
 	endchannel
-; 0x2136e
\ No newline at end of file
+; 0x2136e
diff --git a/audio/sfx/sfx_08_37.asm b/audio/sfx/sfx_08_37.asm
index 813c4504..32a44e59 100644..100755
--- a/audio/sfx/sfx_08_37.asm
+++ b/audio/sfx/sfx_08_37.asm
@@ -23,4 +23,4 @@ SFX_08_37_Ch3: ; 20a58 (8:4a58)
 	unknownnoise0x20 15, 215, 60
 	unknownnoise0x20 8, 193, 44
 	endchannel
-; 0x20a65
\ No newline at end of file
+; 0x20a65
diff --git a/audio/sfx/sfx_08_38.asm b/audio/sfx/sfx_08_38.asm
index b162539e..7db5b654 100644..100755
--- a/audio/sfx/sfx_08_38.asm
+++ b/audio/sfx/sfx_08_38.asm
@@ -31,4 +31,4 @@ SFX_08_38_Ch3: ; 20aab (8:4aab)
 	unknownnoise0x20 12, 183, 76
 	unknownnoise0x20 15, 162, 92
 	endchannel
-; 0x20abb
\ No newline at end of file
+; 0x20abb
diff --git a/audio/sfx/sfx_08_39.asm b/audio/sfx/sfx_08_39.asm
index ecce76f2..1b9b0dae 100644..100755
--- a/audio/sfx/sfx_08_39.asm
+++ b/audio/sfx/sfx_08_39.asm
@@ -24,4 +24,4 @@ SFX_08_39_Ch3: ; 20b41 (8:4b41)
 	unknownnoise0x20 10, 182, 44
 	unknownnoise0x20 8, 145, 28
 	endchannel
-; 0x20b4e
\ No newline at end of file
+; 0x20b4e
diff --git a/audio/sfx/sfx_08_3a.asm b/audio/sfx/sfx_08_3a.asm
index 24cb206c..cc992756 100644..100755
--- a/audio/sfx/sfx_08_3a.asm
+++ b/audio/sfx/sfx_08_3a.asm
@@ -61,4 +61,4 @@ SFX_08_3a_Ch3: ; 239b0 (8:79b0)
 	rest 1
 	A_ 8
 	endchannel
-; 0x239c7
\ No newline at end of file
+; 0x239c7
diff --git a/audio/sfx/sfx_08_3b.asm b/audio/sfx/sfx_08_3b.asm
index 910cf9dc..6a178f4c 100644..100755
--- a/audio/sfx/sfx_08_3b.asm
+++ b/audio/sfx/sfx_08_3b.asm
@@ -67,4 +67,4 @@ SFX_08_3b_Ch3: ; 239fe (8:79fe)
 	rest 1
 	A_ 8
 	endchannel
-; 0x23a13
\ No newline at end of file
+; 0x23a13
diff --git a/audio/sfx/sfx_08_3c.asm b/audio/sfx/sfx_08_3c.asm
index e9ebca58..2bbc9caf 100644..100755
--- a/audio/sfx/sfx_08_3c.asm
+++ b/audio/sfx/sfx_08_3c.asm
@@ -6,4 +6,4 @@ SFX_08_3c_Ch1: ; 203dd (8:43dd)
 	unknownsfx0x20 8, 226, 0, 2
 	unknownsfx0x10 8
 	endchannel
-; 0x203ee
\ No newline at end of file
+; 0x203ee
diff --git a/audio/sfx/sfx_08_3d.asm b/audio/sfx/sfx_08_3d.asm
index c2d411af..c263a999 100644..100755
--- a/audio/sfx/sfx_08_3d.asm
+++ b/audio/sfx/sfx_08_3d.asm
@@ -5,4 +5,4 @@ SFX_08_3d_Ch1: ; 203ee (8:43ee)
 	unknownsfx0x20 15, 242, 80, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x203fd
\ No newline at end of file
+; 0x203fd
diff --git a/audio/sfx/sfx_08_3e.asm b/audio/sfx/sfx_08_3e.asm
index 3ac78576..0808979b 100644..100755
--- a/audio/sfx/sfx_08_3e.asm
+++ b/audio/sfx/sfx_08_3e.asm
@@ -7,4 +7,4 @@ SFX_08_3e_Ch1: ; 203fd (8:43fd)
 	unknownsfx0x20 15, 242, 0, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x20412
\ No newline at end of file
+; 0x20412
diff --git a/audio/sfx/sfx_08_3f.asm b/audio/sfx/sfx_08_3f.asm
index a834f917..6351f53c 100644..100755
--- a/audio/sfx/sfx_08_3f.asm
+++ b/audio/sfx/sfx_08_3f.asm
@@ -2,4 +2,4 @@ SFX_08_3f_Ch1: ; 203d6 (8:43d6)
 	unknownnoise0x20 1, 226, 51
 	unknownnoise0x20 8, 225, 34
 	endchannel
-; 0x203dd
\ No newline at end of file
+; 0x203dd
diff --git a/audio/sfx/sfx_08_40.asm b/audio/sfx/sfx_08_40.asm
index 7603a54a..f62eb148 100644..100755
--- a/audio/sfx/sfx_08_40.asm
+++ b/audio/sfx/sfx_08_40.asm
@@ -5,4 +5,4 @@ SFX_08_40_Ch1: ; 203c3 (8:43c3)
 	unknownsfx0x20 0, 145, 192, 7
 	unknownsfx0x20 12, 161, 208, 7
 	endchannel
-; 0x203d6
\ No newline at end of file
+; 0x203d6
diff --git a/audio/sfx/sfx_08_41.asm b/audio/sfx/sfx_08_41.asm
index f4825bb4..a4788ad6 100644..100755
--- a/audio/sfx/sfx_08_41.asm
+++ b/audio/sfx/sfx_08_41.asm
@@ -9,4 +9,4 @@ SFX_08_41_Ch2: ; 20436 (8:4436)
 	duty 2
 	unknownsfx0x20 15, 194, 130, 7
 	endchannel
-; 0x2043d
\ No newline at end of file
+; 0x2043d
diff --git a/audio/sfx/sfx_08_42.asm b/audio/sfx/sfx_08_42.asm
index 43232843..fadf0c42 100644..100755
--- a/audio/sfx/sfx_08_42.asm
+++ b/audio/sfx/sfx_08_42.asm
@@ -9,4 +9,4 @@ SFX_08_42_Ch1: ; 2043d (8:443d)
 SFX_08_42_Ch2: ; 20448 (8:4448)
 	unknownnoise0x20 15, 162, 34
 	endchannel
-; 0x2044c
\ No newline at end of file
+; 0x2044c
diff --git a/audio/sfx/sfx_08_43.asm b/audio/sfx/sfx_08_43.asm
index 53b1676d..27bd52fb 100644..100755
--- a/audio/sfx/sfx_08_43.asm
+++ b/audio/sfx/sfx_08_43.asm
@@ -9,4 +9,4 @@ SFX_08_43_Ch2: ; 20453 (8:4453)
 	unknownnoise0x20 8, 244, 34
 	unknownnoise0x20 15, 242, 33
 	endchannel
-; 0x2045d
\ No newline at end of file
+; 0x2045d
diff --git a/audio/sfx/sfx_08_44.asm b/audio/sfx/sfx_08_44.asm
index 59a587bb..57f8901a 100644..100755
--- a/audio/sfx/sfx_08_44.asm
+++ b/audio/sfx/sfx_08_44.asm
@@ -11,4 +11,4 @@ SFX_08_44_Ch1: ; 2045d (8:445d)
 	unknownnoise0x20 2, 49, 17
 	unknownnoise0x20 8, 65, 51
 	endchannel
-; 0x2047f
\ No newline at end of file
+; 0x2047f
diff --git a/audio/sfx/sfx_08_45.asm b/audio/sfx/sfx_08_45.asm
index 5b22cbcc..77a1065f 100644..100755
--- a/audio/sfx/sfx_08_45.asm
+++ b/audio/sfx/sfx_08_45.asm
@@ -13,4 +13,4 @@ SFX_08_45_Ch2: ; 20490 (8:4490)
 	unknownsfx0x20 15, 146, 0, 6
 	unknownsfx0x20 15, 146, 130, 7
 	endchannel
-; 0x2049b
\ No newline at end of file
+; 0x2049b
diff --git a/audio/sfx/sfx_08_46.asm b/audio/sfx/sfx_08_46.asm
index b1d35eb1..4e4732c5 100644..100755
--- a/audio/sfx/sfx_08_46.asm
+++ b/audio/sfx/sfx_08_46.asm
@@ -59,4 +59,4 @@ SFX_08_46_Ch3: ; 23a44 (8:7a44)
 	G_ 2
 	G# 4
 	endchannel
-; 0x23a53
\ No newline at end of file
+; 0x23a53
diff --git a/audio/sfx/sfx_08_47.asm b/audio/sfx/sfx_08_47.asm
index 87e76a17..47f8b645 100644..100755
--- a/audio/sfx/sfx_08_47.asm
+++ b/audio/sfx/sfx_08_47.asm
@@ -1,4 +1,4 @@
 SFX_08_47_Ch1: ; 204aa (8:44aa)
 	unknownnoise0x20 2, 161, 18
 	endchannel
-; 0x204ae
\ No newline at end of file
+; 0x204ae
diff --git a/audio/sfx/sfx_08_48.asm b/audio/sfx/sfx_08_48.asm
index ace8ada4..0792ae25 100644..100755
--- a/audio/sfx/sfx_08_48.asm
+++ b/audio/sfx/sfx_08_48.asm
@@ -4,4 +4,4 @@ SFX_08_48_Ch1: ; 204ae (8:44ae)
 	unknownsfx0x20 15, 242, 128, 7
 	unknownsfx0x10 8
 	endchannel
-; 0x204b9
\ No newline at end of file
+; 0x204b9
diff --git a/audio/sfx/sfx_08_49.asm b/audio/sfx/sfx_08_49.asm
index 6219a615..9d145c09 100644..100755
--- a/audio/sfx/sfx_08_49.asm
+++ b/audio/sfx/sfx_08_49.asm
@@ -4,4 +4,4 @@ SFX_08_49_Ch1: ; 204b9 (8:44b9)
 	unknownsfx0x20 15, 242, 0, 5
 	unknownsfx0x10 8
 	endchannel
-; 0x204c4
\ No newline at end of file
+; 0x204c4
diff --git a/audio/sfx/sfx_08_4a.asm b/audio/sfx/sfx_08_4a.asm
index 3ebc3281..f566332b 100644..100755
--- a/audio/sfx/sfx_08_4a.asm
+++ b/audio/sfx/sfx_08_4a.asm
@@ -1,4 +1,4 @@
 SFX_08_4a_Ch1: ; 204c4 (8:44c4)
 	unknownnoise0x20 2, 161, 34
 	endchannel
-; 0x204c8
\ No newline at end of file
+; 0x204c8
diff --git a/audio/sfx/sfx_08_4b.asm b/audio/sfx/sfx_08_4b.asm
index 980af0c9..24e6bfc3 100644..100755
--- a/audio/sfx/sfx_08_4b.asm
+++ b/audio/sfx/sfx_08_4b.asm
@@ -1,4 +1,4 @@
 SFX_08_4b_Ch1: ; 204c8 (8:44c8)
 	unknownnoise0x20 8, 241, 84
 	endchannel
-; 0x204cc
\ No newline at end of file
+; 0x204cc
diff --git a/audio/sfx/sfx_08_4c.asm b/audio/sfx/sfx_08_4c.asm
index f7f32305..3b4d0350 100644..100755
--- a/audio/sfx/sfx_08_4c.asm
+++ b/audio/sfx/sfx_08_4c.asm
@@ -3,4 +3,4 @@ SFX_08_4c_Ch1: ; 204cc (8:44cc)
 	unknownnoise0x20 4, 255, 18
 	unknownnoise0x20 10, 241, 85
 	endchannel
-; 0x204d6
\ No newline at end of file
+; 0x204d6
diff --git a/audio/sfx/sfx_08_4d.asm b/audio/sfx/sfx_08_4d.asm
index da4fa223..90c2fe6c 100644..100755
--- a/audio/sfx/sfx_08_4d.asm
+++ b/audio/sfx/sfx_08_4d.asm
@@ -3,4 +3,4 @@ SFX_08_4d_Ch1: ; 204d6 (8:44d6)
 	unknownnoise0x20 8, 242, 53
 	unknownnoise0x20 10, 241, 85
 	endchannel
-; 0x204e0
\ No newline at end of file
+; 0x204e0
diff --git a/audio/sfx/sfx_08_4e.asm b/audio/sfx/sfx_08_4e.asm
index f371f7ee..172d245c 100644..100755
--- a/audio/sfx/sfx_08_4e.asm
+++ b/audio/sfx/sfx_08_4e.asm
@@ -2,4 +2,4 @@ SFX_08_4e_Ch1: ; 204e0 (8:44e0)
 	unknownnoise0x20 15, 159, 35
 	unknownnoise0x20 8, 241, 33
 	endchannel
-; 0x204e7
\ No newline at end of file
+; 0x204e7
diff --git a/audio/sfx/sfx_08_4f.asm b/audio/sfx/sfx_08_4f.asm
index 3200b9aa..d8f45c20 100644..100755
--- a/audio/sfx/sfx_08_4f.asm
+++ b/audio/sfx/sfx_08_4f.asm
@@ -4,4 +4,4 @@ SFX_08_4f_Ch1: ; 204e7 (8:44e7)
 	unknownnoise0x20 2, 225, 58
 	unknownnoise0x20 6, 241, 52
 	endchannel
-; 0x204f4
\ No newline at end of file
+; 0x204f4
diff --git a/audio/sfx/sfx_08_50.asm b/audio/sfx/sfx_08_50.asm
index 176da9c1..23b6d22c 100644..100755
--- a/audio/sfx/sfx_08_50.asm
+++ b/audio/sfx/sfx_08_50.asm
@@ -3,4 +3,4 @@ SFX_08_50_Ch1: ; 204f4 (8:44f4)
 	unknownnoise0x20 2, 244, 20
 	unknownnoise0x20 15, 241, 50
 	endchannel
-; 0x204fe
\ No newline at end of file
+; 0x204fe
diff --git a/audio/sfx/sfx_08_51.asm b/audio/sfx/sfx_08_51.asm
index 85cd06bb..d34a0d2b 100644..100755
--- a/audio/sfx/sfx_08_51.asm
+++ b/audio/sfx/sfx_08_51.asm
@@ -4,4 +4,4 @@ SFX_08_51_Ch1: ; 204fe (8:44fe)
 	unknownnoise0x20 8, 244, 34
 	unknownnoise0x20 15, 242, 33
 	endchannel
-; 0x2050b
\ No newline at end of file
+; 0x2050b
diff --git a/audio/sfx/sfx_08_52.asm b/audio/sfx/sfx_08_52.asm
index d5ca41b6..1ffbbd25 100644..100755
--- a/audio/sfx/sfx_08_52.asm
+++ b/audio/sfx/sfx_08_52.asm
@@ -4,4 +4,4 @@ SFX_08_52_Ch1: ; 2050b (8:450b)
 	unknownnoise0x20 6, 242, 35
 	loopchannel 4, SFX_08_52_Ch1
 	endchannel
-; 0x20519
\ No newline at end of file
+; 0x20519
diff --git a/audio/sfx/sfx_08_53.asm b/audio/sfx/sfx_08_53.asm
index 07215881..aae94ed9 100644..100755
--- a/audio/sfx/sfx_08_53.asm
+++ b/audio/sfx/sfx_08_53.asm
@@ -4,4 +4,4 @@ SFX_08_53_Ch1: ; 20519 (8:4519)
 	unknownnoise0x20 6, 242, 35
 	unknownnoise0x20 15, 242, 34
 	endchannel
-; 0x20526
\ No newline at end of file
+; 0x20526
diff --git a/audio/sfx/sfx_08_54.asm b/audio/sfx/sfx_08_54.asm
index 019cb3a1..92f84454 100644..100755
--- a/audio/sfx/sfx_08_54.asm
+++ b/audio/sfx/sfx_08_54.asm
@@ -4,4 +4,4 @@ SFX_08_54_Ch1: ; 20526 (8:4526)
 	unknownnoise0x20 8, 242, 84
 	unknownnoise0x20 8, 241, 101
 	endchannel
-; 0x20533
\ No newline at end of file
+; 0x20533
diff --git a/audio/sfx/sfx_08_55.asm b/audio/sfx/sfx_08_55.asm
index 93049b71..50b73f0d 100644..100755
--- a/audio/sfx/sfx_08_55.asm
+++ b/audio/sfx/sfx_08_55.asm
@@ -8,4 +8,4 @@ SFX_08_55_Ch1: ; 20533 (8:4533)
 	unknownnoise0x20 12, 145, 16
 	unknownnoise0x20 8, 242, 65
 	endchannel
-; 0x2054c
\ No newline at end of file
+; 0x2054c
diff --git a/audio/sfx/sfx_08_56.asm b/audio/sfx/sfx_08_56.asm
index 05d62e90..db106420 100644..100755
--- a/audio/sfx/sfx_08_56.asm
+++ b/audio/sfx/sfx_08_56.asm
@@ -3,4 +3,4 @@ SFX_08_56_Ch1: ; 2054c (8:454c)
 	unknownnoise0x20 1, 180, 34
 	unknownnoise0x20 8, 241, 68
 	endchannel
-; 0x20556
\ No newline at end of file
+; 0x20556
diff --git a/audio/sfx/sfx_08_57.asm b/audio/sfx/sfx_08_57.asm
index d8fa8880..d69c0e11 100644..100755
--- a/audio/sfx/sfx_08_57.asm
+++ b/audio/sfx/sfx_08_57.asm
@@ -4,4 +4,4 @@ SFX_08_57_Ch1: ; 20556 (8:4556)
 	unknownnoise0x20 4, 241, 68
 	unknownnoise0x20 8, 241, 85
 	endchannel
-; 0x20563
\ No newline at end of file
+; 0x20563
diff --git a/audio/sfx/sfx_08_58.asm b/audio/sfx/sfx_08_58.asm
index 66a07ba4..92a51d59 100644..100755
--- a/audio/sfx/sfx_08_58.asm
+++ b/audio/sfx/sfx_08_58.asm
@@ -2,4 +2,4 @@ SFX_08_58_Ch1: ; 20563 (8:4563)
 	unknownnoise0x20 4, 255, 85
 	unknownnoise0x20 8, 241, 101
 	endchannel
-; 0x2056a
\ No newline at end of file
+; 0x2056a
diff --git a/audio/sfx/sfx_08_59.asm b/audio/sfx/sfx_08_59.asm
index b67845d6..c8f67cc0 100644..100755
--- a/audio/sfx/sfx_08_59.asm
+++ b/audio/sfx/sfx_08_59.asm
@@ -3,4 +3,4 @@ SFX_08_59_Ch1: ; 2056a (8:456a)
 	unknownnoise0x20 2, 196, 34
 	unknownnoise0x20 8, 242, 52
 	endchannel
-; 0x20574
\ No newline at end of file
+; 0x20574
diff --git a/audio/sfx/sfx_08_5a.asm b/audio/sfx/sfx_08_5a.asm
index 6d9994ab..788ac25e 100644..100755
--- a/audio/sfx/sfx_08_5a.asm
+++ b/audio/sfx/sfx_08_5a.asm
@@ -2,4 +2,4 @@ SFX_08_5a_Ch1: ; 20574 (8:4574)
 	unknownnoise0x20 4, 241, 52
 	unknownnoise0x20 15, 242, 100
 	endchannel
-; 0x2057b
\ No newline at end of file
+; 0x2057b
diff --git a/audio/sfx/sfx_08_5b.asm b/audio/sfx/sfx_08_5b.asm
index 2a1cc2fa..31a58537 100644..100755
--- a/audio/sfx/sfx_08_5b.asm
+++ b/audio/sfx/sfx_08_5b.asm
@@ -2,4 +2,4 @@ SFX_08_5b_Ch1: ; 2057b (8:457b)
 	unknownnoise0x20 2, 241, 34
 	unknownnoise0x20 15, 242, 18
 	endchannel
-; 0x20582
\ No newline at end of file
+; 0x20582
diff --git a/audio/sfx/sfx_08_5c.asm b/audio/sfx/sfx_08_5c.asm
index f395fa7e..f14c9aab 100644..100755
--- a/audio/sfx/sfx_08_5c.asm
+++ b/audio/sfx/sfx_08_5c.asm
@@ -3,4 +3,4 @@ SFX_08_5c_Ch1: ; 20582 (8:4582)
 	unknownnoise0x20 15, 244, 1
 	unknownnoise0x20 15, 242, 1
 	endchannel
-; 0x2058c
\ No newline at end of file
+; 0x2058c
diff --git a/audio/sfx/sfx_08_5d.asm b/audio/sfx/sfx_08_5d.asm
index 2b54b1b9..c973dcf6 100644..100755
--- a/audio/sfx/sfx_08_5d.asm
+++ b/audio/sfx/sfx_08_5d.asm
@@ -2,4 +2,4 @@ SFX_08_5d_Ch1: ; 2058c (8:458c)
 	unknownnoise0x20 8, 241, 50
 	unknownnoise0x20 8, 241, 51
 	endchannel
-; 0x20593
\ No newline at end of file
+; 0x20593
diff --git a/audio/sfx/sfx_08_5e.asm b/audio/sfx/sfx_08_5e.asm
index 24159908..366a6410 100644..100755
--- a/audio/sfx/sfx_08_5e.asm
+++ b/audio/sfx/sfx_08_5e.asm
@@ -14,4 +14,4 @@ SFX_08_5e_Ch2: ; 205a4 (8:45a4)
 	unknownnoise0x20 0, 209, 34
 	unknownnoise0x20 6, 161, 50
 	endchannel
-; 0x205b1
\ No newline at end of file
+; 0x205b1
diff --git a/audio/sfx/sfx_08_5f.asm b/audio/sfx/sfx_08_5f.asm
index b8084264..cd5da5a0 100644..100755
--- a/audio/sfx/sfx_08_5f.asm
+++ b/audio/sfx/sfx_08_5f.asm
@@ -4,4 +4,4 @@ SFX_08_5f_Ch1: ; 205b1 (8:45b1)
 	unknownnoise0x20 3, 194, 51
 	unknownnoise0x20 8, 241, 84
 	endchannel
-; 0x205be
\ No newline at end of file
+; 0x205be
diff --git a/audio/sfx/sfx_08_60.asm b/audio/sfx/sfx_08_60.asm
index fcf2bb8b..a1ae9cdb 100644..100755
--- a/audio/sfx/sfx_08_60.asm
+++ b/audio/sfx/sfx_08_60.asm
@@ -2,4 +2,4 @@ SFX_08_60_Ch1: ; 205be (8:45be)
 	unknownnoise0x20 12, 241, 84
 	unknownnoise0x20 8, 241, 100
 	endchannel
-; 0x205c5
\ No newline at end of file
+; 0x205c5
diff --git a/audio/sfx/sfx_08_61.asm b/audio/sfx/sfx_08_61.asm
index 39c12c1e..c930fed6 100644..100755
--- a/audio/sfx/sfx_08_61.asm
+++ b/audio/sfx/sfx_08_61.asm
@@ -5,4 +5,4 @@ SFX_08_61_Ch1: ; 205c5 (8:45c5)
 	unknownnoise0x20 15, 130, 50
 	unknownnoise0x20 8, 241, 52
 	endchannel
-; 0x205d5
\ No newline at end of file
+; 0x205d5
diff --git a/audio/sfx/sfx_08_62.asm b/audio/sfx/sfx_08_62.asm
index 13f4b95a..62f178fb 100644..100755
--- a/audio/sfx/sfx_08_62.asm
+++ b/audio/sfx/sfx_08_62.asm
@@ -2,4 +2,4 @@ SFX_08_62_Ch1: ; 205d5 (8:45d5)
 	unknownnoise0x20 2, 210, 50
 	unknownnoise0x20 15, 242, 67
 	endchannel
-; 0x205dc
\ No newline at end of file
+; 0x205dc
diff --git a/audio/sfx/sfx_08_63.asm b/audio/sfx/sfx_08_63.asm
index bd5b9e2f..a69c6976 100644..100755
--- a/audio/sfx/sfx_08_63.asm
+++ b/audio/sfx/sfx_08_63.asm
@@ -5,4 +5,4 @@ SFX_08_63_Ch1: ; 205dc (8:45dc)
 	unknownnoise0x20 7, 100, 0
 	unknownnoise0x20 15, 242, 85
 	endchannel
-; 0x205ec
\ No newline at end of file
+; 0x205ec
diff --git a/audio/sfx/sfx_08_64.asm b/audio/sfx/sfx_08_64.asm
index b615919f..ad463435 100644..100755
--- a/audio/sfx/sfx_08_64.asm
+++ b/audio/sfx/sfx_08_64.asm
@@ -10,4 +10,4 @@ SFX_08_64_Ch2: ; 205f7 (8:45f7)
 	unknownnoise0x20 15, 63, 34
 	unknownnoise0x20 15, 242, 33
 	endchannel
-; 0x205fe
\ No newline at end of file
+; 0x205fe
diff --git a/audio/sfx/sfx_08_65.asm b/audio/sfx/sfx_08_65.asm
index e0368e06..2e2faa15 100644..100755
--- a/audio/sfx/sfx_08_65.asm
+++ b/audio/sfx/sfx_08_65.asm
@@ -5,4 +5,4 @@ SFX_08_65_Ch1: ; 205fe (8:45fe)
 	unknownnoise0x20 8, 242, 66
 	unknownnoise0x20 15, 242, 65
 	endchannel
-; 0x2060e
\ No newline at end of file
+; 0x2060e
diff --git a/audio/sfx/sfx_08_66.asm b/audio/sfx/sfx_08_66.asm
index 07f1ab05..03e351e7 100644..100755
--- a/audio/sfx/sfx_08_66.asm
+++ b/audio/sfx/sfx_08_66.asm
@@ -7,4 +7,4 @@ SFX_08_66_Ch1: ; 2060e (8:460e)
 	unknownnoise0x20 8, 255, 84
 	unknownnoise0x20 15, 242, 84
 	endchannel
-; 0x20624
\ No newline at end of file
+; 0x20624
diff --git a/audio/sfx/sfx_08_67.asm b/audio/sfx/sfx_08_67.asm
index aa327873..89a5cbc7 100644..100755
--- a/audio/sfx/sfx_08_67.asm
+++ b/audio/sfx/sfx_08_67.asm
@@ -25,4 +25,4 @@ SFX_08_67_Ch3: ; 2064a (8:464a)
 	unknownnoise0x20 3, 161, 17
 	loopchannel 10, SFX_08_67_Ch3
 	endchannel
-; 0x20655
\ No newline at end of file
+; 0x20655
diff --git a/audio/sfx/sfx_08_68.asm b/audio/sfx/sfx_08_68.asm
index efa46f92..e0fd06c5 100644..100755
--- a/audio/sfx/sfx_08_68.asm
+++ b/audio/sfx/sfx_08_68.asm
@@ -19,4 +19,4 @@ SFX_08_68_Ch3: ; 20673 (8:4673)
 	unknownnoise0x20 1, 209, 41
 	loopchannel 6, SFX_08_68_Ch3
 	endchannel
-; 0x2067e
\ No newline at end of file
+; 0x2067e
diff --git a/audio/sfx/sfx_08_69.asm b/audio/sfx/sfx_08_69.asm
index 26395cfa..7e1bafae 100644..100755
--- a/audio/sfx/sfx_08_69.asm
+++ b/audio/sfx/sfx_08_69.asm
@@ -16,4 +16,4 @@ SFX_08_69_Ch2: ; 20695 (8:4695)
 	unknownnoise0x20 12, 245, 156
 	unknownnoise0x20 15, 244, 172
 	endchannel
-; 0x206a9
\ No newline at end of file
+; 0x206a9
diff --git a/audio/sfx/sfx_08_6a.asm b/audio/sfx/sfx_08_6a.asm
index efe39d5d..f38948a4 100644..100755
--- a/audio/sfx/sfx_08_6a.asm
+++ b/audio/sfx/sfx_08_6a.asm
@@ -26,4 +26,4 @@ SFX_08_6a_Ch3: ; 206db (8:46db)
 	unknownnoise0x20 15, 195, 50
 	loopchannel 2, SFX_08_6a_Ch3
 	endchannel
-; 0x206ec
\ No newline at end of file
+; 0x206ec
diff --git a/audio/sfx/sfx_08_6b.asm b/audio/sfx/sfx_08_6b.asm
index d0491d28..85226308 100644..100755
--- a/audio/sfx/sfx_08_6b.asm
+++ b/audio/sfx/sfx_08_6b.asm
@@ -19,4 +19,4 @@ SFX_08_6b_Ch2: ; 2070b (8:470b)
 	loopchannel 5, SFX_08_6b_Ch2
 	unknownnoise0x20 8, 129, 18
 	endchannel
-; 0x20722
\ No newline at end of file
+; 0x20722
diff --git a/audio/sfx/sfx_08_6c.asm b/audio/sfx/sfx_08_6c.asm
index c9a020cd..93821db5 100644..100755
--- a/audio/sfx/sfx_08_6c.asm
+++ b/audio/sfx/sfx_08_6c.asm
@@ -23,4 +23,4 @@ SFX_08_6c_Ch3: ; 20748 (8:4748)
 	unknownnoise0x20 15, 244, 65
 	loopchannel 3, SFX_08_6c_Ch3
 	endchannel
-; 0x20759
\ No newline at end of file
+; 0x20759
diff --git a/audio/sfx/sfx_08_6d.asm b/audio/sfx/sfx_08_6d.asm
index 6e94d9eb..7693df84 100644..100755
--- a/audio/sfx/sfx_08_6d.asm
+++ b/audio/sfx/sfx_08_6d.asm
@@ -23,4 +23,4 @@ SFX_08_6d_Ch3: ; 20787 (8:4787)
 	unknownnoise0x20 2, 210, 42
 	loopchannel 21, SFX_08_6d_Ch3
 	endchannel
-; 0x20792
\ No newline at end of file
+; 0x20792
diff --git a/audio/sfx/sfx_08_6e.asm b/audio/sfx/sfx_08_6e.asm
index 3f0a40d5..6a5749c9 100644..100755
--- a/audio/sfx/sfx_08_6e.asm
+++ b/audio/sfx/sfx_08_6e.asm
@@ -25,4 +25,4 @@ SFX_08_6e_Ch3: ; 207c0 (8:47c0)
 	unknownnoise0x20 5, 210, 18
 	loopchannel 9, SFX_08_6e_Ch3
 	endchannel
-; 0x207d1
\ No newline at end of file
+; 0x207d1
diff --git a/audio/sfx/sfx_08_6f.asm b/audio/sfx/sfx_08_6f.asm
index bb5ca6e8..c233fd90 100644..100755
--- a/audio/sfx/sfx_08_6f.asm
+++ b/audio/sfx/sfx_08_6f.asm
@@ -19,4 +19,4 @@ SFX_08_6f_Ch3: ; 207ef (8:47ef)
 	unknownnoise0x20 4, 242, 68
 	loopchannel 9, SFX_08_6f_Ch3
 	endchannel
-; 0x207fa
\ No newline at end of file
+; 0x207fa
diff --git a/audio/sfx/sfx_08_70.asm b/audio/sfx/sfx_08_70.asm
index 01c90d9a..9ac504ff 100644..100755
--- a/audio/sfx/sfx_08_70.asm
+++ b/audio/sfx/sfx_08_70.asm
@@ -30,4 +30,4 @@ SFX_08_70_Ch3: ; 20834 (8:4834)
 	unknownnoise0x20 15, 207, 16
 	unknownnoise0x20 15, 194, 16
 	endchannel
-; 0x20847
\ No newline at end of file
+; 0x20847
diff --git a/audio/sfx/sfx_08_71.asm b/audio/sfx/sfx_08_71.asm
index a594e0be..92a81006 100644..100755
--- a/audio/sfx/sfx_08_71.asm
+++ b/audio/sfx/sfx_08_71.asm
@@ -16,4 +16,4 @@ SFX_08_71_Ch2: ; 2085e (8:485e)
 	unknownsfx0x20 15, 255, 225, 7
 	unknownsfx0x20 15, 242, 226, 7
 	endchannel
-; 0x20875
\ No newline at end of file
+; 0x20875
diff --git a/audio/sfx/sfx_08_72.asm b/audio/sfx/sfx_08_72.asm
index cfd83636..ba307ca0 100644..100755
--- a/audio/sfx/sfx_08_72.asm
+++ b/audio/sfx/sfx_08_72.asm
@@ -10,4 +10,4 @@ SFX_08_72_Ch2: ; 20880 (8:4880)
 	duty 3
 	unknownsfx0x20 8, 241, 1, 7
 	endchannel
-; 0x20887
\ No newline at end of file
+; 0x20887
diff --git a/audio/sfx/sfx_08_73.asm b/audio/sfx/sfx_08_73.asm
index 6097a9cb..c1b189fc 100644..100755
--- a/audio/sfx/sfx_08_73.asm
+++ b/audio/sfx/sfx_08_73.asm
@@ -16,4 +16,4 @@ SFX_08_73_Ch2: ; 2089e (8:489e)
 	unknownsfx0x20 6, 225, 144, 6
 	unknownsfx0x20 8, 225, 16, 7
 	endchannel
-; 0x208b5
\ No newline at end of file
+; 0x208b5
diff --git a/audio/sfx/sfx_08_74.asm b/audio/sfx/sfx_08_74.asm
index ed322dcb..37332169 100644..100755
--- a/audio/sfx/sfx_08_74.asm
+++ b/audio/sfx/sfx_08_74.asm
@@ -20,4 +20,4 @@ SFX_08_74_Ch3: ; 208d3 (8:48d3)
 	unknownnoise0x20 15, 255, 85
 	unknownnoise0x20 15, 243, 86
 	endchannel
-; 0x208e0
\ No newline at end of file
+; 0x208e0
diff --git a/audio/sfx/sfx_08_75.asm b/audio/sfx/sfx_08_75.asm
index 0a25cb45..f1513d04 100644..100755
--- a/audio/sfx/sfx_08_75.asm
+++ b/audio/sfx/sfx_08_75.asm
@@ -27,4 +27,4 @@ SFX_08_75_Ch2: ; 208f0 (8:48f0)
 	octave 5
 	G# 8
 	endchannel
-; 0x20902
\ No newline at end of file
+; 0x20902
diff --git a/audio/sfx/sfx_08_76.asm b/audio/sfx/sfx_08_76.asm
index 7a1891ae..1318b1e2 100644..100755
--- a/audio/sfx/sfx_08_76.asm
+++ b/audio/sfx/sfx_08_76.asm
@@ -45,4 +45,4 @@ SFX_08_76_Ch3: ; 20980 (8:4980)
 	unknownnoise0x20 1, 209, 41
 	loopchannel 26, SFX_08_76_Ch3
 	endchannel
-; 0x2098b
\ No newline at end of file
+; 0x2098b
diff --git a/audio/sfx/sfx_08_77.asm b/audio/sfx/sfx_08_77.asm
index 84def9b8..54a0aa3b 100644..100755
--- a/audio/sfx/sfx_08_77.asm
+++ b/audio/sfx/sfx_08_77.asm
@@ -7,4 +7,4 @@ SFX_08_77_Ch1: ; 20412 (8:4412)
 	unknownsfx0x20 10, 225, 224, 7
 	unknownsfx0x20 1, 0, 0, 0
 	endchannel
-; 0x2042d
\ No newline at end of file
+; 0x2042d
diff --git a/audio/sfx/sfx_08_pokeflute.asm b/audio/sfx/sfx_08_pokeflute.asm
index 103e2d56..4c015e73 100755
--- a/audio/sfx/sfx_08_pokeflute.asm
+++ b/audio/sfx/sfx_08_pokeflute.asm
@@ -12,4 +12,4 @@ SFX_08_PokeFlute_Ch2: ; 22325 (8:6325)
 	rest 5
 	rest 5
 	endchannel
-; 0x2232f
\ No newline at end of file
+; 0x2232f
diff --git a/audio/sfx/sfx_08_pokeflute_ch3.asm b/audio/sfx/sfx_08_pokeflute_ch3.asm
index cf3f32a7..e0060d7f 100755
--- a/audio/sfx/sfx_08_pokeflute_ch3.asm
+++ b/audio/sfx/sfx_08_pokeflute_ch3.asm
@@ -11,4 +11,4 @@ SFX_08_PokeFlute_Ch3: ; 2049b (8:449b)
 	octave 6
 	C_ 13
 	endchannel
-; 0x204aa
\ No newline at end of file
+; 0x204aa
diff --git a/audio/sfx/sfx_08_unused.asm b/audio/sfx/sfx_08_unused.asm
index 4ba4c212..857502d3 100755
--- a/audio/sfx/sfx_08_unused.asm
+++ b/audio/sfx/sfx_08_unused.asm
@@ -29,4 +29,4 @@ SFX_08_unused_Ch3: ; 209c1 (8:49c1)
 	unknownnoise0x20 12, 125, 76
 	unknownnoise0x20 15, 211, 76
 	endchannel
-; 0x209d7
\ No newline at end of file
+; 0x209d7
diff --git a/audio/sfx/sfx_08_unused2.asm b/audio/sfx/sfx_08_unused2.asm
index 0bfe4dd3..e69ec72d 100755
--- a/audio/sfx/sfx_08_unused2.asm
+++ b/audio/sfx/sfx_08_unused2.asm
@@ -54,4 +54,4 @@ SFX_08_unused2_Ch3: ; 22359 (8:6359)
 	B_ 4
 	rest 4
 	endchannel
-; 0x22370
\ No newline at end of file
+; 0x22370
diff --git a/audio/sfx/sfx_1f_01.asm b/audio/sfx/sfx_1f_01.asm
index e7a40492..dec8baa6 100644..100755
--- a/audio/sfx/sfx_1f_01.asm
+++ b/audio/sfx/sfx_1f_01.asm
@@ -1,4 +1,4 @@
 SFX_1f_01_Ch1: ; 7c2fd (1f:42fd)
 	unknownnoise0x20 0, 193, 51
 	endchannel
-; 0x7c301
\ No newline at end of file
+; 0x7c301
diff --git a/audio/sfx/sfx_1f_02.asm b/audio/sfx/sfx_1f_02.asm
index bb95fe0b..d383abed 100644..100755
--- a/audio/sfx/sfx_1f_02.asm
+++ b/audio/sfx/sfx_1f_02.asm
@@ -1,4 +1,4 @@
 SFX_1f_02_Ch1: ; 7c301 (1f:4301)
 	unknownnoise0x20 0, 177, 51
 	endchannel
-; 0x7c305
\ No newline at end of file
+; 0x7c305
diff --git a/audio/sfx/sfx_1f_03.asm b/audio/sfx/sfx_1f_03.asm
index 3d6fa66a..57e18697 100644..100755
--- a/audio/sfx/sfx_1f_03.asm
+++ b/audio/sfx/sfx_1f_03.asm
@@ -1,4 +1,4 @@
 SFX_1f_03_Ch1: ; 7c305 (1f:4305)
 	unknownnoise0x20 0, 161, 51
 	endchannel
-; 0x7c309
\ No newline at end of file
+; 0x7c309
diff --git a/audio/sfx/sfx_1f_04.asm b/audio/sfx/sfx_1f_04.asm
index 3d73e1a3..587d9f22 100644..100755
--- a/audio/sfx/sfx_1f_04.asm
+++ b/audio/sfx/sfx_1f_04.asm
@@ -1,4 +1,4 @@
 SFX_1f_04_Ch1: ; 7c309 (1f:4309)
 	unknownnoise0x20 0, 129, 51
 	endchannel
-; 0x7c30d
\ No newline at end of file
+; 0x7c30d
diff --git a/audio/sfx/sfx_1f_05.asm b/audio/sfx/sfx_1f_05.asm
index 3db77f2e..1edcdf20 100644..100755
--- a/audio/sfx/sfx_1f_05.asm
+++ b/audio/sfx/sfx_1f_05.asm
@@ -6,4 +6,4 @@ SFX_1f_05_Ch1: ; 7c30d (1f:430d)
 	unknownnoise0x20 3, 130, 51
 	unknownnoise0x20 2, 129, 50
 	endchannel
-; 0x7c320
\ No newline at end of file
+; 0x7c320
diff --git a/audio/sfx/sfx_1f_06.asm b/audio/sfx/sfx_1f_06.asm
index 1d6c85cf..0470795c 100644..100755
--- a/audio/sfx/sfx_1f_06.asm
+++ b/audio/sfx/sfx_1f_06.asm
@@ -1,4 +1,4 @@
 SFX_1f_06_Ch1: ; 7c320 (1f:4320)
 	unknownnoise0x20 0, 81, 42
 	endchannel
-; 0x7c324
\ No newline at end of file
+; 0x7c324
diff --git a/audio/sfx/sfx_1f_07.asm b/audio/sfx/sfx_1f_07.asm
index 69982127..0471d63a 100644..100755
--- a/audio/sfx/sfx_1f_07.asm
+++ b/audio/sfx/sfx_1f_07.asm
@@ -2,4 +2,4 @@ SFX_1f_07_Ch1: ; 7c324 (1f:4324)
 	unknownnoise0x20 1, 65, 43
 	unknownnoise0x20 0, 97, 42
 	endchannel
-; 0x7c32b
\ No newline at end of file
+; 0x7c32b
diff --git a/audio/sfx/sfx_1f_08.asm b/audio/sfx/sfx_1f_08.asm
index 8798fc9b..94c0e10d 100644..100755
--- a/audio/sfx/sfx_1f_08.asm
+++ b/audio/sfx/sfx_1f_08.asm
@@ -1,4 +1,4 @@
 SFX_1f_08_Ch1: ; 7c32b (1f:432b)
 	unknownnoise0x20 0, 129, 16
 	endchannel
-; 0x7c32f
\ No newline at end of file
+; 0x7c32f
diff --git a/audio/sfx/sfx_1f_09.asm b/audio/sfx/sfx_1f_09.asm
index ef7a87bc..4a9216e9 100644..100755
--- a/audio/sfx/sfx_1f_09.asm
+++ b/audio/sfx/sfx_1f_09.asm
@@ -1,4 +1,4 @@
 SFX_1f_09_Ch1: ; 7c32f (1f:432f)
 	unknownnoise0x20 0, 130, 35
 	endchannel
-; 0x7c333
\ No newline at end of file
+; 0x7c333
diff --git a/audio/sfx/sfx_1f_0a.asm b/audio/sfx/sfx_1f_0a.asm
index 4b3ffa3e..b3c618ca 100644..100755
--- a/audio/sfx/sfx_1f_0a.asm
+++ b/audio/sfx/sfx_1f_0a.asm
@@ -1,4 +1,4 @@
 SFX_1f_0a_Ch1: ; 7c333 (1f:4333)
 	unknownnoise0x20 0, 130, 37
 	endchannel
-; 0x7c337
\ No newline at end of file
+; 0x7c337
diff --git a/audio/sfx/sfx_1f_0b.asm b/audio/sfx/sfx_1f_0b.asm
index a7f558fd..5d21ffb8 100644..100755
--- a/audio/sfx/sfx_1f_0b.asm
+++ b/audio/sfx/sfx_1f_0b.asm
@@ -1,4 +1,4 @@
 SFX_1f_0b_Ch1: ; 7c337 (1f:4337)
 	unknownnoise0x20 0, 130, 38
 	endchannel
-; 0x7c33b
\ No newline at end of file
+; 0x7c33b
diff --git a/audio/sfx/sfx_1f_0c.asm b/audio/sfx/sfx_1f_0c.asm
index 50d7d56f..82cba9c0 100644..100755
--- a/audio/sfx/sfx_1f_0c.asm
+++ b/audio/sfx/sfx_1f_0c.asm
@@ -1,4 +1,4 @@
 SFX_1f_0c_Ch1: ; 7c33b (1f:433b)
 	unknownnoise0x20 0, 161, 16
 	endchannel
-; 0x7c33f
\ No newline at end of file
+; 0x7c33f
diff --git a/audio/sfx/sfx_1f_0d.asm b/audio/sfx/sfx_1f_0d.asm
index b329482b..b7d6ca2f 100644..100755
--- a/audio/sfx/sfx_1f_0d.asm
+++ b/audio/sfx/sfx_1f_0d.asm
@@ -1,4 +1,4 @@
 SFX_1f_0d_Ch1: ; 7c33f (1f:433f)
 	unknownnoise0x20 0, 162, 17
 	endchannel
-; 0x7c343
\ No newline at end of file
+; 0x7c343
diff --git a/audio/sfx/sfx_1f_0e.asm b/audio/sfx/sfx_1f_0e.asm
index 7b36809b..397d78b1 100644..100755
--- a/audio/sfx/sfx_1f_0e.asm
+++ b/audio/sfx/sfx_1f_0e.asm
@@ -1,4 +1,4 @@
 SFX_1f_0e_Ch1: ; 7c343 (1f:4343)
 	unknownnoise0x20 0, 162, 80
 	endchannel
-; 0x7c347
\ No newline at end of file
+; 0x7c347
diff --git a/audio/sfx/sfx_1f_0f.asm b/audio/sfx/sfx_1f_0f.asm
index f8e11b6d..c9cdaac4 100644..100755
--- a/audio/sfx/sfx_1f_0f.asm
+++ b/audio/sfx/sfx_1f_0f.asm
@@ -2,4 +2,4 @@ SFX_1f_0f_Ch1: ; 7c347 (1f:4347)
 	unknownnoise0x20 0, 161, 24
 	unknownnoise0x20 0, 49, 51
 	endchannel
-; 0x7c34e
\ No newline at end of file
+; 0x7c34e
diff --git a/audio/sfx/sfx_1f_10.asm b/audio/sfx/sfx_1f_10.asm
index 049d47a8..34bd5cd2 100644..100755
--- a/audio/sfx/sfx_1f_10.asm
+++ b/audio/sfx/sfx_1f_10.asm
@@ -2,4 +2,4 @@ SFX_1f_10_Ch1: ; 7c34e (1f:434e)
 	unknownnoise0x20 2, 145, 40
 	unknownnoise0x20 0, 113, 24
 	endchannel
-; 0x7c355
\ No newline at end of file
+; 0x7c355
diff --git a/audio/sfx/sfx_1f_11.asm b/audio/sfx/sfx_1f_11.asm
index 503396fb..b0fe8073 100644..100755
--- a/audio/sfx/sfx_1f_11.asm
+++ b/audio/sfx/sfx_1f_11.asm
@@ -1,4 +1,4 @@
 SFX_1f_11_Ch1: ; 7c355 (1f:4355)
 	unknownnoise0x20 0, 145, 34
 	endchannel
-; 0x7c359
\ No newline at end of file
+; 0x7c359
diff --git a/audio/sfx/sfx_1f_12.asm b/audio/sfx/sfx_1f_12.asm
index 344281f5..8fc78082 100644..100755
--- a/audio/sfx/sfx_1f_12.asm
+++ b/audio/sfx/sfx_1f_12.asm
@@ -1,4 +1,4 @@
 SFX_1f_12_Ch1: ; 7c359 (1f:4359)
 	unknownnoise0x20 0, 113, 34
 	endchannel
-; 0x7c35d
\ No newline at end of file
+; 0x7c35d
diff --git a/audio/sfx/sfx_1f_13.asm b/audio/sfx/sfx_1f_13.asm
index 2eab2643..831d50c4 100644..100755
--- a/audio/sfx/sfx_1f_13.asm
+++ b/audio/sfx/sfx_1f_13.asm
@@ -1,4 +1,4 @@
 SFX_1f_13_Ch1: ; 7c35d (1f:435d)
 	unknownnoise0x20 0, 97, 34
 	endchannel
-; 0x7c361
\ No newline at end of file
+; 0x7c361
diff --git a/audio/sfx/sfx_1f_14.asm b/audio/sfx/sfx_1f_14.asm
index 373bb2c3..a1c24136 100644..100755
--- a/audio/sfx/sfx_1f_14.asm
+++ b/audio/sfx/sfx_1f_14.asm
@@ -19,4 +19,4 @@ SFX_1f_14_Ch3: ; 7ca1a (1f:4a1a)
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 8, 129, 28
 	endchannel
-; 0x7ca24
\ No newline at end of file
+; 0x7ca24
diff --git a/audio/sfx/sfx_1f_15.asm b/audio/sfx/sfx_1f_15.asm
index b3edbdbd..3f42e339 100644..100755
--- a/audio/sfx/sfx_1f_15.asm
+++ b/audio/sfx/sfx_1f_15.asm
@@ -22,4 +22,4 @@ SFX_1f_15_Ch3: ; 7cc32 (1f:4c32)
 	unknownnoise0x20 3, 130, 28
 	unknownnoise0x20 8, 113, 44
 	endchannel
-; 0x7cc3f
\ No newline at end of file
+; 0x7cc3f
diff --git a/audio/sfx/sfx_1f_16.asm b/audio/sfx/sfx_1f_16.asm
index 7c2346fb..a9f0e332 100644..100755
--- a/audio/sfx/sfx_1f_16.asm
+++ b/audio/sfx/sfx_1f_16.asm
@@ -15,4 +15,4 @@ SFX_1f_16_Ch2: ; 7cb90 (1f:4b90)
 
 SFX_1f_16_Ch3: ; 7cb9e (1f:4b9e)
 	endchannel
-; 0x7cb9f
\ No newline at end of file
+; 0x7cb9f
diff --git a/audio/sfx/sfx_1f_17.asm b/audio/sfx/sfx_1f_17.asm
index bfda0fe3..f0f15f40 100644..100755
--- a/audio/sfx/sfx_1f_17.asm
+++ b/audio/sfx/sfx_1f_17.asm
@@ -28,4 +28,4 @@ SFX_1f_17_Ch3: ; 7c959 (1f:4959)
 	unknownnoise0x20 12, 182, 76
 	unknownnoise0x20 15, 162, 92
 	endchannel
-; 0x7c966
\ No newline at end of file
+; 0x7c966
diff --git a/audio/sfx/sfx_1f_18.asm b/audio/sfx/sfx_1f_18.asm
index 7e532f3e..4496dd9a 100644..100755
--- a/audio/sfx/sfx_1f_18.asm
+++ b/audio/sfx/sfx_1f_18.asm
@@ -30,4 +30,4 @@ SFX_1f_18_Ch3: ; 7cd08 (1f:4d08)
 	unknownnoise0x20 7, 195, 76
 	unknownnoise0x20 8, 161, 92
 	endchannel
-; 0x7cd1b
\ No newline at end of file
+; 0x7cd1b
diff --git a/audio/sfx/sfx_1f_19.asm b/audio/sfx/sfx_1f_19.asm
index c9609be5..0398340e 100644..100755
--- a/audio/sfx/sfx_1f_19.asm
+++ b/audio/sfx/sfx_1f_19.asm
@@ -17,4 +17,4 @@ SFX_1f_19_Ch2: ; 7cabd (1f:4abd)
 
 SFX_1f_19_Ch3: ; 7cacf (1f:4acf)
 	endchannel
-; 0x7cad0
\ No newline at end of file
+; 0x7cad0
diff --git a/audio/sfx/sfx_1f_1a.asm b/audio/sfx/sfx_1f_1a.asm
index 2498f122..8fca97df 100644..100755
--- a/audio/sfx/sfx_1f_1a.asm
+++ b/audio/sfx/sfx_1f_1a.asm
@@ -20,4 +20,4 @@ SFX_1f_1a_Ch3: ; 7ca6f (1f:4a6f)
 	unknownnoise0x20 15, 215, 156
 	unknownnoise0x20 15, 242, 172
 	endchannel
-; 0x7ca82
\ No newline at end of file
+; 0x7ca82
diff --git a/audio/sfx/sfx_1f_1b.asm b/audio/sfx/sfx_1f_1b.asm
index df3167b1..307e7b43 100644..100755
--- a/audio/sfx/sfx_1f_1b.asm
+++ b/audio/sfx/sfx_1f_1b.asm
@@ -19,4 +19,4 @@ SFX_1f_1b_Ch3: ; 7caa0 (1f:4aa0)
 	unknownnoise0x20 15, 230, 76
 	unknownnoise0x20 8, 177, 92
 	endchannel
-; 0x7caaa
\ No newline at end of file
+; 0x7caaa
diff --git a/audio/sfx/sfx_1f_1c.asm b/audio/sfx/sfx_1f_1c.asm
index 4e7ac177..3767953d 100644..100755
--- a/audio/sfx/sfx_1f_1c.asm
+++ b/audio/sfx/sfx_1f_1c.asm
@@ -21,4 +21,4 @@ SFX_1f_1c_Ch3: ; 7ccc0 (1f:4cc0)
 	unknownnoise0x20 11, 215, 92
 	unknownnoise0x20 15, 194, 76
 	endchannel
-; 0x7ccca
\ No newline at end of file
+; 0x7ccca
diff --git a/audio/sfx/sfx_1f_1d.asm b/audio/sfx/sfx_1f_1d.asm
index 703b55d5..c631f556 100644..100755
--- a/audio/sfx/sfx_1f_1d.asm
+++ b/audio/sfx/sfx_1f_1d.asm
@@ -33,4 +33,4 @@ SFX_1f_1d_Ch3: ; 7c7e2 (1f:47e2)
 	unknownnoise0x20 6, 212, 61
 	unknownnoise0x20 8, 193, 59
 	endchannel
-; 0x7c7fb
\ No newline at end of file
+; 0x7c7fb
diff --git a/audio/sfx/sfx_1f_1e.asm b/audio/sfx/sfx_1f_1e.asm
index 4733a534..f9df4ca3 100644..100755
--- a/audio/sfx/sfx_1f_1e.asm
+++ b/audio/sfx/sfx_1f_1e.asm
@@ -33,4 +33,4 @@ SFX_1f_1e_Ch3: ; 7cc81 (1f:4c81)
 	unknownnoise0x20 3, 164, 44
 	unknownnoise0x20 8, 145, 60
 	endchannel
-; 0x7cc9a
\ No newline at end of file
+; 0x7cc9a
diff --git a/audio/sfx/sfx_1f_1f.asm b/audio/sfx/sfx_1f_1f.asm
index 9188186b..1466c684 100644..100755
--- a/audio/sfx/sfx_1f_1f.asm
+++ b/audio/sfx/sfx_1f_1f.asm
@@ -35,4 +35,4 @@ SFX_1f_1f_Ch3: ; 7cb1a (1f:4b1a)
 	unknownnoise0x20 4, 193, 44
 	unknownnoise0x20 8, 161, 76
 	endchannel
-; 0x7cb33
\ No newline at end of file
+; 0x7cb33
diff --git a/audio/sfx/sfx_1f_20.asm b/audio/sfx/sfx_1f_20.asm
index 2d0b1fc6..68eb568c 100644..100755
--- a/audio/sfx/sfx_1f_20.asm
+++ b/audio/sfx/sfx_1f_20.asm
@@ -27,4 +27,4 @@ SFX_1f_20_Ch2: ; 7cb5a (1f:4b5a)
 
 SFX_1f_20_Ch3: ; 7cb80 (1f:4b80)
 	endchannel
-; 0x7cb81
\ No newline at end of file
+; 0x7cb81
diff --git a/audio/sfx/sfx_1f_21.asm b/audio/sfx/sfx_1f_21.asm
index 31c600b0..d37e2940 100644..100755
--- a/audio/sfx/sfx_1f_21.asm
+++ b/audio/sfx/sfx_1f_21.asm
@@ -38,4 +38,4 @@ SFX_1f_21_Ch3: ; 7cbed (1f:4bed)
 	unknownnoise0x20 9, 194, 44
 	unknownnoise0x20 4, 161, 60
 	endchannel
-; 0x7cc0c
\ No newline at end of file
+; 0x7cc0c
diff --git a/audio/sfx/sfx_1f_22.asm b/audio/sfx/sfx_1f_22.asm
index a239822f..f765ed15 100644..100755
--- a/audio/sfx/sfx_1f_22.asm
+++ b/audio/sfx/sfx_1f_22.asm
@@ -21,4 +21,4 @@ SFX_1f_22_Ch3: ; 7ca4a (1f:4a4a)
 	unknownnoise0x20 2, 97, 33
 	unknownnoise0x20 8, 97, 17
 	endchannel
-; 0x7ca54
\ No newline at end of file
+; 0x7ca54
diff --git a/audio/sfx/sfx_1f_23.asm b/audio/sfx/sfx_1f_23.asm
index dd021169..76151d7e 100644..100755
--- a/audio/sfx/sfx_1f_23.asm
+++ b/audio/sfx/sfx_1f_23.asm
@@ -27,4 +27,4 @@ SFX_1f_23_Ch3: ; 7c99c (1f:499c)
 	unknownnoise0x20 8, 183, 92
 	unknownnoise0x20 15, 194, 93
 	endchannel
-; 0x7c9ac
\ No newline at end of file
+; 0x7c9ac
diff --git a/audio/sfx/sfx_1f_24.asm b/audio/sfx/sfx_1f_24.asm
index 448541e6..55d6345c 100644..100755
--- a/audio/sfx/sfx_1f_24.asm
+++ b/audio/sfx/sfx_1f_24.asm
@@ -29,4 +29,4 @@ SFX_1f_24_Ch3: ; 7c9f2 (1f:49f2)
 	unknownnoise0x20 4, 116, 16
 	unknownnoise0x20 4, 113, 32
 	endchannel
-; 0x7c9fc
\ No newline at end of file
+; 0x7c9fc
diff --git a/audio/sfx/sfx_1f_25.asm b/audio/sfx/sfx_1f_25.asm
index b0db2369..15ea54a7 100644..100755
--- a/audio/sfx/sfx_1f_25.asm
+++ b/audio/sfx/sfx_1f_25.asm
@@ -32,4 +32,4 @@ SFX_1f_25_Ch3: ; 7c8ca (1f:48ca)
 	unknownnoise0x20 12, 210, 61
 	unknownnoise0x20 8, 209, 44
 	endchannel
-; 0x7c8e0
\ No newline at end of file
+; 0x7c8e0
diff --git a/audio/sfx/sfx_1f_26.asm b/audio/sfx/sfx_1f_26.asm
index f0b205d5..488c9c32 100644..100755
--- a/audio/sfx/sfx_1f_26.asm
+++ b/audio/sfx/sfx_1f_26.asm
@@ -22,4 +22,4 @@ SFX_1f_26_Ch3: ; 7cdc6 (1f:4dc6)
 	unknownnoise0x20 3, 194, 108
 	unknownnoise0x20 8, 209, 92
 	endchannel
-; 0x7cdd3
\ No newline at end of file
+; 0x7cdd3
diff --git a/audio/sfx/sfx_1f_27.asm b/audio/sfx/sfx_1f_27.asm
index de7adafb..ade4b1ba 100644..100755
--- a/audio/sfx/sfx_1f_27.asm
+++ b/audio/sfx/sfx_1f_27.asm
@@ -28,4 +28,4 @@ SFX_1f_27_Ch3: ; 7ce09 (1f:4e09)
 	unknownnoise0x20 8, 179, 76
 	unknownnoise0x20 8, 161, 92
 	endchannel
-; 0x7ce1c
\ No newline at end of file
+; 0x7ce1c
diff --git a/audio/sfx/sfx_1f_28.asm b/audio/sfx/sfx_1f_28.asm
index c76c94a7..5f24e7d9 100644..100755
--- a/audio/sfx/sfx_1f_28.asm
+++ b/audio/sfx/sfx_1f_28.asm
@@ -19,4 +19,4 @@ SFX_1f_28_Ch3: ; 7ce3a (1f:4e3a)
 	unknownnoise0x20 14, 196, 60
 	unknownnoise0x20 8, 209, 44
 	endchannel
-; 0x7ce44
\ No newline at end of file
+; 0x7ce44
diff --git a/audio/sfx/sfx_1f_29.asm b/audio/sfx/sfx_1f_29.asm
index bc19ea3b..3c15675b 100644..100755
--- a/audio/sfx/sfx_1f_29.asm
+++ b/audio/sfx/sfx_1f_29.asm
@@ -28,4 +28,4 @@ SFX_1f_29_Ch3: ; 7cee0 (1f:4ee0)
 	unknownnoise0x20 3, 162, 92
 	unknownnoise0x20 8, 177, 108
 	endchannel
-; 0x7cef3
\ No newline at end of file
+; 0x7cef3
diff --git a/audio/sfx/sfx_1f_2a.asm b/audio/sfx/sfx_1f_2a.asm
index b91e4c2e..36f0ccd5 100644..100755
--- a/audio/sfx/sfx_1f_2a.asm
+++ b/audio/sfx/sfx_1f_2a.asm
@@ -19,4 +19,4 @@ SFX_1f_2a_Ch3: ; 7cd5b (1f:4d5b)
 	unknownnoise0x20 4, 230, 60
 	unknownnoise0x20 15, 242, 76
 	endchannel
-; 0x7cd65
\ No newline at end of file
+; 0x7cd65
diff --git a/audio/sfx/sfx_1f_2b.asm b/audio/sfx/sfx_1f_2b.asm
index da51e7c9..859969eb 100644..100755
--- a/audio/sfx/sfx_1f_2b.asm
+++ b/audio/sfx/sfx_1f_2b.asm
@@ -22,4 +22,4 @@ SFX_1f_2b_Ch3: ; 7cf19 (1f:4f19)
 	unknownnoise0x20 9, 228, 124
 	unknownnoise0x20 15, 226, 108
 	endchannel
-; 0x7cf26
\ No newline at end of file
+; 0x7cf26
diff --git a/audio/sfx/sfx_1f_2c.asm b/audio/sfx/sfx_1f_2c.asm
index a480b584..bdbcad46 100644..100755
--- a/audio/sfx/sfx_1f_2c.asm
+++ b/audio/sfx/sfx_1f_2c.asm
@@ -32,4 +32,4 @@ SFX_1f_2c_Ch3: ; 7d049 (1f:5049)
 	unknownnoise0x20 6, 180, 60
 	unknownnoise0x20 8, 193, 44
 	endchannel
-; 0x7d05c
\ No newline at end of file
+; 0x7d05c
diff --git a/audio/sfx/sfx_1f_2d.asm b/audio/sfx/sfx_1f_2d.asm
index f4c4ecd9..8ba33430 100644..100755
--- a/audio/sfx/sfx_1f_2d.asm
+++ b/audio/sfx/sfx_1f_2d.asm
@@ -16,4 +16,4 @@ SFX_1f_2d_Ch2: ; 7cd2a (1f:4d2a)
 
 SFX_1f_2d_Ch3: ; 7cd3c (1f:4d3c)
 	endchannel
-; 0x7cd3d
\ No newline at end of file
+; 0x7cd3d
diff --git a/audio/sfx/sfx_1f_2e.asm b/audio/sfx/sfx_1f_2e.asm
index 2c72b5a1..8c76ae07 100644..100755
--- a/audio/sfx/sfx_1f_2e.asm
+++ b/audio/sfx/sfx_1f_2e.asm
@@ -28,4 +28,4 @@ SFX_1f_2e_Ch3: ; 7cfaa (1f:4faa)
 	unknownnoise0x20 2, 226, 60
 	unknownnoise0x20 8, 209, 44
 	endchannel
-; 0x7cfbd
\ No newline at end of file
+; 0x7cfbd
diff --git a/audio/sfx/sfx_1f_2f.asm b/audio/sfx/sfx_1f_2f.asm
index 9b0bf71b..dbefbf62 100644..100755
--- a/audio/sfx/sfx_1f_2f.asm
+++ b/audio/sfx/sfx_1f_2f.asm
@@ -24,4 +24,4 @@ SFX_1f_2f_Ch3: ; 7cd93 (1f:4d93)
 	unknownnoise0x20 5, 163, 60
 	unknownnoise0x20 8, 145, 44
 	endchannel
-; 0x7cda0
\ No newline at end of file
+; 0x7cda0
diff --git a/audio/sfx/sfx_1f_30.asm b/audio/sfx/sfx_1f_30.asm
index b6833986..89447832 100644..100755
--- a/audio/sfx/sfx_1f_30.asm
+++ b/audio/sfx/sfx_1f_30.asm
@@ -29,4 +29,4 @@ SFX_1f_30_Ch3: ; 7cf64 (1f:4f64)
 	unknownnoise0x20 8, 196, 108
 	unknownnoise0x20 15, 179, 92
 	endchannel
-; 0x7cf74
\ No newline at end of file
+; 0x7cf74
diff --git a/audio/sfx/sfx_1f_31.asm b/audio/sfx/sfx_1f_31.asm
index b67f3863..4af60d4a 100644..100755
--- a/audio/sfx/sfx_1f_31.asm
+++ b/audio/sfx/sfx_1f_31.asm
@@ -27,4 +27,4 @@ SFX_1f_31_Ch3: ; 7cff3 (1f:4ff3)
 	unknownnoise0x20 1, 178, 91
 	unknownnoise0x20 15, 194, 76
 	endchannel
-; 0x7d003
\ No newline at end of file
+; 0x7d003
diff --git a/audio/sfx/sfx_1f_32.asm b/audio/sfx/sfx_1f_32.asm
index 92bb6a6f..4e11a38e 100644..100755
--- a/audio/sfx/sfx_1f_32.asm
+++ b/audio/sfx/sfx_1f_32.asm
@@ -36,4 +36,4 @@ SFX_1f_32_Ch3: ; 7ce8e (1f:4e8e)
 	unknownnoise0x20 5, 146, 26
 	unknownnoise0x20 8, 129, 24
 	endchannel
-; 0x7ceaa
\ No newline at end of file
+; 0x7ceaa
diff --git a/audio/sfx/sfx_1f_33.asm b/audio/sfx/sfx_1f_33.asm
index 607635c7..b273d6ac 100644..100755
--- a/audio/sfx/sfx_1f_33.asm
+++ b/audio/sfx/sfx_1f_33.asm
@@ -22,4 +22,4 @@ SFX_1f_33_Ch3: ; 7d082 (1f:5082)
 	unknownnoise0x20 8, 196, 69
 	unknownnoise0x20 8, 177, 68
 	endchannel
-; 0x7d08f
\ No newline at end of file
+; 0x7d08f
diff --git a/audio/sfx/sfx_1f_34.asm b/audio/sfx/sfx_1f_34.asm
index 59a5bd3a..18588747 100644..100755
--- a/audio/sfx/sfx_1f_34.asm
+++ b/audio/sfx/sfx_1f_34.asm
@@ -22,4 +22,4 @@ SFX_1f_34_Ch3: ; 7d0b5 (1f:50b5)
 	unknownnoise0x20 14, 210, 86
 	unknownnoise0x20 8, 209, 102
 	endchannel
-; 0x7d0c2
\ No newline at end of file
+; 0x7d0c2
diff --git a/audio/sfx/sfx_1f_35.asm b/audio/sfx/sfx_1f_35.asm
index 10d4c3a2..565dd1f2 100644..100755
--- a/audio/sfx/sfx_1f_35.asm
+++ b/audio/sfx/sfx_1f_35.asm
@@ -25,4 +25,4 @@ SFX_1f_35_Ch2: ; 7d0e5 (1f:50e5)
 
 SFX_1f_35_Ch3: ; 7d107 (1f:5107)
 	endchannel
-; 0x7d108
\ No newline at end of file
+; 0x7d108
diff --git a/audio/sfx/sfx_1f_36.asm b/audio/sfx/sfx_1f_36.asm
index 376b5f3a..2bb9dc28 100644..100755
--- a/audio/sfx/sfx_1f_36.asm
+++ b/audio/sfx/sfx_1f_36.asm
@@ -22,4 +22,4 @@ SFX_1f_36_Ch3: ; 7d12e (1f:512e)
 	unknownnoise0x20 1, 162, 57
 	unknownnoise0x20 8, 145, 73
 	endchannel
-; 0x7d13b
\ No newline at end of file
+; 0x7d13b
diff --git a/audio/sfx/sfx_1f_37.asm b/audio/sfx/sfx_1f_37.asm
index 41698fd9..6dd98fb8 100644..100755
--- a/audio/sfx/sfx_1f_37.asm
+++ b/audio/sfx/sfx_1f_37.asm
@@ -23,4 +23,4 @@ SFX_1f_37_Ch3: ; 7c825 (1f:4825)
 	unknownnoise0x20 15, 215, 60
 	unknownnoise0x20 8, 193, 44
 	endchannel
-; 0x7c832
\ No newline at end of file
+; 0x7c832
diff --git a/audio/sfx/sfx_1f_38.asm b/audio/sfx/sfx_1f_38.asm
index 885eee1f..02c65baa 100644..100755
--- a/audio/sfx/sfx_1f_38.asm
+++ b/audio/sfx/sfx_1f_38.asm
@@ -31,4 +31,4 @@ SFX_1f_38_Ch3: ; 7c878 (1f:4878)
 	unknownnoise0x20 12, 183, 76
 	unknownnoise0x20 15, 162, 92
 	endchannel
-; 0x7c888
\ No newline at end of file
+; 0x7c888
diff --git a/audio/sfx/sfx_1f_39.asm b/audio/sfx/sfx_1f_39.asm
index d29da9aa..7b9d5121 100644..100755
--- a/audio/sfx/sfx_1f_39.asm
+++ b/audio/sfx/sfx_1f_39.asm
@@ -24,4 +24,4 @@ SFX_1f_39_Ch3: ; 7c90e (1f:490e)
 	unknownnoise0x20 10, 182, 44
 	unknownnoise0x20 8, 145, 28
 	endchannel
-; 0x7c91b
\ No newline at end of file
+; 0x7c91b
diff --git a/audio/sfx/sfx_1f_3a.asm b/audio/sfx/sfx_1f_3a.asm
index 1d92127e..3ab6c1d3 100644..100755
--- a/audio/sfx/sfx_1f_3a.asm
+++ b/audio/sfx/sfx_1f_3a.asm
@@ -45,4 +45,4 @@ SFX_1f_3a_Ch3: ; 7e877 (1f:6877)
 	B_ 2
 	rest 2
 	endchannel
-; 0x7e887
\ No newline at end of file
+; 0x7e887
diff --git a/audio/sfx/sfx_1f_3b.asm b/audio/sfx/sfx_1f_3b.asm
index 3ce00c8a..b864987b 100644..100755
--- a/audio/sfx/sfx_1f_3b.asm
+++ b/audio/sfx/sfx_1f_3b.asm
@@ -67,4 +67,4 @@ SFX_1f_3b_Ch3: ; 7ee5f (1f:6e5f)
 	rest 1
 	A_ 8
 	endchannel
-; 0x7ee74
\ No newline at end of file
+; 0x7ee74
diff --git a/audio/sfx/sfx_1f_3c.asm b/audio/sfx/sfx_1f_3c.asm
index fb476203..051a4376 100644..100755
--- a/audio/sfx/sfx_1f_3c.asm
+++ b/audio/sfx/sfx_1f_3c.asm
@@ -6,4 +6,4 @@ SFX_1f_3c_Ch1: ; 7c3f3 (1f:43f3)
 	unknownsfx0x20 8, 226, 0, 2
 	unknownsfx0x10 8
 	endchannel
-; 0x7c404
\ No newline at end of file
+; 0x7c404
diff --git a/audio/sfx/sfx_1f_3d.asm b/audio/sfx/sfx_1f_3d.asm
index f7acd76f..0275329d 100644..100755
--- a/audio/sfx/sfx_1f_3d.asm
+++ b/audio/sfx/sfx_1f_3d.asm
@@ -5,4 +5,4 @@ SFX_1f_3d_Ch1: ; 7c490 (1f:4490)
 	unknownsfx0x20 15, 242, 80, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x7c49f
\ No newline at end of file
+; 0x7c49f
diff --git a/audio/sfx/sfx_1f_3e.asm b/audio/sfx/sfx_1f_3e.asm
index 411b544d..89518f22 100644..100755
--- a/audio/sfx/sfx_1f_3e.asm
+++ b/audio/sfx/sfx_1f_3e.asm
@@ -7,4 +7,4 @@ SFX_1f_3e_Ch1: ; 7c4b2 (1f:44b2)
 	unknownsfx0x20 15, 242, 0, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x7c4c7
\ No newline at end of file
+; 0x7c4c7
diff --git a/audio/sfx/sfx_1f_3f.asm b/audio/sfx/sfx_1f_3f.asm
index de7a44cf..017daf8a 100644..100755
--- a/audio/sfx/sfx_1f_3f.asm
+++ b/audio/sfx/sfx_1f_3f.asm
@@ -2,4 +2,4 @@ SFX_1f_3f_Ch1: ; 7c3c3 (1f:43c3)
 	unknownnoise0x20 1, 226, 51
 	unknownnoise0x20 8, 225, 34
 	endchannel
-; 0x7c3ca
\ No newline at end of file
+; 0x7c3ca
diff --git a/audio/sfx/sfx_1f_40.asm b/audio/sfx/sfx_1f_40.asm
index 216bd569..05d2e17d 100644..100755
--- a/audio/sfx/sfx_1f_40.asm
+++ b/audio/sfx/sfx_1f_40.asm
@@ -5,4 +5,4 @@ SFX_1f_40_Ch1: ; 7c44b (1f:444b)
 	unknownsfx0x20 0, 145, 192, 7
 	unknownsfx0x20 12, 161, 208, 7
 	endchannel
-; 0x7c45e
\ No newline at end of file
+; 0x7c45e
diff --git a/audio/sfx/sfx_1f_41.asm b/audio/sfx/sfx_1f_41.asm
index 6f854c74..f255ba76 100644..100755
--- a/audio/sfx/sfx_1f_41.asm
+++ b/audio/sfx/sfx_1f_41.asm
@@ -75,4 +75,4 @@ SFX_1f_41_Ch3: ; 7ee09 (1f:6e09)
 	F_ 2
 	rest 2
 	endchannel
-; 0x7ee28
\ No newline at end of file
+; 0x7ee28
diff --git a/audio/sfx/sfx_1f_42.asm b/audio/sfx/sfx_1f_42.asm
index 6c8c388a..daa4c7bb 100644..100755
--- a/audio/sfx/sfx_1f_42.asm
+++ b/audio/sfx/sfx_1f_42.asm
@@ -57,4 +57,4 @@ SFX_1f_42_Ch3: ; 7eeaf (1f:6eaf)
 	F_ 4
 	D# 8
 	endchannel
-; 0x7eeb9
\ No newline at end of file
+; 0x7eeb9
diff --git a/audio/sfx/sfx_1f_43.asm b/audio/sfx/sfx_1f_43.asm
index 59b7339c..94d8fb9c 100644..100755
--- a/audio/sfx/sfx_1f_43.asm
+++ b/audio/sfx/sfx_1f_43.asm
@@ -6,4 +6,4 @@ SFX_1f_43_Ch1: ; 7c49f (1f:449f)
 	unknownsfx0x20 15, 243, 0, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x7c4b2
\ No newline at end of file
+; 0x7c4b2
diff --git a/audio/sfx/sfx_1f_44.asm b/audio/sfx/sfx_1f_44.asm
index bc2ff935..4efbe345 100644..100755
--- a/audio/sfx/sfx_1f_44.asm
+++ b/audio/sfx/sfx_1f_44.asm
@@ -5,4 +5,4 @@ SFX_1f_44_Ch1: ; 7c4c7 (1f:44c7)
 	unknownsfx0x20 15, 242, 80, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x7c4d6
\ No newline at end of file
+; 0x7c4d6
diff --git a/audio/sfx/sfx_1f_45.asm b/audio/sfx/sfx_1f_45.asm
index c2f734ad..e64cb337 100644..100755
--- a/audio/sfx/sfx_1f_45.asm
+++ b/audio/sfx/sfx_1f_45.asm
@@ -12,4 +12,4 @@ SFX_1f_45_Ch1: ; 7c4d6 (1f:44d6)
 	unknownsfx0x20 3, 129, 192, 7
 	unknownsfx0x20 3, 129, 0, 7
 	endchannel
-; 0x7c505
\ No newline at end of file
+; 0x7c505
diff --git a/audio/sfx/sfx_1f_46.asm b/audio/sfx/sfx_1f_46.asm
index 4e9026b7..3989bd00 100644..100755
--- a/audio/sfx/sfx_1f_46.asm
+++ b/audio/sfx/sfx_1f_46.asm
@@ -5,4 +5,4 @@ SFX_1f_46_Ch1: ; 7c505 (1f:4505)
 	unknownsfx0x20 4, 240, 0, 2
 	unknownsfx0x20 1, 0, 0, 0
 	endchannel
-; 0x7c518
\ No newline at end of file
+; 0x7c518
diff --git a/audio/sfx/sfx_1f_47.asm b/audio/sfx/sfx_1f_47.asm
index f56c49b7..945e93fe 100644..100755
--- a/audio/sfx/sfx_1f_47.asm
+++ b/audio/sfx/sfx_1f_47.asm
@@ -5,4 +5,4 @@ SFX_1f_47_Ch1: ; 7c518 (1f:4518)
 	unknownsfx0x20 4, 240, 0, 7
 	unknownsfx0x20 1, 0, 0, 0
 	endchannel
-; 0x7c52b
\ No newline at end of file
+; 0x7c52b
diff --git a/audio/sfx/sfx_1f_48.asm b/audio/sfx/sfx_1f_48.asm
index c46af22b..c0854070 100644..100755
--- a/audio/sfx/sfx_1f_48.asm
+++ b/audio/sfx/sfx_1f_48.asm
@@ -8,4 +8,4 @@ SFX_1f_48_Ch1: ; 7c52b (1f:452b)
 	unknownsfx0x20 15, 23, 0, 4
 	unknownsfx0x10 8
 	endchannel
-; 0x7c546
\ No newline at end of file
+; 0x7c546
diff --git a/audio/sfx/sfx_1f_49.asm b/audio/sfx/sfx_1f_49.asm
index 0f20dcd3..f1ae8229 100644..100755
--- a/audio/sfx/sfx_1f_49.asm
+++ b/audio/sfx/sfx_1f_49.asm
@@ -6,4 +6,4 @@ SFX_1f_49_Ch1: ; 7c546 (1f:4546)
 	unknownsfx0x20 4, 241, 128, 7
 	unknownsfx0x20 4, 0, 0, 0
 	endchannel
-; 0x7c55d
\ No newline at end of file
+; 0x7c55d
diff --git a/audio/sfx/sfx_1f_4a.asm b/audio/sfx/sfx_1f_4a.asm
index c0d8324b..4e1c7e2e 100644..100755
--- a/audio/sfx/sfx_1f_4a.asm
+++ b/audio/sfx/sfx_1f_4a.asm
@@ -7,4 +7,4 @@ SFX_1f_4a_Ch1: ; 7c55d (1f:455d)
 	unknownsfx0x10 8
 	unknownsfx0x20 1, 0, 0, 0
 	endchannel
-; 0x7c572
\ No newline at end of file
+; 0x7c572
diff --git a/audio/sfx/sfx_1f_4b.asm b/audio/sfx/sfx_1f_4b.asm
index c4d33187..2dc74200 100644..100755
--- a/audio/sfx/sfx_1f_4b.asm
+++ b/audio/sfx/sfx_1f_4b.asm
@@ -8,4 +8,4 @@ SFX_1f_4b_Ch1: ; 7c572 (1f:4572)
 	unknownsfx0x20 15, 23, 0, 7
 	unknownsfx0x10 8
 	endchannel
-; 0x7c58d
\ No newline at end of file
+; 0x7c58d
diff --git a/audio/sfx/sfx_1f_4c.asm b/audio/sfx/sfx_1f_4c.asm
index 811d4bc7..1f55c9c2 100644..100755
--- a/audio/sfx/sfx_1f_4c.asm
+++ b/audio/sfx/sfx_1f_4c.asm
@@ -8,4 +8,4 @@ SFX_1f_4c_Ch1: ; 7c58d (1f:458d)
 	unknownsfx0x20 15, 23, 0, 5
 	unknownsfx0x10 8
 	endchannel
-; 0x7c5a8
\ No newline at end of file
+; 0x7c5a8
diff --git a/audio/sfx/sfx_1f_4d.asm b/audio/sfx/sfx_1f_4d.asm
index 8dcb0a8b..9c5686ec 100644..100755
--- a/audio/sfx/sfx_1f_4d.asm
+++ b/audio/sfx/sfx_1f_4d.asm
@@ -4,4 +4,4 @@ SFX_1f_4d_Ch1: ; 7c5a8 (1f:45a8)
 	unknownsfx0x20 15, 210, 0, 5
 	unknownsfx0x10 8
 	endchannel
-; 0x7c5b3
\ No newline at end of file
+; 0x7c5b3
diff --git a/audio/sfx/sfx_1f_4e.asm b/audio/sfx/sfx_1f_4e.asm
index 92f1a396..e3f4b6e5 100644..100755
--- a/audio/sfx/sfx_1f_4e.asm
+++ b/audio/sfx/sfx_1f_4e.asm
@@ -4,4 +4,4 @@ SFX_1f_4e_Ch1: ; 7c5b3 (1f:45b3)
 	unknownsfx0x20 15, 242, 0, 4
 	unknownsfx0x10 8
 	endchannel
-; 0x7c5be
\ No newline at end of file
+; 0x7c5be
diff --git a/audio/sfx/sfx_1f_4f.asm b/audio/sfx/sfx_1f_4f.asm
index aab678ab..5b73d196 100644..100755
--- a/audio/sfx/sfx_1f_4f.asm
+++ b/audio/sfx/sfx_1f_4f.asm
@@ -4,4 +4,4 @@ SFX_1f_4f_Ch1: ; 7c5be (1f:45be)
 	unknownnoise0x20 2, 241, 34
 	unknownnoise0x20 1, 0, 0
 	endchannel
-; 0x7c5cb
\ No newline at end of file
+; 0x7c5cb
diff --git a/audio/sfx/sfx_1f_50.asm b/audio/sfx/sfx_1f_50.asm
index fba01b43..3b99e1f3 100644..100755
--- a/audio/sfx/sfx_1f_50.asm
+++ b/audio/sfx/sfx_1f_50.asm
@@ -16,4 +16,4 @@ SFX_1f_50_Ch1: ; 7c5cb (1f:45cb)
 	unknownnoise0x20 2, 65, 18
 	unknownnoise0x20 2, 0, 0
 	endchannel
-; 0x7c5fc
\ No newline at end of file
+; 0x7c5fc
diff --git a/audio/sfx/sfx_1f_51.asm b/audio/sfx/sfx_1f_51.asm
index 4df2d1d8..83501af4 100644..100755
--- a/audio/sfx/sfx_1f_51.asm
+++ b/audio/sfx/sfx_1f_51.asm
@@ -16,4 +16,4 @@ SFX_1f_51_Ch2: ; 7c613 (1f:4613)
 	unknownsfx0x20 15, 240, 1, 4
 	unknownsfx0x20 1, 0, 0, 0
 	endchannel
-; 0x7c626
\ No newline at end of file
+; 0x7c626
diff --git a/audio/sfx/sfx_1f_52.asm b/audio/sfx/sfx_1f_52.asm
index 6fa9eaa2..0ac5e8ee 100644..100755
--- a/audio/sfx/sfx_1f_52.asm
+++ b/audio/sfx/sfx_1f_52.asm
@@ -4,4 +4,4 @@ SFX_1f_52_Ch1: ; 7c626 (1f:4626)
 	unknownsfx0x20 15, 210, 0, 7
 	unknownsfx0x10 8
 	endchannel
-; 0x7c631
\ No newline at end of file
+; 0x7c631
diff --git a/audio/sfx/sfx_1f_53.asm b/audio/sfx/sfx_1f_53.asm
index 86e7ce4a..47d5d3dd 100644..100755
--- a/audio/sfx/sfx_1f_53.asm
+++ b/audio/sfx/sfx_1f_53.asm
@@ -8,4 +8,4 @@ SFX_1f_53_Ch1: ; 7c631 (1f:4631)
 	unknownnoise0x20 8, 244, 85
 	unknownnoise0x20 8, 241, 68
 	endchannel
-; 0x7c64a
\ No newline at end of file
+; 0x7c64a
diff --git a/audio/sfx/sfx_1f_54.asm b/audio/sfx/sfx_1f_54.asm
index acdc3da5..1a6a1031 100644..100755
--- a/audio/sfx/sfx_1f_54.asm
+++ b/audio/sfx/sfx_1f_54.asm
@@ -20,4 +20,4 @@ SFX_1f_54_Ch2: ; 7c669 (1f:4669)
 	unknownsfx0x20 15, 240, 130, 4
 	unknownsfx0x20 15, 242, 130, 4
 	endchannel
-; 0x7c688
\ No newline at end of file
+; 0x7c688
diff --git a/audio/sfx/sfx_1f_55.asm b/audio/sfx/sfx_1f_55.asm
index 9a27c885..3622e334 100644..100755
--- a/audio/sfx/sfx_1f_55.asm
+++ b/audio/sfx/sfx_1f_55.asm
@@ -10,4 +10,4 @@ SFX_1f_55_Ch1: ; 7c688 (1f:4688)
 	unknownsfx0x20 15, 226, 0, 7
 	unknownsfx0x10 8
 	endchannel
-; 0x7c6a5
\ No newline at end of file
+; 0x7c6a5
diff --git a/audio/sfx/sfx_1f_56.asm b/audio/sfx/sfx_1f_56.asm
index 77624440..941c4b0c 100644..100755
--- a/audio/sfx/sfx_1f_56.asm
+++ b/audio/sfx/sfx_1f_56.asm
@@ -5,4 +5,4 @@ SFX_1f_56_Ch1: ; 7c3ca (1f:43ca)
 	unknownnoise0x20 8, 244, 85
 	unknownnoise0x20 8, 241, 68
 	endchannel
-; 0x7c3da
\ No newline at end of file
+; 0x7c3da
diff --git a/audio/sfx/sfx_1f_57.asm b/audio/sfx/sfx_1f_57.asm
index 36880103..3ea03695 100644..100755
--- a/audio/sfx/sfx_1f_57.asm
+++ b/audio/sfx/sfx_1f_57.asm
@@ -2,4 +2,4 @@ SFX_1f_57_Ch1: ; 7c3da (1f:43da)
 	unknownnoise0x20 9, 241, 68
 	unknownnoise0x20 8, 209, 67
 	endchannel
-; 0x7c3e1
\ No newline at end of file
+; 0x7c3e1
diff --git a/audio/sfx/sfx_1f_58.asm b/audio/sfx/sfx_1f_58.asm
index ac61fe40..6a27c732 100644..100755
--- a/audio/sfx/sfx_1f_58.asm
+++ b/audio/sfx/sfx_1f_58.asm
@@ -9,4 +9,4 @@ SFX_1f_58_Ch2: ; 7c3e8 (1f:43e8)
 	unknownsfx0x20 2, 8, 0, 0
 	unknownsfx0x20 8, 177, 65, 7
 	endchannel
-; 0x7c3f3
\ No newline at end of file
+; 0x7c3f3
diff --git a/audio/sfx/sfx_1f_59.asm b/audio/sfx/sfx_1f_59.asm
index a50d05c0..45e65572 100644..100755
--- a/audio/sfx/sfx_1f_59.asm
+++ b/audio/sfx/sfx_1f_59.asm
@@ -9,4 +9,4 @@ SFX_1f_59_Ch2: ; 7c40b (1f:440b)
 	unknownsfx0x20 1, 8, 0, 0
 	unknownsfx0x20 4, 161, 97, 7
 	endchannel
-; 0x7c416
\ No newline at end of file
+; 0x7c416
diff --git a/audio/sfx/sfx_1f_5a.asm b/audio/sfx/sfx_1f_5a.asm
index 8c050129..567b331b 100644..100755
--- a/audio/sfx/sfx_1f_5a.asm
+++ b/audio/sfx/sfx_1f_5a.asm
@@ -11,4 +11,4 @@ SFX_1f_5a_Ch2: ; 7c421 (1f:4421)
 	unknownsfx0x20 4, 145, 193, 6
 	unknownsfx0x20 8, 162, 161, 7
 	endchannel
-; 0x7c430
\ No newline at end of file
+; 0x7c430
diff --git a/audio/sfx/sfx_1f_5b.asm b/audio/sfx/sfx_1f_5b.asm
index 771aa496..9921eb88 100644..100755
--- a/audio/sfx/sfx_1f_5b.asm
+++ b/audio/sfx/sfx_1f_5b.asm
@@ -4,4 +4,4 @@ SFX_1f_5b_Ch1: ; 7c430 (1f:4430)
 	unknownsfx0x20 15, 241, 0, 3
 	unknownsfx0x10 8
 	endchannel
-; 0x7c43b
\ No newline at end of file
+; 0x7c43b
diff --git a/audio/sfx/sfx_1f_5c.asm b/audio/sfx/sfx_1f_5c.asm
index 8ac03d9c..571db9a9 100644..100755
--- a/audio/sfx/sfx_1f_5c.asm
+++ b/audio/sfx/sfx_1f_5c.asm
@@ -5,4 +5,4 @@ SFX_1f_5c_Ch1: ; 7c43b (1f:443b)
 	unknownnoise0x20 12, 97, 35
 	unknownnoise0x20 6, 65, 84
 	endchannel
-; 0x7c44b
\ No newline at end of file
+; 0x7c44b
diff --git a/audio/sfx/sfx_1f_5d.asm b/audio/sfx/sfx_1f_5d.asm
index f0606032..f0606032 100644..100755
--- a/audio/sfx/sfx_1f_5d.asm
+++ b/audio/sfx/sfx_1f_5d.asm
diff --git a/audio/sfx/sfx_1f_5e.asm b/audio/sfx/sfx_1f_5e.asm
index e6bbaa64..30de5a1a 100644..100755
--- a/audio/sfx/sfx_1f_5e.asm
+++ b/audio/sfx/sfx_1f_5e.asm
@@ -8,4 +8,4 @@ SFX_1f_5e_Ch1: ; 7c6a5 (1f:46a5)
 	unknownnoise0x20 15, 231, 67
 	unknownnoise0x20 15, 242, 67
 	endchannel
-; 0x7c6be
\ No newline at end of file
+; 0x7c6be
diff --git a/audio/sfx/sfx_1f_5f.asm b/audio/sfx/sfx_1f_5f.asm
index 7ae72e98..5a18de25 100644..100755
--- a/audio/sfx/sfx_1f_5f.asm
+++ b/audio/sfx/sfx_1f_5f.asm
@@ -4,4 +4,4 @@ SFX_1f_5f_Ch1: ; 7c6be (1f:46be)
 	unknownsfx0x20 12, 194, 64, 7
 	unknownsfx0x10 8
 	endchannel
-; 0x7c6c9
\ No newline at end of file
+; 0x7c6c9
diff --git a/audio/sfx/sfx_1f_60.asm b/audio/sfx/sfx_1f_60.asm
index 3f098eeb..424a2d28 100644..100755
--- a/audio/sfx/sfx_1f_60.asm
+++ b/audio/sfx/sfx_1f_60.asm
@@ -4,4 +4,4 @@ SFX_1f_60_Ch1: ; 7c6c9 (1f:46c9)
 	unknownsfx0x20 12, 194, 128, 6
 	unknownsfx0x10 8
 	endchannel
-; 0x7c6d4
\ No newline at end of file
+; 0x7c6d4
diff --git a/audio/sfx/sfx_1f_61.asm b/audio/sfx/sfx_1f_61.asm
index 745ce3a4..afc7dae3 100644..100755
--- a/audio/sfx/sfx_1f_61.asm
+++ b/audio/sfx/sfx_1f_61.asm
@@ -3,4 +3,4 @@ SFX_1f_61_Ch1: ; 7c6d4 (1f:46d4)
 	unknownnoise0x20 2, 175, 49
 	unknownnoise0x20 15, 242, 65
 	endchannel
-; 0x7c6de
\ No newline at end of file
+; 0x7c6de
diff --git a/audio/sfx/sfx_1f_62.asm b/audio/sfx/sfx_1f_62.asm
index 71be0e5d..44a2c2c0 100644..100755
--- a/audio/sfx/sfx_1f_62.asm
+++ b/audio/sfx/sfx_1f_62.asm
@@ -2,4 +2,4 @@ SFX_1f_62_Ch1: ; 7c6de (1f:46de)
 	unknownnoise0x20 2, 210, 50
 	unknownnoise0x20 15, 242, 67
 	endchannel
-; 0x7c6e5
\ No newline at end of file
+; 0x7c6e5
diff --git a/audio/sfx/sfx_1f_63.asm b/audio/sfx/sfx_1f_63.asm
index 88ce100d..f47ed1c1 100644..100755
--- a/audio/sfx/sfx_1f_63.asm
+++ b/audio/sfx/sfx_1f_63.asm
@@ -5,4 +5,4 @@ SFX_1f_63_Ch1: ; 7c6e5 (1f:46e5)
 	unknownnoise0x20 3, 192, 34
 	unknownnoise0x20 15, 210, 36
 	endchannel
-; 0x7c6f5
\ No newline at end of file
+; 0x7c6f5
diff --git a/audio/sfx/sfx_1f_64.asm b/audio/sfx/sfx_1f_64.asm
index 703343ad..3e6ec789 100644..100755
--- a/audio/sfx/sfx_1f_64.asm
+++ b/audio/sfx/sfx_1f_64.asm
@@ -4,4 +4,4 @@ SFX_1f_64_Ch1: ; 7c6f5 (1f:46f5)
 	unknownsfx0x20 1, 242, 224, 6
 	unknownsfx0x20 8, 241, 0, 7
 	endchannel
-; 0x7c704
\ No newline at end of file
+; 0x7c704
diff --git a/audio/sfx/sfx_1f_65.asm b/audio/sfx/sfx_1f_65.asm
index b8708858..1f262365 100644..100755
--- a/audio/sfx/sfx_1f_65.asm
+++ b/audio/sfx/sfx_1f_65.asm
@@ -3,4 +3,4 @@ SFX_1f_65_Ch1: ; 7c704 (1f:4704)
 	unknownsfx0x20 2, 241, 0, 7
 	unknownsfx0x20 8, 129, 224, 7
 	endchannel
-; 0x7c70f
\ No newline at end of file
+; 0x7c70f
diff --git a/audio/sfx/sfx_1f_66.asm b/audio/sfx/sfx_1f_66.asm
index 1b581a91..7ffa9bd2 100644..100755
--- a/audio/sfx/sfx_1f_66.asm
+++ b/audio/sfx/sfx_1f_66.asm
@@ -12,4 +12,4 @@ SFX_1f_66_Ch2: ; 7c71e (1f:471e)
 	unknownsfx0x20 2, 193, 65, 7
 	unknownsfx0x20 15, 209, 129, 7
 	endchannel
-; 0x7c72d
\ No newline at end of file
+; 0x7c72d
diff --git a/audio/sfx/sfx_1f_67.asm b/audio/sfx/sfx_1f_67.asm
index 4bd391a1..0ba27bad 100644..100755
--- a/audio/sfx/sfx_1f_67.asm
+++ b/audio/sfx/sfx_1f_67.asm
@@ -12,4 +12,4 @@ SFX_1f_67_Ch1: ; 7c72d (1f:472d)
 	unknownsfx0x20 15, 18, 224, 7
 	unknownsfx0x10 8
 	endchannel
-; 0x7c758
\ No newline at end of file
+; 0x7c758
diff --git a/audio/sfx/sfx_1f_unused.asm b/audio/sfx/sfx_1f_unused.asm
index 773c069e..c4109f17 100755
--- a/audio/sfx/sfx_1f_unused.asm
+++ b/audio/sfx/sfx_1f_unused.asm
@@ -29,4 +29,4 @@ SFX_1f_unused_Ch3: ; 7c78e (1f:478e)
 	unknownnoise0x20 12, 125, 76
 	unknownnoise0x20 15, 211, 76
 	endchannel
-; 0x7c7a4
\ No newline at end of file
+; 0x7c7a4
diff --git a/constants/connection_constants.asm b/constants/connection_constants.asm
index 9b24ef6b..916d6c4f 100755
--- a/constants/connection_constants.asm
+++ b/constants/connection_constants.asm
@@ -2,4 +2,4 @@
 EAST  EQU 1
 WEST  EQU 2
 SOUTH EQU 4
-NORTH EQU 8
\ No newline at end of file
+NORTH EQU 8
diff --git a/constants/evolution_constants.asm b/constants/evolution_constants.asm
index 879b2c2a..2e3f3613 100755
--- a/constants/evolution_constants.asm
+++ b/constants/evolution_constants.asm
@@ -1,4 +1,4 @@
 ; Evolution types
 EV_LEVEL EQU 1
 EV_ITEM  EQU 2
-EV_TRADE EQU 3
\ No newline at end of file
+EV_TRADE EQU 3
diff --git a/constants/item_constants.asm b/constants/item_constants.asm
index be320371..be251e62 100644..100755
--- a/constants/item_constants.asm
+++ b/constants/item_constants.asm
@@ -138,4 +138,4 @@ TM_46         EQU $F6
 TM_47         EQU $F7
 TM_48         EQU $F8
 TM_49         EQU $F9
-TM_50         EQU $FA
\ No newline at end of file
+TM_50         EQU $FA
diff --git a/constants/list_constants.asm b/constants/list_constants.asm
index a8f016ae..aab542ec 100755
--- a/constants/list_constants.asm
+++ b/constants/list_constants.asm
@@ -11,4 +11,4 @@ MOVE_NAME     EQU 2
 ITEM_NAME     EQU 4
 PLAYEROT_NAME EQU 5
 ENEMYOT_NAME  EQU 6
-TRAINER_NAME  EQU 7
\ No newline at end of file
+TRAINER_NAME  EQU 7
diff --git a/constants/oam_constants.asm b/constants/oam_constants.asm
index 02ffee01..ddf95648 100755
--- a/constants/oam_constants.asm
+++ b/constants/oam_constants.asm
@@ -6,4 +6,4 @@ OAMFLAG_VFLIPPED    EQU %00100000 ; OAM flag flips the sprite vertically.
 
 ; OAM attribute flags
 OAM_HFLIP EQU %00100000 ; horizontal flip
-OAM_VFLIP EQU %01000000 ; vertical flip
\ No newline at end of file
+OAM_VFLIP EQU %01000000 ; vertical flip
diff --git a/constants/palette_constants.asm b/constants/palette_constants.asm
index 669c5296..981f621d 100644..100755
--- a/constants/palette_constants.asm
+++ b/constants/palette_constants.asm
@@ -35,4 +35,4 @@ PAL_YELLOWBAR EQU $20
 PAL_REDBAR    EQU $21
 PAL_BADGE     EQU $22
 PAL_CAVE      EQU $23
-PAL_GAMEFREAK EQU $24
\ No newline at end of file
+PAL_GAMEFREAK EQU $24
diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm
index 92abfe3e..dc249d59 100755
--- a/constants/sprite_constants.asm
+++ b/constants/sprite_constants.asm
@@ -94,4 +94,4 @@ BOULDER_MOVEMENT_BYTE_2 EQU $10
 SPRITE_FACING_DOWN  EQU $00
 SPRITE_FACING_UP    EQU $04
 SPRITE_FACING_LEFT  EQU $08
-SPRITE_FACING_RIGHT EQU $0C
\ No newline at end of file
+SPRITE_FACING_RIGHT EQU $0C
diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm
index 37a51376..f98352f9 100644..100755
--- a/constants/trainer_constants.asm
+++ b/constants/trainer_constants.asm
@@ -45,4 +45,4 @@ SONY3         EQU $2B
 LORELEI       EQU $2C
 CHANNELER     EQU $2D
 AGATHA        EQU $2E
-LANCE         EQU $2F
\ No newline at end of file
+LANCE         EQU $2F
diff --git a/constants/type_constants.asm b/constants/type_constants.asm
index 66085f8d..095a3d28 100755
--- a/constants/type_constants.asm
+++ b/constants/type_constants.asm
@@ -13,4 +13,8 @@ GRASS    EQU $16
 ELECTRIC EQU $17
 PSYCHIC  EQU $18
 ICE      EQU $19
-DRAGON   EQU $1A
\ No newline at end of file
+<<<<<<< HEAD
+DRAGON   EQU $1A
+=======
+DRAGON   EQU $1A
+>>>>>>> d48ea223eaad84af95e4f29043c279b56aa4ae88
diff --git a/yellow/bank3c/main.asm b/engine/bank3c/main.asm
index c05f46f5..92f5634c 100644
--- a/yellow/bank3c/main.asm
+++ b/engine/bank3c/main.asm
@@ -1,4 +1,4 @@
-INCLUDE "yellow/bank3c/overworld.asm"
+INCLUDE "engine/bank3c/overworld.asm"
 
 ResetStatusAndHalveMoneyOnBlackout:: ; f0274 (3c:4274)
 ; Reset player status on blackout.
diff --git a/yellow/bank3c/overworld.asm b/engine/bank3c/overworld.asm
index 778244d6..778244d6 100644
--- a/yellow/bank3c/overworld.asm
+++ b/engine/bank3c/overworld.asm
diff --git a/yellow/bank3d/random.asm b/engine/bank3d/random.asm
index b7fb0edd..8c8ead4e 100644
--- a/yellow/bank3d/random.asm
+++ b/engine/bank3d/random.asm
@@ -1,4 +1,4 @@
-SECTION "bank3d",ROMX[$67DC],BANK[$3D]
+SECTION "bank3d Random",ROMX[$67DC],BANK[$3D]
 
 Random_::
 ; Generate a random 16-bit value.
diff --git a/yellow/bank3f/data/map_header_banks.asm b/engine/bank3f/data/map_header_banks.asm
index 94a13510..94a13510 100644
--- a/yellow/bank3f/data/map_header_banks.asm
+++ b/engine/bank3f/data/map_header_banks.asm
diff --git a/yellow/bank3f/data/map_header_pointers.asm b/engine/bank3f/data/map_header_pointers.asm
index 5431727e..5431727e 100644
--- a/yellow/bank3f/data/map_header_pointers.asm
+++ b/engine/bank3f/data/map_header_pointers.asm
diff --git a/yellow/bank3f/data/map_songs.asm b/engine/bank3f/data/map_songs.asm
index 4a84aebb..4a84aebb 100644
--- a/yellow/bank3f/data/map_songs.asm
+++ b/engine/bank3f/data/map_songs.asm
diff --git a/yellow/bank3f/main.asm b/engine/bank3f/main.asm
index c9662acd..b02829eb 100644
--- a/yellow/bank3f/main.asm
+++ b/engine/bank3f/main.asm
@@ -1,6 +1,6 @@
-INCLUDE "yellow/bank3f/data/map_songs.asm"
-INCLUDE "yellow/bank3f/data/map_header_pointers.asm"
-INCLUDE "yellow/bank3f/data/map_header_banks.asm"
+INCLUDE "engine/bank3f/data/map_songs.asm"
+INCLUDE "engine/bank3f/data/map_header_pointers.asm"
+INCLUDE "engine/bank3f/data/map_header_banks.asm"
 
 Func_fc4dd:: ; fc4dd (3f:44dd)
 ; possibly to test if pika should be out?
@@ -21,7 +21,7 @@ Func_fc4dd:: ; fc4dd (3f:44dd)
 	and a
 	ret
 	
-Func_fc5fa:: ; fc5fa (3f:44fa)
+Func_fc4fa:: ; fc4fa (3f:44fa)
 	ld hl,wd430
 	bit 4,[hl]
 	res 4,[hl]
@@ -188,7 +188,7 @@ Func_fc5fa:: ; fc5fa (3f:45fa)
 	cp ROCK_TUNNEL_1
 	jr z,.asm_fc645
 	ld a,[W_CURMAP]
-	ld hl,Pointer_fc64b
+	ld hl,Pointer_fc46b
 	call Func_1568 ; similar to IsInArray, but not the same
 	jr c,.asm_fc639
 	ld a,[W_CURMAP]
@@ -232,7 +232,7 @@ Pointer_fc653:: ; fc653 (3f:4653)
 
 Func_fc65b:: ; fc65b (3f:465b)
 	ld a,[W_CURMAP]
-
+	
 Func_fc69a:: ; fc69a (3f:469a)
 
 Func_fcc08:: ; fcc08 (3f:4c08)
diff --git a/engine/battle/bank_e_misc.asm b/engine/battle/bank_e_misc.asm
index 78b27108..6ef4065f 100644..100755
--- a/engine/battle/bank_e_misc.asm
+++ b/engine/battle/bank_e_misc.asm
@@ -119,4 +119,4 @@ GetMonSpecies: ; 39c37 (e:5c37)
 	add hl, de
 	ld a, [hl]
 	ld [wcf91], a
-	ret
\ No newline at end of file
+	ret
diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm
index f03dd07f..5d78af5b 100644..100755
--- a/engine/battle/end_of_battle.asm
+++ b/engine/battle/end_of_battle.asm
@@ -85,4 +85,4 @@ DrawText: ; 13864 (4:7864)
 
 PickUpPayDayMoneyText: ; 1386b (4:786b)
 	TX_FAR _PickUpPayDayMoneyText
-	db "@"
\ No newline at end of file
+	db "@"
diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm
index 3cdfb5cb..d8da714e 100644..100755
--- a/engine/battle/read_trainer_party.asm
+++ b/engine/battle/read_trainer_party.asm
@@ -163,4 +163,4 @@ ReadTrainer: ; 39c53 (e:5c53)
 	inc de
 	dec b
 	jr nz,.LastLoop ; repeat W_CURENEMYLVL times
-	ret
\ No newline at end of file
+	ret
diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm
index 191cfd5e..19a184f2 100644
--- a/engine/battle/trainer_ai.asm
+++ b/engine/battle/trainer_ai.asm
@@ -808,7 +808,7 @@ AIIncreaseStat: ; 3a808 (e:6808)
 	ld a,[hl]
 	push af
 	push hl
-	ld a,$AF
+	ld a,ANIM_AF
 	ld [hli],a
 	ld [hl],b
 	callab StatModifierUpEffect
diff --git a/engine/battle/trainer_pic_money_pointers.asm b/engine/battle/trainer_pic_money_pointers.asm
index 3d32eb00..3f684db3 100644..100755
--- a/engine/battle/trainer_pic_money_pointers.asm
+++ b/engine/battle/trainer_pic_money_pointers.asm
@@ -140,4 +140,4 @@ TrainerPicAndMoneyPointers: ; 39914 (e:5914)
 	money 9900
 
 	dw LancePic
-	money 9900
\ No newline at end of file
+	money 9900
diff --git a/engine/battle/wild_encounters.asm b/engine/battle/wild_encounters.asm
index 03119b90..61b318b9 100644
--- a/engine/battle/wild_encounters.asm
+++ b/engine/battle/wild_encounters.asm
@@ -23,7 +23,7 @@ TryDoWildEncounter: ; 13870 (4:7870)
 	jr z, .lastRepelStep
 	ld [wRepelRemainingSteps], a
 .asm_1389e
-; determine if wild pokémon can appear in the half-block we’re standing in	
+; determine if wild pokemon can appear in the half-block we're standing in	
 ; is the bottom right tile (9,9) of the half-block we're standing in a grass/water tile?
 	hlCoord 9, 9
 	ld c, [hl]
@@ -35,9 +35,9 @@ TryDoWildEncounter: ; 13870 (4:7870)
 	cp c
 	ld a, [W_WATERRATE]
 	jr z, .CanEncounter
-; even if not in grass/water, standing anywhere we can encounter pokémon
-; so long as the map is “indoor” and has wild pokémon defined.
-; …as long as it’s not Viridian Forest or Safari Zone.
+; even if not in grass/water, standing anywhere we can encounter pokemon
+; so long as the map is "indoor" and has wild pokemon defined.
+; ...as long as it's not Viridian Forest or Safari Zone.
 	ld a, [W_CURMAP]
 	cp REDS_HOUSE_1F ; is this an indoor map?
 	jr c, .CantEncounter2
@@ -61,7 +61,7 @@ TryDoWildEncounter: ; 13870 (4:7870)
 	inc hl
 	jr .determineEncounterSlot
 .gotEncounterSlot
-; determine which wild pokémon (grass or water) can appear in the half-block we’re standing in
+; determine which wild pokemon (grass or water) can appear in the half-block we're standing in
 	ld c, [hl]
 	ld hl, W_GRASSMONS
 	aCoord 8, 9	
diff --git a/home.asm b/home.asm
index f66a098a..3bb81ec2 100644
--- a/home.asm
+++ b/home.asm
@@ -165,7 +165,6 @@ Joypad:: ; 01b9
 ReadJoypad:: ; 01c8 (0:01c8)
 	homecall_jump ReadJoypad_
 	
-INCLUDE "data/map_header_pointers.asm"
 INCLUDE "home/overworld.asm"
 
 
diff --git a/home/copy2.asm b/home/copy2.asm
index 318ed882..ad82260a 100644
--- a/home/copy2.asm
+++ b/home/copy2.asm
@@ -14,11 +14,11 @@ FarCopyDataDouble:: ; 15d4 (0:15d4)
 	ld e,a
 	ld a,b
 	and a
-	jr z,.8bitcopyamount
+	jr z,.eightbitcopyamount
 	ld a,c
 	and a ; multiple of $100
 	jr z, .expandloop ; if so, do not increment b because the first instance of dec c results in underflow
-.8bitcopyamount
+.eightbitcopyamount
 	inc b
 .expandloop
 	ld a,[de]
@@ -134,13 +134,13 @@ FillMemory:: ; 166e (0:166e)
 	push af
 	ld a,b
 	and a
-	jr z, .8bitcopyamount
+	jr z, .eightbitcopyamount
 	ld a,c
 	and a
-	jr z, .mulitpleof$100
-.8bitcopyamount
+	jr z, .mulitpleof0x100
+.eightbitcopyamount
 	inc b
-.multipleof$100
+.mulitpleof0x100
 	pop af
 .loop
 	ld [hli],a
diff --git a/home/overworld.asm b/home/overworld.asm
index b3008903..1530f8b3 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -287,16 +287,11 @@ OverworldLoopLessDelay:: ; 0245 (0:0245)
 	callab AnyPartyAlive
 	ld a,d
 	and a
-	jr z,.allPokemonFainted
+	jr z,AllPokemonFainted
 .noFaintCheck
 	ld c,$0a
 	call DelayFrames
 	jp EnterMap
-;.allPokemonFainted
-;	ld a,$ff
-;	ld [W_ISINBATTLE],a
-;	call RunMapScript
-;	jp HandleBlackOut
 
 StepCountCheck:: ; 0457 (0:0457)
 	ld a,[wd730]
@@ -316,6 +311,12 @@ StepCountCheck:: ; 0457 (0:0457)
 .doneStepCounting
 	ret
 
+AllPokemonFainted:: ; 0475 (0:0475)
+	ld a,$ff
+	ld [W_ISINBATTLE],a
+	call RunMapScript
+	jp HandleBlackOut
+
 ; function to determine if there will be a battle and execute it (either a trainer battle or wild battle)
 ; sets carry if a battle occurred and unsets carry if not
 NewBattle:: ; 0480 (0:0480)
@@ -638,7 +639,7 @@ CheckMapConnections:: ; 05db (0:05db)
 	ld [wCurrentTileBlockMapViewPointer + 1],a
 .loadNewMap ; 06ce (0:06ce)
 ; load the connected map that was entered
-	ld hl,[wd430]
+	ld hl,wd430
 	set 4,[hl]
 	ld a,$2
 	ld [wd431],a
diff --git a/home/serial.asm b/home/serial.asm
index a199de57..1f0146d9 100644
--- a/home/serial.asm
+++ b/home/serial.asm
@@ -309,4 +309,4 @@ Serial_TryEstablishingExternallyClockedConnection:: ; 22fa (0:22fa)
 	ld [hSerialReceiveData], a
 	ld a, START_TRANSFER_EXTERNAL_CLOCK
 	ld [rSC], a
-	ret
\ No newline at end of file
+	ret
diff --git a/macros.asm b/macros.asm
index 1a7aae56..a241672b 100644
--- a/macros.asm
+++ b/macros.asm
@@ -75,6 +75,7 @@ callsb: MACRO
 	ld a, BANK(\1)
 	call BankswitchCommon
 	call \1
+	ENDM
 	
 callba: MACRO
 	ld b, BANK(\1)
diff --git a/main.asm b/main.asm
index 96b22a64..cfebad5e 100755
--- a/main.asm
+++ b/main.asm
@@ -19,57 +19,9 @@ SECTION "bank1",ROMX,BANK[$1]
 
 INCLUDE "data/facing.asm"
 
-ResetStatusAndHalveMoneyOnBlackout::
-; Reset player status on blackout.
-	xor a
-	ld [wBattleResult], a
-	ld [wWalkBikeSurfState], a
-	ld [W_ISINBATTLE], a
-	ld [wMapPalOffset], a
-	ld [wNPCMovementScriptFunctionNum], a
-	ld [hJoyHeld], a
-	ld [wNPCMovementScriptPointerTableNum], a
-	ld [wFlags_0xcd60], a
-
-	ld [$ff9f], a
-	ld [$ff9f + 1], a
-	ld [$ff9f + 2], a
-	call HasEnoughMoney
-	jr c, .lostmoney ; never happens
-
-	; Halve the player's money.
-	ld a, [wPlayerMoney]
-	ld [$ff9f], a
-	ld a, [wPlayerMoney + 1]
-	ld [$ff9f + 1], a
-	ld a, [wPlayerMoney + 2]
-	ld [$ff9f + 2], a
-	xor a
-	ld [$ffa2], a
-	ld [$ffa3], a
-	ld a, 2
-	ld [$ffa4], a
-	predef DivideBCDPredef3
-	ld a, [$ffa2]
-	ld [wPlayerMoney], a
-	ld a, [$ffa2 + 1]
-	ld [wPlayerMoney + 1], a
-	ld a, [$ffa2 + 2]
-	ld [wPlayerMoney + 2], a
-
-.lostmoney
-	ld hl, wd732
-	set 2, [hl]
-	res 3, [hl]
-	set 6, [hl]
-	ld a, %11111111
-	ld [wJoyIgnore], a
-	predef_jump HealParty
-
-
-MewPicFront:: INCBIN "pic/bmon/mew.pic"
-MewPicBack::  INCBIN "pic/monback/mewb.pic"
-INCLUDE "data/baseStats/mew.asm"
+;MewPicFront:: INCBIN "pic/bmon/mew.pic"
+;MewPicBack::  INCBIN "pic/monback/mewb.pic"
+;INCLUDE "data/baseStats/mew.asm"
 
 INCLUDE "engine/battle/safari_zone.asm"
 
@@ -2032,9 +1984,9 @@ SECTION "bank3",ROMX,BANK[$3]
 
 INCLUDE "engine/joypad.asm"
 
-INCLUDE "data/map_songs.asm"
+;INCLUDE "data/map_songs.asm"
 
-INCLUDE "data/map_header_banks.asm"
+;INCLUDE "data/map_header_banks.asm"
 
 ClearVariablesAfterLoadingMapData: ; c335 (3:4335)
 	ld a, $90
@@ -4858,8 +4810,6 @@ INCLUDE "data/mapHeaders/fuchsiacity.asm"
 INCLUDE "data/mapObjects/fuchsiacity.asm"
 FuchsiaCityBlocks: INCBIN "maps/fuchsiacity.blk"
 
-INCLUDE "engine/play_time.asm"
-
 INCLUDE "scripts/pallettown.asm"
 INCLUDE "scripts/viridiancity.asm"
 INCLUDE "scripts/pewtercity.asm"
@@ -6671,14 +6621,14 @@ INCLUDE "engine/items/tm_prices.asm"
 
 SECTION "bank3c",ROMX,BANK[$3C]
 
-INCLUDE "yellow/bank3c/main.asm"
+INCLUDE "engine/bank3c/main.asm"
 
 SECTION "bank3d",ROMX,BANK[$3D]
 
-INCLUDE "yellow/bank3d/random.asm"
+INCLUDE "engine/bank3d/random.asm"
 
 SECTION "bank3e",ROMX,BANK[$3E]
 
 SECTION "bank3f",ROMX,BANK[$3F]
 
-INCLUDE "yellow/bank3f/main.asm"
\ No newline at end of file
+INCLUDE "engine/bank3f/main.asm"
diff --git a/wram.asm b/wram.asm
index 75f849ee..a2d5dc38 100755
--- a/wram.asm
+++ b/wram.asm
@@ -236,9 +236,9 @@ wLastMenuItem:: ; cc2a
 ; id of previously selected menu item
 	ds 1
 
-wcc2b:: ds 1
-wcc2c:: ds 1
-wcc2d:: ds 1
+wcc2b:: ds 1 ; used in party menu
+wcc2c:: ds 1 ; used in item related menus (inventory, pc)
+wcc2d:: ds 1 ; also used in inventory, supposed to save an item id
 
 wPlayerMoveListIndex:: ; cc2e
 	ds 1
@@ -265,14 +265,14 @@ wListScrollOffset:: ; cc36
 ; keeps track of what section of the list is on screen
 	ds 1
 
-wcc37:: ds 1
+wcc37:: ds 1 ; menu related thing, used in pokedex and dialog boxes
 
 wTradeCenterPointerTableIndex:: ; cc38
 	ds 1
 
 	ds 1
 
-wcc3a:: ds 1
+wcc3a:: ds 1 ; both used in home/text.asm
 wcc3b:: ds 1
 
 wDoNotWaitForButtonPressAfterDisplayingText:: ; cc3c
@@ -289,7 +289,7 @@ wLinkMenuSelectionReceiveBuffer:: ; cc3d
 ; two byte buffer
 ; the received menu selection is stored twice
 
-wcc3d:: ds 1
+wcc3d:: ds 1 ; not used for anything other than mentioned above
 
 wSerialExchangeNybbleReceiveData:: ; cc3e
 ; the final received nybble is stored here by Serial_ExchangeNybble
@@ -312,22 +312,22 @@ wLinkTimeoutCounter:: ; cc47
 wUnknownSerialCounter:: ; cc47
 ; 2 bytes
 
-wcc47:: ds 1
-wcc48:: ds 1
+wcc47:: ds 1 ; used in text id stuff
+wcc48:: ds 1 ; part of wUnknownSerialCounter
 
 wWhichTradeMonSelectionMenu:: ; cc49
 ; $00 = player mons
 ; $01 = enemy mons
 
-wcc49:: ds 1
+wcc49:: ds 1 ; used in some pokemon related stuff (some kind of species storage byte)
 
 wMenuWrappingEnabled:: ; cc4a
 ; set to 1 if you can go from the bottom to the top or top to bottom of a menu
 ; set to 0 if you can't go past the top or bottom of the menu
 	ds 1
 
-wcc4b:: ds 2
-wcc4d:: ds 1
+wcc4b:: ds 2 ; used as a joypad storage value
+wcc4d:: ds 1 ; used in sprite hiding/showing related operations
 
 wPredefID:: ; cc4e
 	ds 1
@@ -355,13 +355,13 @@ wBoostExpByExpAll:: ; cc5b
 wAnimationType:: ; cc5b
 ; values between 0-6. Shake screen horizontally, shake screen vertically, blink Pokemon...
 
-wcc5b:: ds 1
-wcc5c:: ds 1
-wcc5d:: ds 1
-wcc5e:: ds 13
+wcc5b:: ds 1 ; these upcoming values below are miscellaneous storage values
+wcc5c:: ds 1 ; used in pokedex evaluation as well
+wcc5d:: ds 1 ; used in pokedex evaluation
+wcc5e:: ds 13 ; as well as used as miscellaneous storage value, this is also used for the game corner slots
 
-wcc6b:: ds 14
-wcc79:: ds 30
+wcc6b:: ds 14 ; doesn't seem to be used for anything, probably just more storage
+wcc79:: ds 30 ; used in battle animations
 
 wNPCMovementDirections2:: ; cc97
 
@@ -369,7 +369,7 @@ wSwitchPartyMonTempBuffer:: ; cc97
 ; temporary buffer when swapping party mon data
 	ds 10
 
-wcca1:: ds 49
+wcca1:: ds 49 ; used in overworld npc movement
 
 wRLEByteCount:: ; ccd2
 	ds 1
@@ -379,8 +379,8 @@ wSimulatedJoypadStatesEnd:: ; ccd3
 ; the list starts above this address and extends downwards in memory until here
 ; overloaded with below labels
 
-wccd3:: ds 1
-wccd4:: ds 1
+wccd3:: ds 1 ; used in battle, pokemon, PC and game corner stuff
+wccd4:: ds 1 ; used in evolving pokemon and has a direct reference for simulated joypad stuff in vermillion and seafoam
 
 ; if [ccd5] != 1, the second AI layer is not applied
 wAILayer2Encouragement:: ; ccd5
@@ -393,7 +393,7 @@ wPlayerSubstituteHP:: ; ccd7
 wEnemySubstituteHP:: ; ccd8
 	ds 1
 
-wccd9:: ds 2
+wccd9:: ds 2 ; used in InitBattleVariablesLoop (written to after the loop is finished)
 
 wMoveMenuType:: ; ccdb
 ; 0=regular, 1=mimic, 2=above message box (relearn, heal pp..)
@@ -416,8 +416,8 @@ wAICount:: ; ccdf
 wEnemyMoveListIndex:: ; cce2
 	ds 1
 
-wcce3:: ds 1
-wcce4:: ds 1
+wcce3:: ds 1 ; used in battle-related text functions
+wcce4:: ds 1 ; used in battle-related text functions
 
 wTotalPayDayMoney:: ; cce5
 ; total amount of money made using Pay Day during the current battle
@@ -430,20 +430,20 @@ wSafariBaitFactor:: ; cce9
 
 	ds 1
 
-wcceb:: ds 1
-wccec:: ds 1
+wcceb:: ds 1 ; used to save the dvs of a mon when it uses transform
+wccec:: ds 1 ; also used with above case
 
 wMonIsDisobedient:: ds 1 ; cced
 
-wPlayerDisabledMoveNumber:: ds 1 ; ccee 
+wPlayerDisabledMoveNumber:: ds 1 ; ccee
 wEnemyDisabledMoveNumber:: ds 1 ; ccef
 
-wccf0:: ds 1
+wccf0:: ds 1 ; used as a check if a mon fainted
 
 wPlayerUsedMove:: ds 1 ; ccf1
 wEnemyUsedMove:: ds 1 ; ccf2
 
-wccf3:: ds 1
+wccf3:: ds 1 ; used with the move minimize
 
 wMoveDidntMiss:: ds 1 ; ccf4
 
@@ -451,8 +451,8 @@ wPartyFoughtCurrentEnemyFlags:: ; ccf5
 ; flags that indicate which party members have fought the current enemy mon
 	flag_array 6
 
-wccf6:: ds 1
-wccf7:: ds 14
+wccf6:: ds 1 ; used in some hp bar thing
+wccf7:: ds 14 ; used with substitute move sliding thing? (not sure)
 
 wUnknownSlotVar:: ; cd05
 
@@ -557,7 +557,7 @@ wInGameTradeReceiveMonSpecies::
 
 wNPCMovementDirections2Index:: ; cd37
 
-wcd37:: ds 1
+wcd37:: ds 1 ; used in list menus, like the fossil lab menu or drink girl menu. Also used in link menu.
 
 wSimulatedJoypadStatesIndex:: ; cd38
 ; the next simulated joypad state is at wSimulatedJoypadStatesEnd plus this value minus 1
@@ -628,7 +628,8 @@ wPlayerSpinWhileMovingUpOrDownAnimFrameDelay:: ; cd3f
 wHiddenObjectIndex:: ; cd3f
 
 wTrainerFacingDirection:: ; cd3f
-wcd3f::
+
+wcd3f:: ; used with daycare text for money amount
 	ds 1
 
 wPlayerSpinInPlaceAnimSoundID:: ; cd40
@@ -644,34 +645,35 @@ wHiddenObjectX:: ; cd41
 
 wTrainerScreenX:: ; cd41
 	ds 1
+; a lot of the uses for these values use more than the said address
 
-wcd42:: ds 1
-wcd43:: ds 1
-wcd44:: ds 1
-wcd45:: ds 1
-wcd46:: ds 1
-wcd47:: ds 1
-wcd48:: ds 1
-wcd49:: ds 1
-wcd4a:: ds 1
-wcd4b:: ds 1
+wcd42:: ds 1 ; used in pewter center script, printing field mon moves, slot machines and HoF PC
+wcd43:: ds 1 ; slot machine stuff and GetMonFieldMoves
+wcd44:: ds 1 ; just slot machine
+wcd45:: ds 1 ; slot machine...
+wcd46:: ds 1 ; slot machine...
+wcd47:: ds 1 ; used in slot machine and spinning player sprite
+wcd48:: ds 1 ; same as above
+wcd49:: ds 1 ; used in slot machine, displaying the gym leaders/badges on the trainer card, and displaying the town map
+wcd4a:: ds 1 ; probably used in one of the above mentioned functions
+wcd4b:: ds 1 ; same as above
 
 wTradedPlayerMonOTID:: ; cd4c
 
-wcd4c:: ds 1
-wcd4d:: ds 1
+wcd4c:: ds 1 ; slot machine and probably other above stuff
+wcd4d:: ds 1 ; used with cut and slot machine
 
 wTradedEnemyMonOT:: ; cd4e
 
-wcd4e:: ds 1
-wcd4f:: ds 1
-wcd50:: ds 9
+wcd4e:: ds 1 ; used with in-game trades and slot machine
+wcd4f:: ds 1 ; used with in-game trades, emotion bubbles, and player animations
+wcd50:: ds 9 ; used with in-game trades, emotion bubbles, and player and miscellaneous sprite animations
 
 wTradedEnemyMonOTID:: ; cd59
 	ds 2
 
-wcd5b:: ds 1
-wcd5c:: ds 1
+wcd5b:: ds 1 ; used in some sprite stuff, town map and surge gym trash cans
+wcd5c:: ds 1 ; used in town map
 
 wMonPartySpriteSpecies:: ; cd5d
 	ds 1
@@ -693,18 +695,19 @@ wFlags_0xcd60:: ; cd60
 
 	ds 9
 
-wcd6a:: ds 1
+wcd6a:: ds 1 ; used as the output of the outcome of an item (successful, unsuccessful, can't be used now, etc.)
 
 wJoyIgnore:: ; cd6b
 ; Set buttons are ignored.
 	ds 1
 
-wcd6c:: ds 1
-wcd6d:: ds 4
-wcd71:: ds 1
-wcd72:: ds 5
-wcd77:: ds 1
-wcd78:: ds 9
+; as well as the said function, these values are used as a buffer for PlaceString
+wcd6c:: ds 1 ; used in pokemon status screen and battle stuff
+wcd6d:: ds 4 ; used solely for PlaceString
+wcd71:: ds 1 ; used with pokemon status screen
+wcd72:: ds 5 ; used with restoring PP
+wcd77:: ds 1 ; used as an end terminator for GetMonName: (@ is written to this location)
+wcd78:: ds 9 ; also used with restoring PP
 
 wSerialOtherGameboyRandomNumberListBlock:: ; cd81
 ; buffer for transferring the random number list generated by the other gameboy
@@ -724,23 +727,24 @@ wHPBarNewHP:: ; ceed
 wHPBarDelta:: ; ceef
 	ds 1
 
-wcef0:: ds 1
-wcef1:: ds 12
+wcef0:: ds 1  ; used with HP bar stuff, probably used with wBuffer too.
+wcef1:: ds 12 ; same case as above
 
 wHPBarHPDifference:: ; cefd
 	ds 1
 	ds 7
 
-wcf05:: ds 1
-wcf06:: ds 1
+wcf05:: ds 1 ; used with enemy using healing moves
+wcf06:: ds 1 ; used with healing items as a storage value to store wWhichPokemon
 
 wAnimSoundID:: ; cf07
 ; sound ID during battle animations
 	ds 1
 
-wcf08:: ds 1
-wcf09:: ds 1
-wcf0a:: ds 1
+wcf08:: ds 1 ; used as a storage value for the bank to return to after a BankswitchHome (bankswitch in homebank)
+wcf09:: ds 1 ; used as a temp storage value for the bank to switch to
+wcf0a:: ds 1 ; used as flags for Poke Mart
+
 wBattleResult:: ; cf0b
 ; $00 - win
 ; $01 - lose
@@ -751,16 +755,16 @@ wAutoTextBoxDrawingControl:: ; cf0c
 ; bit 0: if set, DisplayTextID automatically draws a text box
 	ds 1
 
-wcf0d:: ds 1
-wcf0e:: ds 1
-wcf0f:: ds 1
+wcf0d:: ds 1 ; used with some overworld scripts (not exactly sure what it's used for)
+wcf0e:: ds 1 ; used with some overworld collison check
+wcf0f:: ds 1 ; used with moving overworld sprites
 
 wNPCMovementScriptFunctionNum:: ; cf10
 ; which script function within the pointer table indicated by
 ; wNPCMovementScriptPointerTableNum
 	ds 1
 
-wcf11:: ds 1
+wcf11:: ds 1 ; used as a flag if the game needs to switch to the bank which the map is in when displaying a text id (flag is set during predefs)
 
 wPredefParentBank:: ; cf12
 	ds 1
@@ -777,23 +781,23 @@ wNPCMovementScriptSpriteOffset:: ; cf17
 ; sprite offset of sprite being controlled by NPC movement script
 	ds 1
 
-wcf18:: ds 2
+wcf18:: ds 2 ; used with overworld movement
 
 wOnSGB:: ; cf1b
 ; if running on SGB, it's 1, else it's 0
 	ds 1
 
-wcf1c:: ds 1
-wcf1d:: ds 1
-wcf1e:: ds 1
-wcf1f:: ds 6
-wcf25:: ds 8
-wcf2d:: ds 1
-wcf2e:: ds 2
-wcf30:: ds 7
-wcf37:: ds 20
-wcf4b:: ds 1
-wcf4c:: ds 1
+wcf1c:: ds 1 ; used with sgb palettes
+wcf1d:: ds 1 ; used when displaying palettes for Pokemon
+wcf1e:: ds 1 ; used to display palettes for HP bar
+wcf1f:: ds 6 ; used to display HP bars in Pokemon Menu (probably palettes)
+wcf25:: ds 8 ; used to display HP bar for Pokemon Status Screen (probably palettes too)
+wcf2d:: ds 1 ; also used to display HP bar for Pokemon Menu (something about HP colour)
+wcf2e:: ds 2 ; more HP bar palette stuff.
+wcf30:: ds 7 ; used with palettes (apparently for Pokedex)
+wcf37:: ds 20 ; used with palletes too (used for Party Menu)
+wcf4b:: ds 1 ; storage buffer for various strings
+wcf4c:: ds 1 ; used with displaying EXP value, probably also overflowed with wcf4b
 wGainBoostedExp:: ; cf4d
     ds 1
 	ds 17
@@ -810,19 +814,19 @@ wStringBuffer3:: ; cf81
 wList:: ; cf8b
 	ds 2
 
-wcf8d:: ds 1
-wcf8e:: ds 1
+wcf8d:: ds 1 ; used in GetMonName
+wcf8e:: ds 1 ; also used in GetMonName (probably as a pointer)
 
 wItemPrices:: ; cf8f
 	ds 2
 
-wcf91:: ds 1
+wcf91:: ds 1 ; used with a lot of things (too much to list here)
 
 wWhichPokemon:: ; cf92
 ; which pokemon you selected
 	ds 1
 
-wcf93:: ds 1
+wcf93:: ds 1 ; used with lists
 
 wHPBarType:: ; cf94
 ; type of HP bar
@@ -834,9 +838,9 @@ wListMenuID:: ; cf94
 ; ID used by DisplayListMenuID
 	ds 1
 
-wcf95:: ds 1
-wcf96:: ds 1
-wcf97:: ds 1
+wcf95:: ds 1 ; used with RemovePokemon (BoxMons, Daycare, Trades, etc.)
+wcf96:: ds 1 ; used with removing items
+wcf97:: ds 1 ; used with printing item quantities?
 
 ; LoadMonData copies mon data here
 wLoadedMon:: party_struct wLoadedMon ; cf98
@@ -860,9 +864,9 @@ wMusicHeaderPointer:: ; cfc7
 ; (the current music channel address - $4000) / 3
 	ds 1
 
-wcfc8:: ds 1
-wcfc9:: ds 1
-wcfca:: ds 1
+wcfc8:: ds 1 ; used with audio
+wcfc9:: ds 1 ; also used with audio
+wcfca:: ds 1 ; also used with audio too
 
 wUpdateSpritesEnabled:: ; cfcb
 ; $01 enables UpdateSprites; anything else disables it
@@ -949,10 +953,11 @@ W_TRAINERCLASS:: ; d031
 wTrainerPicPointer:: ; wd033
 	ds 2
 	ds 1
-wd036:: ds 16
-wd046:: ds 1
-wd047:: ds 1
-wd048:: ds 2
+
+wd036:: ds 16 ; used as a temporary buffer to print "XXX learned YYY"
+wd046:: ds 1 ; used with trainer pointer stuff (not exactly sure, but the label is incremented and loaded with a value, so wd047 is accessed)
+wd047:: ds 1 ; used with unloading trainer data?
+wd048:: ds 2 ; used as a pointer for missable object loop
 
 W_TRAINERNAME:: ; d04a
 ; 13 bytes for the letters of the opposing trainer
@@ -988,7 +993,7 @@ wDamageMultipliers:: ; d05b
    ;  $a = neutral
    ; $14 = super-effective
 ; bit 7: STAB
-    ds 1
+	ds 1
 
 W_LONEATTACKNO:: ; d05c
 ; which entry in LoneAttacks to use
@@ -1107,17 +1112,17 @@ wEscapedFromBattle::
 ; non-zero when an item or move that allows escape from battle was used
 	ds 1
 
-wd079:: 
-wAmountMoneyWon:: ds 1 ; wd079 - wd07b
-wd07a:: ds 1
-	ds 1
+wAmountMoneyWon:: ; wd079 - wd07b
+wd079:: ds 1 ; used as a value to print the money won from a battle, as well as a misc. value in seafoam
+wd07a:: ds 1 ; same case as above
+wd07b:: ds 1 ; used as a buffer to convert the money won from a battle into BCD
 
 W_ANIMATIONID:: ; d07c
 ; ID number of the current battle animation
 	ds 1
 
-wd07d:: ds 1
-wd07e:: ds 3
+wd07d:: ds 1 ; used with naming functions and party display type
+wd07e:: ds 3 ; used with mart and inventory
 
 ; base coordinates of frame block
 W_BASECOORDX:: ; d081
@@ -1133,7 +1138,7 @@ W_FBTILECOUNTER:: ; d084
 ; counts how many tiles of the current frame block have been drawn
 	ds 1
 
-wd085:: ds 1
+wd085:: ds 1 ; used with animating water/flowers
 
 W_SUBANIMFRAMEDELAY:: ; d086
 ; duration of each frame of the current subanimation in terms of screen refreshes
@@ -1142,7 +1147,7 @@ W_SUBANIMCOUNTER:: ; d087
 ; counts the number of subentries left in the current subanimation
 	ds 1
 
-wd088:: ds 1
+wd088:: ds 1 ; savefile checksum (if file is corrupted)
 
 W_NUMFBTILES:: ; d089
 ; number of tiles in current battle animation frame block
@@ -1151,7 +1156,7 @@ W_NUMFBTILES:: ; d089
 wTradedMonMovingRight:: ; d08a
 ; $01 if mon is moving from left gameboy to right gameboy; $00 if vice versa
 
-wd08a:: ds 1
+wd08a:: ds 1 ; used with sprites and displaying the option menu on the main menu screen?
 
 wTownMapSpriteBlinkingCounter:: ; d08b
 
@@ -1187,13 +1192,13 @@ W_SUBANIMSUBENTRYADDR:: ; d096
 
 	ds 2
 
-wd09a:: ds 1
+wd09a:: ds 1 ; used with the battle transition screen when entering a battle (screen slowly draws into black)
 
 wTownMapSpriteBlinkingEnabled:: ; d09b
 ; non-zero when enabled. causes nest locations to blink on and off.
 ; the town selection cursor will blink regardless of what this value is
 
-wd09b:: ds 1
+wd09b:: ds 1 ; also used with battle transition screen and move animations
 
 W_FBDESTADDR:: ; d09c
 ; current destination address in OAM for frame blocks (big endian)
@@ -1213,8 +1218,8 @@ W_FBMODE:: ; d09e
 
 wNewTileBlockID:: ; d09f
 
-wd09f:: ds 1
-wd0a0:: ds 1
+wd09f:: ds 1 ; used with predef ReplaceTileBlock
+wd0a0:: ds 1 ; used in VBlank and ChangeBGPalColor0_4Frames
 
 W_SPRITECURPOSX:: ; d0a1
 	ds 1
@@ -1263,7 +1268,7 @@ W_SPRITEDECODETABLE1PTR:: ; d0b3
 ; pointer to differential decoding table (assuming initial value 1)
 	ds 2
 
-wd0b5:: ds 1
+wd0b5:: ds 1 ; used as a temp storage area for Pokemon Species, and other Pokemon/Battle related things
 
 wNameListType:: ; d0b6
 	ds 1
@@ -1315,7 +1320,7 @@ W_MONHLEARNSET:: ; d0cc
 	flag_array 50 + 5
 	ds 1
 
-wd0d4:: ds 3
+wd0d4:: ds 3 ; temp storage for hTilesetType
 
 W_MONHPADDING:: ; d0d7
 
@@ -1338,50 +1343,50 @@ wMoveNum:: ; d0e0
 wMovesString:: ; d0e1
 	ds 56
 
-wd119:: ds 1
+wd119:: ds 1 ; written to from W_CURMAPTILESET but never read
 
 wWalkBikeSurfStateCopy:: ; d11a
 ; wWalkBikeSurfState is sometimes copied here, but it doesn't seem to be used for anything
 	ds 1
 
-wd11b:: ds 1
-wd11c:: ds 1
-wd11d:: ds 1
-wd11e:: ds 1
-wd11f:: ds 1
+wd11b:: ds 1 ; used with mart text box and cable club
+wd11c:: ds 1 ; temp storage value for catching pokemon
+wd11d:: ds 1 ; used with battle switchout and testing if the enemy mon fainted
+wd11e:: ds 1 ; used as a Pokemon and Item storage value. Also used as an output value for CountSetBits
+wd11f:: ds 1 ; used when running from battle and PartyMenuInit
 
 wNumRunAttempts::
 ; number of times the player has tried to run from battle
 	ds 1
 
-wd121:: ds 1
-wd122:: ds 2
-wd124:: ds 1
+wd121:: ds 1 ; used with evolving pokemon
+wd122:: ds 2 ; saved ROM bank number for vblank
+wd124:: ds 1 ; used as an output value when determining if an item is a key item
 
 wTextBoxID:: ; d125
 	ds 1
 
-wd126:: ds 1
+wd126:: ds 1 ; not exactly sure what this is used for, but it seems to be used as a multipurpose temp flag value
 
 W_CURENEMYLVL:: ; d127
 	ds 1
 
-wd128:: ds 1
-wd129:: ds 1
-wd12a:: ds 1
+wd128:: ds 1 ; used as a pointer to displaying Poke Mart inventory, also used to store the pointer of LoadItemList (pointer to item list initially in hl)
+wd129:: ds 1 ; second half of above mentioned pointer
+wd12a:: ds 1 ; Number of list entries for displaying a list
 
 wLinkState:: ; d12b
 	ds 1
 
 wTwoOptionMenuID:: ds 1
-wd12d:: ds 1
-wd12e:: ds 1
-wd12f:: ds 1
-wd130:: ds 1
-wd131:: ds 1
-wd132:: ds 1
-wd133:: ds 6
-wd139:: ds 1
+wd12d:: ds 1 ; used with item menus and pokemart menu, also used with testing if all Pokemon Fainted?
+wd12e:: ds 1 ; used as an output value to determine if A or B was pressed in a yes/no box
+wd12f:: ds 1 ; used in some coordinatestuff, npc pathstuff, and game corner prize stuff
+wd130:: ds 1 ; saved value of screen Y coord of trainer sprite
+wd131:: ds 1 ; saved value of screen X coord of trainer sprite
+wd132:: ds 1 ; saved value of map Y coordinate of trainer sprite (not sure for purpose)
+wd133:: ds 6 ; saved value of map X coordinate of trainer sprite
+wd139:: ds 1 ; backup of selected menu entry for game corner prizes
 
 wIgnoreInputCounter:: ; d13a
 ; counts downward each frame
@@ -1408,9 +1413,9 @@ W_PRIZE3:: ; d13f
 wSerialRandomNumberListBlock:: ; d141
 ; the first 7 bytes are the preamble
 
-wd141:: ds 2
-wd143:: ds 2
-wd145:: ds 3
+wd141:: ds 2 ; prices for prizes
+wd143:: ds 2 ; prices for prizes
+wd145:: ds 3 ; prices for prizes
 
 wLinkBattleRandomNumberList:: ; d148
 ; shared list of 9 random numbers, indexed by wLinkBattleRandomNumberListIndex
@@ -1419,11 +1424,10 @@ wLinkBattleRandomNumberList:: ; d148
 wSerialPlayerDataBlock:: ; d152
 ; the first 6 bytes are the preamble
 
-wd152:: ds 1
-wd153:: ds 3
-wd156:: ds 1
-wd157:: ds 1
-
+wd152:: ds 1 ; used as a temporary storage for the item used
+wd153:: ds 3 ; written to during pokedex flag action but doesn't seem to be read from
+wd156:: ds 1 ; evolution stone ID used
+wd157:: ds 1 ; used with oak's lab script (related to npc movement directions), possibly indirectly accessed with values below
 
 wPlayerName:: ; d158
 	ds 11
@@ -1484,13 +1488,13 @@ W_OBTAINEDBADGES:: ; d356
 
 	ds 1
 
-wd358:: ds 1
+wd358:: ds 1 ; bit 0 set = no delay when printing text (W_OPTIONS is still checked though)
 
 wPlayerID:: ; d359
 	ds 2
 
-wd35b:: ds 1
-wd35c:: ds 1
+wd35b:: ds 1 ; used with audio stuff
+wd35c:: ds 1 ; storage for audio bank for current map?
 
 wMapPalOffset:: ; d35d
 ; offset subtracted from FadePal4 to get the background and object palettes for the current map
@@ -1521,7 +1525,7 @@ W_XBLOCKCOORD:: ; d364
 wLastMap:: ; d365
 	ds 1
 
-wd366:: ds 1
+wd366:: ds 1 ; W_CURMAPWIDTH of the last outdoor map visited when entering an inside map
 
 W_CURMAPTILESET:: ; d367
 	ds 1
@@ -1550,7 +1554,7 @@ W_MAPCONNECTIONS:: ; d370
 W_MAPCONN1PTR:: ; d371
 	ds 1
 
-wd372:: ds 1
+wd372:: ds 1 ; some connection stuff, too bothered to label it
 wd373:: ds 1
 wd374:: ds 1
 wd375:: ds 1
@@ -1611,9 +1615,9 @@ W_SPRITESETID:: ; d3a8
 ; sprite set ID for the current map
 	ds 1
 
-wd3a9:: ds 1
-wd3aa:: ds 3
-wd3ad:: ds 1
+wd3a9:: ds 1 ; used when getting the object data pointer
+wd3aa:: ds 3 ; second part of the pointer
+wd3ad:: ds 1 ; used as the beginning value for copying warp data
 
 wNumberOfWarps:: ; d3ae
 ; number of warps in current map
@@ -1630,21 +1634,27 @@ wDestinationWarpID:: ; d42f
 wd430:: ds 1 ; d430
 wd431:: ds 1 ; d431
 
-	ds 3
+	ds 2
 
+wd434:: ds 1
 wd435:: ds 1
 wd436:: ds 1
 
-	ds 60
-	
+	ds 19
+
+wd44a:: ds 1
+wd44b:: ds 1
+
+	ds 39
+
 wd472:: ds 1
 wd473:: ds 1
 
 	ds 61
 
-wd4b0:: ds 1
-wd4b1:: ds 32
-wd4d1:: ds 16
+wd4b0:: ds 1 ; number of signs on the map
+wd4b1:: ds 32 ; starting address for sign coords
+wd4d1:: ds 16 ; starting address for sign text IDs
 
 W_NUMSPRITES:: ; d4e1
 ; number of sprites on the current map
@@ -1665,16 +1675,16 @@ W_MAPSPRITEEXTRADATA:: ; d504
 ; two bytes per sprite (trainer class/item ID, trainer set ID)
 	ds 32
 
-wd524:: ds 1
-wd525:: ds 1
+wd524:: ds 1 ; map height in 2x2 metatiles, also used with checking connections
+wd525:: ds 1 ; map width in 2x2 metatiles, also used with checking connections
 
 wMapViewVRAMPointer:: ; d526
 ; the address of the upper left corner of the visible portion of the BG tile map in VRAM
 	ds 2
 
-wd528:: ds 1
-wd529:: ds 1
-wd52a:: ds 1
+wd528:: ds 1 ; additional storage for directions
+wd529:: ds 1 ; same case as above, but used differently
+wd52a:: ds 1 ; same case as above
 
 W_TILESETBANK:: ; d52b
 	ds 1
@@ -1705,9 +1715,9 @@ wBoxItems:: ; d53b
 	ds 50 * 2
 	ds 1 ; end
 
-wd5a0:: ds 2
-wd5a2:: ds 1
-wd5a3:: ds 1
+wd5a0:: ds 2 ; current box number
+wd5a2:: ds 1 ; number of HOF teams
+wd5a3:: ds 1 ; unused? (written to when loading map data)
 
 wPlayerCoins:: ; d5a4
 	ds 2 ; BCD
@@ -1716,7 +1726,7 @@ W_MISSABLEOBJECTFLAGS:: ; d5a6
 ; bit array of missable objects. set = removed
 	ds 39
 
-wd5cd:: ds 1
+wd5cd:: ds 1 ; temp copy of c1x2 (sprite facing/anim)
 
 W_MISSABLEOBJECTLIST:: ; d5ce
 ; each entry consists of 2 bytes
@@ -1941,8 +1951,8 @@ W_ROUTE18GATECURSCRIPT:: ; d669
 
 	ds 134
 
-wd6f0:: ds 14
-wd6fe:: ds 2
+wd6f0:: ds 14 ; flags for hidden items?
+wd6fe:: ds 2 ; flags for hidden coins?
 
 wWalkBikeSurfState:: ; d700
 ; $00 = walking
@@ -1995,7 +2005,7 @@ wDestinationMap:: ; d71a
 ; destination map (for certain types of special warps, not ordinary walking)
 	ds 1
 
-wd71b:: ds 1
+wd71b:: ds 1 ; written to but doesn't seem to be read
 
 wTileInFrontOfBoulderAndBoulderCollisionResult:: ; d71c
 ; used to store the tile in front of the boulder when trying to push a boulder
@@ -2010,7 +2020,7 @@ wWhichDungeonWarp:: ; d71e
 ; which dungeon warp within the source map was used
 	ds 1
 
-wd71f:: ds 9
+wd71f:: ds 9 ; used with card key
 
 wd728::
 ; bit 0: using Strength outside of battle
@@ -2018,14 +2028,15 @@ wd728::
 
 	ds 1
 
-wd72a:: ds 2
+wd72a:: ds 2 ; flags for if a gym is beaten, also used to determine whether to display your name on the gym statues
 
 wd72c:: ; d72c
 ; bit 0: if not set, the 3 minimum steps between random battles have passed
 	ds 1
 
-wd72d:: ds 1
-wd72e:: ds 2
+wd72d:: ds 1 ; misc temp flags? (in some scripts, bit 6 and 7 set after a special battle (e.g. gym leaders) has been won)
+             ; also used as a start menu flag
+wd72e:: ds 2 ; more temp misc flags, used with npc movement, main menu and other stuff
 
 wd730::
 ; bit 0: NPC sprite being moved by script
@@ -2055,7 +2066,7 @@ W_FLAGS_D733:: ; d733
 ; bit 7: used fly out of battle
 	ds 1
 
-wd734:: ds 2
+wd734:: ds 2 ; flag for indigo plateau and lorelei (not sure what it's for)
 
 wd736:: ; d736
 ; bit 0: check if the player is standing on a door and make him walk down a step if so
@@ -2069,8 +2080,8 @@ wCompletedInGameTradeFlags:: ; d737
 
 	ds 2
 
-wd73b:: ds 1
-wd73c:: ds 3
+wd73b:: ds 1 ; used with elevator warps
+wd73c:: ds 3 ; also used with elevator warps
 
 wCardKeyDoorY:: ; d73f
 	ds 1
@@ -2080,9 +2091,9 @@ wCardKeyDoorX:: ; d740
 
 	ds 2
 
-wd743:: ds 1
-wd744:: ds 3
-wd747:: ds 3
+wd743:: ds 1 ; used with surge gym trash cans
+wd744:: ds 3 ; also used with surge gym trash cans
+wd747:: ds 3 ; below here are mostly in game flags
 wd74a:: ds 1
 
 wd74b:: ; d74b
@@ -2228,7 +2239,6 @@ W_GRASSRATE:: ; d887
 W_GRASSMONS:: ; d888
 	ds 20
 
-
 wEnemyPartyCount:: ds 1     ; d89c
 wEnemyPartyMons::  ds PARTY_LENGTH + 1 ; d89d
 
@@ -2249,7 +2259,7 @@ W_TRAINERHEADERPTR:: ; da30
 
 	ds 6
 
-wda38:: ds 1
+wda38:: ds 1 ; used with cinnabar gym questions and pokemon tower 7F?
 
 W_CURMAPSCRIPT:: ; da39
 ; index of current map script, mostly used as index for function pointer array
diff --git a/yellow/audio.asm b/yellow/audio.asm
new file mode 100755
index 00000000..e94c7db5
--- /dev/null
+++ b/yellow/audio.asm
@@ -0,0 +1,2 @@
+INCLUDE "yellow.asm"
+INCLUDE "audio.asm"
diff --git a/yellow/main.asm b/yellow/main.asm
new file mode 100755
index 00000000..36c88720
--- /dev/null
+++ b/yellow/main.asm
@@ -0,0 +1,2 @@
+INCLUDE "yellow.asm"
+INCLUDE "main.asm"
diff --git a/yellow/text.asm b/yellow/text.asm
new file mode 100755
index 00000000..a84a633d
--- /dev/null
+++ b/yellow/text.asm
@@ -0,0 +1,2 @@
+INCLUDE "yellow.asm"
+INCLUDE "text.asm"
diff --git a/yellow/wram.asm b/yellow/wram.asm
new file mode 100755
index 00000000..c0b7f781
--- /dev/null
+++ b/yellow/wram.asm
@@ -0,0 +1,2 @@
+INCLUDE "yellow.asm"
+INCLUDE "wram.asm"