diff options
author | Bryan Bishop <kanzure@gmail.com> | 2014-06-27 21:33:08 -0500 |
---|---|---|
committer | Bryan Bishop <kanzure@gmail.com> | 2014-06-27 21:33:08 -0500 |
commit | 1ecfe6bd23bb9b4e1886342c082bd5c3a108abbb (patch) | |
tree | 8190d5b11ebec4505c5494baf74b339ae9c82078 /battle/effects/nightmare.asm | |
parent | 1fbe471b74908be6e89777857bf7407ef427225b (diff) | |
parent | d6fbdfb8decf6231d6b43fbfcba63f9ce60308dc (diff) |
Merge pull request #256 from yenatch/master
Fix predefs and battle code.
Diffstat (limited to 'battle/effects/nightmare.asm')
-rw-r--r-- | battle/effects/nightmare.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/battle/effects/nightmare.asm b/battle/effects/nightmare.asm index cd3210cab..01f17ff71 100644 --- a/battle/effects/nightmare.asm +++ b/battle/effects/nightmare.asm @@ -14,14 +14,14 @@ BattleCommand52: ; 37536 ; Only works on a sleeping opponent. ld a, BATTLE_VARS_STATUS_OPP - call _GetBattleVar + call GetBattleVarAddr and SLP jr z, .failed ; Bail if the opponent is already having a nightmare. ld a, BATTLE_VARS_SUBSTATUS1_OPP - call _GetBattleVar + call GetBattleVarAddr bit SUBSTATUS_NIGHTMARE, [hl] jr nz, .failed |