shithub: pokered

Download patch

ref: bd533aa79bbe1998fd2b699bd7205da2de4fe55c
parent: b36f793667924f868282ce979fabab3e95d642a5
author: U-Fish-PC\Daniel <corrnondacqb@yahoo.com>
date: Wed Jun 25 12:58:27 EDT 2014

Use *Coord instead of FuncCoord
Using 'Coord =' doesn't like using wTileMap
So use hlCoord, deCoord, bcCoord, aCoord, Coorda, or dwCoord
to avoid static addresses

--- a/engine/HoF_room_pc.asm
+++ b/engine/HoF_room_pc.asm
@@ -16,8 +16,7 @@
 	call FillMemory
 	ld hl, wTileMap
 	call Func_7417b
-	FuncCoord 0, 14
-	ld hl, Coord
+	hlCoord 0, 14
 	call Func_7417b
 	ld a, $c0
 	ld [rBGP], a ; $ff47
@@ -62,8 +61,7 @@
 	ld a,[hl]
 	ld [wcf91],a
 	ld [wd0b5],a
-	FuncCoord 8, 6
-	ld hl,Coord
+	hlCoord 8, 6
 	call GetMonHeader
 	call LoadFrontSpriteByMonIndex
 	ld hl,vBGMap0 + $c
@@ -153,8 +151,7 @@
 	jp FillMemory
 
 FillMiddleOfScreenWithWhite: ; 74183 (1d:4183)
-	FuncCoord 0, 4
-	ld hl, Coord
+	hlCoord 0, 4
 	ld bc, $c8 ; 10 rows of 20 tiles each
 	ld a, $7f ; blank white tile
 	jp FillMemory
@@ -164,8 +161,7 @@
 	push de
 .asm_74192
 	pop de
-	FuncCoord 9, 6
-	ld hl, Coord
+	hlCoord 9, 6
 	push hl
 	call FillMiddleOfScreenWithWhite
 	pop hl
@@ -241,12 +237,10 @@
 	ld hl, vChars2 + $600
 	ld bc, (BANK(TheEndGfx) << 8) + $0a
 	call CopyVideoData
-	FuncCoord 4, 8
-	ld hl, Coord
+	hlCoord 4, 8
 	ld de, TheEndTextString
 	call PlaceString
-	FuncCoord 4, 9
-	ld hl, Coord
+	hlCoord 4, 9
 	inc de
 	call PlaceString
 	jp Func_740ba
--- a/engine/battle/1.asm
+++ b/engine/battle/1.asm
@@ -67,12 +67,10 @@
 .asm_789c
 	ld a, [H_WHOSETURN] ; $fff3
 	and a
-	FuncCoord 10, 9
-	ld hl, Coord
+	hlCoord 10, 9
 	ld a, $1
 	jr z, .asm_78aa
-	FuncCoord 2, 2
-	ld hl, Coord
+	hlCoord 2, 2
 	xor a
 .asm_78aa
 	ld [wListMenuID], a ; wListMenuID
--- a/engine/battle/1c.asm
+++ b/engine/battle/1c.asm
@@ -2,8 +2,7 @@
 	ld a, $e4
 	ld [rOBP1], a ; $ff49
 	call Func_7092a
-	FuncCoord 12, 0
-	ld hl, Coord
+	hlCoord 12, 0
 	ld bc, $707
 	call ClearScreenArea
 	call Delay3
@@ -287,8 +286,7 @@
 	call BattleTransition_InwardSpiral
 	jr .done
 .outwardSpiral
-	FuncCoord 10, 10
-	ld hl, Coord
+	hlCoord 10, 10
 	ld a, $3
 	ld [wd09f], a
 	ld a, l
@@ -457,28 +455,20 @@
 	push bc
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a
-	FuncCoord 0, 7
-	ld hl, Coord
-	FuncCoord 0, 8
-	ld de, Coord
+	hlCoord 0, 7
+	deCoord 0, 8
 	ld bc, $ffd8
 	call BattleTransition_CopyTiles1
-	FuncCoord 0, 10
-	ld hl, Coord
-	FuncCoord 0, 9
-	ld de, Coord
+	hlCoord 0, 10
+	deCoord 0, 9
 	ld bc, $28
 	call BattleTransition_CopyTiles1
-	FuncCoord 8, 0
-	ld hl, Coord
-	FuncCoord 9, 0
-	ld de, Coord
+	hlCoord 8, 0
+	deCoord 9, 0
 	ld bc, $fffe
 	call BattleTransition_CopyTiles2
-	FuncCoord 11, 0
-	ld hl, Coord
-	FuncCoord 10, 0
-	ld de, Coord
+	hlCoord 11, 0
+	deCoord 10, 0
 	ld bc, $2
 	call BattleTransition_CopyTiles2
 	ld a, $1
@@ -499,25 +489,19 @@
 	ld [H_AUTOBGTRANSFERENABLED], a
 .loop
 	push bc
-	FuncCoord 0, 16
-	ld hl, Coord
-	FuncCoord 0, 17
-	ld de, Coord
+	hlCoord 0, 16
+	deCoord 0, 17
 	ld bc, $ffd8
 	call BattleTransition_CopyTiles1
-	FuncCoord 0, 1
-	ld hl, Coord
+	hlCoord 0, 1
 	ld de, wTileMap
 	ld bc, $28
 	call BattleTransition_CopyTiles1
-	FuncCoord 18, 0
-	ld hl, Coord
-	FuncCoord 19, 0
-	ld de, Coord
+	hlCoord 18, 0
+	deCoord 19, 0
 	ld bc, $fffe
 	call BattleTransition_CopyTiles2
-	FuncCoord 1, 0
-	ld hl, Coord
+	hlCoord 1, 0
 	ld de, wTileMap
 	ld bc, $2
 	call BattleTransition_CopyTiles2
@@ -615,8 +599,7 @@
 BattleTransition_VerticalStripes: ; 70c7e (1c:4c7e)
 	ld c, $12
 	ld hl, wTileMap
-	FuncCoord 1, 17
-	ld de, Coord
+	deCoord 1, 17
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a
 .loop
@@ -655,8 +638,7 @@
 BattleTransition_HorizontalStripes: ; 70cb4 (1c:4cb4)
 	ld c, $14
 	ld hl, wTileMap
-	FuncCoord 19, 1
-	ld de, Coord
+	deCoord 19, 1
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a
 .loop
@@ -777,104 +759,84 @@
 BattleTransition_HalfCircle1: ; 70d61 (1c:4d61)
 	db $01
 	dw BattleTransition_CircleData1
-	FuncCoord 18, 6
-	dw Coord
+	dwCoord 18, 6
 
 	db $01
 	dw BattleTransition_CircleData2
-	FuncCoord 19, 3
-	dw Coord
+	dwCoord 19, 3
 
 	db $01
 	dw BattleTransition_CircleData3
-	FuncCoord 18, 0
-	dw Coord
+	dwCoord 18, 0
 
 	db $01
 	dw BattleTransition_CircleData4
-	FuncCoord 14, 0
-	dw Coord
+	dwCoord 14, 0
 
 	db $01
 	dw BattleTransition_CircleData5
-	FuncCoord 10, 0
-	dw Coord
+	dwCoord 10, 0
 
 	db $00
 	dw BattleTransition_CircleData5
-	FuncCoord 9, 0
-	dw Coord
+	dwCoord 9, 0
 
 	db $00
 	dw BattleTransition_CircleData4
-	FuncCoord 5, 0
-	dw Coord
+	dwCoord 5, 0
 
 	db $00
 	dw BattleTransition_CircleData3
-	FuncCoord 1, 0
-	dw Coord
+	dwCoord 1, 0
 
 	db $00
 	dw BattleTransition_CircleData2
-	FuncCoord 0, 3
-	dw Coord
+	dwCoord 0, 3
 
 	db $00
 	dw BattleTransition_CircleData1
-	FuncCoord 1, 6
-	dw Coord
+	dwCoord 1, 6
 
 BattleTransition_HalfCircle2: ; 70d93 (1c:4d93)
 	db $00
 	dw BattleTransition_CircleData1
-	FuncCoord 1, 11
-	dw Coord
+	dwCoord 1, 11
 
 	db $00
 	dw BattleTransition_CircleData2
-	FuncCoord 0, 14
-	dw Coord
+	dwCoord 0, 14
 
 	db $00
 	dw BattleTransition_CircleData3
-	FuncCoord 1, 17
-	dw Coord
+	dwCoord 1, 17
 
 	db $00
 	dw BattleTransition_CircleData4
-	FuncCoord 5, 17
-	dw Coord
+	dwCoord 5, 17
 
 	db $00
 	dw BattleTransition_CircleData5
-	FuncCoord 9, 17
-	dw Coord
+	dwCoord 9, 17
 
 	db $01
 	dw BattleTransition_CircleData5
-	FuncCoord 10, 17
-	dw Coord
+	dwCoord 10, 17
 
 	db $01
 	dw BattleTransition_CircleData4
-	FuncCoord 14, 17
-	dw Coord
+	dwCoord 14, 17
 
 	db $01
 	dw BattleTransition_CircleData3
-	FuncCoord 18, 17
-	dw Coord
+	dwCoord 18, 17
 
 	db $01
 	dw BattleTransition_CircleData2
-	FuncCoord 19, 14
-	dw Coord
+	dwCoord 19, 14
 
 	db $01
 	dw BattleTransition_CircleData1
-	FuncCoord 18, 11
-	dw Coord
+	dwCoord 18, 11
 
 BattleTransition_Circle_Sub3: ; 70dc5 (1c:4dc5)
 	push hl
--- a/engine/battle/4_2.asm
+++ b/engine/battle/4_2.asm
@@ -18,8 +18,7 @@
 	jr z, .asm_137de
 	ld de, DrawText
 .asm_137de
-	FuncCoord 6, 8
-	ld hl, Coord
+	hlCoord 6, 8
 	call PlaceString
 	ld c, $c8
 	call DelayFrames
@@ -110,8 +109,7 @@
 	jr z, .asm_13905
 	ld [wd0db], a
 .asm_1389e
-	FuncCoord 9, 9
-	ld hl, Coord
+	hlCoord 9, 9
 	ld c, [hl]
 	ld a, [W_GRASSTILE]
 	cp c
@@ -145,8 +143,7 @@
 .asm_138d7
 	ld c, [hl]
 	ld hl, W_GRASSMONS ; wd888
-	FuncCoord 8, 9
-	ld a, [Coord]
+	aCoord 8, 9
 	cp $14
 	jr nz, .asm_138e5
 	ld hl, W_WATERMONS ; wd8a5 (aliases: wEnemyMon1HP)
@@ -250,14 +247,12 @@
 	ld [hli], a
 	ld [hl], a
 .asm_13982
-	FuncCoord 10, 9
-	ld hl, Coord
+	hlCoord 10, 9
 	ld a, [H_WHOSETURN] ; $fff3
 	and a
 	ld a, $1
 	jr z, .asm_13990
-	FuncCoord 2, 2
-	ld hl, Coord
+	hlCoord 2, 2
 	xor a
 .asm_13990
 	ld [wListMenuID], a ; wListMenuID
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -754,8 +754,7 @@
 	cp a,1
 	ret nz
 .moveGhostMarowakLeft
-	FuncCoord 17,0
-	ld hl,Coord
+	hlCoord 17, 0
 	ld de,20
 	ld bc,$0707 ; 7 rows and 7 columns
 .loop
@@ -854,8 +853,7 @@
 	cp a,1 ; is it the end of the subanimation?
 	jr nz,FlashScreenEveryFourFrameBlocks
 ; if it's the end of the subanimation, make the attacking pokemon disappear
-	FuncCoord 1, 5
-	ld hl,Coord
+	hlCoord 1, 5
 	jp AnimationHideMonPic ; make pokemon disappear
 
 ; flashes the screen when subanimation counter is 1 modulo 4
@@ -1561,11 +1559,9 @@
 	call AnimationHideMonPic
 	ld a, [H_WHOSETURN] ; $fff3
 	and a
-	FuncCoord 2, 5
-	ld hl, Coord
+	hlCoord 2, 5
 	jr z, .asm_79407
-	FuncCoord 11, 0
-	ld hl, Coord
+	hlCoord 11, 0
 .asm_79407
 	xor a
 	push hl
@@ -1676,16 +1672,12 @@
 	ld a, [H_WHOSETURN] ; $fff3
 	and a
 	jr z, .asm_794b1
-	FuncCoord 16, 0
-	ld hl, Coord
-	FuncCoord 14, 0
-	ld de, Coord
+	hlCoord 16, 0
+	deCoord 14, 0
 	jr .asm_794b7
 .asm_794b1
-	FuncCoord 5, 5
-	ld hl, Coord
-	FuncCoord 3, 5
-	ld de, Coord
+	hlCoord 5, 5
+	deCoord 3, 5
 .asm_794b7
 	push de
 	xor a
@@ -1889,12 +1881,10 @@
 	ld a, [H_WHOSETURN] ; $fff3
 	and a
 	jr z, .asm_79602
-	FuncCoord 12, 0
-	ld hl, Coord
+	hlCoord 12, 0
 	jr .asm_79605
 .asm_79602
-	FuncCoord 0, 5
-	ld hl, Coord
+	hlCoord 0, 5
 .asm_79605
 	ld d, $8
 .asm_79607
@@ -2128,8 +2118,7 @@
 	xor a
 	ld [W_SPRITEFLIPPED], a
 	call GetMonHeader
-	FuncCoord 12, 0
-	ld hl, Coord
+	hlCoord 12, 0
 	call LoadFrontSpriteByMonIndex
 	jr .asm_797d3
 .asm_797b0
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -96,8 +96,7 @@
 	ld a, $1
 	ld [wd125], a
 	call DisplayTextBoxID
-	FuncCoord 1, 5
-	ld hl, Coord
+	hlCoord 1, 5
 	ld bc, $307
 	call ClearScreenArea
 	call DisableLCD
@@ -171,8 +170,7 @@
 	ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
 	ld a, $31
 	ld [$ffe1], a
-	FuncCoord 1, 5
-	ld hl, Coord
+	hlCoord 1, 5
 	predef Func_3f0c6
 	xor a
 	ld [$ffb0], a
@@ -309,8 +307,7 @@
 	ld [wcf91], a
 	ld [wBattleMonSpecies2], a
 	call LoadScreenTilesFromBuffer1
-	FuncCoord 1, 5
-	ld hl, Coord
+	hlCoord 1, 5
 	ld a, $9
 	call Func_3c8df
 	call SaveScreenTilesToBuffer1
@@ -736,14 +733,12 @@
 	ret
 
 UpdateCurMonHPBar: ; 3c4f6 (f:44f6)
-	FuncCoord 10, 9
-	ld hl, Coord    ; tile pointer to player HP bar
+	hlCoord 10, 9    ; tile pointer to player HP bar
 	ld a, [H_WHOSETURN] ; $fff3
 	and a
 	ld a, $1
 	jr z, .playersTurn
-	FuncCoord 2, 2
-	ld hl, Coord    ; tile pointer to enemy HP bar
+	hlCoord 2, 2    ; tile pointer to enemy HP bar
 	xor a
 .playersTurn
 	push bc
@@ -828,10 +823,8 @@
 	ld hl, wccf1
 	ld [hli], a
 	ld [hl], a
-	FuncCoord 12, 5
-	ld hl, Coord
-	FuncCoord 12, 6
-	ld de, Coord
+	hlCoord 12, 5
+	deCoord 12, 6
 	call Func_3c893
 	ld hl, wTileMap
 	ld bc, $40b
