Rename/organize part 3 of 4

rename functions, clean up address/wram comments, other misc only broken up so that all changes are viewable on github
2026-02-06 15:45:24 +13:00 · 2015-07-03 14:39:24 -05:00 · 2015-07-03 14:39:24 -05:00 · fc9b61e8ac
commit fc9b61e8ac
parent f4a31b3e0b
155 changed files with 156 additions and 312 deletions
--- a/audio/music/bikeriding.asm
+++ b/audio/music/bikeriding.asm
@ -702,4 +702,3 @@ Music_BikeRiding_branch_7dec2::
 	triangle3 1
 	triangle3 1
 	endchannel
-; 0x7ded1
--- a/audio/music/celadon.asm
+++ b/audio/music/celadon.asm
@ -409,4 +409,3 @@ Music_Celadon_branch_b7c1::
 	F# 2
 	E_ 2
 	loopchannel 0, Music_Celadon_branch_b7c1
-; 0xb86d
--- a/audio/music/cinnabar.asm
+++ b/audio/music/cinnabar.asm
@ -352,4 +352,3 @@ Music_Cinnabar_branch_b93f::
 	C_ 1
 	rest 1
 	loopchannel 0, Music_Cinnabar_branch_b93f
-; 0xb9eb
--- a/audio/music/cinnabarmansion.asm
+++ b/audio/music/cinnabarmansion.asm
@ -170,4 +170,3 @@ Music_CinnabarMansion_branch_7edb5::
 	rest 8
 	cymbal3 8
 	loopchannel 0, Music_CinnabarMansion_branch_7edb5
-; 0x7edda
--- a/audio/music/cities1.asm
+++ b/audio/music/cities1.asm
@ -655,4 +655,3 @@ Music_Cities1_branch_ad6e::
 	triangle2 2
 	triangle2 2
 	endchannel
-; 0xad77
--- a/audio/music/cities2.asm
+++ b/audio/music/cities2.asm
@ -414,4 +414,3 @@ Music_Cities2_branch_b64c::
 	E_ 2
 	G# 2
 	loopchannel 0, Music_Cities2_branch_b64c
-; 0xb6c7
--- a/audio/music/credits.asm
+++ b/audio/music/credits.asm
@ -818,4 +818,3 @@ Music_Credits_branch_7ffed::
 	A_ 1
 	rest 3
 	endchannel
-; 0x7fffa
--- a/audio/music/defeatedgymleader.asm
+++ b/audio/music/defeatedgymleader.asm
@ -605,4 +605,3 @@ Music_DefeatedGymLeader_branch_23e65::
 	G_ 2
 	E_ 2
 	loopchannel 0, Music_DefeatedGymLeader_branch_23e65
-; 0x23f52
--- a/audio/music/defeatedtrainer.asm
+++ b/audio/music/defeatedtrainer.asm
@ -264,4 +264,3 @@ Music_DefeatedTrainer_branch_23b24::
 	octave 4
 	A_ 3
 	loopchannel 0, Music_DefeatedTrainer_branch_23b24
-; 0x23b74
--- a/audio/music/defeatedwildmon.asm
+++ b/audio/music/defeatedwildmon.asm
@ -300,4 +300,3 @@ Music_DefeatedWildMon_branch_23c21::
 	octave 4
 	D# 4
 	loopchannel 0, Music_DefeatedWildMon_branch_23c21
-; 0x23cad
--- a/audio/music/dungeon1.asm
+++ b/audio/music/dungeon1.asm
@ -673,4 +673,3 @@ Music_Dungeon1_branch_7e202::
 	snare8 4
 	snare9 4
 	endchannel
-; 0x7e20b
--- a/audio/music/dungeon2.asm
+++ b/audio/music/dungeon2.asm
@ -315,4 +315,3 @@ Music_Dungeon2_branch_7e9dd::
 	snare9 4
 	snare7 4
 	loopchannel 0, Music_Dungeon2_branch_7e9dd
