pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Magnemite and Magneton handling in the Time Machine.

Browse Source
This commit is contained in:
yenatch
2014-03-05 02:45:33 -05:00
parent d952b5c3eb
commit 6856667b36
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
main.asm
View File

@@ -88029,12 +88029,12 @@ Functionfb57e: ; fb57e
ld a, [$d003] ld a, [$d003]
inc a inc a
ld c, a ld c, a
ld b, $0 ld b, 0
ld hl, OTPartyCount ld hl, OTPartyCount
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
pop hl pop hl
cp $fd cp EGG
jr z, .asm_fb59c jr z, .asm_fb59c
cp [hl] cp [hl]
jr nz, .asm_fb5db jr nz, .asm_fb5db
@@ -88042,10 +88042,10 @@ Functionfb57e: ; fb57e
.asm_fb59c .asm_fb59c
ld b, h ld b, h
ld c, l ld c, l
ld hl, $001f ld hl, OTPartyMon1Level - OTPartyMon1
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
cp $65 cp 101
jr nc, .asm_fb5db jr nc, .asm_fb5db
ld a, [InLinkBattle] ld a, [InLinkBattle]
cp $1 cp $1
@@ -88053,13 +88053,17 @@ Functionfb57e: ; fb57e
ld hl, OTPartySpecies ld hl, OTPartySpecies
ld a, [$d003] ld a, [$d003]
ld c, a ld c, a
ld b, $0 ld b, 0
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
cp $51
; Magnemite and Magneton's types changed
; from Electric to Electric/Steel.
cp MAGNEMITE
jr z, .asm_fb5d9 jr z, .asm_fb5d9
cp $52 cp MAGNETON
jr z, .asm_fb5d9 jr z, .asm_fb5d9
ld [CurSpecies], a ld [CurSpecies], a
call GetBaseData call GetBaseData
ld hl, $cbea ld hl, $cbea