jpab/jpba macros

4 files changed, 4 insertions, 12 deletions

diff --git a/scripts/celadonmartelevator.asm b/scripts/celadonmartelevator.asm
index a0aa576d..c8ff1a6d 100755
--- a/scripts/celadonmartelevator.asm
+++ b/scripts/celadonmartelevator.asm
@@ -55,9 +55,7 @@ CeldaonMartElevatorWarpMaps: ; 4864a (12:464a)
 	db $02, CELADON_MART_5
 
 CeladonMartElevatorScript_48654: ; 48654 (12:4654)
-	ld b, BANK(ShakeElevator)
-	ld hl, ShakeElevator
-	jp Bankswitch
+	jpba ShakeElevator
 
 CeladonMartElevatorTextPointers: ; 4865c (12:465c)
 	dw CeladonMartElevatorText1
diff --git a/scripts/celadonmartroof.asm b/scripts/celadonmartroof.asm
index b0afbee0..f83e466d 100755
--- a/scripts/celadonmartroof.asm
+++ b/scripts/celadonmartroof.asm
@@ -135,9 +135,7 @@ CeladonMartRoofScript_4840c: ; 4840c (12:440c)
 	jp PrintText
 
 RemoveItemByIDBank12: ; 484e6 (12:44e6)
-	ld b, BANK(RemoveItemByID)
-	ld hl, RemoveItemByID
-	jp Bankswitch
+	jpba RemoveItemByID
 
 CeladonMartRoofText_484ee: ; 484ee (12:44ee)
 	TX_FAR _CeladonMartRoofText_484ee
diff --git a/scripts/lab4.asm b/scripts/lab4.asm
index 6d4bd923..21fee0c6 100755
--- a/scripts/lab4.asm
+++ b/scripts/lab4.asm
@@ -112,6 +112,4 @@ Lab4Text2: ; 75dda (1d:5dda)
 	jp TextScriptEnd
 
 LoadFossilItemAndMonNameBank1D: ; 75de8 (1d:5de8)
-	ld b, BANK(LoadFossilItemAndMonName)
-	ld hl, LoadFossilItemAndMonName
-	jp Bankswitch
+	jpba LoadFossilItemAndMonName
diff --git a/scripts/viridiangym.asm b/scripts/viridiangym.asm
index 7a577095..40484d21 100755
--- a/scripts/viridiangym.asm
+++ b/scripts/viridiangym.asm
@@ -128,9 +128,7 @@ ViridianGymScript4: ; 7496b (1d:496b)
 	ld [W_CURMAPSCRIPT], a
 	ret
 .asm_74980
-	ld b, BANK(LoadSpinnerArrowTiles)
-	ld hl, LoadSpinnerArrowTiles
-	jp Bankswitch
+	jpba LoadSpinnerArrowTiles
 
 ViridianGymScript3: ; 74988 (1d:4988)
 	ld a, [W_ISINBATTLE]