diff options
Diffstat (limited to 'engine/breeding.asm')
| -rwxr-xr-x | engine/breeding.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/breeding.asm b/engine/breeding.asm index b16747089..d66616061 100755 --- a/engine/breeding.asm +++ b/engine/breeding.asm @@ -202,7 +202,7 @@ DoEggStep:: ; 16f3e OverworldHatchEgg:: ; 16f5e call RefreshScreen - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call HatchEggs call ExitAllMenus call RestartMapMusic @@ -288,7 +288,7 @@ HatchEggs: ; 16f70 (5:6f70) push hl ld bc, MON_STAT_EXP - 1 add hl, bc - ld b, $0 + ld b, FALSE predef CalcPkmnStats pop bc ld hl, MON_MAXHP @@ -705,7 +705,7 @@ EggHatch_AnimationSequence: ; 1728f (5:728f) call DisableLCD ld hl, EggHatchGFX ld de, vTiles0 tile $00 - ld bc, $20 + ld bc, 2 tiles ld a, BANK(EggHatchGFX) call FarCopyBytes farcall ClearSpriteAnims @@ -887,26 +887,26 @@ Hatch_ShellFragmentLoop: ; 17418 (5:7418) jr nz, .loop ret -Special_DayCareMon1: ; 17421 +DayCareMon1: ; 17421 ld hl, DayCareMon1Text call PrintText ld a, [wBreedMon1Species] call PlayMonCry ld a, [wDayCareLady] - bit 0, a + bit DAYCARELADY_HAS_MON_F, a jr z, DayCareMonCursor call ButtonSound ld hl, wBreedMon2Nick call DayCareMonCompatibilityText jp PrintText -Special_DayCareMon2: ; 17440 +DayCareMon2: ; 17440 ld hl, DayCareMon2Text call PrintText ld a, [wBreedMon2Species] call PlayMonCry ld a, [wDayCareMan] - bit 0, a + bit DAYCAREMAN_HAS_MON_F, a jr z, DayCareMonCursor call ButtonSound ld hl, wBreedMon1Nick |