From 7ee8a6509e323ec012ece6273809e46830c29239 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sat, 28 Aug 2021 17:02:20 -0400 Subject: wcf4b -> wStringBuffer --- engine/battle/core.asm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'engine/battle/core.asm') 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] -- cgit v1.3.1-sl0p From 30acb46b988d4bb54af761696123778acd8517e3 Mon Sep 17 00:00:00 2001 From: Amber Brault Date: Sun, 26 Sep 2021 22:57:55 -0400 Subject: Fix typos (#334) --- engine/battle/core.asm | 2 +- home/vcopy.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/battle/core.asm') diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 00906cef..d24a43d0 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -3337,7 +3337,7 @@ CheckPlayerStatusConditions: .HeldInPlaceCheck ld a, [wEnemyBattleStatus1] - bit USING_TRAPPING_MOVE, a ; is enemy using a mult-turn move like wrap? + bit USING_TRAPPING_MOVE, a ; is enemy using a multi-turn move like wrap? jp z, .FlinchedCheck ld hl, CantMoveText call PrintText diff --git a/home/vcopy.asm b/home/vcopy.asm index 504406b9..93c035eb 100644 --- a/home/vcopy.asm +++ b/home/vcopy.asm @@ -127,7 +127,7 @@ AutoBgMapTransfer:: ld a, h ldh [hSPTemp], a ld a, l - ldh [hSPTemp + 1], a ; save stack pinter + ldh [hSPTemp + 1], a ; save stack pointer ldh a, [hAutoBGTransferPortion] and a jr z, .transferTopThird -- cgit v1.3.1-sl0p