diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-24 20:11:13 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-24 20:11:13 -0500 |
| commit | 84dd1b587f72f6552dcaed337a269570d5cb2f0d (patch) | |
| tree | 087fcc09375df462e76e9a3cfc4811ade8aaf790 | |
| parent | b4c5ade8b38670ae342ce30f5811e9be5429161a (diff) | |
Use STRING_BUFFER_LENGTH for the wStringBuffers
| -rw-r--r-- | constants/script_constants.asm | 2 | ||||
| -rw-r--r-- | engine/items/tmhm.asm | 4 | ||||
| -rw-r--r-- | engine/overworld/scripting.asm | 2 | ||||
| -rw-r--r-- | wram.asm | 13 |
4 files changed, 12 insertions, 9 deletions
diff --git a/constants/script_constants.asm b/constants/script_constants.asm index 23e4c587..e98a53b2 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -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 diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index 0a14ca50..e8cbbb00 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 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 diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index 8c915bd4..0ca066f3 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -1496,7 +1496,7 @@ GetStringBuffer: CopyConvertedText: ld hl, wStringBuffer3 - ld bc, wStringBuffer4 - wStringBuffer3 + ld bc, STRING_BUFFER_LENGTH call AddNTimes call CopyName2 ret @@ -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 |