Consolidate coord macros

13 files changed, 125 insertions, 125 deletions

diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
index 7764603d..6803c38b 100755
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -759,7 +759,7 @@ DoBallTossSpecialEffects: ; 78f3e (1e:4f3e)
 	cp a,1
 	ret nz
 .moveGhostMarowakLeft
-	hlCoord 17, 0
+	coord hl, 17, 0
 	ld de,20
 	ld bc,$0707 ; 7 rows and 7 columns
 .loop
@@ -858,7 +858,7 @@ DoExplodeSpecialEffects: ; 79009 (1e:5009)
 	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
-	hlCoord 1, 5
+	coord hl, 1, 5
 	jp AnimationHideMonPic ; make pokemon disappear
 
 ; flashes the screen when subanimation counter is 1 modulo 4
@@ -1292,12 +1292,12 @@ AnimationSlideMonUp: ; 7927a (1e:527a)
 	ld c, $7
 	ld a, [H_WHOSETURN]
 	and a
-	hlCoord 1, 6
-	deCoord 1, 5
+	coord hl, 1, 6
+	coord de, 1, 5
 	ld a, $30
 	jr z, .asm_79291
-	hlCoord 12, 1
-	deCoord 12, 0
+	coord hl, 12, 1
+	coord de, 12, 0
 	ld a, $ff
 .asm_79291
 	ld [wd09f], a
@@ -1352,9 +1352,9 @@ _AnimationSlideMonUp: ; 792bf (1e:52bf)
 	jr nz, .asm_792c4
 	ld a, [H_WHOSETURN]
 	and a
-	hlCoord 1, 11
+	coord hl, 1, 11
 	jr z, .asm_792e2
-	hlCoord 12, 6
+	coord hl, 12, 6
 .asm_792e2
 	ld a, [wd09f]
 	inc a
@@ -1513,11 +1513,11 @@ AnimationShakeBackAndForth: ; 793b1 (1e:53b1)
 ; The mon's sprite disappears after this animation.
 	ld a, [H_WHOSETURN]
 	and a
-	hlCoord 0, 5
-	deCoord 2, 5
+	coord hl, 0, 5
+	coord de, 2, 5
 	jr z, .asm_793c2
-	hlCoord 11, 0
-	deCoord 13, 0
+	coord hl, 11, 0
+	coord de, 13, 0
 
 .asm_793c2
 	xor a
@@ -1561,9 +1561,9 @@ AnimationMoveMonHorizontally: ; 793f9 (1e:53f9)
 	call AnimationHideMonPic
 	ld a, [H_WHOSETURN]
 	and a
-	hlCoord 2, 5
+	coord hl, 2, 5
 	jr z, .asm_79407
-	hlCoord 11, 0
+	coord hl, 11, 0
 .asm_79407
 	xor a
 	push hl
@@ -1674,12 +1674,12 @@ AnimationSquishMonPic: ; 794a1 (1e:54a1)
 	ld a, [H_WHOSETURN]
 	and a
 	jr z, .asm_794b1
-	hlCoord 16, 0
-	deCoord 14, 0
+	coord hl, 16, 0
+	coord de, 14, 0
 	jr .asm_794b7
 .asm_794b1
-	hlCoord 5, 5
-	deCoord 3, 5
+	coord hl, 5, 5
+	coord de, 3, 5
 .asm_794b7
 	push de
 	xor a
@@ -1883,10 +1883,10 @@ AnimationSlideMonLeft: ; 795f8 (1e:55f8)
 	ld a, [H_WHOSETURN]
 	and a
 	jr z, .asm_79602
-	hlCoord 12, 0
+	coord hl, 12, 0
 	jr .asm_79605
 .asm_79602
-	hlCoord 0, 5
+	coord hl, 0, 5
 .asm_79605
 	ld d, $8
 .asm_79607
@@ -2121,7 +2121,7 @@ Func_79793: ; 79793 (1e:5793)
 	xor a
 	ld [W_SPRITEFLIPPED], a
 	call GetMonHeader
-	hlCoord 12, 0
+	coord hl, 12, 0
 	call LoadFrontSpriteByMonIndex
 	jr .asm_797d3
 .asm_797b0
@@ -2185,7 +2185,7 @@ Func_7980c: ; 7980c (1e:580c)
 	push bc
 	ld e, a
 	ld d, $0
