diff options
| author | yenatch <yenatch@gmail.com> | 2014-03-05 02:45:33 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-03-05 02:45:33 -0500 |
| commit | 6856667b36fcb6a7f97259cc519583d80a632849 (patch) | |
| tree | ed7997cf2036dfa58b1ffdcb947448ede83b93f9 | |
| parent | d952b5c3ebdd0762f77cba7758d8a5e750116074 (diff) | |
Magnemite and Magneton handling in the Time Machine.
| -rw-r--r-- | main.asm | 18 |
1 files changed, 11 insertions, 7 deletions
@@ -88029,12 +88029,12 @@ Functionfb57e: ; fb57e ld a, [$d003] inc a ld c, a - ld b, $0 + ld b, 0 ld hl, OTPartyCount add hl, bc ld a, [hl] pop hl - cp $fd + cp EGG jr z, .asm_fb59c cp [hl] jr nz, .asm_fb5db @@ -88042,10 +88042,10 @@ Functionfb57e: ; fb57e .asm_fb59c ld b, h ld c, l - ld hl, $001f + ld hl, OTPartyMon1Level - OTPartyMon1 add hl, bc ld a, [hl] - cp $65 + cp 101 jr nc, .asm_fb5db ld a, [InLinkBattle] cp $1 @@ -88053,13 +88053,17 @@ Functionfb57e: ; fb57e ld hl, OTPartySpecies ld a, [$d003] ld c, a - ld b, $0 + ld b, 0 add hl, bc ld a, [hl] - cp $51 + + ; Magnemite and Magneton's types changed + ; from Electric to Electric/Steel. + cp MAGNEMITE jr z, .asm_fb5d9 - cp $52 + cp MAGNETON jr z, .asm_fb5d9 + ld [CurSpecies], a call GetBaseData ld hl, $cbea |