summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2018-07-27 12:06:46 -0400
committerGitHub <noreply@github.com>2018-07-27 12:06:46 -0400
commit7641ce9babf2604fdca74bd75360d53ea5b31266 (patch)
treef282f0da6683891eed5073d2312a6218069861b5 /engine
parent748d4249805c19399b3c72c0f60d0f1a6ffe43ad (diff)
parent0aac0f9cfc5bc95b378d0c33cb047f136cd361b7 (diff)
Merge pull request #545 from mid-kid/master
bugs_and_glitches fixes
Diffstat (limited to 'engine')
-rw-r--r--engine/battle/effect_commands.asm2
-rw-r--r--engine/events/bug_contest/contest_2.asm3
2 files changed, 1 insertions, 4 deletions
diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm
index bb98badca..bc578ea6f 100644
--- a/engine/battle/effect_commands.asm
+++ b/engine/battle/effect_commands.asm
@@ -6684,7 +6684,7 @@ INCLUDE "engine/battle/move_effects/future_sight.asm"
INCLUDE "engine/battle/move_effects/thunder.asm"
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
call GetBattleVar
and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
diff --git a/engine/events/bug_contest/contest_2.asm b/engine/events/bug_contest/contest_2.asm
index 9cf70a03e..ddfad8644 100644
--- a/engine/events/bug_contest/contest_2.asm
+++ b/engine/events/bug_contest/contest_2.asm
@@ -58,9 +58,6 @@ SelectRandomBugContestContestants:
CheckBugContestContestantFlag:
; 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 e, a
ld d, 0