Use STRING_BUFFER_LENGTH for the wStringBuffers

2020-11-24 20:11:17 -05:00
parent 4ca9f45db7
commit 4613bcfadf
6 changed files with 14 additions and 11 deletions
--- a/engine/battle/effect_commands.asm
+++ b/engine/battle/effect_commands.asm
@@ -4711,7 +4711,7 @@ GetStatName:

 .Copy:
 	ld de, wStringBuffer2
-	ld bc, wStringBuffer3 - wStringBuffer2
+	ld bc, STRING_BUFFER_LENGTH
 	jp CopyBytes

 INCLUDE "data/battle/stat_names.asm"
--- a/engine/items/tmhm.asm
+++ b/engine/items/tmhm.asm
@@ -73,7 +73,7 @@ AskTeachTMHM:
 ChooseMonToLearnTMHM:
 	ld hl, wStringBuffer2
 	ld de, wTMHMMoveNameBackup
-	ld bc, 12
+	ld bc, MOVE_NAME_LENGTH - 1
 	call CopyBytes
 	call ClearBGPalettes
 ChooseMonToLearnTMHM_NoRefresh:
@@ -97,7 +97,7 @@ ChooseMonToLearnTMHM_NoRefresh:
 	push bc
 	ld hl, wTMHMMoveNameBackup
 	ld de, wStringBuffer2
-	ld bc, 12
+	ld bc, MOVE_NAME_LENGTH - 1
 	call CopyBytes
 	pop af ; now contains the original contents of af
 	ret
--- a/engine/overworld/scripting.asm
+++ b/engine/overworld/scripting.asm
@@ -1590,7 +1590,7 @@ GetStringBuffer:

 CopyConvertedText:
 	ld hl, wStringBuffer3
-	ld bc, wStringBuffer4 - wStringBuffer3
+	ld bc, STRING_BUFFER_LENGTH
 	call AddNTimes
 	call CopyName2
 	ret