Remove even more address comments

That should be all of them this time

audio/music_pointers.asm

@@ -3,109 +3,109 @@
 Music:
 ; entries correspond to MUSIC_* constants
 
-	dba Music_Nothing ; 0xe91a3
-	dba Music_TitleScreen ; 0xeb808
-	dba Music_Route1 ; 0xec000
-	dba Music_Route3 ; 0xec2ca
-	dba Music_Route12 ; 0xec506
-	dba Music_MagnetTrain ; 0xef5f0
-	dba Music_KantoGymBattle ; 0xec720
-	dba Music_KantoTrainerBattle ; 0xec9fa
-	dba Music_KantoWildBattle ; 0xed06d
-	dba Music_PokemonCenter ; 0xed5c6
-	dba Music_LookHiker ; 0xf7411
-	dba Music_LookLass ; 0xed79b
-	dba Music_LookOfficer ; 0xed82d
-	dba Music_HealPokemon ; 0xf0697
-	dba Music_LavenderTown ; 0xef72f
-	dba Music_Route2 ; 0xed8dd
-	dba Music_MtMoon ; 0xedb29
-	dba Music_ShowMeAround ; 0xedbd8
-	dba Music_GameCorner ; 0xedd6d
-	dba Music_Bicycle ; 0xee119
-	dba Music_HallOfFame ; 0xf05bf
-	dba Music_ViridianCity ; 0xf4000
-	dba Music_CeladonCity ; 0xf435b
-	dba Music_TrainerVictory ; 0xebeab
-	dba Music_WildPokemonVictory ; 0xf4518
-	dba Music_GymLeaderVictory ; 0xf462c
-	dba Music_MtMoonSquare ; 0xf4815
-	dba Music_Gym ; 0xf48ae
-	dba Music_PalletTown ; 0xf4b0c
-	dba Music_ProfOaksPokemonTalk ; 0xf4c9f
-	dba Music_ProfOak ; 0xf4dea
-	dba Music_LookRival ; 0xf4f79
-	dba Music_AfterTheRivalFight ; 0xf5127
-	dba Music_Surf ; 0xf518a
-	dba Music_Evolution ; 0xf06e1
-	dba Music_NationalPark ; 0xf54e8
-	dba Music_Credits ; 0x1f31c
-	dba Music_AzaleaTown ; 0xf57e8
-	dba Music_CherrygroveCity ; 0xf5b03
-	dba Music_LookKimonoGirl ; 0xf79b8
-	dba Music_UnionCave ; 0xf5c60
-	dba Music_JohtoWildBattle ; 0xf5dc5
-	dba Music_JohtoTrainerBattle ; 0xf6096
-	dba Music_Route30 ; 0xefc01
-	dba Music_EcruteakCity ; 0xef2d0
-	dba Music_VioletCity ; 0xf0000
-	dba Music_JohtoGymBattle ; 0xea50d
-	dba Music_ChampionBattle ; 0xea9c1
-	dba Music_RivalBattle ; 0xe974f
-	dba Music_RocketBattle ; 0xe9b6f
-	dba Music_ElmsLab ; 0xea040
-	dba Music_DarkCave ; 0xea2be
-	dba Music_Route29 ; 0xf0386
-	dba Music_Route36 ; 0xe94e9
-	dba Music_SSAqua ; 0xead99
-	dba Music_LookYoungster ; 0xf66c3
-	dba Music_LookBeauty ; 0xeee3e
-	dba Music_LookRocket ; 0xf74a2
-	dba Music_LookPokemaniac ; 0xebde1
-	dba Music_LookSage ; 0xee35e
-	dba Music_NewBarkTown ; 0xeb2d3
-	dba Music_GoldenrodCity ; 0xeb453
-	dba Music_VermilionCity ; 0xeb676
-	dba Music_PokemonChannel ; 0xee45f
-	dba Music_PokeFluteChannel ; 0xf7b13
-	dba Music_TinTower ; 0xf6811
-	dba Music_SproutTower ; 0xf6974
-	dba Music_BurnedTower ; 0xf6a99
-	dba Music_Lighthouse ; 0xee569
-	dba Music_LakeOfRage ; 0xee6c5
-	dba Music_IndigoPlateau ; 0xee852
-	dba Music_Route37 ; 0xee94b
-	dba Music_RocketHideout ; 0xeeb75
-	dba Music_DragonsDen ; 0xeece8
-	dba Music_JohtoWildBattleNight ; 0xf605c
-	dba Music_RuinsOfAlphRadio ; 0xeedcb
-	dba Music_SuccessfulCapture ; 0xf4602
-	dba Music_Route26 ; 0xeefb2
-	dba Music_Mom ; 0xf6bf2
-	dba Music_VictoryRoad ; 0xf6c72
-	dba Music_PokemonLullaby ; 0xf6d79
-	dba Music_PokemonMarch ; 0xf6e23
-	dba Music_GoldSilverOpening ; 0xf7055
-	dba Music_GoldSilverOpening2 ; 0xf7308
-	dba Music_MainMenu ; 0xf78fd
-	dba Music_RuinsOfAlphInterior ; 0xebd9e
-	dba Music_RocketTheme ; 0xf766d
-	dba Music_DancingHall ; 0xef9bc
-	dba Music_ContestResults ; 0xefb3e
-	dba Music_BugCatchingContest ; 0xf7c16
-	dba Music_LakeOfRageRocketRadio ; 0xef5b1
-	dba Music_Printer ; 0xf07fd
-	dba Music_PostCredits ; 0xcfd9e
+	dba Music_Nothing
+	dba Music_TitleScreen
+	dba Music_Route1
+	dba Music_Route3
+	dba Music_Route12
+	dba Music_MagnetTrain
+	dba Music_KantoGymBattle
+	dba Music_KantoTrainerBattle
+	dba Music_KantoWildBattle
+	dba Music_PokemonCenter
+	dba Music_LookHiker
+	dba Music_LookLass
+	dba Music_LookOfficer
+	dba Music_HealPokemon
+	dba Music_LavenderTown
+	dba Music_Route2
+	dba Music_MtMoon
+	dba Music_ShowMeAround
+	dba Music_GameCorner
+	dba Music_Bicycle
+	dba Music_HallOfFame
+	dba Music_ViridianCity
+	dba Music_CeladonCity
+	dba Music_TrainerVictory
+	dba Music_WildPokemonVictory
+	dba Music_GymLeaderVictory
+	dba Music_MtMoonSquare
+	dba Music_Gym
+	dba Music_PalletTown
+	dba Music_ProfOaksPokemonTalk
+	dba Music_ProfOak
+	dba Music_LookRival
+	dba Music_AfterTheRivalFight
+	dba Music_Surf
+	dba Music_Evolution
+	dba Music_NationalPark
+	dba Music_Credits
+	dba Music_AzaleaTown
+	dba Music_CherrygroveCity
+	dba Music_LookKimonoGirl
+	dba Music_UnionCave
+	dba Music_JohtoWildBattle
+	dba Music_JohtoTrainerBattle
+	dba Music_Route30
+	dba Music_EcruteakCity
+	dba Music_VioletCity
+	dba Music_JohtoGymBattle
+	dba Music_ChampionBattle
+	dba Music_RivalBattle
+	dba Music_RocketBattle
+	dba Music_ElmsLab
+	dba Music_DarkCave
+	dba Music_Route29
+	dba Music_Route36
+	dba Music_SSAqua
+	dba Music_LookYoungster
+	dba Music_LookBeauty
+	dba Music_LookRocket
+	dba Music_LookPokemaniac
+	dba Music_LookSage
+	dba Music_NewBarkTown
+	dba Music_GoldenrodCity
+	dba Music_VermilionCity
+	dba Music_PokemonChannel
+	dba Music_PokeFluteChannel
+	dba Music_TinTower
+	dba Music_SproutTower
+	dba Music_BurnedTower
+	dba Music_Lighthouse
+	dba Music_LakeOfRage
+	dba Music_IndigoPlateau
+	dba Music_Route37
+	dba Music_RocketHideout
+	dba Music_DragonsDen
+	dba Music_JohtoWildBattleNight
+	dba Music_RuinsOfAlphRadio
+	dba Music_SuccessfulCapture
+	dba Music_Route26
+	dba Music_Mom
+	dba Music_VictoryRoad
+	dba Music_PokemonLullaby
+	dba Music_PokemonMarch
+	dba Music_GoldSilverOpening
+	dba Music_GoldSilverOpening2
+	dba Music_MainMenu
+	dba Music_RuinsOfAlphInterior
+	dba Music_RocketTheme
+	dba Music_DancingHall
+	dba Music_ContestResults
+	dba Music_BugCatchingContest
+	dba Music_LakeOfRageRocketRadio
+	dba Music_Printer
+	dba Music_PostCredits
 
 ; Crystal adds the following songs:
 
