aboutsummaryrefslogtreecommitdiffstats
path: root/engine/battle/1c.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2015-02-07 02:43:08 -0800
committerYamaArashi <shadow962@live.com>2015-02-07 02:43:08 -0800
commit3fdb8a0d8995746d5605136ece384516338489b0 (patch)
tree214030fb5b6ec943cdcb2ba84e622fba0ad3fb8f /engine/battle/1c.asm
parentadd constants for volatile statuses and more battle labels/commentary/constants (diff)
downloadpokeyellow-3fdb8a0d8995746d5605136ece384516338489b0.tar.gz
pokeyellow-3fdb8a0d8995746d5605136ece384516338489b0.tar.xz
pokeyellow-3fdb8a0d8995746d5605136ece384516338489b0.zip
serial/trade/misc
Diffstat (limited to 'engine/battle/1c.asm')
-rwxr-xr-xengine/battle/1c.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/1c.asm b/engine/battle/1c.asm
index bceeac2b..b905777b 100755
--- a/engine/battle/1c.asm
+++ b/engine/battle/1c.asm
@@ -127,8 +127,8 @@ BattleTransition: ; 7096d (1c:496d)
call Delay3
call LoadBattleTransitionTile
ld bc, $0
- ld a, [W_ISLINKBATTLE]
- cp $4
+ ld a, [wLinkState]
+ cp LINK_STATE_BATTLING
jr z, .linkBattle
call GetBattleTransitionID_WildOrTrainer
call GetBattleTransitionID_CompareLevels