merge with newest update

This commit is contained in:
JimB16
2015-10-26 03:26:53 +01:00
446 changed files with 17108 additions and 16475 deletions

View File

@@ -1,11 +1,11 @@
AI_SwitchOrTryItem: ; 38000
and a
ld a, [IsInBattle]
ld a, [wBattleMode]
dec a
ret z
ld a, [InLinkBattle]
ld a, [wLinkMode]
and a
ret nz
@@ -732,7 +732,7 @@ AI_Switch: ; 3846c
callba Function3d57a
xor a
ld [wd264], a
ld a, [InLinkBattle]
ld a, [wLinkMode]
and a
ret nz
scf