diff options
| author | yenatch <yenatch@gmail.com> | 2015-11-13 00:44:06 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-11-13 00:44:06 -0500 |
| commit | 9c5473e965520f672640daf4ee76622640e0de15 (patch) | |
| tree | 33d513a05a026cb6c094eb7ee73ad52ee36d0888 /misc/crystal_misc.asm | |
| parent | 1c1fe276ca59726bb0008c60006c6b48cd093573 (diff) | |
| parent | 40802da3cf27a453f62c8c4b712e876b06a9d834 (diff) | |
Merge pull request #326 from PikalaxALT/master
Reopen #325
Diffstat (limited to 'misc/crystal_misc.asm')
| -rw-r--r-- | misc/crystal_misc.asm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/misc/crystal_misc.asm b/misc/crystal_misc.asm index cb152cefd..489ec77ee 100644 --- a/misc/crystal_misc.asm +++ b/misc/crystal_misc.asm @@ -144,14 +144,14 @@ Function17a751: ; 17a751 (5e:6751) ret Function17a770: ; 17a770 (5e:6770) - ld a, [hOAMUpdate] ; $ff00+$d8 + ld a, [hOAMUpdate] push af ld a, $1 - ld [hOAMUpdate], a ; $ff00+$d8 + ld [hOAMUpdate], a call HideSprites call Function17a9cb pop af - ld [hOAMUpdate], a ; $ff00+$d8 + ld [hOAMUpdate], a ret Function17a781: ; 17a781 (5e:6781) @@ -251,7 +251,7 @@ Function17a7ff: ; 17a7ff (5e:67ff) Function17a81a: ; 17a81a (5e:681a) call IsSFXPlaying ret nc - ld a, [hJoyPressed] ; $ff00+$a7 + ld a, [hJoyPressed] and $3 ret z call ExitMenu @@ -269,7 +269,7 @@ Function17a83c: ; 17a83c (5e:683c) ld a, [hJoyLast] and $f0 ld c, a - ld a, [hJoyPressed] ; $ff00+$a7 + ld a, [hJoyPressed] and $b or c ld c, a @@ -430,7 +430,7 @@ Function17a91e: ; 17a91e (5e:691e) ret .asm_17a92c - call LoadMenuDataHeader_0x1d75 + call LoadStandardMenuDataHeader call Function17a99e ld hl, $d088 set 7, [hl] @@ -741,10 +741,10 @@ Unknown_17aaf7: ; 17aaf7 ; 17aba0 Function17aba0: ; 17aba0 (5e:6ba0) - ld a, [rVBK] ; $ff00+$4f + ld a, [rVBK] push af ld a, $1 - ld [rVBK], a ; $ff00+$4f + ld [rVBK], a ld hl, VTiles5 tile $00 ld de, GFX_17afa5 @@ -752,7 +752,7 @@ Function17aba0: ; 17aba0 (5e:6ba0) call Get2bpp pop af - ld [rVBK], a ; $ff00+$4f + ld [rVBK], a ld hl, VTiles0 tile $00 ld de, GFX_17afa5 + $4c0 @@ -766,13 +766,13 @@ Function17aba0: ; 17aba0 (5e:6ba0) ret Function17abcf: ; 17abcf (5e:6bcf) - ld a, [rSVBK] ; $ff00+$70 + ld a, [rSVBK] push af - ld a, BANK(Unkn1Pals) - ld [rSVBK], a ; $ff00+$70 + ld a, BANK(wMapPals) + ld [rSVBK], a ld hl, Palette_17ac55 - ld de, Unkn1Pals ; $d000 + ld de, wMapPals ; $d000 ld bc, $30 call CopyBytes @@ -793,7 +793,7 @@ Function17abcf: ; 17abcf (5e:6bcf) call FarCopyBytes pop af - ld [rSVBK], a ; $ff00+$70 + ld [rSVBK], a ret Function17ac0c: ; 17ac0c (5e:6c0c) |