summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2016-04-09 18:13:37 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2016-04-09 18:13:37 -0400
commit3caf9a43e308af32ba23fd672ba662d2ea4c091e (patch)
tree92d28ef34fbeeb6fddf0ef404db3de7b535305ca /main.asm
parent9ca431b4f9706a3bbbbcfb03e2bab3360a5258a2 (diff)
Some Bank3F Pikachu Emotions disassembling and partial documentation.
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/main.asm b/main.asm
index 13ee5769..5b4c41b3 100755
--- a/main.asm
+++ b/main.asm
@@ -2476,7 +2476,7 @@ ApplyOutOfBattlePoisonDamage: ; c3de (3:43de)
ld a, [wd730]
add a
jp c, .noBlackOut ; no black out if joypad states are being simulated
- ld a, [wd493]
+ ld a, [wPreventBlackout]
bit 7, a
jp nz, .noBlackOut
ld a, [wd72e]