@@ -1063,14 +1056,11 @@
 	ld [hl], a
 	ld [wBattleMonStatus], a ; wBattleMonStatus
 	call ReadPlayerMonCurHPAndStatus
-	FuncCoord 9, 7
-	ld hl, Coord
+	hlCoord 9, 7
 	ld bc, $50b
 	call ClearScreenArea
-	FuncCoord 1, 10
-	ld hl, Coord
-	FuncCoord 1, 11
-	ld de, Coord
+	hlCoord 1, 10
+	deCoord 1, 11
 	call Func_3c893
 	ld a, $1
 	ld [wcf0b], a
@@ -1096,8 +1086,7 @@
 	ld hl, UseNextMonText
 	call PrintText
 .asm_3c7ad
-	FuncCoord 13, 9
-	ld hl, Coord
+	hlCoord 13, 9
 	ld bc, $a0e
 	ld a, $14
 	ld [wd125], a
@@ -1333,8 +1322,7 @@
 	ld [wAICount],a
 	ld hl,W_PLAYERBATTSTATUS1
 	res 5,[hl]
-	FuncCoord 18, 0
-	ld hl,Coord
+	hlCoord 18, 0
 	ld a,8
 	call Func_3c8df
 	call Func_3ee94
@@ -1404,8 +1392,7 @@
 	jr nz,.next4
 	ld hl, TrainerAboutToUseText
 	call PrintText
-	FuncCoord 0, 7
-	ld hl,Coord
+	hlCoord 0, 7
 	ld bc,$0801
 	ld a,$14
 	ld [wd125],a
@@ -1456,8 +1443,7 @@
 	call LoadMonFrontSprite
 	ld a,$CF
 	ld [$FFE1],a
-	FuncCoord 15, 6
-	ld hl,Coord
+	hlCoord 15, 6
 	predef Func_3f073
 	ld a,[wEnemyMonSpecies2]
 	call PlayCry
@@ -1777,8 +1763,7 @@
 	ld [H_WHOSETURN], a ; $fff3
 	ld a, POOF_ANIM
 	call PlayMoveAnimation
-	FuncCoord 4, 11
-	ld hl, Coord
+	hlCoord 4, 11
 	predef Func_3f073
 	ld a, [wcf91]
 	call PlayCry
@@ -1786,12 +1771,10 @@
 	jp SaveScreenTilesToBuffer1
 
 Func_3ccfa: ; 3ccfa (f:4cfa)
-	FuncCoord 1, 5
-	ld hl, Coord
+	hlCoord 1, 5
 	ld bc, $707
 	call ClearScreenArea
-	FuncCoord 3, 7
-	ld hl, Coord
+	hlCoord 3, 7
 	ld bc, $505
 	xor a
 	ld [wcd6c], a
@@ -1800,8 +1783,7 @@
 	ld c, $4
 	call DelayFrames
 	call Func_3cd3a
-	FuncCoord 4, 9
-	ld hl, Coord
+	hlCoord 4, 9
 	ld bc, $303
 	ld a, $1
 	ld [wcd6c], a
@@ -1811,12 +1793,10 @@
 	call Delay3
 	call Func_3cd3a
 	ld a, $4c
-	FuncCoord 5, 11
-	ld [Coord], a
+	Coorda 5, 11
 
 Func_3cd3a: ; 3cd3a (f:4d3a)
-	FuncCoord 1, 5
-	ld hl, Coord
+	hlCoord 1, 5
 	ld bc, $707
 	jp ClearScreenArea
 
@@ -1839,17 +1819,14 @@
 Func_3cd60: ; 3cd60 (f:4d60)
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
-	FuncCoord 9, 7
-	ld hl, Coord
+	hlCoord 9, 7
 	ld bc, $50b
 	call ClearScreenArea
 	callab PlacePlayerHUDTiles
-	FuncCoord 18, 9
-	ld hl, Coord
+	hlCoord 18, 9
 	ld [hl], $73
 	ld de, wBattleMonNick
-	FuncCoord 10, 7
-	ld hl, Coord
+	hlCoord 10, 7
 	call Func_3ce9c
 	call PlaceString
 	ld hl, wBattleMonSpecies
@@ -1860,8 +1837,7 @@
 	ld de, wcfb9
 	ld bc, $b
 	call CopyData
-	FuncCoord 14, 8
-	ld hl, Coord
+	hlCoord 14, 8
 	push hl
 	inc hl
 	ld de, wcf9c
@@ -1872,8 +1848,7 @@
 .asm_3cdae
 	ld a, [wcf98]
 	ld [wcf91], a
-	FuncCoord 10, 9
-	ld hl, Coord
+	hlCoord 10, 9
 	predef DrawHP 
 	ld a, $1
 	ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
@@ -1910,12 +1885,10 @@
 	call ClearScreenArea
 	callab PlaceEnemyHUDTiles
 	ld de, wEnemyMonNick
-	FuncCoord 1, 0
-	ld hl, Coord
+	hlCoord 1, 0
 	call Func_3ce9c
 	call PlaceString
-	FuncCoord 4, 1
-	ld hl, Coord
+	hlCoord 4, 1
 	push hl
 	inc hl
 	ld de, wEnemyMonStatus ; wcfe9
@@ -1984,8 +1957,7 @@
 Func_3ce7f: ; 3ce7f (f:4e7f)
 	xor a
 	ld [wListMenuID], a ; wListMenuID
-	FuncCoord 2, 2
-	ld hl, Coord
+	hlCoord 2, 2
 	call DrawHPBar
 	ld a, $1
 	ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
@@ -2055,14 +2027,12 @@
 	ld bc, $b
 	call CopyData
 	; the following simulates the keystrokes by drawing menus on screen
-	FuncCoord 9, 14
-	ld hl, Coord
+	hlCoord 9, 14
 	ld [hl], "▶"
 	ld c, $50
 	call DelayFrames
 	ld [hl], $7f
-	FuncCoord 9, 16
-	ld hl, Coord
+	hlCoord 9, 16
 	ld [hl], "▶"
 	ld c, $32
 	call DelayFrames
@@ -2087,19 +2057,14 @@
 	cp $2
 	ld a, " "
 	jr z, .safaribattle
-	FuncCoord 15, 14
-	ld [Coord], a
-	FuncCoord 15, 16
-	ld [Coord], a
+	Coorda 15, 14
+	Coorda 15, 16
 	ld b, $9
 	jr .notsafari
 .safaribattle
-	FuncCoord 13, 14
-	ld [Coord], a
-	FuncCoord 13, 16
-	ld [Coord], a
-	FuncCoord 7, 14
-	ld hl, Coord
+	Coorda 13, 14
+	Coorda 13, 16
+	hlCoord 7, 14
 	ld de, W_NUMSAFARIBALLS ; W_NUMSAFARIBALLS
 	ld bc, $102
 	call PrintNumber
@@ -2124,19 +2089,14 @@
 	cp $2
 	ld a, " "
 	jr z, .safarirightcolumn
-	FuncCoord 9, 14
-	ld [Coord], a
-	FuncCoord 9, 16
-	ld [Coord], a
+	Coorda 9, 14
+	Coorda 9, 16
 	ld b, $f
 	jr .notsafarirightcolumn
 .safarirightcolumn
-	FuncCoord 1, 14
-	ld [Coord], a
-	FuncCoord 1, 16
-	ld [Coord], a
-	FuncCoord 7, 14
-	ld hl, Coord
+	Coorda 1, 14
+	Coorda 1, 16
+	hlCoord 7, 14
 	ld de, W_NUMSAFARIBALLS ; W_NUMSAFARIBALLS
 	ld bc, $102
 	call PrintNumber
@@ -2328,8 +2288,7 @@
 	jp InitBattleMenu
 
 Func_3d105: ; 3d105 (f:5105)
-	FuncCoord 11, 11
-	ld hl, Coord
+	hlCoord 11, 11
 	ld bc, $81
 	ld a, $7f
 	call FillMemory
@@ -2484,21 +2443,17 @@
 	ret z
 	ld hl, wBattleMonMoves
 	call .loadmoves
-	FuncCoord 4, 12
-	ld hl, Coord
+	hlCoord 4, 12
 	ld b, $4
 	ld c, $e
 	di
 	call TextBoxBorder
-	FuncCoord 4, 12
-	ld hl, Coord
+	hlCoord 4, 12
 	ld [hl], $7a
-	FuncCoord 10, 12
-	ld hl, Coord
+	hlCoord 10, 12
 	ld [hl], $7e
 	ei
-	FuncCoord 6, 13
-	ld hl, Coord
+	hlCoord 6, 13
 	call .writemoves
 	ld b, $5
 	ld a, $c
@@ -2506,13 +2461,11 @@
 .mimicmenu
 	ld hl, wEnemyMonMoves
 	call .loadmoves
-	FuncCoord 0, 7
-	ld hl, Coord
+	hlCoord 0, 7
 	ld b, $4
 	ld c, $e
 	call TextBoxBorder
-	FuncCoord 2, 8
-	ld hl, Coord
+	hlCoord 2, 8
 	call .writemoves
 	ld b, $1
 	ld a, $7
@@ -2523,13 +2476,11 @@
 	ld bc, $2c
 	call AddNTimes
 	call .loadmoves
-	FuncCoord 4, 7
-	ld hl, Coord
+	hlCoord 4, 7
 	ld b, $4
 	ld c, $e
 	call TextBoxBorder
-	FuncCoord 6, 8
-	ld hl, Coord
+	hlCoord 6, 8
 	call .writemoves
 	ld b, $5
 	ld a, $7
@@ -2584,8 +2535,7 @@
 	jr z, .battleselect
 	dec a
 	jr nz, .select
-	FuncCoord 1, 14
-	ld hl, Coord
+	hlCoord 1, 14
 	ld de, WhichTechniqueString ; $53b8
 	call PlaceString
 	jr .select
@@ -2597,8 +2547,7 @@
 	ld a, [wcc35]
 	and a
 	jr z, .select
-	FuncCoord 5, 13
-	ld hl, Coord
+	hlCoord 5, 13
 	dec a
 	ld bc, $14
 	call AddNTimes
@@ -2834,8 +2783,7 @@
 Func_3d4b6: ; 3d4b6 (f:54b6)
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
-	FuncCoord 0, 8
-	ld hl, Coord
+	hlCoord 0, 8
 	ld b, $3
 	ld c, $9
 	call TextBoxBorder
@@ -2848,8 +2796,7 @@
 	ld a, [wCurrentMenuItem] ; wCurrentMenuItem
 	cp b
 	jr nz, .asm_3d4df
-	FuncCoord 1, 10
-	ld hl, Coord
+	hlCoord 1, 10
 	ld de, DisabledText
 	call PlaceString
 	jr .asm_3d54e
@@ -2879,29 +2826,23 @@
 	ld a, [hl]
 	and $3f
 	ld [wcd6d], a
-	FuncCoord 1, 9
-	ld hl, Coord
+	hlCoord 1, 9
 	ld de, TypeText
 	call PlaceString
-	FuncCoord 7, 11
-	ld hl, Coord
+	hlCoord 7, 11
 	ld [hl], "/"
-	FuncCoord 5, 9
-	ld hl, Coord
+	hlCoord 5, 9
 	ld [hl], "/"
-	FuncCoord 5, 11
-	ld hl, Coord
+	hlCoord 5, 11
 	ld de, wcd6d
 	ld bc, $102
 	call PrintNumber
-	FuncCoord 8, 11
-	ld hl, Coord
+	hlCoord 8, 11
 	ld de, wd11e
 	ld bc, $102
 	call PrintNumber
 	call GetCurrentMove
-	FuncCoord 2, 10
-	ld hl, Coord
+	hlCoord 2, 10
 	predef Func_27d98
 .asm_3d54e
 	ld a, $1
@@ -4773,8 +4714,7 @@
 	ld [wHPBarNewHP+1],a
 	ld a,[hl]
 	ld [wHPBarNewHP],a
-	FuncCoord 2, 2
-	ld hl,Coord
+	hlCoord 2, 2
 	xor a
 	ld [wListMenuID],a
 	predef UpdateHPBar2 ; animate the HP bar shortening
@@ -4892,8 +4832,7 @@
 	ld [wHPBarMaxHP+1],a
 	ld a,[hl]
 	ld [wHPBarMaxHP],a
-	FuncCoord 10, 9
-	ld hl,Coord
+	hlCoord 10, 9
 	ld a,$01
 	ld [wListMenuID],a
 	predef UpdateHPBar2 ; animate the HP bar shortening
@@ -6274,8 +6213,7 @@
 	ld [$0], a
 	ld a, $31
 	ld [$ffe1], a
-	FuncCoord 1, 5
-	ld hl, Coord
+	hlCoord 1, 5
 	predef_jump Func_3f0c6
 
 Func_3ed02: ; 3ed02 (f:6d02)
@@ -6676,8 +6614,7 @@
 	ld [$ffe1], a
 	dec a
 	ld [wAICount], a ; wccdf
-	FuncCoord 12, 0
-	ld hl, Coord
+	hlCoord 12, 0
 	predef Func_3f0c6
 	ld a, $ff
 	ld [wEnemyMonPartyPos], a
@@ -6731,8 +6668,7 @@
 	xor a
 	ld [W_TRAINERCLASS], a ; wd031
 	ld [$ffe1], a
-	FuncCoord 12, 0
-	ld hl, Coord
+	hlCoord 12, 0
 	predef Func_3f0c6
 
 Func_3efeb: ; 3efeb (f:6feb)
@@ -6753,12 +6689,10 @@
 	ld a, $9c
 	ld [$ffbd], a
 	call LoadScreenTilesFromBuffer1
-	FuncCoord 9, 7
-	ld hl, Coord
+	hlCoord 9, 7
 	ld bc, $50a
 	call ClearScreenArea
-	FuncCoord 1, 0
-	ld hl, Coord
+	hlCoord 1, 0
 	ld bc, $40a
 	call ClearScreenArea
 	call ClearSprites
@@ -6900,8 +6834,7 @@
 ; been loaded with GetMonHeader.
 	ld a, [wBattleMonSpecies2]
 	ld [wcf91], a
-	FuncCoord 1, 5
-	ld hl, Coord
+	hlCoord 1, 5
 	ld b, $7
 	ld c, $8
 	call ClearScreenArea
--- a/engine/battle/d.asm
+++ b/engine/battle/d.asm
@@ -1,20 +1,16 @@
 Func_372d6: ; 372d6 (d:72d6)
 	call LoadTextBoxTilePatterns
-	FuncCoord 3, 4
-	ld hl, Coord
+	hlCoord 3, 4
 	ld b, $7
 	ld c, $c
 	call TextBoxBorder
-	FuncCoord 4, 5
-	ld hl, Coord
+	hlCoord 4, 5
 	ld de, wPlayerName ; wd158
 	call PlaceString
-	FuncCoord 4, 10
-	ld hl, Coord
+	hlCoord 4, 10
 	ld de, W_GRASSRATE ; W_GRASSRATE
 	call PlaceString
-	FuncCoord 9, 8
-	ld hl, Coord
+	hlCoord 9, 8
 	ld a, $69
 	ld [hli], a
 	ld [hl], $6a
--- a/engine/battle/e.asm
+++ b/engine/battle/e.asm
@@ -67,8 +67,7 @@
 	ld b, $1
 	call GoPAL_SET
 	callab _LoadTrainerPic
-	FuncCoord 19, 0
-	ld hl, Coord
+	hlCoord 19, 0
 	ld c, $0
 .asm_396e9
 	inc c
@@ -1173,8 +1172,7 @@
 
 Func_3a718: ; 3a718 (e:6718)
 	call AIPrintItemUse_
