summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2013-08-30 19:17:32 -0400
committeryenatch <yenatch@gmail.com>2013-08-30 20:53:42 -0400
commit17f25691db80b7bd577d401a53eecb913a0b8860 (patch)
treea3d1211861c90f0b6aab64d038325a35cd9751dc
parentf4572ecd4dc8effb26c2a14de30f0ba58c317078 (diff)
Function378b is IsAPokemon
-rw-r--r--main.asm15
1 files changed, 8 insertions, 7 deletions
diff --git a/main.asm b/main.asm
index fc1aaee33..d506d9854 100644
--- a/main.asm
+++ b/main.asm
@@ -7374,19 +7374,20 @@ Function3718: ; 3718
-Function3741: ; 3741
+IsAPokemon: ; 3741
+; Return carry if species a is not a Pokemon.
and a
- jr z, .asm_374c
+ jr z, .NotAPokemon
cp EGG
- jr z, .asm_374e
+ jr z, .Pokemon
cp $fc
- jr c, .asm_374e
+ jr c, .Pokemon
-.asm_374c
+.NotAPokemon
scf
ret
-.asm_374e
+.Pokemon
and a
ret
; 3750
@@ -7460,7 +7461,7 @@ Function3786: ; 3786
Function378b: ; 378b
ld a, [CurPartySpecies]
- call Function3741
+ call IsAPokemon
jr c, .asm_37ad
push hl
ld de, VTiles2