Make some labels more consistent

4 files changed, 26 insertions, 23 deletions

diff --git a/data/text/common_1.asm b/data/text/common_1.asm
index 97750d47..c27c465f 100644
--- a/data/text/common_1.asm
+++ b/data/text/common_1.asm
@@ -1664,33 +1664,33 @@ _ExpPointsText::
 	text " EXP. Points!"
 	prompt
 
-Text_GoMon::
+_GoMonText::
 	text "Go! @"
 	text_ram wBattleMonNick
 	text "!"
 	done
 
-Text_DoItMon::
+_DoItMonText::
 	text "Do it! @"
 	text_ram wBattleMonNick
 	text "!"
 	done
 
-Text_GoForItMon::
+_GoForItMonText::
 	text "Go for it,"
 	line "@"
 	text_ram wBattleMonNick
 	text "!"
 	done
 
-Text_YourFoesWeakGetmMon::
+_YourFoesWeakGetmMonText::
 	text "Your foe's weak!"
 	line "Get'm, @"
 	text_ram wBattleMonNick
 	text "!"
 	done
 
-Text_BattleMonNickComma::
+_BattleMonNickCommaText::
 	text_ram wBattleMonNick
 	text ",@@"
 
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 0587c750..21da8405 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -7335,7 +7335,7 @@ SendOutMonText:
 	and a
 	jr z, .not_linked
 
-	ld hl, JumpText_GoMon ; If we're in a LinkBattle print just "Go <PlayerMon>"
+	ld hl, GoMonText ; If we're in a LinkBattle print just "Go <PlayerMon>"
 
 	ld a, [wBattleHasJustStarted] ; unless this (unidentified) variable is set
 	and a
@@ -7346,7 +7346,7 @@ SendOutMonText:
 	ld hl, wEnemyMonHP
 	ld a, [hli]
 	or [hl]
-	ld hl, JumpText_GoMon
+	ld hl, GoMonText
 	jr z, .skip_to_textbox
 
 	; compute enemy helth remaining as a percentage
@@ -7375,36 +7375,36 @@ SendOutMonText:
 	call Divide
 
 	ldh a, [hQuotient + 3]
-	ld hl, JumpText_GoMon
+	ld hl, GoMonText
 	cp 70
 	jr nc, .skip_to_textbox
 
-	ld hl, JumpText_DoItMon
+	ld hl, DoItMonText
 	cp 40
 	jr nc, .skip_to_textbox
 
-	ld hl, JumpText_GoForItMon
+	ld hl, GoForItMonText
 	cp 10
 	jr nc, .skip_to_textbox
 
-	ld hl, JumpText_YourFoesWeakGetmMon
+	ld hl, YourFoesWeakGetmMonText
 .skip_to_textbox
 	jp PrintText
 
-JumpText_GoMon:
-	text_far Text_GoMon
+GoMonText:
+	text_far _GoMonText
 	text_end
 
-JumpText_DoItMon:
-	text_far Text_DoItMon
+DoItMonText:
+	text_far _DoItMonText
 	text_end
 
-JumpText_GoForItMon:
-	text_far Text_GoForItMon
+GoForItMonText:
+	text_far _GoForItMonText
 	text_end
 
-JumpText_YourFoesWeakGetmMon:
-	text_far Text_YourFoesWeakGetmMon
+YourFoesWeakGetmMonText:
+	text_far _YourFoesWeakGetmMonText
 	text_end
 
 WithdrawMonText:
@@ -7412,7 +7412,7 @@ WithdrawMonText:
 	jp PrintText
 
 .WithdrawMonText:
-	text_far Text_BattleMonNickComma
+	text_far _BattleMonNickCommaText
 	text_asm
 ; Print text to withdraw mon
 ; depending on HP the message is different
diff --git a/engine/games/unown_puzzle.asm b/engine/games/unown_puzzle.asm
index 48e36b89..c5db774b 100644
--- a/engine/games/unown_puzzle.asm
+++ b/engine/games/unown_puzzle.asm
@@ -171,7 +171,7 @@ PlaceStartCancelBoxBorder:
 UnownPuzzleJumptable:
 	jumptable .Jumptable, wJumptableIndex
 
-.Jumptable:
+.Jumptable: ; redundant one-entry jumptable
 	dw .Function
 
 .Function:
diff --git a/engine/link/link.asm b/engine/link/link.asm
index 2d8d458b..d8526687 100644
--- a/engine/link/link.asm
+++ b/engine/link/link.asm
@@ -1148,7 +1148,7 @@ LinkTradeOTPartymonMenuLoop:
 .not_d_up
 	bit D_DOWN_F, a
 	jp z, LinkTradePartiesMenuMasterLoop
-	jp LinkTradeCheckCancel
+	jp LinkTradeOTPartymonMenuCheckCancel
 
 LinkTrade_PlayerPartyMenu:
 	xor a
@@ -1376,11 +1376,12 @@ LinkTrade_TradeStatsMenu:
 	text_far _LinkAbnormalMonText
 	text_end
 
-LinkTradeCheckCancel:
+LinkTradeOTPartymonMenuCheckCancel:
 	ld a, [wMenuCursorY]
 	cp 1
 	jp nz, LinkTradePartiesMenuMasterLoop
 	call HideCursor
+
 .loop1
 	ld a, "▶"
 	ldcoord_a 1, 16
@@ -1408,6 +1409,8 @@ LinkTradeCheckCancel:
 	ld a, [wOtherPlayerLinkMode]
 	cp $f
 	jr nz, .loop1
+	; fallthrough
+
 ExitLinkCommunications:
 	xor a
 	ld [wUnusedLinkCommunicationByte], a