summaryrefslogtreecommitdiff
path: root/engine/battle
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2021-08-28 17:02:20 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2021-08-28 17:02:20 -0400
commit7ee8a6509e323ec012ece6273809e46830c29239 (patch)
treea58c8343919f9be0f208733f77506d783e5c269c /engine/battle
parent236426138bf085c4b7b854b43d910370fffca290 (diff)
wcf4b -> wStringBuffer
Diffstat (limited to 'engine/battle')
-rw-r--r--engine/battle/core.asm14
-rw-r--r--engine/battle/effects.asm2
2 files changed, 8 insertions, 8 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index f325350f..00906cef 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -2239,7 +2239,7 @@ UseBagItem:
ld a, [wcf91]
ld [wd11e], a
call GetItemName
- call CopyStringToCF4B ; copy name
+ call CopyToStringBuffer
xor a
ld [wPseudoItemID], a
call UseItem
@@ -3544,7 +3544,7 @@ CheckPlayerStatusConditions:
ld a, RAGE
ld [wd11e], a
call GetMoveName
- call CopyStringToCF4B
+ call CopyToStringBuffer
xor a
ld [wPlayerMoveEffect], a
ld hl, PlayerCanExecuteMove
@@ -3746,7 +3746,7 @@ PrintMoveName:
ret
_PrintMoveName:
- text_far _CF4BText
+ text_far _MoveNameText
text_asm
ld hl, ExclamationPointPointerTable
ld a, [wd11e] ; exclamation point num
@@ -5108,7 +5108,7 @@ ReloadMoveData:
call IncrementMovePP
; the follow two function calls are used to reload the move name
call GetMoveName
- call CopyStringToCF4B
+ call CopyToStringBuffer
ld a, $01
and a
ret
@@ -5609,7 +5609,7 @@ EnemyCanExecuteChargingMove:
ld [wNameListType], a
call GetName
ld de, wcd6d
- call CopyStringToCF4B
+ call CopyToStringBuffer
EnemyCanExecuteMove:
xor a
ld [wMonIsDisobedient], a
@@ -6046,7 +6046,7 @@ CheckEnemyStatusConditions:
ld a, RAGE
ld [wd11e], a
call GetMoveName
- call CopyStringToCF4B
+ call CopyToStringBuffer
xor a
ld [wEnemyMoveEffect], a
ld hl, EnemyCanExecuteMove
@@ -6088,7 +6088,7 @@ GetCurrentMove:
ld [wNameListType], a
call GetName
ld de, wcd6d
- jp CopyStringToCF4B
+ jp CopyToStringBuffer
LoadEnemyMonData:
ld a, [wLinkState]
diff --git a/engine/battle/effects.asm b/engine/battle/effects.asm
index d86a4cbf..91bb9ee0 100644
--- a/engine/battle/effects.asm
+++ b/engine/battle/effects.asm
@@ -751,7 +751,7 @@ PrintStatText:
jr z, .findStatName_outer
jr .findStatName_inner
.foundStatName
- ld de, wcf4b
+ ld de, wStringBuffer
ld bc, $a
jp CopyData