-	FuncCoord 2, 2
-	ld hl,Coord
+	hlCoord 2, 2
 	xor a
 	ld [wListMenuID],a
 	predef UpdateHPBar2
@@ -1489,8 +1487,7 @@
 	ld de, wTrainerFacingDirection
 	ld bc, $3
 	call CopyData
-	FuncCoord 18, 10
-	ld hl, Coord
+	hlCoord 18, 10
 	ld de, rIE ; $ffff
 	jr PlaceHUDTiles
 
@@ -1505,8 +1502,7 @@
 	ld de, wTrainerFacingDirection
 	ld bc, $3
 	call CopyData
-	FuncCoord 1, 2
-	ld hl, Coord
+	hlCoord 1, 2
 	ld de, $1
 	jr PlaceHUDTiles
 
--- a/engine/battle/e_2.asm
+++ b/engine/battle/e_2.asm
@@ -85,12 +85,10 @@
 	call BankswitchEtoF
 	ld a, [H_WHOSETURN] ; $fff3
 	and a
-	FuncCoord 10, 9
-	ld hl, Coord
+	hlCoord 10, 9
 	ld a, $1
 	jr z, .asm_3ba83
-	FuncCoord 2, 2
-	ld hl, Coord
+	hlCoord 2, 2
 	xor a
 .asm_3ba83
 	ld [wListMenuID], a ; wListMenuID
--- a/engine/cable_club.asm
+++ b/engine/cable_club.asm
@@ -6,13 +6,11 @@
 	call LoadFontTilePatterns
 	call LoadHpBarAndStatusTilePatterns
 	call LoadTrainerInfoTextBoxTiles
-	FuncCoord 3, 8
-	ld hl, Coord
+	hlCoord 3, 8
 	ld b, $2
 	ld c, $c
 	call Func_5ab3
-	FuncCoord 4, 10
-	ld hl, Coord
+	hlCoord 4, 10
 	ld de, PleaseWaitString ; $550f
 	call PlaceString
 	ld hl, W_NUMHITS ; wd074
--- a/engine/clear_save.asm
+++ b/engine/clear_save.asm
@@ -5,8 +5,7 @@
 	call LoadTextBoxTilePatterns
 	ld hl, ClearSaveDataText
 	call PrintText
-	FuncCoord 14, 7
-	ld hl, Coord
+	hlCoord 14, 7
 	ld bc, $80f
 	ld a, $7
 	ld [wd12c], a
--- a/engine/evolution.asm
+++ b/engine/evolution.asm
@@ -99,8 +99,7 @@
 
 Func_7beb9: ; 7beb9 (1e:7eb9)
 	call GetMonHeader
-	FuncCoord 7, 2
-	ld hl, Coord
+	hlCoord 7, 2
 	jp LoadFlippedFrontSpriteByMonIndex
 asm_7bec2: ; 7bec2 (1e:7ec2)
 	ld a, $31
@@ -117,8 +116,7 @@
 	push bc
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
-	FuncCoord 7, 2
-	ld hl, Coord
+	hlCoord 7, 2
 	ld bc, $707
 	ld de, $d
 .asm_7bee3
--- a/engine/hall_of_fame.asm
+++ b/engine/hall_of_fame.asm
@@ -57,13 +57,11 @@
 	call Func_702e1
 	ld c, $50
 	call DelayFrames
-	FuncCoord 2, 13
-	ld hl, Coord
+	hlCoord 2, 13
 	ld b, $3
 	ld c, $e
 	call TextBoxBorder
-	FuncCoord 4, 15
-	ld hl, Coord
+	hlCoord 4, 15
 	ld de, HallOfFameText
 	call PlaceString
 	ld c, 180
@@ -113,8 +111,7 @@
 	call Func_7033e
 	jr .asm_702ab
 .asm_7029d
-	FuncCoord 12, 5
-	ld hl, Coord
+	hlCoord 12, 5
 	call GetMonHeader
 	call LoadFrontSpriteByMonIndex
 	predef LoadMonBackPic
@@ -157,27 +154,22 @@
 	jp Func_70404
 
 Func_702f0: ; 702f0 (1c:42f0)
-	FuncCoord 0, 2
-	ld hl, Coord
+	hlCoord 0, 2
 	ld b, $9
 	ld c, $a
 	call TextBoxBorder
-	FuncCoord 2, 6
-	ld hl, Coord
+	hlCoord 2, 6
 	ld de, HoFMonInfoText
 	call PlaceString
-	FuncCoord 1, 4
-	ld hl, Coord
+	hlCoord 1, 4
 	ld de, wcd6d
 	call PlaceString
 	ld a, [wTrainerFacingDirection]
-	FuncCoord 8, 7
-	ld hl, Coord
+	hlCoord 8, 7
 	call PrintLevelCommon
 	ld a, [wWhichTrade] ; wWhichTrade
 	ld [wd0b5], a
-	FuncCoord 3, 9
-	ld hl, Coord
+	hlCoord 3, 9
 	predef Func_27d6b
 	ld a, [wWhichTrade] ; wWhichTrade
 	jp PlayCry
@@ -207,8 +199,7 @@
 
 Func_7036d: ; 7036d (1c:436d)
 	ld b, $0
-	FuncCoord 12, 5
-	ld hl, Coord
+	hlCoord 12, 5
 	predef_jump Func_79dda
 
 Func_70377: ; 70377 (1c:4377)
@@ -215,26 +206,21 @@
 	ld hl, wd747
 	set 3, [hl]
 	predef DisplayDexRating
-	FuncCoord 0, 4
-	ld hl, Coord
+	hlCoord 0, 4
 	ld b, $6
 	ld c, $a
 	call TextBoxBorder
-	FuncCoord 5, 0
-	ld hl, Coord
+	hlCoord 5, 0
 	ld b, $2
 	ld c, $9
 	call TextBoxBorder
-	FuncCoord 7, 2
-	ld hl, Coord
+	hlCoord 7, 2
 	ld de, wPlayerName ; wd158
 	call PlaceString
-	FuncCoord 1, 6
-	ld hl, Coord
+	hlCoord 1, 6
 	ld de, HoFPlayTimeText
 	call PlaceString
-	FuncCoord 5, 7
-	ld hl, Coord
+	hlCoord 5, 7
 	ld de, W_PLAYTIMEHOURS + 1
 	ld bc, $103
 	call PrintNumber
@@ -243,12 +229,10 @@
 	ld de, W_PLAYTIMEMINUTES + 1
 	ld bc, $8102
 	call PrintNumber
-	FuncCoord 1, 9
-	ld hl, Coord
+	hlCoord 1, 9
 	ld de, HoFMoneyText
 	call PlaceString
-	FuncCoord 4, 10
-	ld hl, Coord
+	hlCoord 4, 10
 	ld de, wPlayerMoney ; wPlayerMoney
 	ld c, $a3
 	call PrintBCDNumber
--- a/engine/hidden_object_functions17.asm
+++ b/engine/hidden_object_functions17.asm
@@ -77,8 +77,7 @@
 	call LoadMonFrontSprite
 	ld a, $80
 	ld [$ffe1], a
-	FuncCoord 10, 11
-	ld hl, Coord
+	hlCoord 10, 11
 	predef Func_3f073
 	call WaitForTextScrollButtonPress
 	call LoadScreenTilesFromBuffer1
--- a/engine/hidden_object_functions3.asm
+++ b/engine/hidden_object_functions3.asm
@@ -5,8 +5,7 @@
 	jr nz, .asm_fb7f
 	ld a, [W_CURMAPTILESET] ; W_CURMAPTILESET
 	ld b, a
-	FuncCoord 8, 7
-	ld a, [Coord]
+	aCoord 8, 7
 	ld c, a
 	ld hl, BookshelfTileIDs ; $7b8b
 .asm_fb62
--- a/engine/intro.asm
+++ b/engine/intro.asm
@@ -204,8 +204,7 @@
 	jr asm_417fe
 
 Func_417f8: ; 417f8 (10:57f8)
-	FuncCoord 0, 4
-	ld hl, Coord
+	hlCoord 0, 4
 	ld bc, $c8
 asm_417fe: ; 417fe (10:57fe)
 	ld [hl], $0
@@ -259,8 +258,7 @@
 	ret
 
 Func_4183f: ; 4183f (10:583f)
-	FuncCoord 13, 7
-	ld hl, Coord
+	hlCoord 13, 7
 
 Func_41842: ; 41842 (10:5842)
 	ld c, $0
@@ -335,8 +333,7 @@
 	ld hl, wTileMap
 	ld c, $50
 	call Func_41807
-	FuncCoord 0, 14
-	ld hl, Coord
+	hlCoord 0, 14
 	ld c, $50
 	call Func_41807
 	ld hl, vBGMap1
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -913,8 +913,7 @@
 	sbc b
 	ld [hl],a
 	ld [wHPBarNewHP+1],a
-	FuncCoord 4, 1
-	ld hl,Coord
+	hlCoord 4, 1
 	ld a,[wWhichPokemon]
 	ld bc,2 * 20
 	call AddNTimes ; calculate coordinates of HP bar of pokemon that used Softboiled
@@ -2096,8 +2095,7 @@
 	call PrintText
 	ld hl,TeachMachineMoveText
 	call PrintText
-	FuncCoord 14,7
-	ld hl,Coord
+	hlCoord 14, 7
 	ld bc,$080f
 	ld a,$14
 	ld [wd125],a
@@ -2488,8 +2486,7 @@
 	call CopyStringToCF4B ; copy name to wcf4b
 	ld hl,IsItOKToTossItemText
 	call PrintText
-	FuncCoord 14,7
-	ld hl,Coord
+	hlCoord 14, 7
 	ld bc,$080f
 	ld a,$14
 	ld [wd125],a
--- a/engine/learn_move.asm
+++ b/engine/learn_move.asm
@@ -76,8 +76,7 @@
 AbandonLearning: ; 6eda (1:6eda)
 	ld hl, AbandonLearningText
 	call PrintText
-	FuncCoord 14, 7
-	ld hl, Coord
+	hlCoord 14, 7
 	ld bc, $80f
 	ld a, $14
 	ld [wd125], a
@@ -100,8 +99,7 @@
 	push hl
 	ld hl, TryingToLearnText
 	call PrintText
-	FuncCoord 14, 7
-	ld hl, Coord
+	hlCoord 14, 7
 	ld bc, $80f
 	ld a, $14
 	ld [wd125], a
@@ -122,13 +120,11 @@
 	push hl
 	ld hl, WhichMoveToForgetText
 	call PrintText
-	FuncCoord 4, 7
-	ld hl, Coord
+	hlCoord 4, 7
 	ld b, $4
 	ld c, $e
 	call TextBoxBorder
-	FuncCoord 6, 8
-	ld hl, Coord
+	hlCoord 6, 8
 	ld de, wd0e1
 	ld a, [$fff6]
 	set 2, a
--- a/engine/menu/bills_pc.asm
+++ b/engine/menu/bills_pc.asm
@@ -32,18 +32,15 @@
 	ld a, [wd7f1]
 	bit 0, a
 	jr nz, .asm_21414
-	FuncCoord 2, 2
-	ld hl, Coord
+	hlCoord 2, 2
 	ld de, SomeonesPCText ; $548b
 	jr .asm_2141a
 .asm_21414
-	FuncCoord 2, 2
-	ld hl, Coord
+	hlCoord 2, 2
 	ld de, BillsPCText ; $5497
 .asm_2141a
 	call PlaceString
-	FuncCoord 2, 4
-	ld hl, Coord
+	hlCoord 2, 4
 	ld de, wPlayerName ; wd158
 	call PlaceString
 	ld l, c
@@ -53,8 +50,7 @@
 	ld a, [wd74b]
 	bit 5, a
 	jr z, .asm_21462
-	FuncCoord 2, 6
-	ld hl, Coord
+	hlCoord 2, 6
 	ld de, OaksPCText ; $54a5
 	call PlaceString
 	ld a, [wd5a2]
@@ -62,24 +58,20 @@
 	jr z, .asm_2145a
 	ld a, $4
 	ld [wMaxMenuItem], a ; wMaxMenuItem
-	FuncCoord 2, 8
-	ld hl, Coord
+	hlCoord 2, 8
 	ld de, PKMNLeaguePCText ; $54b2
 	call PlaceString
-	FuncCoord 2, 10
-	ld hl, Coord
+	hlCoord 2, 10
 	ld de, LogOffPCText ; $54ba
 	jr .asm_2146d
 .asm_2145a
-	FuncCoord 2, 8
-	ld hl, Coord
+	hlCoord 2, 8
 	ld de, LogOffPCText ; $54ba
 	jr .asm_2146d
 .asm_21462
 	ld a, $2
 	ld [wMaxMenuItem], a ; wMaxMenuItem
-	FuncCoord 2, 6
-	ld hl, Coord
+	hlCoord 2, 6
 	ld de, LogOffPCText ; $54ba
 .asm_2146d
 	call PlaceString
@@ -146,8 +138,7 @@
 	ld b, $a
 	ld c, $c
 	call TextBoxBorder
-	FuncCoord 2, 2
-	ld hl, Coord
+	hlCoord 2, 2
 	ld de, BillsPCMenuText ; $56e1
 	call PlaceString
 	ld hl, wTopMenuItemY ; wTopMenuItemY
@@ -170,8 +161,7 @@
 	ld [wPlayerMonNumber], a ; wPlayerMonNumber
 	ld hl, WhatText
 	call PrintText
-	FuncCoord 9, 14
-	ld hl, Coord
+	hlCoord 9, 14
 	ld b, $2
 	ld c, $9
 	call TextBoxBorder
@@ -180,8 +170,7 @@
 	cp $9
 	jr c, .asm_2154f
 	sub $9
-	FuncCoord 17, 16
-	ld hl, Coord
+	hlCoord 17, 16
 	ld [hl], $f7
 	add $f6
 	jr .asm_21551
@@ -188,10 +177,8 @@
 .asm_2154f
 	add $f7
 .asm_21551
-	FuncCoord 18, 16
-	ld [Coord], a
-	FuncCoord 10, 16
-	ld hl, Coord
+	Coorda 18, 16
+	hlCoord 10, 16
 	ld de, BoxNoPCText ; $5713
 	call PlaceString
 	ld a, $1
@@ -405,8 +392,7 @@
 	db $ff
 
 Func_2174b: ; 2174b (8:574b)
-	FuncCoord 9, 10
-	ld hl, Coord
+	hlCoord 9, 10
 	ld b, $6
 	ld c, $9
 	call TextBoxBorder
@@ -416,11 +402,9 @@
 	jr nz, .asm_21761
 	ld de, WithdrawPCText ; $57d3
 .asm_21761
-	FuncCoord 11, 12
-	ld hl, Coord
+	hlCoord 11, 12
 	call PlaceString
-	FuncCoord 11, 14
-	ld hl, Coord
+	hlCoord 11, 14
 	ld de, StatsCancelPCText ; $57dc
 	call PlaceString
 	ld hl, wTopMenuItemY ; wTopMenuItemY
--- a/engine/menu/diploma.asm
+++ b/engine/menu/diploma.asm
@@ -33,8 +33,7 @@
 	pop bc
 	dec c
 	jr nz, .asm_56715 ; 0x56725 $ee
-	FuncCoord 10, 4
-	ld hl, Coord
+	hlCoord 10, 4
 	ld de, wPlayerName
 	call PlaceString
 	callba Func_44dd
--- a/engine/menu/league_pc.asm
+++ b/engine/menu/league_pc.asm
@@ -93,22 +93,18 @@
 	ld b, $0B
 	ld c, 0
 	call GoPAL_SET