-	hlCoord 0, 0
+	coord hl, 0, 0
 	add hl, de
 	ld bc, $707
 	call ClearScreenArea
@@ -2207,7 +2207,7 @@ GetMonSpriteTileMapPointerFromRowCount: ; 79820 (1e:5820)
 .enemyTurn
 	ld a, 12
 .next
-	hlCoord 0, 0
+	coord hl, 0, 0
 	ld e, a
 	ld d, 0
 	add hl, de
diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm
index 997f23ef..4f605b52 100644
--- a/engine/battle/battle_transitions.asm
+++ b/engine/battle/battle_transitions.asm
@@ -202,7 +202,7 @@ BattleTransition_Spiral: ; 70a72 (1c:4a72)
 	call BattleTransition_InwardSpiral
 	jr .done
 .outwardSpiral
-	hlCoord 10, 10
+	coord hl, 10, 10
 	ld a, $3
 	ld [wd09f], a
 	ld a, l
@@ -231,7 +231,7 @@ BattleTransition_Spiral: ; 70a72 (1c:4a72)
 BattleTransition_InwardSpiral: ; 70aaa (1c:4aaa)
 	ld a, $7
 	ld [wWhichTrade], a
-	hlCoord 0, 0
+	coord hl, 0, 0
 	ld c, $11
 	ld de, SCREEN_WIDTH
 	call BattleTransition_InwardSpiral_
@@ -371,20 +371,20 @@ BattleTransition_Shrink: ; 70b7f (1c:4b7f)
 	push bc
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a
-	hlCoord 0, 7
-	deCoord 0, 8
+	coord hl, 0, 7
+	coord de, 0, 8
 	ld bc, -SCREEN_WIDTH * 2
 	call BattleTransition_CopyTiles1
-	hlCoord 0, 10
-	deCoord 0, 9
+	coord hl, 0, 10
+	coord de, 0, 9
 	ld bc, SCREEN_WIDTH * 2
 	call BattleTransition_CopyTiles1
-	hlCoord 8, 0
-	deCoord 9, 0
+	coord hl, 8, 0
+	coord de, 9, 0
 	ld bc, -2
 	call BattleTransition_CopyTiles2
-	hlCoord 11, 0
-	deCoord 10, 0
+	coord hl, 11, 0
+	coord de, 10, 0
 	ld bc, $2
 	call BattleTransition_CopyTiles2
 	ld a, $1
@@ -405,20 +405,20 @@ BattleTransition_Split: ; 70bca (1c:4bca)
 	ld [H_AUTOBGTRANSFERENABLED], a
 .loop
 	push bc
-	hlCoord 0, 16
-	deCoord 0, 17
+	coord hl, 0, 16
+	coord de, 0, 17
 	ld bc, -SCREEN_WIDTH * 2
 	call BattleTransition_CopyTiles1
-	hlCoord 0, 1
-	deCoord 0, 0
+	coord hl, 0, 1
+	coord de, 0, 0
 	ld bc, SCREEN_WIDTH * 2
 	call BattleTransition_CopyTiles1
-	hlCoord 18, 0
-	deCoord 19, 0
+	coord hl, 18, 0
+	coord de, 19, 0
 	ld bc, -2
 	call BattleTransition_CopyTiles2
-	hlCoord 1, 0
-	deCoord 0, 0
+	coord hl, 1, 0
+	coord de, 0, 0
 	ld bc, $2
 	call BattleTransition_CopyTiles2
 	call BattleTransition_TransferDelay3
@@ -514,8 +514,8 @@ BattleTransition_CopyTiles2: ; 70c3f (1c:4c3f)
 ; used for high level wild dungeon battles
 BattleTransition_VerticalStripes: ; 70c7e (1c:4c7e)
 	ld c, SCREEN_HEIGHT
-	hlCoord 0, 0
-	deCoord 1, 17
+	coord hl, 0, 0
+	coord de, 1, 17
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a
 .loop
@@ -553,8 +553,8 @@ BattleTransition_VerticalStripes_: ; 70caa (1c:4caa)
 ; used for low level wild dungeon battles
 BattleTransition_HorizontalStripes: ; 70cb4 (1c:4cb4)
 	ld c, SCREEN_WIDTH
