diff options
| author | JimB16 <f1@jimb.de> | 2015-10-26 03:26:53 +0100 |
|---|---|---|
| committer | JimB16 <f1@jimb.de> | 2015-10-26 03:26:53 +0100 |
| commit | 9a9cb38e39c991e102a1c6da7e8e16b2a1c61e07 (patch) | |
| tree | 46c064628b3d8015da22d6396b3c711e80646745 /home/serial.asm | |
| parent | 3b9a3cc3bee8934e45f5e4d3fd9704b3fa619560 (diff) | |
| parent | 0d17d4a75866d053f5e0b48c66deb2508071d98b (diff) | |
merge with newest update
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 8b848bbe2..1ebf00389 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 |