-	dba Music_Clair ; 0x1fa8d
-	dba Music_MobileAdapterMenu ; 0x17801f
-	dba Music_MobileAdapter ; 0x1fc87
-	dba Music_BuenasPassword ; 0x178153
-	dba Music_LookMysticalMan ; 0x17843b
-	dba Music_CrystalOpening ; 0x1786e8
-	dba Music_BattleTowerTheme ; 0x178889
-	dba Music_SuicuneBattle ; 0x178b81
-	dba Music_BattleTowerLobby ; 0x17948b
-	dba Music_MobileCenter ; 0x17961d
+	dba Music_Clair
+	dba Music_MobileAdapterMenu
+	dba Music_MobileAdapter
+	dba Music_BuenasPassword
+	dba Music_LookMysticalMan
+	dba Music_CrystalOpening
+	dba Music_BattleTowerTheme
+	dba Music_SuicuneBattle
+	dba Music_BattleTowerLobby
+	dba Music_MobileCenter

data/events/pokedex_ratings.asm

@@ -3,7 +3,7 @@ rating: MACRO
 	dbww \1, \2, \3
 ENDM
 
-OakRatings: ; 0x2667f
+OakRatings:
 ; if you caught at most this many, play this sound, load this text
 ; (text is defined in engine/events/prof_oaks_pc.asm)
 	rating   9, SFX_DEX_FANFARE_LESS_THAN_20, OakRating01
