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

data/battle_tower/trainer_text.asm

@@ -1,743 +1,623 @@
-BattleTowerText_0x1ec000: ; 0x1ec000
+BattleTowerText_0x1ec000:
 	text "Hello, glad to"
 	line "meet you!"
 
 	para "I do hope we have"
 	line "a good battle."
 	done
-; 0x1ec03b
 
-BattleTowerText_0x1ec03b: ; 0x1ec03b
+BattleTowerText_0x1ec03b:
 	text "Thank you! A most"
 	line "enjoyable battle!"
 	done
-; 0x1ec060
 
-UnknownText_0x1ec060: ; 0x1ec060
+UnknownText_0x1ec060:
 	text "Thank you. You are"
 	line "formidable."
 	done
-; 0x1ec080
 
-BattleTowerText_0x1ec080: ; 0x1ec080
+BattleTowerText_0x1ec080:
 	text "Work, work, work…"
 	line "I'm always busy!"
 	done
-; 0x1ec0a3
 
-UnknownText_0x1ec0a3: ; 0x1ec0a3
+UnknownText_0x1ec0a3:
 	text "But, I work hard"
 	line "in battle too!"
 	done
-; 0x1ec0c4
 
-UnknownText_0x1ec0c4: ; 0x1ec0c4
+UnknownText_0x1ec0c4:
 	text "I'm too busy to be"
 	line "battling!"
 	done
-; 0x1ec0e1
 
-UnknownText_0x1ec0e1: ; 0x1ec0e1
+UnknownText_0x1ec0e1:
 	text "Brace yourself for"
 	line "my all-out attack!"
 	done
-; 0x1ec108
 
-UnknownText_0x1ec108: ; 0x1ec108
+UnknownText_0x1ec108:
 	text "What a cakewalk!"
 	line "You're too easy!"
 	done
-; 0x1ec12a
 
-UnknownText_0x1ec12a: ; 0x1ec12a
+UnknownText_0x1ec12a:
 	text "I won't lose next"
 	line "time, all right?"
 	done
-; 0x1ec14d
 
-UnknownText_0x1ec14d: ; 0x1ec14d
+UnknownText_0x1ec14d:
 	text "Heh, your #MON"
 	line "look pretty cool."
 	done
-; 0x1ec16f
 
-UnknownText_0x1ec16f: ; 0x1ec16f
+UnknownText_0x1ec16f:
 	text "Hey, hey, no way!"
 	line "You won't win!"
 	done
-; 0x1ec190
 
-UnknownText_0x1ec190: ; 0x1ec190
+UnknownText_0x1ec190:
 	text "You serious?"
 	line "This is brutal!"
 	done
-; 0x1ec1ae
 
-UnknownText_0x1ec1ae: ; 0x1ec1ae
+UnknownText_0x1ec1ae:
 	text "#MON every day!"
 	line "I love battling!"
 	done
-; 0x1ec1d0
 
-UnknownText_0x1ec1d0: ; 0x1ec1d0
+UnknownText_0x1ec1d0:
 	text "I'm on top of my"
 	line "game, but not you!"
 	done
-; 0x1ec1f4
 
-UnknownText_0x1ec1f4: ; 0x1ec1f4
+UnknownText_0x1ec1f4:
 	text "I don't care that"
 	line "I lost, really!"
 	done
-; 0x1ec216
 
-UnknownText_0x1ec216: ; 0x1ec216
+UnknownText_0x1ec216:
 	text "Hi, there! Let's"
 	line "keep this clean!"
 	done
-; 0x1ec238
 
-UnknownText_0x1ec238: ; 0x1ec238
+UnknownText_0x1ec238:
 	text "Whoops, sorry for"
 	line "that wipeout!"
 	done
-; 0x1ec259
 
-UnknownText_0x1ec259: ; 0x1ec259
+UnknownText_0x1ec259:
 	text "Whoops! Come on,"
 	line "let me win one!"
 	done
-; 0x1ec27b
 
-UnknownText_0x1ec27b: ; 0x1ec27b
+UnknownText_0x1ec27b:
 	text "Do you want to see"
 	line "my battle level?"
 	done
-; 0x1ec2a0
 
-UnknownText_0x1ec2a0: ; 0x1ec2a0
+UnknownText_0x1ec2a0:
 	text "Hehehe, I know"
 	line "your level now!"
 	done
-; 0x1ec2c0
 
-UnknownText_0x1ec2c0: ; 0x1ec2c0
+UnknownText_0x1ec2c0:
 	text "Ouch… I'm just too"
 	line "weak…"
 	done
-; 0x1ec2d9
 
-UnknownText_0x1ec2d9: ; 0x1ec2d9
+UnknownText_0x1ec2d9:
 	text "Hey, let's battle."
 	line "I'm your opponent."
 	done
-; 0x1ec2fe
 
-UnknownText_0x1ec2fe: ; 0x1ec2fe
+UnknownText_0x1ec2fe:
 	text "Wow, you're not"
 	line "serious about it!"
 	done
-; 0x1ec320
 
-UnknownText_0x1ec320: ; 0x1ec320
+UnknownText_0x1ec320:
 	text "…Urgh… Nothing"
 	line "positive here…"
 	done
-; 0x1ec33f
 
-UnknownText_0x1ec33f: ; 0x1ec33f
+UnknownText_0x1ec33f:
 	text "I'm your"
 	line "opponent."
 
 	para "Get ready to be"
 	line "hammered."
 	done
-; 0x1ec36c
 
-UnknownText_0x1ec36c: ; 0x1ec36c
+UnknownText_0x1ec36c:
 	text "Hahah! That was a"
 	line "pushover!"
 	done
-; 0x1ec389
 
-UnknownText_0x1ec389: ; 0x1ec389
+UnknownText_0x1ec389:
 	text "No way! There has"
 	line "to be a mistake!"
 	done
-; 0x1ec3ad
 
-UnknownText_0x1ec3ad: ; 0x1ec3ad
+UnknownText_0x1ec3ad:
 	text "Hah!"
 	line "Let's get rolling!"
 	done
-; 0x1ec3c5
 
-UnknownText_0x1ec3c5: ; 0x1ec3c5
+UnknownText_0x1ec3c5:
 	text "Wahahaha! Didn't"
 	line "break a sweat!"
 	done
-; 0x1ec3e5
 
-UnknownText_0x1ec3e5: ; 0x1ec3e5
+UnknownText_0x1ec3e5:
 	text "Tough! I'm no"
 	line "match for you!"
 	done
-; 0x1ec402
 
-UnknownText_0x1ec402: ; 0x1ec402
+UnknownText_0x1ec402:
 	text "<……><……><……>"
 	line "<……><……>Battle?"
 	done
-; 0x1ec411
 
-UnknownText_0x1ec411: ; 0x1ec411
+UnknownText_0x1ec411:
 	text "<……><……><……>"
 	line "<……><……>I won?"
 	done
-; 0x1ec41f
 
-UnknownText_0x1ec41f: ; 0x1ec41f
+UnknownText_0x1ec41f:
 	text "<……><……><……>"
 	line "<……><……>I lost?"
 	done
-; 0x1ec42e
 
-UnknownText_0x1ec42e: ; 0x1ec42e
+UnknownText_0x1ec42e:
 	text "You want to be a"
 	line "leader?"
 
 	para "Let me battle you,"
 	line "then!"
 	done
-; 0x1ec461
 
-UnknownText_0x1ec461: ; 0x1ec461
+UnknownText_0x1ec461:
 	text "You need another"
 	line "ten years of"
 
 	para "training to get"
 	line "better, I'd say."
 	done
-; 0x1ec4a0
 
-UnknownText_0x1ec4a0: ; 0x1ec4a0
+UnknownText_0x1ec4a0:
 	text "You're incredibly"
 	line "talented."
 
 	para "No one can touch"
 	line "you now!"
 	done
-; 0x1ec4d6
 
-UnknownText_0x1ec4d6: ; 0x1ec4d6
+UnknownText_0x1ec4d6:
 	text "Today, I'm going"
 	line "to whomp you."
 	done
-; 0x1ec4f5
 
-UnknownText_0x1ec4f5: ; 0x1ec4f5
+UnknownText_0x1ec4f5:
 	text "I knew I'd win."
 	line "I'm so great!"
 	done
-; 0x1ec512
 
-UnknownText_0x1ec512: ; 0x1ec512
+UnknownText_0x1ec512:
 	text "Uh? My plans are"
 	line "out of whack…"
 	done
-; 0x1ec532
 
-UnknownText_0x1ec532: ; 0x1ec532
+UnknownText_0x1ec532:
 	text "I bet you can't"
 	line "beat me!"
 	done
-; 0x1ec54b
 
-UnknownText_0x1ec54b: ; 0x1ec54b
+UnknownText_0x1ec54b:
 	text "Those #MON"
 	line "aren't enough!"
 	done
-; 0x1ec565
 
-UnknownText_0x1ec565: ; 0x1ec565
+UnknownText_0x1ec565:
 	text "I want your"
 	line "#MON. Please?"
 	done
-; 0x1ec580
 
-UnknownText_0x1ec580: ; 0x1ec580
+UnknownText_0x1ec580:
 	text "I'll show you a"
 	line "real battle!"
 	done
-; 0x1ec59d
 
-UnknownText_0x1ec59d: ; 0x1ec59d
+UnknownText_0x1ec59d:
 	text "This battle…"
 	line "I'm bored!"
 	done
-; 0x1ec5b5
 
-UnknownText_0x1ec5b5: ; 0x1ec5b5
+UnknownText_0x1ec5b5:
 	text "…I won't turn tail"
 	line "in battle!"
 	done
-; 0x1ec5d3
 
-UnknownText_0x1ec5d3: ; 0x1ec5d3
+UnknownText_0x1ec5d3:
 	text "Let's go!"
 	line "No holds barred!"
 	done
-; 0x1ec5ee
 
-UnknownText_0x1ec5ee: ; 0x1ec5ee
+UnknownText_0x1ec5ee:
 	text "Sorry! I wanted"
 	line "the win more!"
 	done
-; 0x1ec60d
 
-UnknownText_0x1ec60d: ; 0x1ec60d
+UnknownText_0x1ec60d:
 	text "Wahah! Congrats!"
 	line "I can't do better!"
 	done
-; 0x1ec631
 
-UnknownText_0x1ec631: ; 0x1ec631
+UnknownText_0x1ec631:
 	text "My #MON skills"
 	line "are phenomenal!"
 	done
-; 0x1ec651
 
-UnknownText_0x1ec651: ; 0x1ec651
+UnknownText_0x1ec651:
 	text "You've got a long"
 	line "way to go."
 
 	para "Well, keep trying!"
 	line "Best of luck!"
 	done
-; 0x1ec68f
 
-UnknownText_0x1ec68f: ; 0x1ec68f
+UnknownText_0x1ec68f:
 	text "Aww… Don't lose"
 	line "after beating me."
 	done
-; 0x1ec6b1
 
-UnknownText_0x1ec6b1: ; 0x1ec6b1
+UnknownText_0x1ec6b1:
 	text "Who are you?"
 	line "I don't know you…"
 	done
-; 0x1ec6d0
 
-UnknownText_0x1ec6d0: ; 0x1ec6d0
+UnknownText_0x1ec6d0:
 	text "I must've imagined"
 	line "that."
 
 	para "There seems to be"
 	line "no one here…"
 	done
-; 0x1ec708
 
-UnknownText_0x1ec708: ; 0x1ec708
+UnknownText_0x1ec708:
 	text "Who am I?"
 	line "I don't know…"
 	done
-; 0x1ec720
 
-UnknownText_0x1ec720: ; 0x1ec720
+UnknownText_0x1ec720:
 	text "Um… Are you that…"
 	line "um…person?"
 	done
-; 0x1ec73e
 
-UnknownText_0x1ec73e: ; 0x1ec73e
+UnknownText_0x1ec73e:
 	text "It doesn't appear"
 	line "to be you…"
 	done
-; 0x1ec75b
 
-UnknownText_0x1ec75b: ; 0x1ec75b
+UnknownText_0x1ec75b:
 	text "Then you really"
 	line "are the legendary…"
 	done
-; 0x1ec77f
 
-UnknownText_0x1ec77f: ; 0x1ec77f
+UnknownText_0x1ec77f:
 	text "I heard that"
 	line "you're hot!"
 	done
-; 0x1ec798
 
-UnknownText_0x1ec798: ; 0x1ec798
+UnknownText_0x1ec798:
 	text "Not bad. I was"
 	line "just a bit better."
 	done
-; 0x1ec7bb
 
-UnknownText_0x1ec7bb: ; 0x1ec7bb
+UnknownText_0x1ec7bb:
 	text "Eh, you're not"
 	line "that special."
 	done
-; 0x1ec7d8
 
-UnknownText_0x1ec7d8: ; 0x1ec7d8
+UnknownText_0x1ec7d8:
 	text "I'm scared about"
 	line "what might happen."
 
 	para "My #MON are way"
 	line "too strong."
 	done
-; 0x1ec818
 
-UnknownText_0x1ec818: ; 0x1ec818
+UnknownText_0x1ec818:
 	text "See? My #MON"
 	line "were too strong."
 	done
-; 0x1ec837
 
-UnknownText_0x1ec837: ; 0x1ec837
+UnknownText_0x1ec837:
 	text "Graa! My #MON"
 	line "were total wimps!"
 	done
-; 0x1ec858
 
-UnknownText_0x1ec858: ; 0x1ec858
+UnknownText_0x1ec858:
 	text "Hey, there!"
 	line "I'll take you on!"
 	done
-; 0x1ec876
 
-UnknownText_0x1ec876: ; 0x1ec876
+UnknownText_0x1ec876:
 	text "Don't you have a"
 	line "better strategy?"
 	done
-; 0x1ec898
 
-UnknownText_0x1ec898: ; 0x1ec898
+UnknownText_0x1ec898:
 	text "You've got decent"
 	line "style!"
 	done
-; 0x1ec8b1
 
-UnknownText_0x1ec8b1: ; 0x1ec8b1
+UnknownText_0x1ec8b1:
 	text "I wonder if I can"
 	line "battle properly…"
 	done
-; 0x1ec8d5
 
-UnknownText_0x1ec8d5: ; 0x1ec8d5
+UnknownText_0x1ec8d5:
 	text "Um… Sorry…"
 	line "I think I won."
 	done
-; 0x1ec8f0
 
-UnknownText_0x1ec8f0: ; 0x1ec8f0
+UnknownText_0x1ec8f0:
 	text "I guess I'm not"
 	line "good enough yet…"
 	done
-; 0x1ec911
 
-UnknownText_0x1ec911: ; 0x1ec911
+UnknownText_0x1ec911:
 	text "Wrrooar!"
 	line "I won't lose!"
 	done
-; 0x1ec928
 
-UnknownText_0x1ec928: ; 0x1ec928
+UnknownText_0x1ec928:
 	text "Wrrooar! I knew"
 	line "I was a genius!"
 	done
-; 0x1ec949
 
-UnknownText_0x1ec949: ; 0x1ec949
+UnknownText_0x1ec949:
 	text "Arrooh! I hate it"
 	line "when I lose!"
 	done
-; 0x1ec969
 
-UnknownText_0x1ec969: ; 0x1ec969
+UnknownText_0x1ec969:
 	text "Sorry, but I'm"
 	line "going to win."
 	done
-; 0x1ec986
 
-UnknownText_0x1ec986: ; 0x1ec986
+UnknownText_0x1ec986:
 	text "Yeah! My #MON"
 	line "rule!"
 	done
-; 0x1ec99b
 
-UnknownText_0x1ec99b: ; 0x1ec99b
+UnknownText_0x1ec99b:
 	text "Oh, close! I lost"
 	line "by just a bit!"
 	done
-; 0x1ec9bd
 
-UnknownText_0x1ec9bd: ; 0x1ec9bd
+UnknownText_0x1ec9bd:
 	text "OK, I'm not"
 	line "fooling around!"
 	done
-; 0x1ec9d9
 
-UnknownText_0x1ec9d9: ; 0x1ec9d9
+UnknownText_0x1ec9d9:
 	text "Yay! Too easy!"
 	line "Like, no way!"
 	done
-; 0x1ec9f7
 
-UnknownText_0x1ec9f7: ; 0x1ec9f7
+UnknownText_0x1ec9f7:
 	text "No!"
 	line "Like, no way!"
 	done
-; 0x1eca0a
 
-UnknownText_0x1eca0a: ; 0x1eca0a
+UnknownText_0x1eca0a:
 	text "Look! My #MON"
 	line "are really cute!"
 	done
-; 0x1eca2a
 
-UnknownText_0x1eca2a: ; 0x1eca2a
+UnknownText_0x1eca2a:
 	text "Aren't they really"
 	line "adorable?"
 	done
-; 0x1eca47
 
-UnknownText_0x1eca47: ; 0x1eca47
+UnknownText_0x1eca47:
 	text "I'm sorry, it's"
 	line "all my fault!"
 	done
-; 0x1eca64
 
-UnknownText_0x1eca64: ; 0x1eca64
+UnknownText_0x1eca64:
 	text "Let's get our"
 	line "battle started!"
 	done
-; 0x1eca82
 
-UnknownText_0x1eca82: ; 0x1eca82
+UnknownText_0x1eca82:
 	text "Was I too strong"
 	line "for you?"
 	done
-; 0x1eca9d
 
-UnknownText_0x1eca9d: ; 0x1eca9d
+UnknownText_0x1eca9d:
 	text "Ooh, you're in a"
 	line "different class."
 	done
-; 0x1ecabf
 
-UnknownText_0x1ecabf: ; 0x1ecabf
+UnknownText_0x1ecabf:
 	text "Are we going to"
 	line "battle? Let's!"
 	done
-; 0x1ecade
 
-UnknownText_0x1ecade: ; 0x1ecade
+UnknownText_0x1ecade:
 	text "Oh, you're too"
 	line "weak. Shame."
 	done
-; 0x1ecafa
 
-UnknownText_0x1ecafa: ; 0x1ecafa
+UnknownText_0x1ecafa:
 	text "Wow! Are you quite"
 	line "satisfied?"
 	done
-; 0x1ecb19
 
-UnknownText_0x1ecb19: ; 0x1ecb19
+UnknownText_0x1ecb19:
 	text "Oh, you have some"
 	line "rare #MON."
 	done
-; 0x1ecb37
 
-UnknownText_0x1ecb37: ; 0x1ecb37
+UnknownText_0x1ecb37:
 	text "May I have one of"
 	line "your #MON?"
 	done
-; 0x1ecb55
 
-UnknownText_0x1ecb55: ; 0x1ecb55
+UnknownText_0x1ecb55:
 	text "…I want one of"
 	line "your #MON."
 	done
-; 0x1ecb70
 
-UnknownText_0x1ecb70: ; 0x1ecb70
+UnknownText_0x1ecb70:
 	text "Want to hear about"
 	line "my cute #MON?"
 	done
-; 0x1ecb92
 
-UnknownText_0x1ecb92: ; 0x1ecb92
+UnknownText_0x1ecb92:
 	text "What do you think"
 	line "about my cuties?"
 	done
-; 0x1ecbb6
 
-UnknownText_0x1ecbb6: ; 0x1ecbb6
+UnknownText_0x1ecbb6:
 	text "Oh! My! You're a"
 	line "dreadful trainer!"
 	done
-; 0x1ecbd9
 
-UnknownText_0x1ecbd9: ; 0x1ecbd9
+UnknownText_0x1ecbd9:
 	text "Battle? Sure!"
 	line "Right now!"
 	done
-; 0x1ecbf3
 
-UnknownText_0x1ecbf3: ; 0x1ecbf3
+UnknownText_0x1ecbf3:
 	text "Oh, I love it!"
 	line "Battling is wild!"
 	done
-; 0x1ecc15
 
-UnknownText_0x1ecc15: ; 0x1ecc15
+UnknownText_0x1ecc15:
 	text "Oh, how rude! Wait"
 	line "till next time!"
 	done
-; 0x1ecc39
 
-UnknownText_0x1ecc39: ; 0x1ecc39
+UnknownText_0x1ecc39:
 	text "Please let me win!"
 	line "Please?"
 	done
-; 0x1ecc55
 
-UnknownText_0x1ecc55: ; 0x1ecc55
+UnknownText_0x1ecc55:
 	text "Wow, thank you!"
 	line "You're so nice!"
 	done
-; 0x1ecc75
 
-UnknownText_0x1ecc75: ; 0x1ecc75
+UnknownText_0x1ecc75:
 	text "You're mean!"
 	line "I hate meanies!"
 	done
-; 0x1ecc92
 
-UnknownText_0x1ecc92: ; 0x1ecc92
+UnknownText_0x1ecc92:
 	text "Well, can we"
 	line "begin?"
 	done
-; 0x1ecca7
 
-UnknownText_0x1ecca7: ; 0x1ecca7
+UnknownText_0x1ecca7:
 	text "Well, I beg your"
 	line "pardon…"
 	done
-; 0x1eccc1
 
-UnknownText_0x1eccc1: ; 0x1eccc1
+UnknownText_0x1eccc1:
 	text "Sob… That's not"
 	line "fair!"
 	done
-; 0x1eccd7
 
-UnknownText_0x1eccd7: ; 0x1eccd7
+UnknownText_0x1eccd7:
 	text "I'm good!"
 	line "You can't win."
 	done
-; 0x1eccef
 
-UnknownText_0x1eccef: ; 0x1eccef
+UnknownText_0x1eccef:
 	text "Giving up? You're"
 	line "pretty weak!"
 	done
-; 0x1ecd0e
 
-UnknownText_0x1ecd0e: ; 0x1ecd0e
+UnknownText_0x1ecd0e:
 	text "I won't accept"
 	line "this… No way!"
 	done
-; 0x1ecd2b
 
-UnknownText_0x1ecd2b: ; 0x1ecd2b
+UnknownText_0x1ecd2b:
 	text "Are you treating"
 	line "this seriously?"
 	done
-; 0x1ecd4d
 
-UnknownText_0x1ecd4d: ; 0x1ecd4d
+UnknownText_0x1ecd4d:
 	text "Oh, sorry! Looks"
 	line "like I won!"
 	done
-; 0x1ecd6b
 
-UnknownText_0x1ecd6b: ; 0x1ecd6b
+UnknownText_0x1ecd6b:
 	text "Oh, how nasty!"
 	line "You were serious!"
 	done
-; 0x1ecd8d
 
-UnknownText_0x1ecd8d: ; 0x1ecd8d
+UnknownText_0x1ecd8d:
 	text "Ahahah! I'll take"
 	line "it easy on you!"
 	done
-; 0x1ecdaf
 
-UnknownText_0x1ecdaf: ; 0x1ecdaf
+UnknownText_0x1ecdaf:
 	text "Oops, sorry! But"
 	line "I'm happy too!"
 	done
-; 0x1ecdcf
 
-UnknownText_0x1ecdcf: ; 0x1ecdcf
+UnknownText_0x1ecdcf:
 	text "Oh, oh, I lost!"
 	line "Thanks. Bye!"
 	done
-; 0x1ecded
 
-UnknownText_0x1ecded: ; 0x1ecded
+UnknownText_0x1ecded:
 	text "BATTLE TOWER is a"
 	line "tough place!"
 	done
-; 0x1ece0d
 
-UnknownText_0x1ece0d: ; 0x1ece0d
+UnknownText_0x1ece0d:
 	text "You might have a"
 	line "hard time."
 	done
-; 0x1ece2a
 
-UnknownText_0x1ece2a: ; 0x1ece2a
+UnknownText_0x1ece2a:
 	text "Ooh, you might"
 	line "make a run here!"
 	done
-; 0x1ece4b
 
-UnknownText_0x1ece4b: ; 0x1ece4b
+UnknownText_0x1ece4b:
 	text "I want to see your"
 	line "style in action!"
 	done
-; 0x1ece70
 
-UnknownText_0x1ece70: ; 0x1ece70
+UnknownText_0x1ece70:
 	text "Every battle is a"
 	line "drama!"
 	done
-; 0x1ece8a
 
-UnknownText_0x1ece8a: ; 0x1ece8a
+UnknownText_0x1ece8a:
 	text "Oh… Want to trade"
 	line "something?"
 	done
-; 0x1ecea8
 
-UnknownText_0x1ecea8: ; 0x1ecea8
+UnknownText_0x1ecea8:
 	text "OK, here goes!"
 	line "I have momentum!"
 	done
-; 0x1ecec9
 
-UnknownText_0x1ecec9: ; 0x1ecec9
+UnknownText_0x1ecec9:
 	text "See, I rolled"
 	line "right over you!"
 	done
-; 0x1ecee8
 
-UnknownText_0x1ecee8: ; 0x1ecee8
+UnknownText_0x1ecee8:
 	text "No! This did not"
 	line "happen!"
 	done
-; 0x1ecf02

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

data/trainers/party_pointers.asm

@@ -1,6 +1,6 @@
 ; Groups are defined in data/trainers/parties.asm.
 
-TrainerGroups: ; 0x39999
+TrainerGroups:
 ; entries correspond to trainer classes (see constants/trainer_constants.asm)
 	dw FalknerGroup
 	dw WhitneyGroup

data/wild/johto_grass.asm

@@ -1,6 +1,6 @@
 ; Johto Pokémon in grass
 
-JohtoGrassWildMons: ; 0x2a5e9
+JohtoGrassWildMons:
 
 	map_id SPROUT_TOWER_2F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite

data/wild/johto_water.asm

@@ -1,6 +1,6 @@
 ; Johto Pokémon in water
 
-JohtoWaterWildMons: ; 0x2b11d
+JohtoWaterWildMons:
 
 	map_id RUINS_OF_ALPH_OUTSIDE
 	db 2 percent ; encounter rate

data/wild/kanto_grass.asm

@@ -1,6 +1,6 @@
 ; Kanto Pokémon in grass
 
-KantoGrassWildMons: ; 0x2b274
+KantoGrassWildMons:
 
 	map_id DIGLETTS_CAVE
 	db 4 percent, 2 percent, 8 percent ; encounter rates: morn/day/nite

data/wild/kanto_water.asm

@@ -1,6 +1,6 @@
 ; Kanto Pokémon in water
 
-KantoWaterWildMons: ; 0x2b7f7
+KantoWaterWildMons:
 
 	map_id TOHJO_FALLS
 	db 4 percent ; encounter rate

data/wild/swarm_grass.asm

@@ -1,6 +1,6 @@
 ; Pokémon swarms in grass
 
-SwarmGrassWildMons: ; 0x2b8d0
+SwarmGrassWildMons:
 
 ; Dunsparce swarm
 	map_id DARK_CAVE_VIOLET_ENTRANCE

data/wild/swarm_water.asm

@@ -1,6 +1,6 @@
 ; Pokémon swarms in water
 
-SwarmWaterWildMons: ; 0x2b92f
+SwarmWaterWildMons:
 
 	; No swarms encountered while surfing in Crystal
 

engine/battle/core.asm

@@ -2577,11 +2577,11 @@ PlayVictoryMusic:
 	pop de
 	ret
 
-IsKantoGymLeader: ; 0x3d123
+IsKantoGymLeader:
 	ld hl, KantoGymLeaders
 	jr IsGymLeaderCommon
 
-IsGymLeader: ; 0x3d128
+IsGymLeader:
 	ld hl, GymLeaders
 IsGymLeaderCommon:
 	push de
@@ -2590,7 +2590,6 @@ IsGymLeaderCommon:
 	call IsInArray
 	pop de
 	ret
-; 0x3d137
 
 INCLUDE "data/trainers/leaders.asm"
 

engine/battle/menu.asm

@@ -34,15 +34,14 @@ BattleMenuHeader:
 	dw MenuData_0x24f34
 	db 1 ; default option
 
-MenuData_0x24f34: ; 0x24f34
+MenuData_0x24f34:
 	db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
 	dn 2, 2 ; rows, columns
 	db 6 ; spacing
 	dba Strings24f3d
 	dbw BANK(MenuData_0x24f34), 0
-; 0x24f3d
 
-Strings24f3d: ; 0x24f3d
+Strings24f3d:
 	db "FIGHT@"
 	db "<PKMN>@"
 	db "PACK@"

engine/events/basement_key.asm

