aboutsummaryrefslogtreecommitdiffstats
path: root/engine/events/black_out.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-07 19:48:22 -0400
committerGitHub <noreply@github.com>2020-07-07 19:48:22 -0400
commit9571c550b6a0dcb3a4f54513c881661a87271024 (patch)
treed73507228a57e4f3cece2fb93fe7df3a9439553f /engine/events/black_out.asm
parentMerge pull request #262 from Rangi42/master (diff)
parentMove all code out of home.asm into home/ (diff)
downloadpokeyellow-9571c550b6a0dcb3a4f54513c881661a87271024.tar.gz
pokeyellow-9571c550b6a0dcb3a4f54513c881661a87271024.tar.xz
pokeyellow-9571c550b6a0dcb3a4f54513c881661a87271024.zip
Merge pull request #263 from Rangi42/master
Syncing style with pokecrystal
Diffstat (limited to 'engine/events/black_out.asm')
-rw-r--r--engine/events/black_out.asm26
1 files changed, 13 insertions, 13 deletions
diff --git a/engine/events/black_out.asm b/engine/events/black_out.asm
index 6c358ce3..16d2081f 100644
--- a/engine/events/black_out.asm
+++ b/engine/events/black_out.asm
@@ -6,34 +6,34 @@ ResetStatusAndHalveMoneyOnBlackout::
ld [wIsInBattle], a
ld [wMapPalOffset], a
ld [wNPCMovementScriptFunctionNum], a
- ld [hJoyHeld], a
+ ldh [hJoyHeld], a
ld [wNPCMovementScriptPointerTableNum], a
ld [wFlags_0xcd60], a
- ld [hMoney], a
- ld [hMoney + 1], a
- ld [hMoney + 2], a
+ ldh [hMoney], a
+ ldh [hMoney + 1], a
+ ldh [hMoney + 2], a
call HasEnoughMoney
jr c, .lostmoney ; never happens
; Halve the player's money.
ld a, [wPlayerMoney]
- ld [hMoney], a
+ ldh [hMoney], a
ld a, [wPlayerMoney + 1]
- ld [hMoney + 1], a
+ ldh [hMoney + 1], a
ld a, [wPlayerMoney + 2]
- ld [hMoney + 2], a
+ ldh [hMoney + 2], a
xor a
- ld [hDivideBCDDivisor], a
- ld [hDivideBCDDivisor + 1], a
+ ldh [hDivideBCDDivisor], a
+ ldh [hDivideBCDDivisor + 1], a
ld a, 2
- ld [hDivideBCDDivisor + 2], a
+ ldh [hDivideBCDDivisor + 2], a
predef DivideBCDPredef3
- ld a, [hDivideBCDQuotient]
+ ldh a, [hDivideBCDQuotient]
ld [wPlayerMoney], a
- ld a, [hDivideBCDQuotient + 1]
+ ldh a, [hDivideBCDQuotient + 1]
ld [wPlayerMoney + 1], a
- ld a, [hDivideBCDQuotient + 2]
+ ldh a, [hDivideBCDQuotient + 2]
ld [wPlayerMoney + 2], a
.lostmoney