diff --git a/pokeblue.sym b/pokeblue.sym
index 33f166e31..c443abbea 100644
--- a/pokeblue.sym
+++ b/pokeblue.sym
@@ -2332,119 +2332,124 @@
 02:5bc4 Music_PkmnHealed_Ch2
 02:5bd2 Music_PkmnHealed_Ch3
 02:5bde Music_Routes1_Ch1
-02:5be9 Music_Routes1_branch_9be9
+02:5be9 Music_Routes1_Ch1.mainloop
 02:5c51 Music_Routes1_Ch2
-02:5c53 Music_Routes1_branch_9c53
-02:5c65 Music_Routes1_branch_9c65
-02:5c78 Music_Routes1_branch_9c78
-02:5c8d Music_Routes1_branch_9c8d
+02:5c53 Music_Routes1_Ch2.mainloop
+02:5c65 Music_Routes1_Ch2.sub1
+02:5c78 Music_Routes1_Ch2.sub2
+02:5c8d Music_Routes1_Ch2.sub3
 02:5cd8 Music_Routes1_Ch3
-02:5cdd Music_Routes1_branch_9cdd
+02:5cdd Music_Routes1_Ch3.mainloop
 02:5d24 Music_Routes1_Ch4
+02:5d24 Music_Routes1_Ch4.mainloop
 02:5db9 Music_Routes2_Ch1
-02:5dc3 Music_Routes2_branch_9dc3
+02:5dc3 Music_Routes2_Ch1.mainloop
 02:5e4f Music_Routes2_Ch2
-02:5e54 Music_Routes2_branch_9e54
+02:5e54 Music_Routes2_Ch2.mainloop
 02:5e9b Music_Routes2_Ch3
-02:5e9e Music_Routes2_branch_9e9e
+02:5e9e Music_Routes2_Ch3.mainloop
 02:5f08 Music_Routes2_Ch4
+02:5f08 Music_Routes2_Ch4.mainloop
 02:5fad Music_Routes3_Ch1
-02:5fc3 Music_Routes3_branch_9fc3
+02:5fc3 Music_Routes3_Ch1.mainloop
 02:6009 Music_Routes3_Ch2
-02:601a Music_Routes3_branch_a01a
+02:601a Music_Routes3_Ch2.mainloop
 02:607f Music_Routes3_Ch3
-02:60a3 Music_Routes3_branch_a0a3
+02:60a3 Music_Routes3_Ch3.mainloop
 02:6131 Music_Routes3_Ch4
-02:617a Music_Routes3_branch_a17a
+02:617a Music_Routes3_Ch4.mainloop
 02:626a Music_Routes4_Ch1
-02:628a Music_Routes4_branch_a28a
+02:628a Music_Routes4_Ch1.mainloop
 02:6304 Music_Routes4_Ch2
-02:6325 Music_Routes4_branch_a325
+02:6325 Music_Routes4_Ch2.mainloop
 02:63c4 Music_Routes4_Ch3
-02:63d7 Music_Routes4_branch_a3d7
+02:63d7 Music_Routes4_Ch3.mainloop
 02:649d Music_Routes4_Ch4
-02:64a8 Music_Routes4_branch_a4a8
+02:64a8 Music_Routes4_Ch4.mainloop
 02:65f0 Music_IndigoPlateau_Ch1
-02:6605 Music_IndigoPlateau_branch_a605
-02:6659 Music_IndigoPlateau_branch_a659
+02:6605 Music_IndigoPlateau_Ch1.mainloop
+02:6659 Music_IndigoPlateau_Ch1.sub1
 02:6664 Music_IndigoPlateau_Ch2
-02:6673 Music_IndigoPlateau_branch_a673
-02:66af Music_IndigoPlateau_branch_a6af
+02:6673 Music_IndigoPlateau_Ch2.mainloop
+02:66af Music_IndigoPlateau_Ch2.sub1
 02:66ba Music_IndigoPlateau_Ch3
-02:66c6 Music_IndigoPlateau_branch_a6c6
-02:66fe Music_IndigoPlateau_branch_a6fe
+02:66c6 Music_IndigoPlateau_Ch3.mainloop
+02:66fe Music_IndigoPlateau_Ch3.sub1
 02:670f Music_IndigoPlateau_Ch4
-02:6728 Music_IndigoPlateau_branch_a728
-02:677e Music_IndigoPlateau_branch_a77e
-02:6791 Music_IndigoPlateau_branch_a791
-02:67a8 Music_IndigoPlateau_branch_a7a8
+02:6728 Music_IndigoPlateau_Ch4.mainloop
+02:677e Music_IndigoPlateau_Ch4.sub1
+02:6791 Music_IndigoPlateau_Ch4.sub2
+02:67a8 Music_IndigoPlateau_Ch4.sub3
 02:67c5 Music_PalletTown_Ch1
-02:67ce Music_PalletTown_branch_a7ce
+02:67ce Music_PalletTown_Ch1.mainloop
 02:685f Music_PalletTown_Ch2
-02:6861 Music_PalletTown_branch_a861
+02:6861 Music_PalletTown_Ch2.mainloop
 02:68de Music_PalletTown_Ch3
-02:68e3 Music_PalletTown_branch_a8e3
+02:68e3 Music_PalletTown_Ch3.mainloop
 02:6913 Music_UnusedSong_Ch1
-02:691b Music_UnusedSong_branch_a91b
+02:691b Music_UnusedSong_Ch1.mainloop
 02:69cf Music_UnusedSong_Ch2
-02:69d8 Music_UnusedSong_branch_a9d8
-02:6a6f Music_Cities1_branch_aa6f
+02:69d8 Music_UnusedSong_Ch2.mainloop
+02:6a6f Music_Cities1_Ch1_AlternateTempo
 02:6a76 Music_Cities1_Ch1
-02:6a79 Music_Cities1_branch_aa79
-02:6a80 Music_Cities1_branch_aa80
-02:6b12 Music_Cities1_branch_ab12
-02:6b7d Music_Cities1_branch_ab7d
-02:6b8a Music_Cities1_branch_ab8a
+02:6a79 Music_Cities1_Ch1.body
+02:6a80 Music_Cities1_Ch1.mainloop
+02:6b12 Music_Cities1_Ch1.loop1
+02:6b7d Music_Cities1_Ch1.sub1
+02:6b8a Music_Cities1_Ch1.sub2
 02:6b92 Music_Cities1_Ch2
-02:6c00 Music_Cities1_branch_ac00
+02:6b92 Music_Cities1_Ch2.mainloop
+02:6c00 Music_Cities1_Ch2.sub1
 02:6c32 Music_Cities1_Ch3
-02:6c35 Music_Cities1_branch_ac35
-02:6cc5 Music_Cities1_branch_acc5
-02:6cce Music_Cities1_branch_acce
+02:6c35 Music_Cities1_Ch3.mainloop
+02:6cc5 Music_Cities1_Ch3.sub1
+02:6cce Music_Cities1_Ch3.sub2
 02:6cef Music_Cities1_Ch4
-02:6cf3 Music_Cities1_branch_acf3
-02:6d36 Music_Cities1_branch_ad36
-02:6d45 Music_Cities1_branch_ad45
-02:6d52 Music_Cities1_branch_ad52
-02:6d5f Music_Cities1_branch_ad5f
-02:6d6e Music_Cities1_branch_ad6e
+02:6cef Music_Cities1_Ch4.mainloop
+02:6cf3 Music_Cities1_Ch4.loop1
+02:6d36 Music_Cities1_Ch4.sub1
+02:6d45 Music_Cities1_Ch4.sub2
+02:6d52 Music_Cities1_Ch4.sub3
+02:6d5f Music_Cities1_Ch4.sub4
+02:6d6e Music_Cities1_Ch4.sub5
 02:6d77 SFX_Get_Item1_1_Ch5
 02:6d8e SFX_Get_Item1_1_Ch6
 02:6d9e SFX_Get_Item1_1_Ch7
 02:6dae Music_MuseumGuy_Ch1
-02:6dd6 Music_MuseumGuy_branch_add6
-02:6de7 Music_MuseumGuy_branch_ade7
-02:6dec Music_MuseumGuy_branch_adec
+02:6dd6 Music_MuseumGuy_Ch1.mainloop
+02:6de7 Music_MuseumGuy_Ch1.sub1
+02:6dec Music_MuseumGuy_Ch1.sub2
 02:6df1 Music_MuseumGuy_Ch2
-02:6e26 Music_MuseumGuy_branch_ae26
+02:6e26 Music_MuseumGuy_Ch2.mainloop
 02:6e6e Music_MuseumGuy_Ch3
-02:6e8e Music_MuseumGuy_branch_ae8e
-02:6eb8 Music_MuseumGuy_branch_aeb8
-02:6ec1 Music_MuseumGuy_branch_aec1
+02:6e8e Music_MuseumGuy_Ch3.mainloop
+02:6eb8 Music_MuseumGuy_Ch3.sub1
+02:6ec1 Music_MuseumGuy_Ch3.sub2
 02:6ed1 Music_MuseumGuy_Ch4
-02:6ee1 Music_MuseumGuy_branch_aee1
+02:6ee1 Music_MuseumGuy_Ch4.mainloop
 02:6f59 Music_MeetProfOak_Ch1
-02:6f85 Music_MeetProfOak_branch_af85
+02:6f85 Music_MeetProfOak_Ch1.mainloop
 02:6fa9 Music_MeetProfOak_Ch2
-02:7005 Music_MeetProfOak_branch_b005
+02:7005 Music_MeetProfOak_Ch2.mainloop
 02:703d Music_MeetProfOak_Ch3
-02:70bc Music_MeetProfOak_branch_b0bc
-02:70d8 Music_MeetProfOak_branch_b0d8
-02:70ed Music_MeetProfOak_branch_b0ed
-02:7101 Music_MeetProfOak_branch_b101
-02:7119 Music_MeetRival_branch_b119
+02:70bc Music_MeetProfOak_Ch3.loop1
+02:70bc Music_MeetProfOak_Ch3.mainloop
+02:70d8 Music_MeetProfOak_Ch3.loop2
+02:70ed Music_MeetProfOak_Ch3.loop3
+02:7101 Music_MeetProfOak_Ch3.loop4
+02:7119 Music_MeetRival_Ch1_AlternateTempo
 02:7120 Music_MeetRival_Ch1
-02:7123 Music_MeetRival_branch_b123
-02:7140 Music_MeetRival_branch_b140
-02:719b Music_MeetRival_branch_b19b
-02:71a2 Music_MeetRival_branch_b1a2
-02:71a5 Music_MeetRival_branch_b1a5
+02:7123 Music_MeetRival_Ch1.body
+02:7140 Music_MeetRival_Ch1.mainloop
+02:719b Music_MeetRival_Ch1_AlternateStartAndTempo
+02:71a2 Music_MeetRival_Ch1_AlternateStart
+02:71a5 Music_MeetRival_Ch1_AlternateStart.body
 02:71bb Music_MeetRival_Ch2
-02:71d8 Music_MeetRival_branch_b1d8
-02:721d Music_MeetRival_branch_b21d
+02:71d8 Music_MeetRival_Ch2.mainloop
+02:721d Music_MeetRival_Ch2_AlternateStart
 02:7233 Music_MeetRival_Ch3
-02:724b Music_MeetRival_branch_b24b
-02:72b5 Music_MeetRival_branch_b2b5
+02:724b Music_MeetRival_Ch3.mainloop
+02:72b5 Music_MeetRival_Ch3_AlternateStart
 02:72c8 SFX_Pokedex_Rating_1_Ch5
 02:72e1 SFX_Pokedex_Rating_1_Ch6
 02:72f7 SFX_Pokedex_Rating_1_Ch7
@@ -2455,74 +2460,76 @@
 02:7381 SFX_Get_Key_Item_1_Ch6
 02:739d SFX_Get_Key_Item_1_Ch7
 02:73a7 Music_SSAnne_Ch1
-02:73b2 Music_SSAnne_branch_b3b2
+02:73b2 Music_SSAnne_Ch1.mainloop
 02:7419 Music_SSAnne_Ch2
-02:741e Music_SSAnne_branch_b41e
+02:741e Music_SSAnne_Ch2.mainloop
 02:74cb Music_SSAnne_Ch3
+02:74cb Music_SSAnne_Ch3.mainloop
 02:7504 Music_Cities2_Ch1
-02:751a Music_Cities2_branch_b51a
+02:751a Music_Cities2_Ch1.mainloop
 02:7569 Music_Cities2_Ch2
-02:758b Music_Cities2_branch_b58b
+02:758b Music_Cities2_Ch2.mainloop
 02:7640 Music_Cities2_Ch3
-02:764c Music_Cities2_branch_b64c
+02:764c Music_Cities2_Ch3.mainloop
 02:76c7 Music_Celadon_Ch1
-02:76d4 Music_Celadon_branch_b6d4
+02:76d4 Music_Celadon_Ch1.mainloop
 02:773a Music_Celadon_Ch2
-02:774a Music_Celadon_branch_b74a
+02:774a Music_Celadon_Ch2.mainloop
 02:77b5 Music_Celadon_Ch3
-02:77c1 Music_Celadon_branch_b7c1
+02:77c1 Music_Celadon_Ch3.mainloop
 02:786d Music_Cinnabar_Ch1
-02:7878 Music_Cinnabar_branch_b878
+02:7878 Music_Cinnabar_Ch1.mainloop
 02:78d4 Music_Cinnabar_Ch2
-02:78d9 Music_Cinnabar_branch_b8d9
+02:78d9 Music_Cinnabar_Ch2.mainloop
 02:793d Music_Cinnabar_Ch3
-02:793f Music_Cinnabar_branch_b93f
+02:793f Music_Cinnabar_Ch3.mainloop
 02:79eb Music_Vermilion_Ch1
-02:79f6 Music_Vermilion_branch_b9f6
+02:79f6 Music_Vermilion_Ch1.mainloop
 02:7a61 Music_Vermilion_Ch2
-02:7a66 Music_Vermilion_branch_ba66
+02:7a66 Music_Vermilion_Ch2.mainloop
 02:7aa6 Music_Vermilion_Ch3
-02:7aa8 Music_Vermilion_branch_baa8
+02:7aa8 Music_Vermilion_Ch3.mainloop
 02:7b0d Music_Vermilion_Ch4
-02:7b0e Music_Vermilion_branch_bb0e
-02:7b3f Music_Vermilion_branch_bb3f
+02:7b0e Music_Vermilion_Ch4.loop1
+02:7b0e Music_Vermilion_Ch4.mainloop
+02:7b3f Music_Vermilion_Ch4.sub1
 02:7b58 Music_Lavender_Ch1
-02:7b6b Music_Lavender_branch_bb6b
+02:7b6b Music_Lavender_Ch1.mainloop
 02:7b9e Music_Lavender_Ch2
-02:7ba5 Music_Lavender_branch_bba5
+02:7ba5 Music_Lavender_Ch2.mainloop
 02:7bae Music_Lavender_Ch3
-02:7bb9 Music_Lavender_branch_bbb9
+02:7bb9 Music_Lavender_Ch3.mainloop
 02:7c21 Music_Lavender_Ch4
-02:7c26 Music_Lavender_branch_bc26
+02:7c26 Music_Lavender_Ch4.mainloop
 02:7c2e Music_SafariZone_Ch1
-02:7c4f Music_SafariZone_branch_bc4f
-02:7c5f Music_SafariZone_branch_bc5f
+02:7c4f Music_SafariZone_Ch1.mainloop
+02:7c5f Music_SafariZone_Ch1.sub1
 02:7c6a Music_SafariZone_Ch2
-02:7c79 Music_SafariZone_branch_bc79
-02:7c89 Music_SafariZone_branch_bc89
+02:7c79 Music_SafariZone_Ch2.mainloop
+02:7c89 Music_SafariZone_Ch2.sub1
 02:7c94 Music_SafariZone_Ch3
-02:7c97 Music_SafariZone_branch_bc97
-02:7ca5 Music_SafariZone_branch_bca5
+02:7c97 Music_SafariZone_Ch3.mainloop
+02:7ca5 Music_SafariZone_Ch3.sub1
 02:7cbb Music_Gym_Ch1
-02:7cd8 Music_Gym_branch_bcd8
+02:7cd8 Music_Gym_Ch1.mainloop
 02:7d6b Music_Gym_Ch2
-02:7d82 Music_Gym_branch_bd82
+02:7d82 Music_Gym_Ch2.mainloop
 02:7dfa Music_Gym_Ch3
-02:7e02 Music_Gym_branch_be02
-02:7e3b Music_Gym_branch_be3b
-02:7e44 Music_Gym_branch_be44
-02:7e4d Music_Gym_branch_be4d
+02:7e02 Music_Gym_Ch3.mainloop
+02:7e3b Music_Gym_Ch3.sub1
+02:7e44 Music_Gym_Ch3.sub2
+02:7e4d Music_Gym_Ch3.sub3
 02:7e56 Music_Pokecenter_Ch1
-02:7e61 Music_Pokecenter_branch_be61
+02:7e61 Music_Pokecenter_Ch1.mainloop
 02:7ef9 Music_Pokecenter_Ch2
-02:7efc Music_Pokecenter_branch_befc
-02:7f4e Music_Pokecenter_branch_bf4e
-02:7f60 Music_Pokecenter_branch_bf60
+02:7efc Music_Pokecenter_Ch2.mainloop
+02:7f4e Music_Pokecenter_Ch2.sub1
+02:7f60 Music_Pokecenter_Ch2.sub2
 02:7f70 Music_Pokecenter_Ch3
-02:7f72 Music_Pokecenter_branch_bf72
-02:7fd9 Music_Pokecenter_branch_bfd9
-02:7fe2 Music_Pokecenter_branch_bfe2
-02:7feb Music_Pokecenter_branch_bfeb
+02:7f72 Music_Pokecenter_Ch3.mainloop
+02:7fd9 Music_Pokecenter_Ch3.sub1
+02:7fe2 Music_Pokecenter_Ch3.sub2
+02:7feb Music_Pokecenter_Ch3.sub3
 03:4000 _Joypad
 03:4034 DiscardButtonPresses
 03:403c TrySoftReset
@@ -5171,9 +5178,9 @@
 08:45fe SFX_Battle_25_Ch8
 08:460e SFX_Battle_26_Ch8
 08:4624 SFX_Battle_27_Ch5
-08:462a SFX_Battle_27_branch_2062a
+08:462a SFX_Battle_27_Ch5.loop1
 08:4637 SFX_Battle_27_Ch6
-08:463d SFX_Battle_27_branch_2063d
+08:463d SFX_Battle_27_Ch6.loop1
 08:464a SFX_Battle_27_Ch8
 08:4655 SFX_Battle_28_Ch5
 08:4664 SFX_Battle_28_Ch6
@@ -5212,7 +5219,7 @@
 08:48e0 SFX_Battle_35_Ch5
 08:48f0 SFX_Battle_35_Ch6
 08:4902 SFX_Battle_36_Ch5
-08:4930 SFX_Battle_36_branch_20930
+08:4930 SFX_Battle_36_Ch5.loop1
 08:4941 SFX_Battle_36_Ch6
 08:4980 SFX_Battle_36_Ch8
 08:498b SFX_UnusedCry_2_Ch5
@@ -5568,34 +5575,34 @@
 08:6347 SFX_UnusedFanfare_Ch6
 08:6359 SFX_UnusedFanfare_Ch7
 08:6370 Music_GymLeaderBattle_Ch1
-08:63b0 Music_GymLeaderBattle_branch_223b0
+08:63b0 Music_GymLeaderBattle_Ch1.mainloop
 08:65a1 Music_GymLeaderBattle_Ch2
-08:65e0 Music_GymLeaderBattle_branch_225e0
+08:65e0 Music_GymLeaderBattle_Ch2.mainloop
 08:66ef Music_GymLeaderBattle_Ch3
-08:67b1 Music_GymLeaderBattle_branch_227b1
+08:67b1 Music_GymLeaderBattle_Ch3.mainloop
 08:6919 Music_TrainerBattle_Ch1
-08:6962 Music_TrainerBattle_branch_22962
+08:6962 Music_TrainerBattle_Ch1.mainloop
 08:6bae Music_TrainerBattle_Ch2
-08:6bfc Music_TrainerBattle_branch_22bfc
+08:6bfc Music_TrainerBattle_Ch2.mainloop
 08:6d10 Music_TrainerBattle_Ch3
-08:6d9c Music_TrainerBattle_branch_22d9c
+08:6d9c Music_TrainerBattle_Ch3.mainloop
 08:7099 Music_WildBattle_Ch1
-08:70e0 Music_WildBattle_branch_230e0
+08:70e0 Music_WildBattle_Ch1.mainloop
 08:71d8 Music_WildBattle_Ch2
-08:7225 Music_WildBattle_branch_23225
+08:7225 Music_WildBattle_Ch2.mainloop
 08:7290 Music_WildBattle_Ch3
-08:72b5 Music_WildBattle_branch_232b5
-08:72d8 Music_WildBattle_branch_232d8
+08:72b5 Music_WildBattle_Ch3.introloop
+08:72d8 Music_WildBattle_Ch3.mainloop
 08:73a6 Music_FinalBattle_Ch1
-08:7429 Music_FinalBattle_branch_23429
+08:7429 Music_FinalBattle_Ch1.mainloop
 08:756a Music_FinalBattle_Ch2
-08:75e6 Music_FinalBattle_branch_235e6
-08:7704 Music_FinalBattle_branch_23704
-08:7710 Music_FinalBattle_branch_23710
+08:75e6 Music_FinalBattle_Ch2.mainloop
+08:7704 Music_FinalBattle_Ch2.sub1
+08:7710 Music_FinalBattle_Ch2.sub2
 08:771c Music_FinalBattle_Ch3
-08:777d Music_FinalBattle_branch_2377d
-08:795b Music_FinalBattle_branch_2395b
-08:796c Music_FinalBattle_branch_2396c
+08:777d Music_FinalBattle_Ch3.mainloop
+08:795b Music_FinalBattle_Ch3.sub1
+08:796c Music_FinalBattle_Ch3.sub2
 08:797d SFX_Level_Up_Ch5
 08:7998 SFX_Level_Up_Ch6
 08:79b0 SFX_Level_Up_Ch7
@@ -5606,23 +5613,23 @@
 08:7a2e SFX_Caught_Mon_Ch6
 08:7a44 SFX_Caught_Mon_Ch7
 08:7a53 Music_DefeatedTrainer_Ch1
-08:7a76 Music_DefeatedTrainer_branch_23a76
+08:7a76 Music_DefeatedTrainer_Ch1.mainloop
 08:7ac1 Music_DefeatedTrainer_Ch2
-08:7ad2 Music_DefeatedTrainer_branch_23ad2
+08:7ad2 Music_DefeatedTrainer_Ch2.mainloop
 08:7b15 Music_DefeatedTrainer_Ch3
-08:7b24 Music_DefeatedTrainer_branch_23b24
+08:7b24 Music_DefeatedTrainer_Ch3.mainloop
 08:7b74 Music_DefeatedWildMon_Ch1
-08:7b8b Music_DefeatedWildMon_branch_23b8b
+08:7b8b Music_DefeatedWildMon_Ch1.mainloop
 08:7bc1 Music_DefeatedWildMon_Ch2
-08:7bce Music_DefeatedWildMon_branch_23bce
+08:7bce Music_DefeatedWildMon_Ch2.mainloop
 08:7c0e Music_DefeatedWildMon_Ch3
-08:7c21 Music_DefeatedWildMon_branch_23c21
+08:7c21 Music_DefeatedWildMon_Ch3.mainloop
 08:7cad Music_DefeatedGymLeader_Ch1
-08:7ccc Music_DefeatedGymLeader_branch_23ccc
+08:7ccc Music_DefeatedGymLeader_Ch1.mainloop
 08:7d6d Music_DefeatedGymLeader_Ch2
-08:7d84 Music_DefeatedGymLeader_branch_23d84
+08:7d84 Music_DefeatedGymLeader_Ch2.mainloop
 08:7e52 Music_DefeatedGymLeader_Ch3
-08:7e65 Music_DefeatedGymLeader_branch_23e65
+08:7e65 Music_DefeatedGymLeader_Ch3.mainloop
 09:4000 RhydonPicFront
 09:4202 RhydonPicBack
 09:429a KangaskhanPicFront
@@ -14676,130 +14683,138 @@
 1f:5ba3 Audio3_Pitches
 1f:5ba3 Audio3_Pitches._table_width_u7986
 1f:5bbb Music_BikeRiding_Ch1
-1f:5bc9 Music_BikeRiding_branch_7dbc9
+1f:5bc9 Music_BikeRiding_Ch1.mainloop
 1f:5c6c Music_BikeRiding_Ch2
-1f:5c75 Music_BikeRiding_branch_7dc75
+1f:5c75 Music_BikeRiding_Ch2.mainloop
 1f:5d14 Music_BikeRiding_Ch3
-1f:5d17 Music_BikeRiding_branch_7dd17
+1f:5d17 Music_BikeRiding_Ch3.mainloop
 1f:5e68 Music_BikeRiding_Ch4
-1f:5e6a Music_BikeRiding_branch_7de6a
-1f:5ea7 Music_BikeRiding_branch_7dea7
-1f:5eb4 Music_BikeRiding_branch_7deb4
-1f:5ec2 Music_BikeRiding_branch_7dec2
+1f:5e6a Music_BikeRiding_Ch4.mainloop
+1f:5ea7 Music_BikeRiding_Ch4.sub1
+1f:5eb4 Music_BikeRiding_Ch4.sub2
+1f:5ec2 Music_BikeRiding_Ch4.sub3
 1f:5ed1 Music_Dungeon1_Ch1
-1f:5ee5 Music_Dungeon1_branch_7dee5
-1f:5ee8 Music_Dungeon1_branch_7dee8
-1f:5eff Music_Dungeon1_branch_7deff
-1f:5f6e Music_Dungeon1_branch_7df6e
-1f:5faa Music_Dungeon1_branch_7dfaa
-1f:5fbb Music_Dungeon1_branch_7dfbb
-1f:5fc5 Music_Dungeon1_branch_7dfc5
-1f:5fd5 Music_Dungeon1_branch_7dfd5
+1f:5ee5 Music_Dungeon1_Ch1.mainloop
+1f:5ee8 Music_Dungeon1_Ch1.loop1
+1f:5eff Music_Dungeon1_Ch1.loop2
+1f:5f6e Music_Dungeon1_Ch1.loop3
+1f:5faa Music_Dungeon1_Ch1.sub1
+1f:5fbb Music_Dungeon1_Ch1.sub2
+1f:5fc5 Music_Dungeon1_Ch1.sub3
+1f:5fd5 Music_Dungeon1_Ch1.sub4
 1f:5fde Music_Dungeon1_Ch2
-1f:5feb Music_Dungeon1_branch_7dfeb
-1f:5fed Music_Dungeon1_branch_7dfed
-1f:6006 Music_Dungeon1_branch_7e006
-1f:6097 Music_Dungeon1_branch_7e097
-1f:60ab Music_Dungeon1_branch_7e0ab
-1f:60b5 Music_Dungeon1_branch_7e0b5
-1f:60ba Music_Dungeon1_branch_7e0ba
-1f:60c0 Music_Dungeon1_branch_7e0c0
-1f:60cd Music_Dungeon1_branch_7e0cd
+1f:5feb Music_Dungeon1_Ch2.mainloop
+1f:5fed Music_Dungeon1_Ch2.loop1
+1f:6006 Music_Dungeon1_Ch2.loop2
+1f:6097 Music_Dungeon1_Ch2.sub1
+1f:60ab Music_Dungeon1_Ch2.sub2
+1f:60b5 Music_Dungeon1_Ch2.sub3
+1f:60ba Music_Dungeon1_Ch2.sub4
+1f:60c0 Music_Dungeon1_Ch2.sub5
+1f:60cd Music_Dungeon1_Ch2.sub6
 1f:60dc Music_Dungeon1_Ch3
-1f:60e5 Music_Dungeon1_branch_7e0e5
-1f:6140 Music_Dungeon1_branch_7e140
-1f:6154 Music_Dungeon1_branch_7e154
-1f:615e Music_Dungeon1_branch_7e15e
-1f:6164 Music_Dungeon1_branch_7e164
-1f:6177 Music_Dungeon1_branch_7e177
+1f:60e5 Music_Dungeon1_Ch3.mainloop
+1f:6140 Music_Dungeon1_Ch3.sub1
+1f:6154 Music_Dungeon1_Ch3.sub2
+1f:615e Music_Dungeon1_Ch3.sub3
+1f:6164 Music_Dungeon1_Ch3.sub4
+1f:6177 Music_Dungeon1_Ch3.sub5
 1f:618a Music_Dungeon1_Ch4