@@ -27,7 +27,6 @@ _BasementKey:
 	ld [wItemEffectSucceeded], a
 	ret
 
-.BasementKeyScript: ; 0x507e1
+.BasementKeyScript:
 	closetext
 	farjump BasementDoorScript
-; 0x507e6

engine/events/battle_tower/battle_tower.asm

@@ -330,7 +330,7 @@ ReadBTTrainerParty:
 	jr .done_trainer_name
 
 .trainer_name_okay
-	ld hl, wBT_OTTempName ; 0xc608
+	ld hl, wBT_OTTempName
 
 .done_trainer_name
 	ld de, wOTPlayerName
@@ -1564,7 +1564,7 @@ BattleTowerAction_UbersCheck: ; BattleTowerAction $19
 	ld [wScriptVar], a
 	ret
 
-LoadOpponentTrainerAndPokemonWithOTSprite: ; 0x170b44
+LoadOpponentTrainerAndPokemonWithOTSprite:
 	farcall Function_LoadOpponentTrainerAndPokemons
 	ld a, [rSVBK]
 	push af

engine/events/battle_tower/rules.asm

@@ -20,11 +20,10 @@ CheckForMobileBattleRules:
 	dw JumpText_NeedAtLeastThreeMon
 	dw JumpText_EggDoesNotQualify
 
-.ExcuseMeText: ; 0x8b1fc
+.ExcuseMeText:
 	; Excuse me!
 	text_jump UnknownText_0x1c5937
 	db "@"
-; 0x8b201
 
 _CheckForBattleTowerRules:
 	ld hl, wStringBuffer2
@@ -56,58 +55,50 @@ _CheckForBattleTowerRules:
 	dw JumpText_TheMonMustNotHoldTheSameItems
 	dw JumpText_YouCantTakeAnEgg
 
-JumpText_ExcuseMeYoureNotReady: ; 0x8b22c
+JumpText_ExcuseMeYoureNotReady:
 	; Excuse me. You're not ready.
 	text_jump Text_ExcuseMeYoureNotReady
 	db "@"
-; 0x8b231
 
 BattleTower_PleaseReturnWhenReady:
 	ld hl, .PleaseReturnWhenReady
 	call PrintText
 	ret
 
-.PleaseReturnWhenReady: ; 0x8b238
+.PleaseReturnWhenReady:
 	; Please return when you're ready.
 	text_jump UnknownText_0x1c5962
 	db "@"
-; 0x8b23d
 
-JumpText_NeedAtLeastThreeMon: ; 0x8b23d
+JumpText_NeedAtLeastThreeMon:
 	; You need at least three #MON.
 	text_jump UnknownText_0x1c5983
 	db "@"
-; 0x8b242
 
-JumpText_EggDoesNotQualify: ; 0x8b242
+JumpText_EggDoesNotQualify:
 	; Sorry, an EGG doesn't qualify.
 	text_jump UnknownText_0x1c59a3
 	db "@"
-; 0x8b247
 
-JumpText_OnlyThreeMonMayBeEntered: ; 0x8b247
+JumpText_OnlyThreeMonMayBeEntered:
 	; Only three #MON may be entered.
 	text_jump Text_OnlyThreeMonMayBeEntered
 	db "@"
-; 0x8b24c
 
-JumpText_TheMonMustAllBeDifferentKinds: ; 0x8b24c
+JumpText_TheMonMustAllBeDifferentKinds:
 	; The @  #MON must all be different kinds.
 	text_jump Text_TheMonMustAllBeDifferentKinds
 	db "@"
-; 0x8b251
 
-JumpText_TheMonMustNotHoldTheSameItems: ; 0x8b251
+JumpText_TheMonMustNotHoldTheSameItems:
 	; The @  #MON must not hold the same items.
 	text_jump Text_TheMonMustNotHoldTheSameItems
 	db "@"
-; 0x8b256
 
-JumpText_YouCantTakeAnEgg: ; 0x8b256
+JumpText_YouCantTakeAnEgg:
 	; You can't take an EGG!
 	text_jump Text_YouCantTakeAnEgg
 	db "@"
-; 0x8b25b
 
 BattleTower_ExecuteJumptable:
 	ld bc, 0

engine/events/battle_tower/trainer_text.asm

@@ -233,485 +233,485 @@ BTFemaleTrainerTexts:
 	dw BTWinF15
 
 
-BTGreetingM1: ; 0x11f42e
+BTGreetingM1:
 	text_jump BattleTowerText_0x1ec000
 	db "@"
 
-BTLossM1: ; 0x11f433
+BTLossM1:
 	text_jump BattleTowerText_0x1ec03b
 	db "@"
 
-BTWinM1: ; 0x11f438
+BTWinM1:
 	text_jump UnknownText_0x1ec060
 	db "@"
 
-BTGreetingM2: ; 0x11f43d
+BTGreetingM2:
 	text_jump BattleTowerText_0x1ec080
 	db "@"
 
-BTLossM2: ; 0x11f442
+BTLossM2:
 	text_jump UnknownText_0x1ec0a3
 	db "@"
 
-BTWinM2: ; 0x11f447
+BTWinM2:
 	text_jump UnknownText_0x1ec0c4
 	db "@"
 
-BTGreetingM3: ; 0x11f44c
+BTGreetingM3:
 	text_jump UnknownText_0x1ec0e1
 	db "@"
 
-BTLossM3: ; 0x11f451
+BTLossM3:
 	text_jump UnknownText_0x1ec108
 	db "@"
 
-BTWinM3: ; 0x11f456
+BTWinM3:
 	text_jump UnknownText_0x1ec12a
 	db "@"
 
-BTGreetingM4: ; 0x11f45b
+BTGreetingM4:
 	text_jump UnknownText_0x1ec14d
 	db "@"
 
-BTLossM4: ; 0x11f460
+BTLossM4:
 	text_jump UnknownText_0x1ec16f
 	db "@"
 
-BTWinM4: ; 0x11f465
+BTWinM4:
 	text_jump UnknownText_0x1ec190
 	db "@"
 
-BTGreetingM5: ; 0x11f46a
+BTGreetingM5:
 	text_jump UnknownText_0x1ec1ae
 	db "@"
 
-BTLossM5: ; 0x11f46f
+BTLossM5:
 	text_jump UnknownText_0x1ec1d0
 	db "@"
 
-BTWinM5: ; 0x11f474
+BTWinM5:
 	text_jump UnknownText_0x1ec1f4
 	db "@"
 
-BTGreetingM6: ; 0x11f479
+BTGreetingM6:
 	text_jump UnknownText_0x1ec216
 	db "@"
 
-BTLossM6: ; 0x11f47e
+BTLossM6:
 	text_jump UnknownText_0x1ec238
 	db "@"
 
-BTWinM6: ; 0x11f483
+BTWinM6:
 	text_jump UnknownText_0x1ec259
 	db "@"
 
-BTGreetingM7: ; 0x11f488
+BTGreetingM7:
 	text_jump UnknownText_0x1ec27b
 	db "@"
 
-BTLossM7: ; 0x11f48d
+BTLossM7:
 	text_jump UnknownText_0x1ec2a0
 	db "@"
 
-BTWinM7: ; 0x11f492
+BTWinM7:
 	text_jump UnknownText_0x1ec2c0
 	db "@"
 
-BTGreetingM8: ; 0x11f497
+BTGreetingM8:
 	text_jump UnknownText_0x1ec2d9
 	db "@"
 
-BTLossM8: ; 0x11f49c
+BTLossM8:
 	text_jump UnknownText_0x1ec2fe
 	db "@"
 
-BTWinM8: ; 0x11f4a1
+BTWinM8:
 	text_jump UnknownText_0x1ec320
 	db "@"
 
-BTGreetingM9: ; 0x11f4a6
+BTGreetingM9:
 	text_jump UnknownText_0x1ec33f
 	db "@"
 
-BTLossM9: ; 0x11f4ab
+BTLossM9:
 	text_jump UnknownText_0x1ec36c
 	db "@"
 
-BTWinM9: ; 0x11f4b0
+BTWinM9:
 	text_jump UnknownText_0x1ec389
 	db "@"
 
-BTGreetingM10: ; 0x11f4b5
+BTGreetingM10:
 	text_jump UnknownText_0x1ec3ad
 	db "@"
 
-BTLossM10: ; 0x11f4ba
+BTLossM10:
 	text_jump UnknownText_0x1ec3c5
 	db "@"
 
-BTWinM10: ; 0x11f4bf
+BTWinM10:
 	text_jump UnknownText_0x1ec3e5
 	db "@"
 
-BTGreetingM11: ; 0x11f4c4
+BTGreetingM11:
 	text_jump UnknownText_0x1ec402
 	db "@"
 
-BTLossM11: ; 0x11f4c9
+BTLossM11:
 	text_jump UnknownText_0x1ec411
 	db "@"
 
-BTWinM11: ; 0x11f4ce
+BTWinM11:
 	text_jump UnknownText_0x1ec41f
 	db "@"
 
-BTGreetingM12: ; 0x11f4d3
+BTGreetingM12:
 	text_jump UnknownText_0x1ec42e
 	db "@"
 
-BTLossM12: ; 0x11f4d8
+BTLossM12:
 	text_jump UnknownText_0x1ec461
 	db "@"
 
-BTWinM12: ; 0x11f4dd
+BTWinM12:
 	text_jump UnknownText_0x1ec4a0
 	db "@"
 
-BTGreetingM13: ; 0x11f4e2
+BTGreetingM13:
 	text_jump UnknownText_0x1ec4d6
 	db "@"
 
-BTLossM13: ; 0x11f4e7
+BTLossM13:
 	text_jump UnknownText_0x1ec4f5
 	db "@"
 
-BTWinM13: ; 0x11f4ec
+BTWinM13:
 	text_jump UnknownText_0x1ec512
 	db "@"
 
-BTGreetingM14: ; 0x11f4f1
+BTGreetingM14:
 	text_jump UnknownText_0x1ec532
 	db "@"
 
-BTLossM14: ; 0x11f4f6
+BTLossM14:
 	text_jump UnknownText_0x1ec54b
 	db "@"
 
-BTWinM14: ; 0x11f4fb
+BTWinM14:
 	text_jump UnknownText_0x1ec565
 	db "@"
 
-BTGreetingM15: ; 0x11f500
+BTGreetingM15:
 	text_jump UnknownText_0x1ec580
 	db "@"
 
-BTLossM15: ; 0x11f505
+BTLossM15:
 	text_jump UnknownText_0x1ec59d
 	db "@"
 
-BTWinM15: ; 0x11f50a
+BTWinM15:
 	text_jump UnknownText_0x1ec5b5
 	db "@"
 
-BTGreetingM16: ; 0x11f50f
+BTGreetingM16:
 	text_jump UnknownText_0x1ec5d3
 	db "@"
 
-BTLossM16: ; 0x11f514
+BTLossM16:
 	text_jump UnknownText_0x1ec5ee
 	db "@"
 
-BTWinM16: ; 0x11f519
+BTWinM16:
 	text_jump UnknownText_0x1ec60d
 	db "@"
 
-BTGreetingM17: ; 0x11f51e
+BTGreetingM17:
 	text_jump UnknownText_0x1ec631
 	db "@"
 
-BTLossM17: ; 0x11f523
+BTLossM17:
 	text_jump UnknownText_0x1ec651
 	db "@"
 
-BTWinM17: ; 0x11f528
+BTWinM17:
 	text_jump UnknownText_0x1ec68f
 	db "@"
 
-BTGreetingM18: ; 0x11f52d
+BTGreetingM18:
 	text_jump UnknownText_0x1ec6b1
 	db "@"
 
-BTLossM18: ; 0x11f532
+BTLossM18:
 	text_jump UnknownText_0x1ec6d0
 	db "@"
 
-BTWinM18: ; 0x11f537
+BTWinM18:
 	text_jump UnknownText_0x1ec708
 	db "@"
 
-BTGreetingM19: ; 0x11f53c
+BTGreetingM19:
 	text_jump UnknownText_0x1ec720
 	db "@"
 
-BTLossM19: ; 0x11f541
+BTLossM19:
 	text_jump UnknownText_0x1ec73e
 	db "@"
 
-BTWinM19: ; 0x11f546
+BTWinM19:
 	text_jump UnknownText_0x1ec75b
 	db "@"
 
-BTGreetingM20: ; 0x11f54b
+BTGreetingM20:
 	text_jump UnknownText_0x1ec77f
 	db "@"
 
-BTLossM20: ; 0x11f550
+BTLossM20:
 	text_jump UnknownText_0x1ec798
 	db "@"
 
-BTWinM20: ; 0x11f555
+BTWinM20:
 	text_jump UnknownText_0x1ec7bb
 	db "@"
 
-BTGreetingM21: ; 0x11f55a
+BTGreetingM21:
 	text_jump UnknownText_0x1ec7d8
 	db "@"
 
-BTLossM21: ; 0x11f55f
+BTLossM21:
 	text_jump UnknownText_0x1ec818
 	db "@"
 
-BTWinM21: ; 0x11f564
+BTWinM21:
 	text_jump UnknownText_0x1ec837
 	db "@"
 
-BTGreetingM22: ; 0x11f569
+BTGreetingM22:
 	text_jump UnknownText_0x1ec858
 	db "@"
 
-BTLossM22: ; 0x11f56e
+BTLossM22:
 	text_jump UnknownText_0x1ec876
 	db "@"
 
-BTWinM22: ; 0x11f573
+BTWinM22:
 	text_jump UnknownText_0x1ec898
 	db "@"
 
-BTGreetingM23: ; 0x11f578
+BTGreetingM23:
 	text_jump UnknownText_0x1ec8b1
 	db "@"
 
-BTLossM23: ; 0x11f57d
+BTLossM23:
 	text_jump UnknownText_0x1ec8d5
 	db "@"
 
-BTWinM23: ; 0x11f582
+BTWinM23:
 	text_jump UnknownText_0x1ec8f0
 	db "@"
 
-BTGreetingM24: ; 0x11f587
+BTGreetingM24:
 	text_jump UnknownText_0x1ec911
 	db "@"
 
-BTLossM24: ; 0x11f58c
+BTLossM24:
 	text_jump UnknownText_0x1ec928
 	db "@"
 
-BTWinM24: ; 0x11f591
+BTWinM24:
 	text_jump UnknownText_0x1ec949
 	db "@"
 
-BTGreetingM25: ; 0x11f596
+BTGreetingM25:
 	text_jump UnknownText_0x1ec969
 	db "@"
 
-BTLossM25: ; 0x11f59b
+BTLossM25:
 	text_jump UnknownText_0x1ec986
 	db "@"
 
-BTWinM25: ; 0x11f5a0
+BTWinM25:
 	text_jump UnknownText_0x1ec99b
 	db "@"
 
 
 
 
-BTGreetingF1: ; 0x11f5a5
+BTGreetingF1:
 	text_jump UnknownText_0x1ec9bd
 	db "@"
 
-BTLossF1: ; 0x11f5aa
+BTLossF1:
 	text_jump UnknownText_0x1ec9d9
 	db "@"
 
-BTWinF1: ; 0x11f5af
+BTWinF1:
 	text_jump UnknownText_0x1ec9f7
 	db "@"
 
-BTGreetingF2: ; 0x11f5b4
+BTGreetingF2:
 	text_jump UnknownText_0x1eca0a
 	db "@"
 
-BTLossF2: ; 0x11f5b9
+BTLossF2:
 	text_jump UnknownText_0x1eca2a
 	db "@"
 
-BTWinF2: ; 0x11f5be
+BTWinF2:
 	text_jump UnknownText_0x1eca47
 	db "@"
 
-BTGreetingF3: ; 0x11f5c3
+BTGreetingF3:
 	text_jump UnknownText_0x1eca64
 	db "@"
 
-BTLossF3: ; 0x11f5c8
+BTLossF3:
 	text_jump UnknownText_0x1eca82
 	db "@"
 
-BTWinF3: ; 0x11f5cd
+BTWinF3:
 	text_jump UnknownText_0x1eca9d
 	db "@"
 
-BTGreetingF4: ; 0x11f5d2
+BTGreetingF4:
 	text_jump UnknownText_0x1ecabf
 	db "@"
 
-BTLossF4: ; 0x11f5d7
+BTLossF4:
 	text_jump UnknownText_0x1ecade
 	db "@"
 
-BTWinF4: ; 0x11f5dc
+BTWinF4:
 	text_jump UnknownText_0x1ecafa
 	db "@"
 
-BTGreetingF5: ; 0x11f5e1
+BTGreetingF5:
 	text_jump UnknownText_0x1ecb19
 	db "@"
 
-BTLossF5: ; 0x11f5e6
+BTLossF5:
 	text_jump UnknownText_0x1ecb37
 	db "@"
 
-BTWinF5: ; 0x11f5eb
+BTWinF5:
 	text_jump UnknownText_0x1ecb55
 	db "@"
 
-BTGreetingF6: ; 0x11f5f0
+BTGreetingF6:
 	text_jump UnknownText_0x1ecb70
 	db "@"
 
-BTLossF6: ; 0x11f5f5
+BTLossF6:
 	text_jump UnknownText_0x1ecb92
 	db "@"
 
-BTWinF6: ; 0x11f5fa
+BTWinF6:
 	text_jump UnknownText_0x1ecbb6
 	db "@"
 
-BTGreetingF7: ; 0x11f5ff
+BTGreetingF7:
 	text_jump UnknownText_0x1ecbd9
 	db "@"
 
-BTLossF7: ; 0x11f604
+BTLossF7:
 	text_jump UnknownText_0x1ecbf3
 	db "@"
 
-BTWinF7: ; 0x11f609
+BTWinF7:
 	text_jump UnknownText_0x1ecc15
 	db "@"
 
-BTGreetingF8: ; 0x11f60e
+BTGreetingF8:
 	text_jump UnknownText_0x1ecc39
 	db "@"
 
-BTLossF8: ; 0x11f613
+BTLossF8:
 	text_jump UnknownText_0x1ecc55
 	db "@"
 
-BTWinF8: ; 0x11f618
+BTWinF8:
 	text_jump UnknownText_0x1ecc75
 	db "@"
 
-BTGreetingF9: ; 0x11f61d
+BTGreetingF9:
 	text_jump UnknownText_0x1ecc92
 	db "@"
 
-BTLossF9: ; 0x11f622
+BTLossF9:
 	text_jump UnknownText_0x1ecca7
 	db "@"
 
-BTWinF9: ; 0x11f627
+BTWinF9:
 	text_jump UnknownText_0x1eccc1
 	db "@"
 
-BTGreetingF10: ; 0x11f62c
+BTGreetingF10:
 	text_jump UnknownText_0x1eccd7
 	db "@"
 
-BTLossF10: ; 0x11f631
+BTLossF10:
 	text_jump UnknownText_0x1eccef
 	db "@"
 
-BTWinF10: ; 0x11f636
+BTWinF10:
 	text_jump UnknownText_0x1ecd0e
 	db "@"
 
-BTGreetingF11: ; 0x11f63b
+BTGreetingF11:
 	text_jump UnknownText_0x1ecd2b
 	db "@"
 
-BTLossF11: ; 0x11f640
+BTLossF11:
 	text_jump UnknownText_0x1ecd4d
 	db "@"
 
-BTWinF11: ; 0x11f645
+BTWinF11:
 	text_jump UnknownText_0x1ecd6b
 	db "@"
 
-BTGreetingF12: ; 0x11f64a
+BTGreetingF12:
 	text_jump UnknownText_0x1ecd8d
 	db "@"
 
-BTLossF12: ; 0x11f64f
+BTLossF12:
 	text_jump UnknownText_0x1ecdaf
 	db "@"
 
-BTWinF12: ; 0x11f654
+BTWinF12:
 	text_jump UnknownText_0x1ecdcf
 	db "@"
 
-BTGreetingF13: ; 0x11f659
+BTGreetingF13:
 	text_jump UnknownText_0x1ecded
 	db "@"
 
-BTLossF13: ; 0x11f65e
+BTLossF13:
 	text_jump UnknownText_0x1ece0d
 	db "@"
 
-BTWinF13: ; 0x11f663
+BTWinF13:
 	text_jump UnknownText_0x1ece2a
 	db "@"
 
-BTGreetingF14: ; 0x11f668
+BTGreetingF14:
 	text_jump UnknownText_0x1ece4b
 	db "@"
 
-BTLossF14: ; 0x11f66d
+BTLossF14:
 	text_jump UnknownText_0x1ece70
 	db "@"
 
-BTWinF14: ; 0x11f672
+BTWinF14:
 	text_jump UnknownText_0x1ece8a
 	db "@"
 
-BTGreetingF15: ; 0x11f677
+BTGreetingF15:
 	text_jump UnknownText_0x1ecea8
 	db "@"
 
-BTLossF15: ; 0x11f67c
+BTLossF15:
 	text_jump UnknownText_0x1ecec9
 	db "@"
 
-BTWinF15: ; 0x11f681
+BTWinF15:
 	text_jump UnknownText_0x1ecee8
 	db "@"

engine/events/buena.asm

@@ -27,21 +27,19 @@ BuenasPassword:
 	ld [wScriptVar], a
 	ret
 
-.MenuHeader: ; 0x8afa9
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 10, 7
 	dw .MenuData
 	db 1 ; default option
-; 0x8afb1
 
 	db 0
 
-.MenuData: ; 0x8afb2
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
 	db 0 ; items
 	dw .PasswordIndices
 	dw .PlacePasswordChoices
-; 0x8afb4
 
 .PasswordIndices:
 	db NUM_PASSWORDS_PER_CATEGORY
@@ -148,40 +146,34 @@ BuenaPrize:
 	call PlayClickSFX
 	ret
 
-.Text_AskWhichPrize: ; 0x8b072
+.Text_AskWhichPrize:
 	; Which prize would you like?
 	text_jump UnknownText_0x1c589f
 	db "@"
-; 0x8b077
 
-.Text_IsThatRight: ; 0x8b077
+.Text_IsThatRight:
 	; ? Is that right?
 	text_jump UnknownText_0x1c58bc
 	db "@"
-; 0x8b07c
 
 .Text_HereYouGo:	; Here you go!
 	text_jump UnknownText_0x1c58d1
 	db "@"
-; 0x8b081
 
-.Text_NotEnoughPoints: ; 0x8b081
+.Text_NotEnoughPoints:
 	; You don't have enough points.
 	text_jump UnknownText_0x1c58e0
 	db "@"
-; 0x8b086
 
-.Text_NoRoom: ; 0x8b086
+.Text_NoRoom:
 	; You have no room for it.
 	text_jump UnknownText_0x1c58ff
 	db "@"
-; 0x8b08b
 
-.Text_PleaseComeBackAgain: ; 0x8b08b
+.Text_PleaseComeBackAgain:
 	; Oh. Please come back again!
 	text_jump UnknownText_0x1c591a
 	db "@"
-; 0x8b090
 
 Buena_DisplayBlueCardBalance:
 	ld hl, BlueCardBalanceMenuHeader
@@ -220,7 +212,7 @@ PrintBlueCardBalance:
 .Points_string:
 	db "Points@"
 
-BlueCardBalanceMenuHeader: ; 0x8b0d1
+BlueCardBalanceMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 11, 11, 13
 
@@ -229,7 +221,7 @@ Buena_PlacePrizeMenuBox:
 	call LoadMenuHeader
 	ret
 
-.MenuHeader ; 0x8b0dd
+.MenuHeader
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 17, TEXTBOX_Y - 1
 
@@ -259,16 +251,15 @@ Buena_PrizeMenu:
 	xor a
 	ret
 
-.MenuHeader: ; 0x8b113
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 1, 1, 16, 9
 	dw .MenuData
 	db 1 ; default option
-; 0x8b11b
 
 	db 0
 
-.MenuData: ; 0x8b11c
+.MenuData:
 	db SCROLLINGMENU_DISPLAY_ARROWS ; flags
 	db 4, 13 ; rows, columns
 	db 1 ; spacing

engine/events/bug_contest/caught_mon.asm

@@ -32,7 +32,7 @@ BugContest_SetCaughtContestMon:
 	ld hl, wContestMon
 	jp GeneratePartyMonStats
 
-.caughttext ; 0xe71d
+.caughttext
 	; Caught @ !
 	text_jump UnknownText_0x1c10c0
 	db "@"

engine/events/bug_contest/contest.asm

@@ -6,7 +6,7 @@ GiveParkBalls:
 	farcall StartBugContestTimer
 	ret
 
-BugCatchingContestBattleScript:: ; 0x135eb
+BugCatchingContestBattleScript::
 	writecode VAR_BATTLETYPE, BATTLETYPE_CONTEST
 	randomwildmon
 	startbattle
@@ -15,29 +15,29 @@ BugCatchingContestBattleScript:: ; 0x135eb
 	iffalse BugCatchingContestOutOfBallsScript
 	end
 
-BugCatchingContestOverScript:: ; 0x135f8
+BugCatchingContestOverScript::
 	playsound SFX_ELEVATOR_END
 	opentext
 	writetext BugCatchingContestText_BeeepTimesUp
 	waitbutton
 	jump BugCatchingContestReturnToGateScript
 
-BugCatchingContestOutOfBallsScript: ; 0x13603
+BugCatchingContestOutOfBallsScript:
 	playsound SFX_ELEVATOR_END
 	opentext
 	writetext BugCatchingContestText_ContestIsOver
 	waitbutton
 
-BugCatchingContestReturnToGateScript: ; 0x1360b
+BugCatchingContestReturnToGateScript:
 	closetext
 	jumpstd bugcontestresultswarp
 
-BugCatchingContestText_BeeepTimesUp: ; 0x1360f
+BugCatchingContestText_BeeepTimesUp:
 	; ANNOUNCER: BEEEP! Time's up!
 	text_jump UnknownText_0x1bd2ca
 	db "@"
 
-BugCatchingContestText_ContestIsOver: ; 0x13614
+BugCatchingContestText_ContestIsOver:
 	; ANNOUNCER: The Contest is over!
 	text_jump UnknownText_0x1bd2e7
 	db "@"

engine/events/bug_contest/display_stats.asm

@@ -96,7 +96,7 @@ DisplayAlreadyCaughtText:
 	ld hl, .AlreadyCaughtText
 	jp PrintText
 
-.AlreadyCaughtText: ; 0xcc0d0
+.AlreadyCaughtText:
 	; You already caught a @ .
 	text_jump UnknownText_0x1c10dd
 	db "@"

engine/events/bug_contest/judging.asm

@@ -25,7 +25,7 @@ _BugContestJudging:
 	call PrintText
 	jp BugContest_GetPlayersResult
 
-BugContest_FirstPlaceText: ; 0x136eb
+BugContest_FirstPlaceText:
 	text_jump ContestJudging_FirstPlaceText
 	start_asm
 	ld de, SFX_1ST_PLACE
@@ -34,13 +34,12 @@ BugContest_FirstPlaceText: ; 0x136eb
 	ld hl, BugContest_FirstPlaceScoreText
 	ret
 
-BugContest_FirstPlaceScoreText: ; 0x136fd
+BugContest_FirstPlaceScoreText:
 	; The winning score was @  points!
 	text_jump ContestJudging_FirstPlaceScoreText
 	db "@"
-; 0x13702
 
-BugContest_SecondPlaceText: ; 0x13702
+BugContest_SecondPlaceText:
 	; Placing second was @ , who caught a @ !@ @
 	text_jump ContestJudging_SecondPlaceText
 	start_asm
@@ -50,13 +49,12 @@ BugContest_SecondPlaceText: ; 0x13702
 	ld hl, BugContest_SecondPlaceScoreText
 	ret
 
-BugContest_SecondPlaceScoreText: ; 0x13714
+BugContest_SecondPlaceScoreText:
 	; The score was @  points!
 	text_jump ContestJudging_SecondPlaceScoreText
 	db "@"
-; 0x13719
 
-BugContest_ThirdPlaceText: ; 0x13719
+BugContest_ThirdPlaceText:
 	; Placing third was @ , who caught a @ !@ @
 	text_jump ContestJudging_ThirdPlaceText
 	start_asm
@@ -66,11 +64,10 @@ BugContest_ThirdPlaceText: ; 0x13719
 	ld hl, BugContest_ThirdPlaceScoreText
 	ret
 
