mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-11-16 11:27:33 -08:00
Add Fix for Lock On Status Moves
These changes should fix the status move and secondary effects not working if the opponent is flying or digging but has been locked on.
This commit is contained in:
parent
4046b41c3a
commit
0e45563497
@ -292,13 +292,18 @@ This is a bug with `CheckHiddenOpponent` in [engine/battle/effect_commands.asm](
|
||||
```asm
|
||||
CheckHiddenOpponent: ; 37daa
|
||||
; 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
|
||||
; bit SUBSTATUS_LOCK_ON, a
|
||||
; ret z
|
||||
ld a, BATTLE_VARS_SUBSTATUS3_OPP
|
||||
call GetBattleVar
|
||||
and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
|
||||
ret
|
||||
```
|
||||
|
||||
*To do:* Fix this bug.
|
||||
**Fix:** Uncomment those 4 lines to fix.
|
||||
|
||||
|
||||
## Beat Up can desynchronize link battles
|
||||
|
@ -9708,6 +9708,11 @@ BattleCommand_ThunderAccuracy: ; 37d94
|
||||
|
||||
CheckHiddenOpponent: ; 37daa
|
||||
; 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
|
||||
; bit SUBSTATUS_LOCK_ON, a
|
||||
; ret z
|
||||
ld a, BATTLE_VARS_SUBSTATUS3_OPP
|
||||
call GetBattleVar
|
||||
and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
|
||||
|
Loading…
Reference in New Issue
Block a user