aboutsummaryrefslogtreecommitdiffstats
path: root/engine/events/black_out.asm
diff options
context:
space:
mode:
Diffstat (limited to 'engine/events/black_out.asm')
-rw-r--r--engine/events/black_out.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/events/black_out.asm b/engine/events/black_out.asm
index 16d2081f..5b0459e2 100644
--- a/engine/events/black_out.asm
+++ b/engine/events/black_out.asm
@@ -8,7 +8,7 @@ ResetStatusAndHalveMoneyOnBlackout::
ld [wNPCMovementScriptFunctionNum], a
ldh [hJoyHeld], a
ld [wNPCMovementScriptPointerTableNum], a
- ld [wFlags_0xcd60], a
+ ld [wMiscFlags], a
ldh [hMoney], a
ldh [hMoney + 1], a
@@ -37,10 +37,10 @@ ResetStatusAndHalveMoneyOnBlackout::
ld [wPlayerMoney + 2], a
.lostmoney
- ld hl, wd732
- set 2, [hl]
- res 3, [hl]
- set 6, [hl]
- ld a, %11111111
+ ld hl, wStatusFlags6
+ set BIT_FLY_OR_DUNGEON_WARP, [hl]
+ res BIT_FLY_WARP, [hl]
+ set BIT_ESCAPE_WARP, [hl]
+ ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
ld [wJoyIgnore], a
predef_jump HealParty