diff options
| author | yenatch <yenatch@gmail.com> | 2016-01-04 07:41:19 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2016-01-04 07:41:19 -0500 |
| commit | 0add51451cda9d4221af137f83e2429d3577310c (patch) | |
| tree | fd05f8f0ad49d88b032dc9e10af85a42dfa0e402 /engine/evolve.asm | |
| parent | da87d2a929b1d58175efe063833c124d8ba702c9 (diff) | |
| parent | 2a263629a40e201b1702e2f4e65f1c61360cc2b2 (diff) | |
Merge pull request #330 from PikalaxALT/scriptmacrorenaming
Scriptmacrorenaming
Diffstat (limited to 'engine/evolve.asm')
| -rwxr-xr-x | engine/evolve.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/evolve.asm b/engine/evolve.asm index 6772db932..4a959529a 100755 --- a/engine/evolve.asm +++ b/engine/evolve.asm @@ -78,7 +78,7 @@ endr cp EVOLVE_ITEM jp z, .item - ld a, [wd1e9] + ld a, [wForceEvolution] and a jp nz, .dont_evolve_2 @@ -179,7 +179,7 @@ endr cp b jp nz, .dont_evolve_3 - ld a, [wd1e9] + ld a, [wForceEvolution] and a jp z, .dont_evolve_3 ld a, [wLinkMode] @@ -485,7 +485,7 @@ endr .learn ld a, d - ld [wd262], a + ld [wPutativeTMHMMove], a ld [wd265], a call GetMoveName call CopyName1 |