-BugContest_ThirdPlaceScoreText: ; 0x1372b
+BugContest_ThirdPlaceScoreText:
 	; The score was @  points!
 	text_jump ContestJudging_ThirdPlaceScoreText
 	db "@"
-; 0x13730
 
 LoadContestantName:
 ; If a = 1, get your name.

engine/events/card_key.asm

@@ -32,7 +32,6 @@ _CardKey:
 	ld [wItemEffectSucceeded], a
 	ret
 
-.CardKeyScript: ; 0x507af
+.CardKeyScript:
 	closetext
 	farjump CardKeySlotScript
-; 0x507b4

engine/events/daycare.asm

@@ -166,11 +166,10 @@ DayCareAskDepositPokemon:
 	scf
 	ret
 
-.DummyText: ; 0x167f1
+.DummyText:
 	;
 	text_jump UnknownText_0x1bdaa7
 	db "@"
-; 0x167f6
 
 DayCare_DepositPokemonText:
 	ld a, DAYCARETEXT_DEPOSIT
@@ -296,125 +295,105 @@ PrintDayCareText:
 	dw .OhFineThen ; 12
 	dw .ComeAgain ; 13
 
-.DayCareManIntro: ; 0x168d2
+.DayCareManIntro:
 	; I'm the DAY-CARE MAN. Want me to raise a #MON?
 	text_jump UnknownText_0x1bdaa9
 	db "@"
-; 0x168d7
 
-.DayCareManOddEgg: ; 0x168d7
+.DayCareManOddEgg:
 	; I'm the DAY-CARE MAN. Do you know about EGGS? I was raising #MON with my wife, you see. We were shocked to find an EGG! How incredible is that? So, want me to raise a #MON?
 	text_jump UnknownText_0x1bdad8
 	db "@"
-; 0x168dc
 
-.DayCareLadyIntro: ; 0x168dc
+.DayCareLadyIntro:
 	; I'm the DAY-CARE LADY. Should I raise a #MON for you?
 	text_jump UnknownText_0x1bdb85
 	db "@"
-; 0x168e1
 
-.DayCareLadyOddEgg: ; 0x168e1
+.DayCareLadyOddEgg:
 	; I'm the DAY-CARE LADY. Do you know about EGGS? My husband and I were raising some #MON, you see. We were shocked to find an EGG! How incredible could that be? Should I raise a #MON for you?
 	text_jump UnknownText_0x1bdbbb
 	db "@"
-; 0x168e6
 
-.WhichOne: ; 0x168e6
+.WhichOne:
 	; What should I raise for you?
 	text_jump UnknownText_0x1bdc79
 	db "@"
-; 0x168eb
 
-.JustOneMon: ; 0x168eb
+.JustOneMon:
 	; Oh? But you have just one #MON.
 	text_jump UnknownText_0x1bdc97
 	db "@"
-; 0x168f0
 
-.CantAcceptEgg: ; 0x168f0
+.CantAcceptEgg:
 	; Sorry, but I can't accept an EGG.
 	text_jump UnknownText_0x1bdcb8
 	db "@"
-; 0x168f5
 
-.RemoveMail: ; 0x168f5
+.RemoveMail:
 	; Remove MAIL before you come see me.
 	text_jump UnknownText_0x1bdcda
 	db "@"
-; 0x168fa
 
-.LastHealthyMon: ; 0x168fa
+.LastHealthyMon:
 	; If you give me that, what will you battle with?
 	text_jump UnknownText_0x1bdcff
 	db "@"
-; 0x168ff
 
-.OkayIllRaiseYourMon: ; 0x168ff
+.OkayIllRaiseYourMon:
 	; OK. I'll raise your @ .
 	text_jump UnknownText_0x1bdd30
 	db "@"
-; 0x16904
 
-.ComeBackForItLater: ; 0x16904
+.ComeBackForItLater:
 	; Come back for it later.
 	text_jump UnknownText_0x1bdd4b
 	db "@"
-; 0x16909
 
-.AreWeGeniusesOrWhat: ; 0x16909
+.AreWeGeniusesOrWhat:
 	; Are we geniuses or what? Want to see your @ ?
 	text_jump UnknownText_0x1bdd64
 	db "@"
-; 0x1690e
 
-.AskRetrieveMon: ; 0x1690e
+.AskRetrieveMon:
 	; Your @ has grown a lot. By level, it's grown by @ . If you want your #MON back, it will cost ¥@ .
 	text_jump UnknownText_0x1bdd96
 	db "@"
-; 0x16913
 
-.PerfectHeresYourMon: ; 0x16913
+.PerfectHeresYourMon:
 	; Perfect! Here's your #MON.
 	text_jump UnknownText_0x1bde04
 	db "@"
-; 0x16918
 
-.GotBackMon: ; 0x16918
+.GotBackMon:
 	; got back @ .
 	text_jump UnknownText_0x1bde1f
 	db "@"
-; 0x1691d
 
-.ImmediatelyWithdrawMon: ; 0x1691d
+.ImmediatelyWithdrawMon:
 	; Huh? Back already? Your @ needs a little more time with us. If you want your #MON back, it will cost ¥100.
 	text_jump UnknownText_0x1bde32
 	db "@"
-; 0x16922
 
-.PartyFull: ; 0x16922
+.PartyFull:
 	; You have no room for it.
 	text_jump UnknownText_0x1bdea2
 	db "@"
-; 0x16927
 
-.NotEnoughMoney: ; 0x16927
+.NotEnoughMoney:
 	; You don't have enough money.
 	text_jump UnknownText_0x1bdebc
 	db "@"
-; 0x1692c
 
-.OhFineThen: ; 0x1692c
+.OhFineThen:
 	; Oh, fine then.
 	text_jump UnknownText_0x1bded9
 	db "@"
-; 0x16931
 
-.ComeAgain: ; 0x16931
+.ComeAgain:
 	; Come again.
 	text_jump UnknownText_0x1bdee9
 	db "@"
-; 0x16936
 
 DayCareManOutside:
 	ld hl, wDayCareMan
@@ -424,11 +403,10 @@ DayCareManOutside:
 	call PrintText
 	ret
 
-.NotYet: ; 0x16944
+.NotYet:
 	; Not yet…
 	text_jump UnknownText_0x1bdef6
 	db "@"
-; 0x16949
 
 .AskGiveEgg:
 	ld hl, .IntroText
@@ -467,35 +445,30 @@ DayCareManOutside:
 	ld [wScriptVar], a
 	ret
 
-.IntroText: ; 0x16993
+.IntroText:
 	; Ah, it's you! We were raising your #MON, and my goodness, were we surprised! Your #MON had an EGG! We don't know how it got there, but your #MON had it. You want it?
 	text_jump UnknownText_0x1bdf00
 	db "@"
-; 0x16998
 
-.GotEggText: ; 0x16998
+.GotEggText:
 	; received the EGG!
 	text_jump UnknownText_0x1bdfa5
 	db "@"
-; 0x1699d
 
-.TakeGoodCareOfItText: ; 0x1699d
+.TakeGoodCareOfItText:
 	; Take good care of it.
 	text_jump UnknownText_0x1bdfba
 	db "@"
-; 0x169a2
 
-.IllKeepItThanksText: ; 0x169a2
+.IllKeepItThanksText:
 	; Well then, I'll keep it. Thanks!
 	text_jump UnknownText_0x1bdfd1
 	db "@"
-; 0x169a7
 
-.PartyFullText: ; 0x169a7
+.PartyFullText:
 	; You have no room in your party. Come back later.
 	text_jump UnknownText_0x1bdff2
 	db "@"
-; 0x169ac
 
 DayCare_GiveEgg:
 	ld a, [wEggMonLevel]

engine/events/dratini.asm

@@ -1,4 +1,4 @@
-GiveDratini: ; 0x8b170
+GiveDratini:
 ; if wScriptVar is 0 or 1, change the moveset of the last Dratini in the party.
 ;  0: give it a special moveset with Extremespeed.
 ;  1: give it the normal moveset of a level 15 Dratini.
@@ -84,7 +84,7 @@ GiveDratini: ; 0x8b170
 	db TWISTER
 	db 0
 
-.GetNthPartyMon: ; 0x8b1ce
+.GetNthPartyMon:
 ; inputs:
 ; hl must be set to 0 before calling this function.
 ; a must be set to the number of Pokémon in the party.

engine/events/elevator.asm

@@ -137,11 +137,10 @@ Elevator_AskWhichFloor:
 	scf
 	ret
 
-Elevator_WhichFloorText: ; 0x1350d
+Elevator_WhichFloorText:
 	; Which floor?
 	text_jump UnknownText_0x1bd2bc
 	db "@"
-; 0x13512
 
 
 Elevator_GetCurrentFloorText:
@@ -178,14 +177,13 @@ Elevator_GetCurrentFloorString:
 	call GetFloorString
 	ret
 
-Elevator_MenuHeader: ; 0x13550
+Elevator_MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 12, 1, 18, 9
 	dw Elevator_MenuData
 	db 1 ; default option
-; 0x13558
 
-Elevator_MenuData: ; 0x13558
+Elevator_MenuData:
 	db SCROLLINGMENU_DISPLAY_ARROWS ; flags
 	db 4, 0 ; rows, columns
 	db 1 ; horizontal spacing

engine/events/forced_movement.asm

@@ -1,60 +1,51 @@
-Script_ForcedMovement:: ; 0x1253d
+Script_ForcedMovement::
 	checkcode VAR_FACING
 	ifequal DOWN, .down
 	ifequal UP, .up
 	ifequal LEFT, .left
 	ifequal RIGHT, .right
 	end
-; 0x12550
 
-.up ; 0x12550
+.up
 	applymovement PLAYER, .MovementData_up
 	end
-; 0x12555
 
-.down ; 0x12555
+.down
 	applymovement PLAYER, .MovementData_down
 	end
-; 0x1255a
 
-.right ; 0x1255a
+.right
 	applymovement PLAYER, .MovementData_right
 	end
-; 0x1255f
 
-.left ; 0x1255f
+.left
 	applymovement PLAYER, .MovementData_left
 	end
-; 0x12564
 
-.MovementData_up: ; 0x12564
+.MovementData_up:
 	step_dig 16
 	turn_in DOWN
 	step_dig 16
 	turn_head DOWN
 	step_end
-; 0x1256b
 
-.MovementData_down: ; 0x1256b
+.MovementData_down:
 	step_dig 16
 	turn_in UP
 	step_dig 16
 	turn_head UP
 	step_end
-; 0x12572
 
-.MovementData_right: ; 0x12572
+.MovementData_right:
 	step_dig 16
 	turn_in LEFT
 	step_dig 16
 	turn_head LEFT
 	step_end
-; 0x12579
 
-.MovementData_left: ; 0x12579
+.MovementData_left:
 	step_dig 16
 	turn_in RIGHT
 	step_dig 16
 	turn_head RIGHT
 	step_end
-; 0x12580

engine/events/halloffame.asm

@@ -1,6 +1,6 @@
 HALLOFFAME_COLON EQU $63
 
-HallOfFame:: ; 0x8640e
+HallOfFame::
 	call HallOfFame_FadeOutMusic
 	ld a, [wStatusFlags]
 	push af
@@ -33,7 +33,6 @@ HallOfFame:: ; 0x8640e
 	ld b, a
 	farcall Credits
 	ret
-; 0x86455
 
 RedCredits::
 	ld a, LOW(MUSIC_NONE)

engine/events/itemfinder.asm

@@ -26,31 +26,27 @@ ItemFinder:
 	jr nz, .sfx_loop
 	ret
 
-.Script_FoundSomething: ; 0x125ad
+.Script_FoundSomething:
 	reloadmappart
 	special UpdateTimePals
 	callasm .ItemfinderSound
 	writetext .Text_FoundSomething
 	closetext
 	end
-; 0x125ba
 
-.Script_FoundNothing: ; 0x125ba
+.Script_FoundNothing:
 	reloadmappart
 	special UpdateTimePals
 	writetext .Text_FoundNothing
 	closetext
 	end
-; 0x125c3
 
-.Text_FoundSomething: ; 0x125c3
+.Text_FoundSomething:
 	; Yes! ITEMFINDER indicates there's an item nearby.
 	text_jump UnknownText_0x1c0a77
 	db "@"
-; 0x125c8
 
-.Text_FoundNothing: ; 0x125c8
+.Text_FoundNothing:
 	; Nope! ITEMFINDER isn't responding.
 	text_jump UnknownText_0x1c0aa9
 	db "@"
-; 0x125cd

engine/events/kurt.asm

@@ -3,22 +3,20 @@ Kurt_PrintTextWhichApricorn:
 	call PrintText
 	ret
 
-.Text: ; 0x88007
+.Text:
 	; Which APRICORN should I use?
 	text_jump UnknownText_0x1bc06b
 	db "@"
-; 0x8800c
 
 Kurt_PrintTextHowMany:
 	ld hl, .Text
 	call PrintText
 	ret
 
-.Text: ; 0x88013
+.Text:
 	; How many should I make?
 	text_jump UnknownText_0x1bc089
 	db "@"
-; 0x88018
 
 SelectApricornForKurt:
 	call LoadStandardMenuHeader
@@ -79,16 +77,15 @@ Kurt_SelectApricorn:
 	ld c, a
 	ret
 
-.MenuHeader: ; 0x88086
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 1, 1, 13, 10
 	dw .MenuData
 	db 1 ; default option
-; 0x8808e
 
 	db 0 ; XXX
 
-.MenuData: ; 0x8808f
+.MenuData:
 	db SCROLLINGMENU_DISPLAY_ARROWS ; flags
 	db 4, 7
 	db 1
@@ -150,7 +147,7 @@ Kurt_SelectQuantity:
 	call CloseWindow
 	ret
 
-.MenuHeader: ; 0x8810d
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 6, 9, SCREEN_WIDTH - 1, 12
 	dw NULL

engine/events/lucky_number.asm

@@ -206,12 +206,12 @@ CheckForLuckyNumberWinners:
 	dba sBox13
 	dba sBox14
 
-.FoundPartymonText: ; 0x4d9c9
+.FoundPartymonText:
 	; Congratulations! We have a match with the ID number of @  in your party.
 	text_jump UnknownText_0x1c1261
 	db "@"
 
-.FoundBoxmonText: ; 0x4d9ce
+.FoundBoxmonText:
 	; Congratulations! We have a match with the ID number of @  in your PC BOX.
 	text_jump UnknownText_0x1c12ae
 	db "@"

engine/events/magikarp.asm

@@ -71,11 +71,10 @@ CheckMagikarpLength:
 	ld [wScriptVar], a
 	ret
 
-.MeasureItText: ; 0xfbba9
+.MeasureItText:
 	; Let me measure that MAGIKARP. …Hm, it measures @ .
 	text_jump UnknownText_0x1c1203
 	db "@"
-; 0xfbbae
 
 Magikarp_LoadFeetInchesChars:
 	ld hl, vTiles2 tile "′" ; $6e
@@ -315,8 +314,7 @@ MagikarpHouseSign:
 	call PrintText
 	ret
 
-.CurrentRecordtext: ; 0xfbce8
+.CurrentRecordtext:
 	; "CURRENT RECORD"
 	text_jump UnknownText_0x1c123a
 	db "@"
-; 0xfbced

engine/events/misc_scripts.asm

@@ -1,4 +1,4 @@
-Script_AbortBugContest: ; 0x122c1
+Script_AbortBugContest:
 	checkflag ENGINE_BUG_CONTEST_TIMER
 	iffalse .finish
 	setflag ENGINE_DAILY_BUG_CONTEST
@@ -6,7 +6,7 @@ Script_AbortBugContest: ; 0x122c1
 .finish
 	end
 
-FindItemInBallScript:: ; 0x122ce
+FindItemInBallScript::
 	callasm .TryReceiveItem
 	iffalse .no_room
 	disappear LAST_TALKED
@@ -17,9 +17,8 @@ FindItemInBallScript:: ; 0x122ce
 	itemnotify
 	closetext
 	end
-; 0x122e3
 
-.no_room ; 0x122e3
+.no_room
 	opentext
 	writetext .text_found
 	waitbutton
@@ -27,19 +26,16 @@ FindItemInBallScript:: ; 0x122ce
 	waitbutton
 	closetext
 	end
-; 0x122ee
 
-.text_found ; 0x122ee
+.text_found
 	; found @ !
 	text_jump UnknownText_0x1c0a1c
 	db "@"
-; 0x122f3
 
-.text_bag_full ; 0x122f3
+.text_bag_full
 	; But   can't carry any more items.
 	text_jump UnknownText_0x1c0a2c
 	db "@"
-; 0x122f8
 
 .TryReceiveItem:
 	xor a

engine/events/misc_scripts_2.asm

@@ -1,16 +1,16 @@
-RepelWoreOffScript:: ; 0x13619
+RepelWoreOffScript::
 	opentext
 	writetext .text
 	waitbutton
 	closetext
 	end
 
-.text ; 0x13620
+.text
 	; REPEL's effect wore off.
 	text_jump UnknownText_0x1bd308
 	db "@"
 
-HiddenItemScript:: ; 0x13625
+HiddenItemScript::
 	opentext
 	copybytetovar wEngineBuffer3
 	itemtotext USE_SCRIPT_VAR, MEM_BUFFER_0
@@ -22,7 +22,7 @@ HiddenItemScript:: ; 0x13625
 	itemnotify
 	jump .finish
 
-.bag_full ; 0x1363e
+.bag_full
 	buttonsound
 	writetext .no_room_text
 	waitbutton
@@ -31,12 +31,12 @@ HiddenItemScript:: ; 0x13625
 	closetext
 	end
 
-.found_text ; 0x13645
+.found_text
 	; found @ !
 	text_jump UnknownText_0x1bd321
 	db "@"
 
-.no_room_text ; 0x1364a
+.no_room_text
 	; But   has no space left…
 	text_jump UnknownText_0x1bd331
 	db "@"

engine/events/mom.asm

@@ -389,42 +389,36 @@ DSTChecks:
 	call ClearBox
 	ret
 
-.Text_AdjustClock: ; 0x164f4
+.Text_AdjustClock:
 	; Do you want to adjust your clock for Daylight Saving Time?
 	text_jump UnknownText_0x1c6095
 	db "@"
-; 0x164f9
 
-.Text_LostInstructionBooklet: ; 0x164f9
+.Text_LostInstructionBooklet:
 	; I lost the instruction booklet for the POKéGEAR.
 	; Come back again in a while.
 	text_jump UnknownText_0x1c60d1
 	db "@"
-; 0x164fe
 
-.Text_SwitchToDST: ; 0x164fe
+.Text_SwitchToDST:
 	; Do you want to switch to Daylight Saving Time?
 	text_jump UnknownText_0x1c6000
 	db "@"
-; 0x16503
 
-.Text_SetClockForward: ; 0x16503
+.Text_SetClockForward:
 	; I set the clock forward by one hour.
 	text_jump UnknownText_0x1c6030
 	db "@"
-; 0x16508
 
-.Text_IsDSTOver: ; 0x16508
+.Text_IsDSTOver:
 	; Is Daylight Saving Time over?
 	text_jump UnknownText_0x1c6056
 	db "@"
-; 0x1650d
 
-.Text_SetClockBack: ; 0x1650d
+.Text_SetClockBack:
 	; I put the clock back one hour.
 	text_jump UnknownText_0x1c6075
 	db "@"
-; 0x16512
 
 Mom_SetUpWithdrawMenu:
 	ld de, Mon_WithdrawString
@@ -596,101 +590,85 @@ Mom_WithdrawDepositMenuJoypad:
 	dt 90
 	dt 9
 
-UnknownText_0x16649: ; 0x16649
+UnknownText_0x16649:
 	; Wow, that's a cute #MON. Where did you get it? … So, you're leaving on an adventure… OK! I'll help too. But what can I do for you? I know! I'll save money for you. On a long journey, money's important. Do you want me to save your money?
 	text_jump UnknownText_0x1bd77f
 	db "@"
-; 0x1664e
 
-UnknownText_0x1664e: ; 0x1664e
+UnknownText_0x1664e:
 	; OK, I'll take care of your money.
 	text_jump UnknownText_0x1bd868
 	db "@"
-; 0x16653
 
-UnknownText_0x16653: ; 0x16653
+UnknownText_0x16653:
 	; Be careful. #MON are your friends. You need to work as a team. Now, go on!
 	text_jump UnknownText_0x1bd88e
 	db "@"
-; 0x16658
 
-UnknownText_0x16658: ; 0x16658
+UnknownText_0x16658:
 	; Hi! Welcome home! You're trying very hard, I see. I've kept your room tidy. Or is this about your money?
 	text_jump UnknownText_0x1bd8da
 	db "@"
-; 0x1665d
 
-UnknownText_0x1665d: ; 0x1665d
+UnknownText_0x1665d:
 	; What do you want to do?
 	text_jump UnknownText_0x1bd942
 	db "@"
-; 0x16662
 
-UnknownText_0x16662: ; 0x16662
+UnknownText_0x16662:
 	; How much do you want to save?
 	text_jump UnknownText_0x1bd95b
 	db "@"
-; 0x16667
 
-UnknownText_0x16667: ; 0x16667
+UnknownText_0x16667:
 	; How much do you want to take?
 	text_jump UnknownText_0x1bd97a
 	db "@"
-; 0x1666c
 
-UnknownText_0x1666c: ; 0x1666c
+UnknownText_0x1666c:
 	; Do you want to save some money?
 	text_jump UnknownText_0x1bd999
 	db "@"
-; 0x16671
 
-UnknownText_0x16671: ; 0x16671
+UnknownText_0x16671:
 	; You haven't saved that much.
 	text_jump UnknownText_0x1bd9ba
 	db "@"
-; 0x16676
 
-UnknownText_0x16676: ; 0x16676
+UnknownText_0x16676:
 	; You can't take that much.
 	text_jump UnknownText_0x1bd9d7
 	db "@"
-; 0x1667b
 
-UnknownText_0x1667b: ; 0x1667b
+UnknownText_0x1667b:
 	; You don't have that much.
 	text_jump UnknownText_0x1bd9f1
 	db "@"
-; 0x16680
 
-UnknownText_0x16680: ; 0x16680
+UnknownText_0x16680:
 	; You can't save that much.
 	text_jump UnknownText_0x1bda0b
 	db "@"
-; 0x16685
 
-UnknownText_0x16685: ; 0x16685
+UnknownText_0x16685:
 	; OK, I'll save your money. Trust me! , stick with it!
 	text_jump UnknownText_0x1bda25
 	db "@"
-; 0x1668a
 
-UnknownText_0x1668a: ; 0x1668a
+UnknownText_0x1668a:
 	; Your money's safe here! Get going!
 	text_jump UnknownText_0x1bda5b
 	db "@"
-; 0x1668f
 
-UnknownText_0x1668f: ; 0x1668f
+UnknownText_0x1668f:
 	; , don't give up!
 	text_jump UnknownText_0x1bda7e
 	db "@"
-; 0x16694
 
-UnknownText_0x16694: ; 0x16694
+UnknownText_0x16694:
 	; Just do what you can.
 	text_jump UnknownText_0x1bda90
 	db "@"
-; 0x16699
 
 Mom_SavedString:
 	db "SAVED@"
@@ -704,18 +682,16 @@ Mom_DepositString:
 Mom_HeldString:
 	db "HELD@"
 
-MenuHeader_0x166b5: ; 0x166b5
+MenuHeader_0x166b5:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 10, 10
 	dw MenuData_0x166bd
 	db 1 ; default option
-; 0x166bd
 
-MenuData_0x166bd: ; 0x166bd
+MenuData_0x166bd:
 	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "GET@"
 	db "SAVE@"
 	db "CHANGE@"
 	db "CANCEL@"
-; 0x166d6

engine/events/mom_phone.asm

@@ -24,10 +24,9 @@ MomTriesToBuySomething::
 	scf
 	ret
 
-.Script: ; 0xfd00f
+.Script:
 	callasm .ASMFunction
 	farjump Script_ReceivePhoneCall
-; 0xfd017
 
 .ASMFunction:
 	call MomBuysItem_DeductFunds
@@ -166,21 +165,19 @@ Mom_GetScriptPointer:
 	ld de, .DollScript
 	ret
 
-.ItemScript: ; 0xfd0fd
+.ItemScript:
 	writetext _MomText_HiHowAreYou
 	writetext _MomText_FoundAnItem
 	writetext _MomText_BoughtWithYourMoney
 	writetext _MomText_ItsInPC
 	end
-; 0xfd10a
 
-.DollScript: ; 0xfd10a
+.DollScript:
 	writetext _MomText_HiHowAreYou
 	writetext _MomText_FoundADoll
 	writetext _MomText_BoughtWithYourMoney
 	writetext _MomText_ItsInRoom
 	end
-; 0xfd117
 
 
 GetItemFromMom:
@@ -213,41 +210,35 @@ INCLUDE "data/items/mom_phone.asm"
 
 	db 0, 0, 0 ; unused
 
-_MomText_HiHowAreYou: ; 0xfd1b1
+_MomText_HiHowAreYou:
 	; Hi,  ! How are you?
 	text_jump UnknownText_0x1bc615
 	db "@"
-; 0xfd1b6
 
-_MomText_FoundAnItem: ; 0xfd1b6
+_MomText_FoundAnItem:
 	; I found a useful item shopping, so
 	text_jump UnknownText_0x1bc62a
 	db "@"
-; 0xfd1bb
 
-_MomText_BoughtWithYourMoney: ; 0xfd1bb
+_MomText_BoughtWithYourMoney:
 	; I bought it with your money. Sorry!
 	text_jump UnknownText_0x1bc64e
 	db "@"
-; 0xfd1c0
 
-_MomText_ItsInPC: ; 0xfd1c0
+_MomText_ItsInPC:
 	; It's in your PC. You'll like it!
 	text_jump UnknownText_0x1bc673
 	db "@"
-; 0xfd1c5
 
-_MomText_FoundADoll: ; 0xfd1c5
+_MomText_FoundADoll:
 	; While shopping today, I saw this adorable doll, so
 	text_jump UnknownText_0x1bc693
 	db "@"
-; 0xfd1ca
 
-_MomText_ItsInRoom: ; 0xfd1ca
+_MomText_ItsInRoom:
 	; It's in your room. You'll love it!
 	text_jump UnknownText_0x1bc6c7
 	db "@"
-; 0xfd1cf
 
 	db 0 ; unused
 

engine/events/move_deleter.asm

@@ -59,53 +59,45 @@ MoveDeletion:
 	call PrintText
 	ret
 
-.OnlyOneMoveText: ; 0x2c5d1
+.OnlyOneMoveText:
 	; That #MON knows only one move.
 	text_jump UnknownText_0x1c5eba
 	db "@"
-; 0x2c5d6
 
-.ConfirmDeleteText: ; 0x2c5d6
+.ConfirmDeleteText:
 	; Oh, make it forget @ ?
 	text_jump UnknownText_0x1c5eda
 	db "@"
-; 0x2c5db
 
-.MoveDeletedText: ; 0x2c5db
+.MoveDeletedText:
 	; Done! Your #MON forgot the move.
 	text_jump UnknownText_0x1c5ef5
 	db "@"
-; 0x2c5e0
 
-.EggText: ; 0x2c5e0
+.EggText:
 	; An EGG doesn't know any moves!
 	text_jump UnknownText_0x1c5f17
 	db "@"
-; 0x2c5e5
 
-.DeclinedDeletionText: ; 0x2c5e5
+.DeclinedDeletionText:
 	; No? Come visit me again.
 	text_jump UnknownText_0x1c5f36
 	db "@"
-; 0x2c5ea
 
-.AskWhichMoveText: ; 0x2c5ea
+.AskWhichMoveText:
 	; Which move should it forget, then?
 	text_jump UnknownText_0x1c5f50
 	db "@"
-; 0x2c5ef
 
-.IntroText: ; 0x2c5ef
+.IntroText:
 	; Um… Oh, yes, I'm the MOVE DELETER. I can make #MON forget moves. Shall I make a #MON forget?
 	text_jump UnknownText_0x1c5f74
 	db "@"
-; 0x2c5f4
 
