Merge pull request #555 from Rangi42/ldh

Use real labels for HRAM instead of constants, and the ldh instruction

1 files changed, 12 insertions, 12 deletions

diff --git a/engine/overworld/overworld.asm b/engine/overworld/overworld.asm
index f3dcb5b96..ab9770ee5 100644
--- a/engine/overworld/overworld.asm
+++ b/engine/overworld/overworld.asm
@@ -1,17 +1,17 @@
 GetEmote2bpp:
 	ld a, $1
-	ld [rVBK], a
+	ldh [rVBK], a
 	call Get2bpp
 	xor a
-	ld [rVBK], a
+	ldh [rVBK], a
 	ret
 
 _ReplaceKrisSprite::
 	call GetPlayerSprite
 	ld a, [wUsedSprites]
-	ld [hUsedSpriteIndex], a
+	ldh [hUsedSpriteIndex], a
 	ld a, [wUsedSprites + 1]
-	ld [hUsedSpriteTile], a
+	ldh [hUsedSpriteTile], a
 	call GetUsedSprite
 	ret
 
@@ -533,10 +533,10 @@ GetUsedSprites:
 	ld a, [hli]
 	and a
 	jr z, .done
-	ld [hUsedSpriteIndex], a
+	ldh [hUsedSpriteIndex], a
 
 	ld a, [hli]
-	ld [hUsedSpriteTile], a
+	ldh [hUsedSpriteTile], a
 
 	bit 7, a
 	jr z, .dont_set
@@ -558,9 +558,9 @@ GetUsedSprites:
 	ret
 
 GetUsedSprite:
-	ld a, [hUsedSpriteIndex]
+	ldh a, [hUsedSpriteIndex]
 	call SafeGetSprite
-	ld a, [hUsedSpriteTile]
+	ldh a, [hUsedSpriteTile]
 	call .GetTileAddr
 	push hl
 	push de
@@ -589,7 +589,7 @@ endr
 	bit 6, a
 	jr nz, .done
 
-	ld a, [hUsedSpriteIndex]
+	ldh a, [hUsedSpriteIndex]
 	call _DoesSpriteHaveFacings
 	jr c, .done
 
@@ -618,7 +618,7 @@ endr
 	ret
 
 .CopyToVram:
-	ld a, [rVBK]
+	ldh a, [rVBK]
 	push af
 	ld a, [wSpriteFlags]
 	bit 5, a
@@ -627,10 +627,10 @@ endr
 	ld a, $0
 
 .bankswitch
-	ld [rVBK], a
+	ldh [rVBK], a
 	call Get2bpp
 	pop af
-	ld [rVBK], a
+	ldh [rVBK], a
 	ret
 
 LoadEmote::