diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-24 12:47:30 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-24 12:47:30 -0500 |
| commit | c66d195089b1e1b823be4f0a0fc9b8f41f5f790d (patch) | |
| tree | 47869a9d9ed7f5c2c8a8974b5a46a35e65ffef6a /engine/map_objects.asm | |
| parent | d787c66374df60fceb34fa5860c34bf56e476cbe (diff) | |
callba/callab → farcall/callfar
Diffstat (limited to 'engine/map_objects.asm')
| -rw-r--r-- | engine/map_objects.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/map_objects.asm b/engine/map_objects.asm index 4b8adb75f..971435fb0 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -1699,7 +1699,7 @@ StepType0f: ; 4ecd add hl, bc ld a, [hl] ld b, a - callba CopyDECoordsToMapObject + farcall CopyDECoordsToMapObject pop bc ld hl, OBJECT_FLAGS2 add hl, bc @@ -2177,7 +2177,7 @@ InitTempObject: ; 55ac ret nc ld d, h ld e, l - callba CopyTempObjectToObjectStruct + farcall CopyTempObjectToObjectStruct ret ; 55b9 @@ -2306,7 +2306,7 @@ Function565c: ; 565c call Function56a3 jr c, SetFacing_Standing call Function5688 - callba Function4440 + farcall Function4440 xor a ret ; 5673 @@ -2314,7 +2314,7 @@ Function565c: ; 565c Function5673: ; 5673 call Function56a3 jr c, SetFacing_Standing - callba Function4440 ; no need to farcall + farcall Function4440 ; no need to farcall xor a ret ; 5680 @@ -2340,7 +2340,7 @@ Function5688: ; 5688 ld hl, OBJECT_NEXT_TILE add hl, bc ld [hl], a - callba UpdateTallGrassFlags ; no need to farcall + farcall UpdateTallGrassFlags ; no need to farcall ret ; 56a3 @@ -2527,7 +2527,7 @@ RefreshPlayerSprite: ; 579d ld [wPlayerTurningDirection], a ld [PlayerObjectStepFrame], a call .TryResetPlayerAction - callba CheckWarpFacingDown + farcall CheckWarpFacingDown call c, SpawnInFacingDown call .SpawnInCustomFacing ret @@ -2596,7 +2596,7 @@ StartFollow:: ; 5803 ret c ld a, c call SetFollowerIfVisible - callba QueueFollowerFirstStep + farcall QueueFollowerFirstStep ret ; 5815 @@ -2642,7 +2642,7 @@ ResetFollower: ; 5847 cp -1 ret z call GetObjectStruct - callba Function58e3 ; no need to bankswitch + farcall Function58e3 ; no need to bankswitch ld a, -1 ld [wObjectFollow_Follower], a ret |