@@ -25,5 +25,4 @@ OakRatings: ; 0x2667f
 	rating 239, SFX_DEX_FANFARE_230_PLUS,     OakRating17
 	rating 248, SFX_DEX_FANFARE_230_PLUS,     OakRating18
 	rating 255, SFX_DEX_FANFARE_230_PLUS,     OakRating19
- ; 0x266de
  

data/events/unown_walls.asm

@@ -31,7 +31,7 @@ UnownWalls:
 	; db      $0e, $2c, $64, $2c, $0e, -1
 	unownwall "H", "O", "-", "O", "H"
 
-MenuHeaders_UnownWalls: ; 0x8aed5
+MenuHeaders_UnownWalls:
 ; UNOWNWORDS_ESCAPE
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 3, 4, 16, 9

data/maps/landmarks.asm

@@ -4,7 +4,7 @@ landmark: MACRO
 	dw \3
 ENDM
 
-Landmarks: ; 0x1ca8c3
+Landmarks:
 ; entries correspond to constants/landmark_constants.asm
 	landmark   0,   0, SpecialMapName
 	landmark 148, 116, NewBarkTownName
@@ -102,7 +102,6 @@ Landmarks: ; 0x1ca8c3
 	landmark  20, 116, TohjoFallsName
 	landmark  28,  84, Route28Name
 	landmark 148, 132, FastShipName
-; 0x1caa43
 
 NewBarkTownName:     db "NEW BARK¯TOWN@"
 CherrygroveCityName: db "CHERRYGROVE¯CITY@"

data/maps/spawn_points.asm

@@ -4,7 +4,7 @@ spawn: MACRO
 	db \2, \3
 ENDM
 
-SpawnPoints: ; 0x152ab
+SpawnPoints:
 ; entries correspond to SPAWN_* constants
 
 	spawn PLAYERS_HOUSE_2F,            3,  3

data/phone/text/bill.asm

@@ -1,4 +1,4 @@
-BillPhoneMornGreetingText: ; 0x1b4427
+BillPhoneMornGreetingText:
 	text "Good morning!"
 
 	para "This is the #-"
@@ -8,7 +8,7 @@ BillPhoneMornGreetingText: ; 0x1b4427
 	line "SERVICE."
 	done
 
-BillPhoneDayGreetingText: ; 0x1b4470
+BillPhoneDayGreetingText:
 	text "Good day!"
 
 	para "This is the #-"
@@ -18,7 +18,7 @@ BillPhoneDayGreetingText: ; 0x1b4470
 	line "SERVICE."
 	done
 
-BillPhoneNiteGreetingText: ; 0x1b44b5
+BillPhoneNiteGreetingText:
 	text "Good evening!"
 
 	para "This is the #-"
@@ -28,7 +28,7 @@ BillPhoneNiteGreetingText: ; 0x1b44b5
 	line "SERVICE."
 	done
 
-BillPhoneGenericText: ; 0x1b44fe
+BillPhoneGenericText:
 	text "Who's calling?"
 
 	para "<PLAY_G>, is it?"
@@ -38,7 +38,7 @@ BillPhoneGenericText: ; 0x1b44fe
 	line $56
 	done
 
-BillPhoneNotFullText: ; 0x1b452a
+BillPhoneNotFullText:
 	text "Thanks for"
 	line "waiting!"
 
@@ -52,7 +52,7 @@ BillPhoneNotFullText: ; 0x1b452a
 	line "fill it up!"
 	done
 
-BillPhoneNearlyFullText: ; 0x1b4587
+BillPhoneNearlyFullText:
 	text "Thanks for"
 	line "waiting!"
 
@@ -66,7 +66,7 @@ BillPhoneNearlyFullText: ; 0x1b4587
 	line "switch your BOX."
 	done
 
-BillPhoneFullText: ; 0x1b45ed
+BillPhoneFullText:
 	text "Thanks for"
 	line "waiting!"
 
@@ -80,7 +80,7 @@ BillPhoneFullText: ; 0x1b45ed
 	line "more #MON."
 	done
 
