#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions

4 files changed, 33 insertions, 41 deletions

diff --git a/engine/events/bug_contest/caught_mon.asm b/engine/events/bug_contest/caught_mon.asm
index 71e6f1f62..b2cc044aa 100644
--- a/engine/events/bug_contest/caught_mon.asm
+++ b/engine/events/bug_contest/caught_mon.asm
@@ -14,7 +14,7 @@ BugContest_SetCaughtContestMon:
 	ld a, [wTempEnemyMonSpecies]
 	ld [wNamedObjectIndexBuffer], a
 	call GetPokemonName
-	ld hl, .caughttext
+	ld hl, .ContestCaughtMonText
 	call PrintText
 	ret
 
@@ -32,7 +32,6 @@ BugContest_SetCaughtContestMon:
 	ld hl, wContestMon
 	jp GeneratePartyMonStats
 
-.caughttext
-	; Caught @ !
-	text_far UnknownText_0x1c10c0
+.ContestCaughtMonText:
+	text_far _ContestCaughtMonText
 	text_end
diff --git a/engine/events/bug_contest/contest.asm b/engine/events/bug_contest/contest.asm
index 3e8800739..6a3f77994 100644
--- a/engine/events/bug_contest/contest.asm
+++ b/engine/events/bug_contest/contest.asm
@@ -18,26 +18,24 @@ BugCatchingContestBattleScript::
 BugCatchingContestOverScript::
 	playsound SFX_ELEVATOR_END
 	opentext
-	writetext BugCatchingContestText_BeeepTimesUp
+	writetext BugCatchingContestTimeUpText
 	waitbutton
 	sjump BugCatchingContestReturnToGateScript
 
 BugCatchingContestOutOfBallsScript:
 	playsound SFX_ELEVATOR_END
 	opentext
-	writetext BugCatchingContestText_ContestIsOver
+	writetext BugCatchingContestIsOverText
 	waitbutton
 
 BugCatchingContestReturnToGateScript:
 	closetext
 	jumpstd bugcontestresultswarp
 
-BugCatchingContestText_BeeepTimesUp:
-	; ANNOUNCER: BEEEP! Time's up!
-	text_far UnknownText_0x1bd2ca
+BugCatchingContestTimeUpText:
+	text_far _BugCatchingContestTimeUpText
 	text_end
 
-BugCatchingContestText_ContestIsOver:
-	; ANNOUNCER: The Contest is over!
-	text_far UnknownText_0x1bd2e7
+BugCatchingContestIsOverText:
+	text_far _BugCatchingContestIsOverText
 	text_end
diff --git a/engine/events/bug_contest/display_stats.asm b/engine/events/bug_contest/display_stats.asm
index 6969bc893..dc5518594 100644
--- a/engine/events/bug_contest/display_stats.asm
+++ b/engine/events/bug_contest/display_stats.asm
@@ -67,7 +67,7 @@ DisplayCaughtContestMonStats:
 	ld de, wEnemyMonMaxHP
 	call PrintNum
 
-	ld hl, SwitchMonText
+	ld hl, ContestAskSwitchText
 	call PrintText
 
 	pop af
@@ -86,19 +86,17 @@ DisplayCaughtContestMonStats:
 .This:
 	db " THIS <PKMN>  @"
 
-SwitchMonText:
-	; Switch #MON?
-	text_far UnknownText_0x1c10cf
+ContestAskSwitchText:
+	text_far _ContestAskSwitchText
 	text_end
 
 DisplayAlreadyCaughtText:
 	call GetPokemonName
-	ld hl, .AlreadyCaughtText
+	ld hl, .ContestAlreadyCaughtText
 	jp PrintText
 
-.AlreadyCaughtText:
-	; You already caught a @ .
-	text_far UnknownText_0x1c10dd
+.ContestAlreadyCaughtText:
+	text_far _ContestAlreadyCaughtText
 	text_end
 
 DummyPredef2F:
diff --git a/engine/events/bug_contest/judging.asm b/engine/events/bug_contest/judging.asm
index a166269d5..9f8c0c5c2 100644
--- a/engine/events/bug_contest/judging.asm
+++ b/engine/events/bug_contest/judging.asm
@@ -7,66 +7,63 @@ _BugContestJudging:
 	ld a, [wBugContestThirdPlaceMon]
 	ld [wNamedObjectIndexBuffer], a
 	call GetPokemonName
-	ld hl, BugContest_ThirdPlaceText
+	ld hl, ContestJudging_ThirdPlaceText
 	call PrintText
 	ld a, [wBugContestSecondPlaceWinnerID]
 	call LoadContestantName
 	ld a, [wBugContestSecondPlaceMon]
 	ld [wNamedObjectIndexBuffer], a
 	call GetPokemonName
-	ld hl, BugContest_SecondPlaceText
+	ld hl, ContestJudging_SecondPlaceText
 	call PrintText
 	ld a, [wBugContestFirstPlaceWinnerID]
 	call LoadContestantName
 	ld a, [wBugContestFirstPlaceMon]
 	ld [wNamedObjectIndexBuffer], a
 	call GetPokemonName
-	ld hl, BugContest_FirstPlaceText
+	ld hl, ContestJudging_FirstPlaceText
 	call PrintText
 	jp BugContest_GetPlayersResult
 
-BugContest_FirstPlaceText:
-	text_far ContestJudging_FirstPlaceText
+ContestJudging_FirstPlaceText:
+	text_far _ContestJudging_FirstPlaceText
 	text_asm
 	ld de, SFX_1ST_PLACE
 	call PlaySFX
 	call WaitSFX
-	ld hl, BugContest_FirstPlaceScoreText
+	ld hl, ContestJudging_FirstPlaceScoreText
 	ret
 
-BugContest_FirstPlaceScoreText:
-	; The winning score was @  points!
-	text_far ContestJudging_FirstPlaceScoreText
+ContestJudging_FirstPlaceScoreText:
+	text_far _ContestJudging_FirstPlaceScoreText
 	text_end
 
-BugContest_SecondPlaceText:
+ContestJudging_SecondPlaceText:
 	; Placing second was @ , who caught a @ !@ @
-	text_far ContestJudging_SecondPlaceText
+	text_far _ContestJudging_SecondPlaceText
 	text_asm
 	ld de, SFX_2ND_PLACE
 	call PlaySFX
 	call WaitSFX
-	ld hl, BugContest_SecondPlaceScoreText
+	ld hl, ContestJudging_SecondPlaceScoreText
 	ret
 
-BugContest_SecondPlaceScoreText:
-	; The score was @  points!
-	text_far ContestJudging_SecondPlaceScoreText
+ContestJudging_SecondPlaceScoreText:
+	text_far _ContestJudging_SecondPlaceScoreText
 	text_end
 
-BugContest_ThirdPlaceText:
+ContestJudging_ThirdPlaceText:
 	; Placing third was @ , who caught a @ !@ @
-	text_far ContestJudging_ThirdPlaceText
+	text_far _ContestJudging_ThirdPlaceText
 	text_asm
 	ld de, SFX_3RD_PLACE
 	call PlaySFX
 	call WaitSFX
-	ld hl, BugContest_ThirdPlaceScoreText
+	ld hl, ContestJudging_ThirdPlaceScoreText
 	ret
 
-BugContest_ThirdPlaceScoreText:
-	; The score was @  points!
-	text_far ContestJudging_ThirdPlaceScoreText
+ContestJudging_ThirdPlaceScoreText:
+	text_far _ContestJudging_ThirdPlaceScoreText
 	text_end
 
 LoadContestantName: