summaryrefslogtreecommitdiff
path: root/misc/crystal_misc.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2015-07-21 02:04:38 -0400
committeryenatch <yenatch@gmail.com>2015-07-21 02:04:38 -0400
commit0b5471f385d3cc66bb4ae7aa4191ce3af9f50cac (patch)
tree61cb1021673d8a9b7b1cdddc64d90053a8476e8b /misc/crystal_misc.asm
parent006fc875971c92f2249f47b5fd120c5df76c6883 (diff)
parentd5ddd9e54ec2422d6f1cd7c561c1750512d0a81d (diff)
Merge pull request #302 from PikalaxALT/more_enum
More enum
Diffstat (limited to 'misc/crystal_misc.asm')
-rw-r--r--misc/crystal_misc.asm16
1 files changed, 9 insertions, 7 deletions
diff --git a/misc/crystal_misc.asm b/misc/crystal_misc.asm
index 676fe7bbb..9dbbea79c 100644
--- a/misc/crystal_misc.asm
+++ b/misc/crystal_misc.asm
@@ -249,7 +249,7 @@ Function17a81a: ; 17a81a (5e:681a)
ld a, [hJoyPressed] ; $ff00+$a7
and $3
ret z
- call Function1c07
+ call ExitMenu
call Function17ac1d
call Function17ac2a
ld hl, $d088
@@ -552,16 +552,16 @@ Function17aa22: ; 17aa22 (5e:6a22)
push de
ld a, $3
call Function17aae0
+rept 3
add a
- add a
- add a
+endr
add $0
push af
ld a, $4
call Function17aae0
+rept 3
add a
- add a
- add a
+endr
add $8
ld c, a
pop af
@@ -658,13 +658,15 @@ Function17aaa9: ; 17aaa9 (5e:6aa9)
Function17aac3: ; 17aac3 (5e:6ac3)
ld a, $b
push hl
+rept 2
ld [hli], a
- ld [hli], a
+endr
pop hl
ld de, $14
add hl, de
+rept 2
ld [hli], a
- ld [hli], a
+endr
ret
Function17aad0: ; 17aad0 (5e:6ad0)