Identify more unnamed labels

2 files changed, 64 insertions, 67 deletions

diff --git a/audio/cries.asm b/audio/cries.asm
index f7aef295..352ce321 100644
--- a/audio/cries.asm
+++ b/audio/cries.asm
@@ -221,9 +221,9 @@ Cry_Magcargo_Ch6:
 
 Cry_Magcargo_Ch8:
 	noise_note 2, 14, 8, 59
-Cry_Magcargo_branch_f2eb5:
+.loop:
 	noise_note 1, 15, 1, 78
-	sound_loop 5, Cry_Magcargo_branch_f2eb5
+	sound_loop 5, .loop
 	noise_note 2, 13, 8, 63
 	noise_note 20, 12, 2, 95
 	sound_ret
@@ -348,7 +348,6 @@ Cry_Marill_Ch8:
 Cry_Togepi_Ch5:
 	pitch_offset 2
 Cry_Togepi_Ch6:
-Cry_Togetic_branch_f2fe2:
 	duty_cycle_pattern 1, 1, 0, 2
 	square_note 4, 15, 1, 1942
 	square_note 4, 15, 1, 1837
@@ -359,7 +358,7 @@ Cry_Togetic_branch_f2fe2:
 Cry_Togetic_Ch5:
 	pitch_offset 2
 Cry_Togetic_Ch6:
-	sound_call Cry_Togetic_branch_f2fe2
+	sound_call Cry_Togepi_Ch6
 	sound_loop 2, Cry_Togetic_Ch6
 	square_note 14, 0, 0, 0
 	square_note 8, 15, 2, 1986
@@ -436,12 +435,12 @@ Cry_Hoothoot_Ch5:
 
 Cry_Hoothoot_Ch6:
 	duty_cycle_pattern 0, 2, 0, 2
-Cry_Hoothoot_branch_f30bb:
+.loop1:
 	square_note 2, 10, 1, 1536
-	sound_loop 3, Cry_Hoothoot_branch_f30bb
-Cry_Hoothoot_branch_f30c3:
+	sound_loop 3, .loop1
+.loop2:
 	square_note 2, 10, 1, 1584
-	sound_loop 4, Cry_Hoothoot_branch_f30c3
+	sound_loop 4, .loop2
 	square_note 4, 10, 2, 1588
 	square_note 4, 9, 1, 1592
 	sound_ret
@@ -456,11 +455,11 @@ Cry_Hoothoot_Ch8:
 Cry_Sentret_Ch5:
 	pitch_offset 32
 	duty_cycle 0
-	sound_jump Cry_Sentret_branch_f30eb
+	sound_jump Cry_Sentret_Ch6.body
 
 Cry_Sentret_Ch6:
 	duty_cycle_pattern 0, 1, 2, 3
-Cry_Sentret_branch_f30eb:
+.body:
 	square_note 8, 3, -1, 1837
 	square_note 8, 15, 1, 1824
 	sound_ret
@@ -473,12 +472,11 @@ Cry_Sentret_Ch8:
 Cry_Mareep_Ch5:
 	pitch_offset 32
 	duty_cycle 0
-	sound_jump Cry_Mareep_branch_f3105
+	sound_jump Cry_Mareep_Ch6.body
 
 Cry_Mareep_Ch6:
 	duty_cycle_pattern 0, 0, 0, 1
-Cry_Mareep_branch_f3105:
-Cry_Gligar_branch_f3105:
+.body:
 	square_note 4, 3, -2, 1853
 	square_note 6, 15, 8, 1890
 	square_note 6, 15, 8, 1888
@@ -490,14 +488,14 @@ Cry_Cyndaquil_Ch5:
 Cry_Cyndaquil_Ch6:
 	duty_cycle 2
 	square_note 8, 2, -7, 263
-Cry_Cyndaquil_branch_f311f:
+.loop1:
 	square_note 0, 14, 1, 1155
 	square_note 0, 5, 1, 1102
-	sound_loop 4, Cry_Cyndaquil_branch_f311f
-Cry_Cyndaquil_branch_f312b:
+	sound_loop 4, .loop1
+.loop2:
 	square_note 0, 14, 1, 986
 	square_note 1, 5, 1, 786
-	sound_loop 4, Cry_Cyndaquil_branch_f312b
+	sound_loop 4, .loop2
 	sound_ret
 
 Cry_Gligar_Ch8:
@@ -524,16 +522,16 @@ Cry_Chikorita_Ch8:
 
 Cry_Gligar_Ch5:
 	duty_cycle_pattern 2, 2, 0, 2
-	sound_jump Cry_Gligar_branch_f3105
+	sound_jump Cry_Mareep_Ch6.body
 
 Cry_Girafarig_Ch5:
 	duty_cycle 1
 	pitch_offset 4
-	sound_jump Cry_Girafarig_branch_f316f
+	sound_jump Cry_Girafarig_Ch6.body
 
 Cry_Girafarig_Ch6:
 	duty_cycle_pattern 1, 0, 0, 1
-Cry_Girafarig_branch_f316f:
+.body:
 	square_note 4, 6, 8, 1880
 	square_note 2, 14, 8, 1888
 	square_note 2, 14, 8, 1895
