summaryrefslogtreecommitdiff
path: root/misc/crystal_misc.asm
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-10-16 13:35:43 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2015-10-16 13:35:43 -0400
commit4fa6c6daa46935c7580a60a22bd9216414246dc0 (patch)
treeac6d9963a55214087d9b81b510409b6fdffcb164 /misc/crystal_misc.asm
parent1e2ff967aa11ed0bcdd1dd069bde67724d3851c2 (diff)
Split up bank 2; other relabelings
Diffstat (limited to 'misc/crystal_misc.asm')
-rw-r--r--misc/crystal_misc.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/misc/crystal_misc.asm b/misc/crystal_misc.asm
index ac0800a85..4fe1476ff 100644
--- a/misc/crystal_misc.asm
+++ b/misc/crystal_misc.asm
@@ -151,13 +151,13 @@ Function17a770: ; 17a770 (5e:6770)
ret
Function17a781: ; 17a781 (5e:6781)
- ld a, [$ffaa]
+ ld a, [hInMenu]
push af
ld a, $1
- ld [$ffaa], a
+ ld [hInMenu], a
call Functiona57
pop af
- ld [$ffaa], a
+ ld [hInMenu], a
ret
Function17a78f: ; 17a78f (5e:678f)
@@ -261,7 +261,7 @@ Function17a81a: ; 17a81a (5e:681a)
ret
Function17a83c: ; 17a83c (5e:683c)
- ld a, [$ffa9]
+ ld a, [hJoyLast]
and $f0
ld c, a
ld a, [hJoyPressed] ; $ff00+$a7