Merge branch 'master' of https://github.com/pret/pokecrystal

# Conflicts: # maps/KrissHouse2F.asm
2018-02-15 21:21:58 -05:00
parent 62d6f72bb3 4046b41c3a
commit 612fd7cb96
6 changed files with 14 additions and 14 deletions
--- 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: