diff options
Diffstat (limited to 'engine/overworld')
| -rwxr-xr-x | engine/overworld/map_objects.asm | 14 | ||||
| -rwxr-xr-x | engine/overworld/player_movement.asm | 2 | ||||
| -rwxr-xr-x | engine/overworld/time.asm | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index 2bf5fda2..593a1d75 100755 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm @@ -605,7 +605,7 @@ Function554b: ; 554b (1:554b) ret nc ld d, h ld e, l - callba CopyTempObjectToObjectStruct + farcall CopyTempObjectToObjectStruct ret Function5558: ; 5558 (1:5558) @@ -717,14 +717,14 @@ Function55ef: ; 55ef (1:55ef) call Function5636 jr c, Function5613 call Function561b - callba Function4441 ; same bank + farcall Function4441 ; same bank xor a ret Function5606: ; 5606 (1:5606) call Function5636 jr c, Function5613 - callba Function4441 ; same bank + farcall Function4441 ; same bank xor a ret @@ -748,7 +748,7 @@ Function561b: ; 561b (1:561b) ld hl, $e add hl, bc ld [hl], a - callba UpdateGrassPriority ; same bank + farcall UpdateGrassPriority ; same bank ret Function5636: ; 5636 (1:5636) @@ -931,7 +931,7 @@ Function5730:: ; 5730 (1:5730) ld [wcf39], a ld [wPlayerObjectStepFrame], a call Function574f - callba Function14a44 + farcall Function14a44 call c, Function5770 call Function5761 ret @@ -974,7 +974,7 @@ StartFollow:: ret c ld a, c call Function57a2 - callba QueueFollowerFirstStep + farcall QueueFollowerFirstStep ret Function578b: ; 578b (1:578b) @@ -1015,7 +1015,7 @@ Function57bd: ; 57bd (1:57bd) cp $ff ret z call GetObjectStruct - callba Function5859 ; same bank + farcall Function5859 ; same bank ld a, $ff ld [wObjectFollow_Follower], a ret diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm index 1fdec4e2..8af7c726 100755 --- a/engine/overworld/player_movement.asm +++ b/engine/overworld/player_movement.asm @@ -576,7 +576,7 @@ Function10341: ; 10341 (4:4341) add e ld e, a ld bc, wPlayerSprite - callba Function7120 + farcall Function7120 jr nc, .asm_10369 call Function1036f jr c, .asm_1036c diff --git a/engine/overworld/time.asm b/engine/overworld/time.asm index 7ad065fc..ce847b18 100755 --- a/engine/overworld/time.asm +++ b/engine/overworld/time.asm @@ -148,7 +148,7 @@ CheckPokerusTick: and a jr z, .asm_118e6 ld b, a - callba ApplyPokerusTick ; same bank + farcall ApplyPokerusTick ; same bank .asm_118e6 xor a ret @@ -217,7 +217,7 @@ Function11934: ; 11934 (4:5934) ld hl, wCurHPAnimMaxHP call Function1182e call CloseSRAM - callba Function2a4f6 + farcall Function2a4f6 .asm_1195e ld a, BANK(sMysteryGiftTimer) call OpenSRAM |