diff options
| author | yenatch <yenatch@gmail.com> | 2015-07-20 23:05:28 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-07-20 23:05:28 -0700 |
| commit | 973721491c38aa3014f5b28982227a618d2f6b59 (patch) | |
| tree | e01415064e6da53a471d75b2eb0113846650322b /misc/crystal_misc.asm | |
| parent | a3c6931fa8edd09fcea678fd8d2e9988951380de (diff) | |
| parent | 0b5471f385d3cc66bb4ae7aa4191ce3af9f50cac (diff) | |
Merge remote-tracking branch 'kanzure/master' into gfx-script
Diffstat (limited to 'misc/crystal_misc.asm')
| -rw-r--r-- | misc/crystal_misc.asm | 16 |
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) |