Identify more labels, and use the jumptable macro when possible

This commit is contained in:
Rangi
2020-07-01 13:13:49 -04:00
parent e171c84c29
commit fce6243b43
26 changed files with 41 additions and 253 deletions

View File

@@ -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

View File

@@ -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