Identify more labels, and use the jumptable macro when possible

2 files changed, 2 insertions, 20 deletions

diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm
index 2c7a9c68a..b923f4862 100644
--- a/engine/movie/intro.asm
+++ b/engine/movie/intro.asm
@@ -384,16 +384,7 @@ CrystalIntro:
 	ret
 
 IntroSceneJumper:
-	ld a, [wJumptableIndex]
-	ld e, a
-	ld d, 0
-	ld hl, IntroScenes
-	add hl, de
-	add hl, de
-	ld a, [hli]
-	ld h, [hl]
-	ld l, a
-	jp hl
+	jumptable IntroScenes, wJumptableIndex
 
 IntroScenes:
 	dw IntroScene1
diff --git a/engine/movie/trade_animation.asm b/engine/movie/trade_animation.asm
index 4295ce282..32ab0fa8c 100644
--- a/engine/movie/trade_animation.asm
+++ b/engine/movie/trade_animation.asm
@@ -228,16 +228,7 @@ DoTradeAnimation:
 	ret
 
 .DoTradeAnimCommand:
-	ld a, [wJumptableIndex]
-	ld e, a
-	ld d, 0
-	ld hl, .JumpTable
-	add hl, de
-	add hl, de
-	ld a, [hli]
-	ld h, [hl]
-	ld l, a
-	jp hl
+	jumptable .JumpTable, wJumptableIndex
 
 .JumpTable:
 ; entries correspond to macros/scripts/trade_anims.asm enumeration