summaryrefslogtreecommitdiff
path: root/engine/breeding.asm
diff options
context:
space:
mode:
Diffstat (limited to 'engine/breeding.asm')
-rwxr-xr-xengine/breeding.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/engine/breeding.asm b/engine/breeding.asm
index b402f99f1..967694612 100755
--- a/engine/breeding.asm
+++ b/engine/breeding.asm
@@ -231,8 +231,8 @@ HatchEggs: ; 16f70 (5:6f70)
push de
- callba SetEggMonCaughtData
- callba TrainerRankings_EggsHatched
+ farcall SetEggMonCaughtData
+ farcall TrainerRankings_EggsHatched
ld a, [CurPartyMon]
ld hl, PartyMon1Species
ld bc, PARTYMON_STRUCT_LENGTH
@@ -337,7 +337,7 @@ HatchEggs: ; 16f70 (5:6f70)
ld [MonType], a
push de
ld b, $0
- callba NamingScreen
+ farcall NamingScreen
pop hl
ld de, StringBuffer1
call InitName
@@ -649,7 +649,7 @@ GetEggFrontpic: ; 17224 (5:7224)
ld hl, BattleMonDVs
predef GetUnownLetter
pop de
- predef_jump GetFrontpic
+ predef_jump GetMonFrontpic
GetHatchlingFrontpic: ; 1723c (5:723c)
push de
@@ -659,7 +659,7 @@ GetHatchlingFrontpic: ; 1723c (5:723c)
ld hl, BattleMonDVs
predef GetUnownLetter
pop de
- predef_jump FrontpicPredef
+ predef_jump GetAnimatedFrontpicPredef
Hatch_UpdateFrontpicBGMapCenter: ; 17254 (5:7254)
push af
@@ -687,7 +687,7 @@ EggHatch_DoAnimFrame: ; 1727f (5:727f)
push hl
push de
push bc
- callab PlaySpriteAnimations
+ callfar PlaySpriteAnimations
call DelayFrame
pop bc
pop de
@@ -701,14 +701,14 @@ EggHatch_AnimationSequence: ; 1728f (5:728f)
push af
ld de, MUSIC_NONE
call PlayMusic
- callba BlankScreen
+ farcall BlankScreen
call DisableLCD
ld hl, EggHatchGFX
ld de, VTiles0 tile $00
ld bc, $20
ld a, BANK(EggHatchGFX)
call FarCopyBytes
- callba ClearSpriteAnims
+ farcall ClearSpriteAnims
ld de, VTiles2 tile $00
ld a, [wJumptableIndex]
call GetHatchlingFrontpic
@@ -817,7 +817,7 @@ INCBIN "gfx/evo/egg_hatch.2bpp"
; 173b3
Hatch_InitShellFragments: ; 173b3 (5:73b3)
- callba ClearSpriteAnims
+ farcall ClearSpriteAnims
ld hl, .SpriteData
.loop
ld a, [hli]