diff options
| author | dannye <corrnondacqb@yahoo.com> | 2015-07-14 03:46:23 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2015-07-14 03:49:49 -0500 |
| commit | b1cb3788938fa981e65619f022a41f1c1d91ae3b (patch) | |
| tree | e328c0eea6e6c87a954e396266c355fa3fbec286 /engine/items | |
| parent | ef9e59101e10aed82184bd2fd063b1109e2e4f6a (diff) | |
Comment naming screen
also use more joypad constants
Diffstat (limited to 'engine/items')
| -rwxr-xr-x | engine/items/items.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/items/items.asm b/engine/items/items.asm index fae2a871..8d6037eb 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -643,7 +643,7 @@ ItemUseEvoStone: ; da5b (3:5a5b) ld a,b ld [wcf91],a ld a,$01 - ld [wccd4],a + ld [wForceEvolution],a ld a,(SFX_02_3e - SFX_Headers_02) / 3 call PlaySoundWaitForCurrent call WaitForSoundToFinish @@ -1275,7 +1275,7 @@ ItemUseMedicine: ; dabb (3:5abb) ld [wcc49],a predef LearnMoveFromLevelUp ; learn level up move, if any xor a - ld [wccd4],a + ld [wForceEvolution],a callab TryEvolvingMon ; evolve pokemon, if appropriate ld a,$01 ld [wUpdateSpritesEnabled],a |