summaryrefslogtreecommitdiff
path: root/engine/pokemon
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2021-09-26 22:38:47 -0500
committerdannye <33dannye@gmail.com>2021-09-26 22:43:09 -0500
commit501a21fa5dc6f01c0563316c9cd209cccb1eef45 (patch)
treec2fe5cc6caa9d8117df3008031d7a26317058acb /engine/pokemon
parent45c039801916713e4066644086de4d4940d5fa1d (diff)
parent30acb46b988d4bb54af761696123778acd8517e3 (diff)
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/pokemon')
-rw-r--r--engine/pokemon/evos_moves.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/pokemon/evos_moves.asm b/engine/pokemon/evos_moves.asm
index 165ae02d..d5449b5c 100644
--- a/engine/pokemon/evos_moves.asm
+++ b/engine/pokemon/evos_moves.asm
@@ -119,7 +119,7 @@ Evolution_PartyMonLoop: ; loop over party mons
ld a, [wWhichPokemon]
ld hl, wPartyMonNicks
call GetPartyMonName
- call CopyStringToCF4B
+ call CopyToStringBuffer
ld hl, IsEvolvingText
call PrintText
ld c, 50
@@ -273,7 +273,7 @@ RenameEvolvedMon:
pop af
ld [wd0b5], a
ld hl, wcd6d
- ld de, wcf4b
+ ld de, wStringBuffer
.compareNamesLoop
ld a, [de]
inc de
@@ -359,7 +359,7 @@ LearnMoveFromLevelUp:
ld [wMoveNum], a
ld [wd11e], a
call GetMoveName
- call CopyStringToCF4B
+ call CopyToStringBuffer
predef LearnMove
ld a, b
and a