From 4613bcfadf2df5da711646f1ee54e2e4982309c7 Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 24 Nov 2020 20:11:17 -0500 Subject: Use STRING_BUFFER_LENGTH for the wStringBuffers --- engine/battle/effect_commands.asm | 2 +- engine/items/tmhm.asm | 4 ++-- engine/overworld/scripting.asm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'engine') diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index b1070e8d9..7876fb90e 100644 --- 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" diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index ea990d849..2e0cde341 100644 --- 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 diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index a8b95d3b2..370edb5a2 100644 --- 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 -- cgit v1.2.3