diff options
| author | Sylvie <35663410+Rangi42@users.noreply.github.com> | 2024-07-24 12:21:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-24 12:21:59 -0400 |
| commit | 6e3ab0a9e97ff14123ac65f56cb4b4ddab45b695 (patch) | |
| tree | 32feac5e86fbac9eec6f40c14a19c8bd89c1b52d /engine/pokemon | |
| parent | Identify various flag labels and bit constants (#454) (diff) | |
| download | pokeyellow-6e3ab0a9e97ff14123ac65f56cb4b4ddab45b695.tar.gz pokeyellow-6e3ab0a9e97ff14123ac65f56cb4b4ddab45b695.tar.xz pokeyellow-6e3ab0a9e97ff14123ac65f56cb4b4ddab45b695.zip | |
Identify wcd6d as wNameBuffer and others (#455)
Diffstat (limited to 'engine/pokemon')
| -rw-r--r-- | engine/pokemon/add_mon.asm | 4 | ||||
| -rw-r--r-- | engine/pokemon/evos_moves.asm | 4 | ||||
| -rw-r--r-- | engine/pokemon/learn_move.asm | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engine/pokemon/add_mon.asm b/engine/pokemon/add_mon.asm index 0b7fb96c..73ba8071 100644 --- a/engine/pokemon/add_mon.asm +++ b/engine/pokemon/add_mon.asm @@ -261,13 +261,13 @@ AddPartyMon_WriteMovePP: ld hl, Moves ld bc, MOVE_LENGTH call AddNTimes - ld de, wcd6d + ld de, wMoveData ld a, BANK(Moves) call FarCopyData pop bc pop de pop hl - ld a, [wcd6d + 5] ; PP is byte 5 of move data + ld a, [wMoveData + MOVE_PP] .empty inc de ld [de], a diff --git a/engine/pokemon/evos_moves.asm b/engine/pokemon/evos_moves.asm index fa6930c1..1c7c328c 100644 --- a/engine/pokemon/evos_moves.asm +++ b/engine/pokemon/evos_moves.asm @@ -267,7 +267,7 @@ RenameEvolvedMon: call GetName pop af ld [wd0b5], a - ld hl, wcd6d + ld hl, wNameBuffer ld de, wStringBuffer .compareNamesLoop ld a, [de] @@ -283,7 +283,7 @@ RenameEvolvedMon: call AddNTimes push hl call GetName - ld hl, wcd6d + ld hl, wNameBuffer pop de jp CopyData diff --git a/engine/pokemon/learn_move.asm b/engine/pokemon/learn_move.asm index 0377caa4..981fe13a 100644 --- a/engine/pokemon/learn_move.asm +++ b/engine/pokemon/learn_move.asm @@ -3,7 +3,7 @@ LearnMove: ld a, [wWhichPokemon] ld hl, wPartyMonNicks call GetPartyMonName - ld hl, wcd6d + ld hl, wNameBuffer ld de, wLearnMoveMonName ld bc, NAME_LENGTH call CopyData |