diff options
| author | yenatch <yenatch@gmail.com> | 2015-10-26 01:34:08 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-10-26 01:34:08 -0400 |
| commit | e638cdb74cabff705d4879568e74b8ed43da64e1 (patch) | |
| tree | 02869ee6058c1b7d00d554af86e6eb6b197cd660 /home/serial.asm | |
| parent | b8da3874bbc06e858b7b2d7a602fe33baa046e93 (diff) | |
| parent | 0d17d4a75866d053f5e0b48c66deb2508071d98b (diff) | |
Merge remote-tracking branch 'origin/master' into pngs-kind-of
Conflicts:
INSTALL.md
Diffstat (limited to 'home/serial.asm')
| -rw-r--r-- | home/serial.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/home/serial.asm b/home/serial.asm index 302630cc7..d5df52a23 100644 --- a/home/serial.asm +++ b/home/serial.asm @@ -15,7 +15,7 @@ Serial:: ; 6ef jr nz, .asm_721 ld a, [$ffcb] - inc a + inc a ; is it equal to -1? jr z, .asm_726 ld a, [rSB] @@ -334,7 +334,7 @@ Function87d:: ; 87d Function8c1:: ; 8c1 push bc ld b, $60 - ld a, [InLinkBattle] + ld a, [wLinkMode] cp $1 jr z, .asm_8d7 ld b, $60 @@ -391,7 +391,7 @@ Function908:: ; 908 ; 919 Function919:: ; 919 - ld a, [InLinkBattle] + ld a, [wLinkMode] and a ret nz ld a, $2 |