Reflect Rangi's suggestion

This commit is contained in:
i0brendan0 2018-03-01 04:06:46 -06:00 committed by GitHub
parent 82ffb584c8
commit 51bbfee891
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -293,19 +293,25 @@ This is a bug with `CheckHiddenOpponent` in [engine/battle/effect_commands.asm](
```asm ```asm
CheckHiddenOpponent: ; 37daa CheckHiddenOpponent: ; 37daa
; BUG: This routine should account for Lock-On and Mind Reader. ; BUG: This routine should account for Lock-On and Mind Reader.
; Uncomment the lines below to fix.
; ld a, BATTLE_VARS_SUBSTATUS5_OPP
; call GetBattleVar
; and 1 << SUBSTATUS_LOCK_ON
; ret z
ld a, BATTLE_VARS_SUBSTATUS3_OPP ld a, BATTLE_VARS_SUBSTATUS3_OPP
call GetBattleVar call GetBattleVar
and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
ret ret
``` ```
**Fix:** Uncomment those 4 lines to fix. Fix:
```asm
CheckHiddenOpponent: ; 37daa
ld a, BATTLE_VARS_SUBSTATUS5_OPP
call GetBattleVar
and 1 << SUBSTATUS_LOCK_ON
ret z
ld a, BATTLE_VARS_SUBSTATUS3_OPP
call GetBattleVar
and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
ret
```
## Beat Up can desynchronize link battles ## Beat Up can desynchronize link battles