diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-15 21:21:58 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-15 21:21:58 -0500 |
| commit | 612fd7cb96746cf122b0d500991ea17122f0d90c (patch) | |
| tree | 187b012600e9e9895ffe84270a64058c8edf6bbe /engine/overworld.asm | |
| parent | 62d6f72bb35ed75574bb74b2edca120f8d80a628 (diff) | |
| parent | 4046b41c3aaaf0d930f0268e52112aa7ea01e0a4 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# maps/KrissHouse2F.asm
Diffstat (limited to 'engine/overworld.asm')
| -rwxr-xr-x | engine/overworld.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/overworld.asm b/engine/overworld.asm index be8fa44af..381c2d89f 100755 --- a/engine/overworld.asm +++ b/engine/overworld.asm @@ -220,9 +220,9 @@ GetMonSprite: ; 14259 cp SPRITE_POKEMON jr c, .Normal cp SPRITE_DAY_CARE_MON_1 - jr z, .wBreedMon1 + jr z, .BreedMon1 cp SPRITE_DAY_CARE_MON_2 - jr z, .wBreedMon2 + jr z, .BreedMon2 cp SPRITE_VARS jr nc, .Variable jr .Icon @@ -240,11 +240,11 @@ GetMonSprite: ; 14259 ld a, [hl] jr .Mon -.wBreedMon1 +.BreedMon1 ld a, [wBreedMon1Species] jr .Mon -.wBreedMon2 +.BreedMon2 ld a, [wBreedMon2Species] .Mon: |