-BillPhoneNewlyFullText: ; 0x1b4652
+BillPhoneNewlyFullText:
 	text "Hi, <PLAY_G>?"
 	line "It's me, BILL!"
 

data/phone/text/buena.asm

@@ -1,4 +1,4 @@
-UnknownText_0xa0c28: ; 0xa0c28
+UnknownText_0xa0c28:
 	text "Hi, this is BUENA…"
 
 	para "Oh! Good morning,"
@@ -7,18 +7,16 @@ UnknownText_0xa0c28: ; 0xa0c28
 	para "I'm kind of foggy"
 	line "in the morning…"
 	done
-; 0xa0c72
 
-UnknownText_0xa0c72: ; 0xa0c72
+UnknownText_0xa0c72:
 	text "Hi, this is BUENA…"
 	line "Oh! Hi, <PLAY_G>!"
 
 	para "Do you tune into"
 	line "BUENA's show?"
 	done
-; 0xa0caf
 
-UnknownText_0xa0caf: ; 0xa0caf
+UnknownText_0xa0caf:
 	text "This is BUENA."
 	line "I can't come to"
 
@@ -34,9 +32,8 @@ UnknownText_0xa0caf: ; 0xa0caf
 	para "give me a call"
 	line "after midnight!"
 	done
-; 0xa0d42
 
-UnknownText_0xa0d42: ; 0xa0d42
+UnknownText_0xa0d42:
 	text "Hi, this is BUENA…"
 	line "Oh! Hi, <PLAY_G>!"
 
@@ -46,45 +43,40 @@ UnknownText_0xa0d42: ; 0xa0d42
 	para "Let me tell you,"
 	line "I'm exhausted!"
 	done
-; 0xa0d96
 
-UnknownText_0xa0d96: ; 0xa0d96
+UnknownText_0xa0d96:
 	text "<PLAY_G>!"
 	line "Hi, it's BUENA!"
 
 	para "I got up early, so"
 	line "I decided to call!"
 	done
-; 0xa0dcf
 
-UnknownText_0xa0dcf: ; 0xa0dcf
+UnknownText_0xa0dcf:
 	text "<PLAY_G>!"
 	line "Hi, it's BUENA!"
 
 	para "I needed someone"
 	line "to chat with!"
 	done
-; 0xa0e01
 
-UnknownText_0xa0e01: ; 0xa0e01
+UnknownText_0xa0e01:
 	text "<PLAY_G>!"
 	line "Hi, it's BUENA!"
 
 	para "I'm just on my"
 	line "break."
 	done
-; 0xa0e29
 
-UnknownText_0xa0e29: ; 0xa0e29
+UnknownText_0xa0e29:
 	text "<PLAY_G>!"
 	line "Hi, it's BUENA!"
 
 	para "I couldn't sleep,"
 	line "so I called you."
 	done
-; 0xa0e5e
 
-UnknownText_0xa0e5e: ; 0xa0e5e
+UnknownText_0xa0e5e:
 	text "Oh. Hi, <PLAY_G>!"
 
 	para "You are how?"
@@ -101,9 +93,8 @@ UnknownText_0xa0e5e: ; 0xa0e5e
 	para "<PLAY_G>, you'd"
 	line "better be careful!"
 	done
-; 0xa0efb
 
-UnknownText_0xa0efb: ; 0xa0efb
+UnknownText_0xa0efb:
 	text "The other day, I"
 	line "went out to eat"
 
@@ -125,9 +116,8 @@ UnknownText_0xa0efb: ; 0xa0efb
 	para "show! I'll catch"
 	line "you later!"
 	done
-; 0xa0fcf
 
-UnknownText_0xa0fcf: ; 0xa0fcf
+UnknownText_0xa0fcf:
 	text "You know the"
 	line "receptionist at"
 	cont "the RADIO TOWER?"
@@ -149,9 +139,8 @@ UnknownText_0xa0fcf: ; 0xa0fcf
 
 	para "Catch you later!"
 	done
-; 0xa109d
 
-UnknownText_0xa109d: ; 0xa109d
+UnknownText_0xa109d:
 	text "Tell me, <PLAY_G>."
 	line "Have you ever won"
 
@@ -167,9 +156,8 @@ UnknownText_0xa109d: ; 0xa109d
 
 	para "Let's chat again!"
 	done
-; 0xa1143
 
-UnknownText_0xa1143: ; 0xa1143
+UnknownText_0xa1143:
 	text "You know, last"
 	line "night…"
 
@@ -198,9 +186,8 @@ UnknownText_0xa1143: ; 0xa1143
 	para "Uh… Um… I… Sorry,"
 	line "wrong number!"
 	done
-; 0xa1244
 
-UnknownText_0xa1244: ; 0xa1244
+UnknownText_0xa1244:
 	text "Yesterday, PROF."
 	line "OAK was in the"
 
