summaryrefslogtreecommitdiff
path: root/engine/games
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-01 13:13:49 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-01 13:13:49 -0400
commitfce6243b432d1df1b4ab244023be738a54dbe8f3 (patch)
treec93b0989254b15e86aa0ae07ab255d5bb5fd0afb /engine/games
parente171c84c2990df2c1a3773885297089869a0fd58 (diff)
Identify more labels, and use the jumptable macro when possible
Diffstat (limited to 'engine/games')
-rw-r--r--engine/games/card_flip.asm11
-rw-r--r--engine/games/unown_puzzle.asm11
2 files changed, 2 insertions, 20 deletions
diff --git a/engine/games/card_flip.asm b/engine/games/card_flip.asm
index 499d8a1af..93929fbde 100644
--- a/engine/games/card_flip.asm
+++ b/engine/games/card_flip.asm
@@ -75,16 +75,7 @@ _CardFlip:
ret
.CardFlip:
- 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:
dw .AskPlayWithThree
diff --git a/engine/games/unown_puzzle.asm b/engine/games/unown_puzzle.asm
index 93305dab9..871cb4541 100644
--- a/engine/games/unown_puzzle.asm
+++ b/engine/games/unown_puzzle.asm
@@ -169,16 +169,7 @@ PlaceStartCancelBoxBorder:
ret
UnownPuzzleJumptable:
- 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:
dw .Function