summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorIIMarckus <iimarckus@gmail.com>2012-09-10 21:36:50 -0600
committerIIMarckus <iimarckus@gmail.com>2012-09-10 21:36:50 -0600
commit53926402f8ca40a63bc7243755aba10fedbff912 (patch)
tree95823204320ec2fdb085160bfba0933290ca2e47 /main.asm
parent3501a0be8cfda7505743051668451b17a0b5337d (diff)
Confirmed: this RAM location represents link battle.
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/main.asm b/main.asm
index aac83ff12..d65fdf9c9 100644
--- a/main.asm
+++ b/main.asm
@@ -376,9 +376,9 @@ Char5D:
ld de, $c616
jr .asm_126a ; 0x1219 $4f
push de
- ld a, [$c2dc]
+ ld a, [InLinkBattle]
and a
- jr nz, .asm_124d ; 0x1220 $2b
+ jr nz, .linkbattle
ld a, [$d233]
cp $9
jr z, .asm_1248 ; 0x1227 $1f
@@ -400,7 +400,7 @@ Char5D:
.asm_1248
ld de, $d493
jr .asm_126a ; 0x124b $1d
-.asm_124d
+.linkbattle
ld de, $c656
jr .asm_126a ; 0x1250 $18
push de
@@ -5697,9 +5697,9 @@ INCBIN "baserom.gbc",$2C41a,$2ee8f - $2C41a
jr .done
.othertrainer
- ld a, [$c2dc]
+ ld a, [InLinkBattle]
and a
- jr nz, .linkbattle ; XXX link battle?
+ jr nz, .linkbattle
ld a, BANK(RegionCheck)
ld hl, RegionCheck
rst $8