-1f:6190 Music_Dungeon1_branch_7e190
-1f:61a1 Music_Dungeon1_branch_7e1a1
-1f:61b0 Music_Dungeon1_branch_7e1b0
-1f:61ba Music_Dungeon1_branch_7e1ba
-1f:61cf Music_Dungeon1_branch_7e1cf
-1f:61d5 Music_Dungeon1_branch_7e1d5
-1f:61f1 Music_Dungeon1_branch_7e1f1
-1f:61fa Music_Dungeon1_branch_7e1fa
-1f:6202 Music_Dungeon1_branch_7e202
+1f:6190 Music_Dungeon1_Ch4.loop1
+1f:6190 Music_Dungeon1_Ch4.mainloop
+1f:61a1 Music_Dungeon1_Ch4.loop2
+1f:61b0 Music_Dungeon1_Ch4.loop3
+1f:61ba Music_Dungeon1_Ch4.loop4
+1f:61cf Music_Dungeon1_Ch4.loop5
+1f:61d5 Music_Dungeon1_Ch4.loop6
+1f:61f1 Music_Dungeon1_Ch4.sub1
+1f:61fa Music_Dungeon1_Ch4.sub2
+1f:6202 Music_Dungeon1_Ch4.sub3
 1f:620b Music_GameCorner_Ch1
-1f:6222 Music_GameCorner_branch_7e222
+1f:6222 Music_GameCorner_Ch1.mainloop
 1f:62df Music_GameCorner_Ch2
-1f:62fa Music_GameCorner_branch_7e2fa
+1f:62fa Music_GameCorner_Ch2.mainloop
 1f:638b Music_GameCorner_Ch3
-1f:63a5 Music_GameCorner_branch_7e3a5
-1f:6418 Music_GameCorner_branch_7e418
-1f:642d Music_GameCorner_branch_7e42d
-1f:6442 Music_GameCorner_branch_7e442
-1f:6457 Music_GameCorner_branch_7e457
-1f:646c Music_GameCorner_branch_7e46c
-1f:6481 Music_GameCorner_branch_7e481
-1f:6496 Music_GameCorner_branch_7e496
-1f:64ab Music_GameCorner_branch_7e4ab
+1f:63a5 Music_GameCorner_Ch3.mainloop
+1f:6418 Music_GameCorner_Ch3.sub1
+1f:642d Music_GameCorner_Ch3.sub2
+1f:6442 Music_GameCorner_Ch3.sub3
+1f:6457 Music_GameCorner_Ch3.sub4
+1f:646c Music_GameCorner_Ch3.sub5
+1f:6481 Music_GameCorner_Ch3.sub6
+1f:6496 Music_GameCorner_Ch3.sub7
+1f:64ab Music_GameCorner_Ch3.sub8
 1f:64c0 Music_TitleScreen_Ch1
-1f:64e2 Music_TitleScreen_branch_7e4e2
-1f:6541 Music_TitleScreen_branch_7e541
-1f:654a Music_TitleScreen_branch_7e54a
-1f:655c Music_TitleScreen_branch_7e55c
+1f:64e2 Music_TitleScreen_Ch1.mainloop
+1f:6541 Music_TitleScreen_Ch1.sub1
+1f:654a Music_TitleScreen_Ch1.sub2
+1f:655c Music_TitleScreen_Ch1.sub3
 1f:6578 Music_TitleScreen_Ch2
-1f:6594 Music_TitleScreen_branch_7e594
-1f:6622 Music_TitleScreen_branch_7e622
-1f:662c Music_TitleScreen_branch_7e62c
-1f:6636 Music_TitleScreen_branch_7e636
+1f:6594 Music_TitleScreen_Ch2.mainloop
+1f:6622 Music_TitleScreen_Ch2.sub1
+1f:662c Music_TitleScreen_Ch2.sub2
+1f:6636 Music_TitleScreen_Ch2.sub3
 1f:6643 Music_TitleScreen_Ch3
-1f:665e Music_TitleScreen_branch_7e65e
-1f:6664 Music_TitleScreen_branch_7e664
-1f:66c9 Music_TitleScreen_branch_7e6c9
-1f:66d0 Music_TitleScreen_branch_7e6d0
-1f:66d7 Music_TitleScreen_branch_7e6d7
-1f:66dc Music_TitleScreen_branch_7e6dc
-1f:66e5 Music_TitleScreen_branch_7e6e5
+1f:665e Music_TitleScreen_Ch3.mainloop
+1f:6664 Music_TitleScreen_Ch3.loop1
+1f:66c9 Music_TitleScreen_Ch3.sub1
+1f:66d0 Music_TitleScreen_Ch3.sub2
+1f:66d7 Music_TitleScreen_Ch3.sub3
+1f:66dc Music_TitleScreen_Ch3.sub4
+1f:66e5 Music_TitleScreen_Ch3.sub5
 1f:66eb Music_TitleScreen_Ch4
-1f:6716 Music_TitleScreen_branch_7e716
-1f:6834 Music_TitleScreen_branch_7e834
-1f:6842 Music_TitleScreen_branch_7e842
+1f:6716 Music_TitleScreen_Ch4.mainloop
+1f:6834 Music_TitleScreen_Ch4.sub1
+1f:6842 Music_TitleScreen_Ch4.sub2
 1f:6850 SFX_Get_Item1_3_Ch5
 1f:6867 SFX_Get_Item1_3_Ch6
 1f:6877 SFX_Get_Item1_3_Ch7
 1f:6887 Music_Dungeon2_Ch1
-1f:6892 Music_Dungeon2_branch_7e892
+1f:6892 Music_Dungeon2_Ch1.loop1
+1f:6892 Music_Dungeon2_Ch1.mainloop
 1f:68d8 Music_Dungeon2_Ch2
-1f:68db Music_Dungeon2_branch_7e8db
+1f:68db Music_Dungeon2_Ch2.loop1
+1f:68db Music_Dungeon2_Ch2.mainloop
 1f:693b Music_Dungeon2_Ch3
-1f:6940 Music_Dungeon2_branch_7e940
-1f:6958 Music_Dungeon2_branch_7e958
-1f:69d1 Music_Dungeon2_branch_7e9d1
+1f:6940 Music_Dungeon2_Ch3.loop1
+1f:6940 Music_Dungeon2_Ch3.mainloop
+1f:6958 Music_Dungeon2_Ch3.loop2
+1f:69be Music_Dungeon2_Ch3.sub1
+1f:69d1 Music_Dungeon2_Ch3.sub2
 1f:69dc Music_Dungeon2_Ch4
-1f:69dd Music_Dungeon2_branch_7e9dd
+1f:69dd Music_Dungeon2_Ch4.mainloop
 1f:69f1 Music_Dungeon3_Ch1
-1f:69fc Music_Dungeon3_branch_7e9fc
-1f:69fe Music_Dungeon3_branch_7e9fe
-1f:6a11 Music_Dungeon3_branch_7ea11
-1f:6a18 Music_Dungeon3_branch_7ea18
-1f:6a3c Music_Dungeon3_branch_7ea3c
-1f:6a43 Music_Dungeon3_branch_7ea43
-1f:6ab2 Music_Dungeon3_branch_7eab2
-1f:6ac1 Music_Dungeon3_branch_7eac1
-1f:6ace Music_Dungeon3_branch_7eace
-1f:6add Music_Dungeon3_branch_7eadd
-1f:6aea Music_Dungeon3_branch_7eaea
-1f:6af7 Music_Dungeon3_branch_7eaf7
-1f:6afc Music_Dungeon3_branch_7eafc
+1f:69fc Music_Dungeon3_Ch1.mainloop
+1f:69fe Music_Dungeon3_Ch1.loop1
+1f:6a11 Music_Dungeon3_Ch1.loop2
+1f:6a18 Music_Dungeon3_Ch1.loop3
+1f:6a3c Music_Dungeon3_Ch1.loop4
+1f:6a43 Music_Dungeon3_Ch1.loop5
+1f:6ab2 Music_Dungeon3_Ch1.sub1
+1f:6ac1 Music_Dungeon3_Ch1.sub2
+1f:6ace Music_Dungeon3_Ch1.sub3
+1f:6add Music_Dungeon3_Ch1.sub4
+1f:6aea Music_Dungeon3_Ch1.sub5
+1f:6af7 Music_Dungeon3_Ch1.sub6
+1f:6afc Music_Dungeon3_Ch1.sub7
 1f:6b68 Music_Dungeon3_Ch2
-1f:6b6d Music_Dungeon3_branch_7eb6d
+1f:6b6d Music_Dungeon3_Ch2.mainloop
 1f:6c7a Music_Dungeon3_Ch3
+1f:6c7a Music_Dungeon3_Ch3.mainloop
 1f:6ce4 Music_Dungeon3_Ch4
 1f:6d0f Music_CinnabarMansion_Ch1
-1f:6d19 Music_CinnabarMansion_branch_7ed19
+1f:6d19 Music_CinnabarMansion_Ch1.loop1
+1f:6d19 Music_CinnabarMansion_Ch1.mainloop
 1f:6d40 Music_CinnabarMansion_Ch2
-1f:6d48 Music_CinnabarMansion_branch_7ed48
-1f:6d4e Music_CinnabarMansion_branch_7ed4e
-1f:6d50 Music_CinnabarMansion_branch_7ed50
-1f:6d6c Music_CinnabarMansion_branch_7ed6c
+1f:6d48 Music_CinnabarMansion_Ch2.introloop
+1f:6d4e Music_CinnabarMansion_Ch2.mainloop
+1f:6d50 Music_CinnabarMansion_Ch2.loop1
+1f:6d6c Music_CinnabarMansion_Ch2.sub1
 1f:6d7e Music_CinnabarMansion_Ch3
-1f:6d80 Music_CinnabarMansion_branch_7ed80
+1f:6d80 Music_CinnabarMansion_Ch3.loop1
+1f:6d80 Music_CinnabarMansion_Ch3.mainloop
 1f:6db0 Music_CinnabarMansion_Ch4
-1f:6db5 Music_CinnabarMansion_branch_7edb5
+1f:6db5 Music_CinnabarMansion_Ch4.mainloop
 1f:6dda SFX_Pokedex_Rating_3_Ch5
 1f:6df3 SFX_Pokedex_Rating_3_Ch6
 1f:6e09 SFX_Pokedex_Rating_3_Ch7
@@ -14810,72 +14825,75 @@
 1f:6e93 SFX_Get_Key_Item_3_Ch6
 1f:6eaf SFX_Get_Key_Item_3_Ch7
 1f:6eb9 Music_OaksLab_Ch1
-1f:6ed0 Music_OaksLab_branch_7eed0
+1f:6ed0 Music_OaksLab_Ch1.mainloop
 1f:6f05 Music_OaksLab_Ch2
-1f:6f16 Music_OaksLab_branch_7ef16
+1f:6f16 Music_OaksLab_Ch2.mainloop
 1f:6f52 Music_OaksLab_Ch3
-1f:6f5c Music_OaksLab_branch_7ef5c
+1f:6f5c Music_OaksLab_Ch3.mainloop
 1f:704a Music_PokemonTower_Ch1
-1f:705a Music_PokemonTower_branch_7f05a
+1f:705a Music_PokemonTower_Ch1.mainloop
 1f:70e3 Music_PokemonTower_Ch2
-1f:70ee Music_PokemonTower_branch_7f0ee
+1f:70ee Music_PokemonTower_Ch2.mainloop
 1f:719a Music_PokemonTower_Ch3
-1f:71a2 Music_PokemonTower_branch_7f1a2
+1f:71a2 Music_PokemonTower_Ch3.mainloop
 1f:7243 Music_SilphCo_Ch1
-1f:726d Music_SilphCo_branch_7f26d
-1f:73f0 Music_SilphCo_branch_7f3f0
+1f:726d Music_SilphCo_Ch1.mainloop
+1f:73f0 Music_SilphCo_Ch1.sub1
 1f:7409 Music_SilphCo_Ch2
-1f:742e Music_SilphCo_branch_7f42e
+1f:742e Music_SilphCo_Ch2.mainloop
 1f:75be Music_SilphCo_Ch3
-1f:75c9 Music_SilphCo_branch_7f5c9
+1f:75c9 Music_SilphCo_Ch3.mainloop
 1f:769d Music_MeetEvilTrainer_Ch1
-1f:76ae Music_MeetEvilTrainer_branch_7f6ae
+1f:76ae Music_MeetEvilTrainer_Ch1.mainloop
 1f:76ba Music_MeetEvilTrainer_Ch2
-1f:76c2 Music_MeetEvilTrainer_branch_7f6c2
+1f:76c2 Music_MeetEvilTrainer_Ch2.mainloop
 1f:76e6 Music_MeetEvilTrainer_Ch3
-1f:76ee Music_MeetEvilTrainer_branch_7f6ee
+1f:76ee Music_MeetEvilTrainer_Ch3.mainloop
 1f:76f9 Music_MeetFemaleTrainer_Ch1
-1f:770c Music_MeetFemaleTrainer_branch_7f70c
+1f:770c Music_MeetFemaleTrainer_Ch1.loop1
+1f:770c Music_MeetFemaleTrainer_Ch1.mainloop
 1f:771c Music_MeetFemaleTrainer_Ch2
-1f:7726 Music_MeetFemaleTrainer_branch_7f726
+1f:7726 Music_MeetFemaleTrainer_Ch2.mainloop
 1f:774b Music_MeetFemaleTrainer_Ch3
-1f:7756 Music_MeetFemaleTrainer_branch_7f756
-1f:7770 Music_MeetFemaleTrainer_branch_7f770
+1f:7756 Music_MeetFemaleTrainer_Ch3.mainloop
+1f:7770 Music_MeetFemaleTrainer_Ch3.sub1
 1f:777b Music_MeetMaleTrainer_Ch1
-1f:778f Music_MeetMaleTrainer_branch_7f78f
+1f:778f Music_MeetMaleTrainer_Ch1.mainloop
 1f:77a2 Music_MeetMaleTrainer_Ch2
-1f:77b5 Music_MeetMaleTrainer_branch_7f7b5
+1f:77b5 Music_MeetMaleTrainer_Ch2.mainloop
 1f:77d2 Music_MeetMaleTrainer_Ch3
-1f:77ea Music_MeetMaleTrainer_branch_7f7ea
+1f:77ea Music_MeetMaleTrainer_Ch3.mainloop
 1f:7844 Music_IntroBattle_Ch1
 1f:78bc Music_IntroBattle_Ch2
 1f:791d Music_IntroBattle_Ch3
 1f:795b Music_IntroBattle_Ch4
 1f:7a19 Music_Surfing_Ch1
-1f:7a30 Music_Surfing_branch_7fa30
+1f:7a30 Music_Surfing_Ch1.mainloop
 1f:7a9c Music_Surfing_Ch2
-1f:7aae Music_Surfing_branch_7faae
+1f:7aae Music_Surfing_Ch2.mainloop
 1f:7afa Music_Surfing_Ch3
-1f:7b03 Music_Surfing_branch_7fb03
+1f:7b03 Music_Surfing_Ch3.mainloop
 1f:7b7d Music_JigglypuffSong_Ch1
 1f:7b9a Music_JigglypuffSong_Ch2
 1f:7baf Music_HallOfFame_Ch1
-1f:7bc5 Music_HallOfFame_branch_7fbc5
+1f:7bc5 Music_HallOfFame_Ch1.loop1
+1f:7bc5 Music_HallOfFame_Ch1.mainloop
 1f:7bda Music_HallOfFame_Ch2
-1f:7bdf Music_HallOfFame_branch_7fbdf
+1f:7bdf Music_HallOfFame_Ch2.mainloop
 1f:7bfc Music_HallOfFame_Ch3
-1f:7bfe Music_HallOfFame_branch_7fbfe
+1f:7bfc Music_HallOfFame_Ch3.mainloop
+1f:7bfe Music_HallOfFame_Ch3.loop1
 1f:7c1f Music_Credits_Ch1
 1f:7d5f Music_Credits_Ch2
 1f:7ec2 Music_Credits_Ch3
-1f:7fa4 Music_Credits_branch_7ffa4
-1f:7fae Music_Credits_branch_7ffae
-1f:7fb8 Music_Credits_branch_7ffb8
-1f:7fc1 Music_Credits_branch_7ffc1
-1f:7fd2 Music_Credits_branch_7ffd2
-1f:7fdb Music_Credits_branch_7ffdb
-1f:7fe4 Music_Credits_branch_7ffe4
-1f:7fed Music_Credits_branch_7ffed
+1f:7fa4 Music_Credits_Ch3.sub1
+1f:7fae Music_Credits_Ch3.sub2
+1f:7fb8 Music_Credits_Ch3.sub3
+1f:7fc1 Music_Credits_Ch3.sub4
+1f:7fd2 Music_Credits_Ch3.sub5
+1f:7fdb Music_Credits_Ch3.sub6
+1f:7fe4 Music_Credits_Ch3.sub7
+1f:7fed Music_Credits_Ch3.sub8
 20:4000 _CardKeySuccessText1
 20:4009 _CardKeySuccessText2
 20:4029 _CardKeyFailText
diff --git a/pokeblue_debug.sym b/pokeblue_debug.sym
index e0aa438e4..6e43a0e91 100644
--- a/pokeblue_debug.sym
+++ b/pokeblue_debug.sym
@@ -2341,119 +2341,124 @@
 02:5bc4 Music_PkmnHealed_Ch2
 02:5bd2 Music_PkmnHealed_Ch3
 02:5bde Music_Routes1_Ch1
-02:5be9 Music_Routes1_branch_9be9
+02:5be9 Music_Routes1_Ch1.mainloop
 02:5c51 Music_Routes1_Ch2
-02:5c53 Music_Routes1_branch_9c53
-02:5c65 Music_Routes1_branch_9c65
-02:5c78 Music_Routes1_branch_9c78
-02:5c8d Music_Routes1_branch_9c8d
+02:5c53 Music_Routes1_Ch2.mainloop
+02:5c65 Music_Routes1_Ch2.sub1
+02:5c78 Music_Routes1_Ch2.sub2
+02:5c8d Music_Routes1_Ch2.sub3
 02:5cd8 Music_Routes1_Ch3
-02:5cdd Music_Routes1_branch_9cdd
+02:5cdd Music_Routes1_Ch3.mainloop
 02:5d24 Music_Routes1_Ch4
+02:5d24 Music_Routes1_Ch4.mainloop
 02:5db9 Music_Routes2_Ch1
-02:5dc3 Music_Routes2_branch_9dc3
+02:5dc3 Music_Routes2_Ch1.mainloop
 02:5e4f Music_Routes2_Ch2
-02:5e54 Music_Routes2_branch_9e54
+02:5e54 Music_Routes2_Ch2.mainloop
 02:5e9b Music_Routes2_Ch3
-02:5e9e Music_Routes2_branch_9e9e
+02:5e9e Music_Routes2_Ch3.mainloop
 02:5f08 Music_Routes2_Ch4
+02:5f08 Music_Routes2_Ch4.mainloop
 02:5fad Music_Routes3_Ch1
-02:5fc3 Music_Routes3_branch_9fc3
+02:5fc3 Music_Routes3_Ch1.mainloop
 02:6009 Music_Routes3_Ch2
-02:601a Music_Routes3_branch_a01a
+02:601a Music_Routes3_Ch2.mainloop
 02:607f Music_Routes3_Ch3
-02:60a3 Music_Routes3_branch_a0a3
+02:60a3 Music_Routes3_Ch3.mainloop
 02:6131 Music_Routes3_Ch4
-02:617a Music_Routes3_branch_a17a
+02:617a Music_Routes3_Ch4.mainloop
 02:626a Music_Routes4_Ch1
-02:628a Music_Routes4_branch_a28a
+02:628a Music_Routes4_Ch1.mainloop
 02:6304 Music_Routes4_Ch2
-02:6325 Music_Routes4_branch_a325
+02:6325 Music_Routes4_Ch2.mainloop
 02:63c4 Music_Routes4_Ch3
-02:63d7 Music_Routes4_branch_a3d7
+02:63d7 Music_Routes4_Ch3.mainloop
 02:649d Music_Routes4_Ch4
-02:64a8 Music_Routes4_branch_a4a8
+02:64a8 Music_Routes4_Ch4.mainloop
 02:65f0 Music_IndigoPlateau_Ch1
-02:6605 Music_IndigoPlateau_branch_a605
-02:6659 Music_IndigoPlateau_branch_a659
+02:6605 Music_IndigoPlateau_Ch1.mainloop
+02:6659 Music_IndigoPlateau_Ch1.sub1
 02:6664 Music_IndigoPlateau_Ch2
-02:6673 Music_IndigoPlateau_branch_a673
-02:66af Music_IndigoPlateau_branch_a6af
+02:6673 Music_IndigoPlateau_Ch2.mainloop
+02:66af Music_IndigoPlateau_Ch2.sub1
 02:66ba Music_IndigoPlateau_Ch3
-02:66c6 Music_IndigoPlateau_branch_a6c6
-02:66fe Music_IndigoPlateau_branch_a6fe
+02:66c6 Music_IndigoPlateau_Ch3.mainloop
+02:66fe Music_IndigoPlateau_Ch3.sub1
 02:670f Music_IndigoPlateau_Ch4
-02:6728 Music_IndigoPlateau_branch_a728
-02:677e Music_IndigoPlateau_branch_a77e
-02:6791 Music_IndigoPlateau_branch_a791
-02:67a8 Music_IndigoPlateau_branch_a7a8
+02:6728 Music_IndigoPlateau_Ch4.mainloop
+02:677e Music_IndigoPlateau_Ch4.sub1
+02:6791 Music_IndigoPlateau_Ch4.sub2
+02:67a8 Music_IndigoPlateau_Ch4.sub3
 02:67c5 Music_PalletTown_Ch1
-02:67ce Music_PalletTown_branch_a7ce
+02:67ce Music_PalletTown_Ch1.mainloop
 02:685f Music_PalletTown_Ch2
-02:6861 Music_PalletTown_branch_a861
+02:6861 Music_PalletTown_Ch2.mainloop
 02:68de Music_PalletTown_Ch3
-02:68e3 Music_PalletTown_branch_a8e3
+02:68e3 Music_PalletTown_Ch3.mainloop
 02:6913 Music_UnusedSong_Ch1
-02:691b Music_UnusedSong_branch_a91b
+02:691b Music_UnusedSong_Ch1.mainloop
 02:69cf Music_UnusedSong_Ch2
-02:69d8 Music_UnusedSong_branch_a9d8
-02:6a6f Music_Cities1_branch_aa6f
+02:69d8 Music_UnusedSong_Ch2.mainloop
+02:6a6f Music_Cities1_Ch1_AlternateTempo
 02:6a76 Music_Cities1_Ch1
-02:6a79 Music_Cities1_branch_aa79
-02:6a80 Music_Cities1_branch_aa80
-02:6b12 Music_Cities1_branch_ab12
-02:6b7d Music_Cities1_branch_ab7d
-02:6b8a Music_Cities1_branch_ab8a
+02:6a79 Music_Cities1_Ch1.body
+02:6a80 Music_Cities1_Ch1.mainloop
+02:6b12 Music_Cities1_Ch1.loop1
+02:6b7d Music_Cities1_Ch1.sub1
+02:6b8a Music_Cities1_Ch1.sub2
 02:6b92 Music_Cities1_Ch2
-02:6c00 Music_Cities1_branch_ac00
+02:6b92 Music_Cities1_Ch2.mainloop
+02:6c00 Music_Cities1_Ch2.sub1
 02:6c32 Music_Cities1_Ch3
-02:6c35 Music_Cities1_branch_ac35
-02:6cc5 Music_Cities1_branch_acc5
-02:6cce Music_Cities1_branch_acce
+02:6c35 Music_Cities1_Ch3.mainloop
+02:6cc5 Music_Cities1_Ch3.sub1
+02:6cce Music_Cities1_Ch3.sub2
 02:6cef Music_Cities1_Ch4
-02:6cf3 Music_Cities1_branch_acf3
-02:6d36 Music_Cities1_branch_ad36
-02:6d45 Music_Cities1_branch_ad45
-02:6d52 Music_Cities1_branch_ad52
-02:6d5f Music_Cities1_branch_ad5f
-02:6d6e Music_Cities1_branch_ad6e
+02:6cef Music_Cities1_Ch4.mainloop
+02:6cf3 Music_Cities1_Ch4.loop1
+02:6d36 Music_Cities1_Ch4.sub1
+02:6d45 Music_Cities1_Ch4.sub2
+02:6d52 Music_Cities1_Ch4.sub3
+02:6d5f Music_Cities1_Ch4.sub4
+02:6d6e Music_Cities1_Ch4.sub5
 02:6d77 SFX_Get_Item1_1_Ch5
 02:6d8e SFX_Get_Item1_1_Ch6
 02:6d9e SFX_Get_Item1_1_Ch7
 02:6dae Music_MuseumGuy_Ch1
-02:6dd6 Music_MuseumGuy_branch_add6
-02:6de7 Music_MuseumGuy_branch_ade7
-02:6dec Music_MuseumGuy_branch_adec
+02:6dd6 Music_MuseumGuy_Ch1.mainloop
+02:6de7 Music_MuseumGuy_Ch1.sub1
+02:6dec Music_MuseumGuy_Ch1.sub2
 02:6df1 Music_MuseumGuy_Ch2
-02:6e26 Music_MuseumGuy_branch_ae26
+02:6e26 Music_MuseumGuy_Ch2.mainloop
 02:6e6e Music_MuseumGuy_Ch3
-02:6e8e Music_MuseumGuy_branch_ae8e
-02:6eb8 Music_MuseumGuy_branch_aeb8
-02:6ec1 Music_MuseumGuy_branch_aec1
+02:6e8e Music_MuseumGuy_Ch3.mainloop
+02:6eb8 Music_MuseumGuy_Ch3.sub1
+02:6ec1 Music_MuseumGuy_Ch3.sub2
 02:6ed1 Music_MuseumGuy_Ch4
-02:6ee1 Music_MuseumGuy_branch_aee1
+02:6ee1 Music_MuseumGuy_Ch4.mainloop
 02:6f59 Music_MeetProfOak_Ch1
-02:6f85 Music_MeetProfOak_branch_af85
+02:6f85 Music_MeetProfOak_Ch1.mainloop
 02:6fa9 Music_MeetProfOak_Ch2
-02:7005 Music_MeetProfOak_branch_b005
+02:7005 Music_MeetProfOak_Ch2.mainloop
 02:703d Music_MeetProfOak_Ch3
-02:70bc Music_MeetProfOak_branch_b0bc
-02:70d8 Music_MeetProfOak_branch_b0d8
-02:70ed Music_MeetProfOak_branch_b0ed
-02:7101 Music_MeetProfOak_branch_b101
-02:7119 Music_MeetRival_branch_b119
+02:70bc Music_MeetProfOak_Ch3.loop1
+02:70bc Music_MeetProfOak_Ch3.mainloop
+02:70d8 Music_MeetProfOak_Ch3.loop2
+02:70ed Music_MeetProfOak_Ch3.loop3
+02:7101 Music_MeetProfOak_Ch3.loop4
+02:7119 Music_MeetRival_Ch1_AlternateTempo
 02:7120 Music_MeetRival_Ch1
-02:7123 Music_MeetRival_branch_b123
-02:7140 Music_MeetRival_branch_b140
-02:719b Music_MeetRival_branch_b19b
-02:71a2 Music_MeetRival_branch_b1a2
-02:71a5 Music_MeetRival_branch_b1a5
+02:7123 Music_MeetRival_Ch1.body
+02:7140 Music_MeetRival_Ch1.mainloop
+02:719b Music_MeetRival_Ch1_AlternateStartAndTempo
+02:71a2 Music_MeetRival_Ch1_AlternateStart
+02:71a5 Music_MeetRival_Ch1_AlternateStart.body
 02:71bb Music_MeetRival_Ch2
-02:71d8 Music_MeetRival_branch_b1d8
-02:721d Music_MeetRival_branch_b21d
+02:71d8 Music_MeetRival_Ch2.mainloop
+02:721d Music_MeetRival_Ch2_AlternateStart
 02:7233 Music_MeetRival_Ch3
-02:724b Music_MeetRival_branch_b24b
-02:72b5 Music_MeetRival_branch_b2b5
+02:724b Music_MeetRival_Ch3.mainloop
+02:72b5 Music_MeetRival_Ch3_AlternateStart
 02:72c8 SFX_Pokedex_Rating_1_Ch5
 02:72e1 SFX_Pokedex_Rating_1_Ch6
 02:72f7 SFX_Pokedex_Rating_1_Ch7
