Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NUM_POKEMON in main.asm

This commit is contained in:
yenatch 2013-08-30 22:25:50 -04:00
parent 5342f8d630
commit 21248effe4
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
main.asm
View File

@ -7380,7 +7380,7 @@ IsAPokemon: ; 3741
jr z, .NotAPokemon jr z, .NotAPokemon
cp EGG cp EGG
jr z, .Pokemon jr z, .Pokemon
cp $fc cp NUM_POKEMON + 1
jr c, .Pokemon jr c, .Pokemon
.NotAPokemon .NotAPokemon
@ -25312,7 +25312,7 @@ Function132da: ; 132da
jr z, .asm_132f3 jr z, .asm_132f3
cp EGG cp EGG
jr z, .asm_132f3 jr z, .asm_132f3
cp $fc cp NUM_POKEMON + 1
jr c, .asm_132f8 jr c, .asm_132f8
.asm_132f3 .asm_132f3
@ -25346,7 +25346,7 @@ Function132fe: ; 132fe
jr z, .asm_1331e jr z, .asm_1331e
cp EGG cp EGG
jr z, .asm_1331e jr z, .asm_1331e
cp $fc cp NUM_POKEMON + 1
jr c, .asm_13321 jr c, .asm_13321
.asm_1331e .asm_1331e
@ -46769,7 +46769,7 @@ GetPreEvolution: ; 42581
.asm_425a2 .asm_425a2
inc c inc c
ld a, c ld a, c
cp CELEBI cp NUM_POKEMON
jr c, .asm_42583 jr c, .asm_42583
and a and a
ret ret
@ -56572,9 +56572,9 @@ INCBIN "baserom.gbc", $8d03d, $8d04c - $8d03d
Function8d04c: ; 8d04c Function8d04c: ; 8d04c
call Function8d0ec call Function8d0ec
call Function8d132 call Function8d132
cp $fd cp EGG
jr z, .asm_8d0b9 jr z, .asm_8d0b9
cp $fc cp NUM_POKEMON + 1
jr z, .asm_8d0b6 jr z, .asm_8d0b6
call Function8d1a2 call Function8d1a2
ld a, [$c3ba] ld a, [$c3ba]
@ -63320,9 +63320,9 @@ INCBIN "baserom.gbc", $cc9c4, $cca09 - $cc9c4
Functioncca09: ; cca09 Functioncca09: ; cca09
call Functionccaaa call Functionccaaa
call Functionce7d1 call Functionce7d1
cp $fd cp EGG
jp z, $4aa5 jp z, $4aa5
cp $fc cp NUM_POKEMON + 1
jp z, $4aa2 jp z, $4aa2
push af push af
ld hl, $d419 ld hl, $d419