#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions

engine/battle/ai/items.asm

@@ -687,7 +687,7 @@ AI_Switch:
 	pop af
 
 	jr c, .skiptext
-	ld hl, TextJump_EnemyWithdrew
+	ld hl, EnemyWithdrewText
 	call PrintText
 
 .skiptext
@@ -707,8 +707,8 @@ AI_Switch:
 	scf
 	ret
 
-TextJump_EnemyWithdrew:
-	text_far Text_EnemyWithdrew
+EnemyWithdrewText:
+	text_far _EnemyWithdrewText
 	text_end
 
 Function384d5: ; This appears to be unused
@@ -824,9 +824,9 @@ PrintText_UsedItemOn:
 	ld de, wMonOrItemNameBuffer
 	ld bc, ITEM_NAME_LENGTH
 	call CopyBytes
-	ld hl, TextJump_EnemyUsedOn
+	ld hl, EnemyUsedOnText
 	jp PrintText
 
-TextJump_EnemyUsedOn:
-	text_far Text_EnemyUsedOn
+EnemyUsedOnText:
+	text_far _EnemyUsedOnText
 	text_end

engine/battle/core.asm

@@ -7405,20 +7405,20 @@ BoostExp:
 Text_MonGainedExpPoint:
 	text_far Text_Gained
 	text_asm
-	ld hl, TextJump_StringBuffer2ExpPoints
+	ld hl, ExpPointsText
 	ld a, [wStringBuffer2 + 2] ; IsTradedMon
 	and a
 	ret z
 
-	ld hl, TextJump_ABoostedStringBuffer2ExpPoints
+	ld hl, BoostedExpPointsText
 	ret
 
-TextJump_ABoostedStringBuffer2ExpPoints:
-	text_far Text_ABoostedStringBuffer2ExpPoints
+BoostedExpPointsText:
+	text_far _BoostedExpPointsText
 	text_end
 
-TextJump_StringBuffer2ExpPoints:
-	text_far Text_StringBuffer2ExpPoints
+ExpPointsText:
+	text_far _ExpPointsText
 	text_end
 
 AnimateExpBar:
@@ -7687,11 +7687,11 @@ JumpText_YourFoesWeakGetmMon:
 	text_far Text_YourFoesWeakGetmMon
 	text_asm
 Function_TextJump_BattleMonNick01:
-	ld hl, TextJump_BattleMonNick01
+	ld hl, BattleMonNicknameText
 	ret
 
-TextJump_BattleMonNick01:
-	text_far Text_BattleMonNick01
+BattleMonNicknameText:
+	text_far _BattleMonNicknameText
 	text_end
 
 WithdrawMonText:
@@ -7734,40 +7734,40 @@ WithdrawMonText:
 	pop bc
 	pop de
 	ldh a, [hQuotient + 3]
-	ld hl, TextJump_ThatsEnoughComeBack
+	ld hl, ThatsEnoughComeBackText
 	and a
 	ret z
 
-	ld hl, TextJump_ComeBack
+	ld hl, ComeBackText
 	cp 30
 	ret c
 
-	ld hl, TextJump_OKComeBack
+	ld hl, OKComeBackText
 	cp 70
 	ret c
 
-	ld hl, TextJump_GoodComeBack
+	ld hl, GoodComeBackText
 	ret
 
-TextJump_ThatsEnoughComeBack:
-	text_far Text_ThatsEnoughComeBack
+ThatsEnoughComeBackText:
+	text_far _ThatsEnoughComeBackText
 	text_end
 
-TextJump_OKComeBack:
-	text_far Text_OKComeBack
+OKComeBackText:
+	text_far _OKComeBackText
 	text_end
 
-TextJump_GoodComeBack:
-	text_far Text_GoodComeBack
+GoodComeBackText:
+	text_far _GoodComeBackText
 	text_end
 
 Unreferenced_TextJump_ComeBack:
 ; this function doesn't seem to be used
-	ld hl, TextJump_ComeBack
+	ld hl, ComeBackText
 	ret
 
-TextJump_ComeBack:
-	text_far Text_ComeBack
+ComeBackText:
+	text_far _ComeBackText
 	text_end
 
 Unreferenced_HandleSafariAngerEatingStatus:

engine/battle/effect_commands.asm

@@ -4546,21 +4546,21 @@ BattleCommand_StatUpMessage:
 	jp BattleTextbox
 
 .stat
