Use labels instead of constants for HRAM

21 files changed, 420 insertions, 411 deletions

diff --git a/engine/anim_hp_bar.asm b/engine/anim_hp_bar.asm
index 29afa8ed..561cba42 100755
--- a/engine/anim_hp_bar.asm
+++ b/engine/anim_hp_bar.asm
@@ -277,7 +277,7 @@ Functiond78a: ; d78a (3:578a)
 	ret
 
 Functiond7ba: ; d7ba (3:57ba)
-	ld a, [hCGB]
+	ldh a, [hCGB]
 	and a
 	ret z
 	ld hl, wCurHPAnimPal
@@ -290,7 +290,7 @@ Functiond7ba: ; d7ba (3:57ba)
 	ret
 
 Functiond7cf: ; d7cf (3:57cf)
-	ld a, [hCGB]
+	ldh a, [hCGB]
 	and a
 	jr nz, .asm_d7db
 	call DelayFrame
@@ -318,15 +318,15 @@ Functiond7cf: ; d7cf (3:57cf)
 	cp $5
 	jr z, .asm_d805
 	ld a, $2
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 	ld a, c
-	ld [hBGMapThird], a
+	ldh [hBGMapThird], a
 	call DelayFrame
 .asm_d805
 	ld a, $1
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 	ld a, c
-	ld [hBGMapThird], a
+	ldh [hBGMapThird], a
 	call DelayFrame
 	pop af
 	cp $2
@@ -338,14 +338,14 @@ Functiond7cf: ; d7cf (3:57cf)
 .asm_d819
 	inc c
 	ld a, $2
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 	ld a, c
-	ld [hBGMapThird], a
+	ldh [hBGMapThird], a
 	call DelayFrame
 	ld a, $1
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 	ld a, c
-	ld [hBGMapThird], a
+	ldh [hBGMapThird], a
 	call DelayFrame
 	ret
 
@@ -358,7 +358,7 @@ Functiond7cf: ; d7cf (3:57cf)
 .asm_d835
 	call DelayFrame
 	ld a, c
-	ld [hBGMapThird], a
+	ldh [hBGMapThird], a
 	call DelayFrame
 	ret
 
diff --git a/engine/billspctop.asm b/engine/billspctop.asm
index 65403656..f323d906 100644
--- a/engine/billspctop.asm
+++ b/engine/billspctop.asm
@@ -20,7 +20,7 @@ Text_GottaHavePokemon:
 
 BillsPC_LogIn: ; e3f7 (3:63f7)
 	xor a
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 	call LoadStandardMenuDataHeader
 	call Functione566
 	ld hl, wOptions
@@ -51,7 +51,7 @@ BillsPC_UsePC: ; e41e (3:641e)
 	call SetPalettes
 	xor a
 	ld [wWhichIndexSet], a
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 	call DoNthMenu
 	jr c, .asm_e446
 	ld a, [wMenuCursorBuffer]
@@ -226,7 +226,7 @@ BillsPC_ChangeBoxMenu:
 Functione566: ; e566 (3:6566)
 	call DisableSpriteUpdates
 	xor a
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 	call ClearBGPalettes
 	call ClearSprites
 	hlcoord 0, 0
diff --git a/engine/color.asm b/engine/color.asm
index 25f7179b..fa041873 100755
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -130,7 +130,7 @@ Function9102:
 	call CopyBytes
 	call Function9b28
 	ld a, $1
-	ld [hCGBPalUpdate], a
+	ldh [hCGBPalUpdate], a
 	ret
 
 .BGPal:
@@ -148,7 +148,7 @@ Function9102:
 Function9136:
 	call CheckCGB
 	ret nz
-	ld a, [hSGB]
+	ldh a, [hSGB]
 	and a
 	ret z
 	ld hl, BlkPacket_9ee5
@@ -157,7 +157,7 @@ Function9136:
 Function9144:
 	call CheckCGB
 	jr nz, .asm_9153
-	ld a, [hSGB]
+	ldh a, [hSGB]
 	and a
 	ret z
 	ld hl, PalPacket_a095
@@ -172,7 +172,7 @@ Function9144:
 Function915e:
 	call CheckCGB
 	jr nz, .asm_916d
-	ld a, [hSGB]
+	ldh a, [hSGB]
 	and a
 	ret z
 	ld hl, PalPacket_a0a5
@@ -187,7 +187,7 @@ Function915e:
 Function9178:
 	call CheckCGB
 	jr nz, .asm_91a9
-	ld a, [hSGB]
+	ldh a, [hSGB]
 	and a
 	ret z
 	ld a, c
@@ -217,7 +217,7 @@ Function9178:
 	ret
 
 Function91b4:
-	ld a, [hCGB]
+	ldh a, [hCGB]
 	and a
 	jr nz, .asm_91bf
 	ld hl, wc602
@@ -293,7 +293,7 @@ ApplyHPBarPals:
 	ld bc, $4
 	call CopyBytes
 	ld a, $1
-	ld [hCGBPalUpdate], a
+	ldh [hCGBPalUpdate], a
 	ret
 
 .asm_9236
@@ -331,7 +331,7 @@ LoadStatsScreenPals:
 	ld [wTempBGPals + $11], a
 	call Function9b28
 	ld a, $1
-	ld [hCGBPalUpdate], a
+	ldh [hCGBPalUpdate], a
 	ret
 
 LoadMailPalettes:
@@ -557,19 +557,19 @@ Function9b28: ; 9b28 (2:5b28)
 	ret
 
 Function9b35: ; 9b35 (2:5b35)
-	ld a, [rLCDC]
+	ldh a, [rLCDC]
 	bit 7, a
 	jr z, .asm_9b52
-	ld a, [hBGMapMode]
+	ldh a, [hBGMapMode]
 	push af
 	ld a, $2
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 	call DelayFrame
 	call DelayFrame
 	call DelayFrame
 	call DelayFrame
 	pop af
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 	ret
 
 .asm_9b52
@@ -577,7 +577,7 @@ Function9b35: ; 9b35 (2:5b35)
 	ld de, $9800
 	ld b, $12
 	ld a, $1
-	ld [rVBK], a
+	ldh [rVBK], a
 .asm_9b5e
 	ld c, $14
 .asm_9b60
@@ -595,7 +595,7 @@ Function9b35: ; 9b35 (2:5b35)
 	dec b
 	jr nz, .asm_9b5e
 	ld a, $0
-	ld [rVBK], a
+	ldh [rVBK], a
 	ret
 
 Function9b75: ; 9b75 (2:5b75)
@@ -683,11 +683,11 @@ Function9be9:
 	ret z
 	ld hl, Palettes_9c09
 	ld a, $90
-	ld [rOBPI], a
+	ldh [rOBPI], a
 	ld c, $30
 .asm_9bf6
 	ld a, [hli]
-	ld [rOBPD], a
+	ldh [rOBPD], a
 	dec c
 	jr nz, .asm_9bf6
 	ld hl, Palettes_9c09
@@ -731,7 +731,7 @@ Function9c39:
 	call CheckCGB
 	ret z
 	ld a, $90
-	ld [rOBPI], a
+	ldh [rOBPI], a
 	ld a, $1c
 	call Function9ac7
 	call Function9c52
@@ -744,7 +744,7 @@ Function9c52: ; 9c52 (2:5c52)
 	ld c, $8
 .asm_9c54
 	ld a, [hli]
-	ld [rOBPD], a
+	ldh [rOBPD], a
 	dec c
 	jr nz, .asm_9c54
 	ret
@@ -791,9 +791,9 @@ Function9c87: ; 9c87 (2:5c87)
 .asm_9c8c
 	push bc
 	xor a
-	ld [rJOYP], a
+	ldh [rJOYP], a
 	ld a, $30
-	ld [rJOYP], a
+	ldh [rJOYP], a
 	ld b, $10
 .asm_9c96
 	ld e, $8
@@ -805,18 +805,18 @@ Function9c87: ; 9c87 (2:5c87)
 	jr nz, .asm_9ca2
 	ld a, $20
 .asm_9ca2
-	ld [rJOYP], a
+	ldh [rJOYP], a
 	ld a, $30
-	ld [rJOYP], a
+	ldh [rJOYP], a
 	rr d
 	dec e
 	jr nz, .asm_9c9a
 	dec b
 	jr nz, .asm_9c96
 	ld a, $20
-	ld [rJOYP], a
+	ldh [rJOYP], a
 	ld a, $30
-	ld [rJOYP], a
+	ldh [rJOYP], a
 	call Function9ed9
 	pop bc
 	dec b
@@ -832,12 +832,12 @@ InitSGBBorder: ; 9cc0 (2:5cc0)
 	set 7, a
 	ld [wd8ba], a
 	xor a
-	ld [rJOYP], a
-	ld [hSGB], a
+	ldh [rJOYP], a
+	ldh [hSGB], a
 	call Function9da9
 	jr nc, .asm_9cf7
 	ld a, $1
-	ld [hSGB], a
+	ldh [hSGB], a
 	call Function9d4a
 	call Function9e13
 	call Function9ed9
@@ -857,31 +857,31 @@ InitCGBPals:: ; 9cfd (2:5cfd)
 	call CheckCGB
 	ret z
 	ld a, $1
-	ld [rVBK], a
+	ldh [rVBK], a
 	ld hl, $8000
 	ld bc, $2000
 	xor a
 	call ByteFill
 	ld a, $0
-	ld [rVBK], a
+	ldh [rVBK], a
 	ld a, $80
-	ld [rBGPI], a
+	ldh [rBGPI], a
 	ld c, $20
 .asm_9d19
 	ld a, $ff
-	ld [rBGPD], a
+	ldh [rBGPD], a
 	ld a, $7f
-	ld [rBGPD], a
+	ldh [rBGPD], a
 	dec c
 	jr nz, .asm_9d19
 	ld a, $80
-	ld [rOBPI], a
+	ldh [rOBPI], a
 	ld c, $20
 .asm_9d2a
 	ld a, $ff
-	ld [rOBPD], a
+	ldh [rOBPD], a
 	ld a, $7f