-	hlCoord 0, 0
-	deCoord 19, 1
+	coord hl, 0, 0
+	coord de, 19, 1
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a
 .loop
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 2f407290..5deeb4dc 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -101,7 +101,7 @@ SlidePlayerAndEnemySilhouettesOnScreen: ; 3c04c (f:404c)
 	ld a, MESSAGE_BOX ; the usual text box at the bottom of the screen
 	ld [wTextBoxID], a
 	call DisplayTextBoxID
-	hlCoord 1, 5
+	coord hl, 1, 5
 	ld bc, $307
 	call ClearScreenArea
 	call DisableLCD
@@ -117,7 +117,7 @@ SlidePlayerAndEnemySilhouettesOnScreen: ; 3c04c (f:404c)
 	or c
 	jr nz, .clearBackgroundLoop
 ; copy the work RAM tile map to VRAM
-	hlCoord 0, 0
+	coord hl, 0, 0
 	ld de, vBGMap0
 	ld b, 18 ; number of rows
 .copyRowLoop
@@ -176,7 +176,7 @@ SlidePlayerAndEnemySilhouettesOnScreen: ; 3c04c (f:404c)
 	ld [H_AUTOBGTRANSFERENABLED], a
 	ld a, $31
 	ld [$ffe1], a
-	hlCoord 1, 5
+	coord hl, 1, 5
 	predef CopyUncompressedPicToTilemap
 	xor a
 	ld [hWY], a
@@ -324,7 +324,7 @@ StartBattle: ; 3c11e (f:411e)
 	ld [wcf91], a
 	ld [wBattleMonSpecies2], a
 	call LoadScreenTilesFromBuffer1
-	hlCoord 1, 5
+	coord hl, 1, 5
 	ld a, $9
 	call SlideTrainerPicOffScreen
 	call SaveScreenTilesToBuffer1
@@ -760,12 +760,12 @@ HandlePoisonBurnLeechSeed_IncreaseEnemyHP: ; 3c4a3 (f:44a3)
 	ret
 
 UpdateCurMonHPBar: ; 3c4f6 (f:44f6)
-	hlCoord 10, 9    ; tile pointer to player HP bar
+	coord hl, 10, 9    ; tile pointer to player HP bar
 	ld a, [H_WHOSETURN]
 	and a
 	ld a, $1
 	jr z, .playersTurn
-	hlCoord 2, 2    ; tile pointer to enemy HP bar
+	coord hl, 2, 2    ; tile pointer to enemy HP bar
 	xor a
 .playersTurn
 	push bc
@@ -852,10 +852,10 @@ FaintEnemyPokemon: ; 0x3c567
 	ld hl, wPlayerUsedMove
 	ld [hli], a
 	ld [hl], a
-	hlCoord 12, 5
-	deCoord 12, 6
+	coord hl, 12, 5
+	coord de, 12, 6
 	call SlideDownFaintedMonPic
-	hlCoord 0, 0
+	coord hl, 0, 0
 	ld bc, $40b
 	call ClearScreenArea
 	ld a, [W_ISINBATTLE]
@@ -1105,11 +1105,11 @@ RemoveFaintedPlayerMon: ; 3c741 (f:4741)
 	ld [hl], a
 	ld [wBattleMonStatus], a
 	call ReadPlayerMonCurHPAndStatus
-	hlCoord 9, 7
+	coord hl, 9, 7
 	ld bc, $50b
 	call ClearScreenArea
-	hlCoord 1, 10
-	deCoord 1, 11
+	coord hl, 1, 10
+	coord de, 1, 11
 	call SlideDownFaintedMonPic
 	ld a, $1
 	ld [wBattleResult], a
@@ -1137,7 +1137,7 @@ DoUseNextMonDialogue: ; 3c79b (f:479b)
 	ld hl, UseNextMonText
 	call PrintText
 .displayYesNoBox
-	hlCoord 13, 9
+	coord hl, 13, 9
 	ld bc, $a0e
 	ld a, TWO_OPTION_MENU
 	ld [wTextBoxID], a
@@ -1214,7 +1214,7 @@ HandlePlayerBlackOut: ; 3c837 (f:4837)
 	ld a, [W_CUROPPONENT]
 	cp $c8 + SONY1
 	jr nz, .notSony1Battle
-	hlCoord 0, 0  ; sony 1 battle
+	coord hl, 0, 0  ; sony 1 battle
 	ld bc, $815
 	call ClearScreenArea
 	call ScrollTrainerPicAfterBattle
