From af29f1f97ca855f24879a17283886a1d959fb3ed Mon Sep 17 00:00:00 2001 From: Rangi Date: Sat, 16 Feb 2019 13:04:08 -0500 Subject: [PATCH] Eliminate some $xxxx values --- engine/battle_anims/functions.asm | 2 +- engine/games/card_flip.asm | 4 ++-- engine/overworld/init_map.asm | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/engine/battle_anims/functions.asm b/engine/battle_anims/functions.asm index 6706bd364..fc1ef4766 100644 --- a/engine/battle_anims/functions.asm +++ b/engine/battle_anims/functions.asm @@ -2514,7 +2514,7 @@ BattleAnimFunction_25: ld hl, BATTLEANIMSTRUCT_10 add hl, bc ld e, [hl] - ld hl, $ffa0 + lb hl, -1, $a0 add hl, de ld e, l ld d, h diff --git a/engine/games/card_flip.asm b/engine/games/card_flip.asm index ac0532391..a87be3dae 100644 --- a/engine/games/card_flip.asm +++ b/engine/games/card_flip.asm @@ -46,9 +46,9 @@ _CardFlip: call CardFlip_InitAttrPals call EnableLCD call WaitBGMap2 - ld a, $e4 + ld a, %11100100 call DmgToCgbBGPals - ld de, $e4e4 + lb de, %11100100, %11100100 call DmgToCgbObjPals call DelayFrame xor a diff --git a/engine/overworld/init_map.asm b/engine/overworld/init_map.asm index 5008270a2..fece592d0 100644 --- a/engine/overworld/init_map.asm +++ b/engine/overworld/init_map.asm @@ -90,9 +90,9 @@ HDMATransfer_FillBGMap0WithBlack: ldh [rHDMA1], a ld a, LOW(wDecompressScratch) ldh [rHDMA2], a - ld a, HIGH(vBGMap0 % $8000) + ld a, HIGH(vBGMap0 - VRAM_Begin) ldh [rHDMA3], a - ld a, LOW(vBGMap0 % $8000) + ld a, LOW(vBGMap0 - VRAM_Begin) ldh [rHDMA4], a ld a, $3f ldh [hDMATransfer], a