* last callab/callba macros

engine/scripting.asm

@@ -201,7 +201,7 @@ Script_3callasm: ; 0x96e17
 	call GetScriptByte
 	ld h, a
 	ld a, b
-	rst $8
+	rst FarCall
 	ret
 ; 0x96e26
 
@@ -233,7 +233,7 @@ Script_2ptcallasm: ; 0x96e35
 	ld h, [hl]
 	ld l, a
 	ld a, b
-	rst $8
+	rst FarCall
 	ret
 ; 0x96e45
 
@@ -435,7 +435,7 @@ Script_interpretmenu2: ; 0x96f30
 
 	ld a, [ScriptBank]
 	ld hl, $1d81
-	rst $8
+	rst FarCall
 	ld a, [$cfa9]
 	jr nc, .asm_96f3d ; 0x96f3a $1
 	xor a
@@ -449,7 +449,7 @@ Script_interpretmenu: ; 0x96f41
 
 	ld a, [ScriptBank]
 	ld hl, $202a
-	rst $8
+	rst FarCall
 	ld a, [$cf88]
 	jr nc, .asm_96f4e ; 0x96f4b $1
 	xor a
@@ -2200,7 +2200,7 @@ Script_stringtotext: ; 0x9777d
 	ld d, a
 	ld a, [ScriptBank]
 	ld hl, $30d6
-	rst $8
+	rst FarCall
 	ld de, StringBuffer2
 	jp Unknown_976c0
 ; 0x97792

items/item_effects.asm

@@ -1170,9 +1170,7 @@ Functionf030: ; f030 (3:7030)
 	res 7, [hl]
 .asm_f04f
 	push bc
-	ld a, BANK(Function0x365d7)
+	callba Function0x365d7
-	ld hl, Function0x365d7
-	rst $8 ;  ; indirect jump to Function0x365d7 (365d7 (d:65d7))
 	pop bc
 	ret
 
@@ -1410,27 +1408,15 @@ Functionf20b: ; f20b (3:720b)
 
 ; known jump sources: f215 (3:7215), f41f (3:741f)
 Functionf21c: ; f21c (3:721c)
-	ld a, BANK(Function5004f)
+	callba Function5004f
-	ld hl, Function5004f
+	callba Function50405
-	rst $8 ;  ; indirect jump to Function5004f (5004f (14:404f))
+	callba Function503e0
-	ld a, BANK(Function50405)
+	callba WritePartyMenuTilemap
-	ld hl, Function50405
+	callba PrintPartyMenuText
-	rst $8 ;  ; indirect jump to Function50405 (50405 (14:4405))
-	ld a, BANK(Function503e0)
-	ld hl, Function503e0
-	rst $8 ;  ; indirect jump to Function503e0 (503e0 (14:43e0))
-	ld a, BANK(WritePartyMenuTilemap)
-	ld hl, WritePartyMenuTilemap
-	rst $8 ;  ; indirect jump to WritePartyMenuTilemap (5005f (14:405f))
-	ld a, BANK(PrintPartyMenuText)
-	ld hl, PrintPartyMenuText
-	rst $8 ;  ; indirect jump to PrintPartyMenuText (5049a (14:449a))
 	call WaitBGMap
 	call Function32f9
 	call DelayFrame
-	ld a, BANK(PartyMenuSelect)
+	callba PartyMenuSelect
-	ld hl, PartyMenuSelect
-	rst $8 ;  ; indirect jump to PartyMenuSelect (50457 (14:4457))
 	ret
 
 ; known jump sources: ef6d (3:6f6d), f28a (3:728a), f40d (3:740d)
@@ -1443,12 +1429,8 @@ Functionf24a: ; f24a (3:724a)
 	push hl
 	push de
 	push bc
-	ld a, BANK(WritePartyMenuTilemap)
+	callba WritePartyMenuTilemap
-	ld hl, WritePartyMenuTilemap
+	callba Function50566
-	rst $8 ;  ; indirect jump to WritePartyMenuTilemap (5005f (14:405f))
-	ld a, BANK(Function50566)
-	ld hl, Function50566
-	rst $8 ;  ; indirect jump to Function50566 (50566 (14:4566))
 	call WaitBGMap
 	call Function32f9
 	call DelayFrame