mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-11-16 11:27:33 -08:00
Merge branch 'master' of https://github.com/pret/pokecrystal
This commit is contained in:
commit
54d507cf61
File diff suppressed because it is too large
Load Diff
@ -6684,7 +6684,7 @@ INCLUDE "engine/battle/move_effects/future_sight.asm"
|
|||||||
INCLUDE "engine/battle/move_effects/thunder.asm"
|
INCLUDE "engine/battle/move_effects/thunder.asm"
|
||||||
|
|
||||||
CheckHiddenOpponent:
|
CheckHiddenOpponent:
|
||||||
; BUG: This routine should account for Lock-On and Mind Reader.
|
; BUG: This routine is completely redundant and introduces a bug, since BattleCommand_CheckHit does these checks properly.
|
||||||
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
|
||||||
|
@ -58,9 +58,6 @@ SelectRandomBugContestContestants:
|
|||||||
CheckBugContestContestantFlag:
|
CheckBugContestContestantFlag:
|
||||||
; Checks the flag of the Bug Catching Contestant whose index is loaded in a.
|
; Checks the flag of the Bug Catching Contestant whose index is loaded in a.
|
||||||
|
|
||||||
; Bug: If a >= NUM_BUG_CONTESTANTS when this is called,
|
|
||||||
; it will read beyond the table.
|
|
||||||
|
|
||||||
ld hl, BugCatchingContestantEventFlagTable
|
ld hl, BugCatchingContestantEventFlagTable
|
||||||
ld e, a
|
ld e, a
|
||||||
ld d, 0
|
ld d, 0
|
||||||
|
Loading…
Reference in New Issue
Block a user