@@ -2464,74 +2469,76 @@
 02:7381 SFX_Get_Key_Item_1_Ch6
 02:739d SFX_Get_Key_Item_1_Ch7
 02:73a7 Music_SSAnne_Ch1
-02:73b2 Music_SSAnne_branch_b3b2
+02:73b2 Music_SSAnne_Ch1.mainloop
 02:7419 Music_SSAnne_Ch2
-02:741e Music_SSAnne_branch_b41e
+02:741e Music_SSAnne_Ch2.mainloop
 02:74cb Music_SSAnne_Ch3
+02:74cb Music_SSAnne_Ch3.mainloop
 02:7504 Music_Cities2_Ch1
-02:751a Music_Cities2_branch_b51a
+02:751a Music_Cities2_Ch1.mainloop
 02:7569 Music_Cities2_Ch2
-02:758b Music_Cities2_branch_b58b
+02:758b Music_Cities2_Ch2.mainloop
 02:7640 Music_Cities2_Ch3
-02:764c Music_Cities2_branch_b64c
+02:764c Music_Cities2_Ch3.mainloop
 02:76c7 Music_Celadon_Ch1
-02:76d4 Music_Celadon_branch_b6d4
+02:76d4 Music_Celadon_Ch1.mainloop
 02:773a Music_Celadon_Ch2
-02:774a Music_Celadon_branch_b74a
+02:774a Music_Celadon_Ch2.mainloop
 02:77b5 Music_Celadon_Ch3
-02:77c1 Music_Celadon_branch_b7c1
+02:77c1 Music_Celadon_Ch3.mainloop
 02:786d Music_Cinnabar_Ch1
-02:7878 Music_Cinnabar_branch_b878
+02:7878 Music_Cinnabar_Ch1.mainloop
 02:78d4 Music_Cinnabar_Ch2
-02:78d9 Music_Cinnabar_branch_b8d9
+02:78d9 Music_Cinnabar_Ch2.mainloop
 02:793d Music_Cinnabar_Ch3
-02:793f Music_Cinnabar_branch_b93f
+02:793f Music_Cinnabar_Ch3.mainloop
 02:79eb Music_Vermilion_Ch1
-02:79f6 Music_Vermilion_branch_b9f6
+02:79f6 Music_Vermilion_Ch1.mainloop
 02:7a61 Music_Vermilion_Ch2
-02:7a66 Music_Vermilion_branch_ba66
+02:7a66 Music_Vermilion_Ch2.mainloop
 02:7aa6 Music_Vermilion_Ch3
-02:7aa8 Music_Vermilion_branch_baa8
+02:7aa8 Music_Vermilion_Ch3.mainloop
 02:7b0d Music_Vermilion_Ch4
-02:7b0e Music_Vermilion_branch_bb0e
-02:7b3f Music_Vermilion_branch_bb3f
+02:7b0e Music_Vermilion_Ch4.loop1
+02:7b0e Music_Vermilion_Ch4.mainloop
+02:7b3f Music_Vermilion_Ch4.sub1
 02:7b58 Music_Lavender_Ch1
-02:7b6b Music_Lavender_branch_bb6b
+02:7b6b Music_Lavender_Ch1.mainloop
 02:7b9e Music_Lavender_Ch2
-02:7ba5 Music_Lavender_branch_bba5
+02:7ba5 Music_Lavender_Ch2.mainloop
 02:7bae Music_Lavender_Ch3
-02:7bb9 Music_Lavender_branch_bbb9
+02:7bb9 Music_Lavender_Ch3.mainloop
 02:7c21 Music_Lavender_Ch4
-02:7c26 Music_Lavender_branch_bc26
+02:7c26 Music_Lavender_Ch4.mainloop
 02:7c2e Music_SafariZone_Ch1
-02:7c4f Music_SafariZone_branch_bc4f
-02:7c5f Music_SafariZone_branch_bc5f
+02:7c4f Music_SafariZone_Ch1.mainloop
+02:7c5f Music_SafariZone_Ch1.sub1
 02:7c6a Music_SafariZone_Ch2
-02:7c79 Music_SafariZone_branch_bc79
-02:7c89 Music_SafariZone_branch_bc89
+02:7c79 Music_SafariZone_Ch2.mainloop
+02:7c89 Music_SafariZone_Ch2.sub1
 02:7c94 Music_SafariZone_Ch3
-02:7c97 Music_SafariZone_branch_bc97
-02:7ca5 Music_SafariZone_branch_bca5
+02:7c97 Music_SafariZone_Ch3.mainloop
+02:7ca5 Music_SafariZone_Ch3.sub1
 02:7cbb Music_Gym_Ch1
-02:7cd8 Music_Gym_branch_bcd8
+02:7cd8 Music_Gym_Ch1.mainloop
 02:7d6b Music_Gym_Ch2
-02:7d82 Music_Gym_branch_bd82
+02:7d82 Music_Gym_Ch2.mainloop
 02:7dfa Music_Gym_Ch3
-02:7e02 Music_Gym_branch_be02
-02:7e3b Music_Gym_branch_be3b
-02:7e44 Music_Gym_branch_be44
-02:7e4d Music_Gym_branch_be4d
+02:7e02 Music_Gym_Ch3.mainloop
+02:7e3b Music_Gym_Ch3.sub1
+02:7e44 Music_Gym_Ch3.sub2
+02:7e4d Music_Gym_Ch3.sub3
 02:7e56 Music_Pokecenter_Ch1
-02:7e61 Music_Pokecenter_branch_be61
+02:7e61 Music_Pokecenter_Ch1.mainloop
 02:7ef9 Music_Pokecenter_Ch2
-02:7efc Music_Pokecenter_branch_befc
-02:7f4e Music_Pokecenter_branch_bf4e
-02:7f60 Music_Pokecenter_branch_bf60
+02:7efc Music_Pokecenter_Ch2.mainloop
+02:7f4e Music_Pokecenter_Ch2.sub1
+02:7f60 Music_Pokecenter_Ch2.sub2
 02:7f70 Music_Pokecenter_Ch3
-02:7f72 Music_Pokecenter_branch_bf72
-02:7fd9 Music_Pokecenter_branch_bfd9
-02:7fe2 Music_Pokecenter_branch_bfe2
-02:7feb Music_Pokecenter_branch_bfeb
+02:7f72 Music_Pokecenter_Ch3.mainloop
+02:7fd9 Music_Pokecenter_Ch3.sub1
+02:7fe2 Music_Pokecenter_Ch3.sub2
+02:7feb Music_Pokecenter_Ch3.sub3
 03:4000 _Joypad
 03:4034 DiscardButtonPresses
 03:403c TrySoftReset
@@ -5180,9 +5187,9 @@
 08:45fe SFX_Battle_25_Ch8
 08:460e SFX_Battle_26_Ch8
 08:4624 SFX_Battle_27_Ch5
-08:462a SFX_Battle_27_branch_2062a
+08:462a SFX_Battle_27_Ch5.loop1
 08:4637 SFX_Battle_27_Ch6
-08:463d SFX_Battle_27_branch_2063d
+08:463d SFX_Battle_27_Ch6.loop1
 08:464a SFX_Battle_27_Ch8
 08:4655 SFX_Battle_28_Ch5
 08:4664 SFX_Battle_28_Ch6
@@ -5221,7 +5228,7 @@
 08:48e0 SFX_Battle_35_Ch5
 08:48f0 SFX_Battle_35_Ch6
 08:4902 SFX_Battle_36_Ch5
-08:4930 SFX_Battle_36_branch_20930
+08:4930 SFX_Battle_36_Ch5.loop1
 08:4941 SFX_Battle_36_Ch6
 08:4980 SFX_Battle_36_Ch8
 08:498b SFX_UnusedCry_2_Ch5
@@ -5577,34 +5584,34 @@
 08:6347 SFX_UnusedFanfare_Ch6
 08:6359 SFX_UnusedFanfare_Ch7
 08:6370 Music_GymLeaderBattle_Ch1
-08:63b0 Music_GymLeaderBattle_branch_223b0
+08:63b0 Music_GymLeaderBattle_Ch1.mainloop
 08:65a1 Music_GymLeaderBattle_Ch2
-08:65e0 Music_GymLeaderBattle_branch_225e0
+08:65e0 Music_GymLeaderBattle_Ch2.mainloop
 08:66ef Music_GymLeaderBattle_Ch3
-08:67b1 Music_GymLeaderBattle_branch_227b1
+08:67b1 Music_GymLeaderBattle_Ch3.mainloop
 08:6919 Music_TrainerBattle_Ch1
-08:6962 Music_TrainerBattle_branch_22962
+08:6962 Music_TrainerBattle_Ch1.mainloop
 08:6bae Music_TrainerBattle_Ch2
-08:6bfc Music_TrainerBattle_branch_22bfc
+08:6bfc Music_TrainerBattle_Ch2.mainloop
 08:6d10 Music_TrainerBattle_Ch3
-08:6d9c Music_TrainerBattle_branch_22d9c
+08:6d9c Music_TrainerBattle_Ch3.mainloop
 08:7099 Music_WildBattle_Ch1
-08:70e0 Music_WildBattle_branch_230e0
+08:70e0 Music_WildBattle_Ch1.mainloop
 08:71d8 Music_WildBattle_Ch2
-08:7225 Music_WildBattle_branch_23225
+08:7225 Music_WildBattle_Ch2.mainloop
 08:7290 Music_WildBattle_Ch3
-08:72b5 Music_WildBattle_branch_232b5
-08:72d8 Music_WildBattle_branch_232d8
+08:72b5 Music_WildBattle_Ch3.introloop
+08:72d8 Music_WildBattle_Ch3.mainloop
 08:73a6 Music_FinalBattle_Ch1
-08:7429 Music_FinalBattle_branch_23429
+08:7429 Music_FinalBattle_Ch1.mainloop
 08:756a Music_FinalBattle_Ch2
-08:75e6 Music_FinalBattle_branch_235e6
-08:7704 Music_FinalBattle_branch_23704
-08:7710 Music_FinalBattle_branch_23710
+08:75e6 Music_FinalBattle_Ch2.mainloop
+08:7704 Music_FinalBattle_Ch2.sub1
+08:7710 Music_FinalBattle_Ch2.sub2
 08:771c Music_FinalBattle_Ch3
-08:777d Music_FinalBattle_branch_2377d
-08:795b Music_FinalBattle_branch_2395b
-08:796c Music_FinalBattle_branch_2396c
+08:777d Music_FinalBattle_Ch3.mainloop
+08:795b Music_FinalBattle_Ch3.sub1
+08:796c Music_FinalBattle_Ch3.sub2
 08:797d SFX_Level_Up_Ch5
 08:7998 SFX_Level_Up_Ch6
 08:79b0 SFX_Level_Up_Ch7
@@ -5615,23 +5622,23 @@
 08:7a2e SFX_Caught_Mon_Ch6
 08:7a44 SFX_Caught_Mon_Ch7
 08:7a53 Music_DefeatedTrainer_Ch1
-08:7a76 Music_DefeatedTrainer_branch_23a76
+08:7a76 Music_DefeatedTrainer_Ch1.mainloop
 08:7ac1 Music_DefeatedTrainer_Ch2
-08:7ad2 Music_DefeatedTrainer_branch_23ad2
+08:7ad2 Music_DefeatedTrainer_Ch2.mainloop
 08:7b15 Music_DefeatedTrainer_Ch3
-08:7b24 Music_DefeatedTrainer_branch_23b24
+08:7b24 Music_DefeatedTrainer_Ch3.mainloop
 08:7b74 Music_DefeatedWildMon_Ch1
-08:7b8b Music_DefeatedWildMon_branch_23b8b
+08:7b8b Music_DefeatedWildMon_Ch1.mainloop
 08:7bc1 Music_DefeatedWildMon_Ch2
-08:7bce Music_DefeatedWildMon_branch_23bce
+08:7bce Music_DefeatedWildMon_Ch2.mainloop
 08:7c0e Music_DefeatedWildMon_Ch3
-08:7c21 Music_DefeatedWildMon_branch_23c21
+08:7c21 Music_DefeatedWildMon_Ch3.mainloop
 08:7cad Music_DefeatedGymLeader_Ch1
-08:7ccc Music_DefeatedGymLeader_branch_23ccc
+08:7ccc Music_DefeatedGymLeader_Ch1.mainloop
 08:7d6d Music_DefeatedGymLeader_Ch2
-08:7d84 Music_DefeatedGymLeader_branch_23d84
+08:7d84 Music_DefeatedGymLeader_Ch2.mainloop
 08:7e52 Music_DefeatedGymLeader_Ch3
-08:7e65 Music_DefeatedGymLeader_branch_23e65
+08:7e65 Music_DefeatedGymLeader_Ch3.mainloop
 09:4000 RhydonPicFront
 09:4202 RhydonPicBack
 09:429a KangaskhanPicFront
@@ -14685,130 +14692,138 @@
 1f:5ba3 Audio3_Pitches
 1f:5ba3 Audio3_Pitches._table_width_u7986
 1f:5bbb Music_BikeRiding_Ch1
-1f:5bc9 Music_BikeRiding_branch_7dbc9
+1f:5bc9 Music_BikeRiding_Ch1.mainloop
 1f:5c6c Music_BikeRiding_Ch2
-1f:5c75 Music_BikeRiding_branch_7dc75
+1f:5c75 Music_BikeRiding_Ch2.mainloop
 1f:5d14 Music_BikeRiding_Ch3
-1f:5d17 Music_BikeRiding_branch_7dd17
+1f:5d17 Music_BikeRiding_Ch3.mainloop
 1f:5e68 Music_BikeRiding_Ch4
-1f:5e6a Music_BikeRiding_branch_7de6a
-1f:5ea7 Music_BikeRiding_branch_7dea7
-1f:5eb4 Music_BikeRiding_branch_7deb4
-1f:5ec2 Music_BikeRiding_branch_7dec2
+1f:5e6a Music_BikeRiding_Ch4.mainloop
+1f:5ea7 Music_BikeRiding_Ch4.sub1
+1f:5eb4 Music_BikeRiding_Ch4.sub2
+1f:5ec2 Music_BikeRiding_Ch4.sub3
 1f:5ed1 Music_Dungeon1_Ch1
-1f:5ee5 Music_Dungeon1_branch_7dee5
-1f:5ee8 Music_Dungeon1_branch_7dee8
-1f:5eff Music_Dungeon1_branch_7deff
-1f:5f6e Music_Dungeon1_branch_7df6e
-1f:5faa Music_Dungeon1_branch_7dfaa
-1f:5fbb Music_Dungeon1_branch_7dfbb
-1f:5fc5 Music_Dungeon1_branch_7dfc5
-1f:5fd5 Music_Dungeon1_branch_7dfd5
+1f:5ee5 Music_Dungeon1_Ch1.mainloop
+1f:5ee8 Music_Dungeon1_Ch1.loop1
+1f:5eff Music_Dungeon1_Ch1.loop2
+1f:5f6e Music_Dungeon1_Ch1.loop3
+1f:5faa Music_Dungeon1_Ch1.sub1
+1f:5fbb Music_Dungeon1_Ch1.sub2
+1f:5fc5 Music_Dungeon1_Ch1.sub3
+1f:5fd5 Music_Dungeon1_Ch1.sub4
 1f:5fde Music_Dungeon1_Ch2
-1f:5feb Music_Dungeon1_branch_7dfeb
-1f:5fed Music_Dungeon1_branch_7dfed
-1f:6006 Music_Dungeon1_branch_7e006
-1f:6097 Music_Dungeon1_branch_7e097
-1f:60ab Music_Dungeon1_branch_7e0ab
-1f:60b5 Music_Dungeon1_branch_7e0b5
-1f:60ba Music_Dungeon1_branch_7e0ba
-1f:60c0 Music_Dungeon1_branch_7e0c0
-1f:60cd Music_Dungeon1_branch_7e0cd
+1f:5feb Music_Dungeon1_Ch2.mainloop
+1f:5fed Music_Dungeon1_Ch2.loop1
+1f:6006 Music_Dungeon1_Ch2.loop2
+1f:6097 Music_Dungeon1_Ch2.sub1
+1f:60ab Music_Dungeon1_Ch2.sub2
+1f:60b5 Music_Dungeon1_Ch2.sub3
+1f:60ba Music_Dungeon1_Ch2.sub4
+1f:60c0 Music_Dungeon1_Ch2.sub5
+1f:60cd Music_Dungeon1_Ch2.sub6
 1f:60dc Music_Dungeon1_Ch3
-1f:60e5 Music_Dungeon1_branch_7e0e5
-1f:6140 Music_Dungeon1_branch_7e140
-1f:6154 Music_Dungeon1_branch_7e154
-1f:615e Music_Dungeon1_branch_7e15e
-1f:6164 Music_Dungeon1_branch_7e164
-1f:6177 Music_Dungeon1_branch_7e177
+1f:60e5 Music_Dungeon1_Ch3.mainloop
+1f:6140 Music_Dungeon1_Ch3.sub1
+1f:6154 Music_Dungeon1_Ch3.sub2
+1f:615e Music_Dungeon1_Ch3.sub3
+1f:6164 Music_Dungeon1_Ch3.sub4
+1f:6177 Music_Dungeon1_Ch3.sub5
 1f:618a Music_Dungeon1_Ch4
-1f:6190 Music_Dungeon1_branch_7e190
-1f:61a1 Music_Dungeon1_branch_7e1a1
-1f:61b0 Music_Dungeon1_branch_7e1b0
-1f:61ba Music_Dungeon1_branch_7e1ba
-1f:61cf Music_Dungeon1_branch_7e1cf
-1f:61d5 Music_Dungeon1_branch_7e1d5
-1f:61f1 Music_Dungeon1_branch_7e1f1
-1f:61fa Music_Dungeon1_branch_7e1fa
-1f:6202 Music_Dungeon1_branch_7e202
+1f:6190 Music_Dungeon1_Ch4.loop1
+1f:6190 Music_Dungeon1_Ch4.mainloop
+1f:61a1 Music_Dungeon1_Ch4.loop2
+1f:61b0 Music_Dungeon1_Ch4.loop3
+1f:61ba Music_Dungeon1_Ch4.loop4
+1f:61cf Music_Dungeon1_Ch4.loop5
+1f:61d5 Music_Dungeon1_Ch4.loop6
+1f:61f1 Music_Dungeon1_Ch4.sub1
+1f:61fa Music_Dungeon1_Ch4.sub2
+1f:6202 Music_Dungeon1_Ch4.sub3
 1f:620b Music_GameCorner_Ch1
-1f:6222 Music_GameCorner_branch_7e222
+1f:6222 Music_GameCorner_Ch1.mainloop
 1f:62df Music_GameCorner_Ch2
-1f:62fa Music_GameCorner_branch_7e2fa
+1f:62fa Music_GameCorner_Ch2.mainloop
 1f:638b Music_GameCorner_Ch3
-1f:63a5 Music_GameCorner_branch_7e3a5
-1f:6418 Music_GameCorner_branch_7e418
-1f:642d Music_GameCorner_branch_7e42d
-1f:6442 Music_GameCorner_branch_7e442
-1f:6457 Music_GameCorner_branch_7e457
-1f:646c Music_GameCorner_branch_7e46c
-1f:6481 Music_GameCorner_branch_7e481
-1f:6496 Music_GameCorner_branch_7e496
-1f:64ab Music_GameCorner_branch_7e4ab
+1f:63a5 Music_GameCorner_Ch3.mainloop
+1f:6418 Music_GameCorner_Ch3.sub1
+1f:642d Music_GameCorner_Ch3.sub2
+1f:6442 Music_GameCorner_Ch3.sub3
+1f:6457 Music_GameCorner_Ch3.sub4
+1f:646c Music_GameCorner_Ch3.sub5
+1f:6481 Music_GameCorner_Ch3.sub6
+1f:6496 Music_GameCorner_Ch3.sub7
+1f:64ab Music_GameCorner_Ch3.sub8
 1f:64c0 Music_TitleScreen_Ch1
-1f:64e2 Music_TitleScreen_branch_7e4e2
-1f:6541 Music_TitleScreen_branch_7e541
-1f:654a Music_TitleScreen_branch_7e54a
-1f:655c Music_TitleScreen_branch_7e55c
+1f:64e2 Music_TitleScreen_Ch1.mainloop
+1f:6541 Music_TitleScreen_Ch1.sub1
+1f:654a Music_TitleScreen_Ch1.sub2
+1f:655c Music_TitleScreen_Ch1.sub3
 1f:6578 Music_TitleScreen_Ch2
-1f:6594 Music_TitleScreen_branch_7e594
-1f:6622 Music_TitleScreen_branch_7e622
-1f:662c Music_TitleScreen_branch_7e62c
-1f:6636 Music_TitleScreen_branch_7e636
+1f:6594 Music_TitleScreen_Ch2.mainloop
+1f:6622 Music_TitleScreen_Ch2.sub1
+1f:662c Music_TitleScreen_Ch2.sub2
+1f:6636 Music_TitleScreen_Ch2.sub3
 1f:6643 Music_TitleScreen_Ch3
-1f:665e Music_TitleScreen_branch_7e65e
-1f:6664 Music_TitleScreen_branch_7e664
-1f:66c9 Music_TitleScreen_branch_7e6c9
-1f:66d0 Music_TitleScreen_branch_7e6d0
-1f:66d7 Music_TitleScreen_branch_7e6d7
-1f:66dc Music_TitleScreen_branch_7e6dc
-1f:66e5 Music_TitleScreen_branch_7e6e5
+1f:665e Music_TitleScreen_Ch3.mainloop
+1f:6664 Music_TitleScreen_Ch3.loop1
+1f:66c9 Music_TitleScreen_Ch3.sub1
+1f:66d0 Music_TitleScreen_Ch3.sub2
+1f:66d7 Music_TitleScreen_Ch3.sub3
+1f:66dc Music_TitleScreen_Ch3.sub4
+1f:66e5 Music_TitleScreen_Ch3.sub5
 1f:66eb Music_TitleScreen_Ch4
-1f:6716 Music_TitleScreen_branch_7e716
-1f:6834 Music_TitleScreen_branch_7e834
-1f:6842 Music_TitleScreen_branch_7e842
+1f:6716 Music_TitleScreen_Ch4.mainloop
+1f:6834 Music_TitleScreen_Ch4.sub1
+1f:6842 Music_TitleScreen_Ch4.sub2
 1f:6850 SFX_Get_Item1_3_Ch5
 1f:6867 SFX_Get_Item1_3_Ch6
 1f:6877 SFX_Get_Item1_3_Ch7
 1f:6887 Music_Dungeon2_Ch1
-1f:6892 Music_Dungeon2_branch_7e892
+1f:6892 Music_Dungeon2_Ch1.loop1
+1f:6892 Music_Dungeon2_Ch1.mainloop
 1f:68d8 Music_Dungeon2_Ch2
-1f:68db Music_Dungeon2_branch_7e8db
+1f:68db Music_Dungeon2_Ch2.loop1
+1f:68db Music_Dungeon2_Ch2.mainloop
 1f:693b Music_Dungeon2_Ch3
-1f:6940 Music_Dungeon2_branch_7e940
-1f:6958 Music_Dungeon2_branch_7e958
-1f:69d1 Music_Dungeon2_branch_7e9d1
+1f:6940 Music_Dungeon2_Ch3.loop1
+1f:6940 Music_Dungeon2_Ch3.mainloop
+1f:6958 Music_Dungeon2_Ch3.loop2
+1f:69be Music_Dungeon2_Ch3.sub1
+1f:69d1 Music_Dungeon2_Ch3.sub2
 1f:69dc Music_Dungeon2_Ch4
-1f:69dd Music_Dungeon2_branch_7e9dd
+1f:69dd Music_Dungeon2_Ch4.mainloop
 1f:69f1 Music_Dungeon3_Ch1
-1f:69fc Music_Dungeon3_branch_7e9fc
-1f:69fe Music_Dungeon3_branch_7e9fe
-1f:6a11 Music_Dungeon3_branch_7ea11
-1f:6a18 Music_Dungeon3_branch_7ea18
-1f:6a3c Music_Dungeon3_branch_7ea3c
-1f:6a43 Music_Dungeon3_branch_7ea43
-1f:6ab2 Music_Dungeon3_branch_7eab2
-1f:6ac1 Music_Dungeon3_branch_7eac1
-1f:6ace Music_Dungeon3_branch_7eace
-1f:6add Music_Dungeon3_branch_7eadd
-1f:6aea Music_Dungeon3_branch_7eaea
-1f:6af7 Music_Dungeon3_branch_7eaf7
-1f:6afc Music_Dungeon3_branch_7eafc
+1f:69fc Music_Dungeon3_Ch1.mainloop
+1f:69fe Music_Dungeon3_Ch1.loop1
+1f:6a11 Music_Dungeon3_Ch1.loop2
+1f:6a18 Music_Dungeon3_Ch1.loop3
+1f:6a3c Music_Dungeon3_Ch1.loop4
+1f:6a43 Music_Dungeon3_Ch1.loop5
+1f:6ab2 Music_Dungeon3_Ch1.sub1
+1f:6ac1 Music_Dungeon3_Ch1.sub2
+1f:6ace Music_Dungeon3_Ch1.sub3
+1f:6add Music_Dungeon3_Ch1.sub4
+1f:6aea Music_Dungeon3_Ch1.sub5
+1f:6af7 Music_Dungeon3_Ch1.sub6
+1f:6afc Music_Dungeon3_Ch1.sub7
 1f:6b68 Music_Dungeon3_Ch2
-1f:6b6d Music_Dungeon3_branch_7eb6d
+1f:6b6d Music_Dungeon3_Ch2.mainloop
 1f:6c7a Music_Dungeon3_Ch3
+1f:6c7a Music_Dungeon3_Ch3.mainloop
 1f:6ce4 Music_Dungeon3_Ch4
 1f:6d0f Music_CinnabarMansion_Ch1
-1f:6d19 Music_CinnabarMansion_branch_7ed19
+1f:6d19 Music_CinnabarMansion_Ch1.loop1
+1f:6d19 Music_CinnabarMansion_Ch1.mainloop
 1f:6d40 Music_CinnabarMansion_Ch2
-1f:6d48 Music_CinnabarMansion_branch_7ed48
-1f:6d4e Music_CinnabarMansion_branch_7ed4e
-1f:6d50 Music_CinnabarMansion_branch_7ed50
-1f:6d6c Music_CinnabarMansion_branch_7ed6c
+1f:6d48 Music_CinnabarMansion_Ch2.introloop
+1f:6d4e Music_CinnabarMansion_Ch2.mainloop
+1f:6d50 Music_CinnabarMansion_Ch2.loop1
+1f:6d6c Music_CinnabarMansion_Ch2.sub1
 1f:6d7e Music_CinnabarMansion_Ch3
-1f:6d80 Music_CinnabarMansion_branch_7ed80
+1f:6d80 Music_CinnabarMansion_Ch3.loop1
+1f:6d80 Music_CinnabarMansion_Ch3.mainloop
 1f:6db0 Music_CinnabarMansion_Ch4
-1f:6db5 Music_CinnabarMansion_branch_7edb5
+1f:6db5 Music_CinnabarMansion_Ch4.mainloop
 1f:6dda SFX_Pokedex_Rating_3_Ch5
 1f:6df3 SFX_Pokedex_Rating_3_Ch6
 1f:6e09 SFX_Pokedex_Rating_3_Ch7
@@ -14819,72 +14834,75 @@
 1f:6e93 SFX_Get_Key_Item_3_Ch6
 1f:6eaf SFX_Get_Key_Item_3_Ch7
 1f:6eb9 Music_OaksLab_Ch1
-1f:6ed0 Music_OaksLab_branch_7eed0
+1f:6ed0 Music_OaksLab_Ch1.mainloop
 1f:6f05 Music_OaksLab_Ch2
-1f:6f16 Music_OaksLab_branch_7ef16
+1f:6f16 Music_OaksLab_Ch2.mainloop
 1f:6f52 Music_OaksLab_Ch3
-1f:6f5c Music_OaksLab_branch_7ef5c
+1f:6f5c Music_OaksLab_Ch3.mainloop
 1f:704a Music_PokemonTower_Ch1
-1f:705a Music_PokemonTower_branch_7f05a
+1f:705a Music_PokemonTower_Ch1.mainloop
 1f:70e3 Music_PokemonTower_Ch2
-1f:70ee Music_PokemonTower_branch_7f0ee
+1f:70ee Music_PokemonTower_Ch2.mainloop
 1f:719a Music_PokemonTower_Ch3