-.AskWhichMonText: ; 0x2c5f4
+.AskWhichMonText:
 	; Which #MON?
 	text_jump UnknownText_0x1c5fd1
 	db "@"
-; 0x2c5f9
 
 .DeleteMove:
 	ld a, b

engine/events/move_tutor.asm

@@ -98,6 +98,6 @@ CheckCanLearnMoveTutorMove:
 	scf
 	ret
 
-.MenuHeader: ; 0x4930a
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1

engine/events/name_rater.asm

@@ -178,68 +178,58 @@ GetNicknameLength:
 	jr nz, .loop
 	ret
 
-NameRaterIntroText: ; 0xfb80f
+NameRaterIntroText:
 	; Hello, hello! I'm the NAME RATER.
 	; I rate the names of #MON.
 	; Would you like me to rate names?
 	text_jump UnknownText_0x1c0043
 	db "@"
-; 0xfb814
 
-NameRaterWhichMonText: ; 0xfb814
+NameRaterWhichMonText:
 	; Which #MON's nickname should I rate for you?
 	text_jump UnknownText_0x1c00a0
 	db "@"
-; 0xfb819
 
-NameRaterIsGoodText: ; 0xfb819
+NameRaterIsGoodText:
 	; Hm… @ … That's a fairly decent name.
 	; But, how about a slightly better nickname?
 	; Want me to give it a better name?
 	text_jump UnknownText_0x1c00cd
 	db "@"
-; 0xfb81e
 
-NameRaterWhichNameText: ; 0xfb81e
+NameRaterWhichNameText:
 	; All right. What name should we give it, then?
 	text_jump UnknownText_0x1c0142
 	db "@"
-; 0xfb823
 
-NameRaterEvenBetterText: ; 0xfb823
+NameRaterEvenBetterText:
 	; That's a better name than before! Well done!
 	text_jump UnknownText_0x1c0171
 	db "@"
-; 0xfb828
 
-NameRaterCancelText: ; 0xfb828
+NameRaterCancelText:
 	; OK, then. Come again sometime.
 	text_jump UnknownText_0x1c019e
 	db "@"
-; 0xfb82d
 
-NameRaterTradedText: ; 0xfb82d
+NameRaterTradedText:
 	; Hm… @ ? What a great name! It's perfect.
 	; Treat @ with loving care.
 	text_jump UnknownText_0x1c01be
 	db "@"
-; 0xfb832
 
-NameRaterEggText: ; 0xfb832
+NameRaterEggText:
 	; Whoa… That's just an EGG.
 	text_jump UnknownText_0x1c0208
 	db "@"
-; 0xfb837
 
-NameRaterSameAsBeforeText: ; 0xfb837
+NameRaterSameAsBeforeText:
 	; It might look the different as before,
 	; but this new name is much better! Well done!
 	text_jump UnknownText_0x1c0222
 	db "@"
-; 0xfb83c
 
-NameRaterDoneText: ; 0xfb83c
+NameRaterDoneText:
 	; All right. This #MON is now named @ .
 	text_jump UnknownText_0x1c0272
 	db "@"
-; 0xfb841

engine/events/npc_trade.asm

@@ -272,7 +272,7 @@ DoNPCTrade:
 	ret
 
 
-GetTradeAttribute: ; 0xfcdc2
+GetTradeAttribute:
 	ld d, 0
 	push de
 	ld a, [wJumptableIndex]
@@ -286,7 +286,6 @@ GetTradeAttribute: ; 0xfcdc2
 	pop de
 	add hl, de
 	ret
-; 0xfcdd7
 
 Trade_GetAttributeOfCurrentPartymon:
 	ld a, [wCurPartyMon]
@@ -435,14 +434,13 @@ TradeTexts:
 	dw TradeAfterText4
 
 
-ConnectLinkCableText: ; 0xfcf7b
+ConnectLinkCableText:
 	; OK, connect the Game Link Cable.
 	text_jump UnknownText_0x1bd407
 	db "@"
-; 0xfcf80
 
 
-TradedForText: ; 0xfcf80
+TradedForText:
 	; traded givemon for getmon
 	text_jump UnknownText_0x1bd429
 	start_asm
@@ -457,113 +455,95 @@ TradedForText: ; 0xfcf80
 	; interpret_data
 	text_jump UnknownText_0x1bd445
 	db "@"
-; 0xfcf97
 
 
-TradeIntroText1: ; 0xfcf97
+TradeIntroText1:
 	; I collect #MON. Do you have @ ? Want to trade it for my @ ?
 	text_jump UnknownText_0x1bd449
 	db "@"
-; 0xfcf9c
 
-TradeCancelText1: ; 0xfcf9c
+TradeCancelText1:
 	; You don't want to trade? Aww…
 	text_jump UnknownText_0x1bd48c
 	db "@"
-; 0xfcfa1
 
-TradeWrongText1: ; 0xfcfa1
+TradeWrongText1:
 	; Huh? That's not @ .  What a letdown…
 	text_jump UnknownText_0x1bd4aa
 	db "@"
-; 0xfcfa6
 
-TradeCompleteText1: ; 0xfcfa6
+TradeCompleteText1:
 	; Yay! I got myself @ ! Thanks!
 	text_jump UnknownText_0x1bd4d2
 	db "@"
-; 0xfcfab
 
-TradeAfterText1: ; 0xfcfab
+TradeAfterText1:
 	; Hi, how's my old @  doing?
 	text_jump UnknownText_0x1bd4f4
 	db "@"
-; 0xfcfb0
 
 
 TradeIntroText2:
-TradeIntroText3: ; 0xfcfb0
+TradeIntroText3:
 	; Hi, I'm looking for this #MON. If you have @ , would you trade it for my @ ?
 	text_jump UnknownText_0x1bd512
 	db "@"
-; 0xfcfb5
 
 TradeCancelText2:
-TradeCancelText3: ; 0xfcfb5
+TradeCancelText3:
 	; You don't have one either? Gee, that's really disappointing…
 	text_jump UnknownText_0x1bd565
 	db "@"
-; 0xfcfba
 
 TradeWrongText2:
-TradeWrongText3: ; 0xfcfba
+TradeWrongText3:
 	; You don't have @ ? That's too bad, then.
 	text_jump UnknownText_0x1bd5a1
 	db "@"
-; 0xfcfbf
 
-TradeCompleteText2: ; 0xfcfbf
+TradeCompleteText2:
 	; Great! Thank you! I finally got @ .
 	text_jump UnknownText_0x1bd5cc
 	db "@"
-; 0xfcfc4
 
-TradeAfterText2: ; 0xfcfc4
+TradeAfterText2:
 	; Hi! The @ you traded me is doing great!
 	text_jump UnknownText_0x1bd5f4
 	db "@"
-; 0xfcfc9
 
 
-TradeIntroText4: ; 0xfcfc9
+TradeIntroText4:
 	; 's cute, but I don't have it. Do you have @ ? Want to trade it for my @ ?
 	text_jump UnknownText_0x1bd621
 	db "@"
-; 0xfcfce
 
-TradeCancelText4: ; 0xfcfce
+TradeCancelText4:
 	; You don't want to trade? Oh, darn…
 	text_jump UnknownText_0x1bd673
 	db "@"
-; 0xfcfd3
 
-TradeWrongText4: ; 0xfcfd3
+TradeWrongText4:
 	; That's not @ . Please trade with me if you get one.
 	text_jump UnknownText_0x1bd696
 	db "@"
-; 0xfcfd8
 
-TradeCompleteText4: ; 0xfcfd8
+TradeCompleteText4:
 	; Wow! Thank you! I always wanted @ !
 	text_jump UnknownText_0x1bd6cd
 	db "@"
-; 0xfcfdd
 
-TradeAfterText4: ; 0xfcfdd
+TradeAfterText4:
 	; How is that @  I traded you doing? Your @ 's so cute!
 	text_jump UnknownText_0x1bd6f5
 	db "@"
-; 0xfcfe2
 
 
-TradeCompleteText3: ; 0xfcfe2
+TradeCompleteText3:
 	; Uh? What happened?
 	text_jump UnknownText_0x1bd731
 	db "@"
-; 0xfcfe7
 
-TradeAfterText3: ; 0xfcfe7
+TradeAfterText3:
 	; Trading is so odd… I still have a lot to learn about it.
 	text_jump UnknownText_0x1bd745
 	db "@"
-; 0xfcfec

engine/events/overworld.asm

@@ -112,7 +112,7 @@ FieldMoveFailed:
 	call MenuTextBoxBackup
 	ret
 
-.CantUseHere: ; 0xc780
+.CantUseHere:
 	; Can't use that here.
 	text_jump UnknownText_0x1c05c8
 	db "@"
@@ -161,12 +161,12 @@ CutFunction:
 	ld a, $80
 	ret
 
-Text_UsedCut: ; 0xc7c4
+Text_UsedCut:
 	; used CUT!
 	text_jump UnknownText_0x1c05dd
 	db "@"
 
-Text_NothingToCut: ; 0xc7c9
+Text_NothingToCut:
 	; There's nothing to CUT here.
 	text_jump UnknownText_0x1c05ec
 	db "@"
@@ -210,7 +210,7 @@ Script_CutFromMenu:
 	reloadmappart
 	special UpdateTimePals
 
-Script_Cut: ; 0xc802
+Script_Cut:
 	callasm GetPartyNick
 	writetext Text_UsedCut
 	reloadmappart
@@ -316,7 +316,7 @@ UseFlash:
 	ld hl, Script_UseFlash
 	jp QueueScript
 
-Script_UseFlash: ; 0xc8e6
+Script_UseFlash:
 	reloadmappart
 	special UpdateTimePals
 	writetext UnknownText_0xc8f3
@@ -324,7 +324,7 @@ Script_UseFlash: ; 0xc8e6
 	closetext
 	end
 
-UnknownText_0xc8f3: ; 0xc8f3
+UnknownText_0xc8f3:
 	text_jump UnknownText_0x1c0609
 	start_asm
 	call WaitSFX
@@ -334,7 +334,7 @@ UnknownText_0xc8f3: ; 0xc8f3
 	ld hl, .BlankText
 	ret
 
-.BlankText: ; 0xc908
+.BlankText:
 	db "@"
 
 SurfFunction:
@@ -617,7 +617,7 @@ FlyFunction:
 	ld a, $82
 	ret
 
-.FlyScript: ; 0xcaa3
+.FlyScript:
 	reloadmappart
 	callasm HideSprites
 	special UpdateTimePals
@@ -678,11 +678,11 @@ CheckMapCanWaterfall:
 	scf
 	ret
 
-Script_WaterfallFromMenu: ; 0xcb1c
+Script_WaterfallFromMenu:
 	reloadmappart
 	special UpdateTimePals
 
-Script_UsedWaterfall: ; 0xcb20
+Script_UsedWaterfall:
 	callasm GetPartyNick
 	writetext .Text_UsedWaterfall
 	waitbutton
@@ -709,7 +709,7 @@ Script_UsedWaterfall: ; 0xcb20
 	turn_waterfall UP
 	step_end
 
-.Text_UsedWaterfall: ; 0xcb51
+.Text_UsedWaterfall:
 	; used WATERFALL!
 	text_jump UnknownText_0x1c068e
 	db "@"
@@ -736,15 +736,15 @@ TryWaterfallOW::
 	scf
 	ret
 
-Script_CantDoWaterfall: ; 0xcb7e
+Script_CantDoWaterfall:
 	jumptext .Text_CantDoWaterfall
 
-.Text_CantDoWaterfall: ; 0xcb81
+.Text_CantDoWaterfall:
 	; Wow, it's a huge waterfall.
 	text_jump UnknownText_0x1c06a3
 	db "@"
 
-Script_AskWaterfall: ; 0xcb86
+Script_AskWaterfall:
 	opentext
 	writetext .AskUseWaterfall
 	yesorno
@@ -752,7 +752,7 @@ Script_AskWaterfall: ; 0xcb86
 	closetext
 	end
 
-.AskUseWaterfall: ; 0xcb90
+.AskUseWaterfall:
 	; Do you want to use WATERFALL?
 	text_jump UnknownText_0x1c06bf
 	db "@"
@@ -839,33 +839,33 @@ dig_incave
 	ld a, $80
 	ret
 
-.Text_UsedDig: ; 0xcc1c
+.Text_UsedDig:
 	; used DIG!
 	text_jump UnknownText_0x1c06de
 	db "@"
 
-.Text_UsedEscapeRope: ; 0xcc21
+.Text_UsedEscapeRope:
 	; used an ESCAPE ROPE.
 	text_jump UnknownText_0x1c06ed
 	db "@"
 
-.Text_CantUseHere: ; 0xcc26
+.Text_CantUseHere:
 	; Can't use that here.
 	text_jump UnknownText_0x1c0705
 	db "@"
 
-.UsedEscapeRopeScript: ; 0xcc2b
+.UsedEscapeRopeScript:
 	reloadmappart
 	special UpdateTimePals
 	writetext .Text_UsedEscapeRope
 	jump .UsedDigOrEscapeRopeScript
 
-.UsedDigScript: ; 0xcc35
+.UsedDigScript:
 	reloadmappart
 	special UpdateTimePals
 	writetext .Text_UsedDig
 
-.UsedDigOrEscapeRopeScript: ; 0xcc3c
+.UsedDigOrEscapeRopeScript:
 	waitbutton
 	closetext
 	playsound SFX_WARP_TO
@@ -878,12 +878,12 @@ dig_incave
 	applymovement PLAYER, .DigReturn
 	end
 
-.DigOut: ; 0xcc59
+.DigOut:
 	step_dig 32
 	hide_object
 	step_end
 
-.DigReturn: ; 0xcc5d
+.DigReturn:
 	show_object
 	return_dig 32
 	step_end
@@ -938,17 +938,17 @@ TeleportFunction:
 	ld a, $80
 	ret
 
-.Text_ReturnToLastMonCenter: ; 0xccb1
+.Text_ReturnToLastMonCenter:
 	; Return to the last #MON CENTER.
 	text_jump UnknownText_0x1c071a
 	db "@"
 
-.Text_CantUseHere: ; 0xccb6
+.Text_CantUseHere:
 	; Can't use that here.
 	text_jump UnknownText_0x1c073b
 	db "@"
 
-.TeleportScript: ; 0xccbb
+.TeleportScript:
 	reloadmappart
 	special UpdateTimePals
 	writetext .Text_ReturnToLastMonCenter
@@ -992,7 +992,7 @@ StrengthFunction:
 	ld a, $80
 	ret
 
-.JumpText: ; 0xcd01
+.JumpText:
 	text_jump UnknownText_0x1c0751
 	db "@"
 
@@ -1019,11 +1019,11 @@ SetStrengthFlag:
 	call GetPartyNick
 	ret
 
-Script_StrengthFromMenu: ; 0xcd29
+Script_StrengthFromMenu:
 	reloadmappart
 	special UpdateTimePals
 
-Script_UsedStrength: ; 0xcd2d
+Script_UsedStrength:
 	callasm SetStrengthFlag
 	writetext .UsedStrength
 	copybytetovar wBuffer6
@@ -1033,11 +1033,11 @@ Script_UsedStrength: ; 0xcd2d
 	closetext
 	end
 
-.UsedStrength: ; 0xcd41
+.UsedStrength:
 	text_jump UnknownText_0x1c0774
 	db "@"
 
-.StrengthAllowedItToMoveBoulders: ; 0xcd46
+.StrengthAllowedItToMoveBoulders:
 	text_jump UnknownText_0x1c0788
 	db "@"
 
@@ -1047,13 +1047,13 @@ AskStrengthScript:
 	ifequal $1, .DontMeetRequirements
 	jump .AlreadyUsedStrength
 
-.DontMeetRequirements: ; 0xcd59
+.DontMeetRequirements:
 	jumptext UnknownText_0xcd73
 
-.AlreadyUsedStrength: ; 0xcd5c
+.AlreadyUsedStrength:
 	jumptext UnknownText_0xcd6e
 
-.AskStrength: ; 0xcd5f
+.AskStrength:
 	opentext
 	writetext UnknownText_0xcd69
 	yesorno
@@ -1061,17 +1061,17 @@ AskStrengthScript:
 	closetext
 	end
 
-UnknownText_0xcd69: ; 0xcd69
+UnknownText_0xcd69:
 	; A #MON may be able to move this. Want to use STRENGTH?
 	text_jump UnknownText_0x1c07a0
 	db "@"
 
-UnknownText_0xcd6e: ; 0xcd6e
+UnknownText_0xcd6e:
 	; Boulders may now be moved!
 	text_jump UnknownText_0x1c07d8
 	db "@"
 
-UnknownText_0xcd73: ; 0xcd73
+UnknownText_0xcd73:
 	; A #MON may be able to move this.
 	text_jump UnknownText_0x1c07f4
 	db "@"
@@ -1147,7 +1147,7 @@ Jumptable_cdae:
 	ld a, $80
 	ret
 
-Text_UsedWhirlpool: ; 0xcdd9
+Text_UsedWhirlpool:
 	; used WHIRLPOOL!
 	text_jump UnknownText_0x1c0816
 	db "@"
@@ -1181,11 +1181,11 @@ TryWhirlpoolMenu:
 	scf
 	ret
 
-Script_WhirlpoolFromMenu: ; 0xce0b
+Script_WhirlpoolFromMenu:
 	reloadmappart
 	special UpdateTimePals
 
-Script_UsedWhirlpool: ; 0xce0f
+Script_UsedWhirlpool:
 	callasm GetPartyNick
 	writetext Text_UsedWhirlpool
 	reloadmappart
@@ -1232,14 +1232,14 @@ TryWhirlpoolOW::
 	scf
 	ret
 
-Script_MightyWhirlpool: ; 0xce66
+Script_MightyWhirlpool:
 	jumptext .MightyWhirlpoolText
 
-.MightyWhirlpoolText: ; 0xce69
+.MightyWhirlpoolText:
 	text_jump UnknownText_0x1c082b
 	db "@"
 
-Script_AskWhirlpoolOW: ; 0xce6e
+Script_AskWhirlpoolOW:
 	opentext
 	writetext UnknownText_0xce78
 	yesorno
@@ -1247,7 +1247,7 @@ Script_AskWhirlpoolOW: ; 0xce6e
 	closetext
 	end
 
-UnknownText_0xce78: ; 0xce78
+UnknownText_0xce78:
 	text_jump UnknownText_0x1c0864
 	db "@"
 
@@ -1272,21 +1272,21 @@ TryHeadbuttFromMenu:
 	ld a, $80
 	ret
 
-UnknownText_0xce9d: ; 0xce9d
+UnknownText_0xce9d:
 	; did a HEADBUTT!
 	text_jump UnknownText_0x1c0897
 	db "@"
 
-UnknownText_0xcea2: ; 0xcea2
+UnknownText_0xcea2:
 	; Nope. Nothing…
 	text_jump UnknownText_0x1c08ac
 	db "@"
 
-HeadbuttFromMenuScript: ; 0xcea7
+HeadbuttFromMenuScript:
 	reloadmappart
 	special UpdateTimePals
 
-HeadbuttScript: ; 0xceab
+HeadbuttScript:
 	callasm GetPartyNick
 	writetext UnknownText_0xce9d
 
@@ -1322,7 +1322,7 @@ TryHeadbuttOW::
 	xor a
 	ret
 
-AskHeadbuttScript: ; 0xcedc
+AskHeadbuttScript:
 	opentext
 	writetext UnknownText_0xcee6
 	yesorno
@@ -1330,7 +1330,7 @@ AskHeadbuttScript: ; 0xcedc
 	closetext
 	end
 
-UnknownText_0xcee6: ; 0xcee6
+UnknownText_0xcee6:
 	; A #MON could be in this tree. Want to HEADBUTT it?
 	text_jump UnknownText_0x1c08bc
 	db "@"
@@ -1380,7 +1380,7 @@ GetFacingObject:
 	scf
 	ret
 
-RockSmashFromMenuScript: ; 0xcf2e
+RockSmashFromMenuScript:
 	reloadmappart
 	special UpdateTimePals
 
@@ -1403,15 +1403,15 @@ RockSmashScript:
 .done
 	end
 
-MovementData_0xcf55: ; 0xcf55
+MovementData_0xcf55:
 	rock_smash 10
 	step_end
 
-UnknownText_0xcf58: ; 0xcf58
+UnknownText_0xcf58:
 	text_jump UnknownText_0x1c08f0
 	db "@"
 
-AskRockSmashScript: ; 0xcf5d
+AskRockSmashScript:
 	callasm HasRockSmash
 	ifequal 1, .no
 
@@ -1424,12 +1424,12 @@ AskRockSmashScript: ; 0xcf5d
 .no
 	jumptext UnknownText_0xcf72
 
-UnknownText_0xcf72: ; 0xcf72
+UnknownText_0xcf72:
 	; Maybe a #MON can break this.
 	text_jump UnknownText_0x1c0906
 	db "@"
 
-UnknownText_0xcf77: ; 0xcf77
+UnknownText_0xcf77:
 	; This rock looks breakable. Want to use ROCK SMASH?
 	text_jump UnknownText_0x1c0924
 	db "@"
@@ -1538,32 +1538,32 @@ FishFunction:
 	ld a, $81
 	ret
 
-Script_NotEvenANibble: ; 0xd01e
+Script_NotEvenANibble:
 	scall Script_FishCastRod
 	writetext UnknownText_0xd0a9
 	jump Script_NotEvenANibble_FallThrough
 
-Script_NotEvenANibble2: ; 0xd027
+Script_NotEvenANibble2:
 	scall Script_FishCastRod
 	writetext UnknownText_0xd0a9
 
-Script_NotEvenANibble_FallThrough: ; 0xd02d
+Script_NotEvenANibble_FallThrough:
 	loademote EMOTE_SHADOW
 	callasm PutTheRodAway
 	closetext
 	end
 
-Script_GotABite: ; 0xd035
+Script_GotABite:
 	scall Script_FishCastRod
 	callasm Fishing_CheckFacingUp
 	iffalse .NotFacingUp
 	applymovement PLAYER, .Movement_FacingUp
 	jump .FightTheHookedPokemon
 
-.NotFacingUp: ; 0xd046
+.NotFacingUp:
 	applymovement PLAYER, .Movement_NotFacingUp
 
-.FightTheHookedPokemon: ; 0xd04a
+.FightTheHookedPokemon:
 	pause 40
 	applymovement PLAYER, .Movement_RestoreRod
 	writetext UnknownText_0xd0a4
@@ -1608,7 +1608,7 @@ Fishing_CheckFacingUp:
 	ld [wScriptVar], a
 	ret
 
-Script_FishCastRod: ; 0xd07c
+Script_FishCastRod:
 	reloadmappart
 	loadvar hBGMapMode, $0
 	special UpdateTimePals
@@ -1632,12 +1632,12 @@ PutTheRodAway:
 	call ReplaceKrisSprite
 	ret
 
-UnknownText_0xd0a4: ; 0xd0a4
+UnknownText_0xd0a4:
 	; Oh! A bite!
 	text_jump UnknownText_0x1c0958
 	db "@"
 
-UnknownText_0xd0a9: ; 0xd0a9
+UnknownText_0xd0a9:
 	; Not even a nibble!
 	text_jump UnknownText_0x1c0965
 	db "@"
@@ -1733,7 +1733,7 @@ BikeFunction:
 	scf
 	ret
 
-Script_GetOnBike: ; 0xd13e
+Script_GetOnBike:
 	reloadmappart
 	special UpdateTimePals
 	writecode VAR_MOVEMENT, PLAYER_BIKE
@@ -1743,7 +1743,7 @@ Script_GetOnBike: ; 0xd13e
 	special ReplaceKrisSprite
 	end
 
-Script_GetOnBike_Register: ; 0xd14e
+Script_GetOnBike_Register:
 	writecode VAR_MOVEMENT, PLAYER_BIKE
 	closetext
 	special ReplaceKrisSprite
@@ -1753,7 +1753,7 @@ Script_GetOnBike_Register: ; 0xd14e
 	nop
 	ret
 
-Script_GetOffBike: ; 0xd158
+Script_GetOffBike:
 	reloadmappart
 	special UpdateTimePals
 	writecode VAR_MOVEMENT, PLAYER_NORMAL
@@ -1766,27 +1766,27 @@ FinishGettingOffBike:
 	special PlayMapMusic
 	end
 
-Script_GetOffBike_Register: ; 0xd16b
+Script_GetOffBike_Register:
 	writecode VAR_MOVEMENT, PLAYER_NORMAL
 	jump FinishGettingOffBike
 
-Script_CantGetOffBike: ; 0xd171
+Script_CantGetOffBike:
 	writetext .CantGetOffBikeText
 	waitbutton
 	closetext
 	end
 
-.CantGetOffBikeText: ; 0xd177
+.CantGetOffBikeText:
 	; You can't get off here!
 	text_jump UnknownText_0x1c099a
 	db "@"
 
-GotOnTheBikeText: ; 0xd17c
+GotOnTheBikeText:
 	; got on the @ .
 	text_jump UnknownText_0x1c09b2
 	db "@"
 
-GotOffTheBikeText: ; 0xd181
+GotOffTheBikeText:
 	; got off the @ .
 	text_jump UnknownText_0x1c09c7
 	db "@"
@@ -1813,7 +1813,7 @@ TryCutOW::
 	scf
 	ret
 
-AskCutScript: ; 0xd1a9
+AskCutScript:
 	opentext
 	writetext UnknownText_0xd1c8
 	yesorno
@@ -1833,13 +1833,13 @@ AskCutScript: ; 0xd1a9
 	ld [wScriptVar], a
 	ret
 
-UnknownText_0xd1c8: ; 0xd1c8
+UnknownText_0xd1c8:
 	text_jump UnknownText_0x1c09dd
 	db "@"
 
-CantCutScript: ; 0xd1cd
+CantCutScript:
 	jumptext UnknownText_0xd1d0
 
-UnknownText_0xd1d0: ; 0xd1d0
+UnknownText_0xd1d0:
 	text_jump UnknownText_0x1c0a05
 	db "@"

engine/events/poke_seer.asm

@@ -297,53 +297,45 @@ SeerTexts:
 	dw SeerEggText
 	dw SeerLevelOnlyText
 
-SeerIntroText: ; 0x4f28c
+SeerIntroText:
 	; I see all. I know all… Certainly, I know of your #MON!
 	text_jump UnknownText_0x1c475f
 	db "@"
-; 0x4f291
 
-SeerCantTellText: ; 0x4f291
+SeerCantTellText:
 	; Whaaaat? I can't tell a thing! How could I not know of this?
 	text_jump UnknownText_0x1c4797
 	db "@"
-; 0x4f296
 
-SeerMetAtText: ; 0x4f296
+SeerMetAtText:
 	; Hm… I see you met @  here: @ !
 	text_jump UnknownText_0x1c47d4
 	db "@"
-; 0x4f29b
 
-SeerTimeLevelText: ; 0x4f29b
+SeerTimeLevelText:
 	; The time was @ ! Its level was @ ! Am I good or what?
 	text_jump UnknownText_0x1c47fa
 	db "@"
-; 0x4f2a0
 
-SeerTradedText: ; 0x4f2a0
+SeerTradedText:
 	; Hm… @ came from @ in a trade? @ was where @ met @ !
 	text_jump UnknownText_0x1c4837
 	db "@"
-; 0x4f2a5
 
-SeerLevelOnlyText: ; 0x4f2a5
+SeerLevelOnlyText:
 	; What!? Incredible! I don't understand how, but it is incredible! You are special. I can't tell where you met it, but it was at level @ . Am I good or what?
 	text_jump UnknownText_0x1c487f
 	db "@"
-; 0x4f2aa
 
-SeerEggText: ; 0x4f2aa
+SeerEggText:
 	; Hey! That's an EGG! You can't say that you've met it yet…
 	text_jump UnknownText_0x1c491d
 	db "@"
-; 0x4f2af
 
-SeerCancelText: ; 0x4f2af
+SeerCancelText:
 	; Fufufu! I saw that you'd do nothing!
 	text_jump UnknownText_0x1c4955
 	db "@"
-; 0x4f2b4
 
 
 SeerAdvice:
@@ -381,35 +373,30 @@ SeerAdviceTexts:
 	dbw 100, SeerAdvice5
 	dbw 255, SeerAdvice1
 
