3 files changed, 16 insertions, 22 deletions
diff --git a/data/maps/setup_scripts.asm b/data/maps/setup_scripts.asm
index 3df4ac404..6702be698 100644
--- a/data/maps/setup_scripts.asm
+++ b/data/maps/setup_scripts.asm
@@ -37,7 +37,7 @@ MapSetupScript_Warp:
 	db map_spawn_in_facing_down
 	db map_refresh_sprites
 	db map_play_music_bike
-	db map_fade_in_music
+	db map_fade_in_to_music
 	db map_fade_in_palettes
 	db map_activate_anims
 	db map_load_wild_mon_data
diff --git a/data/text/common_1.asm b/data/text/common_1.asm
index 4aeb1331a..e585a6320 100644
--- a/data/text/common_1.asm
+++ b/data/text/common_1.asm
@@ -215,32 +215,32 @@ _OakTimeIsItText::
 
 ; Mobile Adapter
 
-UnknownText_0x1bc384::
+UnknownText_0x1bc384:: ; unreferenced
 	text "There is nothing"
 	line "connected."
 	done
 
-UnknownText_0x1bc3a1::
+UnknownText_0x1bc3a1:: ; unreferenced
 	text "Check cell phone"
 	line "adapter."
 	done
 
-UnknownText_0x1bc3bc::
+UnknownText_0x1bc3bc:: ; unreferenced
 	text "Check CDMA"
 	line "adapter."
 	done
 
-UnknownText_0x1bc3d1::
+UnknownText_0x1bc3d1:: ; unreferenced
 	text "Check DOCOMO PHS"
 	line "adapter."
 	done
 
-UnknownText_0x1bc3ec::
+UnknownText_0x1bc3ec:: ; unreferenced
 	text "Check DDI PHS"
 	line "adapter."
 	done
 
-UnknownText_0x1bc404::
+UnknownText_0x1bc404:: ; unreferenced
 	text "Check unlimited"
 	line "battle mobile"
 	cont "adapter."
@@ -1258,17 +1258,17 @@ UnknownText_0x1bd223::
 	text "Closing link."
 	done
 
-UnknownText_0x1bd232::
+UnknownText_0x1bd232:: ; unreferenced
 	text "Clear the time"
 	line "limit?"
 	done
 
-UnknownText_0x1bd249::
+UnknownText_0x1bd249:: ; unreferenced
 	text "The time limit was"
 	line "cleared."
 	done
 
-UnknownText_0x1bd266::
+UnknownText_0x1bd266:: ; unreferenced
 	text "Pick which packet"
 	line "as an error?"
 	done
diff --git a/data/text/common_2.asm b/data/text/common_2.asm
index 6ef6162e1..4b01a5294 100644
--- a/data/text/common_2.asm
+++ b/data/text/common_2.asm
@@ -889,18 +889,15 @@ _MailMovedFromBoxText::
 	line "from the MAILBOX."
 	prompt
 
-; unreferenced
-_YesPromptText::
+_YesPromptText:: ; unreferenced
 	text "Yes"
 	prompt
 
-; unreferenced
-_NoPromptText::
+_NoPromptText:: ; unreferenced
 	text "No"
 	prompt
 
-; unreferenced
-_AnimationTypeText::
+_AnimationTypeText:: ; unreferenced
 	text_decimal wcf64, 1, 3
 	text " @"
 	text_ram wStringBuffer1
@@ -911,8 +908,7 @@ _AnimationTypeText::
 
 	text_end ; unreferenced
 
-; unreferenced
-_MonNumberText::
+_MonNumberText:: ; unreferenced
 	text "#MON number?"
 	done
 
@@ -1352,8 +1348,7 @@ _OakPCText4::
 	line "OAK's PC closed."
 	done
 
-; unreferenced
-_TrainerRankingExplanationText::
+_TrainerRankingExplanationText:: ; unreferenced
 	text "Triple-theme"
 	line "trainer ranking!"
 
@@ -1364,8 +1359,7 @@ _TrainerRankingExplanationText::
 	para ""
 	done
 
-; unreferenced
-_TrainerRankingNoDataText::
+_TrainerRankingNoDataText:: ; unreferenced
 	text "There is no"
 	line "ranking data."