-1f:71a2 Music_PokemonTower_branch_7f1a2
+1f:71a2 Music_PokemonTower_Ch3.mainloop
 1f:7243 Music_SilphCo_Ch1
-1f:726d Music_SilphCo_branch_7f26d
-1f:73f0 Music_SilphCo_branch_7f3f0
+1f:726d Music_SilphCo_Ch1.mainloop
+1f:73f0 Music_SilphCo_Ch1.sub1
 1f:7409 Music_SilphCo_Ch2
-1f:742e Music_SilphCo_branch_7f42e
+1f:742e Music_SilphCo_Ch2.mainloop
 1f:75be Music_SilphCo_Ch3
-1f:75c9 Music_SilphCo_branch_7f5c9
+1f:75c9 Music_SilphCo_Ch3.mainloop
 1f:769d Music_MeetEvilTrainer_Ch1
-1f:76ae Music_MeetEvilTrainer_branch_7f6ae
+1f:76ae Music_MeetEvilTrainer_Ch1.mainloop
 1f:76ba Music_MeetEvilTrainer_Ch2
-1f:76c2 Music_MeetEvilTrainer_branch_7f6c2
+1f:76c2 Music_MeetEvilTrainer_Ch2.mainloop
 1f:76e6 Music_MeetEvilTrainer_Ch3
-1f:76ee Music_MeetEvilTrainer_branch_7f6ee
+1f:76ee Music_MeetEvilTrainer_Ch3.mainloop
 1f:76f9 Music_MeetFemaleTrainer_Ch1
-1f:770c Music_MeetFemaleTrainer_branch_7f70c
+1f:770c Music_MeetFemaleTrainer_Ch1.loop1
+1f:770c Music_MeetFemaleTrainer_Ch1.mainloop
 1f:771c Music_MeetFemaleTrainer_Ch2
-1f:7726 Music_MeetFemaleTrainer_branch_7f726
+1f:7726 Music_MeetFemaleTrainer_Ch2.mainloop
 1f:774b Music_MeetFemaleTrainer_Ch3
-1f:7756 Music_MeetFemaleTrainer_branch_7f756
-1f:7770 Music_MeetFemaleTrainer_branch_7f770
+1f:7756 Music_MeetFemaleTrainer_Ch3.mainloop
+1f:7770 Music_MeetFemaleTrainer_Ch3.sub1
 1f:777b Music_MeetMaleTrainer_Ch1
-1f:778f Music_MeetMaleTrainer_branch_7f78f
+1f:778f Music_MeetMaleTrainer_Ch1.mainloop
 1f:77a2 Music_MeetMaleTrainer_Ch2
-1f:77b5 Music_MeetMaleTrainer_branch_7f7b5
+1f:77b5 Music_MeetMaleTrainer_Ch2.mainloop
 1f:77d2 Music_MeetMaleTrainer_Ch3
-1f:77ea Music_MeetMaleTrainer_branch_7f7ea
+1f:77ea Music_MeetMaleTrainer_Ch3.mainloop
 1f:7844 Music_IntroBattle_Ch1
 1f:78bc Music_IntroBattle_Ch2
 1f:791d Music_IntroBattle_Ch3
 1f:795b Music_IntroBattle_Ch4
 1f:7a19 Music_Surfing_Ch1
-1f:7a30 Music_Surfing_branch_7fa30
+1f:7a30 Music_Surfing_Ch1.mainloop
 1f:7a9c Music_Surfing_Ch2
-1f:7aae Music_Surfing_branch_7faae
+1f:7aae Music_Surfing_Ch2.mainloop
 1f:7afa Music_Surfing_Ch3
-1f:7b03 Music_Surfing_branch_7fb03
+1f:7b03 Music_Surfing_Ch3.mainloop
 1f:7b7d Music_JigglypuffSong_Ch1
 1f:7b9a Music_JigglypuffSong_Ch2
 1f:7baf Music_HallOfFame_Ch1
-1f:7bc5 Music_HallOfFame_branch_7fbc5
+1f:7bc5 Music_HallOfFame_Ch1.loop1
+1f:7bc5 Music_HallOfFame_Ch1.mainloop
 1f:7bda Music_HallOfFame_Ch2
-1f:7bdf Music_HallOfFame_branch_7fbdf
+1f:7bdf Music_HallOfFame_Ch2.mainloop
 1f:7bfc Music_HallOfFame_Ch3
-1f:7bfe Music_HallOfFame_branch_7fbfe
+1f:7bfc Music_HallOfFame_Ch3.mainloop
+1f:7bfe Music_HallOfFame_Ch3.loop1
 1f:7c1f Music_Credits_Ch1
 1f:7d5f Music_Credits_Ch2
 1f:7ec2 Music_Credits_Ch3
-1f:7fa4 Music_Credits_branch_7ffa4
-1f:7fae Music_Credits_branch_7ffae
-1f:7fb8 Music_Credits_branch_7ffb8
-1f:7fc1 Music_Credits_branch_7ffc1
-1f:7fd2 Music_Credits_branch_7ffd2
-1f:7fdb Music_Credits_branch_7ffdb
-1f:7fe4 Music_Credits_branch_7ffe4
-1f:7fed Music_Credits_branch_7ffed
+1f:7fa4 Music_Credits_Ch3.sub1
+1f:7fae Music_Credits_Ch3.sub2
+1f:7fb8 Music_Credits_Ch3.sub3
+1f:7fc1 Music_Credits_Ch3.sub4
+1f:7fd2 Music_Credits_Ch3.sub5
+1f:7fdb Music_Credits_Ch3.sub6
+1f:7fe4 Music_Credits_Ch3.sub7
+1f:7fed Music_Credits_Ch3.sub8
 20:4000 _CardKeySuccessText1
 20:4009 _CardKeySuccessText2
 20:4029 _CardKeyFailText
diff --git a/pokeblue_vc.sym b/pokeblue_vc.sym
index 612b53727..6f0064aed 100644
--- a/pokeblue_vc.sym
+++ b/pokeblue_vc.sym
@@ -2348,119 +2348,124 @@
 02:5bc4 Music_PkmnHealed_Ch2
 02:5bd2 Music_PkmnHealed_Ch3
 02:5bde Music_Routes1_Ch1
-02:5be9 Music_Routes1_branch_9be9
+02:5be9 Music_Routes1_Ch1.mainloop
 02:5c51 Music_Routes1_Ch2
-02:5c53 Music_Routes1_branch_9c53
-02:5c65 Music_Routes1_branch_9c65
-02:5c78 Music_Routes1_branch_9c78
-02:5c8d Music_Routes1_branch_9c8d
+02:5c53 Music_Routes1_Ch2.mainloop
+02:5c65 Music_Routes1_Ch2.sub1
+02:5c78 Music_Routes1_Ch2.sub2
+02:5c8d Music_Routes1_Ch2.sub3
 02:5cd8 Music_Routes1_Ch3
-02:5cdd Music_Routes1_branch_9cdd
+02:5cdd Music_Routes1_Ch3.mainloop
 02:5d24 Music_Routes1_Ch4
+02:5d24 Music_Routes1_Ch4.mainloop
 02:5db9 Music_Routes2_Ch1
-02:5dc3 Music_Routes2_branch_9dc3
+02:5dc3 Music_Routes2_Ch1.mainloop
 02:5e4f Music_Routes2_Ch2
-02:5e54 Music_Routes2_branch_9e54
+02:5e54 Music_Routes2_Ch2.mainloop
 02:5e9b Music_Routes2_Ch3
-02:5e9e Music_Routes2_branch_9e9e
+02:5e9e Music_Routes2_Ch3.mainloop
 02:5f08 Music_Routes2_Ch4
+02:5f08 Music_Routes2_Ch4.mainloop
 02:5fad Music_Routes3_Ch1
-02:5fc3 Music_Routes3_branch_9fc3
+02:5fc3 Music_Routes3_Ch1.mainloop
 02:6009 Music_Routes3_Ch2
-02:601a Music_Routes3_branch_a01a
+02:601a Music_Routes3_Ch2.mainloop
 02:607f Music_Routes3_Ch3
-02:60a3 Music_Routes3_branch_a0a3
+02:60a3 Music_Routes3_Ch3.mainloop
 02:6131 Music_Routes3_Ch4
-02:617a Music_Routes3_branch_a17a
+02:617a Music_Routes3_Ch4.mainloop
 02:626a Music_Routes4_Ch1
-02:628a Music_Routes4_branch_a28a
+02:628a Music_Routes4_Ch1.mainloop
 02:6304 Music_Routes4_Ch2
-02:6325 Music_Routes4_branch_a325
+02:6325 Music_Routes4_Ch2.mainloop
 02:63c4 Music_Routes4_Ch3
-02:63d7 Music_Routes4_branch_a3d7
+02:63d7 Music_Routes4_Ch3.mainloop
 02:649d Music_Routes4_Ch4
-02:64a8 Music_Routes4_branch_a4a8
+02:64a8 Music_Routes4_Ch4.mainloop
 02:65f0 Music_IndigoPlateau_Ch1
-02:6605 Music_IndigoPlateau_branch_a605
-02:6659 Music_IndigoPlateau_branch_a659
+02:6605 Music_IndigoPlateau_Ch1.mainloop
+02:6659 Music_IndigoPlateau_Ch1.sub1
 02:6664 Music_IndigoPlateau_Ch2
-02:6673 Music_IndigoPlateau_branch_a673
-02:66af Music_IndigoPlateau_branch_a6af
+02:6673 Music_IndigoPlateau_Ch2.mainloop
+02:66af Music_IndigoPlateau_Ch2.sub1
 02:66ba Music_IndigoPlateau_Ch3
-02:66c6 Music_IndigoPlateau_branch_a6c6
-02:66fe Music_IndigoPlateau_branch_a6fe
+02:66c6 Music_IndigoPlateau_Ch3.mainloop
+02:66fe Music_IndigoPlateau_Ch3.sub1
 02:670f Music_IndigoPlateau_Ch4
-02:6728 Music_IndigoPlateau_branch_a728
-02:677e Music_IndigoPlateau_branch_a77e
-02:6791 Music_IndigoPlateau_branch_a791
-02:67a8 Music_IndigoPlateau_branch_a7a8
+02:6728 Music_IndigoPlateau_Ch4.mainloop
+02:677e Music_IndigoPlateau_Ch4.sub1
+02:6791 Music_IndigoPlateau_Ch4.sub2
+02:67a8 Music_IndigoPlateau_Ch4.sub3
 02:67c5 Music_PalletTown_Ch1
-02:67ce Music_PalletTown_branch_a7ce
+02:67ce Music_PalletTown_Ch1.mainloop
 02:685f Music_PalletTown_Ch2
-02:6861 Music_PalletTown_branch_a861
+02:6861 Music_PalletTown_Ch2.mainloop
 02:68de Music_PalletTown_Ch3
-02:68e3 Music_PalletTown_branch_a8e3
+02:68e3 Music_PalletTown_Ch3.mainloop
 02:6913 Music_UnusedSong_Ch1
-02:691b Music_UnusedSong_branch_a91b
+02:691b Music_UnusedSong_Ch1.mainloop
 02:69cf Music_UnusedSong_Ch2
-02:69d8 Music_UnusedSong_branch_a9d8
-02:6a6f Music_Cities1_branch_aa6f
+02:69d8 Music_UnusedSong_Ch2.mainloop
+02:6a6f Music_Cities1_Ch1_AlternateTempo
 02:6a76 Music_Cities1_Ch1
-02:6a79 Music_Cities1_branch_aa79
-02:6a80 Music_Cities1_branch_aa80
-02:6b12 Music_Cities1_branch_ab12
-02:6b7d Music_Cities1_branch_ab7d
-02:6b8a Music_Cities1_branch_ab8a
+02:6a79 Music_Cities1_Ch1.body
+02:6a80 Music_Cities1_Ch1.mainloop
+02:6b12 Music_Cities1_Ch1.loop1
+02:6b7d Music_Cities1_Ch1.sub1
+02:6b8a Music_Cities1_Ch1.sub2
 02:6b92 Music_Cities1_Ch2
-02:6c00 Music_Cities1_branch_ac00
+02:6b92 Music_Cities1_Ch2.mainloop
+02:6c00 Music_Cities1_Ch2.sub1
 02:6c32 Music_Cities1_Ch3
-02:6c35 Music_Cities1_branch_ac35
-02:6cc5 Music_Cities1_branch_acc5
-02:6cce Music_Cities1_branch_acce
+02:6c35 Music_Cities1_Ch3.mainloop
+02:6cc5 Music_Cities1_Ch3.sub1
+02:6cce Music_Cities1_Ch3.sub2
 02:6cef Music_Cities1_Ch4
-02:6cf3 Music_Cities1_branch_acf3
-02:6d36 Music_Cities1_branch_ad36
-02:6d45 Music_Cities1_branch_ad45
-02:6d52 Music_Cities1_branch_ad52
-02:6d5f Music_Cities1_branch_ad5f
-02:6d6e Music_Cities1_branch_ad6e
+02:6cef Music_Cities1_Ch4.mainloop
+02:6cf3 Music_Cities1_Ch4.loop1
+02:6d36 Music_Cities1_Ch4.sub1
+02:6d45 Music_Cities1_Ch4.sub2
+02:6d52 Music_Cities1_Ch4.sub3
+02:6d5f Music_Cities1_Ch4.sub4
+02:6d6e Music_Cities1_Ch4.sub5
 02:6d77 SFX_Get_Item1_1_Ch5
 02:6d8e SFX_Get_Item1_1_Ch6
 02:6d9e SFX_Get_Item1_1_Ch7
 02:6dae Music_MuseumGuy_Ch1
-02:6dd6 Music_MuseumGuy_branch_add6
-02:6de7 Music_MuseumGuy_branch_ade7
-02:6dec Music_MuseumGuy_branch_adec
+02:6dd6 Music_MuseumGuy_Ch1.mainloop
+02:6de7 Music_MuseumGuy_Ch1.sub1
+02:6dec Music_MuseumGuy_Ch1.sub2
 02:6df1 Music_MuseumGuy_Ch2
-02:6e26 Music_MuseumGuy_branch_ae26
+02:6e26 Music_MuseumGuy_Ch2.mainloop
 02:6e6e Music_MuseumGuy_Ch3
-02:6e8e Music_MuseumGuy_branch_ae8e
-02:6eb8 Music_MuseumGuy_branch_aeb8
-02:6ec1 Music_MuseumGuy_branch_aec1
+02:6e8e Music_MuseumGuy_Ch3.mainloop
+02:6eb8 Music_MuseumGuy_Ch3.sub1
+02:6ec1 Music_MuseumGuy_Ch3.sub2
 02:6ed1 Music_MuseumGuy_Ch4
-02:6ee1 Music_MuseumGuy_branch_aee1
+02:6ee1 Music_MuseumGuy_Ch4.mainloop
 02:6f59 Music_MeetProfOak_Ch1
-02:6f85 Music_MeetProfOak_branch_af85
+02:6f85 Music_MeetProfOak_Ch1.mainloop
 02:6fa9 Music_MeetProfOak_Ch2
-02:7005 Music_MeetProfOak_branch_b005
+02:7005 Music_MeetProfOak_Ch2.mainloop
 02:703d Music_MeetProfOak_Ch3
-02:70bc Music_MeetProfOak_branch_b0bc
-02:70d8 Music_MeetProfOak_branch_b0d8
-02:70ed Music_MeetProfOak_branch_b0ed
-02:7101 Music_MeetProfOak_branch_b101
-02:7119 Music_MeetRival_branch_b119
+02:70bc Music_MeetProfOak_Ch3.loop1
+02:70bc Music_MeetProfOak_Ch3.mainloop
+02:70d8 Music_MeetProfOak_Ch3.loop2
+02:70ed Music_MeetProfOak_Ch3.loop3
+02:7101 Music_MeetProfOak_Ch3.loop4
+02:7119 Music_MeetRival_Ch1_AlternateTempo
 02:7120 Music_MeetRival_Ch1
-02:7123 Music_MeetRival_branch_b123
-02:7140 Music_MeetRival_branch_b140
-02:719b Music_MeetRival_branch_b19b
-02:71a2 Music_MeetRival_branch_b1a2
-02:71a5 Music_MeetRival_branch_b1a5
+02:7123 Music_MeetRival_Ch1.body
+02:7140 Music_MeetRival_Ch1.mainloop
+02:719b Music_MeetRival_Ch1_AlternateStartAndTempo
+02:71a2 Music_MeetRival_Ch1_AlternateStart
+02:71a5 Music_MeetRival_Ch1_AlternateStart.body
 02:71bb Music_MeetRival_Ch2
-02:71d8 Music_MeetRival_branch_b1d8
-02:721d Music_MeetRival_branch_b21d
+02:71d8 Music_MeetRival_Ch2.mainloop
+02:721d Music_MeetRival_Ch2_AlternateStart
 02:7233 Music_MeetRival_Ch3
-02:724b Music_MeetRival_branch_b24b
-02:72b5 Music_MeetRival_branch_b2b5
+02:724b Music_MeetRival_Ch3.mainloop
+02:72b5 Music_MeetRival_Ch3_AlternateStart
 02:72c8 SFX_Pokedex_Rating_1_Ch5
 02:72e1 SFX_Pokedex_Rating_1_Ch6
 02:72f7 SFX_Pokedex_Rating_1_Ch7
@@ -2471,74 +2476,76 @@
 02:7381 SFX_Get_Key_Item_1_Ch6
 02:739d SFX_Get_Key_Item_1_Ch7
 02:73a7 Music_SSAnne_Ch1
-02:73b2 Music_SSAnne_branch_b3b2
+02:73b2 Music_SSAnne_Ch1.mainloop
 02:7419 Music_SSAnne_Ch2
-02:741e Music_SSAnne_branch_b41e
+02:741e Music_SSAnne_Ch2.mainloop
 02:74cb Music_SSAnne_Ch3
+02:74cb Music_SSAnne_Ch3.mainloop
 02:7504 Music_Cities2_Ch1
-02:751a Music_Cities2_branch_b51a
+02:751a Music_Cities2_Ch1.mainloop
 02:7569 Music_Cities2_Ch2
-02:758b Music_Cities2_branch_b58b
+02:758b Music_Cities2_Ch2.mainloop
 02:7640 Music_Cities2_Ch3
-02:764c Music_Cities2_branch_b64c
+02:764c Music_Cities2_Ch3.mainloop
 02:76c7 Music_Celadon_Ch1
-02:76d4 Music_Celadon_branch_b6d4
+02:76d4 Music_Celadon_Ch1.mainloop
 02:773a Music_Celadon_Ch2
-02:774a Music_Celadon_branch_b74a
+02:774a Music_Celadon_Ch2.mainloop
 02:77b5 Music_Celadon_Ch3
-02:77c1 Music_Celadon_branch_b7c1
+02:77c1 Music_Celadon_Ch3.mainloop
 02:786d Music_Cinnabar_Ch1
-02:7878 Music_Cinnabar_branch_b878
+02:7878 Music_Cinnabar_Ch1.mainloop
 02:78d4 Music_Cinnabar_Ch2
-02:78d9 Music_Cinnabar_branch_b8d9
+02:78d9 Music_Cinnabar_Ch2.mainloop
 02:793d Music_Cinnabar_Ch3
-02:793f Music_Cinnabar_branch_b93f
+02:793f Music_Cinnabar_Ch3.mainloop
 02:79eb Music_Vermilion_Ch1
-02:79f6 Music_Vermilion_branch_b9f6
+02:79f6 Music_Vermilion_Ch1.mainloop
 02:7a61 Music_Vermilion_Ch2
-02:7a66 Music_Vermilion_branch_ba66
+02:7a66 Music_Vermilion_Ch2.mainloop
 02:7aa6 Music_Vermilion_Ch3
-02:7aa8 Music_Vermilion_branch_baa8
+02:7aa8 Music_Vermilion_Ch3.mainloop
 02:7b0d Music_Vermilion_Ch4
-02:7b0e Music_Vermilion_branch_bb0e
-02:7b3f Music_Vermilion_branch_bb3f
+02:7b0e Music_Vermilion_Ch4.loop1
+02:7b0e Music_Vermilion_Ch4.mainloop
+02:7b3f Music_Vermilion_Ch4.sub1
 02:7b58 Music_Lavender_Ch1
-02:7b6b Music_Lavender_branch_bb6b
+02:7b6b Music_Lavender_Ch1.mainloop
 02:7b9e Music_Lavender_Ch2
-02:7ba5 Music_Lavender_branch_bba5
+02:7ba5 Music_Lavender_Ch2.mainloop
 02:7bae Music_Lavender_Ch3
-02:7bb9 Music_Lavender_branch_bbb9
+02:7bb9 Music_Lavender_Ch3.mainloop
 02:7c21 Music_Lavender_Ch4
-02:7c26 Music_Lavender_branch_bc26
+02:7c26 Music_Lavender_Ch4.mainloop
 02:7c2e Music_SafariZone_Ch1
-02:7c4f Music_SafariZone_branch_bc4f
-02:7c5f Music_SafariZone_branch_bc5f
+02:7c4f Music_SafariZone_Ch1.mainloop
+02:7c5f Music_SafariZone_Ch1.sub1
 02:7c6a Music_SafariZone_Ch2
-02:7c79 Music_SafariZone_branch_bc79
-02:7c89 Music_SafariZone_branch_bc89
+02:7c79 Music_SafariZone_Ch2.mainloop
+02:7c89 Music_SafariZone_Ch2.sub1
 02:7c94 Music_SafariZone_Ch3
-02:7c97 Music_SafariZone_branch_bc97
-02:7ca5 Music_SafariZone_branch_bca5
+02:7c97 Music_SafariZone_Ch3.mainloop
+02:7ca5 Music_SafariZone_Ch3.sub1
 02:7cbb Music_Gym_Ch1
-02:7cd8 Music_Gym_branch_bcd8
+02:7cd8 Music_Gym_Ch1.mainloop
 02:7d6b Music_Gym_Ch2
-02:7d82 Music_Gym_branch_bd82
+02:7d82 Music_Gym_Ch2.mainloop
 02:7dfa Music_Gym_Ch3
-02:7e02 Music_Gym_branch_be02
-02:7e3b Music_Gym_branch_be3b
-02:7e44 Music_Gym_branch_be44
-02:7e4d Music_Gym_branch_be4d
+02:7e02 Music_Gym_Ch3.mainloop
+02:7e3b Music_Gym_Ch3.sub1
+02:7e44 Music_Gym_Ch3.sub2
+02:7e4d Music_Gym_Ch3.sub3
 02:7e56 Music_Pokecenter_Ch1
-02:7e61 Music_Pokecenter_branch_be61
+02:7e61 Music_Pokecenter_Ch1.mainloop
 02:7ef9 Music_Pokecenter_Ch2
-02:7efc Music_Pokecenter_branch_befc
-02:7f4e Music_Pokecenter_branch_bf4e
-02:7f60 Music_Pokecenter_branch_bf60
+02:7efc Music_Pokecenter_Ch2.mainloop
+02:7f4e Music_Pokecenter_Ch2.sub1
+02:7f60 Music_Pokecenter_Ch2.sub2
 02:7f70 Music_Pokecenter_Ch3
-02:7f72 Music_Pokecenter_branch_bf72
-02:7fd9 Music_Pokecenter_branch_bfd9
-02:7fe2 Music_Pokecenter_branch_bfe2
-02:7feb Music_Pokecenter_branch_bfeb
+02:7f72 Music_Pokecenter_Ch3.mainloop
+02:7fd9 Music_Pokecenter_Ch3.sub1
+02:7fe2 Music_Pokecenter_Ch3.sub2
+02:7feb Music_Pokecenter_Ch3.sub3
 03:4000 _Joypad
 03:4034 DiscardButtonPresses
 03:403c TrySoftReset
@@ -5187,9 +5194,9 @@
 08:45fe SFX_Battle_25_Ch8
 08:460e SFX_Battle_26_Ch8
 08:4624 SFX_Battle_27_Ch5
-08:462a SFX_Battle_27_branch_2062a
+08:462a SFX_Battle_27_Ch5.loop1
 08:4637 SFX_Battle_27_Ch6
-08:463d SFX_Battle_27_branch_2063d
+08:463d SFX_Battle_27_Ch6.loop1
 08:464a SFX_Battle_27_Ch8
 08:4655 SFX_Battle_28_Ch5
 08:4664 SFX_Battle_28_Ch6
@@ -5228,7 +5235,7 @@
 08:48e0 SFX_Battle_35_Ch5
 08:48f0 SFX_Battle_35_Ch6
 08:4902 SFX_Battle_36_Ch5
-08:4930 SFX_Battle_36_branch_20930
+08:4930 SFX_Battle_36_Ch5.loop1
 08:4941 SFX_Battle_36_Ch6
 08:4980 SFX_Battle_36_Ch8
 08:498b SFX_UnusedCry_2_Ch5
@@ -5584,34 +5591,34 @@
 08:6347 SFX_UnusedFanfare_Ch6
 08:6359 SFX_UnusedFanfare_Ch7
 08:6370 Music_GymLeaderBattle_Ch1
-08:63b0 Music_GymLeaderBattle_branch_223b0
+08:63b0 Music_GymLeaderBattle_Ch1.mainloop
 08:65a1 Music_GymLeaderBattle_Ch2
-08:65e0 Music_GymLeaderBattle_branch_225e0
+08:65e0 Music_GymLeaderBattle_Ch2.mainloop
 08:66ef Music_GymLeaderBattle_Ch3
-08:67b1 Music_GymLeaderBattle_branch_227b1
+08:67b1 Music_GymLeaderBattle_Ch3.mainloop
 08:6919 Music_TrainerBattle_Ch1
-08:6962 Music_TrainerBattle_branch_22962
+08:6962 Music_TrainerBattle_Ch1.mainloop
 08:6bae Music_TrainerBattle_Ch2
-08:6bfc Music_TrainerBattle_branch_22bfc
+08:6bfc Music_TrainerBattle_Ch2.mainloop
 08:6d10 Music_TrainerBattle_Ch3
-08:6d9c Music_TrainerBattle_branch_22d9c
+08:6d9c Music_TrainerBattle_Ch3.mainloop
 08:7099 Music_WildBattle_Ch1
-08:70e0 Music_WildBattle_branch_230e0
+08:70e0 Music_WildBattle_Ch1.mainloop
 08:71d8 Music_WildBattle_Ch2
-08:7225 Music_WildBattle_branch_23225
+08:7225 Music_WildBattle_Ch2.mainloop
 08:7290 Music_WildBattle_Ch3
-08:72b5 Music_WildBattle_branch_232b5
-08:72d8 Music_WildBattle_branch_232d8
+08:72b5 Music_WildBattle_Ch3.introloop
+08:72d8 Music_WildBattle_Ch3.mainloop
 08:73a6 Music_FinalBattle_Ch1
-08:7429 Music_FinalBattle_branch_23429
+08:7429 Music_FinalBattle_Ch1.mainloop
 08:756a Music_FinalBattle_Ch2
-08:75e6 Music_FinalBattle_branch_235e6
-08:7704 Music_FinalBattle_branch_23704
-08:7710 Music_FinalBattle_branch_23710
+08:75e6 Music_FinalBattle_Ch2.mainloop
+08:7704 Music_FinalBattle_Ch2.sub1
+08:7710 Music_FinalBattle_Ch2.sub2
 08:771c Music_FinalBattle_Ch3
-08:777d Music_FinalBattle_branch_2377d
-08:795b Music_FinalBattle_branch_2395b
-08:796c Music_FinalBattle_branch_2396c
+08:777d Music_FinalBattle_Ch3.mainloop
+08:795b Music_FinalBattle_Ch3.sub1
+08:796c Music_FinalBattle_Ch3.sub2
 08:797d SFX_Level_Up_Ch5
 08:7998 SFX_Level_Up_Ch6
 08:79b0 SFX_Level_Up_Ch7
@@ -5622,23 +5629,23 @@
 08:7a2e SFX_Caught_Mon_Ch6
 08:7a44 SFX_Caught_Mon_Ch7
 08:7a53 Music_DefeatedTrainer_Ch1
-08:7a76 Music_DefeatedTrainer_branch_23a76
+08:7a76 Music_DefeatedTrainer_Ch1.mainloop
 08:7ac1 Music_DefeatedTrainer_Ch2
-08:7ad2 Music_DefeatedTrainer_branch_23ad2
+08:7ad2 Music_DefeatedTrainer_Ch2.mainloop
 08:7b15 Music_DefeatedTrainer_Ch3