-SeerAdvice1: ; 0x4f2e8
+SeerAdvice1:
 	; Incidentally… It would be wise to raise your #MON with a little more care.
 	text_jump UnknownText_0x1c497a
 	db "@"
-; 0x4f2ed
 
-SeerAdvice2: ; 0x4f2ed
+SeerAdvice2:
 	; Incidentally… It seems to have grown a little. @  seems to be becoming more confident.
 	text_jump UnknownText_0x1c49c6
 	db "@"
-; 0x4f2f2
 
-SeerAdvice3: ; 0x4f2f2
+SeerAdvice3:
 	; Incidentally… @  has grown. It's gained much strength.
 	text_jump UnknownText_0x1c4a21
 	db "@"
-; 0x4f2f7
 
-SeerAdvice4: ; 0x4f2f7
+SeerAdvice4:
 	; Incidentally… It certainly has grown mighty! This @ must have come through numerous #MON battles. It looks brimming with confidence.
 	text_jump UnknownText_0x1c4a5b
 	db "@"
-; 0x4f2fc
 
-SeerAdvice5: ; 0x4f2fc
+SeerAdvice5:
 	; Incidentally… I'm impressed by your dedication. It's been a long time since I've seen a #MON as mighty as this @ . I'm sure that seeing @ in battle would excite anyone.
 	text_jump UnknownText_0x1c4ae5
 	db "@"
-; 0x4f301
 
 
 GetCaughtGender:

engine/events/pokecenter_pc.asm

@@ -113,7 +113,6 @@ PC_CheckPartyForPokemon:
 	; Bzzzzt! You must have a #MON to use this!
 	text_jump UnknownText_0x1c1328
 	db "@"
-; 0x15668
 
 BillsPC:
 	call PC_PlayChoosePCSound
@@ -200,11 +199,10 @@ _PlayersHousePC:
 	ld c, $1
 	ret
 
-UnknownText_0x156ff: ; 0x156ff
+UnknownText_0x156ff:
 	; turned on the PC.
 	text_jump UnknownText_0x1c1353
 	db "@"
-; 0x15704
 
 _PlayersPC:
 	ld a, b
@@ -236,7 +234,7 @@ Function15715:
 	call ExitMenu
 	ret
 
-PlayersPCMenuData: ; 0x15736
+PlayersPCMenuData:
 	db MENU_BACKUP_TILES ; flags
 	db  0,  0 ; top left corner coords (y, x)
 	db 12, 15 ; bottom right corner coords (y, x)
@@ -258,7 +256,7 @@ PLAYERSPC_DECORATION    EQU 4
 PLAYERSPC_TURN_OFF      EQU 5
 PLAYERSPC_LOG_OFF       EQU 6
 
-.PlayersPCMenuPointers: ; 0x15746
+.PlayersPCMenuPointers:
 ; entries correspond to PLAYERSPC_* constants
 	dw PlayerWithdrawItemMenu, .WithdrawItem
 	dw PlayerDepositItemMenu,  .DepositItem
@@ -305,13 +303,12 @@ PC_DisplayTextWaitMenu:
 	ld [wOptions], a
 	ret
 
-UnknownText_0x157cc: ; 0x157cc
+UnknownText_0x157cc:
 	; What do you want to do?
 	text_jump UnknownText_0x1c1368
 	db "@"
-; 0x157d1
 
-PlayerWithdrawItemMenu: ; 0x157d1
+PlayerWithdrawItemMenu:
 	call LoadStandardMenuHeader
 	farcall ClearPCItemScreen
 .loop
@@ -375,19 +372,19 @@ PlayerWithdrawItemMenu: ; 0x157d1
 .done
 	ret
 
-.HowManyText: ; 0x15850
+.HowManyText:
 	text_jump _PlayersPCHowManyWithdrawText
 	db "@"
 
-.WithdrewText: ; 0x15855
+.WithdrewText:
 	text_jump _PlayersPCWithdrewItemsText
 	db "@"
 
-.NoRoomText: ; 0x1585a
+.NoRoomText:
 	text_jump _PlayersPCNoRoomWithdrawText
 	db "@"
 
-PlayerTossItemMenu: ; 0x1585f
+PlayerTossItemMenu:
 	call LoadStandardMenuHeader
 	farcall ClearPCItemScreen
 .loop
@@ -401,24 +398,21 @@ PlayerTossItemMenu: ; 0x1585f
 	call CloseSubmenu
 	xor a
 	ret
-; 0x1587d
 
-PlayerDecorationMenu: ; 0x1587d
+PlayerDecorationMenu:
 	farcall _PlayerDecorationMenu
 	ld a, c
 	and a
 	ret z
 	scf
 	ret
-; 0x15888
 
-PlayerLogOffMenu: ; 0x15888
+PlayerLogOffMenu:
 	xor a
 	scf
 	ret
-; 0x1588b
 
-PlayerDepositItemMenu: ; 0x1588b
+PlayerDepositItemMenu:
 	call .CheckItemsInBag
 	jr c, .nope
 	call DisableSpriteUpdates
@@ -538,25 +532,24 @@ PlayerDepositItemMenu: ; 0x1588b
 	and a
 	ret
 
-.HowManyText: ; 0x1596e
+.HowManyText:
 	text_jump _PlayersPCHowManyDepositText
 	db "@"
 
-.DepositText: ; 0x15973
+.DepositText:
 	text_jump _PlayersPCDepositItemsText
 	db "@"
 
-.NoRoomText: ; 0x15978
+.NoRoomText:
 	text_jump _PlayersPCNoRoomDepositText
 	db "@"
 
-PlayerMailBoxMenu: ; 0x1597d
+PlayerMailBoxMenu:
 	farcall _PlayerMailBoxMenu
 	xor a
 	ret
-; 0x15985
 
-PCItemsJoypad: ; 0x15985
+PCItemsJoypad:
 	xor a
 	ld [wSwitchItem], a
 .loop
@@ -645,38 +638,32 @@ PC_DisplayText:
 	call ExitMenu
 	ret
 
-PokecenterPCText_BootedUpPC: ; 0x15a27
+PokecenterPCText_BootedUpPC:
 	; turned on the PC.
 	text_jump UnknownText_0x1c144d
 	db "@"
-; 0x15a2c
 
-PokecenterPCText_AccessWhosePC: ; 0x15a2c
+PokecenterPCText_AccessWhosePC:
 	; Access whose PC?
 	text_jump UnknownText_0x1c1462
 	db "@"
-; 0x15a31
 
-PokecenterPCText_AccessedBillsPC: ; 0x15a31
+PokecenterPCText_AccessedBillsPC:
 	; BILL's PC accessed. #MON Storage System opened.
 	text_jump UnknownText_0x1c1474
 	db "@"
-; 0x15a36
 
-PokecenterPCText_AccessedOwnPC: ; 0x15a36
+PokecenterPCText_AccessedOwnPC:
 	; Accessed own PC. Item Storage System opened.
 	text_jump UnknownText_0x1c14a4
 	db "@"
-; 0x15a3b
 
-PokecenterPCText_AccessedOaksPC: ; 0x15a3b
+PokecenterPCText_AccessedOaksPC:
 	; PROF.OAK's PC accessed. #DEX Rating System opened.
 	text_jump UnknownText_0x1c14d2
 	db "@"
-; 0x15a40
 
-PokecenterPCText_LinkClosed: ; 0x15a40
+PokecenterPCText_LinkClosed:
 	; … Link closed…
 	text_jump UnknownText_0x1c1505
 	db "@"
-; 0x15a45

engine/events/pokepic.asm

@@ -41,7 +41,7 @@ ClosePokepic::
 	call LoadStandardFont
 	ret
 
-PokepicMenuHeader: ; 0x24547
+PokepicMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 6, 4, 14, 13
 	dw NULL

engine/events/print_photo.asm

@@ -29,32 +29,27 @@ PhotoStudio:
 	call PrintText
 	ret
 
-.Text_AskWhichMon: ; 0x16e04
+.Text_AskWhichMon:
 	; Which #MON should I photo- graph?
 	text_jump UnknownText_0x1be024
 	db "@"
-; 0x16e09
 
-.Text_HoldStill: ; 0x16e09
+.Text_HoldStill:
 	; All righty. Hold still for a bit.
 	text_jump UnknownText_0x1be047
 	db "@"
-; 0x16e0e
 
-.Text_Presto: ; 0x16e0e
+.Text_Presto:
 	; Presto! All done. Come again, OK?
 	text_jump UnknownText_0x1be06a
 	db "@"
-; 0x16e13
 
-.Text_NoPicture: ; 0x16e13
+.Text_NoPicture:
 	; Oh, no picture? Come again, OK?
 	text_jump UnknownText_0x1c0000
 	db "@"
-; 0x16e18
 
-.Text_Egg: ; 0x16e18
+.Text_Egg:
 	; An EGG? My talent is worth more…
 	text_jump UnknownText_0x1c0021
 	db "@"
-; 0x16e1d

engine/events/prof_oaks_pc.asm

@@ -1,4 +1,4 @@
-ProfOaksPC: ; 0x265d3
+ProfOaksPC:
 	ld hl, OakPCText1
 	call MenuTextBox
 	call YesNoBox
@@ -11,7 +11,7 @@ ProfOaksPC: ; 0x265d3
 	call ExitMenu
 	ret
 
-ProfOaksPCBoot ; 0x265ee
+ProfOaksPCBoot:
 	ld hl, OakPCText2
 	call PrintText
 	call Rate
@@ -20,7 +20,7 @@ ProfOaksPCBoot ; 0x265ee
 	call WaitSFX
 	ret
 
-ProfOaksPCRating: ; 0x26601
+ProfOaksPCRating:
 	call Rate
 	push de
 	ld de, MUSIC_NONE
@@ -31,7 +31,7 @@ ProfOaksPCRating: ; 0x26601
 	call WaitSFX
 	ret
 
-Rate: ; 0x26616
+Rate:
 ; calculate Seen/Owned
 	ld hl, wPokedexSeen
 	ld b, wEndPokedexSeen - wPokedexSeen
@@ -55,7 +55,7 @@ Rate: ; 0x26616
 	pop de
 	ret
 
-.UpdateRatingBuffers: ; 0x26647
+.UpdateRatingBuffers:
 	ld hl, wStringBuffer3
 	ld de, wd002
 	call .UpdateRatingBuffer
@@ -64,7 +64,7 @@ Rate: ; 0x26616
 	call .UpdateRatingBuffer
 	ret
 
-.UpdateRatingBuffer: ; 0x2665a
+.UpdateRatingBuffer:
 	push hl
 	ld a, "@"
 	ld bc, ITEM_NAME_LENGTH
@@ -74,7 +74,7 @@ Rate: ; 0x26616
 	call PrintNum
 	ret
 
-FindOakRating: ; 0x2666b
+FindOakRating:
 ; return sound effect in de
 ; return text pointer in hl
 	nop
@@ -100,15 +100,15 @@ endr
 
 INCLUDE "data/events/pokedex_ratings.asm"
 
-OakPCText1: ; 0x266de
+OakPCText1:
 	text_jump _OakPCText1
 	db "@"
 
-OakPCText2: ; 0x266e3
+OakPCText2:
 	text_jump _OakPCText2
 	db "@"
 
-OakPCText3: ; 0x266e8
+OakPCText3:
 	text_jump _OakPCText3
 	db "@"
 
@@ -188,6 +188,6 @@ OakRating19:
 	text_jump _OakRating19
 	db "@"
 
-OakPCText4: ; 0x2674c
+OakPCText4:
 	text_jump _OakPCText4
 	db "@"

engine/events/sacred_ash.asm

@@ -46,7 +46,7 @@ CheckAnyFaintedMon:
 	scf
 	ret
 
-SacredAshScript: ; 0x50821
+SacredAshScript:
 	special HealParty
 	reloadmappart
 	playsound SFX_WARP_TO
@@ -63,10 +63,8 @@ SacredAshScript: ; 0x50821
 	waitbutton
 	closetext
 	end
-; 0x50845
 
-UnknownText_0x50845: ; 0x50845
+UnknownText_0x50845:
 	; 's #MON were all healed!
 	text_jump UnknownText_0x1c0b65
 	db "@"
-; 0x5084a

engine/events/specials.asm

@@ -83,7 +83,7 @@ FoundNone:
 	ld [wScriptVar], a
 	ret
 
-NameRival: ; 0xc29d
+NameRival:
 	ld b, $2 ; rival
 	ld de, wRivalName
 	farcall _NamingScreen
@@ -95,7 +95,6 @@ NameRival: ; 0xc29d
 
 .default
 	db "SILVER@"
-; 0xc2b9
 
 NameRater:
 	farcall _NameRater
@@ -168,11 +167,10 @@ GetMysteryGiftItem:
 	ld [wScriptVar], a
 	ret
 
-.ReceiveItemText: ; 0xc345
+.ReceiveItemText:
 	; received item
 	text_jump UnknownText_0x1bd3be
 	db "@"
-; 0xc34a
 
 BugContestJudging:
 	farcall _BugContestJudging
@@ -257,17 +255,15 @@ CheckCoinsAndCoinCase:
 	scf
 	ret
 
-.NoCoinsText: ; 0xc3d1
+.NoCoinsText:
 	; You have no coins.
 	text_jump UnknownText_0x1bd3d7
 	db "@"
-; 0xc3d6
 
-.NoCoinCaseText: ; 0xc3d6
+.NoCoinCaseText:
 	; You don't have a COIN CASE.
 	text_jump UnknownText_0x1bd3eb
 	db "@"
-; 0xc3db
 
 ClearBGPalettesBufferScreen:
 	call ClearBGPalettes
@@ -331,7 +327,7 @@ CheckLuckyNumberShowFlag:
 	farcall _CheckLuckyNumberShowFlag
 	jp ScriptReturnCarry
 
-SnorlaxAwake: ; 0xc43d
+SnorlaxAwake:
 ; Check if the Poké Flute channel is playing, and if the player is standing
 ; next to Snorlax.
 
@@ -430,7 +426,7 @@ PrintDiploma:
 	call ExitAllMenus
 	ret
 
-TrainerHouse: ; 0xc4b9
+TrainerHouse:
 	ld a, BANK(sMysteryGiftTrainerHouseFlag)
 	call GetSRAMBank
 	ld a, [sMysteryGiftTrainerHouseFlag]

engine/events/std_collision.asm

@@ -25,5 +25,5 @@ CheckFacingTileForStdScript::
 
 INCLUDE "data/events/collision_stdscripts.asm"
 
-Script_JumpStdFromRAM: ; 0x1369a
+Script_JumpStdFromRAM:
 	jump wJumpStdScriptBuffer

engine/events/std_scripts.asm

@@ -216,7 +216,7 @@ Radio2Script:
 	closetext
 	end
 
-TrashCanScript: ; 0xbc1a5
+TrashCanScript:
 	farjumptext TrashCanText
 
 PCScript:
@@ -335,9 +335,8 @@ BugContestResults_DidNotWin:
 	farwritetext ContestResults_DidNotWinText
 	buttonsound
 	jump BugContestResults_FinishUp
-; 0xbc2b1
 
-BugContestResults_ReturnAfterWinnersPrize: ; 0xbc2b1
+BugContestResults_ReturnAfterWinnersPrize:
 	farwritetext ContestResults_JoinUsNextTimeText
 	buttonsound
 
@@ -381,9 +380,8 @@ BugContestResults_CleanUp:
 	setflag ENGINE_DAILY_BUG_CONTEST
 	special PlayMapMusic
 	end
-; 0xbc31e
 
-BugContestResults_FirstPlace: ; 0xbc31e
+BugContestResults_FirstPlace:
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	itemtotext SUN_STONE, MEM_BUFFER_1
 	farwritetext ContestResults_PlayerWonAPrizeText
@@ -391,55 +389,48 @@ BugContestResults_FirstPlace: ; 0xbc31e
 	verbosegiveitem SUN_STONE
 	iffalse BugContestResults_NoRoomForSunStone
 	jump BugContestResults_ReturnAfterWinnersPrize
-; 0xbc332
 
-BugContestResults_SecondPlace: ; 0xbc332
+BugContestResults_SecondPlace:
 	itemtotext EVERSTONE, MEM_BUFFER_1
 	farwritetext ContestResults_PlayerWonAPrizeText
 	waitbutton
 	verbosegiveitem EVERSTONE
 	iffalse BugContestResults_NoRoomForEverstone
 	jump BugContestResults_ReturnAfterWinnersPrize
-; 0xbc343
 
-BugContestResults_ThirdPlace: ; 0xbc343
+BugContestResults_ThirdPlace:
 	itemtotext GOLD_BERRY, MEM_BUFFER_1
 	farwritetext ContestResults_PlayerWonAPrizeText
 	waitbutton
 	verbosegiveitem GOLD_BERRY
 	iffalse BugContestResults_NoRoomForGoldBerry
 	jump BugContestResults_ReturnAfterWinnersPrize
-; 0xbc354
 
-BugContestResults_NoRoomForSunStone: ; 0xbc354
+BugContestResults_NoRoomForSunStone:
 	farwritetext BugContestPrizeNoRoomText
 	buttonsound
 	setevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE
 	jump BugContestResults_ReturnAfterWinnersPrize
-; 0xbc35f
 
-BugContestResults_NoRoomForEverstone: ; 0xbc35f
+BugContestResults_NoRoomForEverstone:
 	farwritetext BugContestPrizeNoRoomText
 	buttonsound
 	setevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE
 	jump BugContestResults_ReturnAfterWinnersPrize
-; 0xbc36a
 
-BugContestResults_NoRoomForGoldBerry: ; 0xbc36a
+BugContestResults_NoRoomForGoldBerry:
 	farwritetext BugContestPrizeNoRoomText
 	buttonsound
 	setevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY
 	jump BugContestResults_ReturnAfterWinnersPrize
-; 0xbc375
 
-BugContestResults_NoRoomForBerry: ; 0xbc375
+BugContestResults_NoRoomForBerry:
 	farwritetext BugContestPrizeNoRoomText
 	buttonsound
 	setevent EVENT_CONTEST_OFFICER_HAS_BERRY
 	jump BugContestResults_DidNotWin
-; 0xbc380
 
-BugContestResults_CopyContestantsToResults: ; 0xbc380
+BugContestResults_CopyContestantsToResults:
 	checkevent EVENT_BUG_CATCHING_CONTESTANT_1A
 	iftrue .skip1
 	clearevent EVENT_BUG_CATCHING_CONTESTANT_1B
@@ -1489,7 +1480,7 @@ RegisteredNumberFScript:
 	buttonsound
 	end
 
-NumberAcceptedFScript: ; 0xbcbd3
+NumberAcceptedFScript:
 	checkcode VAR_CALLERID
 	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
 	ifequal PHONE_COOLTRAINERF_BETH, .Beth
@@ -1777,23 +1768,21 @@ GymStatue2Script:
 	closetext
 	end
 
-ReceiveItemScript: ; 0xbcdb9
+ReceiveItemScript:
 	waitsfx
 	farwritetext ReceivedItemText
 	playsound SFX_ITEM
 	waitsfx
 	end
-; 0xbcdc3
 
-ReceiveTogepiEggScript: ; 0xbcdc3
+ReceiveTogepiEggScript:
 	waitsfx
 	farwritetext ReceivedItemText
 	playsound SFX_GET_EGG_FROM_DAY_CARE_LADY
 	waitsfx
 	end
-; 0xbcdcd
 
-GameCornerCoinVendorScript: ; 0xbcdcd
+GameCornerCoinVendorScript:
 	faceplayer
 	opentext
 	farwritetext CoinVendor_WelcomeText
@@ -1804,12 +1793,11 @@ GameCornerCoinVendorScript: ; 0xbcdcd
 	waitbutton
 	closetext
 	end
-; 0xbcde0
 
-CoinVendor_IntroScript: ; 0xbcde0
+CoinVendor_IntroScript:
 	farwritetext CoinVendor_IntroText
 
-.loop ; 0xbcde4
+.loop
 	special DisplayMoneyAndCoinBalance
 	loadmenu .MenuHeader
 	verticalmenu
@@ -1817,9 +1805,8 @@ CoinVendor_IntroScript: ; 0xbcde0
 	ifequal 1, .Buy50
 	ifequal 2, .Buy500
 	jump .Cancel
-; 0xbcdf7
 
-.Buy50: ; 0xbcdf7
+.Buy50:
 	checkcoins MAX_COINS - 50
 	ifequal HAVE_MORE, .CoinCaseFull
 	checkmoney YOUR_MONEY, 1000
@@ -1831,9 +1818,8 @@ CoinVendor_IntroScript: ; 0xbcde0
 	farwritetext CoinVendor_Buy50CoinsText
 	waitbutton
 	jump .loop
-; 0xbce1b
 
-.Buy500: ; 0xbce1b
+.Buy500:
 	checkcoins MAX_COINS - 500
 	ifequal HAVE_MORE, .CoinCaseFull
 	checkmoney YOUR_MONEY, 10000
@@ -1845,28 +1831,24 @@ CoinVendor_IntroScript: ; 0xbcde0
 	farwritetext CoinVendor_Buy500CoinsText
 	waitbutton
 	jump .loop
-; 0xbce3f
 
-.NotEnoughMoney: ; 0xbce3f
+.NotEnoughMoney:
 	farwritetext CoinVendor_NotEnoughMoneyText
 	waitbutton
 	closetext
 	end
-; 0xbce46
 
-.CoinCaseFull: ; 0xbce46
+.CoinCaseFull:
 	farwritetext CoinVendor_CoinCaseFullText
 	waitbutton
 	closetext
 	end
-; 0xbce4d
 
-.Cancel: ; 0xbce4d
+.Cancel:
 	farwritetext CoinVendor_CancelText
 	waitbutton
 	closetext
 	end
-; 0xbce54
 
 
 .MenuHeader:
@@ -1881,7 +1863,6 @@ CoinVendor_IntroScript: ; 0xbcde0
 	db " 50 :  ¥1000@"
 	db "500 : ¥10000@"
 	db "CANCEL@"
-; 0xbce7f
 
 
 HappinessCheckScript:

engine/events/sweet_scent.asm

@@ -5,7 +5,7 @@ SweetScentFromMenu:
 	ld [wFieldMoveSucceeded], a
 	ret
 
-.SweetScent: ; 0x506c8
+.SweetScent:
 	reloadmappart
 	special UpdateTimePals
 	callasm GetPartyNick
@@ -19,18 +19,15 @@ SweetScentFromMenu:
 	startbattle
 	reloadmapafterbattle
 	end
-; 0x506e5
 
-.BugCatchingContest: ; 0x506e5
+.BugCatchingContest:
 	farjump BugCatchingContestBattleScript
-; 0x506e9
 
-SweetScentNothing: ; 0x506e9
+SweetScentNothing:
 	writetext UnknownText_0x5072b
 	waitbutton
 	closetext
 	end
-; 0x506ef
 
 SweetScentEncounter:
 	farcall CanUseSweetScent
@@ -60,14 +57,12 @@ SweetScentEncounter:
 	ld [wBattleType], a
 	ret
 
-UnknownText_0x50726: ; 0x50726
+UnknownText_0x50726:
 	; used SWEET SCENT!
 	text_jump UnknownText_0x1c0b03
 	db "@"
-; 0x5072b
 
-UnknownText_0x5072b: ; 0x5072b
+UnknownText_0x5072b:
 	; Looks like there's nothing here…
 	text_jump UnknownText_0x1c0b1a
 	db "@"
-; 0x50730

engine/events/trainer_scripts.asm

@@ -1,4 +1,4 @@
-TalkToTrainerScript:: ; 0xbe66a
+TalkToTrainerScript::
 	faceplayer
 	trainerflagaction CHECK_FLAG
 	iftrue AlreadyBeatenTrainerScript
@@ -6,7 +6,7 @@ TalkToTrainerScript:: ; 0xbe66a
 	encountermusic
 	jump StartBattleWithMapTrainerScript
 
-SeenByTrainerScript:: ; 0xbe675
+SeenByTrainerScript::
 	loadmemtrainer
 	encountermusic
 	showemote EMOTE_SHOCK, LAST_TALKED, 30
@@ -16,7 +16,7 @@ SeenByTrainerScript:: ; 0xbe675
 	faceobject PLAYER, LAST_TALKED
 	jump StartBattleWithMapTrainerScript
 
-StartBattleWithMapTrainerScript: ; 0xbe68a
+StartBattleWithMapTrainerScript:
 	opentext
 	trainertext $0
 	waitbutton

engine/events/unown_walls.asm

@@ -1,4 +1,4 @@
-HoOhChamber: ; 0x8addb
+HoOhChamber:
 	ld hl, wPartySpecies
 	ld a, [hl]
 	cp HO_OH ; is Ho-oh the first Pokémon in the party?
@@ -9,7 +9,6 @@ HoOhChamber: ; 0x8addb
 	call EventFlagAction
 .done
 	ret
-; 0x8adef
 
 OmanyteChamber:
 	call GetMapAttributesPointer ; pointless?

engine/events/whiteout.asm

@@ -1,13 +1,12 @@
-Script_BattleWhiteout:: ; 0x124c1
+Script_BattleWhiteout::
 	callasm BattleBGMap
 	jump Script_Whiteout
-; 0x124c8
 
-Script_OverworldWhiteout:: ; 0x124c8
+Script_OverworldWhiteout::
 	refreshscreen
 	callasm OverworldBGMap
 
-Script_Whiteout: ; 0x124ce
+Script_Whiteout:
 	writetext .WhitedOutText
 	waitbutton
 	special FadeOutPalettes
@@ -24,13 +23,11 @@ Script_Whiteout: ; 0x124ce
 
 .bug_contest
 	jumpstd bugcontestresultswarp
-; 0x124f5
 
-.WhitedOutText: ; 0x124f5
+.WhitedOutText:
 	; is out of useable #MON!  whited out!
 	text_jump UnknownText_0x1c0a4e
 	db "@"
-; 0x124fa
 
 OverworldBGMap:
 	call ClearPalettes

engine/games/card_flip.asm

@@ -115,11 +115,10 @@ _CardFlip:
 	ld [wJumptableIndex], a
 	ret
 
-.PlayWithThreeCoinsText: ; 0xe01cd
+.PlayWithThreeCoinsText:
 	; Play with three coins?
 	text_jump UnknownText_0x1c5793
 	db "@"
-; 0xe01d2
 
 .DeductCoins:
 	ld a, [wCoins]
@@ -156,11 +155,10 @@ _CardFlip:
 	call .Increment
 	ret
 
-.NotEnoughCoinsText: ; 0xe0212
+.NotEnoughCoinsText:
 	; Not enough coins…
 	text_jump UnknownText_0x1c57ab
 	db "@"
-; 0xe0217
 
 .ChooseACard:
 	xor a
@@ -234,11 +232,10 @@ _CardFlip:
 	call .Increment
 	ret
 
-.ChooseACardText: ; 0xe02b2
+.ChooseACardText:
 	; Choose a card.
 	text_jump UnknownText_0x1c57be
 	db "@"
-; 0xe02b7
 
 .PlaceYourBet:
 	ld hl, .PlaceYourBetText
@@ -257,11 +254,10 @@ _CardFlip:
 	call .Increment
 	ret
 
-.PlaceYourBetText: ; 0xe02d5
+.PlaceYourBetText:
 	; Place your bet.
 	text_jump UnknownText_0x1c57ce
 	db "@"
-; 0xe02da
 
 .CheckTheCard:
 	xor a
@@ -329,17 +325,15 @@ _CardFlip:
 	ld [wJumptableIndex], a
 	ret
 
-.PlayAgainText: ; 0xe0356
+.PlayAgainText:
 	; Want to play again?
 	text_jump UnknownText_0x1c57df
 	db "@"
-; 0xe035b
 
-.CardsShuffledText: ; 0xe035b
+.CardsShuffledText:
 	; The cards have been shuffled.
 	text_jump UnknownText_0x1c57f4
 	db "@"
-; 0xe0360
 
 .Quit:
 	ld hl, wJumptableIndex
@@ -1119,17 +1113,15 @@ CardFlip_CheckWinCondition:
 	jr nz, .loop
 	ret
 
-.Text_Yeah: ; 0xe0811
+.Text_Yeah:
 	; Yeah!
 	text_jump UnknownText_0x1c5813
 	db "@"