-	FuncCoord 12, 5
-	ld hl, Coord
+	hlCoord 12, 5
 	call GetMonHeader
 	call LoadFrontSpriteByMonIndex
 	call GBPalNormal
-	FuncCoord 0, 13
-	ld hl, Coord
+	hlCoord 0, 13
 	ld b, 2
 	ld c, $12
 	call TextBoxBorder
-	FuncCoord 1, 15
-	ld hl, Coord
+	hlCoord 1, 15
 	ld de, HallOfFameNoText
 	call PlaceString
-	FuncCoord 16, 15
-	ld hl, Coord
+	hlCoord 16, 15
 	ld de, wcd42
 	ld bc, $0103
 	call PrintNumber
--- a/engine/menu/main_menu.asm
+++ b/engine/menu/main_menu.asm
@@ -33,24 +33,20 @@
 	ld a,[wd088]
 	cp a,1
 	jr z,.next1
-	FuncCoord 0,0
-	ld hl,Coord
+	hlCoord 0, 0
 	ld b,6
 	ld c,13
 	call TextBoxBorder
-	FuncCoord 2,2
-	ld hl,Coord
+	hlCoord 2, 2
 	ld de,ContinueText
 	call PlaceString
 	jr .next2
 .next1
-	FuncCoord 0,0
-	ld hl,Coord
+	hlCoord 0, 0
 	ld b,4
 	ld c,13
 	call TextBoxBorder
-	FuncCoord 2,2
-	ld hl,Coord
+	hlCoord 2, 2
 	ld de,NewGameText
 	call PlaceString
 .next2
@@ -142,14 +138,12 @@
 	call SaveScreenTilesToBuffer1
 	ld hl, WhereWouldYouLikeText
 	call PrintText
-	FuncCoord 5, 5
-	ld hl, Coord
+	hlCoord 5, 5
 	ld b, $6
 	ld c, $d
 	call TextBoxBorder
 	call UpdateSprites
-	FuncCoord 7, 7
-	ld hl, Coord
+	hlCoord 7, 7
 	ld de, TradeCenterText
 	call PlaceString
 	xor a
@@ -238,14 +232,11 @@
 	ld c, d
 .asm_5ccc
 	ld a, b
-	FuncCoord 6, 7
-	ld [Coord], a
+	Coorda 6, 7
 	ld a, c
-	FuncCoord 6, 9
-	ld [Coord], a
+	Coorda 6, 9
 	ld a, d
-	FuncCoord 6, 11
-	ld [Coord], a
+	Coorda 6, 11
 	ld c, $28
 	call DelayFrames
 	call LoadScreenTilesFromBuffer1
@@ -343,27 +334,21 @@
 ContinueGame: ; 5db5 (1:5db5)
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
-	FuncCoord 4, 7
-	ld hl, Coord
+	hlCoord 4, 7
 	ld b, $8
 	ld c, $e
 	call TextBoxBorder
-	FuncCoord 5, 9
-	ld hl, Coord
+	hlCoord 5, 9
 	ld de, SaveScreenInfoText
 	call PlaceString
-	FuncCoord 12, 9
-	ld hl, Coord
+	hlCoord 12, 9
 	ld de, wPlayerName ; wd158
 	call PlaceString
-	FuncCoord 17, 11
-	ld hl, Coord
+	hlCoord 17, 11
 	call Func_5e2f
-	FuncCoord 16, 13
-	ld hl, Coord
+	hlCoord 16, 13
 	call Func_5e42
-	FuncCoord 13, 15
-	ld hl, Coord
+	hlCoord 13, 15
 	call Func_5e55
 	ld a, $1
 	ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
@@ -433,35 +418,28 @@
 	next "TIME@"
 
 DisplayOptionMenu: ; 5e8a (1:5e8a)
-	FuncCoord 0,0
-	ld hl,Coord
+	hlCoord 0, 0
 	ld b,3
 	ld c,18
 	call TextBoxBorder
-	FuncCoord 0,5
-	ld hl,Coord
+	hlCoord 0, 5
 	ld b,3
 	ld c,18
 	call TextBoxBorder
-	FuncCoord 0,10
-	ld hl,Coord
+	hlCoord 0, 10
 	ld b,3
 	ld c,18
 	call TextBoxBorder
-	FuncCoord 1,1
-	ld hl,Coord
+	hlCoord 1, 1
 	ld de,TextSpeedOptionText
 	call PlaceString
-	FuncCoord 1,6
-	ld hl,Coord
+	hlCoord 1, 6
 	ld de,BattleAnimationOptionText
 	call PlaceString
-	FuncCoord 1,11
-	ld hl,Coord
+	hlCoord 1, 11
 	ld de,BattleStyleOptionText
 	call PlaceString
-	FuncCoord 2,16
-	ld hl,Coord
+	hlCoord 2, 16
 	ld de,OptionMenuCancelText
 	call PlaceString
 	xor a
@@ -655,8 +633,7 @@
 	dec hl
 	ld a,[hl]
 	ld [wWhichTrade],a ; text speed cursor X coordinate
-	FuncCoord 0,3
-	ld hl,Coord
+	hlCoord 0, 3
 	call .placeUnfilledRightArrow
 	sla c
 	ld a,1 ; On
@@ -664,8 +641,7 @@
 	ld a,10 ; Off
 .storeBattleAnimationCursorX
 	ld [wTrainerEngageDistance],a ; battle animation cursor X coordinate
-	FuncCoord 0,8
-	ld hl,Coord
+	hlCoord 0, 8
 	call .placeUnfilledRightArrow
 	sla c
 	ld a,1
@@ -673,12 +649,10 @@
 	ld a,10
 .storeBattleStyleCursorX
 	ld [wTrainerFacingDirection],a ; battle style cursor X coordinate
-	FuncCoord 0,13
-	ld hl,Coord
+	hlCoord 0, 13
 	call .placeUnfilledRightArrow
 ; cursor in front of Cancel
-	FuncCoord 0,16
-	ld hl,Coord
+	hlCoord 0, 16
 	ld a,1
 .placeUnfilledRightArrow
 	ld e,a
--- a/engine/menu/naming_screen.asm
+++ b/engine/menu/naming_screen.asm
@@ -13,8 +13,7 @@
 	call GetMonName
 	ld hl, DoYouWantToNicknameText
 	call PrintText
-	FuncCoord 14, 7
-	ld hl, Coord
+	hlCoord 14, 7
 	ld bc, $80f
 	ld a, $14
 	ld [wd125], a
@@ -94,8 +93,7 @@
 	call LoadHpBarAndStatusTilePatterns
 	call LoadEDTile
 	callba Func_7176c
-	FuncCoord 0, 4
-	ld hl, Coord
+	hlCoord 0, 4
 	ld b, $9
 	ld c, $12
 	call TextBoxBorder
@@ -341,8 +339,7 @@
 	jr nz, .asm_677e
 	ld de, UpperCaseAlphabet ; $67d6
 .asm_677e
-	FuncCoord 2, 5
-	ld hl, Coord
+	hlCoord 2, 5
 	ld bc, $509
 .asm_6784
 	push bc
@@ -373,16 +370,13 @@
 	call CalcStringLength
 	ld a, c
 	ld [wHPBarMaxHP], a
-	FuncCoord 10, 2
-	ld hl, Coord
+	hlCoord 10, 2
 	ld bc, $10a
 	call ClearScreenArea
-	FuncCoord 10, 2
-	ld hl, Coord
+	hlCoord 10, 2
 	ld de, wcf4b
 	call PlaceString
-	FuncCoord 10, 3
-	ld hl, Coord
+	hlCoord 10, 3
 	ld a, [wd07d]
 	cp $2
 	jr nc, .asm_6835
@@ -419,8 +413,7 @@
 .asm_6867
 	ld c, a
 	ld b, $0
-	FuncCoord 10, 3
-	ld hl, Coord
+	hlCoord 10, 3
 	add hl, bc
 	ld [hl], $77
 	ret
@@ -468,8 +461,7 @@
 	jr .asm_68f0
 
 PrintNamingText: ; 68f8 (1:68f8)
-	FuncCoord 0, 1
-	ld hl, Coord
+	hlCoord 0, 1
 	ld a, [wd07d]
 	ld de, YourTextString ; $693f
 	and a
@@ -484,14 +476,12 @@
 	pop af
 	ld [wd11e], a
 	call GetMonName
-	FuncCoord 4, 1
-	ld hl, Coord
+	hlCoord 4, 1
 	call PlaceString
 	ld hl, $1
 	add hl, bc
 	ld [hl], $c9
-	FuncCoord 1, 3
-	ld hl, Coord
+	hlCoord 1, 3
 	ld de, NicknameTextString ; $6953
 	jr .placeString
 .notNickname
--- a/engine/menu/party_menu.asm
+++ b/engine/menu/party_menu.asm
@@ -30,8 +30,7 @@
 	jp z,.printMessage
 	call ErasePartyMenuCursors
 	callba SendBlkPacket_PartyMenu ; loads some data to wcf2e
-	FuncCoord 3,0
-	ld hl,Coord
+	hlCoord 3, 0
 	ld de,wPartySpecies
 	xor a
 	ld c,a
--- a/engine/menu/players_pc.asm
+++ b/engine/menu/players_pc.asm
@@ -26,8 +26,7 @@
 	ld c, $e
 	call TextBoxBorder
 	call UpdateSprites
-	FuncCoord 2, 2
-	ld hl, Coord
+	hlCoord 2, 2
 	ld de, PlayersPCMenuEntries ; $7af5
 	call PlaceString
 	ld hl, wTopMenuItemY ; wTopMenuItemY
--- a/engine/menu/pokedex.asm
+++ b/engine/menu/pokedex.asm
@@ -118,8 +118,7 @@
 	pop af
 	ld [wCurrentMenuItem],a
 	push bc
-	FuncCoord 0,3
-	ld hl,Coord
+	hlCoord 0, 3
 	ld de,20
 	ld bc,$7f0d ; 13 blank tiles
 	call DrawTileLine ; cover up the menu cursor in the pokemon list
@@ -127,8 +126,7 @@
 	ret
 .buttonBPressed
 	push bc
-	FuncCoord 15,10
-	ld hl,Coord
+	hlCoord 15, 10
 	ld de,20
 	ld bc,$7f07 ; 7 blank tiles
 	call DrawTileLine ; cover up the menu cursor in the side menu
@@ -155,8 +153,7 @@
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED],a
 ; draw the horizontal line separating the seen and owned amounts from the menu
-	FuncCoord 15,8
-	ld hl,Coord
+	hlCoord 15, 8
 	ld a,$7a ; horizontal line tile
 	ld [hli],a
 	ld [hli],a
@@ -163,21 +160,17 @@
 	ld [hli],a
 	ld [hli],a
 	ld [hli],a
-	FuncCoord 14,0
-	ld hl,Coord
+	hlCoord 14, 0
 	ld [hl],$71 ; vertical line tile
-	FuncCoord 14,1
-	ld hl,Coord
+	hlCoord 14, 1
 	call DrawPokedexVerticalLine
-	FuncCoord 14,9
-	ld hl,Coord
+	hlCoord 14, 9
 	call DrawPokedexVerticalLine
 	ld hl,wPokedexSeen
 	ld b,wPokedexSeenEnd - wPokedexSeen
 	call CountSetBits
 	ld de,wd11e
-	FuncCoord 16,3
-	ld hl,Coord
+	hlCoord 16, 3
 	ld bc,$0103
 	call PrintNumber ; print number of seen pokemon
 	ld hl,wPokedexOwned
@@ -184,24 +177,19 @@
 	ld b,wPokedexOwnedEnd - wPokedexOwned
 	call CountSetBits
 	ld de,wd11e
-	FuncCoord 16,6
-	ld hl,Coord
+	hlCoord 16, 6
 	ld bc,$0103
 	call PrintNumber ; print number of owned pokemon
-	FuncCoord 16,2
-	ld hl,Coord
+	hlCoord 16, 2
 	ld de,PokedexSeenText
 	call PlaceString
-	FuncCoord 16,5
-	ld hl,Coord
+	hlCoord 16, 5
 	ld de,PokedexOwnText
 	call PlaceString
-	FuncCoord 1,1
-	ld hl,Coord
+	hlCoord 1, 1
 	ld de,PokedexContentsText
 	call PlaceString
-	FuncCoord 16,10
-	ld hl,Coord
+	hlCoord 16, 10
 	ld de,PokedexMenuItemsText
 	call PlaceString
 ; find the highest pokedex number among the pokemon the player has seen
@@ -223,12 +211,10 @@
 .loop
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED],a
-	FuncCoord 4,2
-	ld hl,Coord
+	hlCoord 4, 2
 	ld bc,$0e0a
 	call ClearScreenArea
-	FuncCoord 1,3
-	ld hl,Coord
+	hlCoord 1, 3
 	ld a,[wListScrollOffset]
 	ld [wd11e],a
 	ld d,7
@@ -422,47 +408,36 @@
 	push af
 	xor a
 	ld [$ffd7],a
-	FuncCoord 0,0
-	ld hl,Coord
+	hlCoord 0, 0
 	ld de,1
 	ld bc,$6414
 	call DrawTileLine ; draw top border
-	FuncCoord 0,17
-	ld hl,Coord
+	hlCoord 0, 17
 	ld b,$6f
 	call DrawTileLine ; draw bottom border
-	FuncCoord 0,1
-	ld hl,Coord
+	hlCoord 0, 1
 	ld de,20
 	ld bc,$6610
 	call DrawTileLine ; draw left border
-	FuncCoord 19,1
-	ld hl,Coord
+	hlCoord 19, 1
 	ld b,$67
 	call DrawTileLine ; draw right border
-	FuncCoord 0,0
 	ld a,$63 ; upper left corner tile
-	ld [Coord],a
-	FuncCoord 19,0
+	Coorda 0, 0
 	ld a,$65 ; upper right corner tile
-	ld [Coord],a
-	FuncCoord 0,17
+	Coorda 19, 0
 	ld a,$6c ; lower left corner tile
-	ld [Coord],a
-	FuncCoord 19,17
+	Coorda 0, 17
 	ld a,$6e ; lower right corner tile
-	ld [Coord],a
-	FuncCoord 0,9
-	ld hl,Coord
+	Coorda 19, 17
+	hlCoord 0, 9
 	ld de,PokedexDataDividerLine
 	call PlaceString ; draw horizontal divider line
-	FuncCoord 9,6
-	ld hl,Coord
+	hlCoord 9, 6
 	ld de,HeightWeightText
 	call PlaceString
 	call GetMonName
-	FuncCoord 9,2
-	ld hl,Coord
+	hlCoord 9, 2
 	call PlaceString
 	ld hl,PokedexEntryPointers
 	ld a,[wd11e]
@@ -474,8 +449,7 @@
 	ld a,[hli]
 	ld e,a
 	ld d,[hl] ; de = address of pokedex entry
-	FuncCoord 9,4
-	ld hl,Coord
+	hlCoord 9, 4
 	call PlaceString ; print species name
 	ld h,b
 	ld l,c
@@ -483,8 +457,7 @@
 	ld a,[wd11e]
 	push af
 	call IndexToPokedex
-	FuncCoord 2,8
-	ld hl,Coord
+	hlCoord 2, 8
 	ld a, "№"
 	ld [hli],a
 	ld a,$f2
@@ -506,8 +479,7 @@
 	call Delay3
 	call GBPalNormal
 	call GetMonHeader ; load pokemon picture location