-	text_far UnknownText_0x1c0cc6
+	text_far Text_BattleEffectActivate
 	text_asm
-	ld hl, .up
+	ld hl, .BattleStatWentUpText
 	ld a, [wLoweredStat]
 	and $f0
 	ret z
-	ld hl, .wayup
+	ld hl, .BattleStatWentWayUpText
 	ret
 
-.wayup
-	text_far UnknownText_0x1c0cd0
+.BattleStatWentWayUpText:
+	text_far _BattleStatWentWayUpText
 	text_end
 
-.up
-	text_far UnknownText_0x1c0ce0
+.BattleStatWentUpText:
+	text_far _BattleStatWentUpText
 	text_end
 
 BattleCommand_StatDownMessage:
@@ -4576,21 +4576,21 @@ BattleCommand_StatDownMessage:
 	jp BattleTextbox
 
 .stat
-	text_far UnknownText_0x1c0ceb
+	text_far Text_BattleFoeEffectActivate
 	text_asm
-	ld hl, .fell
+	ld hl, .BattleStatFellText
 	ld a, [wLoweredStat]
 	and $f0
 	ret z
-	ld hl, .sharplyfell
+	ld hl, .BattleStatSharplyFellText
 	ret
 
-.sharplyfell
-	text_far UnknownText_0x1c0cf5
+.BattleStatSharplyFellText:
+	text_far _BattleStatSharplyFellText
 	text_end
 
-.fell
-	text_far UnknownText_0x1c0d06
+.BattleStatFellText:
+	text_far _BattleStatFellText
 	text_end
 
 TryLowerStat:
@@ -5641,64 +5641,58 @@ BattleCommand_Charge:
 	jp EndMoveEffect
 
 .UsedText:
-	text_far UnknownText_0x1c0d0e ; "<USER>"
+	text_far Text_BattleUser ; "<USER>"
 	text_asm
 	ld a, BATTLE_VARS_MOVE_ANIM
 	call GetBattleVar
 	cp RAZOR_WIND
-	ld hl, .RazorWind
+	ld hl, .BattleMadeWhirlwindText
 	jr z, .done
 
 	cp SOLARBEAM
-	ld hl, .Solarbeam
+	ld hl, .BattleTookSunlightText
 	jr z, .done
 
 	cp SKULL_BASH
-	ld hl, .SkullBash
+	ld hl, .BattleLoweredHeadText
 	jr z, .done
 
 	cp SKY_ATTACK
-	ld hl, .SkyAttack
+	ld hl, .BattleGlowingText
 	jr z, .done
 
 	cp FLY
-	ld hl, .Fly
+	ld hl, .BattleFlewText
 	jr z, .done
 
 	cp DIG
-	ld hl, .Dig
+	ld hl, .BattleDugText
 
 .done
 	ret
 
-.RazorWind:
-; 'made a whirlwind!'
-	text_far UnknownText_0x1c0d12
+.BattleMadeWhirlwindText:
+	text_far _BattleMadeWhirlwindText
 	text_end
 
-.Solarbeam:
-; 'took in sunlight!'
-	text_far UnknownText_0x1c0d26
+.BattleTookSunlightText:
+	text_far _BattleTookSunlightText
 	text_end
 
-.SkullBash:
-; 'lowered its head!'
-	text_far UnknownText_0x1c0d3a
+.BattleLoweredHeadText:
+	text_far _BattleLoweredHeadText
 	text_end
 
-.SkyAttack:
-; 'is glowing!'
-	text_far UnknownText_0x1c0d4e
+.BattleGlowingText:
+	text_far _BattleGlowingText
 	text_end
 
-.Fly:
-; 'flew up high!'
-	text_far UnknownText_0x1c0d5c
+.BattleFlewText:
+	text_far _BattleFlewText
 	text_end
 
-.Dig:
-; 'dug a hole!'
-	text_far UnknownText_0x1c0d6c
+.BattleDugText:
+	text_far _BattleDugText
 	text_end
 
 BattleCommand3c:

engine/battle/move_effects/mimic.asm

@@ -43,7 +43,7 @@ BattleCommand_Mimic:
 	ld [hl], 5
 	call GetMoveName
 	call AnimateCurrentMove
-	ld hl, LearnedMoveText
+	ld hl, MimicLearnedMoveText
 	jp StdBattleTextbox
 
 .fail