-; 0x7e9f1
--- a/audio/music/dungeon3.asm
+++ b/audio/music/dungeon3.asm
@ -754,4 +754,3 @@ Music_Dungeon3_Ch4:: ; 7ece4 (1f:6ce4)
 	rest 16
 	rest 10
 	endchannel
-; 0x7ed0f
--- a/audio/music/finalbattle.asm
+++ b/audio/music/finalbattle.asm
@ -1342,4 +1342,3 @@ Music_FinalBattle_branch_2396c::
 	octave 5
 	E_ 2
 	endchannel
-; 0x2397d
--- a/audio/music/gamecorner.asm
+++ b/audio/music/gamecorner.asm
@ -625,4 +625,3 @@ Music_GameCorner_branch_7e4ab::
 	A_ 1
 	rest 1
 	endchannel
-; 0x7e4c0
--- a/audio/music/gym.asm
+++ b/audio/music/gym.asm
@ -355,4 +355,3 @@ Music_Gym_branch_be4d::
 	F_ 2
 	A# 2
 	endchannel
-; 0xbe56
--- a/audio/music/gymleaderbattle.asm
+++ b/audio/music/gymleaderbattle.asm
@ -1398,4 +1398,3 @@ Music_GymLeaderBattle_branch_227b1::
 	octave 4
 	G_ 6
 	loopchannel 0, Music_GymLeaderBattle_branch_227b1
-; 0x22919
--- a/audio/music/halloffame.asm
+++ b/audio/music/halloffame.asm
@ -94,4 +94,3 @@ Music_HallOfFame_branch_7fbfe::
 	E_ 4
 	G_ 4
 	loopchannel 0, Music_HallOfFame_Ch3
-; 0x7fc1f
--- a/audio/music/indigoplateau.asm
+++ b/audio/music/indigoplateau.asm
@ -319,4 +319,3 @@ Music_IndigoPlateau_branch_a7a8::
 	mutedsnare3 1
 	mutedsnare3 1
 	endchannel
-; 0xa7c5
--- a/audio/music/introbattle.asm
+++ b/audio/music/introbattle.asm
@ -327,4 +327,3 @@ Music_IntroBattle_Ch4:: ; 7f95b (1f:795b)
 	rest 16
 	rest 14
 	endchannel
-; 0x7fa19
--- a/audio/music/jigglypuffsong.asm
+++ b/audio/music/jigglypuffsong.asm
@ -38,4 +38,3 @@ Music_JigglypuffSong_Ch2:: ; 7fb9a (1f:7b9a)
 	G# 4
 	E_ 10
 	endchannel
-; 0x7fbaf
--- a/audio/music/lavender.asm
+++ b/audio/music/lavender.asm
@ -197,4 +197,3 @@ Music_Lavender_branch_bc26::
 	triangle2 8
 	triangle2 8
 	loopchannel 0, Music_Lavender_branch_bc26
-; 0xbc2e
--- a/audio/music/meeteviltrainer.asm
+++ b/audio/music/meeteviltrainer.asm
@ -78,4 +78,3 @@ Music_MeetEvilTrainer_branch_7f6ee::
 	rest 3
 	A# 4
 	loopchannel 0, Music_MeetEvilTrainer_branch_7f6ee
-; 0x7f6f9
--- a/audio/music/meetfemaletrainer.asm
+++ b/audio/music/meetfemaletrainer.asm
@ -116,4 +116,3 @@ Music_MeetFemaleTrainer_branch_7f770::
 	F# 1
 	rest 1
 	endchannel
-; 0x7f77b
--- a/audio/music/meetmaletrainer.asm
+++ b/audio/music/meetmaletrainer.asm
@ -188,4 +188,3 @@ Music_MeetMaleTrainer_branch_7f7ea::
 	D# 1
 	rest 1
 	loopchannel 0, Music_MeetMaleTrainer_branch_7f7ea