-	ld [rOBPD], a
+	ldh [rOBPD], a
 	dec c
 	jr nz, .asm_9d2a
 	ld hl, wTempBGPals
@@ -929,7 +929,7 @@ Function9d4a: ; 9d4a (2:5d4a)
 Function9d70:
 	di
 	xor a
-	ld [rJOYP], a
+	ldh [rJOYP], a
 	ld hl, PalPacket_a1c5
 	call Function9c87
 	call Function9d8b
@@ -964,38 +964,38 @@ Function9da9: ; 9da9 (2:5da9)
 	ld hl, PalPacket_a195
 	call Function9c87
 	call Function9ed9
-	ld a, [rJOYP]
+	ldh a, [rJOYP]
 	and $3
 	cp $3
 	jr nz, .asm_9e05
 	ld a, $20
-	ld [rJOYP], a
-	ld a, [rJOYP]
-	ld a, [rJOYP]
+	ldh [rJOYP], a
+	ldh a, [rJOYP]
+	ldh a, [rJOYP]
 	call Function9ed9
 	call Function9ed9
 	ld a, $30
-	ld [rJOYP], a
+	ldh [rJOYP], a
 	call Function9ed9
 	call Function9ed9
 	ld a, $10
-	ld [rJOYP], a
-	ld a, [rJOYP]
-	ld a, [rJOYP]
-	ld a, [rJOYP]
-	ld a, [rJOYP]
-	ld a, [rJOYP]
-	ld a, [rJOYP]
+	ldh [rJOYP], a
+	ldh a, [rJOYP]
+	ldh a, [rJOYP]
+	ldh a, [rJOYP]
+	ldh a, [rJOYP]
+	ldh a, [rJOYP]
+	ldh a, [rJOYP]
 	call Function9ed9
 	call Function9ed9
 	ld a, $30
-	ld [rJOYP], a
-	ld a, [rJOYP]
-	ld a, [rJOYP]
-	ld a, [rJOYP]
+	ldh [rJOYP], a
+	ldh a, [rJOYP]
+	ldh a, [rJOYP]
+	ldh a, [rJOYP]
 	call Function9ed9
 	call Function9ed9
-	ld a, [rJOYP]
+	ldh a, [rJOYP]
 	and $3
 	cp $3
 	jr nz, .asm_9e05
@@ -1016,24 +1016,24 @@ Function9e0a: ; 9e0a (2:5e0a)
 Function9e13: ; 9e13 (2:5e13)
 	call DisableLCD
 	ld a, $e4
-	ld [rBGP], a
+	ldh [rBGP], a
 	ld hl, Palettes_a265
 	ld de, $8800
 	ld bc, $1000
 	call Function9eb1
 	call Function9ec3
 	ld a, $e3
-	ld [rLCDC], a
+	ldh [rLCDC], a
 	ld hl, PalPacket_a175
 	call Function9c87
 	xor a
-	ld [rBGP], a
+	ldh [rBGP], a
 	ret
 
 Function9e37: ; 9e37 (2:5e37)
 	call DisableLCD
 	ld a, $e4
-	ld [rBGP], a
+	ldh [rBGP], a
 	ld de, $8800
 	ld bc, $140
 	call Function9eb1
@@ -1057,17 +1057,17 @@ Function9e37: ; 9e37 (2:5e37)
 	call Function9eb1
 	call Function9ec3
 	ld a, $e3
-	ld [rLCDC], a
+	ldh [rLCDC], a
 	ld hl, PalPacket_a1b5
 	call Function9c87
 	xor a
-	ld [rBGP], a
+	ldh [rBGP], a
 	ret
 
 Function9e83: ; 9e83 (2:5e83)
 	call DisableLCD
 	ld a, $e4
-	ld [rBGP], a
+	ldh [rBGP], a
 	ld de, $8800
 	ld b, $80
 .asm_9e8f
@@ -1081,11 +1081,11 @@ Function9e83: ; 9e83 (2:5e83)
 	jr nz, .asm_9e8f
 	call Function9ec3
 	ld a, $e3
-	ld [rLCDC], a
+	ldh [rLCDC], a
 	ld hl, PalPacket_a1a5
 	call Function9c87
 	xor a
-	ld [rBGP], a
+	ldh [rBGP], a
 	ret
 
 Function9eb1: ; 9eb1 (2:5eb1)
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm
index 16ba1044..a00f35aa 100755
--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
@@ -206,7 +206,7 @@ CutDownTreeOrGrass:
 	ld a, [wBuffer5]
 	ld [hl], a
 	xor a
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 	call OverworldTextModeSwitch
 	call UpdateSprites
 	call DelayFrame
@@ -542,7 +542,7 @@ TryToFly:
 
 .asm_ca83
 	xor a
-	ld [hMapAnims], a
+	ldh [hMapAnims], a
 	call LoadStandardMenuDataHeader
 	call ClearSprites
 	ld a, $24
@@ -1134,7 +1134,7 @@ DisappearWhirlpool: ; 4e20
 	ld a, [wBuffer5]
 	ld [hl], a
 	xor a
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 	call OverworldTextModeSwitch
 	ld a, [wBuffer6]
 	ld e, a
@@ -1285,12 +1285,12 @@ TryRockSmashFromMenu: ; cef7 (3:4ef7)
 GetFacingObject: ; cf10 (3:4f10)
 	farcall CheckFacingObject
 	jr nc, .asm_cf2f
-	ld a, [hObjectStructIndexBuffer]
+	ldh a, [hObjectStructIndexBuffer]
 	call GetObjectStruct
 	ld hl, $1
 	add hl, bc
 	ld a, [hl]
-	ld [hLastTalked], a
+	ldh [hLastTalked], a
 	call GetMapObject
 	ld hl, $4
 	add hl, bc
@@ -1547,7 +1547,7 @@ PutTheRodAway: ; d096
 	call ClearBox
 	call WaitBGMap
 	xor a
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 	ld a, $1
 	ld [wPlayerAction], a
 	call UpdateSprites
diff --git a/engine/health.asm b/engine/health.asm
index 506d5a9d..a94a3ec3 100755
--- a/engine/health.asm
+++ b/engine/health.asm
@@ -44,43 +44,46 @@ Functionc6bc: ; c6bc (3:46bc)
 	farcall Functionf900
 	ret
 
-ComputeHPBarPixels: ; c6de (3:46de)
+ComputeHPBarPixels:
+; e = bc * (6 * 8) / de
 	ld a, b
 	or c
 	jr z, .asm_c722
 	push hl
 	xor a
-	ld [hPrintNum2], a
+	ldh [hMultiplicand + 0], a
 	ld a, b
-	ld [hPrintNum3], a
+	ldh [hMultiplicand + 1], a
 	ld a, c
-	ld [hPrintNum4], a
-	ld a, $30
-	ld [hPrintNum5], a
+	ldh [hMultiplicand + 2], a
+	ld a, 6 * 8
+	ldh [hMultiplier], a
 	call Multiply
+	; We need de to be under 256 because hDivisor is only 1 byte.
 	ld a, d
 	and a
 	jr z, .asm_c711
+	; divide de and hProduct by 4
 	srl d
 	rr e
 	srl d
 	rr e
-	ld a, [hStringCmpString2]
+	ldh a, [hProduct + 2]
 	ld b, a
-	ld a, [hPrintNum4]
+	ldh a, [hProduct + 3]
 	srl b
 	rr a
 	srl b
 	rr a
-	ld [hPrintNum4], a
+	ldh [hDividend + 3], a
 	ld a, b
-	ld [hPrintNum3], a
+	ldh [hDividend + 2], a
 .asm_c711
 	ld a, e
-	ld [hPrintNum5], a
+	ldh [hPrintNum5], a
 	ld b, $4
 	call Divide
-	ld a, [hPrintNum4]
+	ldh a, [hPrintNum4]
 	ld e, a
 	pop hl
 	and a
diff --git a/engine/main_menu.asm b/engine/main_menu.asm
index 7e22a02e..0dd1804b 100755
--- a/engine/main_menu.asm
+++ b/engine/main_menu.asm
@@ -92,7 +92,7 @@ Function5ae4: ; 5ae4 (1:5ae4)
 	ret
 
 .asm_5af0
-	ld a, [hCGB]
+	ldh a, [hCGB]
 	cp $1
 	ld a, $1
 	ret nz
@@ -132,7 +132,7 @@ Function5b27: ; 5b27 (1:5b27)
 	and a
 	ret z
 	xor a
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 	call Function5b45
 	ld hl, wOptions
 	ld a, [hl]
@@ -142,7 +142,7 @@ Function5b27: ; 5b27 (1:5b27)
 	pop af
 	ld [wOptions], a
 	ld a, $1
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 	ret
 
 Function5b45: ; 5b45 (1:5b45)
@@ -175,7 +175,7 @@ Function5b5b: ; 5b5b (1:5b5b)
 	decoord 1, 14
 	call Function5bb8
 	decoord 4, 16
-	ld a, [hHours]
+	ldh a, [hHours]
 	ld c, a
 	farcall PrintHour
 	ld [hl], $9c
@@ -229,7 +229,7 @@ Function5bb8: ; 5bb8 (1:5bb8)
 
 Function5bf7: ; 5bf7 (1:5bf7)
 	xor a
-	ld [hMapAnims], a
+	ldh [hMapAnims], a
 	call ClearTileMap
 	call LoadFontsExtra
 	call Functiond9e
@@ -256,12 +256,12 @@ MainMenu_NewGame:
 	ld a, $0
 	ld [wceec], a
 	ld a, $f1
-	ld [hMapEntryMethod], a
+	ldh [hMapEntryMethod], a
 	jp FinishContinueFunction
 
 Function5c3a: ; 5c3a (1:5c3a)
 	xor a
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 	call Function5c41
 	ret
 
@@ -276,16 +276,16 @@ Function5c41: ; 5c41 (1:5c41)
 	xor a
 	call ByteFill
 
-	ld a, [rLY]
-	ld [hSecondsBackup], a
+	ldh a, [rLY]
+	ldh [hSecondsBackup], a
 	call DelayFrame