@@ -568,11 +566,11 @@ Cry_Slugma_Ch8:
 Cry_Ledyba_Ch5:
 	pitch_offset 2
 	duty_cycle 2
-	sound_jump Cry_Ledyba_branch_f31c2
+	sound_jump Cry_Ledyba_Ch6.body
 
 Cry_Ledyba_Ch6:
 	duty_cycle_pattern 0, 0, 0, 1
-Cry_Ledyba_branch_f31c2:
+.body:
 	square_note 3, 15, 8, 1937
 	square_note 3, 13, 8, 1933
 	square_note 2, 0, 0, 0
@@ -631,24 +629,24 @@ Cry_Donphan_Ch8:
 Cry_Teddiursa_Ch5:
 Cry_Typhlosion_Ch5:
 	duty_cycle_pattern 0, 1, 0, 2
-Cry_Teddiursa_branch_f3246:
+.loop1:
 	square_note 3, 12, 1, 1937
-	sound_loop 3, Cry_Teddiursa_branch_f3246
-Cry_Teddiursa_branch_f324e:
+	sound_loop 3, .loop1
+.loop2:
 	square_note 3, 13, 1, 1201
-	sound_loop 6, Cry_Teddiursa_branch_f324e
-Cry_Teddiursa_branch_f3256:
+	sound_loop 6, .loop2
+.loop3:
 	square_note 1, 13, 1, 1169
 	square_note 1, 11, 1, 1105
-	sound_loop 6, Cry_Teddiursa_branch_f3256
-Cry_Teddiursa_branch_f3262:
+	sound_loop 6, .loop3
+.loop4:
 	square_note 1, 10, 3, 1137
 	square_note 1, 8, 1, 1089
-	sound_loop 6, Cry_Teddiursa_branch_f3262
-Cry_Teddiursa_branch_f326e:
+	sound_loop 6, .loop4
+.loop5:
 	square_note 1, 4, 1, 1057
 	square_note 1, 2, 1, 1025
-	sound_loop 4, Cry_Teddiursa_branch_f326e
+	sound_loop 4, .loop5
 	sound_ret
 
 Cry_Teddiursa_Ch6:
@@ -672,12 +670,11 @@ Cry_Typhlosion_Ch8:
 
 Cry_Natu_Ch5:
 	duty_cycle_pattern 3, 1, 3, 2
-Cry_Mantine_branch_f32a9:
-Cry_Sunflora_branch_f32a9:
+.body1:
 	square_note 4, 15, 8, 1969
 	square_note 4, 15, 8, 1968
 	square_note 4, 4, 8, 1967
-Cry_Mantine_branch_f32b5:
+.body2:
 	square_note 4, 15, 8, 1970
 	square_note 4, 15, 8, 1971
 	square_note 4, 4, 8, 1972
@@ -685,12 +682,12 @@ Cry_Mantine_branch_f32b5:
 
 Cry_Natu_Ch6:
 Cry_Sunflora_Ch6:
-Cry_Mantine_branch_f32c2:
+.body1:
 	duty_cycle_pattern 3, 3, 0, 2
 	square_note 4, 15, 8, 1970
 	square_note 4, 15, 8, 1969
 	square_note 4, 2, 8, 1968
-Cry_Mantine_branch_f32d0:
+.body2:
 	square_note 4, 15, 8, 1972
 	square_note 4, 15, 8, 1974
 	square_note 4, 4, 8, 1976
@@ -698,11 +695,11 @@ Cry_Mantine_branch_f32d0:
 
 Cry_Natu_Ch8:
 Cry_Sunflora_Ch8:
-Cry_Mantine_branch_f32dd:
+.body1:
 	noise_note 4, 8, 8, 5
 	noise_note 4, 8, 8, 4
 	noise_note 4, 3, 8, 3
-Cry_Mantine_branch_f32e6:
+.body2:
 	noise_note 4, 8, 8, 5
 	noise_note 4, 8, 8, 4
 	noise_note 4, 8, 7, 4
@@ -715,30 +712,30 @@ Cry_Teddiursa_Ch8:
 
 Cry_Sunflora_Ch5:
 	duty_cycle 0
-	sound_jump Cry_Sunflora_branch_f32a9
+	sound_jump Cry_Natu_Ch5.body1
 
 Cry_Mantine_Ch5:
 	duty_cycle 0
-	sound_call Cry_Mantine_branch_f32a9
-	sound_call Cry_Mantine_branch_f32b5
+	sound_call Cry_Natu_Ch5.body1
+	sound_call Cry_Natu_Ch5.body2
 	sound_ret
 
 Cry_Mantine_Ch6:
-	sound_call Cry_Mantine_branch_f32c2
-	sound_call Cry_Mantine_branch_f32d0
+	sound_call Cry_Sunflora_Ch6.body1
+	sound_call Cry_Sunflora_Ch6.body2
 	sound_ret
 
 Cry_Mantine_Ch8:
