diff options
| author | YamaArashi <shadow962@live.com> | 2015-07-24 20:27:59 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-07-24 20:27:59 -0700 |
| commit | 7f6d0d49b61a77cfba76057d99881634b882486b (patch) | |
| tree | afb152986ff34039cb64e3101dd2b2b1e3293552 /engine/evos_moves.asm | |
| parent | named more functions (diff) | |
| download | pokeyellow-7f6d0d49b61a77cfba76057d99881634b882486b.tar.gz pokeyellow-7f6d0d49b61a77cfba76057d99881634b882486b.tar.xz pokeyellow-7f6d0d49b61a77cfba76057d99881634b882486b.zip | |
more naming variables
Diffstat (limited to 'engine/evos_moves.asm')
| -rwxr-xr-x | engine/evos_moves.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm index b9b4bb0f..7dcc0513 100755 --- a/engine/evos_moves.asm +++ b/engine/evos_moves.asm @@ -14,7 +14,7 @@ EvolutionAfterBattle: ; 3ad1c (e:6d1c) ld a, [hTilesetType] push af xor a - ld [wd121], a + ld [wEvolutionOccurred], a dec a ld [wWhichPokemon], a push hl @@ -91,7 +91,7 @@ Evolution_PartyMonLoop: ; loop over party mons ld a, [wLoadedMonLevel] cp b ; is the mon's level greater than the evolution requirement? jp c, Evolution_PartyMonLoop ; if so, go the next mon - jr .asm_3adb6 + jr .doEvolution .checkItemEvo ld a, [hli] ld b, a ; evolution item @@ -104,10 +104,10 @@ Evolution_PartyMonLoop: ; loop over party mons ld a, [wLoadedMonLevel] cp b ; is the mon's level greater than the evolution requirement? jp c, .nextEvoEntry2 ; if so, go the next evolution entry -.asm_3adb6 +.doEvolution ld [W_CURENEMYLVL], a - ld a, $1 - ld [wd121], a + ld a, 1 + ld [wEvolutionOccurred], a push hl ld a, [hl] ld [wEvoNewSpecies], a @@ -252,7 +252,7 @@ Evolution_PartyMonLoop: ; loop over party mons ld a, [W_ISINBATTLE] and a ret nz - ld a, [wd121] + ld a, [wEvolutionOccurred] and a call nz, PlayDefaultMusic ret |