@@ -221,9 +208,8 @@ UnknownText_0xa1244: ; 0xa1244
 
 	para "Catch you later!"
 	done
-; 0xa1318
 
-UnknownText_0xa1318: ; 0xa1318
+UnknownText_0xa1318:
 	text "…Cough, cough!"
 
 	para "Uhm sorry uh got"
@@ -242,9 +228,8 @@ UnknownText_0xa1318: ; 0xa1318
 	line "the fly. This has"
 	cont "been BUENA!"
 	done
-; 0xa13d8
 
-UnknownText_0xa13d8: ; 0xa13d8
+UnknownText_0xa13d8:
 	text "Hey, <PLAY_G>."
 	line "You won that RADIO"
 
@@ -263,9 +248,8 @@ UnknownText_0xa13d8: ; 0xa13d8
 	para "Well, let's chat"
 	line "again!"
 	done
-; 0xa1488
 
-UnknownText_0xa1488: ; 0xa1488
+UnknownText_0xa1488:
 	text "I'm elated that"
 	line "more people are"
 
@@ -298,9 +282,8 @@ UnknownText_0xa1488: ; 0xa1488
 
 	para "Let's chat again!"
 	done
-; 0xa15de
 
-UnknownText_0xa15de: ; 0xa15de
+UnknownText_0xa15de:
 	text "Guess what?"
 	line "The RADIO TOWER's"
 
@@ -331,9 +314,8 @@ UnknownText_0xa15de: ; 0xa15de
 	para "Later! Tune into"
 	line "my show!"
 	done
-; 0xa1717
 
-UnknownText_0xa1717: ; 0xa1717
+UnknownText_0xa1717:
 	text "<PLAY_G>, tell me."
 
 	para "When do you relax"
@@ -364,9 +346,8 @@ UnknownText_0xa1717: ; 0xa1717
 	para "Please forget this"
 	line "happened! Later!"
 	done
-; 0xa183d
 
-UnknownText_0xa183d: ; 0xa183d
+UnknownText_0xa183d:
 	text "<PLAY_G>, what was"
 	line "the first #MON"
 	cont "you ever caught?"
@@ -405,9 +386,8 @@ UnknownText_0xa183d: ; 0xa183d
 
 	para "Bye-bye!"
 	done
-; 0xa19b1
 
-UnknownText_0xa19b1: ; 0xa19b1
+UnknownText_0xa19b1:
 	text "Guess what? All of"
 	line "us from the RADIO"
 
@@ -434,9 +414,8 @@ UnknownText_0xa19b1: ; 0xa19b1
 
 	para "Bye-bye!"
 	done
-; 0xa1ac0
 
-UnknownText_0xa1ac0: ; 0xa1ac0
+UnknownText_0xa1ac0:
 	text "Did you know…?"
 
 	para "BEN and FERN talk"
@@ -465,9 +444,8 @@ UnknownText_0xa1ac0: ; 0xa1ac0
 
 	para "Let's chat again!"
 	done
-; 0xa1bed
 
-UnknownText_0xa1bed: ; 0xa1bed
+UnknownText_0xa1bed:
 	text "I'm going shopping"
 	line "with MARY and LILY"
 	cont "soon."
@@ -483,9 +461,8 @@ UnknownText_0xa1bed: ; 0xa1bed
 
 	para "Catch you later!"
 	done
-; 0xa1c88
 
-UnknownText_0xa1c88: ; 0xa1c88
+UnknownText_0xa1c88:
 	text "I'm thinking of"
 	line "going to the GAME"
 
@@ -506,9 +483,8 @@ UnknownText_0xa1c88: ; 0xa1c88
 
 	para "Catch you later!"
 	done
-; 0xa1d5f
 
-UnknownText_0xa1d5f: ; 0xa1d5f
+UnknownText_0xa1d5f:
 	text "Hey, <PLAY_G>. You"
 	line "use your #GEAR"
 
@@ -530,9 +506,8 @@ UnknownText_0xa1d5f: ; 0xa1d5f
 	para "Anyway, thanks for"
 	line "calling! Later!"
 	done
-; 0xa1e2f
 
-UnknownText_0xa1e2f: ; 0xa1e2f
+UnknownText_0xa1e2f:
 	text "Is it sunny"
 	line "outside today?"
 
@@ -547,4 +522,3 @@ UnknownText_0xa1e2f: ; 0xa1e2f
 
 	para "Please call again!"
 	done
-; 0xa1eca

data/phone/text/elm.asm

@@ -1,4 +1,4 @@
-ElmPhoneStartText: ; 0x1b46fc
+ElmPhoneStartText:
 	text "Hello, <PLAY_G>?"
 
 	para "Try not to overdo"
