More movement stuff

battle/core.asm

@@ -5508,7 +5508,7 @@ EnemyMonEntrance: ; 3e3ff
 ; 3e40b
 
 BattleMonEntrance: ; 3e40b
-	call BattleMonNickComma_TextBox
+	call WithdrawPkmnText
 
 	ld c, 50
 	call DelayFrames
@@ -8103,8 +8103,6 @@ JumpText_GoForItPkmn: ; 3f2df
 JumpText_YourFoesWeakGetmPkmn: ; 3f2e6
 	text_jump Text_YourFoesWeakGetmPkmn
 	start_asm
-; 3f2eb
-
 Function_TextJump_BattleMonNick01: ; 3f2eb
 	ld hl, TextJump_BattleMonNick01
 	ret
@@ -8115,18 +8113,13 @@ TextJump_BattleMonNick01: ; 3f2ef
 	db "@"
 ; 3f2f4
 
-
-BattleMonNickComma_TextBox: ; 3f2f4
-	ld hl, TextJump_BattleMonNickComma
+WithdrawPkmnText: ; 3f2f4
+	ld hl, .WithdrawPkmnText
 	jp BattleTextBox
-; 3f2fa
 
-TextJump_BattleMonNickComma: ; 3f2fa
+.WithdrawPkmnText
 	text_jump Text_BattleMonNickComma
 	start_asm
-; 3f2ff
-
-WithdrawPkmnText: ; 3f2ff
 ; Print text to withdraw Pkmn
 ; depending on HP the message is different
 	push de

battle/effect_commands.asm

@@ -5949,7 +5949,6 @@ BattleCommand_StatUpMessage: ; 363b8
 .stat
 	text_jump UnknownText_0x1c0cc6
 	start_asm
-
 	ld hl, .up
 	ld a, [LoweredStat]
 	and $f0
@@ -5983,7 +5982,6 @@ BattleCommand_StatDownMessage: ; 363e9
 .stat
 	text_jump UnknownText_0x1c0ceb
 	start_asm
-
 	ld hl, .fell
 	ld a, [LoweredStat]
 	and $f0
@@ -7345,7 +7343,6 @@ BattleCommand_Charge: ; 36b4d
 .UsedText
 	text_jump UnknownText_0x1c0d0e ; "[USER]"
 	start_asm
-
 	ld a, BATTLE_VARS_MOVE_ANIM
 	call GetBattleVar
 	cp RAZOR_WIND

battle/used_move_text.asm

@@ -11,7 +11,6 @@ UsedMoveText: ; 105db9
 
 	text_jump _ActorNameText
 	start_asm
-
 	ld a, [hBattleTurn]
 	and a
 	jr nz, .start
@@ -67,30 +66,26 @@ UsedMoveText: ; 105db9
 UsedMove1Text: ; 105e04
 	text_jump _UsedMove1Text
 	start_asm
-	jr Function105e10
+	jr UsedMoveText_CheckObedience
 ; 105e0b
 
 UsedMove2Text: ; 105e0b
 	text_jump _UsedMove2Text
 	start_asm
-; 105e10
-
-Function105e10: ; 105e10
+UsedMoveText_CheckObedience: ; 105e10
 ; check obedience
 	ld a, [AlreadyDisobeyed]
 	and a
-	jr z, GetMoveNameText
+	jr z, .GetMoveNameText
 ; print "instead,"
-	ld hl, UsedInsteadText
+	ld hl, .UsedInsteadText
 	ret
 ; 105e1a
 
-UsedInsteadText: ; 105e1a
+.UsedInsteadText
 	text_jump _UsedInsteadText
 	start_asm
-; 105e1f
-
-GetMoveNameText: ; 105e1f
+.GetMoveNameText
 	ld hl, MoveNameText
 	ret
 ; 105e23
@@ -98,9 +93,6 @@ GetMoveNameText: ; 105e1f
 MoveNameText: ; 105e23
 	text_jump _MoveNameText
 	start_asm
-; 105e28
-
-GetUsedMoveTextEnder: ; 105e28
 ; get start address
 	ld hl, .endusedmovetexts