diff options
Diffstat (limited to 'engine/evos_moves.asm')
| -rwxr-xr-x | engine/evos_moves.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm index 660d838e..432e488f 100755 --- a/engine/evos_moves.asm +++ b/engine/evos_moves.asm @@ -17,7 +17,7 @@ Func_3ad1c: ; 3ad1c (e:6d1c) push hl push bc push de - ld hl, W_NUMINPARTY ; W_NUMINPARTY + ld hl, wPartyCount ; wPartyCount push hl asm_3ad2e: ; 3ad2e (e:6d2e) ld hl, wWhichPokemon ; wWhichPokemon @@ -107,7 +107,7 @@ Func_3ad71: ; 3ad71 (e:6d71) ld a, [hl] ld [wHPBarMaxHP + 1], a ld a, [wWhichPokemon] ; wWhichPokemon - ld hl, W_PARTYMON1NAME ; W_PARTYMON1NAME + ld hl, wPartyMonNicks ; wPartyMonNicks call GetPartyMonName call CopyStringToCF4B ld hl, IsEvolvingText @@ -170,7 +170,7 @@ Func_3ad71: ; 3ad71 (e:6d71) ld b, $1 call CalcStats ld a, [wWhichPokemon] ; wWhichPokemon - ld hl, W_PARTYMON1_NUM ; W_PARTYMON1_NUM (aliases: W_PARTYMON1DATA) + ld hl, wPartyMon1Species ; wPartyMon1Species (aliases: wPartyMon1) ld bc, $2c call AddNTimes ld e, l @@ -275,7 +275,7 @@ Func_3aef7: ; 3aef7 (e:6ef7) jr nz, .asm_3af0e ld a, [wWhichPokemon] ; wWhichPokemon ld bc, $b - ld hl, W_PARTYMON1NAME ; W_PARTYMON1NAME + ld hl, wPartyMonNicks ; wPartyMonNicks call AddNTimes push hl call GetName @@ -344,7 +344,7 @@ Func_3af5b: ; 3af5b (e:6f5b) ld a, [wcc49] and a jr nz, .asm_3af96 - ld hl, W_PARTYMON1_MOVE1 ; W_PARTYMON1_MOVE1 + ld hl, wPartyMon1Moves ; wPartyMon1Moves ld a, [wWhichPokemon] ; wWhichPokemon ld bc, $2c call AddNTimes |