4 files changed, 33 insertions, 33 deletions
diff --git a/engine/menu/link_menu.asm b/engine/menu/link_menu.asm
index 458f653b..3782e93e 100644
--- a/engine/menu/link_menu.asm
+++ b/engine/menu/link_menu.asm
@@ -569,67 +569,67 @@ Text_f579c::
 	next "CANCEL@"
 
 Colosseum3MonsText::
-	TX_FAR _Colosseum3MonsText ; a0a2b
+	TX_FAR _Colosseum3MonsText
 	db "@"
 
 ColosseumMewText::
-	TX_FAR _ColosseumMewText ; a0a46
+	TX_FAR _ColosseumMewText
 	db "@"
 
 ColosseumDifferentMonsText::
-	TX_FAR _ColosseumDifferentMonsText ; a0a5f
+	TX_FAR _ColosseumDifferentMonsText
 	db "@"
 
 ColosseumMaxL55Text::
-    TX_FAR _ColosseumMaxL55Text ; a0a81
+    TX_FAR _ColosseumMaxL55Text
     db "@"
 
 ColosseumMinL50Text::
-	TX_FAR _ColosseumMinL50Text ; a0a9a
+	TX_FAR _ColosseumMinL50Text
 	db "@"
 
 ColosseumTotalL155Text::
-	TX_FAR _ColosseumTotalL155Text ; a0aba
+	TX_FAR _ColosseumTotalL155Text
 	db "@"
 
 ColosseumMaxL30Text::
-	TX_FAR _ColosseumMaxL30Text ; a0ad9
+	TX_FAR _ColosseumMaxL30Text
 	db "@"
 
 ColosseumMinL25Text::
-	TX_FAR _ColosseumMinL25Text ; a0af2
+	TX_FAR _ColosseumMinL25Text
 	db "@"
 
 ColosseumTotalL80Text::
-	TX_FAR _ColosseumTotalL80Text ; a0b12
+	TX_FAR _ColosseumTotalL80Text
 	db "@"
 
 ColosseumMaxL20Text::
-	TX_FAR _ColosseumMaxL20Text ; a0b30
+	TX_FAR _ColosseumMaxL20Text
 	db "@"
 
 ColosseumMinL15Text::
-	TX_FAR _ColosseumMinL15Text ; a0b49
+	TX_FAR _ColosseumMinL15Text
 	db "@"
 
 ColosseumTotalL50Text::
-	TX_FAR _ColosseumTotalL50Text ; a0b69
+	TX_FAR _ColosseumTotalL50Text
 	db "@"
 
 ColosseumHeightText::
-	TX_FAR _ColosseumHeightText ; a0b87
+	TX_FAR _ColosseumHeightText
 	db "@"
 
 ColosseumWeightText::
-	TX_FAR _ColosseumWeightText ; a0b9f
+	TX_FAR _ColosseumWeightText
 	db "@"
 
 ColosseumEvolvedText::
-	TX_FAR _ColosseumEvolvedText ; a0bbb
+	TX_FAR _ColosseumEvolvedText
 	db "@"
 
 ColosseumIneligibleText::
-	TX_FAR _ColosseumIneligibleText ; a0bd4
+	TX_FAR _ColosseumIneligibleText
 	db "@"
 
 LinkMenu:
@@ -897,7 +897,7 @@ ColosseumCanceledText:
 	db "@"
 
 ColosseumVersionText:
-	TX_FAR _ColosseumVersionText ; 28:4c47
+	TX_FAR _ColosseumVersionText
 	db "@"
 
 TextTerminator_f5a16:
diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm
index cf837a54..5ff9cc7d 100755
--- a/engine/menu/main_menu.asm
+++ b/engine/menu/main_menu.asm
@@ -263,7 +263,7 @@ SaveScreenInfoText:
 	next "TIME@"
 
 DisplayOptionMenu:
-	callab DisplayOptionMenu_ ; 10:5c70
+	callab DisplayOptionMenu_
 	ret
 
 CheckForPlayerNameInSRAM:
diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm
index fc553d93..d49f7502 100755
--- a/engine/menu/start_sub_menus.asm
+++ b/engine/menu/start_sub_menus.asm
@@ -129,7 +129,7 @@ StartMenu_Pokemon:
 	dw .dig
 	dw .teleport
 	dw .softboiled
-.fly ; 11d1b (4:5d1b)
+.fly
 	bit 2,a ; does the player have the Thunder Badge?
 	jp z,.newBadgeRequired
 	call CheckIfInOutsideMap
@@ -152,7 +152,7 @@ StartMenu_Pokemon:
 .asm_5d4c
 	call Func_1510
 	jp .goBackToMap
-.cut ; 11d52 (4:5d52)
+.cut
 	bit 1,a ; does the player have the Cascade Badge?
 	jp z,.newBadgeRequired
 	predef UsedCut
@@ -160,7 +160,7 @@ StartMenu_Pokemon:
 	and a
 	jp z,.loop
 	jp CloseTextDisplay
-.surf ; 11d66 (4:5d66)
+.surf
 	bit 4,a ; does the player have the Soul Badge?
 	jp z,.newBadgeRequired
 	callba IsSurfingAllowed
@@ -190,13 +190,13 @@ StartMenu_Pokemon:
 	xor a
 	ld [wd473], a
 	jp .loop
-.strength ; 11dab (4:5dab)
+.strength
 	bit 3,a ; does the player have the Rainbow Badge?
 	jp z,.newBadgeRequired
 	predef PrintStrengthTxt
 	call GBPalWhiteOutWithDelay3
 	jp .goBackToMap
-.flash ; 11dbb (4:5dbb)
+.flash
 	bit 0,a ; does the player have the Boulder Badge?
 	jp z,.newBadgeRequired
 	xor a
@@ -208,7 +208,7 @@ StartMenu_Pokemon:
 .flashLightsAreaText
 	TX_FAR _FlashLightsAreaText
 	db "@"
-.dig ; 11dd5 (4:5dd5)
+.dig
 	ld a,ESCAPE_ROPE
 	ld [wcf91],a
 	ld [wPseudoItemID],a
@@ -218,7 +218,7 @@ StartMenu_Pokemon:
 	jp z,.loop
 	call GBPalWhiteOutWithDelay3
 	jp .goBackToMap
-.teleport ; 11ded (4:5ded)
+.teleport
 	call CheckIfInOutsideMap
 	jr z,.canTeleport
 	ld a,[wWhichPokemon]
@@ -250,7 +250,7 @@ StartMenu_Pokemon:
 .cannotFlyHereText
 	TX_FAR _CannotFlyHereText
 	db "@"
-.softboiled ; 11e35 (4:5e35)
+.softboiled
 	ld hl,wPartyMon1MaxHP
 	ld a,[wWhichPokemon]
 	ld bc,wPartyMon2 - wPartyMon1
diff --git a/engine/menu/text_ids2.asm b/engine/menu/text_ids2.asm
index fbac3986..e23ae707 100644
--- a/engine/menu/text_ids2.asm
+++ b/engine/menu/text_ids2.asm
@@ -512,19 +512,19 @@ TwoOptionMenuStrings:
 	db 4,3,0
 	dw .NoYesMenu
 
-.NoYesMenu ; 7542 (1:7542)
+.NoYesMenu
 	db "NO",$4E,"YES@"
-.YesNoMenu ; 7549 (1:7549)
+.YesNoMenu
 	db "YES",$4E,"NO@"
-.NorthWestMenu ; 7550 (1:7550)
+.NorthWestMenu
 	db "NORTH",$4E,"WEST@"
-.SouthEastMenu ; 755b (1:755b)
+.SouthEastMenu
 	db "SOUTH",$4E,"EAST@"
-.NorthEastMenu ; 7566 (1:7566)
+.NorthEastMenu
 	db "NORTH",$4E,"EAST@"
-.TradeCancelMenu ; 7571 (1:7571)
+.TradeCancelMenu
 	db "TRADE",$4E,"CANCEL@"
-.HealCancelMenu ; 757e (1:757e)
+.HealCancelMenu
 	db "HEAL",$4E,"CANCEL@"
 
 DisplayFieldMoveMonMenu: