Use STRING_BUFFER_LENGTH for the wStringBuffers

This commit is contained in:
Rangi
2020-11-24 20:11:13 -05:00
parent b4c5ade8b3
commit 84dd1b587f
4 changed files with 12 additions and 9 deletions

View File

@@ -9,6 +9,8 @@ LAST_TALKED EQU -2
const STRING_BUFFER_5 ; use wStringBuffer5
NUM_STRING_BUFFERS EQU const_value
STRING_BUFFER_LENGTH EQU 19
; checkmoney/takemoney accounts
const_def
const YOUR_MONEY ; 0

View File

@@ -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
farcall LoadPartyMenuGFX
@@ -96,7 +96,7 @@ ChooseMonToLearnTMHM:
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

View File

@@ -1496,7 +1496,7 @@ GetStringBuffer:
CopyConvertedText:
ld hl, wStringBuffer3
ld bc, wStringBuffer4 - wStringBuffer3
ld bc, STRING_BUFFER_LENGTH
call AddNTimes
call CopyName2
ret

View File

@@ -1696,14 +1696,15 @@ wNumHits:: db
ds 1
wMonOrItemNameBuffer:: ds 22
wMonOrItemNameBuffer:: ds NAME_LENGTH
ds NAME_LENGTH
wTMHMMoveNameBackup:: ds MOVE_NAME_LENGTH
wStringBuffer1:: ds 19
wStringBuffer2:: ds 19
wStringBuffer3:: ds 19
wStringBuffer4:: ds 19
wStringBuffer5:: ds 13
wStringBuffer1:: ds STRING_BUFFER_LENGTH
wStringBuffer2:: ds STRING_BUFFER_LENGTH
wStringBuffer3:: ds STRING_BUFFER_LENGTH
wStringBuffer4:: ds STRING_BUFFER_LENGTH
wStringBuffer5:: ds MOVE_NAME_LENGTH
wBattleMenuCursorBuffer:: dw
wCurBattleMon:: db