-	FuncCoord 1,1
-	ld hl,Coord
+	hlCoord 1, 1
 	call LoadFlippedFrontSpriteByMonIndex ; draw pokemon picture
 	ld a,[wcf91]
 	call PlayCry ; play pokemon cry
@@ -520,8 +492,7 @@
 	jp z,.waitForButtonPress ; if the pokemon has not been owned, don't print the height, weight, or description
 	inc de ; de = address of feet (height)
 	ld a,[de] ; reads feet, but a is overwritten without being used
-	FuncCoord 12,6
-	ld hl,Coord
+	hlCoord 12, 6
 	ld bc,$0102
 	call PrintNumber ; print feet (height)
 	ld a,$60 ; feet symbol tile (one tick)
@@ -528,8 +499,7 @@
 	ld [hl],a
 	inc de
 	inc de ; de = address of inches (height)
-	FuncCoord 15,6
-	ld hl,Coord
+	hlCoord 15, 6
 	ld bc,$8102
 	call PrintNumber ; print inches (height)
 	ld a,$61 ; inches symbol tile (two ticks)
@@ -550,13 +520,11 @@
 	dec de
 	ld a,[de] ; a = lower byte of weight
 	ld [hl],a ; store lower byte of weight in [$ff8c]
-	FuncCoord 11,8
 	ld de,$ff8b
-	ld hl,Coord
+	hlCoord 11, 8
 	ld bc,$0205 ; no leading zeroes, right-aligned, 2 bytes, 5 digits
 	call PrintNumber ; print weight
-	FuncCoord 14,8
-	ld hl,Coord
+	hlCoord 14, 8
 	ld a,[$ff8c]
 	sub a,10
 	ld a,[$ff8b]
@@ -574,8 +542,7 @@
 	ld [$ff8b],a ; restore original value of [$ff8b]
 	pop hl
 	inc hl ; hl = address of pokedex description text
-	FuncCoord 1,11
-	ld bc,Coord
+	bcCoord 1, 11
 	ld a,2
 	ld [$fff4],a
 	call TextCommandProcessor ; print pokedex description text
--- a/engine/menu/prize_menu.asm
+++ b/engine/menu/prize_menu.asm
@@ -22,8 +22,7 @@
 	ld a,$01
 	ld [wTopMenuItemX],a
 	call PrintPrizePrice ; 687A
-	FuncCoord 0,2
-	ld hl,Coord
+	hlCoord 0, 2
 	ld b,$08
 	ld c,$10
 	call TextBoxBorder
@@ -94,20 +93,17 @@
 	ld a,[W_PRIZE1]
 	ld [wd11e],a
 	call GetItemName
-	FuncCoord 2,4
-	ld hl,Coord
+	hlCoord 2, 4
 	call PlaceString
 	ld a,[W_PRIZE2]
 	ld [wd11e],a
 	call GetItemName
-	FuncCoord 2,6
-	ld hl,Coord
+	hlCoord 2, 6
 	call PlaceString
 	ld a,[W_PRIZE3]
 	ld [wd11e],a
 	call GetItemName
-	FuncCoord 2,8
-	ld hl,Coord
+	hlCoord 2, 8
 	call PlaceString
 	jr .putNoThanksText
 .putMonName ; 14:67EC
@@ -114,30 +110,25 @@
 	ld a,[W_PRIZE1]
 	ld [wd11e],a
 	call GetMonName
-	FuncCoord 2,4
-	ld hl,Coord
+	hlCoord 2, 4
 	call PlaceString
 	ld a,[W_PRIZE2]
 	ld [wd11e],a
 	call GetMonName
-	FuncCoord 2,6
-	ld hl,Coord
+	hlCoord 2, 6
 	call PlaceString
 	ld a,[W_PRIZE3]
 	ld [wd11e],a
 	call GetMonName
-	FuncCoord 2,8
-	ld hl,Coord
+	hlCoord 2, 8
 	call PlaceString
 .putNoThanksText ; 14:6819
-	FuncCoord 2,10
-	ld hl,Coord
+	hlCoord 2, 10
 	ld de,NoThanksText
 	call PlaceString
 ; put prices on the right side of the textbox
 	ld de,wd141
-	FuncCoord 13,5
-	ld hl,Coord
+	hlCoord 13, 5
 ; reg. c:
 ; [low nybble] number of bytes
 ; [bit 765 = %100] space-padding (not zero-padding)
@@ -146,13 +137,11 @@
 ; used by text-command $02)
 	call PrintBCDNumber ; Print_BCD
 	ld de,wd143
-	FuncCoord 13,7
-	ld hl,Coord
+	hlCoord 13, 7
 	ld c,(%1 << 7 | 2)
 	call PrintBCDNumber
 	ld de,wd145
-	FuncCoord 13,9
-	ld hl,Coord
+	hlCoord 13, 9
 	ld c,(1 << 7 | 2)
 	jp PrintBCDNumber
 
@@ -159,22 +148,18 @@
 INCLUDE "data/prizes.asm"
 
 PrintPrizePrice: ; 5287a (14:687a)
-	FuncCoord 11,0
-	ld hl,Coord
+	hlCoord 11, 0
 	ld b,$01
 	ld c,$07
 	call TextBoxBorder
 	call UpdateSprites      ; XXX save OAM?
-	FuncCoord 12,0
-	ld hl,Coord
+	hlCoord 12, 0
 	ld de,.CoinText
 	call PlaceString
-	FuncCoord 13,1
-	ld hl,Coord
+	hlCoord 13, 1
 	ld de,.SixSpacesText
 	call PlaceString
-	FuncCoord 13,1
-	ld hl,Coord
+	hlCoord 13, 1
 	ld de,wPlayerCoins
 	ld c,%10000010
 	call PrintBCDNumber
--- a/engine/menu/start_sub_menus.asm
+++ b/engine/menu/start_sub_menus.asm
@@ -285,8 +285,7 @@
 
 ; writes a blank tile to all possible menu cursor positions on the party menu
 ErasePartyMenuCursors: ; 132ed (4:72ed)
-	FuncCoord 0,1
-	ld hl,Coord
+	hlCoord 0, 1
 	ld bc,2 * 20 ; menu cursor positions are 2 rows apart
 	ld a,6 ; 6 menu cursor positions
 .loop
@@ -331,14 +330,10 @@
 .choseItem
 ; erase menu cursor (blank each tile in front of an item name)
 	ld a," "
-	FuncCoord 5,4
-	ld [Coord],a
-	FuncCoord 5,6
-	ld [Coord],a
-	FuncCoord 5,8
-	ld [Coord],a
-	FuncCoord 5,10
-	ld [Coord],a
+	Coorda 5, 4
+	Coorda 5, 6
+	Coorda 5, 8
+	Coorda 5, 10
 	call PlaceUnfilledArrowMenuCursor
 	xor a
 	ld [wcc35],a
@@ -531,12 +526,10 @@
 	ld bc,(BANK(RedPicFront) << 8) | $01
 	predef Predef3B
 	call DisableLCD
-	FuncCoord 0,2
-	ld hl,Coord
+	hlCoord 0, 2
 	ld a," "
 	call TrainerInfo_DrawVerticalLine
-	FuncCoord 1,2
-	ld hl,Coord
+	hlCoord 1, 2
 	call TrainerInfo_DrawVerticalLine
 	ld hl,vChars2 + $70
 	ld de,vChars2
@@ -579,8 +572,7 @@
 	dec a
 	ld [hli],a
 	ld [hl],1
-	FuncCoord 0,0
-	ld hl,Coord
+	hlCoord 0, 0
 	call TrainerInfo_DrawTextBox
 	ld hl,wWhichTrade
 	ld a,16 + 1
@@ -588,35 +580,27 @@
 	dec a
 	ld [hli],a
 	ld [hl],3
-	FuncCoord 1,10
-	ld hl,Coord
+	hlCoord 1, 10
 	call TrainerInfo_DrawTextBox
-	FuncCoord 0,10
-	ld hl,Coord
+	hlCoord 0, 10
 	ld a,$d7
 	call TrainerInfo_DrawVerticalLine
-	FuncCoord 19,10
-	ld hl,Coord
+	hlCoord 19, 10
 	call TrainerInfo_DrawVerticalLine
-	FuncCoord 6,9
-	ld hl,Coord
+	hlCoord 6, 9
 	ld de,TrainerInfo_BadgesText
 	call PlaceString
-	FuncCoord 2,2
-	ld hl,Coord
+	hlCoord 2, 2
 	ld de,TrainerInfo_NameMoneyTimeText
 	call PlaceString
-	FuncCoord 7,2
-	ld hl,Coord
+	hlCoord 7, 2
 	ld de,wPlayerName
 	call PlaceString
-	FuncCoord 8,4
-	ld hl,Coord
+	hlCoord 8, 4
 	ld de,wPlayerMoney
 	ld c,$e3
 	call PrintBCDNumber
-	FuncCoord 9,6
-	ld hl,Coord
+	hlCoord 9, 6
 	ld de,W_PLAYTIMEHOURS + 1 ; hours
 	ld bc,$4103
 	call PrintNumber
--- a/engine/menu/status_screen.asm
+++ b/engine/menu/status_screen.asm
@@ -40,8 +40,7 @@
 	push af
 	xor a
 	ld [$ffd7], a
-	FuncCoord 19,1
-	ld hl, Coord
+	hlCoord 19, 1
 	ld bc, $060a
 	call DrawLineBox ; Draws the box around name, HP and status
 	ld de, $fffa
@@ -49,66 +48,54 @@
 	ld [hl], $f2 ; . after No ("." is a different one)
 	dec hl
 	ld [hl], "№"
-	FuncCoord 19,9
-	ld hl, Coord
+	hlCoord 19, 9
 	ld bc, $0806
 	call DrawLineBox ; Draws the box around types, ID No. and OT
-	FuncCoord 10,9
-	ld hl, Coord
+	hlCoord 10, 9
 	ld de, Type1Text
 	call PlaceString ; "TYPE1/"
-	FuncCoord 11,3
-	ld hl, Coord
+	hlCoord 11, 3
 	predef DrawHP ; predef $5f
 	ld hl, wcf25
 	call GetHealthBarColor
 	ld b, $3
 	call GoPAL_SET ; SGB palette
-	FuncCoord 16,6
-	ld hl, Coord
+	hlCoord 16, 6
 	ld de, wcf9c
 	call PrintStatusCondition
 	jr nz, .StatusWritten ; 0x129fc $9
-	FuncCoord 16,6
-	ld hl, Coord
+	hlCoord 16, 6
 	ld de, OKText
 	call PlaceString ; "OK"
 .StatusWritten
-	FuncCoord 9,6
-	ld hl, Coord
+	hlCoord 9, 6
 	ld de, StatusText
 	call PlaceString ; "STATUS/"
-	FuncCoord 14,2
-	ld hl, Coord
+	hlCoord 14, 2
 	call PrintLevel ; Pokémon level
 	ld a, [W_MONHDEXNUM]
 	ld [wd11e], a
 	ld [wd0b5], a
 	predef IndexToPokedex
-	FuncCoord 3,7
-	ld hl, Coord
+	hlCoord 3, 7
 	ld de, wd11e
 	ld bc, $8103 ; Zero-padded, 3
 	call PrintNumber ; Pokémon no.
-	FuncCoord 11,10
-	ld hl, Coord
+	hlCoord 11, 10
 	predef Func_27d6b ; Prints the type (?)
 	ld hl, NamePointers2 ; $6a9d
 	call .unk_12a7e
 	ld d, h
 	ld e, l
-	FuncCoord 9,1
-	ld hl, Coord
+	hlCoord 9, 1
 	call PlaceString ; Pokémon name
 	ld hl, OTPointers ; $6a95
 	call .unk_12a7e
 	ld d, h
 	ld e, l
-	FuncCoord 12,16
-	ld hl, Coord
+	hlCoord 12, 16
 	call PlaceString ; OT
-	FuncCoord 12,14
-	ld hl, Coord
+	hlCoord 12, 14
 	ld de, wcfa4
 	ld bc, $8205 ; 5
 	call PrintNumber ; ID Number
@@ -116,8 +103,7 @@
 	call PrintStatsBox
 	call Delay3
 	call GBPalNormal
-	FuncCoord 1, 0
-	ld hl, Coord
+	hlCoord 1, 0
 	call LoadFlippedFrontSpriteByMonIndex ; draw Pokémon picture
 	ld a, [wcf91]
 	call PlayCry ; play Pokémon cry
@@ -195,23 +181,19 @@
 	ld a, d
 	and a ; a is 0 from the status screen
 	jr nz, .DifferentBox ; 0x12ae6 $12
-	FuncCoord 0,8
-	ld hl, Coord
+	hlCoord 0, 8
 	ld b, $8
 	ld c, $8
 	call TextBoxBorder ; Draws the box
-	FuncCoord 1,9 ; Start printing stats from here
-	ld hl, Coord
+	hlCoord 1, 9 ; Start printing stats from here
 	ld bc, $0019 ; Number offset
 	jr .PrintStats ; 0x12af8 $10
 .DifferentBox
-	FuncCoord 9,2
-	ld hl, Coord
+	hlCoord 9, 2
 	ld b, $8
 	ld c, $9
 	call TextBoxBorder
-	FuncCoord 11, 3
-	ld hl, Coord
+	hlCoord 11, 3
 	ld bc, $0018
 .PrintStats
 	push bc
@@ -258,20 +240,16 @@
 	ld bc, $0004
 	call CopyData
 	callab Func_39b87
-	FuncCoord 9,2
-	ld hl, Coord
+	hlCoord 9, 2
 	ld bc, $050a
 	call ClearScreenArea ; Clear under name
-	FuncCoord 19, 3
-	ld hl, Coord
+	hlCoord 19, 3
 	ld [hl], $78
-	FuncCoord 0,8
-	ld hl, Coord
+	hlCoord 0, 8
 	ld b, $8
 	ld c, $12
 	call TextBoxBorder ; Draw move container
-	FuncCoord 2,9
-	ld hl, Coord
+	hlCoord 2, 9
 	ld de, wd0e1
 	call PlaceString ; Print moves
 	ld a, [wcd6c]
@@ -280,8 +258,7 @@
 	ld a, $4
 	sub c
 	ld b, a ; Number of moves ?
-	FuncCoord 11,10
-	ld hl, Coord
+	hlCoord 11, 10
 	ld de, $0028
 	ld a, $72
 	call Func_12ccb ; Print "PP"
@@ -293,8 +270,7 @@
 	call Func_12ccb ; Fill the rest with --
 .InitPP ; 12bbb
 	ld hl, wcfa0
-	FuncCoord 14,10
-	ld de, Coord
+	deCoord 14, 10
 	ld b, $0
 .PrintPP ; 12bc3
 	ld a, [hli]
@@ -344,8 +320,7 @@
 	cp $4
 	jr nz, .PrintPP ; 0x12c0f $b2
 .PPDone
-	FuncCoord 9,3
-	ld hl, Coord
+	hlCoord 9, 3
 	ld de, EXPPointsText
 	call PlaceString
 	ld a, [wcfb9] ; level
@@ -355,8 +330,7 @@
 	inc a
 	ld [wcfb9], a ; Increase temporarily if not 100
 .Level100
-	FuncCoord 14,6
-	ld hl, Coord
+	hlCoord 14, 6
 	ld [hl], $70 ; 1-tile "to"
 	inc hl
 	inc hl
@@ -364,27 +338,22 @@
 	pop af
 	ld [wcfb9], a
 	ld de, wcfa6
