diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-23 13:17:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-23 13:17:46 -0500 |
| commit | 878092004956418bfd77bfdb9fc9dd7f640f80d2 (patch) | |
| tree | 3a97e3eb15d5c545977038e67589f92158e5bf23 /battle/effect_commands.asm | |
| parent | a6656a986bf9dde51561cab090648e0117b173ad (diff) | |
| parent | 3c37bfc6fa2570a0a77c1230673910257ecf32df (diff) | |
Merge pull request #419 from roukaour/master
More reorganization and documentation
Diffstat (limited to 'battle/effect_commands.asm')
| -rw-r--r-- | battle/effect_commands.asm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index bcebbb6ca..57e4c574f 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -3191,6 +3191,8 @@ BattleCommand_BeatUp: ; 35461 ld a, [wd002] ld c, a ld a, [CurBattleMon] + ; BUG: this can desynchronize link battles + ; Change "cp [hl]" to "cp c" to fix cp [hl] ld hl, BattleMonStatus jr z, .active_mon @@ -9763,6 +9765,7 @@ BattleCommand_ThunderAccuracy: ; 37d94 CheckHiddenOpponent: ; 37daa +; BUG: This routine should account for Lock-On and Mind Reader. ld a, BATTLE_VARS_SUBSTATUS3_OPP call GetBattleVar and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND @@ -9806,7 +9809,7 @@ GetItemHeldEffect: ; 37dd0 ret z push hl - ld hl, ItemAttributes + 2 + ld hl, ItemAttributes + ITEMATTR_EFFECT dec a ld c, a ld b, 0 |