diff options
Diffstat (limited to 'home/map_objects.asm')
| -rw-r--r-- | home/map_objects.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/home/map_objects.asm b/home/map_objects.asm index 2285c8c76..3857bef0c 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -6,7 +6,7 @@ GetSpritePalette:: ; 17ff push bc ld c, a - callba _GetSpritePalette + farcall _GetSpritePalette ld a, c pop bc @@ -328,7 +328,7 @@ _CopyObjectStruct:: ; 1956 call UnmaskObject ld a, [hMapObjectIndexBuffer] call GetMapObject - callba CopyObjectStruct + farcall CopyObjectStruct ret ; 1967 @@ -345,7 +345,7 @@ ApplyDeletionToMapObject:: ; 1967 call .CheckStopFollow pop af call GetObjectStruct - callba DeleteMapObject + farcall DeleteMapObject ret .CheckStopFollow: @@ -356,7 +356,7 @@ ApplyDeletionToMapObject:: ; 1967 cp [hl] ret nz .ok - callba StopFollow + farcall StopFollow ld a, -1 ld [wObjectFollow_Leader], a ld [wObjectFollow_Follower], a @@ -409,20 +409,20 @@ CopyPlayerObjectTemplate:: ; 19a6 .ok ld a, b call GetObjectStruct - callba DeleteMapObject + farcall DeleteMapObject ret ; 19e9 LoadMovementDataPointer:: ; 19e9 -; Load the movement data pointer for person a. - ld [wMovementPerson], a +; Load the movement data pointer for object a. + ld [wMovementObject], a ld a, [hROMBank] ld [wMovementDataPointer], a ld a, l ld [wMovementDataPointer + 1], a ld a, h ld [wMovementDataPointer + 2], a - ld a, [wMovementPerson] + ld a, [wMovementObject] call CheckObjectVisibility ret c @@ -620,8 +620,8 @@ UpdateSprites:: ; 1ad2 bit 0, a ret z - callba Function55e0 - callba _UpdateSprites + farcall Function55e0 + farcall _UpdateSprites ret ; 1ae5 |