@@ -1384,7 +1384,7 @@ EnemySendOutFirstMon: ; 3c92a (f:492a)
 	ld [wAICount],a
 	ld hl,W_PLAYERBATTSTATUS1
 	res 5,[hl]
-	hlCoord 18, 0
+	coord hl, 18, 0
 	ld a,8
 	call SlideTrainerPicOffScreen
 	call PrintEmptyString
@@ -1454,7 +1454,7 @@ EnemySendOutFirstMon: ; 3c92a (f:492a)
 	jr nz,.next4
 	ld hl, TrainerAboutToUseText
 	call PrintText
-	hlCoord 0, 7
+	coord hl, 0, 7
 	ld bc,$0801
 	ld a,TWO_OPTION_MENU
 	ld [wTextBoxID],a
@@ -1489,7 +1489,7 @@ EnemySendOutFirstMon: ; 3c92a (f:492a)
 	call LoadScreenTilesFromBuffer1
 .next4
 	call ClearSprites
-	hlCoord 0, 0
+	coord hl, 0, 0
 	ld bc,$040B
 	call ClearScreenArea
 	ld b,1
@@ -1505,7 +1505,7 @@ EnemySendOutFirstMon: ; 3c92a (f:492a)
 	call LoadMonFrontSprite
 	ld a,$CF
 	ld [$FFE1],a
-	hlCoord 15, 6
+	coord hl, 15, 6
 	predef AnimateSendingOutMon
 	ld a,[wEnemyMonSpecies2]
 	call PlayCry
@@ -1835,7 +1835,7 @@ SendOutMon: ; 3cc91 (f:4c91)
 	ld [H_WHOSETURN], a
 	ld a, POOF_ANIM
 	call PlayMoveAnimation
-	hlCoord 4, 11
+	coord hl, 4, 11
 	predef AnimateSendingOutMon
 	ld a, [wcf91]
 	call PlayCry
@@ -1844,10 +1844,10 @@ SendOutMon: ; 3cc91 (f:4c91)
 
 ; show 2 stages of the player mon getting smaller before disappearing
 AnimateRetreatingPlayerMon: ; 3ccfa (f:4cfa)
-	hlCoord 1, 5
+	coord hl, 1, 5
 	ld bc, $707
 	call ClearScreenArea
-	hlCoord 3, 7
+	coord hl, 3, 7
 	ld bc, $505
 	xor a
 	ld [wDownscaledMonSize], a
@@ -1856,7 +1856,7 @@ AnimateRetreatingPlayerMon: ; 3ccfa (f:4cfa)
 	ld c, 4
 	call DelayFrames
 	call .clearScreenArea
-	hlCoord 4, 9
+	coord hl, 4, 9
 	ld bc, $303
 	ld a, $1
 	ld [wDownscaledMonSize], a
@@ -1868,7 +1868,7 @@ AnimateRetreatingPlayerMon: ; 3ccfa (f:4cfa)
 	ld a, $4c
 	Coorda 5, 11
 .clearScreenArea
-	hlCoord 1, 5
+	coord hl, 1, 5
 	ld bc, $707
 	jp ClearScreenArea
 
@@ -1891,14 +1891,14 @@ DrawHUDsAndHPBars: ; 3cd5a (f:4d5a)
 DrawPlayerHUDAndHPBar: ; 3cd60 (f:4d60)
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a
-	hlCoord 9, 7
+	coord hl, 9, 7
 	ld bc, $50b
 	call ClearScreenArea
 	callab PlacePlayerHUDTiles
-	hlCoord 18, 9
+	coord hl, 18, 9
 	ld [hl], $73
 	ld de, wBattleMonNick
-	hlCoord 10, 7
+	coord hl, 10, 7
 	call CenterMonName
 	call PlaceString
 	ld hl, wBattleMonSpecies
@@ -1909,7 +1909,7 @@ DrawPlayerHUDAndHPBar: ; 3cd60 (f:4d60)
 	ld de, wLoadedMonLevel
 	ld bc, $b
 	call CopyData
-	hlCoord 14, 8
+	coord hl, 14, 8
 	push hl
 	inc hl
 	ld de, wLoadedMonStatus
