diff options
| author | YamaArashi <shadow962@live.com> | 2015-08-07 12:39:29 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-08-07 12:39:29 -0700 |
| commit | 40c1ecb4374a83d9511fe2c5fa99704d9cfc521b (patch) | |
| tree | 400c46f2005706ea7243cb243544be9ca2c51206 /engine/evos_moves.asm | |
| parent | named wram variables (diff) | |
| download | pokeyellow-40c1ecb4374a83d9511fe2c5fa99704d9cfc521b.tar.gz pokeyellow-40c1ecb4374a83d9511fe2c5fa99704d9cfc521b.tar.xz pokeyellow-40c1ecb4374a83d9511fe2c5fa99704d9cfc521b.zip | |
fixed names
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 16e893e5..4ac808c1 100755 --- a/engine/evos_moves.asm +++ b/engine/evos_moves.asm @@ -166,7 +166,7 @@ Evolution_PartyMonLoop: ; loop over party mons ld de, W_MONHEADER call CopyData ld a, [wd0b5] - ld [W_MONHDEXNUM], a + ld [W_MONHINDEX], a pop af ld [wd11e], a ld hl, wLoadedMonHPExp - 1 @@ -257,12 +257,12 @@ Evolution_PartyMonLoop: ; loop over party mons call nz, PlayDefaultMusic ret -; checks if the evolved mon's name is different from the standard name (i.e. it has a nickname) -; if so, rename it to is evolved form's standard name RenameEvolvedMon: ; 3aef7 (e:6ef7) +; Renames the mon to its new, evolved form's standard name unless it had a +; nickname, in which case the nickname is kept. ld a, [wd0b5] push af - ld a, [W_MONHDEXNUM] + ld a, [W_MONHINDEX] ld [wd0b5], a call GetName pop af @@ -275,7 +275,7 @@ RenameEvolvedMon: ; 3aef7 (e:6ef7) cp [hl] inc hl ret nz - cp $50 + cp "@" jr nz, .compareNamesLoop ld a, [wWhichPokemon] ld bc, 11 |