-08:7b24 Music_DefeatedTrainer_branch_23b24
+08:7b24 Music_DefeatedTrainer_Ch3.mainloop
 08:7b74 Music_DefeatedWildMon_Ch1
-08:7b8b Music_DefeatedWildMon_branch_23b8b
+08:7b8b Music_DefeatedWildMon_Ch1.mainloop
 08:7bc1 Music_DefeatedWildMon_Ch2
-08:7bce Music_DefeatedWildMon_branch_23bce
+08:7bce Music_DefeatedWildMon_Ch2.mainloop
 08:7c0e Music_DefeatedWildMon_Ch3
-08:7c21 Music_DefeatedWildMon_branch_23c21
+08:7c21 Music_DefeatedWildMon_Ch3.mainloop
 08:7cad Music_DefeatedGymLeader_Ch1
-08:7ccc Music_DefeatedGymLeader_branch_23ccc
+08:7ccc Music_DefeatedGymLeader_Ch1.mainloop
 08:7d6d Music_DefeatedGymLeader_Ch2
-08:7d84 Music_DefeatedGymLeader_branch_23d84
+08:7d84 Music_DefeatedGymLeader_Ch2.mainloop
 08:7e52 Music_DefeatedGymLeader_Ch3
-08:7e65 Music_DefeatedGymLeader_branch_23e65
+08:7e65 Music_DefeatedGymLeader_Ch3.mainloop
 09:4000 RhydonPicFront
 09:4202 RhydonPicBack
 09:429a KangaskhanPicFront
@@ -14726,130 +14733,138 @@
 1f:5ba3 Audio3_Pitches
 1f:5ba3 Audio3_Pitches._table_width_u7986
 1f:5bbb Music_BikeRiding_Ch1
-1f:5bc9 Music_BikeRiding_branch_7dbc9
+1f:5bc9 Music_BikeRiding_Ch1.mainloop
 1f:5c6c Music_BikeRiding_Ch2
-1f:5c75 Music_BikeRiding_branch_7dc75
+1f:5c75 Music_BikeRiding_Ch2.mainloop
 1f:5d14 Music_BikeRiding_Ch3
-1f:5d17 Music_BikeRiding_branch_7dd17
+1f:5d17 Music_BikeRiding_Ch3.mainloop
 1f:5e68 Music_BikeRiding_Ch4
-1f:5e6a Music_BikeRiding_branch_7de6a
-1f:5ea7 Music_BikeRiding_branch_7dea7
-1f:5eb4 Music_BikeRiding_branch_7deb4
-1f:5ec2 Music_BikeRiding_branch_7dec2
+1f:5e6a Music_BikeRiding_Ch4.mainloop
+1f:5ea7 Music_BikeRiding_Ch4.sub1
+1f:5eb4 Music_BikeRiding_Ch4.sub2
+1f:5ec2 Music_BikeRiding_Ch4.sub3
 1f:5ed1 Music_Dungeon1_Ch1
-1f:5ee5 Music_Dungeon1_branch_7dee5
-1f:5ee8 Music_Dungeon1_branch_7dee8
-1f:5eff Music_Dungeon1_branch_7deff
-1f:5f6e Music_Dungeon1_branch_7df6e
-1f:5faa Music_Dungeon1_branch_7dfaa
-1f:5fbb Music_Dungeon1_branch_7dfbb
-1f:5fc5 Music_Dungeon1_branch_7dfc5
-1f:5fd5 Music_Dungeon1_branch_7dfd5
+1f:5ee5 Music_Dungeon1_Ch1.mainloop
+1f:5ee8 Music_Dungeon1_Ch1.loop1
+1f:5eff Music_Dungeon1_Ch1.loop2
+1f:5f6e Music_Dungeon1_Ch1.loop3
+1f:5faa Music_Dungeon1_Ch1.sub1
+1f:5fbb Music_Dungeon1_Ch1.sub2
+1f:5fc5 Music_Dungeon1_Ch1.sub3
+1f:5fd5 Music_Dungeon1_Ch1.sub4
 1f:5fde Music_Dungeon1_Ch2
-1f:5feb Music_Dungeon1_branch_7dfeb
-1f:5fed Music_Dungeon1_branch_7dfed
-1f:6006 Music_Dungeon1_branch_7e006
-1f:6097 Music_Dungeon1_branch_7e097
-1f:60ab Music_Dungeon1_branch_7e0ab
-1f:60b5 Music_Dungeon1_branch_7e0b5
-1f:60ba Music_Dungeon1_branch_7e0ba
-1f:60c0 Music_Dungeon1_branch_7e0c0
-1f:60cd Music_Dungeon1_branch_7e0cd
+1f:5feb Music_Dungeon1_Ch2.mainloop
+1f:5fed Music_Dungeon1_Ch2.loop1
+1f:6006 Music_Dungeon1_Ch2.loop2
+1f:6097 Music_Dungeon1_Ch2.sub1
+1f:60ab Music_Dungeon1_Ch2.sub2
+1f:60b5 Music_Dungeon1_Ch2.sub3
+1f:60ba Music_Dungeon1_Ch2.sub4
+1f:60c0 Music_Dungeon1_Ch2.sub5
+1f:60cd Music_Dungeon1_Ch2.sub6
 1f:60dc Music_Dungeon1_Ch3
-1f:60e5 Music_Dungeon1_branch_7e0e5
-1f:6140 Music_Dungeon1_branch_7e140
-1f:6154 Music_Dungeon1_branch_7e154
-1f:615e Music_Dungeon1_branch_7e15e
-1f:6164 Music_Dungeon1_branch_7e164
-1f:6177 Music_Dungeon1_branch_7e177
+1f:60e5 Music_Dungeon1_Ch3.mainloop
+1f:6140 Music_Dungeon1_Ch3.sub1
+1f:6154 Music_Dungeon1_Ch3.sub2
+1f:615e Music_Dungeon1_Ch3.sub3
+1f:6164 Music_Dungeon1_Ch3.sub4
+1f:6177 Music_Dungeon1_Ch3.sub5
 1f:618a Music_Dungeon1_Ch4
-1f:6190 Music_Dungeon1_branch_7e190
-1f:61a1 Music_Dungeon1_branch_7e1a1
-1f:61b0 Music_Dungeon1_branch_7e1b0
-1f:61ba Music_Dungeon1_branch_7e1ba
-1f:61cf Music_Dungeon1_branch_7e1cf
-1f:61d5 Music_Dungeon1_branch_7e1d5
-1f:61f1 Music_Dungeon1_branch_7e1f1
-1f:61fa Music_Dungeon1_branch_7e1fa
-1f:6202 Music_Dungeon1_branch_7e202
+1f:6190 Music_Dungeon1_Ch4.loop1
+1f:6190 Music_Dungeon1_Ch4.mainloop
+1f:61a1 Music_Dungeon1_Ch4.loop2
+1f:61b0 Music_Dungeon1_Ch4.loop3
+1f:61ba Music_Dungeon1_Ch4.loop4
+1f:61cf Music_Dungeon1_Ch4.loop5
+1f:61d5 Music_Dungeon1_Ch4.loop6
+1f:61f1 Music_Dungeon1_Ch4.sub1
+1f:61fa Music_Dungeon1_Ch4.sub2
+1f:6202 Music_Dungeon1_Ch4.sub3
 1f:620b Music_GameCorner_Ch1
-1f:6222 Music_GameCorner_branch_7e222
+1f:6222 Music_GameCorner_Ch1.mainloop
 1f:62df Music_GameCorner_Ch2
-1f:62fa Music_GameCorner_branch_7e2fa
+1f:62fa Music_GameCorner_Ch2.mainloop
 1f:638b Music_GameCorner_Ch3
-1f:63a5 Music_GameCorner_branch_7e3a5
-1f:6418 Music_GameCorner_branch_7e418
-1f:642d Music_GameCorner_branch_7e42d
-1f:6442 Music_GameCorner_branch_7e442
-1f:6457 Music_GameCorner_branch_7e457
-1f:646c Music_GameCorner_branch_7e46c
-1f:6481 Music_GameCorner_branch_7e481
-1f:6496 Music_GameCorner_branch_7e496
-1f:64ab Music_GameCorner_branch_7e4ab
+1f:63a5 Music_GameCorner_Ch3.mainloop
+1f:6418 Music_GameCorner_Ch3.sub1
+1f:642d Music_GameCorner_Ch3.sub2
+1f:6442 Music_GameCorner_Ch3.sub3
+1f:6457 Music_GameCorner_Ch3.sub4
+1f:646c Music_GameCorner_Ch3.sub5
+1f:6481 Music_GameCorner_Ch3.sub6
+1f:6496 Music_GameCorner_Ch3.sub7
+1f:64ab Music_GameCorner_Ch3.sub8
 1f:64c0 Music_TitleScreen_Ch1
-1f:64e2 Music_TitleScreen_branch_7e4e2
-1f:6541 Music_TitleScreen_branch_7e541
-1f:654a Music_TitleScreen_branch_7e54a
-1f:655c Music_TitleScreen_branch_7e55c
+1f:64e2 Music_TitleScreen_Ch1.mainloop
+1f:6541 Music_TitleScreen_Ch1.sub1
+1f:654a Music_TitleScreen_Ch1.sub2
+1f:655c Music_TitleScreen_Ch1.sub3
 1f:6578 Music_TitleScreen_Ch2
-1f:6594 Music_TitleScreen_branch_7e594
-1f:6622 Music_TitleScreen_branch_7e622
-1f:662c Music_TitleScreen_branch_7e62c
-1f:6636 Music_TitleScreen_branch_7e636
+1f:6594 Music_TitleScreen_Ch2.mainloop
+1f:6622 Music_TitleScreen_Ch2.sub1
+1f:662c Music_TitleScreen_Ch2.sub2
+1f:6636 Music_TitleScreen_Ch2.sub3
 1f:6643 Music_TitleScreen_Ch3
-1f:665e Music_TitleScreen_branch_7e65e
-1f:6664 Music_TitleScreen_branch_7e664
-1f:66c9 Music_TitleScreen_branch_7e6c9
-1f:66d0 Music_TitleScreen_branch_7e6d0
-1f:66d7 Music_TitleScreen_branch_7e6d7
-1f:66dc Music_TitleScreen_branch_7e6dc
-1f:66e5 Music_TitleScreen_branch_7e6e5
+1f:665e Music_TitleScreen_Ch3.mainloop
+1f:6664 Music_TitleScreen_Ch3.loop1
+1f:66c9 Music_TitleScreen_Ch3.sub1
+1f:66d0 Music_TitleScreen_Ch3.sub2
+1f:66d7 Music_TitleScreen_Ch3.sub3
+1f:66dc Music_TitleScreen_Ch3.sub4
+1f:66e5 Music_TitleScreen_Ch3.sub5
 1f:66eb Music_TitleScreen_Ch4
-1f:6716 Music_TitleScreen_branch_7e716
-1f:6834 Music_TitleScreen_branch_7e834
-1f:6842 Music_TitleScreen_branch_7e842
+1f:6716 Music_TitleScreen_Ch4.mainloop
+1f:6834 Music_TitleScreen_Ch4.sub1
+1f:6842 Music_TitleScreen_Ch4.sub2
 1f:6850 SFX_Get_Item1_3_Ch5
 1f:6867 SFX_Get_Item1_3_Ch6
 1f:6877 SFX_Get_Item1_3_Ch7
 1f:6887 Music_Dungeon2_Ch1
-1f:6892 Music_Dungeon2_branch_7e892
+1f:6892 Music_Dungeon2_Ch1.loop1
+1f:6892 Music_Dungeon2_Ch1.mainloop
 1f:68d8 Music_Dungeon2_Ch2
-1f:68db Music_Dungeon2_branch_7e8db
+1f:68db Music_Dungeon2_Ch2.loop1
+1f:68db Music_Dungeon2_Ch2.mainloop
 1f:693b Music_Dungeon2_Ch3
-1f:6940 Music_Dungeon2_branch_7e940
-1f:6958 Music_Dungeon2_branch_7e958
-1f:69d1 Music_Dungeon2_branch_7e9d1
+1f:6940 Music_Dungeon2_Ch3.loop1
+1f:6940 Music_Dungeon2_Ch3.mainloop
+1f:6958 Music_Dungeon2_Ch3.loop2
+1f:69be Music_Dungeon2_Ch3.sub1
+1f:69d1 Music_Dungeon2_Ch3.sub2
 1f:69dc Music_Dungeon2_Ch4
-1f:69dd Music_Dungeon2_branch_7e9dd
+1f:69dd Music_Dungeon2_Ch4.mainloop
 1f:69f1 Music_Dungeon3_Ch1
-1f:69fc Music_Dungeon3_branch_7e9fc
-1f:69fe Music_Dungeon3_branch_7e9fe
-1f:6a11 Music_Dungeon3_branch_7ea11
-1f:6a18 Music_Dungeon3_branch_7ea18
-1f:6a3c Music_Dungeon3_branch_7ea3c
-1f:6a43 Music_Dungeon3_branch_7ea43
-1f:6ab2 Music_Dungeon3_branch_7eab2
-1f:6ac1 Music_Dungeon3_branch_7eac1
-1f:6ace Music_Dungeon3_branch_7eace
-1f:6add Music_Dungeon3_branch_7eadd
-1f:6aea Music_Dungeon3_branch_7eaea
-1f:6af7 Music_Dungeon3_branch_7eaf7
-1f:6afc Music_Dungeon3_branch_7eafc
+1f:69fc Music_Dungeon3_Ch1.mainloop
+1f:69fe Music_Dungeon3_Ch1.loop1
+1f:6a11 Music_Dungeon3_Ch1.loop2
+1f:6a18 Music_Dungeon3_Ch1.loop3
+1f:6a3c Music_Dungeon3_Ch1.loop4
+1f:6a43 Music_Dungeon3_Ch1.loop5
+1f:6ab2 Music_Dungeon3_Ch1.sub1
+1f:6ac1 Music_Dungeon3_Ch1.sub2
+1f:6ace Music_Dungeon3_Ch1.sub3
+1f:6add Music_Dungeon3_Ch1.sub4
+1f:6aea Music_Dungeon3_Ch1.sub5
+1f:6af7 Music_Dungeon3_Ch1.sub6
+1f:6afc Music_Dungeon3_Ch1.sub7
 1f:6b68 Music_Dungeon3_Ch2
-1f:6b6d Music_Dungeon3_branch_7eb6d
+1f:6b6d Music_Dungeon3_Ch2.mainloop
 1f:6c7a Music_Dungeon3_Ch3
+1f:6c7a Music_Dungeon3_Ch3.mainloop
 1f:6ce4 Music_Dungeon3_Ch4
 1f:6d0f Music_CinnabarMansion_Ch1
-1f:6d19 Music_CinnabarMansion_branch_7ed19
+1f:6d19 Music_CinnabarMansion_Ch1.loop1
+1f:6d19 Music_CinnabarMansion_Ch1.mainloop
 1f:6d40 Music_CinnabarMansion_Ch2
-1f:6d48 Music_CinnabarMansion_branch_7ed48
-1f:6d4e Music_CinnabarMansion_branch_7ed4e
-1f:6d50 Music_CinnabarMansion_branch_7ed50
-1f:6d6c Music_CinnabarMansion_branch_7ed6c
+1f:6d48 Music_CinnabarMansion_Ch2.introloop
+1f:6d4e Music_CinnabarMansion_Ch2.mainloop
+1f:6d50 Music_CinnabarMansion_Ch2.loop1
+1f:6d6c Music_CinnabarMansion_Ch2.sub1
 1f:6d7e Music_CinnabarMansion_Ch3
-1f:6d80 Music_CinnabarMansion_branch_7ed80
+1f:6d80 Music_CinnabarMansion_Ch3.loop1
+1f:6d80 Music_CinnabarMansion_Ch3.mainloop
 1f:6db0 Music_CinnabarMansion_Ch4
-1f:6db5 Music_CinnabarMansion_branch_7edb5
+1f:6db5 Music_CinnabarMansion_Ch4.mainloop
 1f:6dda SFX_Pokedex_Rating_3_Ch5
 1f:6df3 SFX_Pokedex_Rating_3_Ch6
 1f:6e09 SFX_Pokedex_Rating_3_Ch7
@@ -14860,72 +14875,75 @@
 1f:6e93 SFX_Get_Key_Item_3_Ch6
 1f:6eaf SFX_Get_Key_Item_3_Ch7
 1f:6eb9 Music_OaksLab_Ch1
-1f:6ed0 Music_OaksLab_branch_7eed0
+1f:6ed0 Music_OaksLab_Ch1.mainloop
 1f:6f05 Music_OaksLab_Ch2
-1f:6f16 Music_OaksLab_branch_7ef16
+1f:6f16 Music_OaksLab_Ch2.mainloop
 1f:6f52 Music_OaksLab_Ch3
-1f:6f5c Music_OaksLab_branch_7ef5c
+1f:6f5c Music_OaksLab_Ch3.mainloop
 1f:704a Music_PokemonTower_Ch1
-1f:705a Music_PokemonTower_branch_7f05a
+1f:705a Music_PokemonTower_Ch1.mainloop
 1f:70e3 Music_PokemonTower_Ch2
-1f:70ee Music_PokemonTower_branch_7f0ee
+1f:70ee Music_PokemonTower_Ch2.mainloop
 1f:719a Music_PokemonTower_Ch3
-1f:71a2 Music_PokemonTower_branch_7f1a2
+1f:71a2 Music_PokemonTower_Ch3.mainloop
 1f:7243 Music_SilphCo_Ch1
-1f:726d Music_SilphCo_branch_7f26d
-1f:73f0 Music_SilphCo_branch_7f3f0
+1f:726d Music_SilphCo_Ch1.mainloop
+1f:73f0 Music_SilphCo_Ch1.sub1
 1f:7409 Music_SilphCo_Ch2
-1f:742e Music_SilphCo_branch_7f42e
+1f:742e Music_SilphCo_Ch2.mainloop
 1f:75be Music_SilphCo_Ch3
-1f:75c9 Music_SilphCo_branch_7f5c9
+1f:75c9 Music_SilphCo_Ch3.mainloop
 1f:769d Music_MeetEvilTrainer_Ch1
-1f:76ae Music_MeetEvilTrainer_branch_7f6ae
+1f:76ae Music_MeetEvilTrainer_Ch1.mainloop
 1f:76ba Music_MeetEvilTrainer_Ch2
-1f:76c2 Music_MeetEvilTrainer_branch_7f6c2
+1f:76c2 Music_MeetEvilTrainer_Ch2.mainloop
 1f:76e6 Music_MeetEvilTrainer_Ch3
-1f:76ee Music_MeetEvilTrainer_branch_7f6ee
+1f:76ee Music_MeetEvilTrainer_Ch3.mainloop
 1f:76f9 Music_MeetFemaleTrainer_Ch1
-1f:770c Music_MeetFemaleTrainer_branch_7f70c
+1f:770c Music_MeetFemaleTrainer_Ch1.loop1
+1f:770c Music_MeetFemaleTrainer_Ch1.mainloop
 1f:771c Music_MeetFemaleTrainer_Ch2
-1f:7726 Music_MeetFemaleTrainer_branch_7f726
+1f:7726 Music_MeetFemaleTrainer_Ch2.mainloop
 1f:774b Music_MeetFemaleTrainer_Ch3
-1f:7756 Music_MeetFemaleTrainer_branch_7f756
-1f:7770 Music_MeetFemaleTrainer_branch_7f770
+1f:7756 Music_MeetFemaleTrainer_Ch3.mainloop
+1f:7770 Music_MeetFemaleTrainer_Ch3.sub1
 1f:777b Music_MeetMaleTrainer_Ch1
-1f:778f Music_MeetMaleTrainer_branch_7f78f
+1f:778f Music_MeetMaleTrainer_Ch1.mainloop
 1f:77a2 Music_MeetMaleTrainer_Ch2
-1f:77b5 Music_MeetMaleTrainer_branch_7f7b5
+1f:77b5 Music_MeetMaleTrainer_Ch2.mainloop
 1f:77d2 Music_MeetMaleTrainer_Ch3
-1f:77ea Music_MeetMaleTrainer_branch_7f7ea
+1f:77ea Music_MeetMaleTrainer_Ch3.mainloop
 1f:7844 Music_IntroBattle_Ch1
 1f:78bc Music_IntroBattle_Ch2
 1f:791d Music_IntroBattle_Ch3
 1f:795b Music_IntroBattle_Ch4
 1f:7a19 Music_Surfing_Ch1
-1f:7a30 Music_Surfing_branch_7fa30
+1f:7a30 Music_Surfing_Ch1.mainloop
 1f:7a9c Music_Surfing_Ch2
-1f:7aae Music_Surfing_branch_7faae
+1f:7aae Music_Surfing_Ch2.mainloop
 1f:7afa Music_Surfing_Ch3
-1f:7b03 Music_Surfing_branch_7fb03
+1f:7b03 Music_Surfing_Ch3.mainloop
 1f:7b7d Music_JigglypuffSong_Ch1
 1f:7b9a Music_JigglypuffSong_Ch2
 1f:7baf Music_HallOfFame_Ch1
-1f:7bc5 Music_HallOfFame_branch_7fbc5
+1f:7bc5 Music_HallOfFame_Ch1.loop1
+1f:7bc5 Music_HallOfFame_Ch1.mainloop
 1f:7bda Music_HallOfFame_Ch2
-1f:7bdf Music_HallOfFame_branch_7fbdf
+1f:7bdf Music_HallOfFame_Ch2.mainloop
 1f:7bfc Music_HallOfFame_Ch3
-1f:7bfe Music_HallOfFame_branch_7fbfe
+1f:7bfc Music_HallOfFame_Ch3.mainloop
+1f:7bfe Music_HallOfFame_Ch3.loop1
 1f:7c1f Music_Credits_Ch1
 1f:7d5f Music_Credits_Ch2
 1f:7ec2 Music_Credits_Ch3
-1f:7fa4 Music_Credits_branch_7ffa4
-1f:7fae Music_Credits_branch_7ffae
-1f:7fb8 Music_Credits_branch_7ffb8
-1f:7fc1 Music_Credits_branch_7ffc1
-1f:7fd2 Music_Credits_branch_7ffd2
-1f:7fdb Music_Credits_branch_7ffdb
-1f:7fe4 Music_Credits_branch_7ffe4
-1f:7fed Music_Credits_branch_7ffed
+1f:7fa4 Music_Credits_Ch3.sub1
+1f:7fae Music_Credits_Ch3.sub2
+1f:7fb8 Music_Credits_Ch3.sub3
+1f:7fc1 Music_Credits_Ch3.sub4
+1f:7fd2 Music_Credits_Ch3.sub5
+1f:7fdb Music_Credits_Ch3.sub6
+1f:7fe4 Music_Credits_Ch3.sub7
+1f:7fed Music_Credits_Ch3.sub8
 20:4000 _CardKeySuccessText1
 20:4009 _CardKeySuccessText2
 20:4029 _CardKeyFailText
diff --git a/pokered.sym b/pokered.sym
index a28fe8de3..6789e3c32 100644
--- a/pokered.sym
+++ b/pokered.sym
@@ -2332,119 +2332,124 @@
 02:5bc4 Music_PkmnHealed_Ch2
 02:5bd2 Music_PkmnHealed_Ch3
 02:5bde Music_Routes1_Ch1
-02:5be9 Music_Routes1_branch_9be9
+02:5be9 Music_Routes1_Ch1.mainloop
 02:5c51 Music_Routes1_Ch2
-02:5c53 Music_Routes1_branch_9c53
-02:5c65 Music_Routes1_branch_9c65
-02:5c78 Music_Routes1_branch_9c78
-02:5c8d Music_Routes1_branch_9c8d
+02:5c53 Music_Routes1_Ch2.mainloop
+02:5c65 Music_Routes1_Ch2.sub1
+02:5c78 Music_Routes1_Ch2.sub2
+02:5c8d Music_Routes1_Ch2.sub3
 02:5cd8 Music_Routes1_Ch3
-02:5cdd Music_Routes1_branch_9cdd
+02:5cdd Music_Routes1_Ch3.mainloop
 02:5d24 Music_Routes1_Ch4
+02:5d24 Music_Routes1_Ch4.mainloop
 02:5db9 Music_Routes2_Ch1
-02:5dc3 Music_Routes2_branch_9dc3
+02:5dc3 Music_Routes2_Ch1.mainloop
 02:5e4f Music_Routes2_Ch2
-02:5e54 Music_Routes2_branch_9e54
+02:5e54 Music_Routes2_Ch2.mainloop
 02:5e9b Music_Routes2_Ch3
-02:5e9e Music_Routes2_branch_9e9e
+02:5e9e Music_Routes2_Ch3.mainloop
 02:5f08 Music_Routes2_Ch4
+02:5f08 Music_Routes2_Ch4.mainloop
 02:5fad Music_Routes3_Ch1
-02:5fc3 Music_Routes3_branch_9fc3
+02:5fc3 Music_Routes3_Ch1.mainloop
 02:6009 Music_Routes3_Ch2
-02:601a Music_Routes3_branch_a01a
+02:601a Music_Routes3_Ch2.mainloop
 02:607f Music_Routes3_Ch3
-02:60a3 Music_Routes3_branch_a0a3
+02:60a3 Music_Routes3_Ch3.mainloop
 02:6131 Music_Routes3_Ch4
-02:617a Music_Routes3_branch_a17a
+02:617a Music_Routes3_Ch4.mainloop
 02:626a Music_Routes4_Ch1
-02:628a Music_Routes4_branch_a28a
+02:628a Music_Routes4_Ch1.mainloop
 02:6304 Music_Routes4_Ch2
-02:6325 Music_Routes4_branch_a325
+02:6325 Music_Routes4_Ch2.mainloop
 02:63c4 Music_Routes4_Ch3
-02:63d7 Music_Routes4_branch_a3d7
+02:63d7 Music_Routes4_Ch3.mainloop
 02:649d Music_Routes4_Ch4
-02:64a8 Music_Routes4_branch_a4a8
+02:64a8 Music_Routes4_Ch4.mainloop
 02:65f0 Music_IndigoPlateau_Ch1
-02:6605 Music_IndigoPlateau_branch_a605
-02:6659 Music_IndigoPlateau_branch_a659
+02:6605 Music_IndigoPlateau_Ch1.mainloop
+02:6659 Music_IndigoPlateau_Ch1.sub1
 02:6664 Music_IndigoPlateau_Ch2
-02:6673 Music_IndigoPlateau_branch_a673
-02:66af Music_IndigoPlateau_branch_a6af
+02:6673 Music_IndigoPlateau_Ch2.mainloop
+02:66af Music_IndigoPlateau_Ch2.sub1
 02:66ba Music_IndigoPlateau_Ch3
-02:66c6 Music_IndigoPlateau_branch_a6c6
-02:66fe Music_IndigoPlateau_branch_a6fe
+02:66c6 Music_IndigoPlateau_Ch3.mainloop
+02:66fe Music_IndigoPlateau_Ch3.sub1
 02:670f Music_IndigoPlateau_Ch4
-02:6728 Music_IndigoPlateau_branch_a728
-02:677e Music_IndigoPlateau_branch_a77e
-02:6791 Music_IndigoPlateau_branch_a791
-02:67a8 Music_IndigoPlateau_branch_a7a8
+02:6728 Music_IndigoPlateau_Ch4.mainloop
+02:677e Music_IndigoPlateau_Ch4.sub1
+02:6791 Music_IndigoPlateau_Ch4.sub2
+02:67a8 Music_IndigoPlateau_Ch4.sub3
 02:67c5 Music_PalletTown_Ch1
-02:67ce Music_PalletTown_branch_a7ce
+02:67ce Music_PalletTown_Ch1.mainloop
 02:685f Music_PalletTown_Ch2
-02:6861 Music_PalletTown_branch_a861
+02:6861 Music_PalletTown_Ch2.mainloop
 02:68de Music_PalletTown_Ch3
-02:68e3 Music_PalletTown_branch_a8e3
+02:68e3 Music_PalletTown_Ch3.mainloop
 02:6913 Music_UnusedSong_Ch1
-02:691b Music_UnusedSong_branch_a91b
+02:691b Music_UnusedSong_Ch1.mainloop
 02:69cf Music_UnusedSong_Ch2
-02:69d8 Music_UnusedSong_branch_a9d8
-02:6a6f Music_Cities1_branch_aa6f
+02:69d8 Music_UnusedSong_Ch2.mainloop
+02:6a6f Music_Cities1_Ch1_AlternateTempo
 02:6a76 Music_Cities1_Ch1
