Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokecrystal

Browse Source 
# Conflicts:
#	maps/KrissHouse2F.asm
This commit is contained in:
Rangi
2018-02-15 21:21:58 -05:00
parent 62d6f72bb3 4046b41c3a
commit 612fd7cb96
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
home/serial.asm
View File

@@ -200,7 +200,7 @@ Serial_ExchangeByte:: ; 78a
cp SERIAL_NO_DATA_BYTE
ret nz
call CheckwLinkTimeoutFramesNonzero
jr z, .wLinkTimeoutFrames_zero
jr z, .linkTimeoutFrames_zero
push hl
ld hl, wLinkTimeoutFrames + 1
ld a, [hl]
@@ -215,7 +215,7 @@ Serial_ExchangeByte:: ; 78a
call CheckwLinkTimeoutFramesNonzero
jr z, SerialDisconnected
.wLinkTimeoutFrames_zero
.linkTimeoutFrames_zero
ld a, [rIE]
and (1 << SERIAL) | (1 << TIMER) | (1 << LCD_STAT) | (1 << VBLANK)
cp 1 << SERIAL