@@ -1920,7 +1920,7 @@ DrawPlayerHUDAndHPBar: ; 3cd60 (f:4d60)
 .asm_3cdae
 	ld a, [wLoadedMonSpecies]
 	ld [wcf91], a
-	hlCoord 10, 9
+	coord hl, 10, 9
 	predef DrawHP
 	ld a, $1
 	ld [H_AUTOBGTRANSFERENABLED], a
@@ -1952,15 +1952,15 @@ DrawPlayerHUDAndHPBar: ; 3cd60 (f:4d60)
 DrawEnemyHUDAndHPBar: ; 3cdec (f:4dec)
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a
-	hlCoord 0, 0
+	coord hl, 0, 0
 	ld bc, $40c
 	call ClearScreenArea
 	callab PlaceEnemyHUDTiles
 	ld de, wEnemyMonNick
-	hlCoord 1, 0
+	coord hl, 1, 0
 	call CenterMonName
 	call PlaceString
-	hlCoord 4, 1
+	coord hl, 4, 1
 	push hl
 	inc hl
 	ld de, wEnemyMonStatus
@@ -2033,7 +2033,7 @@ DrawEnemyHUDAndHPBar: ; 3cdec (f:4dec)
 .drawHPBar
 	xor a
 	ld [wHPBarType], a
-	hlCoord 2, 2
+	coord hl, 2, 2
 	call DrawHPBar
 	ld a, $1
 	ld [H_AUTOBGTRANSFERENABLED], a
@@ -2108,12 +2108,12 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3)
 	ld bc, $b
 	call CopyData
 ; the following simulates the keystrokes by drawing menus on screen
-	hlCoord 9, 14
+	coord hl, 9, 14
 	ld [hl], "▶"
 	ld c, 80
 	call DelayFrames
 	ld [hl], $7f
-	hlCoord 9, 16
+	coord hl, 9, 16
 	ld [hl], "▶"
 	ld c, 50
 	call DelayFrames
@@ -2145,7 +2145,7 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3)
 .safariLeftColumn
 	Coorda 13, 14
 	Coorda 13, 16
-	hlCoord 7, 14
+	coord hl, 7, 14
 	ld de, W_NUMSAFARIBALLS
 	ld bc, $102
 	call PrintNumber
@@ -2178,7 +2178,7 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3)
 .safariRightColumn
 	Coorda 1, 14 ; clear upper cursor position in left column
 	Coorda 1, 16 ; clear lower cursor position in left column
-	hlCoord 7, 14
+	coord hl, 7, 14
 	ld de, W_NUMSAFARIBALLS
 	ld bc, $102
 	call PrintNumber
@@ -2399,7 +2399,7 @@ PartyMenuOrRockOrRun:
 	call GBPalNormal
 	jp DisplayBattleMenu
 .partyMonDeselected
-	hlCoord 11, 11
+	coord hl, 11, 11
 	ld bc, $81
 	ld a, $7f
 	call FillMemory
@@ -2561,17 +2561,17 @@ MoveSelectionMenu: ; 3d219 (f:5219)
 	ret z
 	ld hl, wBattleMonMoves
 	call .loadmoves
-	hlCoord 4, 12
+	coord hl, 4, 12
 	ld b, $4
 	ld c, $e
 	di
 	call TextBoxBorder
-	hlCoord 4, 12
+	coord hl, 4, 12
 	ld [hl], $7a
-	hlCoord 10, 12
+	coord hl, 10, 12
 	ld [hl], $7e
 	ei
-	hlCoord 6, 13
+	coord hl, 6, 13
 	call .writemoves
 	ld b, $5
 	ld a, $c
@@ -2579,11 +2579,11 @@ MoveSelectionMenu: ; 3d219 (f:5219)
 .mimicmenu
 	ld hl, wEnemyMonMoves
 	call .loadmoves
-	hlCoord 0, 7
+	coord hl, 0, 7
 	ld b, $4
 	ld c, $e
 	call TextBoxBorder
-	hlCoord 2, 8
+	coord hl, 2, 8
 	call .writemoves
 	ld b, $1
 	ld a, $7
@@ -2594,11 +2594,11 @@ MoveSelectionMenu: ; 3d219 (f:5219)
 	ld bc, $2c
 	call AddNTimes
 	call .loadmoves
-	hlCoord 4, 7
+	coord hl, 4, 7
 	ld b, $4
 	ld c, $e
 	call TextBoxBorder