-02:6a79 Music_Cities1_branch_aa79
-02:6a80 Music_Cities1_branch_aa80
-02:6b12 Music_Cities1_branch_ab12
-02:6b7d Music_Cities1_branch_ab7d
-02:6b8a Music_Cities1_branch_ab8a
+02:6a79 Music_Cities1_Ch1.body
+02:6a80 Music_Cities1_Ch1.mainloop
+02:6b12 Music_Cities1_Ch1.loop1
+02:6b7d Music_Cities1_Ch1.sub1
+02:6b8a Music_Cities1_Ch1.sub2
 02:6b92 Music_Cities1_Ch2
-02:6c00 Music_Cities1_branch_ac00
+02:6b92 Music_Cities1_Ch2.mainloop
+02:6c00 Music_Cities1_Ch2.sub1
 02:6c32 Music_Cities1_Ch3
-02:6c35 Music_Cities1_branch_ac35
-02:6cc5 Music_Cities1_branch_acc5
-02:6cce Music_Cities1_branch_acce
+02:6c35 Music_Cities1_Ch3.mainloop
+02:6cc5 Music_Cities1_Ch3.sub1
+02:6cce Music_Cities1_Ch3.sub2
 02:6cef Music_Cities1_Ch4
-02:6cf3 Music_Cities1_branch_acf3
-02:6d36 Music_Cities1_branch_ad36
-02:6d45 Music_Cities1_branch_ad45
-02:6d52 Music_Cities1_branch_ad52
-02:6d5f Music_Cities1_branch_ad5f
-02:6d6e Music_Cities1_branch_ad6e
+02:6cef Music_Cities1_Ch4.mainloop
+02:6cf3 Music_Cities1_Ch4.loop1
+02:6d36 Music_Cities1_Ch4.sub1
+02:6d45 Music_Cities1_Ch4.sub2
+02:6d52 Music_Cities1_Ch4.sub3
+02:6d5f Music_Cities1_Ch4.sub4
+02:6d6e Music_Cities1_Ch4.sub5
 02:6d77 SFX_Get_Item1_1_Ch5
 02:6d8e SFX_Get_Item1_1_Ch6
 02:6d9e SFX_Get_Item1_1_Ch7
 02:6dae Music_MuseumGuy_Ch1
-02:6dd6 Music_MuseumGuy_branch_add6
-02:6de7 Music_MuseumGuy_branch_ade7
-02:6dec Music_MuseumGuy_branch_adec
+02:6dd6 Music_MuseumGuy_Ch1.mainloop
+02:6de7 Music_MuseumGuy_Ch1.sub1
+02:6dec Music_MuseumGuy_Ch1.sub2
 02:6df1 Music_MuseumGuy_Ch2
-02:6e26 Music_MuseumGuy_branch_ae26
+02:6e26 Music_MuseumGuy_Ch2.mainloop
 02:6e6e Music_MuseumGuy_Ch3
-02:6e8e Music_MuseumGuy_branch_ae8e
-02:6eb8 Music_MuseumGuy_branch_aeb8
-02:6ec1 Music_MuseumGuy_branch_aec1
+02:6e8e Music_MuseumGuy_Ch3.mainloop
+02:6eb8 Music_MuseumGuy_Ch3.sub1
+02:6ec1 Music_MuseumGuy_Ch3.sub2
 02:6ed1 Music_MuseumGuy_Ch4
-02:6ee1 Music_MuseumGuy_branch_aee1
+02:6ee1 Music_MuseumGuy_Ch4.mainloop
 02:6f59 Music_MeetProfOak_Ch1
-02:6f85 Music_MeetProfOak_branch_af85
+02:6f85 Music_MeetProfOak_Ch1.mainloop
 02:6fa9 Music_MeetProfOak_Ch2
-02:7005 Music_MeetProfOak_branch_b005
+02:7005 Music_MeetProfOak_Ch2.mainloop
 02:703d Music_MeetProfOak_Ch3
-02:70bc Music_MeetProfOak_branch_b0bc
-02:70d8 Music_MeetProfOak_branch_b0d8
-02:70ed Music_MeetProfOak_branch_b0ed
-02:7101 Music_MeetProfOak_branch_b101
-02:7119 Music_MeetRival_branch_b119
+02:70bc Music_MeetProfOak_Ch3.loop1
+02:70bc Music_MeetProfOak_Ch3.mainloop
+02:70d8 Music_MeetProfOak_Ch3.loop2
+02:70ed Music_MeetProfOak_Ch3.loop3
+02:7101 Music_MeetProfOak_Ch3.loop4
+02:7119 Music_MeetRival_Ch1_AlternateTempo
 02:7120 Music_MeetRival_Ch1
-02:7123 Music_MeetRival_branch_b123
-02:7140 Music_MeetRival_branch_b140
-02:719b Music_MeetRival_branch_b19b
-02:71a2 Music_MeetRival_branch_b1a2
-02:71a5 Music_MeetRival_branch_b1a5
+02:7123 Music_MeetRival_Ch1.body
+02:7140 Music_MeetRival_Ch1.mainloop
+02:719b Music_MeetRival_Ch1_AlternateStartAndTempo
+02:71a2 Music_MeetRival_Ch1_AlternateStart
+02:71a5 Music_MeetRival_Ch1_AlternateStart.body
 02:71bb Music_MeetRival_Ch2
-02:71d8 Music_MeetRival_branch_b1d8
-02:721d Music_MeetRival_branch_b21d
+02:71d8 Music_MeetRival_Ch2.mainloop
+02:721d Music_MeetRival_Ch2_AlternateStart
 02:7233 Music_MeetRival_Ch3
-02:724b Music_MeetRival_branch_b24b
-02:72b5 Music_MeetRival_branch_b2b5
+02:724b Music_MeetRival_Ch3.mainloop
+02:72b5 Music_MeetRival_Ch3_AlternateStart
 02:72c8 SFX_Pokedex_Rating_1_Ch5
 02:72e1 SFX_Pokedex_Rating_1_Ch6
 02:72f7 SFX_Pokedex_Rating_1_Ch7
@@ -2455,74 +2460,76 @@
 02:7381 SFX_Get_Key_Item_1_Ch6
 02:739d SFX_Get_Key_Item_1_Ch7
 02:73a7 Music_SSAnne_Ch1
-02:73b2 Music_SSAnne_branch_b3b2
+02:73b2 Music_SSAnne_Ch1.mainloop
 02:7419 Music_SSAnne_Ch2
-02:741e Music_SSAnne_branch_b41e
+02:741e Music_SSAnne_Ch2.mainloop
 02:74cb Music_SSAnne_Ch3
+02:74cb Music_SSAnne_Ch3.mainloop
 02:7504 Music_Cities2_Ch1
-02:751a Music_Cities2_branch_b51a
+02:751a Music_Cities2_Ch1.mainloop
 02:7569 Music_Cities2_Ch2
-02:758b Music_Cities2_branch_b58b
+02:758b Music_Cities2_Ch2.mainloop
 02:7640 Music_Cities2_Ch3
-02:764c Music_Cities2_branch_b64c
+02:764c Music_Cities2_Ch3.mainloop
 02:76c7 Music_Celadon_Ch1
-02:76d4 Music_Celadon_branch_b6d4
+02:76d4 Music_Celadon_Ch1.mainloop
 02:773a Music_Celadon_Ch2
-02:774a Music_Celadon_branch_b74a
+02:774a Music_Celadon_Ch2.mainloop
 02:77b5 Music_Celadon_Ch3
-02:77c1 Music_Celadon_branch_b7c1
+02:77c1 Music_Celadon_Ch3.mainloop
 02:786d Music_Cinnabar_Ch1
-02:7878 Music_Cinnabar_branch_b878
+02:7878 Music_Cinnabar_Ch1.mainloop
 02:78d4 Music_Cinnabar_Ch2
-02:78d9 Music_Cinnabar_branch_b8d9
+02:78d9 Music_Cinnabar_Ch2.mainloop
 02:793d Music_Cinnabar_Ch3
-02:793f Music_Cinnabar_branch_b93f
+02:793f Music_Cinnabar_Ch3.mainloop
 02:79eb Music_Vermilion_Ch1
-02:79f6 Music_Vermilion_branch_b9f6
+02:79f6 Music_Vermilion_Ch1.mainloop
 02:7a61 Music_Vermilion_Ch2
-02:7a66 Music_Vermilion_branch_ba66
+02:7a66 Music_Vermilion_Ch2.mainloop
 02:7aa6 Music_Vermilion_Ch3
-02:7aa8 Music_Vermilion_branch_baa8
+02:7aa8 Music_Vermilion_Ch3.mainloop
 02:7b0d Music_Vermilion_Ch4
-02:7b0e Music_Vermilion_branch_bb0e
-02:7b3f Music_Vermilion_branch_bb3f
+02:7b0e Music_Vermilion_Ch4.loop1
+02:7b0e Music_Vermilion_Ch4.mainloop
+02:7b3f Music_Vermilion_Ch4.sub1
 02:7b58 Music_Lavender_Ch1
-02:7b6b Music_Lavender_branch_bb6b
+02:7b6b Music_Lavender_Ch1.mainloop
 02:7b9e Music_Lavender_Ch2
-02:7ba5 Music_Lavender_branch_bba5
+02:7ba5 Music_Lavender_Ch2.mainloop
 02:7bae Music_Lavender_Ch3
-02:7bb9 Music_Lavender_branch_bbb9
+02:7bb9 Music_Lavender_Ch3.mainloop
 02:7c21 Music_Lavender_Ch4
-02:7c26 Music_Lavender_branch_bc26
+02:7c26 Music_Lavender_Ch4.mainloop
 02:7c2e Music_SafariZone_Ch1
-02:7c4f Music_SafariZone_branch_bc4f
-02:7c5f Music_SafariZone_branch_bc5f
+02:7c4f Music_SafariZone_Ch1.mainloop
+02:7c5f Music_SafariZone_Ch1.sub1
 02:7c6a Music_SafariZone_Ch2
-02:7c79 Music_SafariZone_branch_bc79
-02:7c89 Music_SafariZone_branch_bc89
+02:7c79 Music_SafariZone_Ch2.mainloop
+02:7c89 Music_SafariZone_Ch2.sub1
 02:7c94 Music_SafariZone_Ch3
-02:7c97 Music_SafariZone_branch_bc97
-02:7ca5 Music_SafariZone_branch_bca5
+02:7c97 Music_SafariZone_Ch3.mainloop
+02:7ca5 Music_SafariZone_Ch3.sub1
 02:7cbb Music_Gym_Ch1
-02:7cd8 Music_Gym_branch_bcd8
+02:7cd8 Music_Gym_Ch1.mainloop
 02:7d6b Music_Gym_Ch2
-02:7d82 Music_Gym_branch_bd82
+02:7d82 Music_Gym_Ch2.mainloop
 02:7dfa Music_Gym_Ch3
-02:7e02 Music_Gym_branch_be02
-02:7e3b Music_Gym_branch_be3b
-02:7e44 Music_Gym_branch_be44
-02:7e4d Music_Gym_branch_be4d
+02:7e02 Music_Gym_Ch3.mainloop
+02:7e3b Music_Gym_Ch3.sub1
+02:7e44 Music_Gym_Ch3.sub2
+02:7e4d Music_Gym_Ch3.sub3
 02:7e56 Music_Pokecenter_Ch1
-02:7e61 Music_Pokecenter_branch_be61
+02:7e61 Music_Pokecenter_Ch1.mainloop
 02:7ef9 Music_Pokecenter_Ch2
-02:7efc Music_Pokecenter_branch_befc
-02:7f4e Music_Pokecenter_branch_bf4e
-02:7f60 Music_Pokecenter_branch_bf60
+02:7efc Music_Pokecenter_Ch2.mainloop
+02:7f4e Music_Pokecenter_Ch2.sub1
+02:7f60 Music_Pokecenter_Ch2.sub2
 02:7f70 Music_Pokecenter_Ch3
-02:7f72 Music_Pokecenter_branch_bf72
-02:7fd9 Music_Pokecenter_branch_bfd9
-02:7fe2 Music_Pokecenter_branch_bfe2
-02:7feb Music_Pokecenter_branch_bfeb
+02:7f72 Music_Pokecenter_Ch3.mainloop
+02:7fd9 Music_Pokecenter_Ch3.sub1
+02:7fe2 Music_Pokecenter_Ch3.sub2
+02:7feb Music_Pokecenter_Ch3.sub3
 03:4000 _Joypad
 03:4034 DiscardButtonPresses
 03:403c TrySoftReset
@@ -5171,9 +5178,9 @@
 08:45fe SFX_Battle_25_Ch8
 08:460e SFX_Battle_26_Ch8
 08:4624 SFX_Battle_27_Ch5
-08:462a SFX_Battle_27_branch_2062a
+08:462a SFX_Battle_27_Ch5.loop1
 08:4637 SFX_Battle_27_Ch6
-08:463d SFX_Battle_27_branch_2063d
+08:463d SFX_Battle_27_Ch6.loop1
 08:464a SFX_Battle_27_Ch8
 08:4655 SFX_Battle_28_Ch5
 08:4664 SFX_Battle_28_Ch6
@@ -5212,7 +5219,7 @@
 08:48e0 SFX_Battle_35_Ch5
 08:48f0 SFX_Battle_35_Ch6
 08:4902 SFX_Battle_36_Ch5
-08:4930 SFX_Battle_36_branch_20930
+08:4930 SFX_Battle_36_Ch5.loop1
 08:4941 SFX_Battle_36_Ch6
 08:4980 SFX_Battle_36_Ch8
 08:498b SFX_UnusedCry_2_Ch5
@@ -5568,34 +5575,34 @@
 08:6347 SFX_UnusedFanfare_Ch6
 08:6359 SFX_UnusedFanfare_Ch7
 08:6370 Music_GymLeaderBattle_Ch1
-08:63b0 Music_GymLeaderBattle_branch_223b0
+08:63b0 Music_GymLeaderBattle_Ch1.mainloop
 08:65a1 Music_GymLeaderBattle_Ch2
-08:65e0 Music_GymLeaderBattle_branch_225e0
+08:65e0 Music_GymLeaderBattle_Ch2.mainloop
 08:66ef Music_GymLeaderBattle_Ch3
-08:67b1 Music_GymLeaderBattle_branch_227b1
+08:67b1 Music_GymLeaderBattle_Ch3.mainloop
 08:6919 Music_TrainerBattle_Ch1
-08:6962 Music_TrainerBattle_branch_22962
+08:6962 Music_TrainerBattle_Ch1.mainloop
 08:6bae Music_TrainerBattle_Ch2
-08:6bfc Music_TrainerBattle_branch_22bfc
+08:6bfc Music_TrainerBattle_Ch2.mainloop
 08:6d10 Music_TrainerBattle_Ch3
-08:6d9c Music_TrainerBattle_branch_22d9c
+08:6d9c Music_TrainerBattle_Ch3.mainloop
 08:7099 Music_WildBattle_Ch1
-08:70e0 Music_WildBattle_branch_230e0
+08:70e0 Music_WildBattle_Ch1.mainloop
 08:71d8 Music_WildBattle_Ch2
-08:7225 Music_WildBattle_branch_23225
+08:7225 Music_WildBattle_Ch2.mainloop
 08:7290 Music_WildBattle_Ch3
-08:72b5 Music_WildBattle_branch_232b5
-08:72d8 Music_WildBattle_branch_232d8
+08:72b5 Music_WildBattle_Ch3.introloop
+08:72d8 Music_WildBattle_Ch3.mainloop
 08:73a6 Music_FinalBattle_Ch1
-08:7429 Music_FinalBattle_branch_23429
+08:7429 Music_FinalBattle_Ch1.mainloop
 08:756a Music_FinalBattle_Ch2
-08:75e6 Music_FinalBattle_branch_235e6
-08:7704 Music_FinalBattle_branch_23704
-08:7710 Music_FinalBattle_branch_23710
+08:75e6 Music_FinalBattle_Ch2.mainloop
+08:7704 Music_FinalBattle_Ch2.sub1
+08:7710 Music_FinalBattle_Ch2.sub2
 08:771c Music_FinalBattle_Ch3
-08:777d Music_FinalBattle_branch_2377d
-08:795b Music_FinalBattle_branch_2395b
-08:796c Music_FinalBattle_branch_2396c
+08:777d Music_FinalBattle_Ch3.mainloop
+08:795b Music_FinalBattle_Ch3.sub1
+08:796c Music_FinalBattle_Ch3.sub2
 08:797d SFX_Level_Up_Ch5
 08:7998 SFX_Level_Up_Ch6
 08:79b0 SFX_Level_Up_Ch7
@@ -5606,23 +5613,23 @@
 08:7a2e SFX_Caught_Mon_Ch6
 08:7a44 SFX_Caught_Mon_Ch7
 08:7a53 Music_DefeatedTrainer_Ch1
-08:7a76 Music_DefeatedTrainer_branch_23a76
+08:7a76 Music_DefeatedTrainer_Ch1.mainloop
 08:7ac1 Music_DefeatedTrainer_Ch2
-08:7ad2 Music_DefeatedTrainer_branch_23ad2
+08:7ad2 Music_DefeatedTrainer_Ch2.mainloop
 08:7b15 Music_DefeatedTrainer_Ch3
-08:7b24 Music_DefeatedTrainer_branch_23b24
+08:7b24 Music_DefeatedTrainer_Ch3.mainloop
 08:7b74 Music_DefeatedWildMon_Ch1
-08:7b8b Music_DefeatedWildMon_branch_23b8b
+08:7b8b Music_DefeatedWildMon_Ch1.mainloop
 08:7bc1 Music_DefeatedWildMon_Ch2
-08:7bce Music_DefeatedWildMon_branch_23bce
+08:7bce Music_DefeatedWildMon_Ch2.mainloop
 08:7c0e Music_DefeatedWildMon_Ch3
-08:7c21 Music_DefeatedWildMon_branch_23c21
+08:7c21 Music_DefeatedWildMon_Ch3.mainloop
 08:7cad Music_DefeatedGymLeader_Ch1
-08:7ccc Music_DefeatedGymLeader_branch_23ccc
+08:7ccc Music_DefeatedGymLeader_Ch1.mainloop
 08:7d6d Music_DefeatedGymLeader_Ch2
-08:7d84 Music_DefeatedGymLeader_branch_23d84
+08:7d84 Music_DefeatedGymLeader_Ch2.mainloop
 08:7e52 Music_DefeatedGymLeader_Ch3
-08:7e65 Music_DefeatedGymLeader_branch_23e65
+08:7e65 Music_DefeatedGymLeader_Ch3.mainloop
 09:4000 RhydonPicFront
 09:4202 RhydonPicBack
 09:429a KangaskhanPicFront
@@ -14676,130 +14683,138 @@
 1f:5ba3 Audio3_Pitches
 1f:5ba3 Audio3_Pitches._table_width_u7986
 1f:5bbb Music_BikeRiding_Ch1
-1f:5bc9 Music_BikeRiding_branch_7dbc9
+1f:5bc9 Music_BikeRiding_Ch1.mainloop
 1f:5c6c Music_BikeRiding_Ch2
-1f:5c75 Music_BikeRiding_branch_7dc75
+1f:5c75 Music_BikeRiding_Ch2.mainloop
 1f:5d14 Music_BikeRiding_Ch3
-1f:5d17 Music_BikeRiding_branch_7dd17
+1f:5d17 Music_BikeRiding_Ch3.mainloop
 1f:5e68 Music_BikeRiding_Ch4
-1f:5e6a Music_BikeRiding_branch_7de6a
-1f:5ea7 Music_BikeRiding_branch_7dea7
-1f:5eb4 Music_BikeRiding_branch_7deb4
-1f:5ec2 Music_BikeRiding_branch_7dec2
+1f:5e6a Music_BikeRiding_Ch4.mainloop
+1f:5ea7 Music_BikeRiding_Ch4.sub1
+1f:5eb4 Music_BikeRiding_Ch4.sub2
+1f:5ec2 Music_BikeRiding_Ch4.sub3
 1f:5ed1 Music_Dungeon1_Ch1
-1f:5ee5 Music_Dungeon1_branch_7dee5
-1f:5ee8 Music_Dungeon1_branch_7dee8
-1f:5eff Music_Dungeon1_branch_7deff
-1f:5f6e Music_Dungeon1_branch_7df6e
-1f:5faa Music_Dungeon1_branch_7dfaa
-1f:5fbb Music_Dungeon1_branch_7dfbb
-1f:5fc5 Music_Dungeon1_branch_7dfc5
-1f:5fd5 Music_Dungeon1_branch_7dfd5
+1f:5ee5 Music_Dungeon1_Ch1.mainloop
+1f:5ee8 Music_Dungeon1_Ch1.loop1
+1f:5eff Music_Dungeon1_Ch1.loop2
+1f:5f6e Music_Dungeon1_Ch1.loop3
+1f:5faa Music_Dungeon1_Ch1.sub1
+1f:5fbb Music_Dungeon1_Ch1.sub2
+1f:5fc5 Music_Dungeon1_Ch1.sub3
+1f:5fd5 Music_Dungeon1_Ch1.sub4
 1f:5fde Music_Dungeon1_Ch2
-1f:5feb Music_Dungeon1_branch_7dfeb
-1f:5fed Music_Dungeon1_branch_7dfed
-1f:6006 Music_Dungeon1_branch_7e006
-1f:6097 Music_Dungeon1_branch_7e097
-1f:60ab Music_Dungeon1_branch_7e0ab
-1f:60b5 Music_Dungeon1_branch_7e0b5
-1f:60ba Music_Dungeon1_branch_7e0ba
-1f:60c0 Music_Dungeon1_branch_7e0c0
-1f:60cd Music_Dungeon1_branch_7e0cd
+1f:5feb Music_Dungeon1_Ch2.mainloop
+1f:5fed Music_Dungeon1_Ch2.loop1
+1f:6006 Music_Dungeon1_Ch2.loop2
+1f:6097 Music_Dungeon1_Ch2.sub1
+1f:60ab Music_Dungeon1_Ch2.sub2
+1f:60b5 Music_Dungeon1_Ch2.sub3
+1f:60ba Music_Dungeon1_Ch2.sub4
+1f:60c0 Music_Dungeon1_Ch2.sub5
+1f:60cd Music_Dungeon1_Ch2.sub6
 1f:60dc Music_Dungeon1_Ch3
-1f:60e5 Music_Dungeon1_branch_7e0e5
-1f:6140 Music_Dungeon1_branch_7e140
-1f:6154 Music_Dungeon1_branch_7e154
-1f:615e Music_Dungeon1_branch_7e15e
-1f:6164 Music_Dungeon1_branch_7e164
-1f:6177 Music_Dungeon1_branch_7e177
+1f:60e5 Music_Dungeon1_Ch3.mainloop
+1f:6140 Music_Dungeon1_Ch3.sub1
+1f:6154 Music_Dungeon1_Ch3.sub2
+1f:615e Music_Dungeon1_Ch3.sub3
+1f:6164 Music_Dungeon1_Ch3.sub4
+1f:6177 Music_Dungeon1_Ch3.sub5
 1f:618a Music_Dungeon1_Ch4
-1f:6190 Music_Dungeon1_branch_7e190
-1f:61a1 Music_Dungeon1_branch_7e1a1
-1f:61b0 Music_Dungeon1_branch_7e1b0
-1f:61ba Music_Dungeon1_branch_7e1ba
-1f:61cf Music_Dungeon1_branch_7e1cf
-1f:61d5 Music_Dungeon1_branch_7e1d5
-1f:61f1 Music_Dungeon1_branch_7e1f1
-1f:61fa Music_Dungeon1_branch_7e1fa
-1f:6202 Music_Dungeon1_branch_7e202
+1f:6190 Music_Dungeon1_Ch4.loop1
+1f:6190 Music_Dungeon1_Ch4.mainloop
+1f:61a1 Music_Dungeon1_Ch4.loop2
+1f:61b0 Music_Dungeon1_Ch4.loop3
+1f:61ba Music_Dungeon1_Ch4.loop4
+1f:61cf Music_Dungeon1_Ch4.loop5
+1f:61d5 Music_Dungeon1_Ch4.loop6
+1f:61f1 Music_Dungeon1_Ch4.sub1
+1f:61fa Music_Dungeon1_Ch4.sub2
+1f:6202 Music_Dungeon1_Ch4.sub3
 1f:620b Music_GameCorner_Ch1
-1f:6222 Music_GameCorner_branch_7e222
+1f:6222 Music_GameCorner_Ch1.mainloop
 1f:62df Music_GameCorner_Ch2
-1f:62fa Music_GameCorner_branch_7e2fa
+1f:62fa Music_GameCorner_Ch2.mainloop
 1f:638b Music_GameCorner_Ch3
-1f:63a5 Music_GameCorner_branch_7e3a5
-1f:6418 Music_GameCorner_branch_7e418
-1f:642d Music_GameCorner_branch_7e42d
-1f:6442 Music_GameCorner_branch_7e442
-1f:6457 Music_GameCorner_branch_7e457
-1f:646c Music_GameCorner_branch_7e46c
-1f:6481 Music_GameCorner_branch_7e481
-1f:6496 Music_GameCorner_branch_7e496
-1f:64ab Music_GameCorner_branch_7e4ab
+1f:63a5 Music_GameCorner_Ch3.mainloop
+1f:6418 Music_GameCorner_Ch3.sub1
+1f:642d Music_GameCorner_Ch3.sub2
+1f:6442 Music_GameCorner_Ch3.sub3
+1f:6457 Music_GameCorner_Ch3.sub4
+1f:646c Music_GameCorner_Ch3.sub5
+1f:6481 Music_GameCorner_Ch3.sub6
+1f:6496 Music_GameCorner_Ch3.sub7
+1f:64ab Music_GameCorner_Ch3.sub8
 1f:64c0 Music_TitleScreen_Ch1
-1f:64e2 Music_TitleScreen_branch_7e4e2
-1f:6541 Music_TitleScreen_branch_7e541
-1f:654a Music_TitleScreen_branch_7e54a
-1f:655c Music_TitleScreen_branch_7e55c
+1f:64e2 Music_TitleScreen_Ch1.mainloop
+1f:6541 Music_TitleScreen_Ch1.sub1
+1f:654a Music_TitleScreen_Ch1.sub2
+1f:655c Music_TitleScreen_Ch1.sub3
 1f:6578 Music_TitleScreen_Ch2
-1f:6594 Music_TitleScreen_branch_7e594
-1f:6622 Music_TitleScreen_branch_7e622
-1f:662c Music_TitleScreen_branch_7e62c
-1f:6636 Music_TitleScreen_branch_7e636
+1f:6594 Music_TitleScreen_Ch2.mainloop
+1f:6622 Music_TitleScreen_Ch2.sub1
+1f:662c Music_TitleScreen_Ch2.sub2
+1f:6636 Music_TitleScreen_Ch2.sub3
 1f:6643 Music_TitleScreen_Ch3
-1f:665e Music_TitleScreen_branch_7e65e
-1f:6664 Music_TitleScreen_branch_7e664
-1f:66c9 Music_TitleScreen_branch_7e6c9
-1f:66d0 Music_TitleScreen_branch_7e6d0
-1f:66d7 Music_TitleScreen_branch_7e6d7
-1f:66dc Music_TitleScreen_branch_7e6dc
-1f:66e5 Music_TitleScreen_branch_7e6e5
+1f:665e Music_TitleScreen_Ch3.mainloop
+1f:6664 Music_TitleScreen_Ch3.loop1
+1f:66c9 Music_TitleScreen_Ch3.sub1
+1f:66d0 Music_TitleScreen_Ch3.sub2
+1f:66d7 Music_TitleScreen_Ch3.sub3
+1f:66dc Music_TitleScreen_Ch3.sub4
+1f:66e5 Music_TitleScreen_Ch3.sub5
 1f:66eb Music_TitleScreen_Ch4
-1f:6716 Music_TitleScreen_branch_7e716
-1f:6834 Music_TitleScreen_branch_7e834
-1f:6842 Music_TitleScreen_branch_7e842
+1f:6716 Music_TitleScreen_Ch4.mainloop
+1f:6834 Music_TitleScreen_Ch4.sub1
+1f:6842 Music_TitleScreen_Ch4.sub2
 1f:6850 SFX_Get_Item1_3_Ch5
 1f:6867 SFX_Get_Item1_3_Ch6
 1f:6877 SFX_Get_Item1_3_Ch7
 1f:6887 Music_Dungeon2_Ch1
-1f:6892 Music_Dungeon2_branch_7e892
+1f:6892 Music_Dungeon2_Ch1.loop1
+1f:6892 Music_Dungeon2_Ch1.mainloop
 1f:68d8 Music_Dungeon2_Ch2
