diff options
| author | IIMarckus <iimarckus@gmail.com> | 2020-02-09 02:20:05 -0700 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2020-02-09 02:20:05 -0700 |
| commit | a7e3a999ff21ecac0bfbe7f091f9ff901075a323 (patch) | |
| tree | 8032e91c6a426b355b6d1d3505bbc1fdc9c40fa6 /home/map_objects.asm | |
| parent | d561a6d2db176240549fa605dc3e7e1f59e86607 (diff) | |
| parent | 0543e933915a65127a8b803789d049478c7889d5 (diff) | |
Merge https://github.com/libjet/pokegold
Diffstat (limited to 'home/map_objects.asm')
| -rw-r--r-- | home/map_objects.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/home/map_objects.asm b/home/map_objects.asm index 94fe60f4..8742ed5e 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -3,7 +3,7 @@ GetSpritePalette:: ; 169c push de push bc ld c, a - callba GetSpritePalette_ + farcall GetSpritePalette_ ld a, c pop bc pop de @@ -292,7 +292,7 @@ CopyObjectStruct:: call UnmaskObject ld a, [hConnectionStripLength] call GetMapObject - callba CopyObjectStruct_ + farcall CopyObjectStruct_ ret ApplyDeletionToMapObject:: ; 1804 (0:1804) @@ -308,7 +308,7 @@ ApplyDeletionToMapObject:: ; 1804 (0:1804) call DeleteOject_CheckStopFollow pop af call GetObjectStruct - callba DeleteMapObject + farcall DeleteMapObject ret DeleteOject_CheckStopFollow:: ; 1822 (0:1822) @@ -319,7 +319,7 @@ DeleteOject_CheckStopFollow:: ; 1822 (0:1822) cp [hl] ret nz .asm_182d - callba StopFollow + farcall StopFollow ld a, $ff ld [wObjectFollow_Leader], a ld [wObjectFollow_Follower], a @@ -368,7 +368,7 @@ Function1855:: .asm_187b ld a, b call GetObjectStruct - callba DeleteMapObject + farcall DeleteMapObject ret LoadMovementDataPointer:: @@ -556,8 +556,8 @@ UpdateSprites:: ; 196f (0:196f) ld a, [wVramState] bit 0, a ret z - callba Function557f - callba UpdateSprites_ + farcall Function557f + farcall UpdateSprites_ ret GetObjectStruct:: ; 1982 (0:1982) |