diff options
| author | YamaArashi <shadow962@live.com> | 2015-02-07 02:43:08 -0800 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-02-07 02:43:08 -0800 |
| commit | 3fdb8a0d8995746d5605136ece384516338489b0 (patch) | |
| tree | 214030fb5b6ec943cdcb2ba84e622fba0ad3fb8f /engine/battle/e.asm | |
| parent | add constants for volatile statuses and more battle labels/commentary/constants (diff) | |
| download | pokeyellow-3fdb8a0d8995746d5605136ece384516338489b0.tar.gz pokeyellow-3fdb8a0d8995746d5605136ece384516338489b0.tar.xz pokeyellow-3fdb8a0d8995746d5605136ece384516338489b0.zip | |
serial/trade/misc
Diffstat (limited to 'engine/battle/e.asm')
| -rwxr-xr-x | engine/battle/e.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/battle/e.asm b/engine/battle/e.asm index dd227be7..9f93baa6 100755 --- a/engine/battle/e.asm +++ b/engine/battle/e.asm @@ -700,7 +700,7 @@ Func_39c37: ; 39c37 (e:5c37) ReadTrainer: ; 39c53 (e:5c53) ; don't change any moves in a link battle - ld a,[W_ISLINKBATTLE] + ld a,[wLinkState] and a ret nz @@ -872,8 +872,8 @@ TrainerAI: ; 3a52e (e:652e) ld a,[W_ISINBATTLE] dec a ret z ; if not a trainer, we're done here - ld a,[W_ISLINKBATTLE] - cp 4 + ld a,[wLinkState] + cp LINK_STATE_BATTLING ret z ld a,[W_TRAINERCLASS] ; what trainer class is this? dec a @@ -1230,8 +1230,8 @@ SwitchEnemyMon: ; 3a74b (e:674b) xor a ld [wd11d],a - ld a,[W_ISLINKBATTLE] - cp 4 + ld a,[wLinkState] + cp LINK_STATE_BATTLING ret z scf ret |