-1f:68db Music_Dungeon2_branch_7e8db
+1f:68db Music_Dungeon2_Ch2.loop1
+1f:68db Music_Dungeon2_Ch2.mainloop
 1f:693b Music_Dungeon2_Ch3
-1f:6940 Music_Dungeon2_branch_7e940
-1f:6958 Music_Dungeon2_branch_7e958
-1f:69d1 Music_Dungeon2_branch_7e9d1
+1f:6940 Music_Dungeon2_Ch3.loop1
+1f:6940 Music_Dungeon2_Ch3.mainloop
+1f:6958 Music_Dungeon2_Ch3.loop2
+1f:69be Music_Dungeon2_Ch3.sub1
+1f:69d1 Music_Dungeon2_Ch3.sub2
 1f:69dc Music_Dungeon2_Ch4
-1f:69dd Music_Dungeon2_branch_7e9dd
+1f:69dd Music_Dungeon2_Ch4.mainloop
 1f:69f1 Music_Dungeon3_Ch1
-1f:69fc Music_Dungeon3_branch_7e9fc
-1f:69fe Music_Dungeon3_branch_7e9fe
-1f:6a11 Music_Dungeon3_branch_7ea11
-1f:6a18 Music_Dungeon3_branch_7ea18
-1f:6a3c Music_Dungeon3_branch_7ea3c
-1f:6a43 Music_Dungeon3_branch_7ea43
-1f:6ab2 Music_Dungeon3_branch_7eab2
-1f:6ac1 Music_Dungeon3_branch_7eac1
-1f:6ace Music_Dungeon3_branch_7eace
-1f:6add Music_Dungeon3_branch_7eadd
-1f:6aea Music_Dungeon3_branch_7eaea
-1f:6af7 Music_Dungeon3_branch_7eaf7
-1f:6afc Music_Dungeon3_branch_7eafc
+1f:69fc Music_Dungeon3_Ch1.mainloop
+1f:69fe Music_Dungeon3_Ch1.loop1
+1f:6a11 Music_Dungeon3_Ch1.loop2
+1f:6a18 Music_Dungeon3_Ch1.loop3
+1f:6a3c Music_Dungeon3_Ch1.loop4
+1f:6a43 Music_Dungeon3_Ch1.loop5
+1f:6ab2 Music_Dungeon3_Ch1.sub1
+1f:6ac1 Music_Dungeon3_Ch1.sub2
+1f:6ace Music_Dungeon3_Ch1.sub3
+1f:6add Music_Dungeon3_Ch1.sub4
+1f:6aea Music_Dungeon3_Ch1.sub5
+1f:6af7 Music_Dungeon3_Ch1.sub6
+1f:6afc Music_Dungeon3_Ch1.sub7
 1f:6b68 Music_Dungeon3_Ch2
-1f:6b6d Music_Dungeon3_branch_7eb6d
+1f:6b6d Music_Dungeon3_Ch2.mainloop
 1f:6c7a Music_Dungeon3_Ch3
+1f:6c7a Music_Dungeon3_Ch3.mainloop
 1f:6ce4 Music_Dungeon3_Ch4
 1f:6d0f Music_CinnabarMansion_Ch1
-1f:6d19 Music_CinnabarMansion_branch_7ed19
+1f:6d19 Music_CinnabarMansion_Ch1.loop1
+1f:6d19 Music_CinnabarMansion_Ch1.mainloop
 1f:6d40 Music_CinnabarMansion_Ch2
-1f:6d48 Music_CinnabarMansion_branch_7ed48
-1f:6d4e Music_CinnabarMansion_branch_7ed4e
-1f:6d50 Music_CinnabarMansion_branch_7ed50
-1f:6d6c Music_CinnabarMansion_branch_7ed6c
+1f:6d48 Music_CinnabarMansion_Ch2.introloop
+1f:6d4e Music_CinnabarMansion_Ch2.mainloop
+1f:6d50 Music_CinnabarMansion_Ch2.loop1
+1f:6d6c Music_CinnabarMansion_Ch2.sub1
 1f:6d7e Music_CinnabarMansion_Ch3
-1f:6d80 Music_CinnabarMansion_branch_7ed80
+1f:6d80 Music_CinnabarMansion_Ch3.loop1
+1f:6d80 Music_CinnabarMansion_Ch3.mainloop
 1f:6db0 Music_CinnabarMansion_Ch4
-1f:6db5 Music_CinnabarMansion_branch_7edb5
+1f:6db5 Music_CinnabarMansion_Ch4.mainloop
 1f:6dda SFX_Pokedex_Rating_3_Ch5
 1f:6df3 SFX_Pokedex_Rating_3_Ch6
 1f:6e09 SFX_Pokedex_Rating_3_Ch7
@@ -14810,72 +14825,75 @@
 1f:6e93 SFX_Get_Key_Item_3_Ch6
 1f:6eaf SFX_Get_Key_Item_3_Ch7
 1f:6eb9 Music_OaksLab_Ch1
-1f:6ed0 Music_OaksLab_branch_7eed0
+1f:6ed0 Music_OaksLab_Ch1.mainloop
 1f:6f05 Music_OaksLab_Ch2
-1f:6f16 Music_OaksLab_branch_7ef16
+1f:6f16 Music_OaksLab_Ch2.mainloop
 1f:6f52 Music_OaksLab_Ch3
-1f:6f5c Music_OaksLab_branch_7ef5c
+1f:6f5c Music_OaksLab_Ch3.mainloop
 1f:704a Music_PokemonTower_Ch1
-1f:705a Music_PokemonTower_branch_7f05a
+1f:705a Music_PokemonTower_Ch1.mainloop
 1f:70e3 Music_PokemonTower_Ch2
-1f:70ee Music_PokemonTower_branch_7f0ee
+1f:70ee Music_PokemonTower_Ch2.mainloop
 1f:719a Music_PokemonTower_Ch3
-1f:71a2 Music_PokemonTower_branch_7f1a2
+1f:71a2 Music_PokemonTower_Ch3.mainloop
 1f:7243 Music_SilphCo_Ch1
-1f:726d Music_SilphCo_branch_7f26d
-1f:73f0 Music_SilphCo_branch_7f3f0
+1f:726d Music_SilphCo_Ch1.mainloop
+1f:73f0 Music_SilphCo_Ch1.sub1
 1f:7409 Music_SilphCo_Ch2
-1f:742e Music_SilphCo_branch_7f42e
+1f:742e Music_SilphCo_Ch2.mainloop
 1f:75be Music_SilphCo_Ch3
-1f:75c9 Music_SilphCo_branch_7f5c9
+1f:75c9 Music_SilphCo_Ch3.mainloop
 1f:769d Music_MeetEvilTrainer_Ch1
-1f:76ae Music_MeetEvilTrainer_branch_7f6ae
+1f:76ae Music_MeetEvilTrainer_Ch1.mainloop
 1f:76ba Music_MeetEvilTrainer_Ch2
-1f:76c2 Music_MeetEvilTrainer_branch_7f6c2
+1f:76c2 Music_MeetEvilTrainer_Ch2.mainloop
 1f:76e6 Music_MeetEvilTrainer_Ch3
-1f:76ee Music_MeetEvilTrainer_branch_7f6ee
+1f:76ee Music_MeetEvilTrainer_Ch3.mainloop
 1f:76f9 Music_MeetFemaleTrainer_Ch1
-1f:770c Music_MeetFemaleTrainer_branch_7f70c
+1f:770c Music_MeetFemaleTrainer_Ch1.loop1
+1f:770c Music_MeetFemaleTrainer_Ch1.mainloop
 1f:771c Music_MeetFemaleTrainer_Ch2
-1f:7726 Music_MeetFemaleTrainer_branch_7f726
+1f:7726 Music_MeetFemaleTrainer_Ch2.mainloop
 1f:774b Music_MeetFemaleTrainer_Ch3
-1f:7756 Music_MeetFemaleTrainer_branch_7f756
-1f:7770 Music_MeetFemaleTrainer_branch_7f770
+1f:7756 Music_MeetFemaleTrainer_Ch3.mainloop
+1f:7770 Music_MeetFemaleTrainer_Ch3.sub1
 1f:777b Music_MeetMaleTrainer_Ch1
-1f:778f Music_MeetMaleTrainer_branch_7f78f
+1f:778f Music_MeetMaleTrainer_Ch1.mainloop
 1f:77a2 Music_MeetMaleTrainer_Ch2
-1f:77b5 Music_MeetMaleTrainer_branch_7f7b5
+1f:77b5 Music_MeetMaleTrainer_Ch2.mainloop
 1f:77d2 Music_MeetMaleTrainer_Ch3
-1f:77ea Music_MeetMaleTrainer_branch_7f7ea
+1f:77ea Music_MeetMaleTrainer_Ch3.mainloop
 1f:7844 Music_IntroBattle_Ch1
 1f:78bc Music_IntroBattle_Ch2
 1f:791d Music_IntroBattle_Ch3
 1f:795b Music_IntroBattle_Ch4
 1f:7a19 Music_Surfing_Ch1
-1f:7a30 Music_Surfing_branch_7fa30
+1f:7a30 Music_Surfing_Ch1.mainloop
 1f:7a9c Music_Surfing_Ch2
-1f:7aae Music_Surfing_branch_7faae
+1f:7aae Music_Surfing_Ch2.mainloop
 1f:7afa Music_Surfing_Ch3
-1f:7b03 Music_Surfing_branch_7fb03
+1f:7b03 Music_Surfing_Ch3.mainloop
 1f:7b7d Music_JigglypuffSong_Ch1
 1f:7b9a Music_JigglypuffSong_Ch2
 1f:7baf Music_HallOfFame_Ch1
-1f:7bc5 Music_HallOfFame_branch_7fbc5
+1f:7bc5 Music_HallOfFame_Ch1.loop1
+1f:7bc5 Music_HallOfFame_Ch1.mainloop
 1f:7bda Music_HallOfFame_Ch2
-1f:7bdf Music_HallOfFame_branch_7fbdf
+1f:7bdf Music_HallOfFame_Ch2.mainloop
 1f:7bfc Music_HallOfFame_Ch3
-1f:7bfe Music_HallOfFame_branch_7fbfe
+1f:7bfc Music_HallOfFame_Ch3.mainloop
+1f:7bfe Music_HallOfFame_Ch3.loop1
 1f:7c1f Music_Credits_Ch1
 1f:7d5f Music_Credits_Ch2
 1f:7ec2 Music_Credits_Ch3
-1f:7fa4 Music_Credits_branch_7ffa4
-1f:7fae Music_Credits_branch_7ffae
-1f:7fb8 Music_Credits_branch_7ffb8
-1f:7fc1 Music_Credits_branch_7ffc1
-1f:7fd2 Music_Credits_branch_7ffd2
-1f:7fdb Music_Credits_branch_7ffdb
-1f:7fe4 Music_Credits_branch_7ffe4
-1f:7fed Music_Credits_branch_7ffed
+1f:7fa4 Music_Credits_Ch3.sub1
+1f:7fae Music_Credits_Ch3.sub2
+1f:7fb8 Music_Credits_Ch3.sub3
+1f:7fc1 Music_Credits_Ch3.sub4
+1f:7fd2 Music_Credits_Ch3.sub5
+1f:7fdb Music_Credits_Ch3.sub6
+1f:7fe4 Music_Credits_Ch3.sub7
+1f:7fed Music_Credits_Ch3.sub8
 20:4000 _CardKeySuccessText1
 20:4009 _CardKeySuccessText2
 20:4029 _CardKeyFailText
diff --git a/pokered_vc.sym b/pokered_vc.sym
index 10b294fe9..eb5ff5217 100644
--- a/pokered_vc.sym
+++ b/pokered_vc.sym
@@ -2348,119 +2348,124 @@
 02:5bc4 Music_PkmnHealed_Ch2
 02:5bd2 Music_PkmnHealed_Ch3
 02:5bde Music_Routes1_Ch1
-02:5be9 Music_Routes1_branch_9be9
+02:5be9 Music_Routes1_Ch1.mainloop
 02:5c51 Music_Routes1_Ch2
-02:5c53 Music_Routes1_branch_9c53
-02:5c65 Music_Routes1_branch_9c65
-02:5c78 Music_Routes1_branch_9c78
-02:5c8d Music_Routes1_branch_9c8d
+02:5c53 Music_Routes1_Ch2.mainloop
+02:5c65 Music_Routes1_Ch2.sub1
+02:5c78 Music_Routes1_Ch2.sub2
+02:5c8d Music_Routes1_Ch2.sub3
 02:5cd8 Music_Routes1_Ch3
-02:5cdd Music_Routes1_branch_9cdd
+02:5cdd Music_Routes1_Ch3.mainloop
 02:5d24 Music_Routes1_Ch4
+02:5d24 Music_Routes1_Ch4.mainloop
 02:5db9 Music_Routes2_Ch1
-02:5dc3 Music_Routes2_branch_9dc3
+02:5dc3 Music_Routes2_Ch1.mainloop
 02:5e4f Music_Routes2_Ch2
-02:5e54 Music_Routes2_branch_9e54
+02:5e54 Music_Routes2_Ch2.mainloop
 02:5e9b Music_Routes2_Ch3
-02:5e9e Music_Routes2_branch_9e9e
+02:5e9e Music_Routes2_Ch3.mainloop
 02:5f08 Music_Routes2_Ch4
+02:5f08 Music_Routes2_Ch4.mainloop
 02:5fad Music_Routes3_Ch1
-02:5fc3 Music_Routes3_branch_9fc3
+02:5fc3 Music_Routes3_Ch1.mainloop
 02:6009 Music_Routes3_Ch2
-02:601a Music_Routes3_branch_a01a
+02:601a Music_Routes3_Ch2.mainloop
 02:607f Music_Routes3_Ch3
-02:60a3 Music_Routes3_branch_a0a3
+02:60a3 Music_Routes3_Ch3.mainloop
 02:6131 Music_Routes3_Ch4
-02:617a Music_Routes3_branch_a17a
+02:617a Music_Routes3_Ch4.mainloop
 02:626a Music_Routes4_Ch1
-02:628a Music_Routes4_branch_a28a
+02:628a Music_Routes4_Ch1.mainloop
 02:6304 Music_Routes4_Ch2
-02:6325 Music_Routes4_branch_a325
+02:6325 Music_Routes4_Ch2.mainloop
 02:63c4 Music_Routes4_Ch3
-02:63d7 Music_Routes4_branch_a3d7
+02:63d7 Music_Routes4_Ch3.mainloop
 02:649d Music_Routes4_Ch4
-02:64a8 Music_Routes4_branch_a4a8
+02:64a8 Music_Routes4_Ch4.mainloop
 02:65f0 Music_IndigoPlateau_Ch1
-02:6605 Music_IndigoPlateau_branch_a605
-02:6659 Music_IndigoPlateau_branch_a659
+02:6605 Music_IndigoPlateau_Ch1.mainloop
+02:6659 Music_IndigoPlateau_Ch1.sub1
 02:6664 Music_IndigoPlateau_Ch2
-02:6673 Music_IndigoPlateau_branch_a673
-02:66af Music_IndigoPlateau_branch_a6af
+02:6673 Music_IndigoPlateau_Ch2.mainloop
+02:66af Music_IndigoPlateau_Ch2.sub1
 02:66ba Music_IndigoPlateau_Ch3
-02:66c6 Music_IndigoPlateau_branch_a6c6
-02:66fe Music_IndigoPlateau_branch_a6fe
+02:66c6 Music_IndigoPlateau_Ch3.mainloop
+02:66fe Music_IndigoPlateau_Ch3.sub1
 02:670f Music_IndigoPlateau_Ch4
-02:6728 Music_IndigoPlateau_branch_a728
-02:677e Music_IndigoPlateau_branch_a77e
-02:6791 Music_IndigoPlateau_branch_a791
-02:67a8 Music_IndigoPlateau_branch_a7a8
+02:6728 Music_IndigoPlateau_Ch4.mainloop
+02:677e Music_IndigoPlateau_Ch4.sub1
+02:6791 Music_IndigoPlateau_Ch4.sub2
+02:67a8 Music_IndigoPlateau_Ch4.sub3
 02:67c5 Music_PalletTown_Ch1
-02:67ce Music_PalletTown_branch_a7ce
+02:67ce Music_PalletTown_Ch1.mainloop
 02:685f Music_PalletTown_Ch2
-02:6861 Music_PalletTown_branch_a861
+02:6861 Music_PalletTown_Ch2.mainloop
 02:68de Music_PalletTown_Ch3
-02:68e3 Music_PalletTown_branch_a8e3
+02:68e3 Music_PalletTown_Ch3.mainloop
 02:6913 Music_UnusedSong_Ch1
-02:691b Music_UnusedSong_branch_a91b
+02:691b Music_UnusedSong_Ch1.mainloop
 02:69cf Music_UnusedSong_Ch2
-02:69d8 Music_UnusedSong_branch_a9d8
-02:6a6f Music_Cities1_branch_aa6f
+02:69d8 Music_UnusedSong_Ch2.mainloop
+02:6a6f Music_Cities1_Ch1_AlternateTempo
 02:6a76 Music_Cities1_Ch1
-02:6a79 Music_Cities1_branch_aa79
-02:6a80 Music_Cities1_branch_aa80
-02:6b12 Music_Cities1_branch_ab12
-02:6b7d Music_Cities1_branch_ab7d
-02:6b8a Music_Cities1_branch_ab8a
+02:6a79 Music_Cities1_Ch1.body
+02:6a80 Music_Cities1_Ch1.mainloop
+02:6b12 Music_Cities1_Ch1.loop1
+02:6b7d Music_Cities1_Ch1.sub1
+02:6b8a Music_Cities1_Ch1.sub2
 02:6b92 Music_Cities1_Ch2
-02:6c00 Music_Cities1_branch_ac00
+02:6b92 Music_Cities1_Ch2.mainloop
+02:6c00 Music_Cities1_Ch2.sub1
 02:6c32 Music_Cities1_Ch3
-02:6c35 Music_Cities1_branch_ac35
-02:6cc5 Music_Cities1_branch_acc5
-02:6cce Music_Cities1_branch_acce
+02:6c35 Music_Cities1_Ch3.mainloop
+02:6cc5 Music_Cities1_Ch3.sub1
+02:6cce Music_Cities1_Ch3.sub2
 02:6cef Music_Cities1_Ch4
-02:6cf3 Music_Cities1_branch_acf3
-02:6d36 Music_Cities1_branch_ad36
-02:6d45 Music_Cities1_branch_ad45
-02:6d52 Music_Cities1_branch_ad52
-02:6d5f Music_Cities1_branch_ad5f
-02:6d6e Music_Cities1_branch_ad6e
+02:6cef Music_Cities1_Ch4.mainloop
+02:6cf3 Music_Cities1_Ch4.loop1
+02:6d36 Music_Cities1_Ch4.sub1
+02:6d45 Music_Cities1_Ch4.sub2
+02:6d52 Music_Cities1_Ch4.sub3
+02:6d5f Music_Cities1_Ch4.sub4
+02:6d6e Music_Cities1_Ch4.sub5
 02:6d77 SFX_Get_Item1_1_Ch5
 02:6d8e SFX_Get_Item1_1_Ch6
 02:6d9e SFX_Get_Item1_1_Ch7
 02:6dae Music_MuseumGuy_Ch1
-02:6dd6 Music_MuseumGuy_branch_add6
-02:6de7 Music_MuseumGuy_branch_ade7
-02:6dec Music_MuseumGuy_branch_adec
+02:6dd6 Music_MuseumGuy_Ch1.mainloop
+02:6de7 Music_MuseumGuy_Ch1.sub1
+02:6dec Music_MuseumGuy_Ch1.sub2
 02:6df1 Music_MuseumGuy_Ch2
-02:6e26 Music_MuseumGuy_branch_ae26
+02:6e26 Music_MuseumGuy_Ch2.mainloop
 02:6e6e Music_MuseumGuy_Ch3
-02:6e8e Music_MuseumGuy_branch_ae8e
-02:6eb8 Music_MuseumGuy_branch_aeb8
-02:6ec1 Music_MuseumGuy_branch_aec1
+02:6e8e Music_MuseumGuy_Ch3.mainloop
+02:6eb8 Music_MuseumGuy_Ch3.sub1
+02:6ec1 Music_MuseumGuy_Ch3.sub2
 02:6ed1 Music_MuseumGuy_Ch4
-02:6ee1 Music_MuseumGuy_branch_aee1
+02:6ee1 Music_MuseumGuy_Ch4.mainloop
 02:6f59 Music_MeetProfOak_Ch1
-02:6f85 Music_MeetProfOak_branch_af85
+02:6f85 Music_MeetProfOak_Ch1.mainloop
 02:6fa9 Music_MeetProfOak_Ch2
-02:7005 Music_MeetProfOak_branch_b005
+02:7005 Music_MeetProfOak_Ch2.mainloop
 02:703d Music_MeetProfOak_Ch3
-02:70bc Music_MeetProfOak_branch_b0bc
-02:70d8 Music_MeetProfOak_branch_b0d8
-02:70ed Music_MeetProfOak_branch_b0ed
-02:7101 Music_MeetProfOak_branch_b101
-02:7119 Music_MeetRival_branch_b119
+02:70bc Music_MeetProfOak_Ch3.loop1
+02:70bc Music_MeetProfOak_Ch3.mainloop
+02:70d8 Music_MeetProfOak_Ch3.loop2
+02:70ed Music_MeetProfOak_Ch3.loop3
+02:7101 Music_MeetProfOak_Ch3.loop4
+02:7119 Music_MeetRival_Ch1_AlternateTempo
 02:7120 Music_MeetRival_Ch1
-02:7123 Music_MeetRival_branch_b123
-02:7140 Music_MeetRival_branch_b140
-02:719b Music_MeetRival_branch_b19b
-02:71a2 Music_MeetRival_branch_b1a2
-02:71a5 Music_MeetRival_branch_b1a5
+02:7123 Music_MeetRival_Ch1.body
+02:7140 Music_MeetRival_Ch1.mainloop
+02:719b Music_MeetRival_Ch1_AlternateStartAndTempo
+02:71a2 Music_MeetRival_Ch1_AlternateStart
+02:71a5 Music_MeetRival_Ch1_AlternateStart.body
 02:71bb Music_MeetRival_Ch2
-02:71d8 Music_MeetRival_branch_b1d8
-02:721d Music_MeetRival_branch_b21d
+02:71d8 Music_MeetRival_Ch2.mainloop
+02:721d Music_MeetRival_Ch2_AlternateStart
 02:7233 Music_MeetRival_Ch3
-02:724b Music_MeetRival_branch_b24b
-02:72b5 Music_MeetRival_branch_b2b5
+02:724b Music_MeetRival_Ch3.mainloop
+02:72b5 Music_MeetRival_Ch3_AlternateStart
 02:72c8 SFX_Pokedex_Rating_1_Ch5
 02:72e1 SFX_Pokedex_Rating_1_Ch6
 02:72f7 SFX_Pokedex_Rating_1_Ch7
@@ -2471,74 +2476,76 @@
 02:7381 SFX_Get_Key_Item_1_Ch6
 02:739d SFX_Get_Key_Item_1_Ch7
 02:73a7 Music_SSAnne_Ch1
-02:73b2 Music_SSAnne_branch_b3b2
+02:73b2 Music_SSAnne_Ch1.mainloop
 02:7419 Music_SSAnne_Ch2
-02:741e Music_SSAnne_branch_b41e
+02:741e Music_SSAnne_Ch2.mainloop
 02:74cb Music_SSAnne_Ch3
+02:74cb Music_SSAnne_Ch3.mainloop
 02:7504 Music_Cities2_Ch1
-02:751a Music_Cities2_branch_b51a
+02:751a Music_Cities2_Ch1.mainloop
 02:7569 Music_Cities2_Ch2
-02:758b Music_Cities2_branch_b58b
+02:758b Music_Cities2_Ch2.mainloop
 02:7640 Music_Cities2_Ch3
-02:764c Music_Cities2_branch_b64c
+02:764c Music_Cities2_Ch3.mainloop
 02:76c7 Music_Celadon_Ch1
-02:76d4 Music_Celadon_branch_b6d4
+02:76d4 Music_Celadon_Ch1.mainloop
 02:773a Music_Celadon_Ch2
-02:774a Music_Celadon_branch_b74a
+02:774a Music_Celadon_Ch2.mainloop
 02:77b5 Music_Celadon_Ch3
-02:77c1 Music_Celadon_branch_b7c1
+02:77c1 Music_Celadon_Ch3.mainloop
 02:786d Music_Cinnabar_Ch1
-02:7878 Music_Cinnabar_branch_b878
+02:7878 Music_Cinnabar_Ch1.mainloop
 02:78d4 Music_Cinnabar_Ch2
-02:78d9 Music_Cinnabar_branch_b8d9
+02:78d9 Music_Cinnabar_Ch2.mainloop
 02:793d Music_Cinnabar_Ch3
-02:793f Music_Cinnabar_branch_b93f
+02:793f Music_Cinnabar_Ch3.mainloop
 02:79eb Music_Vermilion_Ch1
-02:79f6 Music_Vermilion_branch_b9f6
+02:79f6 Music_Vermilion_Ch1.mainloop
 02:7a61 Music_Vermilion_Ch2
-02:7a66 Music_Vermilion_branch_ba66
+02:7a66 Music_Vermilion_Ch2.mainloop
 02:7aa6 Music_Vermilion_Ch3
-02:7aa8 Music_Vermilion_branch_baa8
+02:7aa8 Music_Vermilion_Ch3.mainloop
 02:7b0d Music_Vermilion_Ch4
-02:7b0e Music_Vermilion_branch_bb0e
-02:7b3f Music_Vermilion_branch_bb3f
+02:7b0e Music_Vermilion_Ch4.loop1
+02:7b0e Music_Vermilion_Ch4.mainloop
+02:7b3f Music_Vermilion_Ch4.sub1
 02:7b58 Music_Lavender_Ch1
-02:7b6b Music_Lavender_branch_bb6b
+02:7b6b Music_Lavender_Ch1.mainloop
 02:7b9e Music_Lavender_Ch2
-02:7ba5 Music_Lavender_branch_bba5
+02:7ba5 Music_Lavender_Ch2.mainloop
 02:7bae Music_Lavender_Ch3
-02:7bb9 Music_Lavender_branch_bbb9
+02:7bb9 Music_Lavender_Ch3.mainloop
 02:7c21 Music_Lavender_Ch4
-02:7c26 Music_Lavender_branch_bc26
+02:7c26 Music_Lavender_Ch4.mainloop
 02:7c2e Music_SafariZone_Ch1
-02:7c4f Music_SafariZone_branch_bc4f
-02:7c5f Music_SafariZone_branch_bc5f
+02:7c4f Music_SafariZone_Ch1.mainloop
+02:7c5f Music_SafariZone_Ch1.sub1
 02:7c6a Music_SafariZone_Ch2
-02:7c79 Music_SafariZone_branch_bc79
-02:7c89 Music_SafariZone_branch_bc89
+02:7c79 Music_SafariZone_Ch2.mainloop
+02:7c89 Music_SafariZone_Ch2.sub1
 02:7c94 Music_SafariZone_Ch3
-02:7c97 Music_SafariZone_branch_bc97
-02:7ca5 Music_SafariZone_branch_bca5
+02:7c97 Music_SafariZone_Ch3.mainloop
+02:7ca5 Music_SafariZone_Ch3.sub1
 02:7cbb Music_Gym_Ch1
-02:7cd8 Music_Gym_branch_bcd8
+02:7cd8 Music_Gym_Ch1.mainloop
 02:7d6b Music_Gym_Ch2
-02:7d82 Music_Gym_branch_bd82
+02:7d82 Music_Gym_Ch2.mainloop
 02:7dfa Music_Gym_Ch3
-02:7e02 Music_Gym_branch_be02
-02:7e3b Music_Gym_branch_be3b
-02:7e44 Music_Gym_branch_be44
-02:7e4d Music_Gym_branch_be4d
+02:7e02 Music_Gym_Ch3.mainloop
+02:7e3b Music_Gym_Ch3.sub1
+02:7e44 Music_Gym_Ch3.sub2
+02:7e4d Music_Gym_Ch3.sub3
 02:7e56 Music_Pokecenter_Ch1
-02:7e61 Music_Pokecenter_branch_be61
+02:7e61 Music_Pokecenter_Ch1.mainloop
 02:7ef9 Music_Pokecenter_Ch2