-	ld a, [hRandomSub]
+	ldh a, [hRandomSub]
 	ld [wPlayerID], a
 
-	ld a, [rLY]
-	ld [hSecondsBackup], a
+	ldh a, [rLY]
+	ldh [hSecondsBackup], a
 	call DelayFrame
-	ld a, [hRandomAdd]
+	ldh a, [hRandomAdd]
 	ld [wPlayerID + 1], a
 
 	ld hl, wPartyCount
@@ -481,7 +481,7 @@ MainMenu_Continue:
 	call LoadStandardMenuDataHeader
 	call DisplaySaveInfoOnContinue
 	ld a, $1
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 	ld c, 20
 	call DelayFrames
 	call ConfirmContinue
@@ -514,7 +514,7 @@ MainMenu_Continue:
 	cp $1
 	jr z, .asm_5e42
 	ld a, $f2
-	ld [hMapEntryMethod], a
+	ldh [hMapEntryMethod], a
 	jp FinishContinueFunction
 
 .asm_5e41
@@ -533,7 +533,7 @@ PostCreditsSpawn: ; 5e52 (1:5e52)
 	xor a
 	ld [wd1db], a
 	ld a, $f1
-	ld [hMapEntryMethod], a
+	ldh [hMapEntryMethod], a
 	ret
 
 ConfirmContinue: ; 5e5b (1:5e5b)
@@ -613,7 +613,7 @@ DisplayContinueDataWithRTCError: ; 5ec7 (1:5ec7)
 
 Continue_LoadMenuHeader: ; 5ed7 (1:5ed7)
 	xor a
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 	ld hl, .MenuDataHeader_Dex
 	CheckFlag ENGINE_POKEDEX
 	jr nz, .asm_5ee7
@@ -920,7 +920,7 @@ StorePlayerName: ; 6119 (1:6119)
 	ret
 
 ShrinkPlayer: ; 6123 (1:6123)
-	ld a, [hROMBank]
+	ldh a, [hROMBank]
 	push af
 
 	ld a, 0 << 7 | 32 ; fade out
@@ -986,11 +986,11 @@ MovePlayerPic
 	push hl
 	push de
 	xor a
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 	lb bc, 7, 7
 	predef PlaceGraphic
 	xor a
-	ld [hBGMapThird], a
+	ldh [hBGMapThird], a
 	call WaitBGMap
 	call DelayFrame
 	pop de
@@ -1023,17 +1023,17 @@ IntroFadePalettes:
 
 Intro_WipeInFrontpic: ; 61c5 (1:61c5)
 	ld a, $77
-	ld [hWX], a
+	ldh [hWX], a
 	call DelayFrame
 	ld a, $e4
 	call DmgToCgbBGPals
 .asm_61d1
 	call DelayFrame
-	ld a, [hWX]
+	ldh a, [hWX]
 	sub $8
 	cp $ff
 	ret z
-	ld [hWX], a
+	ldh [hWX], a
 	jr .asm_61d1
 
 Intro_PrepTrainerPic: ; 61df, 61e0 (1:61df, 1:61e0)
@@ -1042,7 +1042,7 @@ Intro_PrepTrainerPic: ; 61df, 61e0 (1:61df, 1:61e0)
 	ld hl, $58a0
 	rst FarCall
 	xor a
-	ld [hGraphicStartTile], a
+	ldh [hGraphicStartTile], a
 	hlcoord 6, 4
 	lb bc, 7, 7
 	predef PlaceGraphic
@@ -1053,7 +1053,7 @@ ShrinkFrame: ; 61f7 (1:61f7)
 	ld c, $31
 	predef DecompressGet2bpp
 	xor a
-	ld [hGraphicStartTile], a
+	ldh [hGraphicStartTile], a
 	hlcoord 6, 4
 	lb bc, 7, 7
 	predef PlaceGraphic
diff --git a/engine/math.asm b/engine/math.asm
index 6f584edf..cdac2d37 100755
--- a/engine/math.asm
+++ b/engine/math.asm
@@ -5,41 +5,41 @@ _Multiply:: ; 67bd
 	ld b, a
 
 	xor a
-	ld [hProduct], a
-	ld [hMathBuffer + 1], a
-	ld [hMathBuffer + 2], a
-	ld [hMathBuffer + 3], a
-	ld [hMathBuffer + 4], a
+	ldh [hProduct], a
+	ldh [hMathBuffer + 1], a
+	ldh [hMathBuffer + 2], a
+	ldh [hMathBuffer + 3], a
+	ldh [hMathBuffer + 4], a
 
 .loop
-	ld a, [hMultiplier]
+	ldh a, [hMultiplier]
 	srl a
-	ld [hMultiplier], a
+	ldh [hMultiplier], a
 	jr nc, .next
 
-	ld a, [hMathBuffer + 4]
+	ldh a, [hMathBuffer + 4]
 	ld c, a
-	ld a, [hMultiplicand + 2]
+	ldh a, [hMultiplicand + 2]
 	add c
-	ld [hMathBuffer + 4], a
+	ldh [hMathBuffer + 4], a
 
-	ld a, [hMathBuffer + 3]
+	ldh a, [hMathBuffer + 3]
 	ld c, a
-	ld a, [hMultiplicand + 1]
+	ldh a, [hMultiplicand + 1]
 	adc c
-	ld [hMathBuffer + 3], a
+	ldh [hMathBuffer + 3], a
 
-	ld a, [hMathBuffer + 2]
+	ldh a, [hMathBuffer + 2]
 	ld c, a
-	ld a, [hMultiplicand + 0]
+	ldh a, [hMultiplicand + 0]
 	adc c
-	ld [hMathBuffer + 2], a
+	ldh [hMathBuffer + 2], a
 
-	ld a, [hMathBuffer + 1]
+	ldh a, [hMathBuffer + 1]
 	ld c, a
-	ld a, [hProduct]
+	ldh a, [hProduct]
 	adc c
-	ld [hMathBuffer + 1], a
+	ldh [hMathBuffer + 1], a
 
 .next
 	dec b
@@ -47,71 +47,71 @@ _Multiply:: ; 67bd
 
 ; hMultiplicand <<= 1
 
-	ld a, [hMultiplicand + 2]
+	ldh a, [hMultiplicand + 2]
 	add a
-	ld [hMultiplicand + 2], a
+	ldh [hMultiplicand + 2], a
 
-	ld a, [hMultiplicand + 1]
+	ldh a, [hMultiplicand + 1]
 	rla
-	ld [hMultiplicand + 1], a
+	ldh [hMultiplicand + 1], a
 
-	ld a, [hMultiplicand + 0]
+	ldh a, [hMultiplicand + 0]
 	rla
-	ld [hMultiplicand + 0], a
+	ldh [hMultiplicand + 0], a
 
-	ld a, [hProduct]
+	ldh a, [hProduct]
 	rla
-	ld [hProduct], a
+	ldh [hProduct], a
 
 	jr .loop
 
 .done
-	ld a, [hMathBuffer + 4]
-	ld [hProduct + 3], a
+	ldh a, [hMathBuffer + 4]
+	ldh [hProduct + 3], a
 
-	ld a, [hMathBuffer + 3]
-	ld [hProduct + 2], a
+	ldh a, [hMathBuffer + 3]
+	ldh [hProduct + 2], a
 
-	ld a, [hMathBuffer + 2]
-	ld [hProduct + 1], a
+	ldh a, [hMathBuffer + 2]
+	ldh [hProduct + 1], a
 
-	ld a, [hMathBuffer + 1]
-	ld [hProduct + 0], a
+	ldh a, [hMathBuffer + 1]
+	ldh [hProduct + 0], a
 
 	ret
 
 _Divide:: ; 681d
 	xor a
-	ld [hMathBuffer + 0], a
-	ld [hMathBuffer + 1], a
-	ld [hMathBuffer + 2], a
-	ld [hMathBuffer + 3], a
-	ld [hMathBuffer + 4], a
+	ldh [hMathBuffer + 0], a
+	ldh [hMathBuffer + 1], a
+	ldh [hMathBuffer + 2], a
+	ldh [hMathBuffer + 3], a
+	ldh [hMathBuffer + 4], a
 
 	ld a, 9
 	ld e, a
 
 .loop
-	ld a, [hMathBuffer + 0]
+	ldh a, [hMathBuffer + 0]
 	ld c, a
-	ld a, [hDividend + 1]
+	ldh a, [hDividend + 1]
 	sub c
 	ld d, a
 
-	ld a, [hDivisor]
+	ldh a, [hDivisor]
 	ld c, a
-	ld a, [hDividend + 0]
+	ldh a, [hDividend + 0]
 	sbc c
 	jr c, .next
 
-	ld [hDividend + 0], a
+	ldh [hDividend + 0], a
 
 	ld a, d
-	ld [hDividend + 1], a
+	ldh [hDividend + 1], a
 
-	ld a, [hMathBuffer + 4]
+	ldh a, [hMathBuffer + 4]
 	inc a
-	ld [hMathBuffer + 4], a
+	ldh [hMathBuffer + 4], a
 
 	jr .loop
 
@@ -120,39 +120,39 @@ _Divide:: ; 681d
 	cp 1
 	jr z, .done
 
-	ld a, [hMathBuffer + 4]
+	ldh a, [hMathBuffer + 4]
 	add a
-	ld [hMathBuffer + 4], a
+	ldh [hMathBuffer + 4], a
 
-	ld a, [hMathBuffer + 3]
+	ldh a, [hMathBuffer + 3]
 	rla
-	ld [hMathBuffer + 3], a
+	ldh [hMathBuffer + 3], a
 
-	ld a, [hMathBuffer + 2]
+	ldh a, [hMathBuffer + 2]
 	rla
-	ld [hMathBuffer + 2], a
+	ldh [hMathBuffer + 2], a
 
-	ld a, [hMathBuffer + 1]
+	ldh a, [hMathBuffer + 1]
 	rla