-; 0xe0816
 
-.Text_Darn: ; 0xe0816
+.Text_Darn:
 	; Darn…
 	text_jump UnknownText_0x1c581a
 	db "@"
-; 0xe081b
 
 .AddCoinPlaySFX:
 	ld a, [wCoins]

engine/games/dummy_game.asm

@@ -322,17 +322,15 @@ DummyGame_CheckMatch:
 	ret
 
 
-DummyGameText_Yeah: ; 0xe2093
+DummyGameText_Yeah:
 	; , yeah!
 	text_jump UnknownText_0x1c1a5b
 	db "@"
-; 0xe2098
 
-DummyGameText_Darn: ; 0xe2098
+DummyGameText_Darn:
 	; Darn…
 	text_jump UnknownText_0x1c1a65
 	db "@"
-; 0xe209d
 
 DummyGame_InitBoard:
 	ld hl, wDummyGameCards

engine/games/slot_machine.asm

@@ -1795,38 +1795,33 @@ Slots_AskBet:
 	ret
 
 
-.Text_BetHowManyCoins: ; 0x930c7
+.Text_BetHowManyCoins:
 	; Bet how many coins?
 	text_jump UnknownText_0x1c5049
 	db "@"
-; 0x930cc
 
-.Text_Start: ; 0x930cc
+.Text_Start:
 	; Start!
 	text_jump UnknownText_0x1c505e
 	db "@"
-; 0x930d1
 
-.Text_NotEnoughCoins: ; 0x930d1
+.Text_NotEnoughCoins:
 	; Not enough coins.
 	text_jump UnknownText_0x1c5066
 	db "@"
-; 0x930d6
 
-.MenuHeader: ; 0x930d6
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 14, 10, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw .MenuData
 	db 1 ; default option
-; 0x930de
 
-.MenuData: ; 0x930de
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 3 ; items
 	db " 3@"
 	db " 2@"
 	db " 1@"
-; 0x930e9
 
 Slots_AskPlayAgain:
 	ld hl, wCoins
@@ -1941,7 +1936,7 @@ Slots_PayoutText:
 	dbw "10@@", .LinedUpMonOrCherry
 	dbw "15@@", .LinedUpMonOrCherry
 
-.Text_PrintPayout: ; 0x931b9
+.Text_PrintPayout:
 	start_asm
 	ld a, [wSlotMatched]
 	add $25
@@ -1961,17 +1956,15 @@ endr
 	ret
 
 
-.Text_LinedUpWonCoins: ; 0x931db
+.Text_LinedUpWonCoins:
 	; lined up! Won @  coins!
 	text_jump UnknownText_0x1c509f
 	db "@"
-; 0x931e0
 
-.Text_Darn: ; 0x931e0
+.Text_Darn:
 	; Darn!
 	text_jump UnknownText_0x1c50bb
 	db "@"
-; 0x931e5
 
 .LinedUpSevens:
 	ld a, SFX_2ND_PLACE

engine/gfx/color.asm

@@ -1128,7 +1128,7 @@ SGBBorder_YetMorePalPushing:
 	ld [rBGP], a
 	ret
 
-CopyData: ; 0x9a52
+CopyData:
 ; copy bc bytes of data from hl to de
 .loop
 	ld a, [hli]
@@ -1139,9 +1139,8 @@ CopyData: ; 0x9a52
 	or b
 	jr nz, .loop
 	ret
-; 0x9a5b
 
-ClearBytes: ; 0x9a5b
+ClearBytes:
 ; clear bc bytes of data starting from de
 .loop
 	xor a
@@ -1152,9 +1151,8 @@ ClearBytes: ; 0x9a5b
 	or b
 	jr nz, .loop
 	ret
-; 0x9a64
 
-DrawDefaultTiles: ; 0x9a64
+DrawDefaultTiles:
 ; Draw 240 tiles (2/3 of the screen) from tiles in VRAM
 	hlbgcoord 0, 0 ; BG Map 0
 	ld de, BG_MAP_WIDTH - SCREEN_WIDTH
@@ -1172,7 +1170,6 @@ DrawDefaultTiles: ; 0x9a64
 	dec c
 	jr nz, .line
 	ret
-; 0x9a7a
 
 SGBDelayCycles:
 	ld de, 7000

engine/items/buy_sell_toss.asm

@@ -201,23 +201,20 @@ BuySell_DisplaySubtotal:
 	call WaitBGMap
 	ret
 
-TossItem_MenuHeader: ; 0x250ed
+TossItem_MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 15, 9, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw ret_25097
 	db 0 ; default option
-; 0x250f5
 
-BuyItem_MenuHeader: ; 0x250f5
+BuyItem_MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 7, 15, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw DisplayPurchasePrice
 	db -1 ; default option
-; 0x250fd
 
-SellItem_MenuHeader: ; 0x250fd
+SellItem_MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 7, 15, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw DisplaySellingPrice
 	db 0 ; default option
-; 0x25105

engine/items/item_effects.asm

@@ -1064,43 +1064,37 @@ LevelBallMultiplier:
 ; These two texts were carried over from gen 1.
 ; They are not used in gen 2, and are dummied out.
 
-Text_RBY_CatchMarowak: ; 0xedab
+Text_RBY_CatchMarowak:
 	; It dodged the thrown BALL! This #MON can't be caught!
 	text_jump UnknownText_0x1c5a5a
 	db "@"
-; 0xedb0
 
-Text_RBY_NoShake: ; 0xedb0
+Text_RBY_NoShake:
 	; You missed the #MON!
 	text_jump UnknownText_0x1c5a90
 	db "@"
-; 0xedb5
 
-Text_NoShake: ; 0xedb5
+Text_NoShake:
 	; Oh no! The #MON broke free!
 	text_jump UnknownText_0x1c5aa6
 	db "@"
-; 0xedba
 
-Text_OneShake: ; 0xedba
+Text_OneShake:
 	; Aww! It appeared to be caught!
 	text_jump UnknownText_0x1c5ac3
 	db "@"
-; 0xedbf
 
-Text_TwoShakes: ; 0xedbf
+Text_TwoShakes:
 	; Aargh! Almost had it!
 	text_jump UnknownText_0x1c5ae3
 	db "@"
-; 0xedc4
 
-Text_ThreeShakes: ; 0xedc4
+Text_ThreeShakes:
 	; Shoot! It was so close too!
 	text_jump UnknownText_0x1c5afa
 	db "@"
-; 0xedc9
 
-Text_GotchaMonWasCaught: ; 0xedc9
+Text_GotchaMonWasCaught:
 	; Gotcha! @ was caught!@ @
 	text_jump UnknownText_0x1c5b17
 	start_asm
@@ -1115,29 +1109,25 @@ Text_GotchaMonWasCaught: ; 0xedc9
 	ld hl, TextJump_Waitbutton
 	ret
 
-TextJump_Waitbutton: ; 0xede6
+TextJump_Waitbutton:
 	; @
 	text_jump Text_Waitbutton_2
 	db "@"
-; 0xedeb
 
-Text_SentToBillsPC: ; 0xedeb
+Text_SentToBillsPC:
 	; was sent to BILL's PC.
 	text_jump UnknownText_0x1c5b38
 	db "@"
-; 0xedf0
 
-Text_AddedToPokedex: ; 0xedf0
+Text_AddedToPokedex:
 	; 's data was newly added to the #DEX.@ @
 	text_jump UnknownText_0x1c5b53
 	db "@"
-; 0xedf5
 
-Text_AskNicknameNewlyCaughtMon: ; 0xedf5
+Text_AskNicknameNewlyCaughtMon:
 	; Give a nickname to @ ?
 	text_jump UnknownText_0x1c5b7f
 	db "@"
-; 0xedfa
 
 ReturnToBattle_UseBall:
 	farcall _ReturnToBattle_UseBall
@@ -1251,11 +1241,10 @@ RareCandy_StatBooster_ExitMenu:
 	jp ClearPalettes
 
 
-Text_StatRose: ; 0xeea6
+Text_StatRose:
 	; 's @  rose.
 	text_jump UnknownText_0x1c5b9a
 	db "@"
-; 0xeeab
 
 
 StatStrings:
@@ -1309,7 +1298,6 @@ RareCandy_StatBooster_GetParameters:
 	ld hl, wPartyMonNicknames
 	call GetNick
 	ret
-; 0xef14
 
 
 RareCandyEffect:
@@ -2097,11 +2085,10 @@ Softboiled_MilkDrinkFunction:
 	pop bc
 	jr .loop
 
-.Text_CantBeUsed: ; 0xf44a
+.Text_CantBeUsed:
 	; That can't be used on this #MON.
 	text_jump UnknownText_0x1c5bac
 	db "@"
-; 0xf44f
 
 
 EscapeRopeEffect:
@@ -2137,11 +2124,10 @@ UseRepel:
 	jp UseItemText
 
 
-TextJump_RepelUsedEarlierIsStillInEffect: ; 0xf47d
+TextJump_RepelUsedEarlierIsStillInEffect:
 	; The REPEL used earlier is still in effect.
 	text_jump Text_RepelUsedEarlierIsStillInEffect
 	db "@"
-; 0xf482
 
 
 XAccuracyEffect:
@@ -2287,19 +2273,17 @@ PokeFluteEffect:
 	ret
 
 
-.CatchyTune: ; 0xf56c
+.CatchyTune:
 	; Played the # FLUTE. Now, that's a catchy tune!
 	text_jump UnknownText_0x1c5bf9
 	db "@"
-; 0xf571
 
-.AllSleepingMonWokeUp: ; 0xf571
+.AllSleepingMonWokeUp:
 	; All sleeping #MON woke up.
 	text_jump UnknownText_0x1c5c28
 	db "@"
-; 0xf576
 
-.PlayedTheFlute: ; 0xf576
+.PlayedTheFlute:
 	; played the # FLUTE.@ @
 	text_jump UnknownText_0x1c5c44
 	start_asm
@@ -2587,35 +2571,30 @@ RestorePP:
 	xor a
 	ret
 
-TextJump_RaiseThePPOfWhichMove: ; 0xf725
+TextJump_RaiseThePPOfWhichMove:
 	; Raise the PP of which move?
 	text_jump Text_RaiseThePPOfWhichMove
 	db "@"
-; 0xf72a
 
-TextJump_RestoreThePPOfWhichMove: ; 0xf72a
+TextJump_RestoreThePPOfWhichMove:
 	; Restore the PP of which move?
 	text_jump Text_RestoreThePPOfWhichMove
 	db "@"
-; 0xf72f
 
-TextJump_PPIsMaxedOut: ; 0xf72f
+TextJump_PPIsMaxedOut:
 	; 's PP is maxed out.
 	text_jump Text_PPIsMaxedOut
 	db "@"
-; 0xf734
 
-TextJump_PPsIncreased: ; 0xf734
+TextJump_PPsIncreased:
 	; 's PP increased.
 	text_jump Text_PPsIncreased
 	db "@"
-; 0xf739
 
-UnknownText_0xf739: ; 0xf739
+UnknownText_0xf739:
 	; PP was restored.
 	text_jump UnknownText_0x1c5cf1
 	db "@"
-; 0xf73e
 
 
 SquirtbottleEffect:
@@ -2656,11 +2635,10 @@ OpenBox:
 
 	jp UseDisposableItem
 
-.text ; 0xf778
+.text
 	; There was a trophy inside!
 	text_jump UnknownText_0x1c5d03
 	db "@"
-; 0xf77d
 
 NoEffect:
 	jp IsntTheTimeMessage
@@ -2753,83 +2731,70 @@ CantUseItemMessage:
 	ld [wItemEffectSucceeded], a
 	jp PrintText
 
-LooksBitterText: ; 0xf80b
+LooksBitterText:
 	; It looks bitter…
 	text_jump UnknownText_0x1c5d3e
 	db "@"
-; 0xf810
 
-CantUseOnEggText: ; 0xf810
+CantUseOnEggText:
 	; That can't be used on an EGG.
 	text_jump UnknownText_0x1c5d50
 	db "@"
-; 0xf815
 
-IsntTheTimeText: ; 0xf815
+IsntTheTimeText:
 	; OAK:  ! This isn't the time to use that!
 	text_jump UnknownText_0x1c5d6e
 	db "@"
-; 0xf81a
 
-BelongsToSomeoneElseText: ; 0xf81a
+BelongsToSomeoneElseText:
 	; That belongs to someone else!
 	text_jump UnknownText_0x1c5d97
 	db "@"
-; 0xf81f
 
-WontHaveAnyEffectText: ; 0xf81f
+WontHaveAnyEffectText:
 	; It won't have any effect.
 	text_jump UnknownText_0x1c5db6
 	db "@"
-; 0xf824
 
-BlockedTheBallText: ; 0xf824
+BlockedTheBallText:
 	; The trainer blocked the BALL!
 	text_jump UnknownText_0x1c5dd0
 	db "@"
-; 0xf829
 
-DontBeAThiefText: ; 0xf829
+DontBeAThiefText:
 	; Don't be a thief!
 	text_jump UnknownText_0x1c5def
 	db "@"
-; 0xf82e
 
-CyclingIsntAllowedText: ; 0xf82e
+CyclingIsntAllowedText:
 	; Cycling isn't allowed here.
 	text_jump UnknownText_0x1c5e01
 	db "@"
-; 0xf833
 
-CantGetOnYourBikeText: ; 0xf833
+CantGetOnYourBikeText:
 	; Can't get on your @  now.
 	text_jump UnknownText_0x1c5e1d
 	db "@"
-; 0xf838
 
-Ball_BoxIsFullText: ; 0xf838
+Ball_BoxIsFullText:
 	; The #MON BOX is full. That can't be used now.
 	text_jump UnknownText_0x1c5e3a
 	db "@"
-; 0xf83d
 
-UsedItemText: ; 0xf83d
+UsedItemText:
 	; used the@ .
 	text_jump UnknownText_0x1c5e68
 	db "@"
-; 0xf842
 
-GotOnTheItemText: ; 0xf842
+GotOnTheItemText:
 	; got on the@ .
 	text_jump UnknownText_0x1c5e7b
 	db "@"
-; 0xf847
 
-GotOffTheItemText: ; 0xf847
+GotOffTheItemText:
 	; got off@ the @ .
 	text_jump UnknownText_0x1c5e90
 	db "@"
-; 0xf84c
 
 
 ApplyPPUp:

engine/items/mart.asm

@@ -572,26 +572,23 @@ RooftopSaleAskPurchaseQuantity:
 	ret
 
 
-Text_Mart_HowMany: ; 0x15e0e
+Text_Mart_HowMany:
 	; How many?
 	text_jump UnknownText_0x1c4bfd
 	db "@"
-; 0x15e13
 
-Text_Mart_CostsThisMuch: ; 0x15e13
+Text_Mart_CostsThisMuch:
 	; @ (S) will be ¥@ .
 	text_jump UnknownText_0x1c4c08
 	db "@"
-; 0x15e18
 
-MenuHeader_Buy: ; 0x15e18
+MenuHeader_Buy:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 1, 3, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .MenuData
 	db 1 ; default option
-; 0x15e20
 
-.MenuData ; 0x15e20
+.MenuData
 	db SCROLLINGMENU_DISPLAY_ARROWS | SCROLLINGMENU_ENABLE_FUNCTION3 ; flags
 	db 4, 8 ; rows, columns
 	db 1 ; horizontal spacing
@@ -618,131 +615,110 @@ MenuHeader_Buy: ; 0x15e18
 	call PrintBCDNumber
 	ret
 
-Text_HerbShop_Intro: ; 0x15e4a
+Text_HerbShop_Intro:
 	; Hello, dear. I sell inexpensive herbal medicine. They're good, but a trifle bitter. Your #MON may not like them. Hehehehe…
 	text_jump UnknownText_0x1c4c28
 	db "@"
-; 0x15e4f
 
-Text_HerbShop_HowMany: ; 0x15e4f
+Text_HerbShop_HowMany:
 	; How many?
 	text_jump UnknownText_0x1c4ca3
 	db "@"
-; 0x15e54
 
-Text_HerbShop_CostsThisMuch: ; 0x15e54
+Text_HerbShop_CostsThisMuch:
 	; @ (S) will be ¥@ .
 	text_jump UnknownText_0x1c4cae
 	db "@"
-; 0x15e59
 
-Text_HerbShop_HereYouGo: ; 0x15e59
+Text_HerbShop_HereYouGo:
 	; Thank you, dear. Hehehehe…
 	text_jump UnknownText_0x1c4cce
 	db "@"
-; 0x15e5e
 
-Text_HerbShop_BagFull: ; 0x15e5e
+Text_HerbShop_BagFull:
 	; Oh? Your PACK is full, dear.
 	text_jump UnknownText_0x1c4cea
 	db "@"
-; 0x15e63
 
-Text_HerbShop_InsufficientFunds: ; 0x15e63
+Text_HerbShop_InsufficientFunds:
 	; Hehehe… You don't have the money.
 	text_jump UnknownText_0x1c4d08
 	db "@"
-; 0x15e68
 
-Text_HerbShop_ComeAgain: ; 0x15e68
+Text_HerbShop_ComeAgain:
 	; Come again, dear. Hehehehe…
 	text_jump UnknownText_0x1c4d2a
 	db "@"
-; 0x15e6d
 
-Text_BargainShop_Intro: ; 0x15e6d
+Text_BargainShop_Intro:
 	; Hiya! Care to see some bargains? I sell rare items that nobody else carries--but only one of each item.
 	text_jump UnknownText_0x1c4d47
 	db "@"
-; 0x15e72
 
-Text_BargainShop_CostsThisMuch: ; 0x15e72
+Text_BargainShop_CostsThisMuch:
 	; costs ¥@ . Want it?
 	text_jump UnknownText_0x1c4db0
 	db "@"
-; 0x15e77
 
-Text_BargainShop_HereYouGo: ; 0x15e77
+Text_BargainShop_HereYouGo:
 	; Thanks.
 	text_jump UnknownText_0x1c4dcd
 	db "@"
-; 0x15e7c
 
-Text_BargainShop_BagFull: ; 0x15e7c
+Text_BargainShop_BagFull:
 	; Uh-oh, your PACK is chock-full.
 	text_jump UnknownText_0x1c4dd6
 	db "@"
-; 0x15e81
 
-Text_BargainShop_SoldOut: ; 0x15e81
+Text_BargainShop_SoldOut:
 	; You bought that already. I'm all sold out of it.
 	text_jump UnknownText_0x1c4df7
 	db "@"
-; 0x15e86
 
-Text_BargainShop_InsufficientFunds: ; 0x15e86
+Text_BargainShop_InsufficientFunds:
 	; Uh-oh, you're short on funds.
 	text_jump UnknownText_0x1c4e28
 	db "@"
-; 0x15e8b
 
-Text_BargainShop_ComeAgain: ; 0x15e8b
+Text_BargainShop_ComeAgain:
 	; Come by again sometime.
 	text_jump UnknownText_0x1c4e46
 	db "@"
-; 0x15e90
 
-Text_Pharmacist_Intro: ; 0x15e90
+Text_Pharmacist_Intro:
 	; What's up? Need some medicine?
 	text_jump UnknownText_0x1c4e5f
 	db "@"
-; 0x15e95
 
-Text_Pharmacy_HowMany: ; 0x15e95
+Text_Pharmacy_HowMany:
 	; How many?
 	text_jump UnknownText_0x1c4e7e
 	db "@"
-; 0x15e9a
 
-Text_Pharmacy_CostsThisMuch: ; 0x15e9a
+Text_Pharmacy_CostsThisMuch:
 	; @ (S) will cost ¥@ .
 	text_jump UnknownText_0x1c4e89
 	db "@"
-; 0x15e9f
 
-Text_Pharmacy_HereYouGo: ; 0x15e9f
+Text_Pharmacy_HereYouGo:
 	; Thanks much!
 	text_jump UnknownText_0x1c4eab
 	db "@"
-; 0x15ea4
 
-Text_Pharmacy_BagFull: ; 0x15ea4
+Text_Pharmacy_BagFull:
 	; You don't have any more space.
 	text_jump UnknownText_0x1c4eb9
 	db "@"
-; 0x15ea9
 
-Text_Pharmacy_InsufficientFunds: ; 0x15ea9
+Text_Pharmacy_InsufficientFunds:
 	; Huh? That's not enough money.
 	text_jump UnknownText_0x1c4ed8
 	db "@"
-; 0x15eae
 
-Text_Pharmacist_ComeAgain: ; 0x15eae
+Text_Pharmacist_ComeAgain:
 	; All right. See you around.
 	text_jump UnknownText_0x1c4ef6
 	db "@"
-; 0x15eb3
 
 
 SellMenu:
@@ -767,11 +743,10 @@ SellMenu:
 	and a
 	ret
 
-.NothingToSellText: ; 0x15edb
+.NothingToSellText:
 	; You don't have anything to sell.
 	text_jump UnknownText_0x1c4f12
 	db "@"
-; 0x15ee0
 
 
 .TryToSellItem:
@@ -839,81 +814,69 @@ SellMenu:
 	and a
 	ret
 
-Text_Mart_SellHowMany: ; 0x15f73
+Text_Mart_SellHowMany:
 	; How many?
 	text_jump UnknownText_0x1c4f33
 	db "@"
-; 0x15f78
 
-Text_Mart_ICanPayThisMuch: ; 0x15f78
+Text_Mart_ICanPayThisMuch:
 	; I can pay you ¥@ . Is that OK?
 	text_jump UnknownText_0x1c4f3e
 	db "@"
-; 0x15f7d
 
 .UnusedString15f7d:
 	db "！ダミー！@"
 
-Text_Mart_HowMayIHelpYou: ; 0x15f83
+Text_Mart_HowMayIHelpYou:
 	; Welcome! How may I help you?
 	text_jump UnknownText_0x1c4f62
 	db "@"
-; 0x15f88
 
-MenuHeader_BuySell: ; 0x15f88
+MenuHeader_BuySell:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 7, 8
 	dw .MenuData
 	db 1 ; default option
-; 0x15f90
 
-.MenuData ; 0x15f90
+.MenuData
 	db STATICMENU_CURSOR ; strings
 	db 3 ; items
 	db "BUY@"
 	db "SELL@"
 	db "QUIT@"
-; 0x15f96
 
-Text_Mart_HereYouGo: ; 0x15fa0
+Text_Mart_HereYouGo:
 	; Here you are. Thank you!
 	text_jump UnknownText_0x1c4f80
 	db "@"
-; 0x15fa5
 
-Text_Mart_InsufficientFunds: ; 0x15fa5
+Text_Mart_InsufficientFunds:
 	; You don't have enough money.
 	text_jump UnknownText_0x1c4f9a
 	db "@"
-; 0x15faa
 
-Text_Mart_BagFull: ; 0x15faa
+Text_Mart_BagFull:
 	; You can't carry any more items.
 	text_jump UnknownText_0x1c4fb7
 	db "@"
-; 0x15faf
 
-TextMart_CantBuyFromYou: ; 0x15faf
+TextMart_CantBuyFromYou:
 	; Sorry, I can't buy that from you.
 	text_jump UnknownText_0x1c4fd7
 	db "@"
-; 0x15fb4
 
-Text_Mart_ComeAgain: ; 0x15fb4
+Text_Mart_ComeAgain:
 	; Please come again!
 	text_jump UnknownText_0x1c4ff9
 	db "@"
-; 0x15fb9
 
-Text_Mart_AnythingElse: ; 0x15fb9
+Text_Mart_AnythingElse:
 	text_jump UnknownText_0x1c500d
 	db "@"
-; 0x15fbe
 
-Text_Mart_SoldForAmount: ; 0x15fbe
+Text_Mart_SoldForAmount:
 	text_jump UnknownText_0x1c502e
 	db "@"
-; 0x15fc3
 
 PlayTransactionSound:
 	call WaitSFX

engine/items/pack.asm

@@ -158,39 +158,35 @@ Pack:
 	call Pack_GetJumptablePointer
 	jp hl
 
-.MenuHeader1: ; 0x10124
+.MenuHeader1:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .MenuData_1
 	db 1 ; default option
-; 0x1012c
 
-.MenuData_1: ; 0x1012c
+.MenuData_1:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 2 ; items
 	db "USE@"
 	db "QUIT@"
-; 0x10137
 
 .Jumptable1:
 	dw .UseItem
 	dw QuitItemSubmenu
 
 
-.MenuHeader2: ; 0x1013b
+.MenuHeader2:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .MenuData_2
 	db 1 ; default option
-; 0x10143
 
-.MenuData_2: ; 0x10143
+.MenuData_2:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 3 ; items
 	db "USE@"
 	db "GIVE@"
 	db "QUIT@"
-; 0x10153
 
 .Jumptable2:
 	dw .UseItem
@@ -314,14 +310,13 @@ Pack:
 	call Pack_GetJumptablePointer
 	jp hl
 
-MenuHeader_UsableKeyItem: ; 0x10249
+MenuHeader_UsableKeyItem:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .MenuData
 	db 1 ; default option
-; 0x10251
 
-.MenuData: ; 0x10251
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 5 ; items
 	db "USE@"
@@ -329,7 +324,6 @@ MenuHeader_UsableKeyItem: ; 0x10249
 	db "TOSS@"
 	db "SEL@"
 	db "QUIT@"
-; 0x1026a
 
 Jumptable_UseGiveTossRegisterQuit:
 	dw UseItem
@@ -338,21 +332,19 @@ Jumptable_UseGiveTossRegisterQuit:
 	dw RegisterItem
 	dw QuitItemSubmenu
 
-MenuHeader_UsableItem: ; 0x10274
+MenuHeader_UsableItem:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 3, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .MenuData
 	db 1 ; default option
-; 0x1027c
 
-.MenuData: ; 0x1027c
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 4 ; items
 	db "USE@"
 	db "GIVE@"
 	db "TOSS@"
 	db "QUIT@"
-; 0x10291
 
 Jumptable_UseGiveTossQuit:
 	dw UseItem
@@ -360,59 +352,53 @@ Jumptable_UseGiveTossQuit:
 	dw TossMenu
 	dw QuitItemSubmenu
 
-MenuHeader_UnusableItem: ; 0x10299
+MenuHeader_UnusableItem:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .MenuData
 	db 1 ; default option
-; 0x102a1
 
-.MenuData: ; 0x102a1
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 2 ; items
 	db "USE@"
 	db "QUIT@"
-; 0x102ac
 
 Jumptable_UseQuit:
 	dw UseItem
 	dw QuitItemSubmenu
 
-MenuHeader_UnusableKeyItem: ; 0x102b0
+MenuHeader_UnusableKeyItem:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .MenuData
 	db 1 ; default option
-; 0x102b8
 
-.MenuData: ; 0x102b8
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 3 ; items
 	db "USE@"
 	db "SEL@"
 	db "QUIT@"
-; 0x102c7
 
 Jumptable_UseRegisterQuit:
 	dw UseItem
 	dw RegisterItem
 	dw QuitItemSubmenu
 
-MenuHeader_HoldableKeyItem: ; 0x102cd
+MenuHeader_HoldableKeyItem:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 3, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .MenuData
 	db 1 ; default option
-; 0x102d5
 
-.MenuData: ; 0x102d5
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 4 ; items
 	db "GIVE@"
 	db "TOSS@"
 	db "SEL@"
 	db "QUIT@"
-; 0x102ea
 
 Jumptable_GiveTossRegisterQuit:
 	dw GiveItem
@@ -420,20 +406,18 @@ Jumptable_GiveTossRegisterQuit:
 	dw RegisterItem
 	dw QuitItemSubmenu
 
-MenuHeader_HoldableItem: ; 0x102f2
+MenuHeader_HoldableItem:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .MenuData
 	db 1 ; default option
-; 0x102fa
 
-.MenuData: ; 0x102fa
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 3 ; items
 	db "GIVE@"
 	db "TOSS@"
 	db "QUIT@"
-; 0x1030b
 
 Jumptable_GiveTossQuit:
 	dw GiveItem
@@ -633,11 +617,10 @@ GiveItem:
 	ld hl, TextJump_YouDontHaveAMon
 	call Pack_PrintTextNoScroll
 	ret