-	hlCoord 6, 8
+	coord hl, 6, 8
 	call .writemoves
 	ld b, $5
 	ld a, $7
@@ -2654,7 +2654,7 @@ SelectMenuItem: ; 3d2fe (f:52fe)
 	jr z, .battleselect
 	dec a
 	jr nz, .select
-	hlCoord 1, 14
+	coord hl, 1, 14
 	ld de, WhichTechniqueString
 	call PlaceString
 	jr .select
@@ -2666,7 +2666,7 @@ SelectMenuItem: ; 3d2fe (f:52fe)
 	ld a, [wMenuItemToSwap]
 	and a
 	jr z, .select
-	hlCoord 5, 13
+	coord hl, 5, 13
 	dec a
 	ld bc, $14
 	call AddNTimes
@@ -2903,7 +2903,7 @@ SwapMovesInMenu: ; 3d435 (f:5435)
 PrintMenuItem: ; 3d4b6 (f:54b6)
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a
-	hlCoord 0, 8
+	coord hl, 0, 8
 	ld b, $3
 	ld c, $9
 	call TextBoxBorder
@@ -2916,7 +2916,7 @@ PrintMenuItem: ; 3d4b6 (f:54b6)
 	ld a, [wCurrentMenuItem]
 	cp b
 	jr nz, .notDisabled
-	hlCoord 1, 10
+	coord hl, 1, 10
 	ld de, DisabledText
 	call PlaceString
 	jr .moveDisabled
@@ -2948,23 +2948,23 @@ PrintMenuItem: ; 3d4b6 (f:54b6)
 	and $3f
 	ld [wcd6d], a
 ; print TYPE/<type> and <curPP>/<maxPP>
-	hlCoord 1, 9
+	coord hl, 1, 9
 	ld de, TypeText
 	call PlaceString
-	hlCoord 7, 11
+	coord hl, 7, 11
 	ld [hl], "/"
-	hlCoord 5, 9
+	coord hl, 5, 9
 	ld [hl], "/"
-	hlCoord 5, 11
+	coord hl, 5, 11
 	ld de, wcd6d
 	ld bc, $102
 	call PrintNumber
-	hlCoord 8, 11
+	coord hl, 8, 11
 	ld de, wd11e
 	ld bc, $102
 	call PrintNumber
 	call GetCurrentMove
-	hlCoord 2, 10
+	coord hl, 2, 10
 	predef PrintMoveType
 .moveDisabled
 	ld a, $1
@@ -4924,7 +4924,7 @@ ApplyDamageToEnemyPokemon: ; 3e142 (f:6142)
 	ld [wHPBarNewHP+1],a
 	ld a,[hl]
 	ld [wHPBarNewHP],a
-	hlCoord 2, 2
+	coord hl, 2, 2
 	xor a
 	ld [wHPBarType],a
 	predef UpdateHPBar2 ; animate the HP bar shortening
@@ -5042,7 +5042,7 @@ ApplyDamageToPlayerPokemon: ; 3e200 (f:6200)
 	ld [wHPBarMaxHP+1],a
 	ld a,[hl]
 	ld [wHPBarMaxHP],a
-	hlCoord 10, 9
+	coord hl, 10, 9
 	ld a,$01
 	ld [wHPBarType],a
 	predef UpdateHPBar2 ; animate the HP bar shortening
@@ -6456,7 +6456,7 @@ LoadPlayerBackPic: ; 3ec92 (f:6c92)
 	ld [$0], a
 	ld a, $31
 	ld [$ffe1], a
-	hlCoord 1, 5
+	coord hl, 1, 5
 	predef_jump CopyUncompressedPicToTilemap
 
 ; does nothing since no stats are ever selected (barring glitches)
@@ -6875,7 +6875,7 @@ InitBattleCommon: ; 3ef3d (f:6f3d)
 	ld [$ffe1], a
 	dec a
 	ld [wAICount], a
-	hlCoord 12, 0
+	coord hl, 12, 0
 	predef CopyUncompressedPicToTilemap
 	ld a, $ff
 	ld [wEnemyMonPartyPos], a
@@ -6929,7 +6929,7 @@ InitWildBattle: ; 3ef8b (f:6f8b)
 	xor a
 	ld [W_TRAINERCLASS], a
 	ld [$ffe1], a