-	ld [hMathBuffer + 1], a
+	ldh [hMathBuffer + 1], a
 
 	dec e
 	jr nz, .next2
 
 	ld e, 8
-	ld a, [hMathBuffer + 0]
-	ld [hDivisor], a
+	ldh a, [hMathBuffer + 0]
+	ldh [hDivisor], a
 	xor a
-	ld [hMathBuffer + 0], a
+	ldh [hMathBuffer + 0], a
 
-	ld a, [hDividend + 1]
-	ld [hDividend + 0], a
+	ldh a, [hDividend + 1]
+	ldh [hDividend + 0], a
 
-	ld a, [hDividend + 2]
-	ld [hDividend + 1], a
+	ldh a, [hDividend + 2]
+	ldh [hDividend + 1], a
 
-	ld a, [hDividend + 3]
-	ld [hDividend + 2], a
+	ldh a, [hDividend + 3]
+	ldh [hDividend + 2], a
 
 .next2
 	ld a, e
@@ -161,30 +161,30 @@ _Divide:: ; 681d
 	dec b
 
 .okay
-	ld a, [hDivisor]
+	ldh a, [hDivisor]
 	srl a
-	ld [hDivisor], a
+	ldh [hDivisor], a
 
-	ld a, [hMathBuffer + 0]
+	ldh a, [hMathBuffer + 0]
 	rr a
-	ld [hMathBuffer + 0], a
+	ldh [hMathBuffer + 0], a
 
 	jr .loop
 
 .done
-	ld a, [hDividend + 1]
-	ld [hDivisor], a
+	ldh a, [hDividend + 1]
+	ldh [hDivisor], a
 
-	ld a, [hMathBuffer + 4]
-	ld [hDividend + 3], a
+	ldh a, [hMathBuffer + 4]
+	ldh [hDividend + 3], a
 
-	ld a, [hMathBuffer + 3]
-	ld [hDividend + 2], a
+	ldh a, [hMathBuffer + 3]
+	ldh [hDividend + 2], a
 
-	ld a, [hMathBuffer + 2]
-	ld [hDividend + 1], a
+	ldh a, [hMathBuffer + 2]
+	ldh [hDividend + 1], a
 
-	ld a, [hMathBuffer + 1]
-	ld [hDividend + 0], a
+	ldh a, [hMathBuffer + 1]
+	ldh [hDividend + 0], a
 
 	ret
diff --git a/engine/move_mon.asm b/engine/move_mon.asm
index aae1390b..dfa51a8e 100755
--- a/engine/move_mon.asm
+++ b/engine/move_mon.asm
@@ -11,7 +11,7 @@ TryAddMonToParty:: ; d892 (3:5892)
 	ret nc
 	ld [de], a
 	ld a, [de]
-	ld [hMoveMon], a
+	ldh [hMoveMon], a
 	add e
 	ld e, a
 	jr nc, .asm_d8ad
@@ -28,7 +28,7 @@ TryAddMonToParty:: ; d892 (3:5892)
 	jr z, .asm_d8c2
 	ld hl, wOTPartyMonOT
 .asm_d8c2
-	ld a, [hMoveMon]
+	ldh a, [hMoveMon]
 	dec a
 	call SkipNames
 	ld d, h
@@ -43,7 +43,7 @@ TryAddMonToParty:: ; d892 (3:5892)
 	ld [wd151], a
 	call GetPokemonName
 	ld hl, wPartyMonNicknames
-	ld a, [hMoveMon]
+	ldh a, [hMoveMon]
 	dec a
 	call SkipNames
 	ld d, h
@@ -58,7 +58,7 @@ TryAddMonToParty:: ; d892 (3:5892)
 	jr z, .asm_d903
 	ld hl, wOTPartyMon1
 .asm_d903
-	ld a, [hMoveMon]
+	ldh a, [hMoveMon]
 	dec a
 	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
@@ -117,28 +117,34 @@ GeneratePartyMonStats:
 	inc de
 	inc de
 	inc de
+
+	; Initialize ID.
 	ld a, [wPlayerID]
 	ld [de], a
 	inc de
 	ld a, [wPlayerID + 1]
 	ld [de], a
 	inc de
+
+	; Initialize Exp.
 	push de
 	ld a, [wCurPartyLevel]
 	ld d, a
-	callfar CalcExpAtLevel ; 14:5550
+	callfar CalcExpAtLevel
 	pop de
-	ld a, [hPrintNum2]
+	ldh a, [hProduct + 1]
 	ld [de], a
 	inc de
-	ld a, [hStringCmpString2]
+	ldh a, [hProduct + 2]
 	ld [de], a
 	inc de
-	ld a, [hPrintNum4]
+	ldh a, [hProduct + 3]
 	ld [de], a
 	inc de
+
+	; Initialize stat experience.
 	xor a
-	ld b, $a
+	ld b, MON_DVS - MON_STAT_EXP
 .asm_d980
 	ld [de], a
 	inc de
@@ -215,10 +221,10 @@ GeneratePartyMonStats:
 	ld c, a
 	ld b, $0
 	call CalcMonStatC
-	ld a, [hStringCmpString2]
+	ldh a, [hProduct + 2]
 	ld [de], a
 	inc de
-	ld a, [hPrintNum4]
+	ldh a, [hProduct + 3]
 	ld [de], a
 	inc de
 	jr .asm_da2f
@@ -787,11 +793,11 @@ Functiondd6a: ; dd6a (3:5d6a)
 	pop bc
 	ld hl, $8
 	add hl, bc
-	ld a, [hQuotient]
+	ldh a, [hQuotient]
 	ld [hli], a
-	ld a, [hPrintNum3]
+	ldh a, [hPrintNum3]
 	ld [hli], a
-	ld a, [hPrintNum4]
+	ldh a, [hPrintNum4]
 	ld [hl], a
 	and a
 	ret
@@ -886,13 +892,13 @@ SendMonIntoBox: ; de74 (3:5e74)
 	ld d, a
 	callfar CalcExpAtLevel
 	pop de
-	ld a, [hQuotient]
+	ldh a, [hQuotient]
 	ld [de], a
 	inc de
-	ld a, [hPrintNum3]
+	ldh a, [hPrintNum3]
 	ld [de], a
 	inc de
-	ld a, [hPrintNum4]
+	ldh a, [hPrintNum4]
 	ld [de], a
 	inc de
 	xor a
@@ -1256,10 +1262,10 @@ CalcMonStats: ; e16d
 .loop
 	inc c
 	call CalcMonStatC
-	ld a, [hMultiplicand + 1]
+	ldh a, [hMultiplicand + 1]
 	ld [de], a
 	inc de
-	ld a, [hMultiplicand + 2]
+	ldh a, [hMultiplicand + 2]
 	ld [de], a
 	inc de
 	ld a, c
@@ -1304,22 +1310,22 @@ CalcMonStatC: ; e181
 	add hl, bc
 .sqrt_loop
 	xor a
-	ld [hMultiplicand], a
-	ld [hMultiplicand + 1], a
+	ldh [hMultiplicand], a
+	ldh [hMultiplicand + 1], a
 	inc b
 	ld a, b
 	cp $ff
 	jr z, .no_stat_exp
-	ld [hMultiplicand + 2], a
-	ld [hMultiplier], a
+	ldh [hMultiplicand + 2], a
+	ldh [hMultiplier], a
 	call Multiply
 	ld a, [hld]
 	ld d, a
-	ld a, [hProduct + 3]
+	ldh a, [hProduct + 3]
 	sub d
 	ld a, [hli]
 	ld d, a
-	ld a, [hProduct + 2]
+	ldh a, [hProduct + 2]
 	sbc d
 	jr c, .sqrt_loop
 .no_stat_exp
@@ -1408,22 +1414,22 @@ CalcMonStatC: ; e181
 	inc d
 
 .no_overflow_2
-	ld [hMultiplicand + 2], a
+	ldh [hMultiplicand + 2], a
 	ld a, d
-	ld [hMultiplicand + 1], a
+	ldh [hMultiplicand + 1], a
 	xor a
-	ld [hMultiplicand + 0], a
+	ldh [hMultiplicand + 0], a
 	ld a, [wCurPartyLevel]
-	ld [hMultiplier], a
+	ldh [hMultiplier], a
 	call Multiply
-	ld a, [hProduct + 1]
-	ld [hDividend + 0], a
-	ld a, [hProduct + 2]
-	ld [hDividend + 1], a
-	ld a, [hProduct + 3]
-	ld [hDividend + 2], a
+	ldh a, [hProduct + 1]
+	ldh [hDividend + 0], a
+	ldh a, [hProduct + 2]
+	ldh [hDividend + 1], a
+	ldh a, [hProduct + 3]
+	ldh [hDividend + 2], a
 	ld a, 100
-	ld [hDivisor], a
+	ldh [hDivisor], a
 	ld a, 3
 	ld b, a
 	call Divide
@@ -1433,42 +1439,42 @@ CalcMonStatC: ; e181
 	jr nz, .not_hp
 	ld a, [wCurPartyLevel]
 	ld b, a
-	ld a, [hQuotient + 2]
+	ldh a, [hQuotient + 2]
 	add b
-	ld [hMultiplicand + 2], a
+	ldh [hMultiplicand + 2], a
 	jr nc, .no_overflow_3
-	ld a, [hQuotient + 1]
+	ldh a, [hQuotient + 1]
 	inc a
-	ld [hMultiplicand + 1], a
+	ldh [hMultiplicand + 1], a
 
 .no_overflow_3
 	ld a, 10
 
 .not_hp
 	ld b, a
-	ld a, [hQuotient + 2]
+	ldh a, [hQuotient + 2]
 	add b
-	ld [hMultiplicand + 2], a
+	ldh [hMultiplicand + 2], a
 	jr nc, .no_overflow_4
-	ld a, [hQuotient + 1]
+	ldh a, [hQuotient + 1]
 	inc a
-	ld [hMultiplicand + 1], a
+	ldh [hMultiplicand + 1], a
 
 .no_overflow_4