-.Egg: ; 0x1048d
+.Egg:
 	; An EGG can't hold an item.
 	text_jump Text_AnEGGCantHoldAnItem
 	db "@"
-; 0x10492
 
 QuitItemSubmenu:
 	ret
@@ -824,36 +807,32 @@ TMHMSubmenu:
 	call Pack_GetJumptablePointer
 	jp hl
 
-.UsableMenuHeader: ; 0x10601
+.UsableMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .UsableMenuData
 	db 1 ; default option
-; 0x10609
 
-.UsableMenuData: ; 0x10609
+.UsableMenuData:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 2 ; items
 	db "USE@"
 	db "QUIT@"
-; 0x10614
 
 .UsableJumptable:
 	dw .Use
 	dw .Quit
 
-.UnusableMenuHeader: ; 0x10618
+.UnusableMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 9, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .UnusableMenuData
 	db 1 ; default option
-; 0x10620
 
-.UnusableMenuData: ; 0x10620
+.UnusableMenuData:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 1 ; items
 	db "QUIT@"
-; 0x10627
 
 .UnusableJumptable:
 	dw .Quit
@@ -1122,14 +1101,13 @@ TutorialPack:
 	ld hl, .ItemsMenuHeader
 	jr .DisplayPocket
 
-.ItemsMenuHeader: ; 0x107ef
+.ItemsMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .ItemsMenuData
 	db 1 ; default option
-; 0x107f7
 
-.ItemsMenuData: ; 0x107f7
+.ItemsMenuData:
 	db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags
 	db 5, 8 ; rows, columns
 	db 2 ; horizontal spacing
@@ -1143,14 +1121,13 @@ TutorialPack:
 	ld hl, .KeyItemsMenuHeader
 	jr .DisplayPocket
 
-.KeyItemsMenuHeader: ; 0x1080e
+.KeyItemsMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .KeyItemsMenuData
 	db 1 ; default option
-; 0x10816
 
-.KeyItemsMenuData: ; 0x10816
+.KeyItemsMenuData:
 	db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags
 	db 5, 8 ; rows, columns
 	db 1 ; horizontal spacing
@@ -1173,14 +1150,13 @@ TutorialPack:
 	ld hl, .BallsMenuHeader
 	jr .DisplayPocket
 
-.BallsMenuHeader: ; 0x10842
+.BallsMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .BallsMenuData
 	db 1 ; default option
-; 0x1084a
 
-.BallsMenuData: ; 0x1084a
+.BallsMenuData:
 	db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags
 	db 5, 8 ; rows, columns
 	db 2 ; horizontal spacing
@@ -1486,14 +1462,13 @@ Pack_InitColors:
 	call DelayFrame
 	ret
 
-ItemsPocketMenuHeader: ; 0x10a4f
+ItemsPocketMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .MenuData
 	db 1 ; default option
-; 0x10a57
 
-.MenuData: ; 0x10a57
+.MenuData:
 	db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags
 	db 5, 8 ; rows, columns
 	db 2 ; horizontal spacing
@@ -1502,14 +1477,13 @@ ItemsPocketMenuHeader: ; 0x10a4f
 	dba PlaceMenuItemQuantity
 	dba UpdateItemDescription
 
-PC_Mart_ItemsPocketMenuHeader: ; 0x10a67
+PC_Mart_ItemsPocketMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .MenuData
 	db 1 ; default option
-; 0x10a6f
 
-.MenuData: ; 0x10a6f
+.MenuData:
 	db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP ; flags
 	db 5, 8 ; rows, columns
 	db 2 ; horizontal spacing
@@ -1518,14 +1492,13 @@ PC_Mart_ItemsPocketMenuHeader: ; 0x10a67
 	dba PlaceMenuItemQuantity
 	dba UpdateItemDescription
 
-KeyItemsPocketMenuHeader: ; 0x10a7f
+KeyItemsPocketMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .MenuData
 	db 1 ; default option
-; 0x10a87
 
-.MenuData: ; 0x10a87
+.MenuData:
 	db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags
 	db 5, 8 ; rows, columns
 	db 1 ; horizontal spacing
@@ -1534,14 +1507,13 @@ KeyItemsPocketMenuHeader: ; 0x10a7f
 	dba PlaceMenuItemQuantity
 	dba UpdateItemDescription
 
-PC_Mart_KeyItemsPocketMenuHeader: ; 0x10a97
+PC_Mart_KeyItemsPocketMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .MenuData
 	db 1 ; default option
-; 0x10a9f
 
-.MenuData: ; 0x10a9f
+.MenuData:
 	db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP ; flags
 	db 5, 8 ; rows, columns
 	db 1 ; horizontal spacing
@@ -1550,14 +1522,13 @@ PC_Mart_KeyItemsPocketMenuHeader: ; 0x10a97
 	dba PlaceMenuItemQuantity
 	dba UpdateItemDescription
 
-BallsPocketMenuHeader: ; 0x10aaf
+BallsPocketMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .MenuData
 	db 1 ; default option
-; 0x10ab7
 
-.MenuData: ; 0x10ab7
+.MenuData:
 	db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags
 	db 5, 8 ; rows, columns
 	db 2 ; horizontal spacing
@@ -1566,14 +1537,13 @@ BallsPocketMenuHeader: ; 0x10aaf
 	dba PlaceMenuItemQuantity
 	dba UpdateItemDescription
 
-PC_Mart_BallsPocketMenuHeader: ; 0x10ac7
+PC_Mart_BallsPocketMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .MenuData
 	db 1 ; default option
-; 0x10acf
 
-.MenuData: ; 0x10acf
+.MenuData:
 	db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP ; flags
 	db 5, 8 ; rows, columns
 	db 2 ; horizontal spacing
@@ -1582,72 +1552,61 @@ PC_Mart_BallsPocketMenuHeader: ; 0x10ac7
 	dba PlaceMenuItemQuantity
 	dba UpdateItemDescription
 
-Text_PackNoItems: ; 0x10adf
+Text_PackNoItems:
 	; No items.
 	text_jump UnknownText_0x1c0b9a
 	db "@"
-; 0x10ae4
 
-Text_ThrowAwayHowMany: ; 0x10ae4
+Text_ThrowAwayHowMany:
 	; Throw away how many?
 	text_jump UnknownText_0x1c0ba5
 	db "@"
-; 0x10ae9
 
-Text_ConfirmThrowAway: ; 0x10ae9
+Text_ConfirmThrowAway:
 	; Throw away @ @ (S)?
 	text_jump UnknownText_0x1c0bbb
 	db "@"
-; 0x10aee
 
-Text_ThrewAway: ; 0x10aee
+Text_ThrewAway:
 	; Threw away @ (S).
 	text_jump UnknownText_0x1c0bd8
 	db "@"
-; 0x10af3
 
-Text_ThisIsntTheTime: ; 0x10af3
+Text_ThisIsntTheTime:
 	; OAK:  ! This isn't the time to use that!
 	text_jump UnknownText_0x1c0bee
 	db "@"
-; 0x10af8
 
-TextJump_YouDontHaveAMon: ; 0x10af8
+TextJump_YouDontHaveAMon:
 	; You don't have a #MON!
 	text_jump Text_YouDontHaveAMon
 	db "@"
-; 0x10afd
 
-Text_RegisteredItem: ; 0x10afd
+Text_RegisteredItem:
 	; Registered the @ .
 	text_jump UnknownText_0x1c0c2e
 	db "@"
-; 0x10b02
 
-Text_CantRegister: ; 0x10b02
+Text_CantRegister:
 	; You can't register that item.
 	text_jump UnknownText_0x1c0c45
 	db "@"
-; 0x10b07
 
-Text_MoveItemWhere: ; 0x10b07
+Text_MoveItemWhere:
 	; Where should this be moved to?
 	text_jump UnknownText_0x1c0c63
 	db "@"
-; 0x10b0c
 
-Text_PackEmptyString: ; 0x10b0c
+Text_PackEmptyString:
 	;
 	text_jump UnknownText_0x1c0c83
 	db "@"
-; 0x10b11
 
-TextJump_YouCantUseItInABattle: ; 0x10b11
+TextJump_YouCantUseItInABattle:
 	; Doesn't seem to be used anywhere
 	; "You can't use it in a battle."
 	text_jump Text_YouCantUseItInABattle
 	db "@"
-; 0x10b16
 
 PackMenuGFX:
 INCBIN "gfx/pack/pack_menu.2bpp"

engine/items/print_item_description.asm

@@ -1,4 +1,4 @@
-PrintItemDescription: ; 0x1c8955
+PrintItemDescription:
 ; Print the description for item [wCurSpecies] at de.
 
 	ld a, [wCurSpecies]
@@ -28,4 +28,3 @@ PrintItemDescription: ; 0x1c8955
 	ld d, [hl]
 	pop hl
 	jp PlaceString
-; 0x1c8987

engine/items/tmhm.asm

@@ -166,29 +166,25 @@ TeachTMHM:
 	scf
 	ret
 
-Text_BootedTM: ; 0x2c8bf
+Text_BootedTM:
 	; Booted up a TM.
 	text_jump UnknownText_0x1c0373
 	db "@"
-; 0x2c8c4
 
-Text_BootedHM: ; 0x2c8c4
+Text_BootedHM:
 	; Booted up an HM.
 	text_jump UnknownText_0x1c0384
 	db "@"
-; 0x2c8c9
 
-Text_ItContained: ; 0x2c8c9
+Text_ItContained:
 	; It contained @ . Teach @ to a #MON?
 	text_jump UnknownText_0x1c0396
 	db "@"
-; 0x2c8ce
 
-Text_TMHMNotCompatible: ; 0x2c8ce
+Text_TMHMNotCompatible:
 	; is not compatible with @ . It can't learn @ .
 	text_jump UnknownText_0x1c03c2
 	db "@"
-; 0x2c8d3
 
 TMHM_PocketLoop:
 	xor a
@@ -501,17 +497,15 @@ Unreferenced_Function2cadf:
 .print
 	jp PrintText
 
-.NoRoomText: ; 0x2caf0
+.NoRoomText:
 	; You have no room for any more @ S.
 	text_jump UnknownText_0x1c03fa
 	db "@"
-; 0x2caf5
 
-.ReceivedText: ; 0x2caf5
+.ReceivedText:
 	; You received @ !
 	text_jump UnknownText_0x1c0421
 	db "@"
-; 0x2cafa
 
 .CheckHaveRoomForTMHM:
 	ld a, [wd265]

engine/items/update_item_description.asm

@@ -1,4 +1,4 @@
-UpdateItemDescription: ; 0x244c3
+UpdateItemDescription:
 	ld a, [wMenuSelection]
 	ld [wCurSpecies], a
 	hlcoord 0, 12

engine/link/link.asm

@@ -505,11 +505,10 @@ LinkTimeout:
 	call WaitBGMap2
 	ret
 
-.TooMuchTimeHasElapsed: ; 0x283ed
+.TooMuchTimeHasElapsed:
 	; Too much time has elapsed. Please try again.
 	text_jump UnknownText_0x1c4183
 	db "@"
-; 0x283f2
 
 ExchangeBytes:
 	ld a, TRUE
@@ -1491,20 +1490,18 @@ Function28926:
 	jp InitTradeMenuDisplay
 
 
-.Text_CantTradeLastMon: ; 0x28aaf
+.Text_CantTradeLastMon:
 	; If you trade that #MON, you won't be able to battle.
 	text_jump UnknownText_0x1c41b1
 	db "@"
-; 0x28ab4
 
 .String_Stats_Trade:
 	db "STATS     TRADE@"
 
-.Text_Abnormal: ; 0x28ac4
+.Text_Abnormal:
 	; Your friend's @  appears to be abnormal!
 	text_jump UnknownText_0x1c41e6
 	db "@"
-; 0x28ac9
 
 
 Function28ac9:
@@ -1955,11 +1952,10 @@ String28eab:
 	db   "TRADE"
 	next "CANCEL@"
 
-UnknownText_0x28eb8: ; 0x28eb8
+UnknownText_0x28eb8:
 	; Trade @ for @ ?
 	text_jump UnknownText_0x1c4212
 	db "@"
-; 0x28ebd
 
 String28ebd:
 	db   "Trade completed!@"

engine/menus/delete_save.asm

@@ -18,18 +18,18 @@ _DeleteSaveData:
 	farcall EmptyAllSRAMBanks
 	ret
 
-.Text_ClearAllSaveData: ; 0x4d580
+.Text_ClearAllSaveData:
 	; Clear all save data?
 	text_jump UnknownText_0x1c564a
 	db "@"
 
-.NoYesMenuHeader: ; 0x4d585
+.NoYesMenuHeader:
 	db 0 ; flags
 	menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .MenuData
 	db 1 ; default option
 
-.MenuData: ; 0x4d58d
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 2 ; items
 	db "NO@"

engine/menus/init_gender.asm

@@ -41,25 +41,22 @@ InitGender:
 	call DelayFrames
 	ret
 
-.MenuHeader: ; 0x48dfc
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 6, 4, 12, 9
 	dw .MenuData
 	db 1 ; default option
-; 0x48e04
 
-.MenuData: ; 0x48e04
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_WRAP | STATICMENU_DISABLE_B ; flags
 	db 2 ; items
 	db "Boy@"
 	db "Girl@"
-; 0x48e0f
 
-TextJump_AreYouABoyOrAreYouAGirl: ; 0x48e0f
+TextJump_AreYouABoyOrAreYouAGirl:
 	; Are you a boy? Or are you a girl?
 	text_jump Text_AreYouABoyOrAreYouAGirl
 	db "@"
-; 0x48e14
 
 InitGenderScreen:
 	ld a, $10

engine/menus/intro_menu.asm

@@ -627,7 +627,7 @@ Continue_DisplayGameTime:
 	jp PrintNum
 
 
-OakSpeech: ; 0x5f99
+OakSpeech:
 	farcall InitClock
 	call RotateFourPalettesLeft
 	call ClearTileMap
@@ -705,11 +705,11 @@ OakSpeech: ; 0x5f99
 	call PrintText
 	ret
 
-OakText1: ; 0x6045
+OakText1:
 	text_jump _OakText1
 	db "@"
 
-OakText2: ; 0x604a
+OakText2:
 	text_jump _OakText2
 	start_asm
 	ld a, WOOPER
@@ -718,27 +718,27 @@ OakText2: ; 0x604a
 	ld hl, OakText3
 	ret
 
-OakText3: ; 0x605b
+OakText3:
 	text_jump _OakText3
 	db "@"
 
-OakText4: ; 0x6060
+OakText4:
 	text_jump _OakText4
 	db "@"
 
-OakText5: ; 0x6065
+OakText5:
 	text_jump _OakText5
 	db "@"
 
-OakText6: ; 0x606a
+OakText6:
 	text_jump _OakText6
 	db "@"
 
-OakText7: ; 0x606f
+OakText7:
 	text_jump _OakText7
 	db "@"
 
-NamePlayer: ; 0x6074
+NamePlayer:
 	farcall MovePlayerPicRight
 	farcall ShowPlayerNamingChoices
 	ld a, [wMenuCursorY]
@@ -867,7 +867,7 @@ Intro_RotatePalettesLeftFrontpic:
 	jr nz, .loop
 	ret
 
-IntroFadePalettes: ; 0x617c
+IntroFadePalettes:
 	db %01010100
 	db %10101000
 	db %11111100

engine/menus/main_menu.asm

@@ -48,14 +48,13 @@ MainMenu:
 	db "MOBILE@"
 	db "MOBILE STUDIUM@"
 
-.Jumptable: ; 0x49d60
+.Jumptable:
 	dw MainMenu_Continue
 	dw MainMenu_NewGame
 	dw MainMenu_Options
 	dw MainMenu_MysteryGift
 	dw MainMenu_Mobile
 	dw MainMenu_MobileStudium
-; 0x49d6c
 
 CONTINUE       EQU 0
 NEW_GAME       EQU 1
@@ -66,20 +65,20 @@ MOBILE_STUDIUM EQU 5
 
 MainMenuItems:
 
-NewGameMenu: ; 0x49d6c
+NewGameMenu:
 	db 2
 	db NEW_GAME
 	db OPTION
 	db -1
 
-ContinueMenu: ; 0x49d70
+ContinueMenu:
 	db 3
 	db CONTINUE
 	db NEW_GAME
 	db OPTION
 	db -1
 
-MobileMysteryMenu: ; 0x49d75
+MobileMysteryMenu:
 	db 5
 	db CONTINUE
 	db NEW_GAME
@@ -88,7 +87,7 @@ MobileMysteryMenu: ; 0x49d75
 	db MOBILE
 	db -1
 
-MobileMenu: ; 0x49d7c
+MobileMenu:
 	db 4
 	db CONTINUE
 	db NEW_GAME
@@ -96,7 +95,7 @@ MobileMenu: ; 0x49d7c
 	db MOBILE
 	db -1
 
-MobileStudiumMenu: ; 0x49d82
+MobileStudiumMenu:
 	db 5
 	db CONTINUE
 	db NEW_GAME
@@ -105,7 +104,7 @@ MobileStudiumMenu: ; 0x49d82
 	db MOBILE_STUDIUM
 	db -1
 
-MysteryMobileStudiumMenu: ; 0x49d89
+MysteryMobileStudiumMenu:
 	db 6
 	db CONTINUE
 	db NEW_GAME
@@ -115,7 +114,7 @@ MysteryMobileStudiumMenu: ; 0x49d89
 	db MOBILE_STUDIUM
 	db -1
 
-MysteryMenu: ; 0x49d91
+MysteryMenu:
 	db 4
 	db CONTINUE
 	db NEW_GAME
@@ -123,7 +122,7 @@ MysteryMenu: ; 0x49d91
 	db MYSTERY_GIFT
 	db -1
 
-MysteryStudiumMenu: ; 0x49d97
+MysteryStudiumMenu:
 	db 5
 	db CONTINUE
 	db NEW_GAME
@@ -132,7 +131,7 @@ MysteryStudiumMenu: ; 0x49d97
 	db MOBILE_STUDIUM
 	db -1
 
-StudiumMenu: ; 0x49d9e
+StudiumMenu:
 	db 4
 	db CONTINUE
 	db NEW_GAME

engine/menus/menu_2.asm

@@ -1,4 +1,4 @@
-PlaceMenuItemName: ; 0x24ab4
+PlaceMenuItemName:
 	push de
 	ld a, [wMenuSelection]
 	ld [wNamedObjectIndexBuffer], a
@@ -7,7 +7,7 @@ PlaceMenuItemName: ; 0x24ab4
 	call PlaceString
 	ret
 
-PlaceMenuItemQuantity: ; 0x24ac3
+PlaceMenuItemQuantity:
 	push de
 	ld a, [wMenuSelection]
 	ld [wCurItem], a
@@ -52,13 +52,13 @@ PlaceMoneyTextBox:
 	call PrintNum
 	ret
 
-MenuHeader_0x24b15: ; 0x24b15
+MenuHeader_0x24b15:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 11, 0, SCREEN_WIDTH - 1, 2
 	dw NULL
 	db 1 ; default option
 
-MenuHeader_0x24b1d: ; 0x24b1d
+MenuHeader_0x24b1d:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 11, 8, 13
 	dw NULL

engine/menus/naming_screen.asm

@@ -4,13 +4,12 @@ NAMINGSCREEN_BORDER     EQUS "\"■\"" ; $60
 NAMINGSCREEN_MIDDLELINE EQUS "\"→\"" ; $eb
 NAMINGSCREEN_UNDERLINE  EQUS "\"<DOT>\"" ; $f2
 
-_NamingScreen: ; 0x116b7
+_NamingScreen:
 	call DisableSpriteUpdates
 	call NamingScreen
 	call ReturnToMapWithSpeechTextbox
 	ret
 
-; 0x116c1
 
 NamingScreen:
 	ld hl, wNamingScreenDestinationPointer

engine/menus/save.asm

@@ -1112,50 +1112,42 @@ Checksum:
 	ret
 
 
-Text_WouldYouLikeToSaveTheGame: ; 0x15283
+Text_WouldYouLikeToSaveTheGame:
 	; Would you like to save the game?
 	text_jump UnknownText_0x1c454b
 	db "@"
-; 0x15288
 
-Text_SavingDontTurnOffThePower: ; 0x15288
+Text_SavingDontTurnOffThePower:
 	; SAVING… DON'T TURN OFF THE POWER.
 	text_jump UnknownText_0x1c456d
 	db "@"
-; 0x1528d
 
-Text_PlayerSavedTheGame: ; 0x1528d
+Text_PlayerSavedTheGame:
 	; saved the game.
 	text_jump UnknownText_0x1c4590
 	db "@"
-; 0x15292
 
-Text_AlreadyASaveFile: ; 0x15292
+Text_AlreadyASaveFile:
 	; There is already a save file. Is it OK to overwrite?
 	text_jump UnknownText_0x1c45a3
 	db "@"
-; 0x15297
 
-Text_AnotherSaveFile: ; 0x15297
+Text_AnotherSaveFile:
 	; There is another save file. Is it OK to overwrite?
 	text_jump UnknownText_0x1c45d9
 	db "@"
-; 0x1529c
 
-Text_SaveFileCorrupted: ; 0x1529c
+Text_SaveFileCorrupted:
 	; The save file is corrupted!
 	text_jump UnknownText_0x1c460d
 	db "@"
-; 0x152a1
 
-Text_SaveOnBoxSwitch: ; 0x152a1
+Text_SaveOnBoxSwitch:
 	; When you change a #MON BOX, data will be saved. OK?
 	text_jump UnknownText_0x1c462a
 	db "@"
-; 0x152a6
 
-Text_SaveOnMoveMonWOMail: ; 0x152a6
+Text_SaveOnMoveMonWOMail:
 	; Each time you move a #MON, data will be saved. OK?
 	text_jump UnknownText_0x1c465f
 	db "@"
-; 0x152ab

engine/menus/start_menu.asm

@@ -647,7 +647,6 @@ TossItemFromPC:
 	; That's too impor- tant to toss out!
 	text_jump UnknownText_0x1c1adf
 	db "@"
-; 0x12a60
 
 CantUseItem:
 	ld hl, CantUseItemText
@@ -1137,7 +1136,6 @@ MonMailAction:
 	menu_coords 12, 10, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw .MenuData
 	db 1 ; default option
-; 0x12dd1
 
 .MenuData:
 	db STATICMENU_CURSOR ; flags
@@ -1145,44 +1143,37 @@ MonMailAction:
 	db "READ@"
 	db "TAKE@"
 	db "QUIT@"
-; 0x12de2
 
 
 .mailwilllosemessagetext
 ; The MAIL will lose its message. OK?
 	text_jump UnknownText_0x1c1c22
 	db "@"
-; 0x12de7
 
 .tookmailfrommontext
 ; MAIL detached from <POKEMON>.
 	text_jump UnknownText_0x1c1c47
 	db "@"
-; 0x12dec
 
 .bagfulltext
 ; There's no space for removing MAIL.
 	text_jump UnknownText_0x1c1c62
 	db "@"
-; 0x12df1
 
 .sendmailtopctext
 ; Send the removed MAIL to your PC?
 	text_jump UnknownText_0x1c1c86
 	db "@"
-; 0x12df6
 
 .mailboxfulltext
 ; Your PC's MAILBOX is full.
 	text_jump UnknownText_0x1c1ca9
 	db "@"
-; 0x12dfb
 
 .sentmailtopctext
 ; The MAIL was sent to your PC.
 	text_jump UnknownText_0x1c1cc4
 	db "@"
-; 0x12e00
 
 
 OpenPartyStats:
@@ -1348,7 +1339,6 @@ MonMenu_Softboiled_MilkDrink:
 	; Not enough HP!
 	text_jump UnknownText_0x1c1ce3
 	db "@"
-; 0x12f05
 
 .CheckMonHasEnoughHP:
 ; Need to have at least (MaxHP / 5) HP left.

engine/movie/init_hof_credits.asm

@@ -23,7 +23,7 @@ InitDisplayForHallOfFame:
 	call SetPalettes
 	ret
 
-.SavingRecordDontTurnOff: ; 0x4e8bd
+.SavingRecordDontTurnOff:
 	; SAVING RECORD… DON'T TURN OFF!
 	text_jump UnknownText_0x1bd39e
 	db "@"

engine/movie/trade_animation.asm

@@ -1247,17 +1247,15 @@ TradeAnim_SentToOTText:
 	ret
 
 
-.Text_WasSentTo: ; 0x29732
+.Text_WasSentTo:
 	; was sent to @ .
 	text_jump UnknownText_0x1bc6e9
 	db "@"
-; 0x29737
 
-.Text_MonName: ; 0x29737
+.Text_MonName:
 	;
 	text_jump UnknownText_0x1bc701
 	db "@"
-; 0x2973c
 
 TradeAnim_OTBidsFarewell:
 	ld hl, .Text_BidsFarewellToMon
@@ -1270,17 +1268,15 @@ TradeAnim_OTBidsFarewell:
 	ret
 
 
-.Text_BidsFarewellToMon: ; 0x29752
+.Text_BidsFarewellToMon:
 	; bids farewell to
 	text_jump UnknownText_0x1bc703
 	db "@"
-; 0x29757
 
-.Text_MonName: ; 0x29757
+.Text_MonName:
 	; .
 	text_jump UnknownText_0x1bc719
 	db "@"
-; 0x2975c
 
 TradeAnim_TakeCareOfText:
 	call WaitTop
@@ -1296,11 +1292,10 @@ TradeAnim_TakeCareOfText:
 	ret
 
 
-.Text_TakeGoodCareOfMon: ; 0x2977a
+.Text_TakeGoodCareOfMon:
 	; Take good care of @ .
 	text_jump UnknownText_0x1bc71f
 	db "@"
-; 0x2977f
 
 TradeAnim_OTSendsText1:
 	ld hl, .Text_ForYourMon
@@ -1315,17 +1310,15 @@ TradeAnim_OTSendsText1:
 	ret
 
 
-.Text_ForYourMon: ; 0x2979a
+.Text_ForYourMon:
 	; For @ 's @ ,
 	text_jump UnknownText_0x1bc739
 	db "@"
-; 0x2979f
 
-.Text_OTSends: ; 0x2979f
+.Text_OTSends:
 	; sends @ .
 	text_jump UnknownText_0x1bc74c
 	db "@"
-; 0x297a4
 
 TradeAnim_OTSendsText2:
 	ld hl, .Text_WillTrade
@@ -1340,17 +1333,15 @@ TradeAnim_OTSendsText2:
 	ret
 
 
-.Text_WillTrade: ; 0x297bf
+.Text_WillTrade:
 	; will trade @ @
 	text_jump UnknownText_0x1bc75e
 	db "@"
-; 0x297c4
 
-.Text_ForYourMon: ; 0x297c4
+.Text_ForYourMon:
 	; for @ 's @ .
 	text_jump UnknownText_0x1bc774
 	db "@"
-; 0x297c9
 
 TradeAnim_Wait80Frames:
 	ld c, 80

engine/overworld/decorations.asm

@@ -5,7 +5,7 @@ InitDecorations:
 	ld [wDecoPoster], a
 	ret
 
-_PlayerDecorationMenu: ; 0x2675c
+_PlayerDecorationMenu:
 	ld a, [wWhichIndexSet]
 	push af
 	ld hl, .MenuHeader
@@ -34,22 +34,19 @@ _PlayerDecorationMenu: ; 0x2675c
 	ld a, [wBuffer5]
 	ld c, a
 	ret
-; 0x2679a
 
-.MenuHeader: ; 0x2679a
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 5, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw .MenuData
 	db 1 ; default option
-; 0x267a2
 
-.MenuData: ; 0x267a2
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
 	db 0 ; items
 	dw wd002
 	dw PlaceNthMenuStrings
 	dw .pointers
-; 0x267aa
 
 .pointers
 	dw DecoBedMenu, .bed
@@ -385,35 +382,31 @@ PopulateDecoCategoryMenu:
 	call MenuTextBoxBackup
 	ret
 
-.Text_nothing_to_choose: ; 0x269b0
+.Text_nothing_to_choose:
 	; There's nothing to choose.
 	text_jump UnknownText_0x1bc471
 	db "@"
-; 0x269b5
 
