diff options
| -rwxr-xr-x | engine/events/overworld.asm | 8 | ||||
| -rwxr-xr-x | engine/items/inventory.asm | 12 |
2 files changed, 5 insertions, 15 deletions
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index 76e6b91..8a6d0f4 100755 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -42,9 +42,7 @@ TeleportFunction: ; 03:52db ld d, a
ld a, [wLastSpawnMapNumber]
ld e, a
- ld hl, IsSpawnPoint
- ld a, BANK(IsSpawnPoint)
- call FarCall_hl
+ callab IsSpawnPoint
jr c, .not_spawn
ld hl, .Text_CantFindDestination
call MenuTextBoxBackup
@@ -94,9 +92,7 @@ TeleportFunction: ; 03:52db call Function1fea
ld a, MAPSETUP_TELEPORT
ldh [hMapEntryMethod], a
- ld hl, Functionfcc24
- ld a, BANK(Functionfcc24)
- jp FarCall_hl
+ jpab Functionfcc24
.Text_ReturnToLastMonCenter:
db "<NULL>"
diff --git a/engine/items/inventory.asm b/engine/items/inventory.asm index 5927f6d..9c5a1ec 100755 --- a/engine/items/inventory.asm +++ b/engine/items/inventory.asm @@ -6,9 +6,7 @@ _ReceiveItem: ; 03:4AA1 call DoesHLEqualwNumBagItems
jp nz, PutItemInPocket
push hl
- ld hl, CheckItemPocket
- ld a, BANK(CheckItemPocket)
- call FarCall_hl
+ callab CheckItemPocket
ld a, [wItemAttributeParamBuffer]
dec a
ld hl, .Pockets
@@ -47,9 +45,7 @@ _TossItem: ; 03:4AE0 call DoesHLEqualwNumBagItems
jr nz, .remove_item
push hl
- ld hl, CheckItemPocket
- ld a, BANK(CheckItemPocket)
- call FarCall_hl
+ callab CheckItemPocket
ld a, [wItemAttributeParamBuffer]
dec a
ld hl, .Pockets
@@ -90,9 +86,7 @@ _CheckItem: ; 03:4B1E call DoesHLEqualwNumBagItems
jr nz, .not_bag
push hl
- ld hl, CheckItemPocket
- ld a, BANK(CheckItemPocket)
- call FarCall_hl
+ callab CheckItemPocket
ld a, [wItemAttributeParamBuffer]
dec a
ld hl, .Pockets
|