-	sound_call Cry_Mantine_branch_f32dd
-	sound_call Cry_Mantine_branch_f32e6
+	sound_call Cry_Sunflora_Ch8.body1
+	sound_call Cry_Sunflora_Ch8.body2
 	sound_ret
 
 Cry_Ampharos_Ch5:
 	duty_cycle_pattern 3, 1, 3, 2
-Cry_Ampharos_branch_f3315:
+.loop:
 	square_note 1, 12, 1, 1312
 	square_note 1, 10, 1, 1056
-	sound_loop 4, Cry_Ampharos_branch_f3315
+	sound_loop 4, .loop
 	duty_cycle 0
 	square_note 4, 7, 8, 1888
 	square_note 4, 7, 8, 1840
@@ -833,15 +830,15 @@ Cry_Aipom_Ch5:
 
 Cry_Aipom_Ch6:
 	duty_cycle_pattern 0, 2, 1, 3
-Cry_Aipom_branch_f3403:
+.loop1:
 	square_note 1, 15, 1, 1972
-	sound_loop 8, Cry_Aipom_branch_f3403
-Cry_Aipom_branch_f340b:
+	sound_loop 8, .loop1
+.loop2:
 	square_note 1, 12, 1, 1936
-	sound_loop 3, Cry_Aipom_branch_f340b
-Cry_Aipom_branch_f3413:
+	sound_loop 3, .loop2
+.loop3:
 	square_note 1, 11, 1, 1933
-	sound_loop 2, Cry_Aipom_branch_f3413
+	sound_loop 2, .loop3
 	square_note 16, 9, 2, 1941
 	sound_ret
 
diff --git a/audio/sfx.asm b/audio/sfx.asm
index 0e51eb1b..5955d283 100644
--- a/audio/sfx.asm
+++ b/audio/sfx.asm
@@ -4492,18 +4492,18 @@ Sfx_Thunder_Ch8:
 Sfx_Supersonic_Ch5:
 	duty_cycle 2
 	square_note 15, 3, -7, 1984
-Sfx_Supersonic_branch_f21ec:
+.loop:
 	square_note 15, 13, -7, 1984
-	sound_loop 4, Sfx_Supersonic_branch_f21ec
+	sound_loop 4, .loop
 	square_note 15, 13, 1, 1984
 	sound_ret
 
 Sfx_Supersonic_Ch6:
 	duty_cycle_pattern 2, 3, 0, 3
 	square_note 15, 2, -7, 1992
-Sfx_Supersonic_branch_f21ff:
+.loop:
 	square_note 15, 12, -7, 1991
-	sound_loop 4, Sfx_Supersonic_branch_f21ff
+	sound_loop 4, .loop
 	square_note 15, 12, 1, 1992
 	sound_ret
 
@@ -4835,10 +4835,10 @@ Sfx_HyperBeam_Ch5:
 	square_note 2, 15, 1, 1984
 	square_note 2, 15, 1, 1792
 	square_note 2, 15, 1, 2000
-Sfx_HyperBeam_branch_f24f5:
+.loop:
 	square_note 2, 15, 1, 1792
 	square_note 2, 15, 1, 2016
-	sound_loop 12, Sfx_HyperBeam_branch_f24f5
+	sound_loop 12, .loop
 	square_note 15, 15, 1, 1792
 	sound_ret
 
@@ -4855,10 +4855,10 @@ Sfx_HyperBeam_Ch6:
 	square_note 2, 15, 1, 1985
 	square_note 2, 15, 1, 1793
 	square_note 2, 15, 1, 2001
-Sfx_HyperBeam_branch_f2534:
+.loop:
 	square_note 2, 15, 1, 1793
 	square_note 2, 15, 1, 2017
-	sound_loop 12, Sfx_HyperBeam_branch_f2534
+	sound_loop 12, .loop
 	square_note 15, 15, 1, 1793
 	sound_ret
 
@@ -4949,17 +4949,17 @@ Sfx_Metronome_Ch5:
 	sound_ret
 
 Sfx_Unknown5F_Ch5:
-Sfx_Unknown5F_branch_f25f5:
+.loop:
 	square_note 2, 15, 7, 1537
 	square_note 2, 15, 7, 1793
-	sound_loop 8, Sfx_Unknown5F_Ch5
+	sound_loop 8, .loop
 	sound_ret
 
 Sfx_Unknown5F_Ch6:
 	square_note 1, 15, 7, 65535
 	square_note 2, 15, 7, 1538
 	square_note 2, 15, 7, 1794
-	sound_loop 8, Sfx_Unknown5F_branch_f25f5
+	sound_loop 8, Sfx_Unknown5F_Ch5.loop
 	sound_ret
 
 Sfx_Fanfare2_Ch5:
@@ -5143,9 +5143,9 @@ Sfx_Sandstorm_Ch8:
 Sfx_Elevator_Ch5:
 	duty_cycle 2
 	pitch_sweep 5, -2
-Sfx_Elevator_branch_f2704:
+.loop:
 	square_note 2, 15, 1, 768
-	sound_loop 48, Sfx_Elevator_branch_f2704
+	sound_loop 48, .loop
 	pitch_sweep 0, 8
 	duty_cycle 2
 	square_note 15, 15, 3, 1840