diff options
| author | yenatch <yenatch@gmail.com> | 2014-12-29 08:47:47 -0800 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-12-29 08:49:08 -0800 |
| commit | 133e2fb7a7bcc914fa179a18bf0ed18a2099d0e8 (patch) | |
| tree | c708a7a5d6ade88197feb6a94ceb7475e5813735 | |
| parent | 1a2784d4142572487fdf10a44aa4752de287e89f (diff) | |
Use "- $ff00" instead of "& $ff" when dealing with hram.
| -rw-r--r-- | engine/credits.asm | 2 | ||||
| -rw-r--r-- | home/lcd.asm | 2 | ||||
| -rw-r--r-- | main.asm | 19 |
3 files changed, 14 insertions, 9 deletions
diff --git a/engine/credits.asm b/engine/credits.asm index 959e073c9..4620dd7e2 100644 --- a/engine/credits.asm +++ b/engine/credits.asm @@ -183,7 +183,7 @@ Function109847:: ; 109847 xor a call ByteFill - ld a, rSCX & $ff + ld a, rSCX - $ff00 ld [hLCDStatCustom], a call GetCreditsPalette diff --git a/home/lcd.asm b/home/lcd.asm index 5a1b6cfda..216941995 100644 --- a/home/lcd.asm +++ b/home/lcd.asm @@ -3,7 +3,7 @@ Function547:: ; 547 ld a, [hLCDStatCustom] - cp rSCX & $ff + cp rSCX - $ff00 ret nz ld c, a ld a, [LYOverrides] @@ -32,7 +32,7 @@ Function4000:: ; 4000 ; 4031 LoadPushOAM:: ; 4031 - ld c, hPushOAM & $ff + ld c, hPushOAM - $ff00 ld b, PushOAMEnd - PushOAM ld hl, PushOAM .loop @@ -3941,21 +3941,26 @@ Function5bae: ; 5bae ld [Coins], a ld [Coins + 1], a +START_MONEY EQU 3000 + +IF START_MONEY / $10000 + ld a, START_MONEY / $10000 +ENDC ld [Money], a - ld a, 3000 >> 8 + ld a, START_MONEY / $100 % $100 ld [Money + 1], a - ld a, 3000 & $ff + ld a, START_MONEY % $100 ld [Money + 2], a xor a ld [$dc17], a ld hl, $dc19 - ld [hl], $0 + ld [hl], 2300 / $10000 inc hl - ld [hl], $8 + ld [hl], 2300 / $100 % $100 inc hl - ld [hl], $fc + ld [hl], 2300 % $100 call Function5ce9 @@ -57533,7 +57538,7 @@ Function4e980: ; 4e980 ld a, $5 ld [rSVBK], a call Function4e998 - ld a, rSCX & $ff + ld a, rSCX - $ff00 ld [hLCDStatCustom], a call Function4e9ab xor a |