@@ -9,7 +9,7 @@ ElmPhoneStartText: ; 0x1b46fc
 	cont "they are hurt."
 	done
 
-ElmPhoneSawMrPokemonText: ; 0x1b4749
+ElmPhoneSawMrPokemonText:
 	text "Hello, <PLAY_G>?"
 
 	para "Did you meet MR."
@@ -17,7 +17,7 @@ ElmPhoneSawMrPokemonText: ; 0x1b4749
 	cont "Come back safely!"
 	done
 
-ElmPhonePokemonStolenText: ; 0x1b4784
+ElmPhonePokemonStolenText:
 	text "<PLAY_G>? I'm very"
 	line "upset now."
 
@@ -28,7 +28,7 @@ ElmPhonePokemonStolenText: ; 0x1b4784
 	line "do that?"
 	done
 
-ElmPhoneCheckingEggText: ; 0x1b47d5
+ElmPhoneCheckingEggText:
 	text "Hello, <PLAY_G>?"
 
 	para "We're checking the"
@@ -38,7 +38,7 @@ ElmPhoneCheckingEggText: ; 0x1b47d5
 	line "#MON EGG."
 	done
 
-ElmPhoneAssistantText: ; 0x1b481c
+ElmPhoneAssistantText:
 	text "Hello, <PLAY_G>?"
 
 	para "Did you see my"
@@ -48,7 +48,7 @@ ElmPhoneAssistantText: ; 0x1b481c
 	line "in VIOLET CITY."
 	done
 
-ElmPhoneEggUnhatchedText: ; 0x1b4868
+ElmPhoneEggUnhatchedText:
 	text "Hello, <PLAY_G>?"
 
 	para "How's the EGG? Has"
@@ -58,7 +58,7 @@ ElmPhoneEggUnhatchedText: ; 0x1b4868
 	line "pens, please call."
 	done
 
-ElmPhoneEggHatchedText: ; 0x1b48bb
+ElmPhoneEggHatchedText:
 	text "Hello, <PLAY_G>?"
 	line "How is the EGG?"
 
@@ -70,7 +70,7 @@ ElmPhoneEggHatchedText: ; 0x1b48bb
 	line "me now!"
 	done
 
-ElmPhoneDiscovery1Text: ; 0x1b491f
+ElmPhoneDiscovery1Text:
 	text "Hello, <PLAY_G>?"
 
 	para "I just made a new"
@@ -83,7 +83,7 @@ ElmPhoneDiscovery1Text: ; 0x1b491f
 	line "the #MON."
 	done
 
-ElmPhoneDiscovery2Text: ; 0x1b4982
+ElmPhoneDiscovery2Text:
 	text "Hello, <PLAY_G>?"
 
 	para "It's still a"
@@ -96,7 +96,7 @@ ElmPhoneDiscovery2Text: ; 0x1b4982
 	line "ing that now."
 	done
 
-ElmPhonePokerusText: ; 0x1b49e7
+ElmPhonePokerusText:
 	text "Hello, <PLAY_G>?"
 
 	para "I discovered an"
@@ -129,7 +129,7 @@ ElmPhonePokerusText: ; 0x1b49e7
 	cont "about. Bye!"
 	done
 
-ElmPhoneDisasterText: ; 0x1b4b17
+ElmPhoneDisasterText:
 	text "H-hello? <PLAY_G>?"
 	line "It's a disaster!"
 
@@ -143,7 +143,7 @@ ElmPhoneDisasterText: ; 0x1b4b17
 	line "here now!"
 	done
 
-ElmPhoneEggAssistantText: ; 0x1b4b87
+ElmPhoneEggAssistantText:
 	text "Hello, <PLAY_G>? We"
 	line "discovered some-"
 
@@ -158,7 +158,7 @@ ElmPhoneEggAssistantText: ; 0x1b4b87
 	cont "him?"
 	done
 
-ElmPhoneRocketText: ; 0x1b4c06
+ElmPhoneRocketText:
 	text "<PLAY_G>, how are"
 	line "things going?"
 
@@ -185,7 +185,7 @@ ElmPhoneRocketText: ; 0x1b4c06
 	line "Take care!"
 	done
 
-ElmPhoneGiftText: ; 0x1b4d09
+ElmPhoneGiftText:
 	text "Hello, <PLAY_G>?"
 
 	para "I have something"
@@ -197,7 +197,7 @@ ElmPhoneGiftText: ; 0x1b4d09
 	para "See you later!"
 	done
 
-ElmPhoneUnusedText: ; 0x1b4d5d
+ElmPhoneUnusedText:
 	text "Hello, <PLAY_G>?"
 	line "How's it going?"
 

data/phone/text/mom.asm

@@ -1,11 +1,11 @@
-MomPhoneGreetingText: ; 0x1b4000
+MomPhoneGreetingText:
 	text "Hello?"
 
 	para "Oh, hi, <PLAYER>!"
 	line "Working hard?"
 	done
 
