diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-14 20:58:49 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-14 20:58:49 -0500 |
| commit | 8e1e583640fcb82cb8d6327a0174a892b4ba0ad2 (patch) | |
| tree | a0485ec429053fa1bcdf03a1e28ea626eef03d79 | |
| parent | 7a09fc9f750aec50dd568226083b279004ffe155 (diff) | |
Close #470 (JOHTO_POKEMON)
| -rw-r--r-- | constants/pokemon_constants.asm | 1 | ||||
| -rwxr-xr-x | engine/link.asm | 2 | ||||
| -rw-r--r-- | engine/pic_animation.asm | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 3585624bd..d4c49c5f5 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -170,6 +170,7 @@ const_value set 1 const DRAGONITE ; 95 const MEWTWO ; 96 const MEW ; 97 +JOHTO_POKEMON EQU const_value const CHIKORITA ; 98 const BAYLEEF ; 99 const MEGANIUM ; 9a diff --git a/engine/link.asm b/engine/link.asm index 779c288e8..bbb151965 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -2050,7 +2050,7 @@ Special_CheckTimeCapsuleCompatibility: ; 29bfb ld a, [hli] cp -1 jr z, .checkitem - cp MEW + 1 + cp JOHTO_POKEMON jr nc, .mon_too_new dec b jr nz, .loop diff --git a/engine/pic_animation.asm b/engine/pic_animation.asm index 33b770b14..4617c5f70 100644 --- a/engine/pic_animation.asm +++ b/engine/pic_animation.asm @@ -1024,7 +1024,7 @@ GetMonFramesPointer: ; d05ce ld hl, UnownFramesPointers jr z, .got_frames ld a, [wPokeAnimSpecies] - cp CHIKORITA + cp JOHTO_POKEMON ld b, BANK(FramesPointers) ld c, BANK(KantoFrames) ld hl, FramesPointers |