-02:7efc Music_Pokecenter_branch_befc
-02:7f4e Music_Pokecenter_branch_bf4e
-02:7f60 Music_Pokecenter_branch_bf60
+02:7efc Music_Pokecenter_Ch2.mainloop
+02:7f4e Music_Pokecenter_Ch2.sub1
+02:7f60 Music_Pokecenter_Ch2.sub2
 02:7f70 Music_Pokecenter_Ch3
-02:7f72 Music_Pokecenter_branch_bf72
-02:7fd9 Music_Pokecenter_branch_bfd9
-02:7fe2 Music_Pokecenter_branch_bfe2
-02:7feb Music_Pokecenter_branch_bfeb
+02:7f72 Music_Pokecenter_Ch3.mainloop
+02:7fd9 Music_Pokecenter_Ch3.sub1
+02:7fe2 Music_Pokecenter_Ch3.sub2
+02:7feb Music_Pokecenter_Ch3.sub3
 03:4000 _Joypad
 03:4034 DiscardButtonPresses
 03:403c TrySoftReset
@@ -5187,9 +5194,9 @@
 08:45fe SFX_Battle_25_Ch8
 08:460e SFX_Battle_26_Ch8
 08:4624 SFX_Battle_27_Ch5
-08:462a SFX_Battle_27_branch_2062a
+08:462a SFX_Battle_27_Ch5.loop1
 08:4637 SFX_Battle_27_Ch6
-08:463d SFX_Battle_27_branch_2063d
+08:463d SFX_Battle_27_Ch6.loop1
 08:464a SFX_Battle_27_Ch8
 08:4655 SFX_Battle_28_Ch5
 08:4664 SFX_Battle_28_Ch6
@@ -5228,7 +5235,7 @@
 08:48e0 SFX_Battle_35_Ch5
 08:48f0 SFX_Battle_35_Ch6
 08:4902 SFX_Battle_36_Ch5
-08:4930 SFX_Battle_36_branch_20930
+08:4930 SFX_Battle_36_Ch5.loop1
 08:4941 SFX_Battle_36_Ch6
 08:4980 SFX_Battle_36_Ch8
 08:498b SFX_UnusedCry_2_Ch5
@@ -5584,34 +5591,34 @@
 08:6347 SFX_UnusedFanfare_Ch6
 08:6359 SFX_UnusedFanfare_Ch7
 08:6370 Music_GymLeaderBattle_Ch1
-08:63b0 Music_GymLeaderBattle_branch_223b0
+08:63b0 Music_GymLeaderBattle_Ch1.mainloop
 08:65a1 Music_GymLeaderBattle_Ch2
-08:65e0 Music_GymLeaderBattle_branch_225e0
+08:65e0 Music_GymLeaderBattle_Ch2.mainloop
 08:66ef Music_GymLeaderBattle_Ch3
-08:67b1 Music_GymLeaderBattle_branch_227b1
+08:67b1 Music_GymLeaderBattle_Ch3.mainloop
 08:6919 Music_TrainerBattle_Ch1
-08:6962 Music_TrainerBattle_branch_22962
+08:6962 Music_TrainerBattle_Ch1.mainloop
 08:6bae Music_TrainerBattle_Ch2
-08:6bfc Music_TrainerBattle_branch_22bfc
+08:6bfc Music_TrainerBattle_Ch2.mainloop
 08:6d10 Music_TrainerBattle_Ch3
-08:6d9c Music_TrainerBattle_branch_22d9c
+08:6d9c Music_TrainerBattle_Ch3.mainloop
 08:7099 Music_WildBattle_Ch1
-08:70e0 Music_WildBattle_branch_230e0
+08:70e0 Music_WildBattle_Ch1.mainloop
 08:71d8 Music_WildBattle_Ch2
-08:7225 Music_WildBattle_branch_23225
+08:7225 Music_WildBattle_Ch2.mainloop
 08:7290 Music_WildBattle_Ch3
-08:72b5 Music_WildBattle_branch_232b5
-08:72d8 Music_WildBattle_branch_232d8
+08:72b5 Music_WildBattle_Ch3.introloop
+08:72d8 Music_WildBattle_Ch3.mainloop
 08:73a6 Music_FinalBattle_Ch1
-08:7429 Music_FinalBattle_branch_23429
+08:7429 Music_FinalBattle_Ch1.mainloop
 08:756a Music_FinalBattle_Ch2
-08:75e6 Music_FinalBattle_branch_235e6
-08:7704 Music_FinalBattle_branch_23704
-08:7710 Music_FinalBattle_branch_23710
+08:75e6 Music_FinalBattle_Ch2.mainloop
+08:7704 Music_FinalBattle_Ch2.sub1
+08:7710 Music_FinalBattle_Ch2.sub2
 08:771c Music_FinalBattle_Ch3
-08:777d Music_FinalBattle_branch_2377d
-08:795b Music_FinalBattle_branch_2395b
-08:796c Music_FinalBattle_branch_2396c
+08:777d Music_FinalBattle_Ch3.mainloop
+08:795b Music_FinalBattle_Ch3.sub1
+08:796c Music_FinalBattle_Ch3.sub2
 08:797d SFX_Level_Up_Ch5
 08:7998 SFX_Level_Up_Ch6
 08:79b0 SFX_Level_Up_Ch7
@@ -5622,23 +5629,23 @@
 08:7a2e SFX_Caught_Mon_Ch6
 08:7a44 SFX_Caught_Mon_Ch7
 08:7a53 Music_DefeatedTrainer_Ch1
-08:7a76 Music_DefeatedTrainer_branch_23a76
+08:7a76 Music_DefeatedTrainer_Ch1.mainloop
 08:7ac1 Music_DefeatedTrainer_Ch2
-08:7ad2 Music_DefeatedTrainer_branch_23ad2
+08:7ad2 Music_DefeatedTrainer_Ch2.mainloop
 08:7b15 Music_DefeatedTrainer_Ch3
-08:7b24 Music_DefeatedTrainer_branch_23b24
+08:7b24 Music_DefeatedTrainer_Ch3.mainloop
 08:7b74 Music_DefeatedWildMon_Ch1
-08:7b8b Music_DefeatedWildMon_branch_23b8b
+08:7b8b Music_DefeatedWildMon_Ch1.mainloop
 08:7bc1 Music_DefeatedWildMon_Ch2
-08:7bce Music_DefeatedWildMon_branch_23bce
+08:7bce Music_DefeatedWildMon_Ch2.mainloop
 08:7c0e Music_DefeatedWildMon_Ch3
-08:7c21 Music_DefeatedWildMon_branch_23c21
+08:7c21 Music_DefeatedWildMon_Ch3.mainloop
 08:7cad Music_DefeatedGymLeader_Ch1
-08:7ccc Music_DefeatedGymLeader_branch_23ccc
+08:7ccc Music_DefeatedGymLeader_Ch1.mainloop
 08:7d6d Music_DefeatedGymLeader_Ch2
-08:7d84 Music_DefeatedGymLeader_branch_23d84
+08:7d84 Music_DefeatedGymLeader_Ch2.mainloop
 08:7e52 Music_DefeatedGymLeader_Ch3
-08:7e65 Music_DefeatedGymLeader_branch_23e65
+08:7e65 Music_DefeatedGymLeader_Ch3.mainloop
 09:4000 RhydonPicFront
 09:4202 RhydonPicBack
 09:429a KangaskhanPicFront
@@ -14729,130 +14736,138 @@
 1f:5ba3 Audio3_Pitches
 1f:5ba3 Audio3_Pitches._table_width_u7986
 1f:5bbb Music_BikeRiding_Ch1
-1f:5bc9 Music_BikeRiding_branch_7dbc9
+1f:5bc9 Music_BikeRiding_Ch1.mainloop
 1f:5c6c Music_BikeRiding_Ch2
-1f:5c75 Music_BikeRiding_branch_7dc75
+1f:5c75 Music_BikeRiding_Ch2.mainloop
 1f:5d14 Music_BikeRiding_Ch3
-1f:5d17 Music_BikeRiding_branch_7dd17
+1f:5d17 Music_BikeRiding_Ch3.mainloop
 1f:5e68 Music_BikeRiding_Ch4
-1f:5e6a Music_BikeRiding_branch_7de6a
-1f:5ea7 Music_BikeRiding_branch_7dea7
-1f:5eb4 Music_BikeRiding_branch_7deb4
-1f:5ec2 Music_BikeRiding_branch_7dec2
+1f:5e6a Music_BikeRiding_Ch4.mainloop
+1f:5ea7 Music_BikeRiding_Ch4.sub1
+1f:5eb4 Music_BikeRiding_Ch4.sub2
+1f:5ec2 Music_BikeRiding_Ch4.sub3
 1f:5ed1 Music_Dungeon1_Ch1
-1f:5ee5 Music_Dungeon1_branch_7dee5
-1f:5ee8 Music_Dungeon1_branch_7dee8
-1f:5eff Music_Dungeon1_branch_7deff
-1f:5f6e Music_Dungeon1_branch_7df6e
-1f:5faa Music_Dungeon1_branch_7dfaa
-1f:5fbb Music_Dungeon1_branch_7dfbb
-1f:5fc5 Music_Dungeon1_branch_7dfc5
-1f:5fd5 Music_Dungeon1_branch_7dfd5
+1f:5ee5 Music_Dungeon1_Ch1.mainloop
+1f:5ee8 Music_Dungeon1_Ch1.loop1
+1f:5eff Music_Dungeon1_Ch1.loop2
+1f:5f6e Music_Dungeon1_Ch1.loop3
+1f:5faa Music_Dungeon1_Ch1.sub1
+1f:5fbb Music_Dungeon1_Ch1.sub2
+1f:5fc5 Music_Dungeon1_Ch1.sub3
+1f:5fd5 Music_Dungeon1_Ch1.sub4
 1f:5fde Music_Dungeon1_Ch2
-1f:5feb Music_Dungeon1_branch_7dfeb
-1f:5fed Music_Dungeon1_branch_7dfed
-1f:6006 Music_Dungeon1_branch_7e006
-1f:6097 Music_Dungeon1_branch_7e097
-1f:60ab Music_Dungeon1_branch_7e0ab
-1f:60b5 Music_Dungeon1_branch_7e0b5
-1f:60ba Music_Dungeon1_branch_7e0ba
-1f:60c0 Music_Dungeon1_branch_7e0c0
-1f:60cd Music_Dungeon1_branch_7e0cd
+1f:5feb Music_Dungeon1_Ch2.mainloop
+1f:5fed Music_Dungeon1_Ch2.loop1
+1f:6006 Music_Dungeon1_Ch2.loop2
+1f:6097 Music_Dungeon1_Ch2.sub1
+1f:60ab Music_Dungeon1_Ch2.sub2
+1f:60b5 Music_Dungeon1_Ch2.sub3
+1f:60ba Music_Dungeon1_Ch2.sub4
+1f:60c0 Music_Dungeon1_Ch2.sub5
+1f:60cd Music_Dungeon1_Ch2.sub6
 1f:60dc Music_Dungeon1_Ch3
-1f:60e5 Music_Dungeon1_branch_7e0e5
-1f:6140 Music_Dungeon1_branch_7e140
-1f:6154 Music_Dungeon1_branch_7e154
-1f:615e Music_Dungeon1_branch_7e15e
-1f:6164 Music_Dungeon1_branch_7e164
-1f:6177 Music_Dungeon1_branch_7e177
+1f:60e5 Music_Dungeon1_Ch3.mainloop
+1f:6140 Music_Dungeon1_Ch3.sub1
+1f:6154 Music_Dungeon1_Ch3.sub2
+1f:615e Music_Dungeon1_Ch3.sub3
+1f:6164 Music_Dungeon1_Ch3.sub4
+1f:6177 Music_Dungeon1_Ch3.sub5
 1f:618a Music_Dungeon1_Ch4
-1f:6190 Music_Dungeon1_branch_7e190
-1f:61a1 Music_Dungeon1_branch_7e1a1
-1f:61b0 Music_Dungeon1_branch_7e1b0
-1f:61ba Music_Dungeon1_branch_7e1ba
-1f:61cf Music_Dungeon1_branch_7e1cf
-1f:61d5 Music_Dungeon1_branch_7e1d5
-1f:61f1 Music_Dungeon1_branch_7e1f1
-1f:61fa Music_Dungeon1_branch_7e1fa
-1f:6202 Music_Dungeon1_branch_7e202
+1f:6190 Music_Dungeon1_Ch4.loop1
+1f:6190 Music_Dungeon1_Ch4.mainloop
+1f:61a1 Music_Dungeon1_Ch4.loop2
+1f:61b0 Music_Dungeon1_Ch4.loop3
+1f:61ba Music_Dungeon1_Ch4.loop4
+1f:61cf Music_Dungeon1_Ch4.loop5
+1f:61d5 Music_Dungeon1_Ch4.loop6
+1f:61f1 Music_Dungeon1_Ch4.sub1
+1f:61fa Music_Dungeon1_Ch4.sub2
+1f:6202 Music_Dungeon1_Ch4.sub3
 1f:620b Music_GameCorner_Ch1
-1f:6222 Music_GameCorner_branch_7e222
+1f:6222 Music_GameCorner_Ch1.mainloop
 1f:62df Music_GameCorner_Ch2
-1f:62fa Music_GameCorner_branch_7e2fa
+1f:62fa Music_GameCorner_Ch2.mainloop
 1f:638b Music_GameCorner_Ch3
-1f:63a5 Music_GameCorner_branch_7e3a5
-1f:6418 Music_GameCorner_branch_7e418
-1f:642d Music_GameCorner_branch_7e42d
-1f:6442 Music_GameCorner_branch_7e442
-1f:6457 Music_GameCorner_branch_7e457
-1f:646c Music_GameCorner_branch_7e46c
-1f:6481 Music_GameCorner_branch_7e481
-1f:6496 Music_GameCorner_branch_7e496
-1f:64ab Music_GameCorner_branch_7e4ab
+1f:63a5 Music_GameCorner_Ch3.mainloop
+1f:6418 Music_GameCorner_Ch3.sub1
+1f:642d Music_GameCorner_Ch3.sub2
+1f:6442 Music_GameCorner_Ch3.sub3
+1f:6457 Music_GameCorner_Ch3.sub4
+1f:646c Music_GameCorner_Ch3.sub5
+1f:6481 Music_GameCorner_Ch3.sub6
+1f:6496 Music_GameCorner_Ch3.sub7
+1f:64ab Music_GameCorner_Ch3.sub8
 1f:64c0 Music_TitleScreen_Ch1
-1f:64e2 Music_TitleScreen_branch_7e4e2
-1f:6541 Music_TitleScreen_branch_7e541
-1f:654a Music_TitleScreen_branch_7e54a
-1f:655c Music_TitleScreen_branch_7e55c
+1f:64e2 Music_TitleScreen_Ch1.mainloop
+1f:6541 Music_TitleScreen_Ch1.sub1
+1f:654a Music_TitleScreen_Ch1.sub2
+1f:655c Music_TitleScreen_Ch1.sub3
 1f:6578 Music_TitleScreen_Ch2
-1f:6594 Music_TitleScreen_branch_7e594
-1f:6622 Music_TitleScreen_branch_7e622
-1f:662c Music_TitleScreen_branch_7e62c
-1f:6636 Music_TitleScreen_branch_7e636
+1f:6594 Music_TitleScreen_Ch2.mainloop
+1f:6622 Music_TitleScreen_Ch2.sub1
+1f:662c Music_TitleScreen_Ch2.sub2
+1f:6636 Music_TitleScreen_Ch2.sub3
 1f:6643 Music_TitleScreen_Ch3
-1f:665e Music_TitleScreen_branch_7e65e
-1f:6664 Music_TitleScreen_branch_7e664
-1f:66c9 Music_TitleScreen_branch_7e6c9
-1f:66d0 Music_TitleScreen_branch_7e6d0
-1f:66d7 Music_TitleScreen_branch_7e6d7
-1f:66dc Music_TitleScreen_branch_7e6dc
-1f:66e5 Music_TitleScreen_branch_7e6e5
+1f:665e Music_TitleScreen_Ch3.mainloop
+1f:6664 Music_TitleScreen_Ch3.loop1
+1f:66c9 Music_TitleScreen_Ch3.sub1
+1f:66d0 Music_TitleScreen_Ch3.sub2
+1f:66d7 Music_TitleScreen_Ch3.sub3
+1f:66dc Music_TitleScreen_Ch3.sub4
+1f:66e5 Music_TitleScreen_Ch3.sub5
 1f:66eb Music_TitleScreen_Ch4
-1f:6716 Music_TitleScreen_branch_7e716
-1f:6834 Music_TitleScreen_branch_7e834
-1f:6842 Music_TitleScreen_branch_7e842
+1f:6716 Music_TitleScreen_Ch4.mainloop
+1f:6834 Music_TitleScreen_Ch4.sub1
+1f:6842 Music_TitleScreen_Ch4.sub2
 1f:6850 SFX_Get_Item1_3_Ch5
 1f:6867 SFX_Get_Item1_3_Ch6
 1f:6877 SFX_Get_Item1_3_Ch7
 1f:6887 Music_Dungeon2_Ch1
-1f:6892 Music_Dungeon2_branch_7e892
+1f:6892 Music_Dungeon2_Ch1.loop1
+1f:6892 Music_Dungeon2_Ch1.mainloop
 1f:68d8 Music_Dungeon2_Ch2
-1f:68db Music_Dungeon2_branch_7e8db
+1f:68db Music_Dungeon2_Ch2.loop1
+1f:68db Music_Dungeon2_Ch2.mainloop
 1f:693b Music_Dungeon2_Ch3
-1f:6940 Music_Dungeon2_branch_7e940
-1f:6958 Music_Dungeon2_branch_7e958
-1f:69d1 Music_Dungeon2_branch_7e9d1
+1f:6940 Music_Dungeon2_Ch3.loop1
+1f:6940 Music_Dungeon2_Ch3.mainloop
+1f:6958 Music_Dungeon2_Ch3.loop2
+1f:69be Music_Dungeon2_Ch3.sub1
+1f:69d1 Music_Dungeon2_Ch3.sub2
 1f:69dc Music_Dungeon2_Ch4
-1f:69dd Music_Dungeon2_branch_7e9dd
+1f:69dd Music_Dungeon2_Ch4.mainloop
 1f:69f1 Music_Dungeon3_Ch1
-1f:69fc Music_Dungeon3_branch_7e9fc
-1f:69fe Music_Dungeon3_branch_7e9fe
-1f:6a11 Music_Dungeon3_branch_7ea11
-1f:6a18 Music_Dungeon3_branch_7ea18
-1f:6a3c Music_Dungeon3_branch_7ea3c
-1f:6a43 Music_Dungeon3_branch_7ea43
-1f:6ab2 Music_Dungeon3_branch_7eab2
-1f:6ac1 Music_Dungeon3_branch_7eac1
-1f:6ace Music_Dungeon3_branch_7eace
-1f:6add Music_Dungeon3_branch_7eadd
-1f:6aea Music_Dungeon3_branch_7eaea
-1f:6af7 Music_Dungeon3_branch_7eaf7
-1f:6afc Music_Dungeon3_branch_7eafc
+1f:69fc Music_Dungeon3_Ch1.mainloop
+1f:69fe Music_Dungeon3_Ch1.loop1
+1f:6a11 Music_Dungeon3_Ch1.loop2
+1f:6a18 Music_Dungeon3_Ch1.loop3
+1f:6a3c Music_Dungeon3_Ch1.loop4
+1f:6a43 Music_Dungeon3_Ch1.loop5
+1f:6ab2 Music_Dungeon3_Ch1.sub1
+1f:6ac1 Music_Dungeon3_Ch1.sub2
+1f:6ace Music_Dungeon3_Ch1.sub3
+1f:6add Music_Dungeon3_Ch1.sub4
+1f:6aea Music_Dungeon3_Ch1.sub5
+1f:6af7 Music_Dungeon3_Ch1.sub6
+1f:6afc Music_Dungeon3_Ch1.sub7
 1f:6b68 Music_Dungeon3_Ch2
-1f:6b6d Music_Dungeon3_branch_7eb6d
+1f:6b6d Music_Dungeon3_Ch2.mainloop
 1f:6c7a Music_Dungeon3_Ch3
+1f:6c7a Music_Dungeon3_Ch3.mainloop
 1f:6ce4 Music_Dungeon3_Ch4
 1f:6d0f Music_CinnabarMansion_Ch1
-1f:6d19 Music_CinnabarMansion_branch_7ed19
+1f:6d19 Music_CinnabarMansion_Ch1.loop1
+1f:6d19 Music_CinnabarMansion_Ch1.mainloop
 1f:6d40 Music_CinnabarMansion_Ch2
-1f:6d48 Music_CinnabarMansion_branch_7ed48
-1f:6d4e Music_CinnabarMansion_branch_7ed4e
-1f:6d50 Music_CinnabarMansion_branch_7ed50
-1f:6d6c Music_CinnabarMansion_branch_7ed6c
+1f:6d48 Music_CinnabarMansion_Ch2.introloop
+1f:6d4e Music_CinnabarMansion_Ch2.mainloop
+1f:6d50 Music_CinnabarMansion_Ch2.loop1
+1f:6d6c Music_CinnabarMansion_Ch2.sub1
 1f:6d7e Music_CinnabarMansion_Ch3
-1f:6d80 Music_CinnabarMansion_branch_7ed80
+1f:6d80 Music_CinnabarMansion_Ch3.loop1
+1f:6d80 Music_CinnabarMansion_Ch3.mainloop
 1f:6db0 Music_CinnabarMansion_Ch4
-1f:6db5 Music_CinnabarMansion_branch_7edb5
+1f:6db5 Music_CinnabarMansion_Ch4.mainloop
 1f:6dda SFX_Pokedex_Rating_3_Ch5
 1f:6df3 SFX_Pokedex_Rating_3_Ch6
 1f:6e09 SFX_Pokedex_Rating_3_Ch7
@@ -14863,72 +14878,75 @@
 1f:6e93 SFX_Get_Key_Item_3_Ch6
 1f:6eaf SFX_Get_Key_Item_3_Ch7
 1f:6eb9 Music_OaksLab_Ch1
-1f:6ed0 Music_OaksLab_branch_7eed0
+1f:6ed0 Music_OaksLab_Ch1.mainloop
 1f:6f05 Music_OaksLab_Ch2
-1f:6f16 Music_OaksLab_branch_7ef16
+1f:6f16 Music_OaksLab_Ch2.mainloop
 1f:6f52 Music_OaksLab_Ch3
-1f:6f5c Music_OaksLab_branch_7ef5c
+1f:6f5c Music_OaksLab_Ch3.mainloop
 1f:704a Music_PokemonTower_Ch1
-1f:705a Music_PokemonTower_branch_7f05a
+1f:705a Music_PokemonTower_Ch1.mainloop
 1f:70e3 Music_PokemonTower_Ch2
-1f:70ee Music_PokemonTower_branch_7f0ee
+1f:70ee Music_PokemonTower_Ch2.mainloop
 1f:719a Music_PokemonTower_Ch3
-1f:71a2 Music_PokemonTower_branch_7f1a2
+1f:71a2 Music_PokemonTower_Ch3.mainloop
 1f:7243 Music_SilphCo_Ch1
-1f:726d Music_SilphCo_branch_7f26d
-1f:73f0 Music_SilphCo_branch_7f3f0
+1f:726d Music_SilphCo_Ch1.mainloop
+1f:73f0 Music_SilphCo_Ch1.sub1
 1f:7409 Music_SilphCo_Ch2
-1f:742e Music_SilphCo_branch_7f42e
+1f:742e Music_SilphCo_Ch2.mainloop
 1f:75be Music_SilphCo_Ch3
-1f:75c9 Music_SilphCo_branch_7f5c9
+1f:75c9 Music_SilphCo_Ch3.mainloop
 1f:769d Music_MeetEvilTrainer_Ch1
-1f:76ae Music_MeetEvilTrainer_branch_7f6ae
+1f:76ae Music_MeetEvilTrainer_Ch1.mainloop
 1f:76ba Music_MeetEvilTrainer_Ch2
-1f:76c2 Music_MeetEvilTrainer_branch_7f6c2
+1f:76c2 Music_MeetEvilTrainer_Ch2.mainloop
 1f:76e6 Music_MeetEvilTrainer_Ch3
-1f:76ee Music_MeetEvilTrainer_branch_7f6ee
+1f:76ee Music_MeetEvilTrainer_Ch3.mainloop
 1f:76f9 Music_MeetFemaleTrainer_Ch1
-1f:770c Music_MeetFemaleTrainer_branch_7f70c
+1f:770c Music_MeetFemaleTrainer_Ch1.loop1
+1f:770c Music_MeetFemaleTrainer_Ch1.mainloop
 1f:771c Music_MeetFemaleTrainer_Ch2
-1f:7726 Music_MeetFemaleTrainer_branch_7f726
+1f:7726 Music_MeetFemaleTrainer_Ch2.mainloop
 1f:774b Music_MeetFemaleTrainer_Ch3
-1f:7756 Music_MeetFemaleTrainer_branch_7f756
-1f:7770 Music_MeetFemaleTrainer_branch_7f770
+1f:7756 Music_MeetFemaleTrainer_Ch3.mainloop
+1f:7770 Music_MeetFemaleTrainer_Ch3.sub1
 1f:777b Music_MeetMaleTrainer_Ch1
-1f:778f Music_MeetMaleTrainer_branch_7f78f
+1f:778f Music_MeetMaleTrainer_Ch1.mainloop
 1f:77a2 Music_MeetMaleTrainer_Ch2
-1f:77b5 Music_MeetMaleTrainer_branch_7f7b5
+1f:77b5 Music_MeetMaleTrainer_Ch2.mainloop
 1f:77d2 Music_MeetMaleTrainer_Ch3
-1f:77ea Music_MeetMaleTrainer_branch_7f7ea
+1f:77ea Music_MeetMaleTrainer_Ch3.mainloop
 1f:7844 Music_IntroBattle_Ch1
 1f:78bc Music_IntroBattle_Ch2
 1f:791d Music_IntroBattle_Ch3
 1f:795b Music_IntroBattle_Ch4
 1f:7a19 Music_Surfing_Ch1
-1f:7a30 Music_Surfing_branch_7fa30
+1f:7a30 Music_Surfing_Ch1.mainloop
 1f:7a9c Music_Surfing_Ch2
-1f:7aae Music_Surfing_branch_7faae
+1f:7aae Music_Surfing_Ch2.mainloop
 1f:7afa Music_Surfing_Ch3
-1f:7b03 Music_Surfing_branch_7fb03
+1f:7b03 Music_Surfing_Ch3.mainloop
 1f:7b7d Music_JigglypuffSong_Ch1
 1f:7b9a Music_JigglypuffSong_Ch2
 1f:7baf Music_HallOfFame_Ch1
-1f:7bc5 Music_HallOfFame_branch_7fbc5
+1f:7bc5 Music_HallOfFame_Ch1.loop1
+1f:7bc5 Music_HallOfFame_Ch1.mainloop
 1f:7bda Music_HallOfFame_Ch2
-1f:7bdf Music_HallOfFame_branch_7fbdf
+1f:7bdf Music_HallOfFame_Ch2.mainloop
 1f:7bfc Music_HallOfFame_Ch3
-1f:7bfe Music_HallOfFame_branch_7fbfe
+1f:7bfc Music_HallOfFame_Ch3.mainloop
+1f:7bfe Music_HallOfFame_Ch3.loop1
 1f:7c1f Music_Credits_Ch1
 1f:7d5f Music_Credits_Ch2
 1f:7ec2 Music_Credits_Ch3
-1f:7fa4 Music_Credits_branch_7ffa4
-1f:7fae Music_Credits_branch_7ffae
-1f:7fb8 Music_Credits_branch_7ffb8
-1f:7fc1 Music_Credits_branch_7ffc1
-1f:7fd2 Music_Credits_branch_7ffd2
-1f:7fdb Music_Credits_branch_7ffdb
-1f:7fe4 Music_Credits_branch_7ffe4
-1f:7fed Music_Credits_branch_7ffed
+1f:7fa4 Music_Credits_Ch3.sub1
+1f:7fae Music_Credits_Ch3.sub2
+1f:7fb8 Music_Credits_Ch3.sub3
+1f:7fc1 Music_Credits_Ch3.sub4
+1f:7fd2 Music_Credits_Ch3.sub5
+1f:7fdb Music_Credits_Ch3.sub6
+1f:7fe4 Music_Credits_Ch3.sub7
+1f:7fed Music_Credits_Ch3.sub8
 20:4000 _CardKeySuccessText1
 20:4009 _CardKeySuccessText2
 20:4029 _CardKeyFailText