-MomPhoneLandmarkText: ; 0x1b4021
+MomPhoneLandmarkText:
 	text "Oh, so you're in"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -19,7 +19,7 @@ MomPhoneLandmarkText: ; 0x1b4021
 	line "take a look?"
 	done
 
-MomPhoneGenericAreaText: ; 0x1b406b
+MomPhoneGenericAreaText:
 	text "Really, you're in"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -30,7 +30,7 @@ MomPhoneGenericAreaText: ; 0x1b406b
 	cont "of neat, <PLAYER>."
 	done
 
-MomPhoneNewBarkText: ; 0x1b40b1
+MomPhoneNewBarkText:
 	text "What? You're in"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -40,7 +40,7 @@ MomPhoneNewBarkText: ; 0x1b40b1
 	line "sometime!"
 	done
 
-MomPhoneCherrygroveText: ; 0x1b40e4
+MomPhoneCherrygroveText:
 	text "You're visiting"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -50,7 +50,7 @@ MomPhoneCherrygroveText: ; 0x1b40e4
 	line "home for a bit?"
 	done
 
-MomOtherAreaText: ; 0x1b411c
+MomOtherAreaText:
 	text "Wow, you're in"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -60,7 +60,7 @@ MomOtherAreaText: ; 0x1b411c
 	line "#MON quest!"
 	done
 
-MomDeterminedText: ; 0x1b4150
+MomDeterminedText:
 	text "That sounds really"
 	line "tough."
 
@@ -71,7 +71,7 @@ MomDeterminedText: ; 0x1b4150
 	line "be OK, right?"
 	done
 
-MomCheckBalanceText: ; 0x1b41a7
+MomCheckBalanceText:
 	text "By the way, you've"
 	line "saved up ¥@"
 	text_from_ram wStringBuffer3
@@ -81,12 +81,12 @@ MomCheckBalanceText: ; 0x1b41a7
 	line "keep on saving?"
 	done
 
-MomImportantToSaveText: ; 0x1b41ea
+MomImportantToSaveText:
 	text "It's important to"
 	line "save your money."
 	done
 
-MomYoureNotSavingText: ; 0x1b420d
+MomYoureNotSavingText:
 	text "Oh, <PLAYER>,"
 	line "you're not saving"
 
@@ -94,7 +94,7 @@ MomYoureNotSavingText: ; 0x1b420d
 	line "you like to save?"
 	done
 
-MomYouveSavedText: ; 0x1b4249
+MomYouveSavedText:
 	text "By the way, you've"
 	line "saved up ¥@"
 	text_from_ram wStringBuffer3
@@ -104,23 +104,23 @@ MomYouveSavedText: ; 0x1b4249
 	line "saving again?"
 	done
 
-MomOKIllSaveText: ; 0x1b4289
+MomOKIllSaveText:
 	text "OK. I'll save your"
 	line "money."
 	done
 
-MomPhoneWontSaveMoneyText: ; 0x1b42a3
+MomPhoneWontSaveMoneyText:
 	text "OK. I won't save"
 	line "your money."
 	done
 
-MomPhoneHangUpText: ; 0x1b42c0
+MomPhoneHangUpText:
 	text "<PLAYER>, keep it"
 	line "up! I'm rooting"
 	cont "for you, baby!"
 	done
 
-MomPhoneNoPokemonText: ; 0x1b42ea
+MomPhoneNoPokemonText:
 	text "Hello?"
 
 	para "Oh, hi, <PLAYER>!"
@@ -128,7 +128,7 @@ MomPhoneNoPokemonText: ; 0x1b42ea
 	cont "waiting for you?"
 	done
 
-MomPhoneNoPokedexText: ; 0x1b431d
+MomPhoneNoPokedexText:
 	text "Hello?"
 
 	para "Oh, hi, <PLAYER>!"
@@ -138,7 +138,7 @@ MomPhoneNoPokedexText: ; 0x1b431d
 	line "ELM? Be good!"
 	done
 
-MomPhoneNoGymQuestText: ; 0x1b435f
+MomPhoneNoGymQuestText:
 	text "Hello?"
 
 	para "Hi, <PLAYER>! If"
@@ -148,7 +148,7 @@ MomPhoneNoGymQuestText: ; 0x1b435f
 	line "on home, dear."
 	done
 
-MomPhoneLectureText: ; 0x1b43a1
+MomPhoneLectureText:
 	text "Hello?"
 
 	para "…… <PLAYER>?"

data/pokemon/dex_entry_pointers.asm

@@ -1,4 +1,4 @@
-PokedexDataPointerTable: ; 0x44378
+PokedexDataPointerTable:
 ; entries correspond to constants/pokemon_constants.asm
 	dw BulbasaurPokedexEntry
 	dw IvysaurPokedexEntry