-	ld a, [hQuotient + 1]
+	ldh a, [hQuotient + 1]
 	cp (1000 / $100) + 1
 	jr nc, .max_stat
 	cp 1000 / $100
 	jr c, .stat_value_okay
-	ld a, [hQuotient + 2]
+	ldh a, [hQuotient + 2]
 	cp 1000 % $100
 	jr c, .stat_value_okay
 
 .max_stat
 	ld a, 999 / $100
-	ld [hMultiplicand + 1], a
+	ldh [hMultiplicand + 1], a
 	ld a, 999 % $100
-	ld [hMultiplicand + 2], a
+	ldh [hMultiplicand + 2], a
 
 .stat_value_okay
 	pop bc
diff --git a/engine/movement_pattern.asm b/engine/movement_pattern.asm
index 0b7617ca..1909f480 100755
--- a/engine/movement_pattern.asm
+++ b/engine/movement_pattern.asm
@@ -137,26 +137,26 @@ Function47fa:
 
 Function47fb: ; 47fb (1:47fb)
 	call Random
-	ld a, [hRandom]
+	ldh a, [hRandom]
 	and $1
 	jp Function4ac9
 
 Function4805: ; 4805 (1:4805)
 	call Random
-	ld a, [hRandom]
+	ldh a, [hRandom]
 	and $1
 	or $2
 	jp Function4ac9
 
 Function4811: ; 4811 (1:4811)
 	call Random
-	ld a, [hRandom]
+	ldh a, [hRandom]
 	and $3
 	jp Function4ac9
 
 Function481b: ; 481b (1:481b)
 	call Random
-	ld a, [hRandom]
+	ldh a, [hRandom]
 	and $c
 	ld hl, $8
 	add hl, bc
@@ -170,7 +170,7 @@ Function482a: ; 482a (1:482a)
 	and $c
 	ld d, a
 	call Random
-	ld a, [hRandom]
+	ldh a, [hRandom]
 	and $c
 	cp d
 	jr nz, .asm_483e
@@ -608,7 +608,7 @@ Function4ac9: ; 4ac9 (1:4ac9)
 	add hl, bc
 	ld [hl], $2
 	ld hl, wCenteredObject
-	ld a, [hConnectionStripLength]
+	ldh a, [hConnectionStripLength]
 	cp [hl]
 	jr z, .asm_4ae9
 	ld hl, $9
@@ -627,13 +627,13 @@ Function4ac9: ; 4ac9 (1:4ac9)
 	call Function4603
 Function4af6: ; 4af6 (1:4af6)
 	call Random
-	ld a, [hRandom]
+	ldh a, [hRandom]
 	and $7f
 	jr asm_4b06
 
 Function4aff: ; 4aff (1:4aff)
 	call Random
-	ld a, [hRandomAdd]
+	ldh a, [hRandomAdd]
 	and $1f
 asm_4b06
 	ld hl, $a
diff --git a/engine/movie/gamefreak_presents.asm b/engine/movie/gamefreak_presents.asm
index 6b15472f..a52413c4 100644
--- a/engine/movie/gamefreak_presents.asm
+++ b/engine/movie/gamefreak_presents.asm
@@ -6,16 +6,16 @@ Copyright_GFPresents: ; e49a8 (39:49a8)
 	call ClearTileMap
 
 	ld a, HIGH(vBGMap0)
-	ld [hBGMapAddress + 1], a
+	ldh [hBGMapAddress + 1], a
 	xor a ; LOW(vBGMap0)
-	ld [hBGMapAddress], a
+	ldh [hBGMapAddress], a
 
-	ld [hJoyDown], a
-	ld [hSCX], a
-	ld [hSCY], a
+	ldh [hJoyDown], a
+	ldh [hSCX], a
+	ldh [hSCY], a
 
 	ld a, SCREEN_HEIGHT_PX
-	ld [hWY], a
+	ldh [hWY], a
 
 	call WaitBGMap
 
@@ -80,14 +80,14 @@ GFPresents_Init: ; e49f3 (39:49f3)
 	ld [wJumpTableIndex], a
 	ld [$ce64], a
 	ld [wIntroSceneTimer], a
-	ld [hSCX], a
-	ld [hSCY], a
+	ldh [hSCX], a
+	ldh [hSCY], a
 
 	ld a, 1
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 
 	ld a, SCREEN_HEIGHT_PX
-	ld [hWY], a
+	ldh [hWY], a
 
 	lb de, %00100100, %11111000
 	call DmgToCgbObjPals
@@ -98,7 +98,7 @@ GFPresents_PlayFrame: ; e4a37 (39:4a37)
 ; Return carry when the sequence completes or is canceled.
 
 	call JoyTextDelay
-	ld a, [hJoyLast]
+	ldh a, [hJoyLast]
 	and BUTTONS
 	jr nz, .pressed_button
 
@@ -279,7 +279,7 @@ GFPresents_UpdateLogoPal: ; e4b20 (39:4b20)
 ; OBP1 was initialized at end of GFPresents_Init
 
 	; once we reached the final state, leave it alone
-	ld a, [rOBP1]
+	ldh a, [rOBP1]
 	cp %10010000
 	ret z
 
@@ -291,7 +291,7 @@ GFPresents_UpdateLogoPal: ; e4b20 (39:4b20)
 	; rotate OBP1 by one color slot (2 bits)
 	; DMG: logo is white, then light gray, then dark gray
 	; CGB: logo is white, then yellow
-	ld a, [rOBP1]
+	ldh a, [rOBP1]
 	rrca
 	rrca
 	call DmgToCgbObjPal1
diff --git a/engine/namingscreen.asm b/engine/namingscreen.asm
index 52cc06c7..3a68626d 100644
--- a/engine/namingscreen.asm
+++ b/engine/namingscreen.asm
@@ -15,23 +15,23 @@ NamingScreen: ; 11aad (4:5aad)
 	ld a, [hl]
 	push af
 	set NO_TEXT_SCROLL, [hl]
-	ld a, [hMapAnims]
+	ldh a, [hMapAnims]
 	push af
 	xor a
-	ld [hMapAnims], a
-	ld a, [hInMenu]
+	ldh [hMapAnims], a
+	ldh a, [hInMenu]
 	push af
 	ld a, $1
-	ld [hInMenu], a
+	ldh [hInMenu], a
 	call Function11ae4
 	call DelayFrame
 .asm_11ad1
 	call Function11cd4
 	jr nc, .asm_11ad1
 	pop af
-	ld [hInMenu], a
+	ldh [hInMenu], a
 	pop af
-	ld [hMapAnims], a
+	ldh [hMapAnims], a
 	pop af
 	ld [wOptions], a
 	call ClearJoypad
@@ -45,7 +45,7 @@ Function11ae4: ; 11ae4 (4:5ae4)
 	call Function1201e
 	call Function11c67
 	ld a, $e3
-	ld [rLCDC], a
+	ldh [rLCDC], a
 	call Function11b09
 	call WaitBGMap
 	call WaitTop
@@ -300,14 +300,14 @@ Function11cd4: ; 11cd4 (4:5cd4)
 	callfar ClearAnimatedObjectBuffer
 	call ClearSprites
 	xor a
-	ld [hSCX], a
-	ld [hSCY], a
+	ldh [hSCX], a
+	ldh [hSCY], a
 	scf
 	ret
 
 Function11cff: ; 11cff (4:5cff)
 	xor a
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 	hlcoord 1, 5
 	call Function11c5b
 	jr nz, .asm_11d0d
@@ -325,7 +325,7 @@ Function11cff: ; 11cff (4:5cff)
 	ld l, a
 	call PlaceString
 	ld a, $1
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 	ret
 
 Function11d27: ; 11d27 (4:5d27)
@@ -843,16 +843,16 @@ Function1201e: ; 1201e (4:601e)
 	ld [hli], a
 	ld [hl], $7e
 	xor a
-	ld [hSCY], a
+	ldh [hSCY], a
 	ld [wGlobalAnimYOffset], a
-	ld [hSCX], a
+	ldh [hSCX], a
 	ld [wGlobalAnimXOffset], a
 	ld [wce63], a
 	ld [wce64], a
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 	ld [wc5d2], a
 	ld a, $7
-	ld [hWX], a
+	ldh [hWX], a
 	ret
 
 NamingScreenGFX_Border: INCBIN "gfx/namingscreen/border.2bpp"
@@ -897,23 +897,23 @@ ComposeMailMessage:
 	ld [hl], e
 	inc hl
 	ld [hl], d
-	ld a, [hMapAnims]
+	ldh a, [hMapAnims]
 	push af
 	xor a
-	ld [hMapAnims], a
-	ld a, [hInMenu]
+	ldh [hMapAnims], a
+	ldh a, [hInMenu]
 	push af
 	ld a, $1
-	ld [hInMenu], a
+	ldh [hInMenu], a
 	call Function12267
 	call DelayFrame
 .asm_1225b
 	call Function1238d
 	jr nc, .asm_1225b
 	pop af
-	ld [hInMenu], a
+	ldh [hInMenu], a
 	pop af
-	ld [hMapAnims], a
+	ldh [hMapAnims], a
 	ret
 
 Function12267: ; 12267 (4:6267)
@@ -937,7 +937,7 @@ Function12267: ; 12267 (4:6267)
 	ld [hl], $0
 	call Function12351
 	ld a, $e3
-	ld [rLCDC], a
+	ldh [rLCDC], a
 	call Function12341
 	ld b, $8
 	call GetSGBLayout
@@ -1015,14 +1015,14 @@ Function1238d: ; 1238d (4:638d)
 	callfar ClearAnimatedObjectBuffer
 	call ClearSprites
 	xor a
-	ld [hSCX], a
-	ld [hSCY], a
+	ldh [hSCX], a
+	ldh [hSCY], a
 	scf
 	ret
 
 Function123b8: ; 123b8 (4:63b8)
 	xor a
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 	hlcoord 1, 1
 	lb bc, 4, 18
 	call ClearBox
@@ -1033,7 +1033,7 @@ Function123b8: ; 123b8 (4:63b8)
 	hlcoord 2, 2
 	call PlaceString
 	ld a, $1
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 	ret
 
 Function123d5: ; 123d5 (4:63d5)
diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm
index 593a1d75..6c344d31 100755
--- a/engine/overworld/map_objects.asm
+++ b/engine/overworld/map_objects.asm
@@ -415,7 +415,7 @@ Function5429: ; 5429 (1:5429)
 	ld [hl], $2
 	call Function54c8
 	ld hl, wCenteredObject
-	ld a, [hMapObjectIndexBuffer]
+	ldh a, [hMapObjectIndexBuffer]
 	cp [hl]
 	jr z, .asm_5450
 	ld hl, $9
@@ -435,7 +435,7 @@ Function5457: ; 5457 (1:5457)
 	ret z
 	ld a, [wObjectFollow_Leader]
 	ld d, a
-	ld a, [hMapObjectIndexBuffer]
+	ldh a, [hMapObjectIndexBuffer]
 	cp d
 	ret nz
 	ld a, e
@@ -565,7 +565,7 @@ Function5504: ; 5504 (1:5504)
 
 Function5518: ; 5518 (1:5518)
 	push bc
-	ld a, [hMapObjectIndexBuffer]
+	ldh a, [hMapObjectIndexBuffer]
 	ld c, a
 	call Function5521
 	pop bc
@@ -622,7 +622,7 @@ Function5558: ; 5558 (1:5558)
 	ld [hli], a
 	ld a, [de]
 	ld [hli], a
-	ld a, [hMapObjectIndexBuffer]
+	ldh a, [hMapObjectIndexBuffer]
 	ld [hli], a
 	push hl
 	ld hl, $10
@@ -646,7 +646,7 @@ Function557f:: ; 557f (1:557f)
 	ld bc, wPlayerStruct
 	xor a
 .asm_5589
-	ld [hConnectionStripLength], a
+	ldh [hConnectionStripLength], a
 	call DoesObjectHaveASprite
 	jr z, .asm_5593
 	call Function55ef
@@ -655,7 +655,7 @@ Function557f:: ; 557f (1:557f)
 	add hl, bc
 	ld b, h
 	ld c, l
-	ld a, [hMapObjectIndexBuffer]
+	ldh a, [hMapObjectIndexBuffer]
 	inc a
 	cp $d
 	jr nz, .asm_5589
@@ -668,7 +668,7 @@ Function55a1
 	ld a, [wd180]
 	bit 7, a
 	jr z, .asm_55b8
-	ld a, [hLastTalked]
+	ldh a, [hLastTalked]
 	and a
 	jr z, .asm_55b8
 	call Function55bc
@@ -697,13 +697,13 @@ Function55d8: ; 55d8 (1:55d8)
 	xor a
 	ld bc, wPlayerStruct
 .asm_55dc
-	ld [hMapObjectIndexBuffer], a
+	ldh [hMapObjectIndexBuffer], a
 	call Function5613
 	ld hl, $28
 	add hl, bc
 	ld b, h
 	ld c, l
-	ld a, [hConnectionStripLength]
+	ldh a, [hConnectionStripLength]
 	inc a
 	cp $d
 	jr nz, .asm_55dc
@@ -812,7 +812,7 @@ Function5660: ; 5660 (1:5660)
 	jr c, .asm_568f
 	sub $20
 .asm_568f
-	ld [hUsedSpriteIndex], a
+	ldh [hUsedSpriteIndex], a
 	ld a, [wce82]
 	ld e, a
 	ld hl, $1a
@@ -841,7 +841,7 @@ Function5660: ; 5660 (1:5660)
 	jr c, .asm_56bf
 	sub $20
 .asm_56bf
-	ld [hUsedSpriteTile], a
+	ldh [hUsedSpriteTile], a
 	ld hl, $6
 	add hl, bc
 	bit 7, [hl]
@@ -854,18 +854,18 @@ Function5660: ; 5660 (1:5660)
 	ld e, a
 .asm_56d1
 	ld a, d
-	ld [hFFC1], a
+	ldh [hFFC1], a
 .asm_56d4
-	ld a, [hFFC1]
+	ldh a, [hFFC1]
 	ld d, a
-	ld a, [hUsedSpriteTile]
+	ldh a, [hUsedSpriteTile]
 	add e
 	dec a
 	cp $12
 	jr nc, .asm_56f6
 	ld b, a
 .asm_56e0
-	ld a, [hUsedSpriteIndex]
+	ldh a, [hUsedSpriteIndex]
 	add d
 	dec a
 	cp $14
@@ -908,7 +908,7 @@ Function5714: ; 5714 (1:5714)
 	ld bc, wPlayerSprite
 	xor a
 .asm_5718
-	ld [hMapObjectIndexBuffer], a
+	ldh [hMapObjectIndexBuffer], a
 	call DoesObjectHaveASprite
 	jr z, .asm_5722
 	call Function437c
@@ -917,7 +917,7 @@ Function5714: ; 5714 (1:5714)
 	add hl, bc
 	ld b, h
 	ld c, l
-	ld a, [hConnectionStripLength]
+	ldh a, [hConnectionStripLength]
 	inc a
 	cp $d
 	jr nz, .asm_5718
@@ -980,7 +980,7 @@ StartFollow::
 Function578b: ; 578b (1:578b)
 	call CheckObjectVisibility
 	ret c
-	ld a, [hObjectStructIndexBuffer]
+	ldh a, [hObjectStructIndexBuffer]
 	ld [wObjectFollow_Leader], a
 	ret
 
@@ -1006,7 +1006,7 @@ Function57a2: ; 57a2 (1:57a2)
 	ld hl, $9
 	add hl, bc
 	ld [hl], $0
-	ld a, [hConnectedMapWidth]
+	ldh a, [hConnectedMapWidth]
 	ld [wObjectFollow_Follower], a
 	ret
 
@@ -1159,20 +1159,20 @@ UpdateSprites_:: ; 5896 (1:5896)
 	bit 0, a
 	ret z
 	xor a
-	ld [hUsedSpriteIndex], a
-	ld a, [hOAMUpdate]
+	ldh [hUsedSpriteIndex], a
+	ldh a, [hOAMUpdate]
 	push af
 	ld a, $1
-	ld [hOAMUpdate], a
+	ldh [hOAMUpdate], a
 	call Function58fe
 	call Function58b0
 	pop af
-	ld [hOAMUpdate], a
+	ldh [hOAMUpdate], a
 	ret
 
 Function58b0: ; 58b0 (1:58b0)
 	ld b, $a0
-	ld a, [hUsedSpriteIndex]
+	ldh a, [hUsedSpriteIndex]
 	cp b
 	ret nc
 	ld l, a
@@ -1333,11 +1333,11 @@ Function597a: ; 597a (1:597a)
 	jr z, .asm_599d
 	or $80
 .asm_599d
-	ld [hFFC4], a
+	ldh [hFFC4], a
 	ld hl, $2
 	add hl, bc
 	ld a, [hl]
-	ld [hFFC3], a
+	ldh [hFFC3], a
 	ld hl, $17
 	add hl, bc
 	ld a, [hl]
@@ -1348,7 +1348,7 @@ Function597a: ; 597a (1:597a)
 	ld e, a
 	ld a, [wce81]
 	add e
-	ld [hFFC1], a
+	ldh [hFFC1], a
 	ld hl, $18
 	add hl, bc
 	ld a, [hl]
@@ -1359,7 +1359,7 @@ Function597a: ; 597a (1:597a)
 	ld e, a
 	ld a, [wce82]
 	add e
-	ld [hFFC2], a
+	ldh [hFFC2], a
 	ld hl, $d
 	add hl, bc
 	ld a, [hl]
@@ -1375,28 +1375,28 @@ Function597a: ; 597a (1:597a)
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	ld a, [hUsedSpriteIndex]
+	ldh a, [hUsedSpriteIndex]
 	ld c, a
 	ld b, $c3
 	ld a, [hli]
-	ld [hUsedSpriteTile], a
+	ldh [hUsedSpriteTile], a
 	add c
 	cp $a0
 	jr nc, .asm_5a25
 .asm_59f3
-	ld a, [hFFC2]
+	ldh a, [hFFC2]
 	add [hl]
 	inc hl
 	ld [bc], a
 	inc c
-	ld a, [hFFC1]
+	ldh a, [hFFC1]
 	add [hl]
 	inc hl
 	ld [bc], a
 	inc c
 	ld e, [hl]
 	inc hl
-	ld a, [hFFC3]
+	ldh a, [hFFC3]
 	bit 2, e
 	jr z, .asm_5a08
 	xor a
@@ -1408,19 +1408,19 @@ Function597a: ; 597a (1:597a)
 	ld a, e
 	bit 1, a
 	jr z, .asm_5a14
-	ld a, [hFFC4]
+	ldh a, [hFFC4]
 	or e
 .asm_5a14
 	and $f0
 	or d
 	ld [bc], a
 	inc c
-	ld a, [hUsedSpriteTile]
+	ldh a, [hUsedSpriteTile]
 	dec a
-	ld [hUsedSpriteTile], a
+	ldh [hUsedSpriteTile], a
 	jr nz, .asm_59f3
 	ld a, c
-	ld [hUsedSpriteIndex], a
+	ldh [hUsedSpriteIndex], a
 .asm_5a23
 	xor a
 	ret
diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm
index 74e44cd3..5a299571 100755
--- a/engine/overworld/movement.asm
+++ b/engine/overworld/movement.asm
@@ -302,7 +302,7 @@ Function517a: ; 517a (1:517a)
 Function519c: ; 519c (1:519c)
 	call DeleteMapObject
 	ld hl, wObjectFollow_Leader
-	ld a, [hMapObjectIndexBuffer]
+	ldh a, [hMapObjectIndexBuffer]
 	cp [hl]
 	jr nz, .asm_51a9
 	ld [hl], $ff
@@ -719,7 +719,7 @@ Function53b1: ; 53b1 (1:53b1)
 	call Function54f5
 .asm_53cf
 	ld hl, wCenteredObject
