diff options
| author | libjet <libj3t@gmail.com> | 2019-12-11 01:38:36 +0000 |
|---|---|---|
| committer | libjet <libj3t@gmail.com> | 2019-12-11 01:38:36 +0000 |
| commit | 93872e920e9c82e1299a7f674cba5b56397b359d (patch) | |
| tree | ad89e14c568a891b702b07e1b44ac25ab253ad73 /engine/overworld/map_objects.asm | |
| parent | cc8fc02a9467307f1494946fd08b4e57d4ffdac5 (diff) | |
Updated macros/scripts/text.asm and cleaned up macros.asm
Diffstat (limited to 'engine/overworld/map_objects.asm')
| -rwxr-xr-x | engine/overworld/map_objects.asm | 14 |
1 files changed, 7 insertions, 7 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 |