From 6ef36800b0dcb86100a7c716172015667e60dc99 Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Fri, 3 Jul 2020 22:11:35 -0400
Subject: Replace raw hex values with HRAM constants

To do: turn constants into labels and use ldh
---
 engine/gfx/oam_dma.asm        |  4 ++--
 engine/gfx/screen_effects.asm | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'engine/gfx')

diff --git a/engine/gfx/oam_dma.asm b/engine/gfx/oam_dma.asm
index b0d64675..aeea4c01 100644
--- a/engine/gfx/oam_dma.asm
+++ b/engine/gfx/oam_dma.asm
@@ -1,12 +1,12 @@
 WriteDMACodeToHRAM::
 ; Since no other memory is available during OAM DMA,
 ; DMARoutine is copied to HRAM and executed there.
-	ld c, $ff80 % $100
+	ld c, hDMARoutine % $100
 	ld b, DMARoutineEnd - DMARoutine
 	ld hl, DMARoutine
 .copy
 	ld a, [hli]
-	ld [$ff00+c], a
+	ldh [c], a
 	inc c
 	dec b
 	jr nz, .copy
diff --git a/engine/gfx/screen_effects.asm b/engine/gfx/screen_effects.asm
index 95f0ea25..0d3806c1 100755
--- a/engine/gfx/screen_effects.asm
+++ b/engine/gfx/screen_effects.asm
@@ -19,7 +19,7 @@ PredefShakeScreenVertically:
 	ld [wDisableVBlankWYUpdate], a
 	xor a
 .loop
-	ld [$ff96], a
+	ld [hMutateWY], a
 	call .MutateWY
 	call .MutateWY
 	dec b
@@ -30,9 +30,9 @@ PredefShakeScreenVertically:
 	ret
 
 .MutateWY
-	ld a, [$ff96]
+	ld a, [hMutateWY]
 	xor b
-	ld [$ff96], a
+	ld [hMutateWY], a
 	ld [rWY], a
 	ld c, 3
 	jp DelayFrames
@@ -43,7 +43,7 @@ PredefShakeScreenHorizontally:
 	call GetPredefRegisters
 	xor a
 .loop
-	ld [$ff97], a
+	ld [hMutateWX], a
 	call .MutateWX
 	ld c, 1
 	call DelayFrames
@@ -58,9 +58,9 @@ PredefShakeScreenHorizontally:
 	ret
 
 .MutateWX
-	ld a, [$ff97]
+	ld a, [hMutateWX]
 	xor b
-	ld [$ff97], a
+	ld [hMutateWX], a
 	bit 7, a
 	jr z, .skipZeroing
 	xor a ; zero a if it's negative
-- 
cgit v1.3.1-sl0p