diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2018-07-29 19:56:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-29 19:56:54 -0400 |
| commit | 98e670f3637b5f845a91423ee2d624d2f1e331a6 (patch) | |
| tree | 20bacd2c3cd766eedddd636de59a99af1d662866 /engine/pokemon/move_mon.asm | |
| parent | 2ec900d96c3b6020be0816151b9ad606c04114b5 (diff) | |
| parent | e346cc7b4152578106f7708363b41d076a3e8d52 (diff) | |
Merge pull request #548 from Rangi42/master
Add meaningful aliases for wd265
Diffstat (limited to 'engine/pokemon/move_mon.asm')
| -rw-r--r-- | engine/pokemon/move_mon.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm index 128bbf200..377268ecb 100644 --- a/engine/pokemon/move_mon.asm +++ b/engine/pokemon/move_mon.asm @@ -52,7 +52,7 @@ TryAddMonToParty: and a jr nz, .skipnickname ld a, [wCurPartySpecies] - ld [wd265], a + ld [wNamedObjectIndexBuffer], a call GetPokemonName ld hl, wPartyMonNicknames ld a, [hMoveMon] @@ -185,11 +185,11 @@ endr .registerpokedex ld a, [wCurPartySpecies] - ld [wd265], a + ld [wTempSpecies], a dec a push de call CheckCaughtMon - ld a, [wd265] + ld a, [wTempSpecies] dec a call SetSeenAndCaughtMon pop de @@ -750,7 +750,7 @@ RestorePPofDepositedPokemon: farcall GetMaxPPOfMove pop de pop hl - ld a, [wd265] + ld a, [wTempPP] ld b, a ld a, [de] and %11000000 @@ -970,7 +970,7 @@ SendMonIntoBox: call CopyBytes ld a, [wCurPartySpecies] - ld [wd265], a + ld [wNamedObjectIndexBuffer], a call GetPokemonName ld de, sBoxMonNicknames @@ -1669,7 +1669,7 @@ GivePoke:: .done ld a, [wCurPartySpecies] - ld [wd265], a + ld [wNamedObjectIndexBuffer], a ld [wTempEnemyMonSpecies], a call GetPokemonName ld hl, wStringBuffer1 |