@@ -251,4 +251,3 @@ PokedexDataPointerTable: ; 0x44378
 	dw LugiaPokedexEntry
 	dw HoOhPokedexEntry
 	dw CelebiPokedexEntry
-; 0x4456e

data/pokemon/dex_order_alpha.asm

@@ -1,6 +1,6 @@
 ; Every Pokémon sorted alphabetically by name.
 
-AlphabeticalPokedexOrder: ; 0x40c65
+AlphabeticalPokedexOrder:
 	db ABRA
 	db AERODACTYL
 	db AIPOM
@@ -252,4 +252,3 @@ AlphabeticalPokedexOrder: ; 0x40c65
 	db YANMA
 	db ZAPDOS
 	db ZUBAT
-; 0x40d60

data/pokemon/dex_order_new.asm

@@ -1,6 +1,6 @@
 ; Every Pokémon sorted in New Pokédex Order.
 
-NewPokedexOrder: ; 0x40d60
+NewPokedexOrder:
 	db CHIKORITA
 	db BAYLEEF
 	db MEGANIUM
@@ -252,4 +252,3 @@ NewPokedexOrder: ; 0x40d60
 	db MEWTWO
 	db MEW
 	db CELEBI
-; 0x40e5b

data/pokemon/egg_move_pointers.asm

@@ -1,4 +1,4 @@
-EggMovePointers:: ; 0x23b11
+EggMovePointers::
 	dw BulbasaurEggMoves
 	dw NoEggMoves
 	dw NoEggMoves
@@ -254,4 +254,3 @@ endc
 	dw NoEggMoves
 	dw NoEggMoves
 	dw NoEggMoves
-; 0x23d07

data/pokemon/evos_attacks_pointers.asm

@@ -1,6 +1,6 @@
 ; Evolutions and attacks are grouped together since they're both checked at level-up.
 
-EvosAttacksPointers:: ; 0x425b1
+EvosAttacksPointers::
 	dw BulbasaurEvosAttacks
 	dw IvysaurEvosAttacks
 	dw VenusaurEvosAttacks
@@ -252,4 +252,3 @@ EvosAttacksPointers:: ; 0x425b1
 	dw LugiaEvosAttacks
 	dw HoOhEvosAttacks
 	dw CelebiEvosAttacks
-; 0x427a7

data/text/unused_sweet_honey.asm

@@ -8,7 +8,7 @@
 ; Most of these texts seem to be associated with a single NPC.
 ; The last text is associated with a second NPC, probably a Butterfree.
 
-UnusedSweetHoneyText: ; 0x5578a
+UnusedSweetHoneyText:
 	text "My #MON is an"
 	line "expert at collect-"
 	cont "ing SWEET HONEY."
@@ -17,7 +17,7 @@ UnusedSweetHoneyText: ; 0x5578a
 	line "with you."
 	done
 
-UnusedSweetHoneyBagFullText: ; 0x557d6
+UnusedSweetHoneyBagFullText:
 	text "I want to give you"
 	line "some SWEET HONEY,"
 
@@ -25,17 +25,17 @@ UnusedSweetHoneyBagFullText: ; 0x557d6
 	line "room for it."
 	done
 
-UnusedSweetHoneyGiveText: ; 0x55819
+UnusedSweetHoneyGiveText:
 	text "Here you go! Have"
 	line "some SWEET HONEY!"
 	done
 
-UnusedGotSweetHoneyText: ; 0x5583e
+UnusedGotSweetHoneyText:
 	text "<PLAYER> received"
 	line "SWEET HONEY."
 	done
 
-UnusedSweetHoneyAfterText1: ; 0x55856
+UnusedSweetHoneyAfterText1:
 	text "My little brother"
 	line "takes SWEET HONEY"
 
@@ -46,7 +46,7 @@ UnusedSweetHoneyAfterText1: ; 0x55856
 	line "up to?"
 	done
 
-UnusedSweetHoneyAfterText2: ; 0x558b1
+UnusedSweetHoneyAfterText2:
 	text "Did you put SWEET"
 	line "HONEY on a tree?"
 
@@ -54,7 +54,7 @@ UnusedSweetHoneyAfterText2: ; 0x558b1
 	line "it?"
 	done
 
-UnusedSweetHoneyAfterText3: ; 0x558ea
+UnusedSweetHoneyAfterText3:
 	text "Did you put SWEET"
 	line "HONEY on a tree?"
 
@@ -63,6 +63,6 @@ UnusedSweetHoneyAfterText3: ; 0x558ea
 	cont "be drawn to it."
 	done
 
-UnusedSweetHoneyButterfreeText: ; 0x5593f
+UnusedSweetHoneyButterfreeText:
 	text "BUTTERFREE: Freeh!"
 	done