-; 0x7f844
--- a/audio/music/meetprofoak.asm
+++ b/audio/music/meetprofoak.asm
@ -421,4 +421,3 @@ Music_MeetProfOak_branch_b101::
 	rest 1
 	loopchannel 2, Music_MeetProfOak_branch_b101
 	loopchannel 0, Music_MeetProfOak_branch_b0bc
-; 0xb119
--- a/audio/music/meetrival.asm
+++ b/audio/music/meetrival.asm
@ -394,4 +394,3 @@ Music_MeetRival_branch_b2b5::
 	G_ 1
 	rest 1
 	loopchannel 0, Music_MeetRival_branch_b24b
-; 0xb2c8
--- a/audio/music/museumguy.asm
+++ b/audio/music/museumguy.asm
@ -335,4 +335,3 @@ Music_MuseumGuy_branch_aee1::
 	mutedsnare3 1
 	mutedsnare3 1
 	loopchannel 0, Music_MuseumGuy_branch_aee1
-; 0xaf59
--- a/audio/music/oakslab.asm
+++ b/audio/music/oakslab.asm
@ -391,4 +391,3 @@ Music_OaksLab_branch_7ef5c::
 	E_ 1
 	rest 3
 	loopchannel 0, Music_OaksLab_branch_7ef5c
-; 0x7f04a
--- a/audio/music/pallettown.asm
+++ b/audio/music/pallettown.asm
@ -312,4 +312,3 @@ Music_PalletTown_branch_a8e3::
 	F# 8
 	loopchannel 0, Music_PalletTown_branch_a8e3
 	endchannel
-; 0xa913
--- a/audio/music/pkmnhealed.asm
+++ b/audio/music/pkmnhealed.asm
@ -45,4 +45,3 @@ Music_PkmnHealed_Ch3:: ; 9bd2 (2:5bd2)
 	E_ 6
 	rest 2
 	endchannel
-; 0x9bde
--- a/audio/music/pokecenter.asm
+++ b/audio/music/pokecenter.asm
@ -373,4 +373,3 @@ Music_Pokecenter_branch_bfeb::
 	F# 2
 	A_ 2
 	endchannel
-; 0xbff4
--- a/audio/music/pokemontower.asm
+++ b/audio/music/pokemontower.asm
@ -456,4 +456,3 @@ Music_PokemonTower_branch_7f1a2::
 	D# 1
 	rest 1
 	loopchannel 0, Music_PokemonTower_branch_7f1a2
-; 0x7f243
--- a/audio/music/routes1.asm
+++ b/audio/music/routes1.asm
@ -402,4 +402,3 @@ Music_Routes1_Ch4:: ; 9d24 (2:5d24)
 	mutedsnare1 2
 	loopchannel 0, Music_Routes1_Ch4
 	endchannel
-; 0x9db9
--- a/audio/music/routes2.asm
+++ b/audio/music/routes2.asm
@ -423,4 +423,3 @@ Music_Routes2_Ch4:: ; 9f08 (2:5f08)
 	rest 3
 	loopchannel 0, Music_Routes2_Ch4
 	endchannel
-; 0x9fad
--- a/audio/music/routes3.asm
+++ b/audio/music/routes3.asm
@ -513,4 +513,3 @@ Music_Routes3_branch_a17a::
 	mutedsnare3 1
 	mutedsnare3 1
 	loopchannel 0, Music_Routes3_branch_a17a
-; 0xa26a
--- a/audio/music/routes4.asm
+++ b/audio/music/routes4.asm
@ -679,4 +679,3 @@ Music_Routes4_branch_a4a8::
 	mutedsnare2 2
 	mutedsnare2 2
 	loopchannel 0, Music_Routes4_branch_a4a8