-	ld a, [hConnectionStripLength]
+	ldh a, [hConnectionStripLength]
 	cp [hl]
 	jr z, .asm_53de
 	ld hl, $9
@@ -740,7 +740,7 @@ Function53e5: ; 53e5 (1:53e5)
 	add hl, bc
 	ld [hl], $4
 	ld hl, wCenteredObject
-	ld a, [hMapObjectIndexBuffer]
+	ldh a, [hMapObjectIndexBuffer]
 	cp [hl]
 	jr z, .asm_5400
 	ld hl, $9
@@ -761,7 +761,7 @@ Function5407: ; 5407 (1:5407)
 	add hl, bc
 	ld [hl], $1
 	ld hl, wCenteredObject
-	ld a, [hConnectionStripLength]
+	ldh a, [hConnectionStripLength]
 	cp [hl]
 	jr z, .asm_5422
 	ld hl, $9
diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm
index e776402a..84235570 100755
--- a/engine/overworld/npc_movement.asm
+++ b/engine/overworld/npc_movement.asm
@@ -224,7 +224,7 @@ CheckFacingObject:
 .asm_70d0
 	ld bc, wObjectStructs
 	ld a, $0
-	ld [hMapObjectIndexBuffer], a
+	ldh [hMapObjectIndexBuffer], a
 	call Function7120
 	ret nc
 	ld hl, $7
@@ -249,7 +249,7 @@ WillPersonBumpIntoSomeoneElse: ; 70e8 (1:70e8)
 	jr Function7120
 
 Function70f4:
-	ld a, [hMapObjectIndexBuffer]
+	ldh a, [hMapObjectIndexBuffer]
 	call GetObjectStruct
 	call Function7100
 	call Function7120
@@ -288,7 +288,7 @@ Function7120: ; 7120 (1:7120)
 	ld bc, wPlayerStruct
 	xor a
 .asm_7124
-	ld [hObjectStructIndexBuffer], a
+	ldh [hObjectStructIndexBuffer], a
 	call DoesObjectHaveASprite
 	jr z, .asm_7172
 	ld hl, $4
@@ -315,9 +315,9 @@ Function7120: ; 7120 (1:7120)
 	cp e
 	jr nz, .asm_715a
 .asm_7152
-	ld a, [hMapObjectIndexBuffer]
+	ldh a, [hMapObjectIndexBuffer]
 	ld l, a
-	ld a, [hConnectedMapWidth]
+	ldh a, [hConnectedMapWidth]
 	cp l
 	jr nz, .asm_7181
 .asm_715a
@@ -331,9 +331,9 @@ Function7120: ; 7120 (1:7120)
 	ld a, [hl]
 	cp e
 	jr nz, .asm_7172
-	ld a, [hConnectionStripLength]
+	ldh a, [hConnectionStripLength]
 	ld l, a
-	ld a, [hObjectStructIndexBuffer]
+	ldh a, [hObjectStructIndexBuffer]
 	cp l
 	jr nz, .asm_7181
 .asm_7172
@@ -341,7 +341,7 @@ Function7120: ; 7120 (1:7120)
 	add hl, bc
 	ld b, h
 	ld c, l
-	ld a, [hConnectedMapWidth]
+	ldh a, [hConnectedMapWidth]
 	inc a
 	cp $d
 	jr nz, .asm_7124
@@ -445,7 +445,7 @@ Function71f2
 	ld bc, wObjectStructs
 	xor a
 .asm_71fe
-	ld [hConnectedMapWidth], a
+	ldh [hConnectedMapWidth], a
 	call DoesObjectHaveASprite
 	jr z, .asm_723f
 	ld hl, $3
@@ -468,7 +468,7 @@ Function71f2
 	ld a, [hl]
 	cp d
 	jr nz, .asm_722d
-	ld a, [hObjectStructIndexBuffer]
+	ldh a, [hObjectStructIndexBuffer]
 	cp $0
 	jr z, .asm_723f
 	jr .asm_724e
@@ -491,7 +491,7 @@ Function71f2
 	add hl, bc
 	ld b, h
 	ld c, l
-	ld a, [hConnectedMapWidth]
+	ldh a, [hConnectedMapWidth]
 	inc a
 	cp $d
 	jr nz, .asm_71fe
diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm
index 8af7c726..c919f000 100755
--- a/engine/overworld/player_movement.asm
+++ b/engine/overworld/player_movement.asm
@@ -11,7 +11,7 @@ DoPlayerMovement:: ; 10000 (4:4000)
 	ret
 
 Function10017: ; 10017 (4:4017)
-	ld a, [hJoyDown]
+	ldh a, [hJoyDown]
 	ld [wcf29], a
 	CheckFlagHL ENGINE_DOWNHILL
 	ret z
@@ -564,7 +564,7 @@ Function102ec: ; 102ec (4:42ec)
 
 Function10341: ; 10341 (4:4341)
 	ld a, 0
-	ld [hMapObjectIndexBuffer], a
+	ldh [hMapObjectIndexBuffer], a
 	ld a, [wPlayerStandingMapX]
 	ld d, a
 	ld a, [wcf30]
diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm
index 64977b97..a706f8aa 100755
--- a/engine/overworld/player_object.asm
+++ b/engine/overworld/player_object.asm
@@ -1,7 +1,7 @@
 BlankScreen:
 	call DisableSpriteUpdates
 	xor a
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 	call ClearBGPalettes
 	call ClearSprites
 	ld hl, wTileMap
@@ -26,10 +26,10 @@ SpawnPlayer: ; 861a (2:461a)
 	ld b, $0
 	call PlayerSpawn_ConvertCoords
 	ld a, $0
-	ld [hObjectStructIndexBuffer], a
+	ldh [hObjectStructIndexBuffer], a
 	ld de, wObjectStructs
 	ld a, $0
-	ld [hMapObjectIndexBuffer], a
+	ldh [hMapObjectIndexBuffer], a
 	ld bc, wMapObjects
 	call CopyMapObjectToObjectStruct
 	ld a, $0
@@ -77,7 +77,7 @@ WritePersonXY:
 	ld hl, $11
 	add hl, bc
 	ld e, [hl]
-	ld a, [hConnectionStripLength]
+	ldh a, [hConnectionStripLength]
 	ld b, a
 	call CopyDECoordsToMapObject
 	and a
@@ -130,12 +130,12 @@ CopyObjectStruct_:: ; 86d7 (2:46d7)
 	ld a, $1
 	ld de, $28
 .asm_86e4
-	ld [hObjectStructIndexBuffer], a
+	ldh [hObjectStructIndexBuffer], a
 	ld a, [hl]
 	and a
 	jr z, .asm_86f4
 	add hl, de
-	ld a, [hConnectedMapWidth]
+	ldh a, [hConnectedMapWidth]
 	inc a
 	cp $d
 	jr nz, .asm_86e4
@@ -160,11 +160,11 @@ CopyMapObjectToObjectStruct: ; 8706 (2:4706)
 	ret
 
 CopyMapObjectToTempObject: ; 870d (2:470d)
-	ld a, [hConnectedMapWidth]
+	ldh a, [hConnectedMapWidth]
 	ld hl, $0
 	add hl, bc
 	ld [hl], a
-	ld a, [hMapObjectIndexBuffer]
+	ldh a, [hMapObjectIndexBuffer]
 	ld [wce99], a
 	ld hl, $1
 	add hl, bc
@@ -210,7 +210,7 @@ InitializeVariableSprites:
 	ld bc, wMap2Object
 	ld a, $2
 .asm_876c
-	ld [hConnectionStripLength], a
+	ldh [hConnectionStripLength], a
 	ld hl, $1
 	add hl, bc
 	ld a, [hl]
@@ -250,7 +250,7 @@ InitializeVariableSprites:
 	add hl, bc
 	ld b, h
 	ld c, l
-	ld a, [hMapObjectIndexBuffer]
+	ldh a, [hMapObjectIndexBuffer]
 	inc a
 	cp $10
 	jr nz, .asm_876c
@@ -289,7 +289,7 @@ asm_87da
 	ld bc, wMap2Object
 	ld a, $2
 .asm_87e4
-	ld [hConnectionStripLength], a
+	ldh [hConnectionStripLength], a
 	ld hl, $1
 	add hl, bc
 	ld a, [hl]
@@ -323,7 +323,7 @@ asm_87da
 	add hl, bc
 	ld b, h
 	ld c, l
-	ld a, [hMapObjectIndexBuffer]
+	ldh a, [hMapObjectIndexBuffer]
 	inc a
 	cp $10
 	jr nz, .asm_87e4
@@ -344,7 +344,7 @@ asm_882e
 	ld bc, wMap2Object
 	ld a, $2
 .asm_8838
-	ld [hConnectionStripLength], a
+	ldh [hConnectionStripLength], a
 	ld hl, $1
 	add hl, bc
 	ld a, [hl]
@@ -378,7 +378,7 @@ asm_882e
 	add hl, bc
 	ld b, h
 	ld c, l
-	ld a, [hConnectionStripLength]
+	ldh a, [hConnectionStripLength]
 	inc a
 	cp $10
 	jr nz, .asm_8838
@@ -474,14 +474,14 @@ InitTempObjectRadius: ; 88fd (2:48fd)
 	ret
 
 TrainerWalkToPlayer:
-	ld a, [hLastTalked]
+	ldh a, [hLastTalked]
 	call InitMovementBuffer
 	ld a, movement_step_sleep
 	call AppendToMovementBuffer
 	ld a, [wcf2a]
 	dec a
 	jr z, .asm_892b
-	ld a, [hLastTalked]
+	ldh a, [hLastTalked]
 	ld b, a
 	ld c, PLAYER
 	ld d, $1
@@ -624,7 +624,7 @@ FollowNotExact:
 	ld hl, $18
 	add hl, de
 	ld [hl], a
-	ld a, [hObjectStructIndexBuffer]
+	ldh a, [hObjectStructIndexBuffer]
 	ld hl, $20
 	add hl, de
 	ld [hl], a
