From 02bd91b7076165653a900a8e39c12a92a9bd2976 Mon Sep 17 00:00:00 2001
From: YamaArashi <shadow962@live.com>
Date: Sun, 19 Jul 2015 11:56:13 -0700
Subject: jpab/jpba macros

---
 engine/battle/moveEffects/focus_energy_effect.asm |  4 +---
 engine/battle/moveEffects/mist_effect.asm         |  4 +---
 engine/battle/moveEffects/paralyze_effect.asm     | 12 +++---------
 engine/battle/moveEffects/substitute_effect.asm   |  4 +---
 4 files changed, 6 insertions(+), 18 deletions(-)

(limited to 'engine/battle/moveEffects')

diff --git a/engine/battle/moveEffects/focus_energy_effect.asm b/engine/battle/moveEffects/focus_energy_effect.asm
index 20a0c07e..b8a783e4 100644
--- a/engine/battle/moveEffects/focus_energy_effect.asm
+++ b/engine/battle/moveEffects/focus_energy_effect.asm
@@ -14,9 +14,7 @@ FocusEnergyEffect_: ; 27f86 (9:7f86)
 .alreadyUsing
 	ld c, 50
 	call DelayFrames
-	ld hl, PrintButItFailedText_
-	ld b, BANK(PrintButItFailedText_)
-	jp Bankswitch
+	jpab PrintButItFailedText_
 
 GettingPumpedText: ; 27fb3 (9:7fb3)
 	db $0a
diff --git a/engine/battle/moveEffects/mist_effect.asm b/engine/battle/moveEffects/mist_effect.asm
index 8394eec1..1f8e40b0 100644
--- a/engine/battle/moveEffects/mist_effect.asm
+++ b/engine/battle/moveEffects/mist_effect.asm
@@ -12,9 +12,7 @@ MistEffect_: ; 33f2b (c:7f2b)
 	ld hl, ShroudedInMistText
 	jp PrintText
 .mistAlreadyInUse
-	ld hl, PrintButItFailedText_
-	ld b, BANK(PrintButItFailedText_)
-	jp Bankswitch
+	jpab PrintButItFailedText_
 
 ShroudedInMistText: ; 33f52 (c:7f52)
 	TX_FAR _ShroudedInMistText
diff --git a/engine/battle/moveEffects/paralyze_effect.asm b/engine/battle/moveEffects/paralyze_effect.asm
index b88e6479..658b0c50 100644
--- a/engine/battle/moveEffects/paralyze_effect.asm
+++ b/engine/battle/moveEffects/paralyze_effect.asm
@@ -36,18 +36,12 @@ ParalyzeEffect_: ; 52601 (14:6601)
 	ld c, 30
 	call DelayFrames
 	callab PlayCurrentMoveAnimation
-	ld hl, PrintMayNotAttackText
-	ld b, BANK(PrintMayNotAttackText)
-	jp Bankswitch
+	jpab PrintMayNotAttackText
 .didntAffect
 	ld c, 50
 	call DelayFrames
-	ld hl, PrintDidntAffectText
-	ld b, BANK(PrintDidntAffectText)
-	jp Bankswitch
+	jpab PrintDidntAffectText
 .doesntAffect
 	ld c, 50
 	call DelayFrames
-	ld hl, PrintDoesntAffectText
-	ld b, BANK(PrintDoesntAffectText)
-	jp Bankswitch
+	jpab PrintDoesntAffectText
diff --git a/engine/battle/moveEffects/substitute_effect.asm b/engine/battle/moveEffects/substitute_effect.asm
index 444c755b..c72fffbe 100644
--- a/engine/battle/moveEffects/substitute_effect.asm
+++ b/engine/battle/moveEffects/substitute_effect.asm
@@ -55,9 +55,7 @@ SubstituteEffect_: ; 17dad (5:7dad)
 	call Bankswitch ; jump to routine depending on animation setting
 	ld hl, SubstituteText
 	call PrintText
-	ld hl, DrawHUDsAndHPBars
-	ld b, BANK(DrawHUDsAndHPBars)
-	jp Bankswitch
+	jpab DrawHUDsAndHPBars
 .alreadyHasSubstitute
 	ld hl, HasSubstituteText
 	jr .printText
-- 
cgit v1.3.1-sl0p