-	FuncCoord 12,4
-	ld hl, Coord
+	hlCoord 12, 4
 	ld bc, $0307
 	call PrintNumber ; exp
 	call .asm_12c86
 	ld de, wcfa6
-	FuncCoord 7,6
-	ld hl, Coord
+	hlCoord 7, 6
 	ld bc, $0307
 	call PrintNumber
-	FuncCoord 9,0
-	ld hl, Coord
+	hlCoord 9, 0
 	call Func_12cc3
-	FuncCoord 9,1
-	ld hl, Coord
+	hlCoord 9, 1
 	call Func_12cc3
 	ld a, [W_MONHDEXNUM]
 	ld [wd11e], a
 	call GetMonName
-	FuncCoord 9,1
-	ld hl, Coord
+	hlCoord 9, 1
 	call PlaceString
 	ld a, $1
 	ld [$ffba], a
--- a/engine/menu/vending_machine.asm
+++ b/engine/menu/vending_machine.asm
@@ -17,18 +17,15 @@
 	ld [wTopMenuItemX], a ; wTopMenuItemX
 	ld hl, wd730
 	set 6, [hl]
-	FuncCoord 0, 3
-	ld hl, Coord
+	hlCoord 0, 3
 	ld b, $8
 	ld c, $c
 	call TextBoxBorder
 	call UpdateSprites
-	FuncCoord 2, 5
-	ld hl, Coord
+	hlCoord 2, 5
 	ld de, DrinkText
 	call PlaceString
-	FuncCoord 9, 6
-	ld hl, Coord
+	hlCoord 9, 6
 	ld de, DrinkPriceText
 	call PlaceString
 	ld hl, wd730
--- a/engine/oak_speech.asm
+++ b/engine/oak_speech.asm
@@ -68,8 +68,7 @@
 	ld [wd0b5],a    ; pic displayed is stored at this location
 	ld [wcf91],a
 	call GetMonHeader      ; this is also related to the pic
-	FuncCoord 6, 4
-	ld hl,Coord     ; position on tilemap the pic is displayed
+	hlCoord 6, 4     ; position on tilemap the pic is displayed
 	call LoadFlippedFrontSpriteByMonIndex      ; displays pic?
 	call MovePicLeft
 	ld hl,OakSpeechText2
@@ -143,8 +142,7 @@
 	ld [$2000],a
 	ld c,$14
 	call DelayFrames
-	FuncCoord 6, 5
-	ld hl,Coord
+	hlCoord 6, 5
 	ld b,7
 	ld c,7
 	call ClearScreenArea
@@ -225,11 +223,9 @@
 	pop bc
 	ld a,c
 	and a
-	FuncCoord 15, 1
-	ld hl,Coord
+	hlCoord 15, 1
 	jr nz,.next
-	FuncCoord 6, 4
-	ld hl,Coord
+	hlCoord 6, 4
 .next
 	xor a
 	ld [$FFE1],a
--- a/engine/oak_speech2.asm
+++ b/engine/oak_speech2.asm
@@ -76,15 +76,13 @@
 	ld bc, $b
 	call CopyData
 	call Delay3
-	FuncCoord 12, 4
-	ld hl, Coord
+	hlCoord 12, 4
 	ld de, $67d
 	ld a, $ff
 	jr asm_6a19
 
 Func_6a12: ; 6a12 (1:6a12)
-	FuncCoord 5, 4
-	ld hl, Coord
+	hlCoord 5, 4
 	ld de, $67d
 	xor a
 asm_6a19: ; 6a19 (1:6a19)
@@ -161,13 +159,11 @@
 	ld b, $a
 	ld c, $9
 	call TextBoxBorder
-	FuncCoord 3, 0
-	ld hl, Coord
+	hlCoord 3, 0
 	ld de, .namestring ; $6aa3
 	call PlaceString
 	pop de
-	FuncCoord 2, 2
-	ld hl, Coord
+	hlCoord 2, 2
 	call PlaceString
 	call UpdateSprites
 	xor a
--- a/engine/overworld/cinnabar_lab.asm
+++ b/engine/overworld/cinnabar_lab.asm
@@ -101,8 +101,7 @@
 	push hl
 	ld [wd11e], a
 	call GetItemName
-	FuncCoord 2, 2
-	ld hl, Coord
+	hlCoord 2, 2
 	ld a, [$ffdb]
 	ld bc, $28
 	call AddNTimes
--- a/engine/overworld/doors.asm
+++ b/engine/overworld/doors.asm
@@ -10,8 +10,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	FuncCoord 8, 9
-	ld a, [Coord]
+	aCoord 8, 9
 	ld b, a
 .asm_1a621
 	ld a, [hli]
--- a/engine/overworld/ledges.asm
+++ b/engine/overworld/ledges.asm
@@ -8,8 +8,7 @@
 	predef Func_c586
 	ld a, [wSpriteStateData1 + 9]
 	ld b, a
-	FuncCoord 8, 9
-	ld a, [Coord]
+	aCoord 8, 9
 	ld c, a
 	ld a, [wcfc6]
 	ld d, a
--- a/engine/overworld/movement.asm
+++ b/engine/overworld/movement.asm
@@ -8,8 +8,7 @@
 	ld [wSpriteStateData2], a
 	jr .asm_4e4a
 .asm_4e41
-	FuncCoord 8, 9
-	ld a, [Coord]
+	aCoord 8, 9
 	ld [$ff93], a
 	cp $60
 	jr c, .asm_4e50
--- a/engine/overworld/player_animations.asm
+++ b/engine/overworld/player_animations.asm
@@ -349,8 +349,7 @@
 	jr z, .asm_707a4
 	cp c
 	jr nz, .asm_7079e
-	FuncCoord 8, 9
-	ld a, [Coord]
+	aCoord 8, 9
 	cp [hl]
 	jr z, .asm_707a2
 .asm_7079e
--- a/engine/overworld/pokemart.asm
+++ b/engine/overworld/pokemart.asm
@@ -77,8 +77,7 @@
 	ld hl,PokemartTellSellPriceText
 	ld bc,$0e01
 	call PrintText
-	FuncCoord 14,7
-	ld hl,Coord
+	hlCoord 14, 7
 	ld bc,$080f
 	ld a,$14
 	ld [wd125],a
@@ -149,8 +148,7 @@
 	call CopyStringToCF4B ; copy name to wcf4b
 	ld hl,PokemartTellBuyPriceText
 	call PrintText
-	FuncCoord 14,7
-	ld hl,Coord
+	hlCoord 14, 7
 	ld bc,$080f
 	ld a,$14
 	ld [wd125],a
--- a/engine/save.asm
+++ b/engine/save.asm
@@ -151,12 +151,10 @@
 	ret nz
 .save        ;$772d
 	call SaveSAVtoSRAM      ;$7848
-	FuncCoord 1,13
-	ld hl,Coord
+	hlCoord 1, 13
 	ld bc,$0412
 	call ClearScreenArea ; clear area 4x12 starting at 13,1
-	FuncCoord 1,14
-	ld hl,Coord
+	hlCoord 1, 14
 	ld de,NowSavingString
 	call PlaceString
 	ld c,$78
@@ -174,8 +172,7 @@
 
 SaveSAVConfirm: ; 73768 (1c:7768)
 	call PrintText
-	FuncCoord 0, 7
-	ld hl,Coord
+	hlCoord 0, 7
 	ld bc,$0801     ;arrow's coordinates |b = Y|c = X|
 	ld a,$14        ;one line shifting ($28 = 2 lines)
 	ld [wd125],a
@@ -435,8 +432,7 @@
 	call TextBoxBorder
 	ld hl, ChooseABoxText
 	call PrintText
-	FuncCoord 11, 0
-	ld hl, Coord
+	hlCoord 11, 0
 	ld b, $c
 	ld c, $7
 	call TextBoxBorder
@@ -443,8 +439,7 @@
 	ld hl, $fff6
 	set 2, [hl]
 	ld de, BoxNames ; $79d9
-	FuncCoord 13, 1
-	ld hl, Coord
+	hlCoord 13, 1
 	call PlaceString
 	ld hl, $fff6
 	res 2, [hl]
@@ -453,8 +448,7 @@
 	cp $9
 	jr c, .asm_739a6
 	sub $9
-	FuncCoord 8, 2
-	ld hl, Coord
+	hlCoord 8, 2
 	ld [hl], $f7
 	add $f6
 	jr .asm_739a8
@@ -461,15 +455,12 @@
 .asm_739a6
 	add $f7
 .asm_739a8
-	FuncCoord 9, 2
-	ld [Coord], a
-	FuncCoord 1, 2
-	ld hl, Coord
+	Coorda 9, 2
+	hlCoord 1, 2
 	ld de, BoxNoText
 	call PlaceString
 	call Func_73a84
-	FuncCoord 18, 1
-	ld hl, Coord
+	hlCoord 18, 1
 	ld de, wWhichTrade ; wWhichTrade
 	ld bc, $14
 	ld a, $c
--- a/engine/titlescreen.asm
+++ b/engine/titlescreen.asm
@@ -68,8 +68,7 @@
 	ld a, BANK(Version_GFX)
 	call FarCopyDataDouble
 	call Func_4519
-	FuncCoord 2, 1
-	ld hl, Coord
+	hlCoord 2, 1
 	ld a, $80
 	ld de, $14
 	ld c, $6
@@ -85,8 +84,7 @@
 	add hl, de
 	dec c
 	jr nz, .asm_434d
-	FuncCoord 2, 7
-	ld hl, Coord
+	hlCoord 2, 7
 	ld a, $31
 	ld b, $10
 .asm_4361
@@ -98,8 +96,7 @@
 	ld hl, wOAMBuffer + $28
 	ld a, $74
 	ld [hl], a
-	FuncCoord 2, 17
-	ld hl, Coord
+	hlCoord 2, 17
 	ld de, .titlescreenTilemap ; $437f
 	ld b, $10
 .asm_4377
@@ -346,8 +343,7 @@
 Func_4524: ; 4524 (1:4524)
 	ld [wcf91], a
 	ld [wd0b5], a
-	FuncCoord 5, 10
-	ld hl, Coord
+	hlCoord 5, 10
 	call GetMonHeader
 	jp LoadFrontSpriteByMonIndex
 
@@ -366,8 +362,7 @@
 	ld hl, vChars2 + $600
 	ld bc, (BANK(NintendoCopyrightLogoGraphics) << 8) + $1c
 	call CopyVideoData
-	FuncCoord 2, 7
-	ld hl, Coord
+	hlCoord 2, 7
 	ld de, CopyrightTextString ; $4556
 	jp PlaceString
 
@@ -381,8 +376,7 @@
 
 ; prints version text (red, blue)
 PrintGameVersionOnTitleScreen: ; 4598 (1:4598)
-	FuncCoord 7, 8
-	ld hl, Coord
+	hlCoord 7, 8
 	ld de, VersionOnTitleScreenText
 	jp PlaceString
 
--- a/engine/town_map.asm
+++ b/engine/town_map.asm
@@ -11,8 +11,7 @@
 	push af
 	ld b, $0
 	call Func_711c4
-	FuncCoord 1, 0
-	ld hl, Coord
+	hlCoord 1, 0
 	ld de, wcd6d
 	call PlaceString
 	ld hl, wOAMBuffer
@@ -57,8 +56,7 @@
 	inc de
 	cp $50
 	jr nz, .asm_70eac
-	FuncCoord 1, 0
-	ld hl, Coord
+	hlCoord 1, 0
 	ld de, wcd6d
 	call PlaceString
 	ld hl, wOAMBuffer + $10
@@ -120,8 +118,7 @@
 	push hl
 	call Func_711ef
 	call GetMonName
-	FuncCoord 1, 0
-	ld hl, Coord
+	hlCoord 1, 0
 	call PlaceString
 	ld h, b
 	ld l, c
@@ -163,8 +160,7 @@
 	ld b, $0
 	call Func_711c4
 	ld hl, wTrainerEngageDistance
-	FuncCoord 18, 0
-	ld de, Coord
+	deCoord 18, 0
 
 .townMapFlyLoop
 	ld a, $7f
@@ -171,8 +167,7 @@
 	ld [de], a
 	push hl
 	push hl
-	FuncCoord 3, 0
-	ld hl, Coord
+	hlCoord 3, 0
 	ld bc, $10f
 	call ClearScreenArea
 	pop hl
@@ -179,17 +174,14 @@
 	ld a, [hl]
 	ld b, $4
 	call Func_711c4
-	FuncCoord 3, 0
-	ld hl, Coord
+	hlCoord 3, 0
 	ld de, wcd6d
 	call PlaceString
 	ld c, $f
 	call DelayFrames
-	FuncCoord 18, 0
-	ld hl, Coord
+	hlCoord 18, 0
 	ld [hl], $ed
-	FuncCoord 19, 0
-	ld hl, Coord
+	hlCoord 19, 0
 	ld [hl], $ee
 	pop hl
 .asm_71004
@@ -228,8 +220,7 @@
 	ld [hl], a
 	ret
 .asm_71042
-	FuncCoord 18, 0
-	ld de, Coord
+	deCoord 18, 0
 	inc hl
 	ld a, [hl]
 	cp $ff
@@ -241,8 +232,7 @@
 	ld hl, wTrainerEngageDistance
 	jp .townMapFlyLoop
 .asm_71058
-	FuncCoord 19, 0
-	ld de, Coord
+	deCoord 19, 0
 	dec hl
 	ld a, [hl]
 	cp $ff
@@ -402,13 +392,11 @@
 	ld a, l
 	and a
 	jr nz, .asm_71236
-	FuncCoord 1, 7
-	ld hl, Coord
+	hlCoord 1, 7
 	ld b, $2
 	ld c, $f
 	call TextBoxBorder
-	FuncCoord 2, 9
-	ld hl, Coord
+	hlCoord 2, 9
 	ld de, AreaUnknownText
 	call PlaceString
 	jr .asm_7123e
--- a/engine/trade.asm
+++ b/engine/trade.asm
@@ -181,8 +181,7 @@
 	ld [$ffae], a
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
-	FuncCoord 4, 0
-	ld hl, Coord
+	hlCoord 4, 0
 	ld b, $6
 	ld c, $a
 	call TextBoxBorder
@@ -227,8 +226,7 @@
 	call DelayFrame
 	ld a, $8b
 	ld [rLCDC], a ; $ff40
-	FuncCoord 6, 2
-	ld hl, Coord
+	hlCoord 6, 2
 	ld b, $7
 	call Func_41842
 	call Func_41186
@@ -300,8 +298,7 @@
 	ld a, $ac
 	call Func_41676
 	call Func_415c8
-	FuncCoord 4, 10
-	ld hl, Coord
+	hlCoord 4, 10
 	ld b, $6
 	ld c, $a
 	call TextBoxBorder
@@ -318,8 +315,7 @@
 	ld a, [wTrainerEngageDistance]
 	call PlayCry
 	call Func_41181
-	FuncCoord 4, 10
-	ld hl, Coord
+	hlCoord 4, 10
 	ld bc, $80c
 	call ClearScreenArea
 	jp PrintTradeTakeCareText
@@ -406,8 +402,7 @@
 
 Func_4142d: ; 4142d (10:542d)
 	call Func_41196
-	FuncCoord 11, 4
-	ld hl, Coord
+	hlCoord 11, 4
 	ld a, $5d
 	ld [hli], a
 	ld a, $5e
@@ -416,17 +411,14 @@
 	ld [hli], a
 	dec c
 	jr nz, .asm_4143a
-	FuncCoord 5, 3
-	ld hl, Coord
+	hlCoord 5, 3
 	ld b, $6
 	call Func_41842