diff --git a/engine/overworld/player_step.asm b/engine/overworld/player_step.asm
index 70947346..36698ed8 100755
--- a/engine/overworld/player_step.asm
+++ b/engine/overworld/player_step.asm
@@ -39,12 +39,12 @@ ScrollScreen::
 	ld d, a
 	ld a, [wPlayerStepVectorY]
 	ld e, a
-	ld a, [hSCX]
+	ldh a, [hSCX]
 	add d
-	ld [hSCX], a
-	ld a, [hSCY]
+	ldh [hSCX], a
+	ldh a, [hSCY]
 	add e
-	ld [hSCY], a
+	ldh [hSCY], a
 	ret
 
 Functiond4f2: ; d4f2 (3:54f2)
diff --git a/engine/overworld/time.asm b/engine/overworld/time.asm
index ce847b18..01273a75 100755
--- a/engine/overworld/time.asm
+++ b/engine/overworld/time.asm
@@ -305,7 +305,7 @@ CalcSecsMinsHoursDaysSince: ; 119c7 (4:59c7)
 	inc hl
 	inc hl
 	inc hl
-	ld a, [hSeconds]
+	ldh a, [hSeconds]
 	ld c, a
 	sub [hl]
 	jr nc, .asm_119d2
@@ -315,7 +315,7 @@ CalcSecsMinsHoursDaysSince: ; 119c7 (4:59c7)
 	dec hl
 	ld [wSecsSince], a
 CalcMinsHoursDaysSince_
-	ld a, [hMinutes]
+	ldh a, [hMinutes]
 	ld c, a
 	sbc [hl]
 	jr nc, .asm_119df
@@ -325,7 +325,7 @@ CalcMinsHoursDaysSince_
 	dec hl
 	ld [wMinsSince], a
 CalcHoursDaysSince_
-	ld a, [hHours]
+	ldh a, [hHours]
 	ld c, a
 	sbc [hl]
 	jr nc, .asm_119ec
@@ -348,11 +348,11 @@ CalcDaysSince_:
 CopyDayHourMinSecToHL: ; 119ff (4:59ff)
 	ld a, [wCurDay]
 	ld [hli], a
-	ld a, [hHours]
+	ldh a, [hHours]
 	ld [hli], a
-	ld a, [hMinutes]
+	ldh a, [hMinutes]
 	ld [hli], a
-	ld a, [hSeconds]
+	ldh a, [hSeconds]
 	ld [hli], a
 	ret
 
@@ -364,15 +364,15 @@ CopyDayToHL: ; 11a0d (4:5a0d)
 CopyDayHourToHL:
 	ld a, [wCurDay]
 	ld [hli], a
-	ld a, [hHours]
+	ldh a, [hHours]
 	ld [hli], a
 	ret
 
 CopyDayHourMinToHL: ; 11a1a (4:5a1a)
 	ld a, [wCurDay]
 	ld [hli], a
-	ld a, [hHours]
+	ldh a, [hHours]
 	ld [hli], a
-	ld a, [hMinutes]
+	ldh a, [hMinutes]
 	ld [hli], a
 	ret
diff --git a/engine/pack.asm b/engine/pack.asm
index 959c6e19..05d4952e 100755
--- a/engine/pack.asm
+++ b/engine/pack.asm
@@ -39,7 +39,7 @@ Function10456: ; 10456 (4:4456)
 
 Pack_InitGFX:
 	xor a
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 	call Function10d70
 	ld a, [wce64]
 	ld [wce63], a
@@ -109,7 +109,7 @@ Pack_InitTMHMPocket:
 	call Function10e51
 	call Function10dd6
 	xor a
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 	call Function10cca
 	call Function10c96
 	ret
@@ -193,7 +193,7 @@ UseTMorHM:
 	ld [wOptions], a
 .asm_105a9
 	xor a
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 	call Function10d70
 	call Function10cca
 	call Function10e5b
@@ -447,7 +447,7 @@ UseItem:
 	jr z, .no_pokemon
 	call DoItemEffect
 	xor a
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 	call Function10d70
 	call Function10cca
 	call Function10e5b
@@ -597,7 +597,7 @@ GiveItem:
 	pop af
 	ld [wOptions], a
 	xor a
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 	call Function10d70
 	call Function10cca
 	call Function10e5b
@@ -656,7 +656,7 @@ Function108e9: ; 108e9 (4:48e9)
 
 BattlePack_InitGFX:
 	xor a
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 	call Function10d70
 	ld a, [wce64]
 	ld [wce63], a
@@ -725,7 +725,7 @@ BattlePack_InitTMHMPocket:
 	call Function10e51
 	call Function10dd6
 	xor a
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 	call Function10cca
 	ld hl, Text_PackEmptyString
 	call Function10cb9
@@ -860,7 +860,7 @@ Function10a86:
 	and a
 	jr nz, asm_10aae
 	xor a
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 	call Function10d70
 	call Function10cca
 	call Function10e5b
@@ -908,7 +908,7 @@ Function10aba: ; 10aba (4:4aba)
 
 Function10ad5: ; 10ad5 (4:4ad5)
 	xor a
-	ld [hBGMapMode], a
+	ldh [hBGMapMode], a
 	ld [wce63], a
 	ld [wce64], a
 	ld [wce65], a
diff --git a/engine/specials.asm b/engine/specials.asm
index aa8aefdd..c6ccef66 100755
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -524,10 +524,10 @@ PlayCurMonCry: ; c60b (3:460b)
 	jp PlayMonCry
 
 GameboyCheck: ; c611 (3:4611)
-	ld a, [hCGB]
+	ldh a, [hCGB]
 	and a
 	jr nz, .asm_c622
-	ld a, [hSGB]
+	ldh a, [hSGB]
 	and a
 	jr nz, .asm_c61e
 	xor a
diff --git a/engine/title.asm b/engine/title.asm
index 8427dfc9..16737cc4 100755
--- a/engine/title.asm
+++ b/engine/title.asm
@@ -14,7 +14,7 @@ StartTitleScreen:
 	res 2, [hl]
 	call ClearTileMap
 	xor a
-	ld [hLCDCPointer], a
+	ldh [hLCDCPointer], a
 	ld b, $8
 	call GetSGBLayout
 	call UpdateTimePals
@@ -50,10 +50,10 @@ InitTitleScreen: ; 6291 (1:6291)
 	call DisableLCD
 	call ClearSprites
 	xor a
-	ld [hBGMapMode], a
-	ld [hMapAnims], a
-	ld [hSCY], a
-	ld [hSCX], a
+	ldh [hBGMapMode], a
+	ldh [hMapAnims], a
+	ldh [hSCY], a
+	ldh [hSCX], a
 	ld hl, $8000
 	ld bc, $2000
 	xor a
@@ -110,7 +110,7 @@ InitTitleScreen: ; 6291 (1:6291)
 	xor a
 	call ByteFill
 	ld a, $43
-	ld [hLCDCPointer], a
+	ldh [hLCDCPointer], a
 	ld b, $c
 	call GetSGBLayout
 	call Function6341
@@ -119,41 +119,41 @@ InitTitleScreen: ; 6291 (1:6291)
 	ret
 
 Function6341: ; 6341 (1:6341)
-	ld a, [hCGB]
+	ldh a, [hCGB]
 	and a
 	jr nz, .asm_6365
-	ld a, [hSGB]
+	ldh a, [hSGB]
 	and a
 	jr nz, .asm_6358
 	ld a, $d8
-	ld [rBGP], a
+	ldh [rBGP], a
 IF DEF(GOLD)
 	ld a, $ff
-	ld [rOBP0], a
+	ldh [rOBP0], a
 	ld a, $f8
 ENDC
 IF DEF(SILVER)
 	ld a, $f0
-	ld [rOBP0], a
+	ldh [rOBP0], a
 	ld a, $f0
 ENDC
-	ld [rOBP1], a
+	ldh [rOBP1], a
 	ret
 
 .asm_6358
 	ld a, $e4
-	ld [rBGP], a
+	ldh [rBGP], a
 IF DEF(GOLD)
 	ld a, $ff
-	ld [rOBP0], a
+	ldh [rOBP0], a
 	ld a, $e4
 ENDC
 IF DEF(SILVER)
 	ld a, $f0
-	ld [rOBP0], a
+	ldh [rOBP0], a
 	ld a, $e0
 ENDC
-	ld [rOBP1], a
+	ldh [rOBP1], a
 	ret
 
 .asm_6365
@@ -166,11 +166,11 @@ ENDC
 	ret
 
 Function636e: ; 636e (1:636e)
-	ld a, [hCGB]
+	ldh a, [hCGB]
 	and a
 	ret z
 	ld a, $1
-	ld [rVBK], a
+	ldh [rVBK], a
 	ld hl, $9800
 	ld bc, $240
 	xor a
@@ -188,7 +188,7 @@ Function636e: ; 636e (1:636e)
 	ld a, $4
 	call ByteFill
 	ld a, $0
-	ld [rVBK], a
+	ldh [rVBK], a
 	ret
 
 Function63a6: ; 63a6 (1:63a6)
@@ -220,7 +220,7 @@ Function63b6: ; 63b6 (1:63b6)
 	jr .asm_63bc
 
 .asm_63ca
-	ld a, [hCGB]
+	ldh a, [hCGB]
 	and a
 	ret nz
 	ld hl, $9960
@@ -236,10 +236,10 @@ TitleScreenFrame: ; 63da (1:63da)
 	jr nz, .asm_63fc
 	call Function640f
 	ld a, $1
-	ld [hOAMUpdate], a
+	ldh [hOAMUpdate], a
 	farcall AnimatedObjects_PlayFrame
 	xor a
-	ld [hOAMUpdate], a
+	ldh [hOAMUpdate], a
 	call Function64b1
 	call DelayFrame
 	and a
@@ -251,7 +251,7 @@ TitleScreenFrame: ; 63da (1:63da)
 
 Function63fe: ; 63fe (1:63fe)
 IF DEF(GOLD)
-	ld a, [hVBlankCounter]
+	ldh a, [hVBlankCounter]
 	and $7
 	ret nz
 ENDC