diff options
| author | yenatch <yenatch@gmail.com> | 2016-04-18 08:01:12 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2016-04-18 08:01:12 -0400 |
| commit | 7aef59841489ea449b9a34d424c681a4b48b88ab (patch) | |
| tree | 72d46f1cc076564f62b11f5379960cd745a7fc9a /engine/breeding/egg.asm | |
| parent | c5fb2c947ffcdd0ddd80319a24a6acbe828d9598 (diff) | |
| parent | 5d94fb22ed0e4c9edfca506b80f50ef71fd78664 (diff) | |
Merge pull request #338 from PikalaxALT/master
Battle anims, HP Bar anim
Diffstat (limited to 'engine/breeding/egg.asm')
| -rwxr-xr-x | engine/breeding/egg.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/breeding/egg.asm b/engine/breeding/egg.asm index cfe4d9a1c..b6f41743e 100755 --- a/engine/breeding/egg.asm +++ b/engine/breeding/egg.asm @@ -166,11 +166,11 @@ CheckBreedmonCompatibility: ; 16e1d cp c jr z, .Compatible -.Incompatible +.Incompatible: and a ret -.Compatible +.Compatible: scf ret ; 16f3e @@ -215,7 +215,7 @@ HatchEggs: ; 16f70 (5:6f70) xor a ld [CurPartyMon], a -.loop: ; 16f7a (5:6f7a) +.loop ; 16f7a (5:6f7a) ld a, [de] inc de cp -1 @@ -348,7 +348,7 @@ HatchEggs: ; 16f70 (5:6f70) ld bc, PKMN_NAME_LENGTH call CopyBytes -.next: ; 1707d (5:707d) +.next ; 1707d (5:707d) ld hl, CurPartyMon inc [hl] pop hl @@ -357,7 +357,7 @@ HatchEggs: ; 16f70 (5:6f70) pop de jp .loop -.done: ; 1708a (5:708a) +.done ; 1708a (5:708a) ret ; 1708b (5:708b) @@ -989,7 +989,7 @@ DayCareMonPrintEmptyString: ; 174b5 ret ; 174b9 -.string: ; 174b9 +.string ; 174b9 db "@" ; 174ba |