-	hlCoord 12, 0
+	coord hl, 12, 0
 	predef CopyUncompressedPicToTilemap
 
 ; common code that executes after init battle code specific to trainer or wild battles
@@ -6951,10 +6951,10 @@ InitBattle_Common: ; 3efeb (f:6feb)
 	ld a, $9c
 	ld [H_AUTOBGTRANSFERDEST + 1], a
 	call LoadScreenTilesFromBuffer1
-	hlCoord 9, 7
+	coord hl, 9, 7
 	ld bc, $50a
 	call ClearScreenArea
-	hlCoord 1, 0
+	coord hl, 1, 0
 	ld bc, $40a
 	call ClearScreenArea
 	call ClearSprites
@@ -7098,7 +7098,7 @@ LoadMonBackPic: ; 3f103 (f:7103)
 ; been loaded with GetMonHeader.
 	ld a, [wBattleMonSpecies2]
 	ld [wcf91], a
-	hlCoord 1, 5
+	coord hl, 1, 5
 	ld b, $7
 	ld c, $8
 	call ClearScreenArea
diff --git a/engine/battle/draw_hud_pokeball_gfx.asm b/engine/battle/draw_hud_pokeball_gfx.asm
index 06280a15..e9be0da5 100644
--- a/engine/battle/draw_hud_pokeball_gfx.asm
+++ b/engine/battle/draw_hud_pokeball_gfx.asm
@@ -121,7 +121,7 @@ PlacePlayerHUDTiles: ; 3a902 (e:6902)
 	ld de, wTrainerFacingDirection
 	ld bc, $3
 	call CopyData
-	hlCoord 18, 10
+	coord hl, 18, 10
 	ld de, rIE
 	jr PlaceHUDTiles
 
@@ -136,7 +136,7 @@ PlaceEnemyHUDTiles: ; 3a919 (e:6919)
 	ld de, wTrainerFacingDirection
 	ld bc, $3
 	call CopyData
-	hlCoord 1, 2
+	coord hl, 1, 2
 	ld de, $1
 	jr PlaceHUDTiles
 
diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm
index 075cbeb1..8264e49c 100755
--- a/engine/battle/end_of_battle.asm
+++ b/engine/battle/end_of_battle.asm
@@ -19,7 +19,7 @@ EndOfBattle: ; 137aa (4:77aa)
 	jr z, .placeWinOrLoseString
 	ld de, DrawText
 .placeWinOrLoseString
-	hlCoord 6, 8
+	coord hl, 6, 8
 	call PlaceString
 	ld c, 200
 	call DelayFrames
diff --git a/engine/battle/ghost_marowak_anim.asm b/engine/battle/ghost_marowak_anim.asm
index 73d3bcc2..e3b3f42c 100644
--- a/engine/battle/ghost_marowak_anim.asm
+++ b/engine/battle/ghost_marowak_anim.asm
@@ -4,7 +4,7 @@ MarowakAnim: ; 708ca (1c:48ca)
 	ld [rOBP1], a
 	call CopyMonPicFromBGToSpriteVRAM ; cover the BG ghost pic with a sprite ghost pic that looks the same
 ; now that the ghost pic is being displayed using sprites, clear the ghost pic from the BG tilemap
-	hlCoord 12, 0
+	coord hl, 12, 0
 	ld bc, $707
 	call ClearScreenArea
 	call Delay3
diff --git a/engine/battle/link_battle_versus_text.asm b/engine/battle/link_battle_versus_text.asm
index 7320da29..dfb2fe35 100644
--- a/engine/battle/link_battle_versus_text.asm
+++ b/engine/battle/link_battle_versus_text.asm
@@ -1,18 +1,18 @@
 ; display "[player] VS [enemy]" text box with pokeballs representing their parties next to the names
 DisplayLinkBattleVersusTextBox: ; 372d6 (d:72d6)
 	call LoadTextBoxTilePatterns
-	hlCoord 3, 4
+	coord hl, 3, 4
 	ld b, $7
 	ld c, $c
 	call TextBoxBorder
-	hlCoord 4, 5
+	coord hl, 4, 5
 	ld de, wPlayerName
 	call PlaceString
-	hlCoord 4, 10
+	coord hl, 4, 10
 	ld de, wLinkEnemyTrainerName
 	call PlaceString
 ; place bold "VS" tiles between the names
