diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
| commit | 4c35f3ac8506e5f326658bbab91c257584f7b716 (patch) | |
| tree | 980025fbbc41e001e260a65ed7c035dd6073e864 /engine/breeding.asm | |
| parent | bb005694b31b6a8cbaeefa8751ea72117e904e02 (diff) | |
| parent | 82a05a1752b476caab8951fe03f539dcc1a63669 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# macros/scripts/maps.asm
Diffstat (limited to 'engine/breeding.asm')
| -rwxr-xr-x | engine/breeding.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/breeding.asm b/engine/breeding.asm index 8977ae175..234e05448 100755 --- a/engine/breeding.asm +++ b/engine/breeding.asm @@ -704,22 +704,22 @@ EggHatch_AnimationSequence: ; 1728f (5:728f) farcall BlankScreen call DisableLCD ld hl, EggHatchGFX - ld de, VTiles0 tile $00 + ld de, vTiles0 tile $00 ld bc, $20 ld a, BANK(EggHatchGFX) call FarCopyBytes farcall ClearSpriteAnims - ld de, VTiles2 tile $00 + ld de, vTiles2 tile $00 ld a, [wJumptableIndex] call GetHatchlingFrontpic - ld de, VTiles2 tile $31 + ld de, vTiles2 tile $31 ld a, EGG call GetEggFrontpic ld de, MUSIC_EVOLUTION call PlayMusic call EnableLCD hlcoord 7, 4 - ld b, HIGH(VBGMap0) + ld b, HIGH(vBGMap0) ld c, $31 ; Egg tiles start here ld a, EGG call Hatch_UpdateFrontpicBGMapCenter @@ -768,7 +768,7 @@ EggHatch_AnimationSequence: ; 1728f (5:728f) call ClearSprites call Hatch_InitShellFragments hlcoord 6, 3 - ld b, HIGH(VBGMap0) + ld b, HIGH(vBGMap0) ld c, $00 ; Hatchling tiles start here ld a, [wJumptableIndex] call Hatch_UpdateFrontpicBGMapCenter |