-	FuncCoord 4, 12
-	ld hl, Coord
+	hlCoord 4, 12
 	ld b, $2
 	ld c, $7
 	call TextBoxBorder
-	FuncCoord 5, 14
-	ld hl, Coord
+	hlCoord 5, 14
 	ld de, wPlayerName ; wd158
 	call PlaceString
 	jp DelayFrame
@@ -433,8 +425,7 @@
 
 Func_4145c: ; 4145c (10:545c)
 	call Func_41196
-	FuncCoord 0, 4
-	ld hl, Coord
+	hlCoord 0, 4
 	ld a, $5e
 	ld c, $e
 .asm_41466
@@ -458,17 +449,14 @@
 	ld [hld], a
 	ld a, $5d
 	ld [hl], a
-	FuncCoord 7, 8
-	ld hl, Coord
+	hlCoord 7, 8
 	ld b, $6
 	call Func_41842
-	FuncCoord 6, 0
-	ld hl, Coord
+	hlCoord 6, 0
 	ld b, $2
 	ld c, $7
 	call TextBoxBorder
-	FuncCoord 7, 2
-	ld hl, Coord
+	hlCoord 7, 2
 	ld de, W_GRASSRATE ; W_GRASSRATE
 	call PlaceString
 	jp DelayFrame
@@ -475,8 +463,7 @@
 
 Func_4149f: ; 4149f (10:549f)
 	call Func_41196
-	FuncCoord 0, 4
-	ld hl, Coord
+	hlCoord 0, 4
 	ld a, $5e
 	ld c, $14
 .asm_414a9
@@ -487,8 +474,7 @@
 
 Func_414ae: ; 414ae (10:54ae)
 	push hl
-	FuncCoord 0, 4
-	ld hl, Coord
+	hlCoord 0, 4
 	call ScheduleRowRedrawHelper
 	pop hl
 	ld a, h
@@ -655,8 +641,7 @@
 	xor $1
 	ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
 	call GetMonHeader
-	FuncCoord 7, 2
-	ld hl, Coord
+	hlCoord 7, 2
 	call LoadFlippedFrontSpriteByMonIndex
 	ld c, $a
 	jp DelayFrames
--- a/engine/trade2.asm
+++ b/engine/trade2.asm
@@ -1,53 +1,43 @@
 Func_42769: ; 42769 (10:6769)
-	FuncCoord 5,0
-	ld hl,Coord
+	hlCoord 5, 0
 	ld de,OTString67E5
 	call PlaceString
 	ld a,[wWhichTrade]
 	ld [wd11e],a
 	predef IndexToPokedex
-	FuncCoord 9, 0
-	ld hl,Coord
+	hlCoord 9, 0
 	ld de,wd11e
 	ld bc,$8103
 	call PrintNumber
-	FuncCoord 5,2
-	ld hl,Coord
+	hlCoord 5, 2
 	ld de,wcf4b
 	call PlaceString
-	FuncCoord 8,4
-	ld hl,Coord
+	hlCoord 8, 4
 	ld de,wTrainerScreenX
 	call PlaceString
-	FuncCoord 8, 6
-	ld hl,Coord
+	hlCoord 8, 6
 	ld de,wcd4c
 	ld bc,$8205
 	jp PrintNumber
 
 Func_427a7: ; 427a7 (10:67a7)
-	FuncCoord 5,10
-	ld hl,Coord
+	hlCoord 5, 10
 	ld de,OTString67E5
 	call PlaceString
 	ld a,[wTrainerEngageDistance]
 	ld [wd11e],a
 	predef IndexToPokedex
-	FuncCoord 9, 10
-	ld hl,Coord
+	hlCoord 9, 10
 	ld de,wd11e
 	ld bc,$8103
 	call PrintNumber
-	FuncCoord 5,12
-	ld hl,Coord
+	hlCoord 5, 12
 	ld de,wcd6d
 	call PlaceString
-	FuncCoord 8,14
-	ld hl,Coord
+	hlCoord 8, 14
 	ld de,wcd4e
 	call PlaceString
-	FuncCoord 8, 16
-	ld hl,Coord
+	hlCoord 8, 16
 	ld de,wcd59
 	ld bc,$8205
 	jp PrintNumber
--- a/home.asm
+++ b/home.asm
@@ -1937,8 +1937,7 @@
 	ld [wd125],a
 	call DisplayTextBoxID ; draw the menu text box
 	call UpdateSprites ; move sprites
-	FuncCoord 4,2 ; coordinates of upper left corner of menu text box
-	ld hl,Coord
+	hlCoord 4, 2 ; coordinates of upper left corner of menu text box
 	ld de,$090e ; height and width of menu text box
 	ld a,[wListMenuID]
 	and a ; is it a PC pokemon list?
@@ -1974,13 +1973,12 @@
 	jr z,.notOldManBattle
 .oldManBattle
 	ld a,"▶"
-	FuncCoord 5,4
-	ld [Coord],a ; place menu cursor in front of first menu entry
+	Coorda 5, 4 ; place menu cursor in front of first menu entry
 	ld c,80
 	call DelayFrames
 	xor a
 	ld [wCurrentMenuItem],a
-	ld hl,Coord
+	hlCoord 5, 4
 	ld a,l
 	ld [wMenuCursorLocation],a
 	ld a,h
@@ -2099,8 +2097,7 @@
 
 DisplayChooseQuantityMenu:: ; 2d57 (0:2d57)
 ; text box dimensions/coordinates for just quantity
-	FuncCoord 15,9
-	ld hl,Coord
+	hlCoord 15, 9
 	ld b,1 ; height
 	ld c,3 ; width
 	ld a,[wListMenuID]
@@ -2107,19 +2104,16 @@
 	cp a,PRICEDITEMLISTMENU
 	jr nz,.drawTextBox
 ; text box dimensions/coordinates for quantity and price
-	FuncCoord 7,9
-	ld hl,Coord
+	hlCoord 7, 9
 	ld b,1  ; height
 	ld c,11 ; width
 .drawTextBox
 	call TextBoxBorder
-	FuncCoord 16,10
-	ld hl,Coord
+	hlCoord 16, 10
 	ld a,[wListMenuID]
 	cp a,PRICEDITEMLISTMENU
 	jr nz,.printInitialQuantity
-	FuncCoord 8,10
-	ld hl,Coord
+	hlCoord 8, 10
 .printInitialQuantity
 	ld de,InitialQuantityText
 	call PlaceString
@@ -2159,8 +2153,7 @@
 	ld a,[wcf97] ; max quantity
 	ld [hl],a
 .handleNewQuantity
-	FuncCoord 17,10
-	ld hl,Coord
+	hlCoord 17, 10
 	ld a,[wListMenuID]
 	cp a,PRICEDITEMLISTMENU
 	jr nz,.printQuantity
@@ -2199,15 +2192,13 @@
 	ld a,[$ffa4]
 	ld [$ffa1],a
 .skipHalvingPrice
-	FuncCoord 12,10
-	ld hl,Coord
+	hlCoord 12, 10
 	ld de,SpacesBetweenQuantityAndPriceText
 	call PlaceString
 	ld de,$ff9f ; total price
 	ld c,$a3
 	call PrintBCDNumber
-	FuncCoord 9,10
-	ld hl,Coord
+	hlCoord 9, 10
 .printQuantity
 	ld de,wcf96 ; current quantity
 	ld bc,$8102 ; print leading zeroes, 1 byte, 2 digits
@@ -2246,8 +2237,7 @@
 	ret
 
 PrintListMenuEntries:: ; 2e5a (0:2e5a)
-	FuncCoord 5, 3
-	ld hl,Coord
+	hlCoord 5, 3
 	ld b,$09
 	ld c,$0e
 	call ClearScreenArea
@@ -2272,8 +2262,7 @@
 	jr nc,.noCarry
 	inc d
 .noCarry
-	FuncCoord 6,4 ; coordinates of first list entry name
-	ld hl,Coord
+	hlCoord 6, 4 ; coordinates of first list entry name
 	ld b,4 ; print 4 names
 .loop
 	ld a,b
@@ -3539,8 +3528,7 @@
 InitYesNoTextBoxParameters:: ; 35ff (0:35ff)
 	xor a
 	ld [wd12c], a
-	FuncCoord 14, 7
-	ld hl, Coord
+	hlCoord 14, 7
 	ld bc, $80f
 	ret
 
@@ -3548,8 +3536,7 @@
 	call SaveScreenTilesToBuffer1
 	ld a, $6
 	ld [wd12c], a
-	FuncCoord 11, 6
-	ld hl, Coord
+	hlCoord 11, 6
 	ld bc, $80c
 	jr DisplayYesNoChoice
 
@@ -3557,8 +3544,7 @@
 	call SaveScreenTilesToBuffer1
 	ld a, $3
 	ld [wd12c], a
-	FuncCoord 12, 7
-	ld hl, Coord
+	hlCoord 12, 7
 	ld bc, $080d
 DisplayYesNoChoice:: ; 3628 (0:3628)
 	ld a, $14
@@ -3995,8 +3981,7 @@
 	jr z, .asm_387c
 	call Func_716c6
 .asm_387c
-	FuncCoord 18, 16
-	ld hl, Coord
+	hlCoord 18, 16
 	call HandleDownArrowBlinkTiming
 	pop hl
 	call JoypadLowSensitivity
@@ -4472,8 +4457,7 @@
 	and a ; was a key pressed?
 	jr nz,.keyPressed
 	push hl
-	FuncCoord 18,11 ; coordinates of blinking down arrow in some menus
-	ld hl,Coord
+	hlCoord 18, 11 ; coordinates of blinking down arrow in some menus
 	call HandleDownArrowBlinkTiming ; blink down arrow (if any)
 	pop hl
 	ld a,[wMenuJoypadPollCount]
@@ -4734,8 +4718,7 @@
 	call Delay3
 	pop hl
 Func_3c59:: ; 3c59 (0:3c59)
-	FuncCoord 1,14
-	ld bc,Coord
+	bcCoord 1, 14
 	jp TextCommandProcessor
 
 ; converts a big-endian binary number into decimal and prints it
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -105,8 +105,7 @@
 	jr nz,.checkForOpponent
 	bit 0,a
 	jr nz,.checkForOpponent
-	FuncCoord 8, 9
-	ld a,[Coord]
+	aCoord 8, 9
 	ld [wcf0e],a
 	call DisplayTextID ; display either the start menu or the NPC/sign text
 	ld a,[wcc47]
@@ -670,8 +669,7 @@
 
 ; function to play a sound when changing maps
 PlayMapChangeSound:: ; 08c9 (0:08c9)
-	FuncCoord 8, 8
-	ld a,[Coord] ; upper left tile of the 4x4 square the player's sprite is standing on
+	aCoord 8, 8 ; upper left tile of the 4x4 square the player's sprite is standing on
 	cp a,$0b ; door tile in tileset 0
 	jr nz,.didNotGoThroughDoor
 	ld a,(SFX_02_57 - SFX_Headers_02) / 3
@@ -1279,8 +1277,7 @@
 ; if not jumping
 
 Func_c44:: ; 0c44 (0:0c44)
-	FuncCoord 8, 9
-	ld a,[Coord] ; tile the player is on
+	aCoord 8, 9 ; tile the player is on
 	ld [wcf0e],a
 
 CheckForTilePairCollisions:: ; 0c4a (0:0c4a)
@@ -1694,8 +1691,7 @@
 ; the portion of the map that was newly exposed due to the player's movement
 
 ScheduleNorthRowRedraw:: ; 0e91 (0:0e91)
-	FuncCoord 0, 0
-	ld hl,Coord
+	hlCoord 0, 0
 	call ScheduleRowRedrawHelper
 	ld a,[wd526]
 	ld [H_SCREENEDGEREDRAWADDR],a
@@ -1717,8 +1713,7 @@
 	ret
 
 ScheduleSouthRowRedraw:: ; 0eb2 (0:0eb2)
-	FuncCoord 0,16
-	ld hl,Coord
+	hlCoord 0, 16
 	call ScheduleRowRedrawHelper
 	ld a,[wd526]
 	ld l,a
@@ -1737,8 +1732,7 @@
 	ret
 
 ScheduleEastColumnRedraw:: ; 0ed3 (0:0ed3)
-	FuncCoord 18,0
-	ld hl,Coord
+	hlCoord 18, 0
 	call ScheduleColumnRedrawHelper
 	ld a,[wd526]
 	ld c,a
@@ -1776,8 +1770,7 @@
 	ret
 
 ScheduleWestColumnRedraw:: ; 0f08 (0:0f08)
-	FuncCoord 0,0
-	ld hl,Coord
+	hlCoord 0, 0
 	call ScheduleColumnRedrawHelper
 	ld a,[wd526]
 	ld [H_SCREENEDGEREDRAWADDR],a
--- a/home/text.asm
+++ b/home/text.asm
@@ -76,8 +76,7 @@
 	cp $4F
 	jr nz,.next3
 	pop hl
-	FuncCoord 1, 16
-	ld hl,Coord
+	hlCoord 1, 16
 	push hl
 	jp Next19E8
 
@@ -270,14 +269,12 @@
 	cp 4
 	jp z,Next1AA2
 	ld a,$EE
-	FuncCoord 18, 16
-	ld [Coord],a
+	Coorda 18, 16
 Next1AA2:: ; 1aa2 (0:1aa2)
 	call ProtectedDelay3
 	call ManualTextScroll
 	ld a,$7F
-	FuncCoord 18, 16
-	ld [Coord],a
+	Coorda 18, 16
 Char57:: ; 1aad (0:1aad)
 	pop hl
 	ld de,Char58Text
@@ -290,30 +287,25 @@
 Char51:: ; 1ab4 (0:1ab4)
 	push de
 	ld a,$EE
-	FuncCoord 18, 16
-	ld [Coord],a
+	Coorda 18, 16
 	call ProtectedDelay3
 	call ManualTextScroll
-	FuncCoord 1, 13
-	ld hl,Coord
+	hlCoord 1, 13
 	ld bc,$0412
 	call ClearScreenArea
 	ld c,$14
 	call DelayFrames
 	pop de
-	FuncCoord 1, 14
-	ld hl,Coord
+	hlCoord 1, 14
 	jp Next19E8
 
 Char49:: ; 1ad5 (0:1ad5)
 	push de
 	ld a,$EE
-	FuncCoord 18, 16
-	ld [Coord],a
+	Coorda 18, 16
 	call ProtectedDelay3
 	call ManualTextScroll
-	FuncCoord 1, 10
-	ld hl,Coord
+	hlCoord 1, 10
 	ld bc,$0712
 	call ClearScreenArea
 	ld c,$14
@@ -320,37 +312,31 @@
 	call DelayFrames
 	pop de
 	pop hl
-	FuncCoord 1, 11
-	ld hl,Coord
+	hlCoord 1, 11
 	push hl
 	jp Next19E8
 
 Char4B:: ; 1af8 (0:1af8)
 	ld a,$EE
-	FuncCoord 18, 16
-	ld [Coord],a
+	Coorda 18, 16
 	call ProtectedDelay3
 	push de
 	call ManualTextScroll
 	pop de
 	ld a,$7F
-	FuncCoord 18, 16
-	ld [Coord],a
+	Coorda 18, 16
 	;fall through
 Char4C:: ; 1b0a (0:1b0a)
 	push de
 	call Next1B18
 	call Next1B18
-	FuncCoord 1, 16
-	ld hl,Coord
+	hlCoord 1, 16
 	pop de
 	jp Next19E8
 
 Next1B18:: ; 1b18 (0:1b18)
