diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-15 21:14:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-15 21:14:22 -0500 |
| commit | 4046b41c3aaaf0d930f0268e52112aa7ea01e0a4 (patch) | |
| tree | 17932d687fef4c87e555c45fda32564f4df7aa0a /engine/overworld.asm | |
| parent | b35eb72290b964b98844afbe741bb7ede34b9ef3 (diff) | |
| parent | 8b007e8d51ec86992d97fa4b1c05b762e0916427 (diff) | |
Merge pull request #487 from luckytyphlosion/master
Fix more w-izing edge cases.
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 7e3a69c6f..79c6ed526 100755 --- a/engine/overworld.asm +++ b/engine/overworld.asm @@ -233,9 +233,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 @@ -253,11 +253,11 @@ GetMonSprite: ; 14259 ld a, [hl] jr .Mon -.wBreedMon1 +.BreedMon1 ld a, [wBreedMon1Species] jr .Mon -.wBreedMon2 +.BreedMon2 ld a, [wBreedMon2Species] .Mon: |