-; 0xa5f0
--- a/audio/music/safarizone.asm
+++ b/audio/music/safarizone.asm
@ -109,4 +109,3 @@ Music_SafariZone_branch_bca5::
 	A_ 2
 	rest 2
 	endchannel
-; 0xbcbb
--- a/audio/music/silphco.asm
+++ b/audio/music/silphco.asm
@ -998,4 +998,3 @@ Music_SilphCo_branch_7f5c9::
 	E_ 4
 	F_ 4
 	loopchannel 0, Music_SilphCo_branch_7f5c9
-; 0x7f69d
--- a/audio/music/ssanne.asm
+++ b/audio/music/ssanne.asm
@ -336,4 +336,3 @@ Music_SSAnne_Ch3:: ; b4cb (2:74cb)
 	G# 8
 	B_ 8
 	loopchannel 0, Music_SSAnne_Ch3
-; 0xb504
--- a/audio/music/surfing.asm
+++ b/audio/music/surfing.asm
@ -333,4 +333,3 @@ Music_Surfing_branch_7fb03::
 	D_ 2
 	E_ 2
 	loopchannel 0, Music_Surfing_branch_7fb03
-; 0x7fb7d
--- a/audio/music/titlescreen.asm
+++ b/audio/music/titlescreen.asm
@ -675,4 +675,3 @@ Music_TitleScreen_branch_7e842::
 	snare2 1
 	rest 3
 	endchannel
-; 0x7e850
--- a/audio/music/trainerbattle.asm
+++ b/audio/music/trainerbattle.asm
@ -1855,4 +1855,3 @@ Music_TrainerBattle_branch_22d9c::
 	D_ 2
 	C_ 2
 	loopchannel 0, Music_TrainerBattle_branch_22d9c
-; 0x23099
--- a/audio/music/unusedsong.asm
+++ b/audio/music/unusedsong.asm
@ -336,4 +336,3 @@ Music_UnusedSong_branch_a9d8::
 	rest 6
 	loopchannel 0, Music_UnusedSong_branch_a9d8
 	endchannel
-; 0xaa6f
--- a/audio/music/vermilion.asm
+++ b/audio/music/vermilion.asm
@ -321,4 +321,3 @@ Music_Vermilion_branch_bb3f::
 	triangle1 1
 	triangle1 1
 	endchannel
-; 0xbb58
--- a/audio/music/wildbattle.asm
+++ b/audio/music/wildbattle.asm
@ -736,4 +736,3 @@ Music_WildBattle_branch_232d8::
 	C# 2
 	G# 2
 	loopchannel 0, Music_WildBattle_branch_232d8
-; 0x233a6
--- a/audio/music/yellow/meetjessiejames.asm
+++ b/audio/music/yellow/meetjessiejames.asm
@ -307,4 +307,3 @@ Music_MeetJessieJames_branch_83235::
 	rest 1
 	loopchannel 0, Music_MeetJessieJames_branch_83235
 	endchannel
-; 0x832ba
--- a/audio/music/yellow/surfingpikachu.asm
+++ b/audio/music/yellow/surfingpikachu.asm
@ -688,4 +688,3 @@ Music_SurfingPikachu_branch_82ea0::
 	D# 1
 	rest 1
 	loopchannel 0, Music_SurfingPikachu_branch_82ea0
-; 0x82fbe
--- a/audio/music/yellow/yellowintro.asm
+++ b/audio/music/yellow/yellowintro.asm
@ -482,4 +482,3 @@ Music_YellowIntro_Ch3:: ; 7f749 (1f:7749)
 	E_ 1
 	rest 15
 	endchannel
-; 0x7f860
--- a/audio/music/yellow/yellowunusedsong.asm
+++ b/audio/music/yellow/yellowunusedsong.asm
@ -324,4 +324,3 @@ Music_YellowUnusedSong_branch_830c3::
 	snare3 4
 	snare3 4
 	loopchannel 0, Music_YellowUnusedSong_branch_830c3
-; 0x8316d