-	FuncCoord 0, 14
-	ld hl,Coord
-	FuncCoord 0, 13
-	ld de,Coord
+	hlCoord 0, 14
+	deCoord 0, 13
 	ld b,$3C
 .next
 	ld a,[hli]
@@ -358,8 +344,7 @@
 	inc de
 	dec b
 	jr nz,.next
-	FuncCoord 1, 16
-	ld hl,Coord
+	hlCoord 1, 16
 	ld a,$7F
 	ld b,$12
 .next2
@@ -514,8 +499,7 @@
 ; (no arguments)
 TextCommand05:: ; 1bc5 (0:1bc5)
 	pop hl
-	FuncCoord 1, 16
-	ld bc,Coord ; address of second line of dialogue text box
+	bcCoord 1, 16 ; address of second line of dialogue text box
 	jp NextTextCommand
 
 ; blink arrow and wait for A or B to be pressed
@@ -526,14 +510,12 @@
 	cp a,$04
 	jp z,TextCommand0D
 	ld a,$ee ; down arrow
-	FuncCoord 18, 16
-	ld [Coord],a ; place down arrow in lower right corner of dialogue text box
+	Coorda 18, 16 ; place down arrow in lower right corner of dialogue text box
 	push bc
 	call ManualTextScroll ; blink arrow and wait for A or B to be pressed
 	pop bc
 	ld a," "
-	FuncCoord 18, 16
-	ld [Coord],a ; overwrite down arrow with blank space
+	Coorda 18, 16 ; overwrite down arrow with blank space
 	pop hl
 	jp NextTextCommand
 
@@ -542,13 +524,11 @@
 ; (no arguments)
 TextCommand07:: ; 1be7 (0:1be7)
 	ld a," "
-	FuncCoord 18, 16
-	ld [Coord],a ; place blank space in lower right corner of dialogue text box
+	Coorda 18, 16 ; place blank space in lower right corner of dialogue text box
 	call Next1B18 ; scroll up text
 	call Next1B18
 	pop hl
-	FuncCoord 1, 16
-	ld bc,Coord ; address of second line of dialogue text box
+	bcCoord 1, 16 ; address of second line of dialogue text box
 	jp NextTextCommand
 
 ; execute asm inline
--- a/home/vcopy.asm
+++ b/home/vcopy.asm
@@ -130,8 +130,7 @@
 	dec a
 	jr z,.transferMiddleThird
 .transferBottomThird
-	FuncCoord 0,12
-	ld hl,Coord
+	hlCoord 0, 12
 	ld sp,hl
 	ld a,[H_AUTOBGTRANSFERDEST + 1]
 	ld h,a
@@ -142,8 +141,7 @@
 	xor a ; TRANSFERTOP
 	jr .doTransfer
 .transferTopThird
-	FuncCoord 0,0
-	ld hl,Coord
+	hlCoord 0, 0
 	ld sp,hl
 	ld a,[H_AUTOBGTRANSFERDEST + 1]
 	ld h,a
@@ -152,8 +150,7 @@
 	ld a,TRANSFERMIDDLE
 	jr .doTransfer
 .transferMiddleThird
-	FuncCoord 0,6
-	ld hl,Coord
+	hlCoord 0, 6
 	ld sp,hl
 	ld a,[H_AUTOBGTRANSFERDEST + 1]
 	ld h,a
--- a/macros.asm
+++ b/macros.asm
@@ -37,8 +37,38 @@
 
 ;\1 = X
 ;\2 = Y
-FuncCoord: MACRO
-Coord = $C3A0 + 20 * \2 + \1
+hlCoord: MACRO
+	ld hl, wTileMap + 20 * \2 + \1
+	ENDM
+
+;\1 = X
+;\2 = Y
+deCoord: MACRO
+	ld de, wTileMap + 20 * \2 + \1
+	ENDM
+
+;\1 = X
+;\2 = Y
+bcCoord: MACRO
+	ld bc, wTileMap + 20 * \2 + \1
+	ENDM
+
+;\1 = X
+;\2 = Y
+aCoord: MACRO
+	ld a, [wTileMap + 20 * \2 + \1]
+	ENDM
+
+;\1 = X
+;\2 = Y
+Coorda: MACRO
+	ld [wTileMap + 20 * \2 + \1], a
+	ENDM
+
+;\1 = X
+;\2 = Y
+dwCoord: MACRO
+	dw wTileMap + 20 * \2 + \1
 	ENDM
 
 ;\1 = Map Width
--- a/main.asm
+++ b/main.asm
@@ -158,8 +158,7 @@
 INCLUDE "engine/oam_dma.asm"
 
 PrintWaitingText:
-	FuncCoord 3, 10
-	ld hl, Coord
+	hlCoord 3, 10
 	ld b, $1
 	ld c, $b
 	ld a, [W_ISINBATTLE]
@@ -170,8 +169,7 @@
 .asm_4c17
 	call Func_5ab3
 .asm_4c1a
-	FuncCoord 4, 11
-	ld hl, Coord
+	hlCoord 4, 11
 	ld de, WaitingText
 	call PlaceString
 	ld c, 50
@@ -920,21 +918,18 @@
 	ld a,[wd74b]
 	bit 5,a ; does the player have the pokedex?
 ; start menu with pokedex
-	FuncCoord 10, 0
-	ld hl,Coord
+	hlCoord 10, 0
 	ld b,$0e
 	ld c,$08
 	jr nz,.drawTextBoxBorder
 ; start menu without pokedex
-	FuncCoord 10, 0
-	ld hl,Coord
+	hlCoord 10, 0
 	ld b,$0c
 	ld c,$08
 	jr .drawTextBoxBorder
 ; if text ID is not 0 (i.e. not the start menu) then do a standard dialogue text box
 .notStartMenu
-	FuncCoord 0, 12
-	ld hl,Coord
+	hlCoord 0, 12
 	ld b,$04
 	ld c,$12
 .drawTextBoxBorder
@@ -992,14 +987,12 @@
 	ld a,[wd74b]
 	bit 5,a ; does the player have the pokedex?
 ; menu with pokedex
-	FuncCoord 10, 0
-	ld hl,Coord
+	hlCoord 10, 0
 	ld b,$0e
 	ld c,$08
 	jr nz,.drawTextBoxBorder
 ; shorter menu if the player doesn't have the pokedex
-	FuncCoord 10, 0
-	ld hl,Coord
+	hlCoord 10, 0
 	ld b,$0c
 	ld c,$08
 .drawTextBoxBorder
@@ -1017,8 +1010,7 @@
 	ld [wcc37],a
 	ld hl,wd730
 	set 6,[hl] ; no pauses between printing each letter
-	FuncCoord 12, 2
-	ld hl,Coord
+	hlCoord 12, 2
 	ld a,[wd74b]
 	bit 5,a ; does the player have the pokedex?
 ; case for not having pokdex
@@ -1360,13 +1352,11 @@
 	ld a, $f
 	ld [wd125], a
 	call DisplayTextBoxID
-	FuncCoord 13, 1
-	ld hl, Coord
+	hlCoord 13, 1
 	ld b, $1
 	ld c, $6
 	call ClearScreenArea
-	FuncCoord 12, 1
-	ld hl, Coord
+	hlCoord 12, 1
 	ld de, wPlayerMoney ; wPlayerMoney
 	ld c, $a3
 	call PrintBCDNumber
@@ -1637,8 +1627,7 @@
 	ld a, [wTrainerScreenX]
 	and a
 	jr nz, .asm_770f
-	FuncCoord 11, 11
-	ld hl, Coord
+	hlCoord 11, 11
 	ld b, $5
 	ld c, $7
 	call TextBoxBorder
@@ -1645,14 +1634,12 @@
 	call UpdateSprites
 	ld a, $c
 	ld [$fff7], a
-	FuncCoord 13, 12
-	ld hl, Coord
+	hlCoord 13, 12
 	ld de, PokemonMenuEntries ; $77c2
 	jp PlaceString
 .asm_770f
 	push af
-	FuncCoord 0, 11
-	ld hl, Coord
+	hlCoord 0, 11
 	ld a, [wcd42]
 	dec a
 	ld e, a
@@ -1675,8 +1662,7 @@
 	inc b
 	call TextBoxBorder
 	call UpdateSprites
-	FuncCoord 0, 12
-	ld hl, Coord
+	hlCoord 0, 12
 	ld a, [wcd42]
 	inc a
 	ld e, a
@@ -1723,8 +1709,7 @@
 	pop hl
 	ld a, [wcd42]
 	ld [$fff7], a
-	FuncCoord 0, 12
-	ld hl, Coord
+	hlCoord 0, 12
 	ld a, [wcd42]
 	inc a
 	ld e, a
@@ -2191,8 +2176,7 @@
 	ld h, [hl]
 	ld l, a
 	ld de, $1
-	FuncCoord 8, 9
-	ld a, [Coord]
+	aCoord 8, 9
 	call IsInArray
 	jr nc, .asm_c4c8
 	ld hl, wd736
@@ -2215,29 +2199,24 @@
 	ld b, $3
 	ld c, $7
 	call TextBoxBorder
-	FuncCoord 1, 1
-	ld hl, Coord
+	hlCoord 1, 1
 	ld de, wSafariSteps ; wd70d
 	ld bc, $203
 	call PrintNumber
-	FuncCoord 4, 1
-	ld hl, Coord
+	hlCoord 4, 1
 	ld de, SafariSteps ; $4579
 	call PlaceString
-	FuncCoord 1, 3
-	ld hl, Coord
+	hlCoord 1, 3
 	ld de, SafariBallText
 	call PlaceString
 	ld a, [W_NUMSAFARIBALLS] ; W_NUMSAFARIBALLS
 	cp $a
 	jr nc, .asm_c56d
-	FuncCoord 5, 3
-	ld hl, Coord
+	hlCoord 5, 3
 	ld a, $7f
 	ld [hl], a
 .asm_c56d
-	FuncCoord 6, 3
-	ld hl, Coord
+	hlCoord 6, 3
 	ld de, W_NUMSAFARIBALLS ; W_NUMSAFARIBALLS
 	ld bc, $102
 	jp PrintNumber
@@ -2259,29 +2238,25 @@
 	ld a, [wSpriteStateData1 + 9]
 	and a
 	jr nz, .asm_c59d
-	FuncCoord 8, 11
-	ld a, [Coord]
+	aCoord 8, 11
 	inc d
 	jr .asm_c5b9
 .asm_c59d
 	cp $4
 	jr nz, .asm_c5a7
-	FuncCoord 8, 7
-	ld a, [Coord]
+	aCoord 8, 7
 	dec d
 	jr .asm_c5b9
 .asm_c5a7
 	cp $8
 	jr nz, .asm_c5b1
-	FuncCoord 6, 9
-	ld a, [Coord]
+	aCoord 6, 9
 	dec e
 	jr .asm_c5b9
 .asm_c5b1
 	cp $c
 	jr nz, .asm_c5b9
-	FuncCoord 10, 9
-	ld a, [Coord]
+	aCoord 10, 9
 	inc e
 .asm_c5b9
 	ld c, a
@@ -2300,8 +2275,7 @@
 	jr nz, .asm_c5d8
 	ld hl, $ffdb
 	set 0, [hl]
-	FuncCoord 8, 13
-	ld a, [Coord]
+	aCoord 8, 13
 	inc d
 	jr .asm_c603
 .asm_c5d8
@@ -2309,8 +2283,7 @@
 	jr nz, .asm_c5e7
 	ld hl, $ffdb
 	set 1, [hl]
-	FuncCoord 8, 5
-	ld a, [Coord]
+	aCoord 8, 5
 	dec d
 	jr .asm_c603
 .asm_c5e7
@@ -2318,8 +2291,7 @@
 	jr nz, .asm_c5f6
 	ld hl, $ffdb
 	set 2, [hl]
-	FuncCoord 4, 9
-	ld a, [Coord]
+	aCoord 4, 9
 	dec e
 	jr .asm_c603
 .asm_c5f6
@@ -2327,8 +2299,7 @@
 	jr nz, .asm_c603
 	ld hl, $ffdb
 	set 3, [hl]
-	FuncCoord 12, 9
-	ld a, [Coord]
+	aCoord 12, 9
 	inc e
 .asm_c603
 	ld c, a
@@ -2919,13 +2890,11 @@
 	ld [hli], a
 	ld [hl], $60 ; First name
 
-	FuncCoord 2, 11
-	ld hl, Coord
+	hlCoord 2, 11
 	ld de, wcd49
 	call .DrawBadgeRow
 
-	FuncCoord 2, 14
-	ld hl, Coord
+	hlCoord 2, 14
 	ld de, wcd49 + 4
 ;	call .DrawBadgeRow
 ;	ret
--- a/scripts/bikeshop.asm
+++ b/scripts/bikeshop.asm
@@ -56,12 +56,10 @@
 	ld c, $f
 	call TextBoxBorder
 	call UpdateSprites
-	FuncCoord 2, 2
-	ld hl, Coord
+	hlCoord 2, 2
 	ld de, BikeShopMenuText
 	call PlaceString
-	FuncCoord 8, 3
-	ld hl, Coord
+	hlCoord 8, 3
 	ld de, BikeShopMenuPrice
 	call PlaceString
 	ld hl, BikeShopText_1d815
--- a/scripts/celadongamecorner.asm
+++ b/scripts/celadongamecorner.asm
@@ -467,40 +467,32 @@
 CeladonGameCornerScript_48f1e: ; 48f1e (12:4f1e)
 	ld hl, wd730
 	set 6, [hl]
-	FuncCoord 11, 0
-	ld hl, Coord
+	hlCoord 11, 0
 	ld b, $5
 	ld c, $7
 	call TextBoxBorder
 	call UpdateSprites
-	FuncCoord 12, 1
-	ld hl, Coord
+	hlCoord 12, 1
 	ld b, $4
 	ld c, $7
 	call ClearScreenArea
-	FuncCoord 12, 2
-	ld hl, Coord
+	hlCoord 12, 2
 	ld de, GameCornerMoneyText
 	call PlaceString
-	FuncCoord 12, 3
-	ld hl, Coord
+	hlCoord 12, 3
 	ld de, GameCornerBlankText1
 	call PlaceString
-	FuncCoord 12, 3
-	ld hl, Coord
+	hlCoord 12, 3
 	ld de, wPlayerMoney
 	ld c, $a3
 	call PrintBCDNumber
-	FuncCoord 12, 4
-	ld hl, Coord
+	hlCoord 12, 4
 	ld de, GameCornerCoinText
 	call PlaceString
-	FuncCoord 12, 5
-	ld hl, Coord
+	hlCoord 12, 5
 	ld de, GameCornerBlankText2
 	call PlaceString
-	FuncCoord 15, 5
-	ld hl, Coord
+	hlCoord 15, 5
 	ld de, wPlayerCoins
 	ld c, $82
 	call PrintBCDNumber
--- a/scripts/celadonmartroof.asm
+++ b/scripts/celadonmartroof.asm
@@ -200,8 +200,7 @@
 	push hl
 	ld [wd11e], a
 	call GetItemName
-	FuncCoord 2, 2
-	ld hl, Coord
+	hlCoord 2, 2
 	ld a, [$ffdb]
 	ld bc, $28
 	call AddNTimes
--- a/scripts/vermiliondock.asm
+++ b/scripts/vermiliondock.asm
@@ -53,8 +53,7 @@
 	call DelayFrames
 	ld b, $9c
 	call CopyScreenTileBufferToVRAM
-	FuncCoord 0, 10
-	ld hl, Coord
+	hlCoord 0, 10
 	ld bc, $0078
 	ld a, $14
 	call FillMemory