-.NonscrollingMenuHeader: ; 0x269b5
+.NonscrollingMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw .NonscrollingMenuData
 	db 1 ; default option
-; 0x269bd
 
-.NonscrollingMenuData: ; 0x269bd
+.NonscrollingMenuData:
 	db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
 	db 0 ; items
 	dw wd002
 	dw DecorationMenuFunction
 	dw DecorationAttributes
-; 0x269c5
 
-.ScrollingMenuHeader: ; 0x269c5
+.ScrollingMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 1, 1, SCREEN_WIDTH - 2, SCREEN_HEIGHT - 2
 	dw .ScrollingMenuData
 	db 1 ; default option
-; 0x269cd
 
-.ScrollingMenuData: ; 0x269cd
+.ScrollingMenuData:
 	db SCROLLINGMENU_DISPLAY_ARROWS ; flags
 	db 8, 0 ; rows, columns
 	db 1 ; horizontal spacing
@@ -814,11 +807,10 @@ DecoAction_SetItUp_Ornament:
 	ld [wOtherDecoration], a
 	ret
 
-UnknownText_0x26e41: ; 0x26e41
+UnknownText_0x26e41:
 	; Which side do you want to put it on?
 	text_jump UnknownText_0x1bc48c
 	db "@"
-; 0x26e46
 
 DecoAction_PutItAway_Ornament:
 	ld a, [wSelectedDecoration]
@@ -841,11 +833,10 @@ DecoAction_PutItAway_Ornament:
 	xor a
 	ret
 
-DecoText_WhichSide: ; 0x26e6b
+DecoText_WhichSide:
 	; Which side do you want to put away?
 	text_jump UnknownText_0x1bc4b2
 	db "@"
-; 0x26e70
 
 DecoAction_AskWhichSide:
 	call MenuTextBox
@@ -882,50 +873,43 @@ QueryWhichSide:
 	pop de
 	ret
 
-MenuHeader_0x26eab: ; 0x26eab
+MenuHeader_0x26eab:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 13, 7
 	dw MenuData_0x26eb3
 	db 1 ; default option
-; 0x26eb3
 
-MenuData_0x26eb3: ; 0x26eb3
+MenuData_0x26eb3:
 	db STATICMENU_CURSOR ; flags
 	db 3 ; items
 	db "RIGHT SIDE@"
 	db "LEFT SIDE@"
 	db "CANCEL@"
-; 0x26ed1
 
-DecoText_PutAwayTheDeco: ; 0x26ed1
+DecoText_PutAwayTheDeco:
 	; Put away the @ .
 	text_jump UnknownText_0x1bc4d7
 	db "@"
-; 0x26ed6
 
-DecoText_NothingToPutAway: ; 0x26ed6
+DecoText_NothingToPutAway:
 	; There's nothing to put away.
 	text_jump UnknownText_0x1bc4ec
 	db "@"
-; 0x26edb
 
-DecoText_SetUpTheDeco: ; 0x26edb
+DecoText_SetUpTheDeco:
 	; Set up the @ .
 	text_jump UnknownText_0x1bc509
 	db "@"
-; 0x26ee0
 
-DecoText_PutAwayAndSetUp: ; 0x26ee0
+DecoText_PutAwayAndSetUp:
 	; Put away the @ and set up the @ .
 	text_jump UnknownText_0x1bc51c
 	db "@"
-; 0x26ee5
 
-DecoText_AlreadySetUp: ; 0x26ee5
+DecoText_AlreadySetUp:
 	; That's already set up.
 	text_jump UnknownText_0x1bc546
 	db "@"
-; 0x26eea
 
 GetDecorationName_c_de:
 	ld a, c
@@ -1024,50 +1008,42 @@ DecorationDesc_PosterPointers:
 	dbw DECO_JIGGLYPUFF_POSTER, DecorationDesc_JigglypuffPoster
 	db -1
 
-DecorationDesc_TownMapPoster: ; 0x26f91
+DecorationDesc_TownMapPoster:
 	opentext
 	writetext .TownMapText
 	waitbutton
 	special OverworldTownMap
 	closetext
 	end
-; 0x26f9b
 
-.TownMapText: ; 0x26f9b
+.TownMapText:
 	; It's the TOWN MAP.
 	text_jump UnknownText_0x1bc55d
 	db "@"
-; 0x26fa0
 
-DecorationDesc_PikachuPoster: ; 0x26fa0
+DecorationDesc_PikachuPoster:
 	jumptext .PikaPosterText
-; 0x26fa3
 
-.PikaPosterText: ; 0x26fa3
+.PikaPosterText:
 	; It's a poster of a cute PIKACHU.
 	text_jump UnknownText_0x1bc570
 	db "@"
-; 0x26fa8
 
-DecorationDesc_ClefairyPoster: ; 0x26fa8
+DecorationDesc_ClefairyPoster:
 	jumptext .ClefairyPosterText
-; 0x26fab
 
-.ClefairyPosterText: ; 0x26fab
+.ClefairyPosterText:
 	; It's a poster of a cute CLEFAIRY.
 	text_jump UnknownText_0x1bc591
 	db "@"
-; 0x26fb0
 
-DecorationDesc_JigglypuffPoster: ; 0x26fb0
+DecorationDesc_JigglypuffPoster:
 	jumptext .JigglypuffPosterText
-; 0x26fb3
 
-.JigglypuffPosterText: ; 0x26fb3
+.JigglypuffPosterText:
 	; It's a poster of a cute JIGGLYPUFF.
 	text_jump UnknownText_0x1bc5b3
 	db "@"
-; 0x26fb8
 
 DecorationDesc_NullPoster:
 	end
@@ -1095,11 +1071,10 @@ DecorationDesc_OrnamentOrConsole:
 .OrnamentConsoleScript:
 	jumptext .OrnamentConsoleText
 
-.OrnamentConsoleText: ; 0x26fd8
+.OrnamentConsoleText:
 	; It's an adorable @ .
 	text_jump UnknownText_0x1bc5d7
 	db "@"
-; 0x26fdd
 
 DecorationDesc_GiantOrnament:
 	ld b, BANK(.BigDollScript)
@@ -1109,11 +1084,10 @@ DecorationDesc_GiantOrnament:
 .BigDollScript:
 	jumptext .BigDollText
 
-.BigDollText: ; 0x26fe6
+.BigDollText:
 	; A giant doll! It's fluffy and cuddly.
 	text_jump UnknownText_0x1bc5ef
 	db "@"
-; 0x26feb
 
 ToggleMaptileDecorations:
 	lb de, 0, 4

engine/overworld/landmarks.asm

@@ -1,4 +1,4 @@
-GetLandmarkCoords: ; 0x1ca896
+GetLandmarkCoords:
 ; Return coordinates (d, e) of landmark e.
 	push hl
 	ld l, e
@@ -12,10 +12,9 @@ GetLandmarkCoords: ; 0x1ca896
 	ld d, [hl]
 	pop hl
 	ret
-; 0x1ca8a5
 
 
-GetLandmarkName:: ; 0x1ca8a5
+GetLandmarkName::
 ; Copy the name of landmark e to wStringBuffer1.
 	push hl
 	push de
@@ -44,13 +43,12 @@ GetLandmarkName:: ; 0x1ca8a5
 	pop de
 	pop hl
 	ret
-; 0x1ca8c3
 
 
 INCLUDE "data/maps/landmarks.asm"
 
 
-RegionCheck: ; 0x1caea1
+RegionCheck:
 ; Checks if the player is in Kanto or Johto.
 ; If in Johto, returns 0 in e.
 ; If in Kanto, returns 1 in e.

engine/overworld/wildmons.asm

@@ -842,7 +842,6 @@ RandomUnseenWildMon:
 	; I just saw some rare @  in @ . I'll call you if I see another rare #MON, OK?
 	text_jump UnknownText_0x1bd34b
 	db "@"
-; 0x2a51f
 
 RandomPhoneWildMon:
 	farcall GetCallerLocation

engine/phone/phone.asm

@@ -282,10 +282,9 @@ CheckSpecialPhoneCall::
 	xor a
 	ret
 
-.script ; 0x90173
+.script
 	pause 30
 	jump Script_ReceivePhoneCall
-; 0x90178
 
 .DoSpecialPhoneCall:
 	ld a, [wSpecialPhoneCallID]
@@ -381,15 +380,13 @@ Function90199:
 	call ExecuteCallbackScript
 	ret
 
-UnknownScript_0x90205: ; 0x90205
+UnknownScript_0x90205:
 	ptcall wd002
 	return
-; 0x90209
 
-UnknownScript_0x90209: ; 0x90209
+UnknownScript_0x90209:
 	scall UnknownScript_0x90657
 	return
-; 0x9020d
 
 LoadCallerScript:
 	nop
@@ -425,7 +422,7 @@ WrongNumber:
 	text_jump UnknownText_0x1c5565
 	db "@"
 
-Script_ReceivePhoneCall: ; 0x90241
+Script_ReceivePhoneCall:
 	refreshscreen
 	callasm RingTwice_StartCall
 	ptcall wPhoneScriptPointer
@@ -434,9 +431,8 @@ Script_ReceivePhoneCall: ; 0x90241
 	closetext
 	callasm InitCallReceiveDelay
 	end
-; 0x90255
 
-Script_SpecialBillCall:: ; 0x90255
+Script_SpecialBillCall::
 	callasm .LoadBillScript
 	jump Script_ReceivePhoneCall
 
@@ -444,7 +440,7 @@ Script_SpecialBillCall:: ; 0x90255
 	ld e, PHONE_BILL
 	jp LoadCallerScript
 
-UnknownScript_0x90261: ; 0x90261
+UnknownScript_0x90261:
 	callasm .LoadElmScript
 	pause 30
 	jump Script_ReceivePhoneCall
@@ -558,10 +554,9 @@ HangUp_BoopOn:
 	call PrintText
 	ret
 
-UnknownText_0x90336: ; 0x90336
+UnknownText_0x90336:
 	text_jump UnknownText_0x1c5588
 	db "@"
-; 0x9033b
 
 
 HangUp_BoopOff:
@@ -721,35 +716,29 @@ INCLUDE "data/phone/phone_contacts.asm"
 INCLUDE "data/phone/special_calls.asm"
 
 
-UnknownScript_0x90657: ; 0x90657
+UnknownScript_0x90657:
 	writetext UnknownText_0x9065b
 	end
-; 0x9065b
 
-UnknownText_0x9065b: ; 0x9065b
+UnknownText_0x9065b:
 	; That number is out of the area.
 	text_jump UnknownText_0x1c558b
 	db "@"
-; 0x90660
 
-PhoneScript_JustTalkToThem: ; 0x90660
+PhoneScript_JustTalkToThem:
 	writetext UnknownText_0x90664
 	end
-; 0x90664
 
-UnknownText_0x90664: ; 0x90664
+UnknownText_0x90664:
 	; Just go talk to that person!
 	text_jump UnknownText_0x1c55ac
 	db "@"
-; 0x90669
 
-UnknownScript_0x90669: ; 0x90669
+UnknownScript_0x90669:
 	writetext UnknownText_0x9066d
 	end
-; 0x9066d
 
-UnknownText_0x9066d: ; 0x9066d
+UnknownText_0x9066d:
 	; Thank you!
 	text_jump UnknownText_0x1c55ca
 	db "@"
-; 0x90672

engine/phone/phone_scripts.asm

@@ -1,10 +1,10 @@
-UnusedPhoneScript: ; 0xbcea5
+UnusedPhoneScript:
 	farwritetext UnusedPhoneText
 	end
 
 ; Mom
 
-MomPhoneScript: ; 0xbceaa
+MomPhoneScript:
 	checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
 	iftrue .bcec5
 	checkevent EVENT_DUDE_TALKED_TO_YOU
@@ -15,7 +15,7 @@ MomPhoneScript: ; 0xbceaa
 	iftrue MomPhoneNoPokedexScript
 	jump MomPhoneNoPokemonScript
 
-.bcec5 ; 0xbcec5
+.bcec5
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8
 	iftrue MomPhoneHangUpScript
 	farwritetext MomPhoneGreetingText
@@ -26,12 +26,12 @@ MomPhoneScript: ; 0xbceaa
 	ifequal 2, MomPhonePalette2
 	jump MomPhoneOther
 
-MomPhoneLandmark: ; 0xbcedf
+MomPhoneLandmark:
 	farwritetext MomPhoneLandmarkText
 	buttonsound
 	jump MomSavingMoney
 
-MomPhonePalette1: ; 0xbcee7
+MomPhonePalette1:
 	checkcode VAR_MAPGROUP
 	ifequal GROUP_NEW_BARK_TOWN, .newbark
 	ifequal GROUP_CHERRYGROVE_CITY, .cherrygrove
@@ -42,103 +42,103 @@ MomPhonePalette1: ; 0xbcee7
 	buttonsound
 	jump MomSavingMoney
 
-.newbark ; 0xbcf05
+.newbark
 	farwritetext MomPhoneNewBarkText
 	buttonsound
 	jump MomSavingMoney
 
-.cherrygrove ; 0xbcf0d
+.cherrygrove
 	farwritetext MomPhoneCherrygroveText
 	buttonsound
 	jump MomSavingMoney
 
-.violet ; 0xbcf15
+.violet
 	landmarktotext SPROUT_TOWER, MEM_BUFFER_1
 	jump MomPhoneLandmark
-.azalea ; 0xbcf1b
+.azalea
 	landmarktotext SLOWPOKE_WELL, MEM_BUFFER_1
 	jump MomPhoneLandmark
-.goldenrod ; 0xbcf21
+.goldenrod
 	landmarktotext RADIO_TOWER, MEM_BUFFER_1
 	jump MomPhoneLandmark
 
-MomPhonePalette2: ; 0xbcf27
+MomPhonePalette2:
 	farwritetext MomOtherAreaText
 	buttonsound
 	jump MomSavingMoney
 
-MomPhoneOther: ; 0xbcf2f
+MomPhoneOther:
 	farwritetext MomDeterminedText
 	buttonsound
 	jump MomSavingMoney
 
-MomSavingMoney: ; 0xbcf37
+MomSavingMoney:
 	checkflag ENGINE_MOM_SAVING_MONEY
 	iffalse .NotSaving
 	checkmoney MOMS_MONEY, 0
 	ifequal HAVE_MORE, .SavingHasMoney
 	jump .SavingNoMoney
 
-.NotSaving: ; 0xbcf49
+.NotSaving:
 	checkmoney MOMS_MONEY, 0
 	ifequal HAVE_MORE, .HasMoney
 	jump .NoMoney
 
-.SavingHasMoney: ; 0xbcf55
+.SavingHasMoney:
 	readmoney MOMS_MONEY, MEM_BUFFER_0
 	farwritetext MomCheckBalanceText
 	yesorno
 	iftrue MomPhoneSaveMoneyScript
 	jump MomPhoneWontSaveMoneyScript
 
-.SavingNoMoney: ; 0xbcf63
+.SavingNoMoney:
 	farwritetext MomImportantToSaveText
 	yesorno
 	iftrue MomPhoneSaveMoneyScript
 	jump MomPhoneWontSaveMoneyScript
 
-.NoMoney: ; 0xbcf6e
+.NoMoney:
 	farwritetext MomYoureNotSavingText
 	yesorno
 	iftrue MomPhoneSaveMoneyScript
 	jump MomPhoneWontSaveMoneyScript
 
-.HasMoney: ; 0xbcf79
+.HasMoney:
 	readmoney MOMS_MONEY, MEM_BUFFER_0
 	farwritetext MomYouveSavedText
 	yesorno
 	iftrue MomPhoneSaveMoneyScript
 	jump MomPhoneWontSaveMoneyScript
 
-MomPhoneSaveMoneyScript: ; 0xbcf87
+MomPhoneSaveMoneyScript:
 	setflag ENGINE_MOM_SAVING_MONEY
 	farwritetext MomOKIllSaveText
 	buttonsound
 	jump MomPhoneHangUpScript
 
-MomPhoneWontSaveMoneyScript: ; 0xbcf92
+MomPhoneWontSaveMoneyScript:
 	clearflag ENGINE_MOM_SAVING_MONEY
 	farwritetext MomPhoneWontSaveMoneyText
 	buttonsound
 	jump MomPhoneHangUpScript
 
-MomPhoneHangUpScript: ; 0xbcf9d
+MomPhoneHangUpScript:
 	farwritetext MomPhoneHangUpText
 	end
 
-MomPhoneNoPokemonScript: ; 0xbcfa2
+MomPhoneNoPokemonScript:
 	farwritetext MomPhoneNoPokemonText
 	end
 
-MomPhoneNoPokedexScript: ; 0xbcfa7
+MomPhoneNoPokedexScript:
 	farwritetext MomPhoneNoPokedexText
 	end
 
-MomPhoneNoGymQuestScript: ; 0xbcfac
+MomPhoneNoGymQuestScript:
 	farwritetext MomPhoneNoGymQuestText
 	end
 
-MomPhoneLectureScript: ; 0xbcfb1
+MomPhoneLectureScript:
 	setevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
 	setflag ENGINE_MOM_ACTIVE
 	specialphonecall SPECIALCALL_NONE
@@ -149,7 +149,7 @@ MomPhoneLectureScript: ; 0xbcfb1
 
 ; Bill
 
-BillPhoneScript1: ; 0xbcfc5
+BillPhoneScript1:
 	checktime DAY
 	iftrue .daygreet
 	checktime NITE
@@ -158,17 +158,17 @@ BillPhoneScript1: ; 0xbcfc5
 	buttonsound
 	jump .main
 
-.daygreet ; 0xbcfd7
+.daygreet
 	farwritetext BillPhoneDayGreetingText
 	buttonsound
 	jump .main
 
-.nitegreet ; 0xbcfdf
+.nitegreet
 	farwritetext BillPhoneNiteGreetingText
 	buttonsound
 	jump .main
 
-.main ; 0xbcfe7
+.main
 	farwritetext BillPhoneGenericText
 	buttonsound
 	checkcode VAR_BOXSPACE
@@ -178,22 +178,22 @@ BillPhoneScript1: ; 0xbcfc5
 	farwritetext BillPhoneNotFullText
 	end
 
-.nearlyfull ; 0xbcffd
+.nearlyfull
 	farwritetext BillPhoneNearlyFullText
 	end
 
-.full ; 0xbd002
+.full
 	farwritetext BillPhoneFullText
 	end
 
-BillPhoneScript2: ; 0xbd007
+BillPhoneScript2:
 	farwritetext BillPhoneNewlyFullText
 	waitbutton
 	end
 
 ; Elm
 
-ElmPhoneScript1: ; 0xbd00d
+ElmPhoneScript1:
 	checkcode VAR_SPECIALPHONECALL
 	ifequal SPECIALCALL_POKERUS, .pokerus
 	checkevent EVENT_SHOWED_TOGEPI_TO_ELM
@@ -216,47 +216,47 @@ ElmPhoneScript1: ; 0xbd00d
 	farwritetext ElmPhoneStartText
 	end
 
-.sawmrpokemon ; 0xbd048
+.sawmrpokemon
 	farwritetext ElmPhoneSawMrPokemonText
 	end
 
-.stolen ; 0xbd04d
+.stolen
 	farwritetext ElmPhonePokemonStolenText
 	end
 
-.checkingegg ; 0xbd052
+.checkingegg
 	farwritetext ElmPhoneCheckingEggText
 	end
 
-.assistant ; 0xbd057
+.assistant
 	farwritetext ElmPhoneAssistantText
 	end
 
-.eggunhatched ; 0xbd05c
+.eggunhatched
 	farwritetext ElmPhoneEggUnhatchedText
 	end
 
-.egghatched ; 0xbd061
+.egghatched
 	farwritetext ElmPhoneEggHatchedText
 	setevent EVENT_TOLD_ELM_ABOUT_TOGEPI_OVER_THE_PHONE
 	end
 
-.discovery ; 0xbd069
+.discovery
 	random 2
 	ifequal 0, .nextdiscovery
 	farwritetext ElmPhoneDiscovery1Text
 	end
 
-.nextdiscovery ; 0xbd074
+.nextdiscovery
 	farwritetext ElmPhoneDiscovery2Text
 	end
 
-.pokerus ; 0xbd079
+.pokerus
 	farwritetext ElmPhonePokerusText
 	specialphonecall SPECIALCALL_NONE
 	end
 
-ElmPhoneScript2: ; 0xbd081
+ElmPhoneScript2:
 	checkcode VAR_SPECIALPHONECALL
 	ifequal SPECIALCALL_ROBBED, .disaster
 	ifequal SPECIALCALL_ASSISTANT, .assistant
@@ -267,30 +267,30 @@ ElmPhoneScript2: ; 0xbd081
 	specialphonecall SPECIALCALL_NONE
 	end
 
-.disaster ; 0xbd09f
+.disaster
 	farwritetext ElmPhoneDisasterText
 	specialphonecall SPECIALCALL_NONE
 	setevent EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON
 	end
 
-.assistant ; 0xbd0aa
+.assistant
 	farwritetext ElmPhoneEggAssistantText
 	specialphonecall SPECIALCALL_NONE
 	clearevent EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER
 	setevent EVENT_ELMS_AIDE_IN_LAB
 	end
 
-.rocket ; 0xbd0b8
+.rocket
 	farwritetext ElmPhoneRocketText
 	specialphonecall SPECIALCALL_NONE
 	end
 
-.gift ; 0xbd0c0
+.gift
 	farwritetext ElmPhoneGiftText
 	specialphonecall SPECIALCALL_NONE
 	end
 
-.unused ; 0xbd0c8
+.unused
 	farwritetext ElmPhoneUnusedText
 	specialphonecall SPECIALCALL_NONE
 	end

engine/pokegear/pokegear.asm

@@ -539,11 +539,10 @@ Pokegear_UpdateClock:
 	db "ごぜん@"
 	db "ごご@"
 
-.DayText: ; 0x90faf
+.DayText:
 	text_jump UnknownText_0x1c5821
 	db "@"
 
-; 0x90fb4
 
 PokegearMap_CheckRegion:
 	ld a, [wPokegearMapPlayerIconLandmark]
@@ -950,19 +949,17 @@ PokegearPhone_MakePhoneCall:
 	ret
 
 
-.dotdotdot ; 0x9124c
+.dotdotdot
 	;
 	text_jump UnknownText_0x1c5824
 	db "@"
 
-; 0x91251
 
-.OutOfServiceArea: ; 0x91251
+.OutOfServiceArea:
 	; You're out of the service area.
 	text_jump UnknownText_0x1c5827
 	db "@"
 
-; 0x91256
 
 PokegearPhone_FinishPhoneCall:
 	ld a, [hJoyPressed]
@@ -1382,26 +1379,23 @@ Pokegear_LoadTilemapRLE:
 	jr .loop
 
 
-PokegearText_WhomToCall: ; 0x914ce
+PokegearText_WhomToCall:
 	; Whom do you want to call?
 	text_jump UnknownText_0x1c5847
 	db "@"
 
-; 0x914d3
 
-PokegearText_PressAnyButtonToExit: ; 0x914d3
+PokegearText_PressAnyButtonToExit:
 	; Press any button to exit.
 	text_jump UnknownText_0x1c5862
 	db "@"
 
-; 0x914d8
 
-PokegearText_DeleteStoredNumber: ; 0x914d8
+PokegearText_DeleteStoredNumber:
 	; Delete this stored phone number?
 	text_jump UnknownText_0x1c587d
 	db "@"
 
-; 0x914dd
 
 PokegearSpritesGFX:
 INCBIN "gfx/pokegear/pokegear_sprites.2bpp.lz"
@@ -2868,7 +2862,6 @@ TownMapPlayerIcon:
 	ld [hl], d
 	ret
 
-; 0x91ff2
 
 LoadTownMapGFX:
 	ld hl, TownMapGFX

engine/pokemon/bills_pc.asm

@@ -231,7 +231,6 @@ BillsPCDepositMenuHeader: ; 0xe253d (38:653d)
 	menu_coords 9, 4, SCREEN_WIDTH - 1, 13
 	dw .MenuData
 	db 1 ; default option
-; 0xe2545
 
 .MenuData: ; 0xe2545 (38:6545)
 	db STATICMENU_CURSOR ; flags
@@ -482,21 +481,19 @@ BillsPC_Withdraw:
 	ld [wJumptableIndex], a
 	ret
 
-.MenuHeader: ; 0xe2731
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 9, 4, SCREEN_WIDTH - 1, 13
 	dw .MenuData
 	db 1 ; default option
-; 0xe2739
 
-.MenuData: ; 0xe2739
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "WITHDRAW@"
 	db "STATS@"
 	db "RELEASE@"
 	db "CANCEL@"
-; 0xe2759
 
 _MovePKMNWithoutMail:
 	ld hl, wOptions
@@ -694,20 +691,18 @@ _MovePKMNWithoutMail:
 	ld [wJumptableIndex], a
 	ret
 
-.MenuHeader: ; 0xe28c3
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 9, 4, SCREEN_WIDTH - 1, 13
 	dw .MenuData
 	db 1 ; default option
-; 0xe28cb
 
-.MenuData: ; 0xe28cb
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 3 ; items
 	db "MOVE@"
 	db "STATS@"
 	db "CANCEL@"
-; 0xe28df
 
 .PrepInsertCursor:
 	xor a
@@ -2272,14 +2267,13 @@ BillsPC_ClearTilemap:
 	call ByteFill
 	ret
 
-_ChangeBox_MenuHeader: ; 0xe35f1
+_ChangeBox_MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 1, 5, 9, 12
 	dw .MenuData
 	db 1 ; default option
-; 0xe35f9
 
-.MenuData ; 0xe35f9
+.MenuData
 	db MENU_UNUSED_1 | MENU_UNUSED_3 ; flags
 	db 4, 0
 	db 1
@@ -2488,21 +2482,19 @@ BillsPC_ChangeBoxSubmenu:
 
 	hlcoord 11, 7 ; unused
 
-.MenuHeader: ; 0xe377b
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 11, 4, SCREEN_WIDTH - 1, 13
 	dw .MenuData
 	db 1 ; default option
-; 0xe3783
 
-.MenuData: ; 0xe3783
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "SWITCH@"
 	db "NAME@"
 	db "PRINT@"
 	db "QUIT@"
-; 0xe379c
 
 BillsPC_PlaceChooseABoxString:
 	ld de, .ChooseABox

engine/pokemon/bills_pc_top.asm

@@ -14,7 +14,7 @@ _BillsPC:
 	scf
 	ret
 
-.Text_GottaHavePokemon: ; 0xe417
+.Text_GottaHavePokemon:
 	; You gotta have #MON to call!
 	text_jump UnknownText_0x1c1006
 	db "@"
@@ -35,7 +35,7 @@ _BillsPC:
 	call LoadFontsBattleExtra
 	ret
 
-.Text_What: ; 0xe43a
+.Text_What:
 	; What?
 	text_jump UnknownText_0x1c1024
 	db "@"
@@ -68,13 +68,13 @@ _BillsPC:
 	call CloseWindow
 	ret
 
-.MenuHeader: ; 0xe46f
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw .MenuData
 	db 1 ; default option
 
-.MenuData: ; 0xe477
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 0 ; items
 	dw .items
@@ -128,7 +128,7 @@ BillsPC_MovePKMNMenu:
 	and a
 	ret
 
-.Text_MonHoldingMail: ; 0xe4f9
+.Text_MonHoldingMail:
 	; There is a #MON holding MAIL. Please remove the MAIL.
 	text_jump UnknownText_0x1c102b
 	db "@"
@@ -163,12 +163,12 @@ Unreferenced_Functione512:
 	scf
 	ret
 
-.Text_NoMon: ; 0xe52e
+.Text_NoMon:
 	; You don't have a single #MON!
 	text_jump UnknownText_0x1c1062
 	db "@"
 
-.Text_ItsYourLastMon: ; 0xe533
+.Text_ItsYourLastMon:
 	; You can't deposit your last #MON!
 	text_jump UnknownText_0x1c1080
 	db "@"
@@ -224,7 +224,7 @@ Unreferenced_Functione56d:
 	scf
 	ret
 
-UnknownText_0xe57e: ; 0xe57e
+UnknownText_0xe57e:
 	; You can't take any more #MON.
 	text_jump UnknownText_0x1c10a2
 	db "@"