merge with newest update

2015-10-26 03:26:53 +01:00
parent 3b9a3cc3be 0d17d4a758
commit 9a9cb38e39
446 changed files with 17108 additions and 16475 deletions
--- 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