summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main.asm10
-rw-r--r--wram.asm5
2 files changed, 10 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
diff --git a/wram.asm b/wram.asm
index 11e40ccb1..8764fedcf 100644
--- a/wram.asm
+++ b/wram.asm
@@ -1,3 +1,8 @@
+SECTION "linkbattle",BSS[$c2dc]
+
+InLinkBattle: ; 0xc2dc
+ ds 1 ; nonzero when in a link battle
+
SECTION "BattleMons",BSS[$c62a]
BattleMonSpecies: ; c62a