-	hlCoord 9, 8
+	coord hl, 9, 8
 	ld a, $69
 	ld [hli], a
 	ld [hl], $6a
diff --git a/engine/battle/moveEffects/drain_hp_effect.asm b/engine/battle/moveEffects/drain_hp_effect.asm
index be52e76d..1096794f 100644
--- a/engine/battle/moveEffects/drain_hp_effect.asm
+++ b/engine/battle/moveEffects/drain_hp_effect.asm
@@ -71,10 +71,10 @@ DrainHPEffect_: ; 783f (1:783f)
 .next
 	ld a, [H_WHOSETURN]
 	and a
-	hlCoord 10, 9
+	coord hl, 10, 9
 	ld a, $1
 	jr z, .next2
-	hlCoord 2, 2
+	coord hl, 2, 2
 	xor a
 .next2
 	ld [wHPBarType], a
diff --git a/engine/battle/moveEffects/heal_effect.asm b/engine/battle/moveEffects/heal_effect.asm
index d9729747..cea63a1f 100644
--- a/engine/battle/moveEffects/heal_effect.asm
+++ b/engine/battle/moveEffects/heal_effect.asm
@@ -89,10 +89,10 @@ HealEffect_: ; 3b9ec (e:79ec)
 	call BankswitchEtoF
 	ld a, [H_WHOSETURN]
 	and a
-	hlCoord 10, 9
+	coord hl, 10, 9
 	ld a, $1
 	jr z, .updateHPBar
-	hlCoord 2, 2
+	coord hl, 2, 2
 	xor a
 .updateHPBar
 	ld [wHPBarType], a
diff --git a/engine/battle/moveEffects/recoil_effect.asm b/engine/battle/moveEffects/recoil_effect.asm
index 95b54922..51232af6 100644
--- a/engine/battle/moveEffects/recoil_effect.asm
+++ b/engine/battle/moveEffects/recoil_effect.asm
@@ -53,12 +53,12 @@ RecoilEffect_: ; 1392c (4:792c)
 	ld [hli], a
 	ld [hl], a
 .getHPBarCoords
-	hlCoord 10, 9
+	coord hl, 10, 9
 	ld a, [H_WHOSETURN]
 	and a
 	ld a, $1
 	jr z, .updateHPBar
-	hlCoord 2, 2
+	coord hl, 2, 2
 	xor a
 .updateHPBar
 	ld [wHPBarType], a
diff --git a/engine/battle/scroll_draw_trainer_pic.asm b/engine/battle/scroll_draw_trainer_pic.asm
index 18df86e0..b32650e3 100644
--- a/engine/battle/scroll_draw_trainer_pic.asm
+++ b/engine/battle/scroll_draw_trainer_pic.asm
@@ -6,7 +6,7 @@ _ScrollTrainerPicAfterBattle: ; 396d3 (e:56d3)
 	ld b, $1
 	call GoPAL_SET
 	callab _LoadTrainerPic
-	hlCoord 19, 0
+	coord hl, 19, 0
 	ld c, $0
 .scrollLoop
 	inc c
diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm
index 55314ea9..a53f00f6 100644
--- a/engine/battle/trainer_ai.asm
+++ b/engine/battle/trainer_ai.asm
@@ -641,7 +641,7 @@ AIRecoverHP: ; 3a6da (e:66da)
 
 AIPrintItemUseAndUpdateHPBar: ; 3a718 (e:6718)
 	call AIPrintItemUse_
-	hlCoord 2, 2
+	coord hl, 2, 2
 	xor a
 	ld [wHPBarType],a
 	predef UpdateHPBar2
diff --git a/engine/battle/wild_encounters.asm b/engine/battle/wild_encounters.asm
index 03dc6fb6..5964f996 100644
--- a/engine/battle/wild_encounters.asm
+++ b/engine/battle/wild_encounters.asm
@@ -25,7 +25,7 @@ TryDoWildEncounter: ; 13870 (4:7870)
 .asm_1389e
 ; determine if wild pokemon can appear in the half-block we're standing in
 ; is the bottom right tile (9,9) of the half-block we're standing in a grass/water tile?
-	hlCoord 9, 9
+	coord hl, 9, 9
 	ld c, [hl]
 	ld a, [W_GRASSTILE]
 	cp c