Fix three byte loads from high ram

3 files changed, 23 insertions, 22 deletions

diff --git a/src/engine/bank2.asm b/src/engine/bank2.asm
index 9d2c8a8..04e6218 100755
--- a/src/engine/bank2.asm
+++ b/src/engine/bank2.asm
@@ -563,8 +563,7 @@ Func_9152: ; 9152 (2:5152)
 	ret
 
 Func_9168: ; 9168 (2:5168)
-	;ld [$ffb5], a
-	db $ea, $b5, $ff
+	ld [hffb5], a
 	call Func_8d56
 	ld de, $0000
 	ld bc, $1404
@@ -583,8 +582,7 @@ Func_9168: ; 9168 (2:5168)
 	ld a, $4
 	ld hl, $ceb2
 	call Func_9843
-	;ld a, [$ffb5]
-	db $fa, $b5, $ff
+	ld a, [hffb5]
 	bit 0, a
 	jr z, .asm_91b0
 	ld hl, $a200
@@ -597,8 +595,7 @@ Func_9168: ; 9168 (2:5168)
 	ld a, $1
 	ld [$ceb2], a
 .asm_91bd
-	;ld a, [$ffb5]
-	db $fa, $b5, $ff
+	ld a, [hffb5]
 	bit 1, a
 	jr z, .asm_91cd
 	ld hl, $a254
@@ -611,8 +608,7 @@ Func_9168: ; 9168 (2:5168)
 	ld a, $1
 	ld [$ceb3], a
 .asm_91da
-	;ld a, [$ffb5]
-	db $fa, $b5, $ff
+	ld a, [hffb5]
 	bit 2, a
 	jr z, .asm_91ea
 	ld hl, $a2a8
@@ -625,8 +621,7 @@ Func_9168: ; 9168 (2:5168)
 	ld a, $1
 	ld [$ceb4], a
 .asm_91f7
-	;ld a, [$ffb5]
-	db $fa, $b5, $ff
+	ld a, [hffb5]
 	bit 3, a
 	jr z, .asm_9207
 	ld hl, $a2fc
diff --git a/src/engine/home.asm b/src/engine/home.asm
index 4412535..7a6d96f 100755
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -2803,10 +2803,10 @@ Func_21f2: ; 21f2 (0:21f2)
 	xor a
 	ld [$cd0a], a
 	ld a, $f
-	ldh [$ffaf], a
+	ldh [hffaf], a
 	ret
 .asm_2221
-	ldh [$ffaf], a
+	ldh [hffaf], a
 	xor a
 	ret
 .asm_2225
@@ -2888,7 +2888,7 @@ Func_2298: ; 2298 (0:2298)
 	ldh [$ffac], a
 	ld [$cd0b], a
 	ld a, $f
-	ldh [$ffaf], a
+	ldh [hffaf], a
 	ret
 
 Func_22a6: ; 22a6 (0:22a6)
@@ -3326,7 +3326,7 @@ Func_2546: ; 2546 (0:2546)
 	jr c, .asm_2561
 	cp $60
 	jr nc, .asm_2565
-	ldh a, [$ffaf]
+	ldh a, [hffaf]
 	cp $f
 	jr nz, .asm_2565
 	ld d, $f
@@ -3788,14 +3788,12 @@ Func_2cc8: ; 2cc8 (0:2cc8)
 	ld [$ce49], a
 	ld [$ce4a], a
 	ld a, $f
-	;ld [$ffaf], a
-	db $ea, $af, $ff
+	ld [hffaf], a
 Func_2cd7: ; 2cd7 (0:2cd7)
 	push hl
 	call Func_2d06
 	pop bc
-	;ld a, [$ffaf]
-	db $fa, $af, $ff
+	ld a, [hffaf]
 	ld [hli], a
 	ld a, [$cd0a]
 	ld [hli], a
@@ -3815,8 +3813,7 @@ Func_2ceb: ; 2ceb (0:2ceb)
 Func_2cf3: ; 2cf3 (0:2cf3)
 	call Func_2d06
 	ld a, [hli]
-	;ld [$ffaf], a
-	db $ea, $af, $ff
+	ld [hffaf], a
 	ld a, [hli]
 	ld [$cd0a], a
 	ld a, [hli]
@@ -3887,8 +3884,7 @@ Func_2d43: ; 2d43 (0:2d43)
 .asm_2d8a
 	call Func_2ceb
 	ld a, $f
-	;ld [$ffaf], a
-	db $ea, $af, $ff
+	ld [hffaf], a
 	xor a
 	ld [$cd0a], a
 	ld de, $ce3f
diff --git a/src/hram.asm b/src/hram.asm
index 8d3941a..be24666 100644
--- a/src/hram.asm
+++ b/src/hram.asm
@@ -44,3 +44,13 @@ hWY:: ; ff95
 ; $c2 = player ; $c3 = opponent
 hWhoseTurn:: ; ff97
 	ds 1
+
+	ds 23
+
+hffaf:: ; ffaf
+	ds 1
+
+	ds 5
+
+hffb5:: ; ffb5
+	ds 1