diff options
| author | dannye <33dannye@gmail.com> | 2021-09-26 22:38:47 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-09-26 22:43:09 -0500 |
| commit | 501a21fa5dc6f01c0563316c9cd209cccb1eef45 (patch) | |
| tree | c2fe5cc6caa9d8117df3008031d7a26317058acb /engine/battle | |
| parent | Switch from Travis CI to GitHub Actions (diff) | |
| parent | Fix typos (#334) (diff) | |
| download | pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.tar.gz pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.tar.xz pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/core.asm | 16 | ||||
| -rw-r--r-- | engine/battle/effects.asm | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 48104833..882f3f8e 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2344,7 +2344,7 @@ UseBagItem: ld a, [wcf91] ld [wd11e], a call GetItemName - call CopyStringToCF4B ; copy name + call CopyToStringBuffer xor a ld [wPseudoItemID], a call UseItem @@ -3506,7 +3506,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 @@ -3713,7 +3713,7 @@ CheckPlayerStatusConditions: ld a, RAGE ld [wd11e], a call GetMoveName - call CopyStringToCF4B + call CopyToStringBuffer xor a ld [wPlayerMoveEffect], a ld hl, PlayerCanExecuteMove @@ -3915,7 +3915,7 @@ PrintMoveName: ret _PrintMoveName: - text_far _CF4BText + text_far _MoveNameText text_asm ld hl, ExclamationPointPointerTable ld a, [wd11e] ; exclamation point num @@ -5277,7 +5277,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 @@ -5789,7 +5789,7 @@ EnemyCanExecuteChargingMove: ld [wNameListType], a call GetName ld de, wcd6d - call CopyStringToCF4B + call CopyToStringBuffer EnemyCanExecuteMove: xor a ld [wMonIsDisobedient], a @@ -6226,7 +6226,7 @@ CheckEnemyStatusConditions: ld a, RAGE ld [wd11e], a call GetMoveName - call CopyStringToCF4B + call CopyToStringBuffer xor a ld [wEnemyMoveEffect], a ld hl, EnemyCanExecuteMove @@ -6268,7 +6268,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 283a794b..959f7eaf 100644 --- a/engine/battle/effects.asm +++ b/engine/battle/effects.asm @@ -787,7 +787,7 @@ PrintStatText: jr z, .findStatName_outer jr .findStatName_inner .foundStatName - ld de, wcf4b + ld de, wStringBuffer ld bc, $a jp CopyData |