Consolidate coord macros

12 files changed, 159 insertions, 159 deletions

diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm
index 59da2774..d491cd38 100644
--- a/engine/menu/bills_pc.asm
+++ b/engine/menu/bills_pc.asm
@@ -11,17 +11,17 @@ DisplayPCMainMenu:: ; 213c8 (8:53c8)
 	ld a, [wNumHoFTeams]
 	and a
 	jr nz, .leaguePCAvailable
-	hlCoord 0, 0
+	coord hl, 0, 0
 	ld b, 8
 	ld c, 14
 	jr .next
 .noOaksPC
-	hlCoord 0, 0
+	coord hl, 0, 0
 	ld b, 6
 	ld c, 14
 	jr .next
 .leaguePCAvailable
-	hlCoord 0, 0
+	coord hl, 0, 0
 	ld b, 10
 	ld c, 14
 .next
@@ -32,15 +32,15 @@ DisplayPCMainMenu:: ; 213c8 (8:53c8)
 	ld a, [wd7f1]
 	bit 0, a
 	jr nz, .metBill
-	hlCoord 2, 2
+	coord hl, 2, 2
 	ld de, SomeonesPCText
 	jr .next2
 .metBill
-	hlCoord 2, 2
+	coord hl, 2, 2
 	ld de, BillsPCText
 .next2
 	call PlaceString
-	hlCoord 2, 4
+	coord hl, 2, 4
 	ld de, wPlayerName
 	call PlaceString
 	ld l, c
@@ -50,7 +50,7 @@ DisplayPCMainMenu:: ; 213c8 (8:53c8)
 	ld a, [wd74b]
 	bit 5, a ; received pokedex?
 	jr z, .noOaksPC2
-	hlCoord 2, 6
+	coord hl, 2, 6
 	ld de, OaksPCText
 	call PlaceString
 	ld a, [wNumHoFTeams]
@@ -58,20 +58,20 @@ DisplayPCMainMenu:: ; 213c8 (8:53c8)
 	jr z, .noLeaguePC
 	ld a, 4
 	ld [wMaxMenuItem], a
-	hlCoord 2, 8
+	coord hl, 2, 8
 	ld de, PKMNLeaguePCText
 	call PlaceString
-	hlCoord 2, 10
+	coord hl, 2, 10
 	ld de, LogOffPCText
 	jr .next3
 .noLeaguePC
-	hlCoord 2, 8
+	coord hl, 2, 8
 	ld de, LogOffPCText
 	jr .next3
 .noOaksPC2
 	ld a, $2
 	ld [wMaxMenuItem], a
-	hlCoord 2, 6
+	coord hl, 2, 6
 	ld de, LogOffPCText
 .next3
 	call PlaceString
@@ -122,11 +122,11 @@ BillsPCMenu: ; 214e8 (8:54e8)
 	ld bc, (BANK(PokeballTileGraphics) << 8) + $01
 	call CopyVideoData
 	call LoadScreenTilesFromBuffer2DisableBGTransfer
-	hlCoord 0, 0
+	coord hl, 0, 0
 	ld b, 10
 	ld c, 12
 	call TextBoxBorder
-	hlCoord 2, 2
+	coord hl, 2, 2
 	ld de, BillsPCMenuText
 	call PlaceString
 	ld hl, wTopMenuItemY
@@ -149,7 +149,7 @@ BillsPCMenu: ; 214e8 (8:54e8)
 	ld [wPlayerMonNumber], a
 	ld hl, WhatText
 	call PrintText
-	hlCoord 9, 14
+	coord hl, 9, 14
 	ld b, 2
 	ld c, 9
 	call TextBoxBorder
@@ -159,7 +159,7 @@ BillsPCMenu: ; 214e8 (8:54e8)
 	jr c, .singleDigitBoxNum
 ; two digit box num
 	sub 9
-	hlCoord 17, 16
+	coord hl, 17, 16
 	ld [hl], "1"
 	add "0"
 	jr .next
@@ -167,7 +167,7 @@ BillsPCMenu: ; 214e8 (8:54e8)
 	add "1"
 .next
 	Coorda 18, 16
-	hlCoord 10, 16
+	coord hl, 10, 16
 	ld de, BoxNoPCText
 	call PlaceString
 	ld a, 1
@@ -391,7 +391,7 @@ HMMoveArray: ; 21745 (8:5745)
 	db -1
 
 DisplayDepositWithdrawMenu: ; 2174b (8:574b)
-	hlCoord 9, 10
+	coord hl, 9, 10
 	ld b, 6
 	ld c, 9
 	call TextBoxBorder
@@ -401,9 +401,9 @@ DisplayDepositWithdrawMenu: ; 2174b (8:574b)
 	jr nz, .next
 	ld de, WithdrawPCText
 .next
-	hlCoord 11, 12
+	coord hl, 11, 12
 	call PlaceString
-	hlCoord 11, 14
+	coord hl, 11, 14
 	ld de, StatsCancelPCText
 	call PlaceString
 	ld hl, wTopMenuItemY
diff --git a/engine/menu/diploma.asm b/engine/menu/diploma.asm
index 33453a53..56373dd3 100755
--- a/engine/menu/diploma.asm
+++ b/engine/menu/diploma.asm
@@ -12,7 +12,7 @@ DisplayDiploma: ; 566e2 (15:66e2)
 	ld bc, $0010
 	ld a, BANK(CircleTile)
 	call FarCopyData2
-	hlCoord 0, 0
+	coord hl, 0, 0
 	ld bc, $1012
 	predef Diploma_TextBoxBorder
 	ld hl, DiplomaTextPointersAndCoords
@@ -33,7 +33,7 @@ DisplayDiploma: ; 566e2 (15:66e2)
 	pop bc
 	dec c
 	jr nz, .asm_56715
-	hlCoord 10, 4
+	coord hl, 10, 4
 	ld de, wPlayerName
 	call PlaceString
 	callba DrawPlayerCharacter
diff --git a/engine/menu/league_pc.asm b/engine/menu/league_pc.asm
index c38ab86b..560ed421 100755
--- a/engine/menu/league_pc.asm
+++ b/engine/menu/league_pc.asm
@@ -95,18 +95,18 @@ LeaguePCShowMon: ; 76610 (1d:6610)
 	ld b, $0B
 	ld c, 0
 	call GoPAL_SET
-	hlCoord 12, 5
+	coord hl, 12, 5
 	call GetMonHeader
 	call LoadFrontSpriteByMonIndex
 	call GBPalNormal
-	hlCoord 0, 13
+	coord hl, 0, 13
 	ld b, 2
 	ld c, $12
 	call TextBoxBorder
-	hlCoord 1, 15
+	coord hl, 1, 15
 	ld de, HallOfFameNoText
 	call PlaceString
-	hlCoord 16, 15
+	coord hl, 16, 15
 	ld de, wHoFTeamNo
 	ld bc, $0103
 	call PrintNumber
diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm
index 10ad7a2d..9e160f81 100755
--- a/engine/menu/main_menu.asm
+++ b/engine/menu/main_menu.asm
@@ -33,20 +33,20 @@ MainMenu: ; 5af2 (1:5af2)
 	ld a,[wd088]
 	cp a,1
 	jr z,.next1
-	hlCoord 0, 0
+	coord hl, 0, 0
 	ld b,6
 	ld c,13
 	call TextBoxBorder
-	hlCoord 2, 2
+	coord hl, 2, 2
 	ld de,ContinueText
 	call PlaceString
 	jr .next2
 .next1
-	hlCoord 0, 0
+	coord hl, 0, 0
 	ld b,4
 	ld c,13
 	call TextBoxBorder
-	hlCoord 2, 2
+	coord hl, 2, 2
 	ld de,NewGameText
 	call PlaceString
 .next2
@@ -139,12 +139,12 @@ LinkMenu: ; 5c0a (1:5c0a)
 	call SaveScreenTilesToBuffer1
 	ld hl, WhereWouldYouLikeText
 	call PrintText
-	hlCoord 5, 5
+	coord hl, 5, 5
 	ld b, $6
 	ld c, $d
 	call TextBoxBorder
 	call UpdateSprites
-	hlCoord 7, 7
+	coord hl, 7, 7
 	ld de, CableClubOptionsText
 	call PlaceString
 	xor a
@@ -340,21 +340,21 @@ CableClubOptionsText: ; 5d97 (1:5d97)
 ContinueGame: ; 5db5 (1:5db5)
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a
-	hlCoord 4, 7
+	coord hl, 4, 7
 	ld b, $8
 	ld c, $e
 	call TextBoxBorder
-	hlCoord 5, 9
+	coord hl, 5, 9
 	ld de, SaveScreenInfoText
 	call PlaceString
-	hlCoord 12, 9
+	coord hl, 12, 9
 	ld de, wPlayerName
 	call PlaceString
-	hlCoord 17, 11
+	coord hl, 17, 11
 	call Func_5e2f
-	hlCoord 16, 13
+	coord hl, 16, 13
 	call Func_5e42
-	hlCoord 13, 15
+	coord hl, 13, 15
 	call Func_5e55
 	ld a, $1
 	ld [H_AUTOBGTRANSFERENABLED], a
@@ -364,23 +364,23 @@ ContinueGame: ; 5db5 (1:5db5)
 PrintSaveScreenText: ; 5def (1:5def)
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a
-	hlCoord 4, 0
+	coord hl, 4, 0
 	ld b, $8
 	ld c, $e
 	call TextBoxBorder
 	call LoadTextBoxTilePatterns
 	call UpdateSprites
-	hlCoord 5, 2
+	coord hl, 5, 2
 	ld de, SaveScreenInfoText
 	call PlaceString
-	hlCoord 12, 2
+	coord hl, 12, 2
 	ld de, wPlayerName
 	call PlaceString
-	hlCoord 17, 4
+	coord hl, 17, 4
 	call Func_5e2f
-	hlCoord 16, 6
+	coord hl, 16, 6
 	call Func_5e42
-	hlCoord 13, 8
+	coord hl, 13, 8
 	call Func_5e55
 	ld a, $1
 	ld [H_AUTOBGTRANSFERENABLED], a
@@ -424,28 +424,28 @@ SaveScreenInfoText: ; 5e6a (1:5e6a)
 	next "TIME@"
 
 DisplayOptionMenu: ; 5e8a (1:5e8a)
-	hlCoord 0, 0
+	coord hl, 0, 0
 	ld b,3
 	ld c,18
 	call TextBoxBorder
-	hlCoord 0, 5
+	coord hl, 0, 5
 	ld b,3
 	ld c,18
 	call TextBoxBorder
-	hlCoord 0, 10
+	coord hl, 0, 10
 	ld b,3
 	ld c,18
 	call TextBoxBorder
-	hlCoord 1, 1
+	coord hl, 1, 1
 	ld de,TextSpeedOptionText
 	call PlaceString
-	hlCoord 1, 6
+	coord hl, 1, 6
 	ld de,BattleAnimationOptionText
 	call PlaceString
-	hlCoord 1, 11
+	coord hl, 1, 11
 	ld de,BattleStyleOptionText
 	call PlaceString
-	hlCoord 2, 16
+	coord hl, 2, 16
 	ld de,OptionMenuCancelText
 	call PlaceString
 	xor a
@@ -639,7 +639,7 @@ SetCursorPositionsFromOptions: ; 604c (1:604c)
 	dec hl
 	ld a,[hl]
 	ld [wOptionsTextSpeedCursorX],a ; text speed cursor X coordinate
-	hlCoord 0, 3
+	coord hl, 0, 3
 	call .placeUnfilledRightArrow
 	sla c
 	ld a,1 ; On
@@ -647,7 +647,7 @@ SetCursorPositionsFromOptions: ; 604c (1:604c)
 	ld a,10 ; Off
 .storeBattleAnimationCursorX
 	ld [wOptionsBattleAnimCursorX],a ; battle animation cursor X coordinate
-	hlCoord 0, 8
+	coord hl, 0, 8
 	call .placeUnfilledRightArrow
 	sla c
 	ld a,1
@@ -655,10 +655,10 @@ SetCursorPositionsFromOptions: ; 604c (1:604c)
 	ld a,10
 .storeBattleStyleCursorX
 	ld [wOptionsBattleStyleCursorX],a ; battle style cursor X coordinate
-	hlCoord 0, 13
+	coord hl, 0, 13
 	call .placeUnfilledRightArrow
 ; cursor in front of Cancel
-	hlCoord 0, 16
+	coord hl, 0, 16
 	ld a,1
 .placeUnfilledRightArrow
 	ld e,a
diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm
index 2416f0da..20deb834 100755
--- a/engine/menu/naming_screen.asm
+++ b/engine/menu/naming_screen.asm
@@ -4,7 +4,7 @@ AskName: ; 64eb (1:64eb)
 	push hl
 	ld a, [W_ISINBATTLE]
 	dec a
-	hlCoord 0, 0
+	coord hl, 0, 0
 	ld b, $4
 	ld c, $b
 	call z, ClearScreenArea ; only if in wild batle
@@ -13,7 +13,7 @@ AskName: ; 64eb (1:64eb)
 	call GetMonName
 	ld hl, DoYouWantToNicknameText
 	call PrintText
-	hlCoord 14, 7
+	coord hl, 14, 7
 	ld bc, $80f
 	ld a, TWO_OPTION_MENU
 	ld [wTextBoxID], a
@@ -93,7 +93,7 @@ DisplayNamingScreen: ; 6596 (1:6596)
 	call LoadHpBarAndStatusTilePatterns
 	call LoadEDTile
 	callba LoadMonPartySpriteGfx
-	hlCoord 0, 4
+	coord hl, 0, 4
 	ld b, $9
 	ld c, $12
 	call TextBoxBorder
@@ -343,7 +343,7 @@ PrintAlphabet: ; 676f (1:676f)
 	jr nz, .lowercase
 	ld de, UpperCaseAlphabet
 .lowercase
-	hlCoord 2, 5
+	coord hl, 2, 5
 	ld bc, $509 ; 5 rows, 9 columns
 .outerLoop
 	push bc
@@ -374,13 +374,13 @@ PrintNicknameAndUnderscores: ; 680e (1:680e)
 	call CalcStringLength
 	ld a, c
 	ld [wHPBarMaxHP], a
-	hlCoord 10, 2
+	coord hl, 10, 2
 	ld bc, $10a
 	call ClearScreenArea
-	hlCoord 10, 2
+	coord hl, 10, 2
 	ld de, wcf4b
 	call PlaceString
-	hlCoord 10, 3
+	coord hl, 10, 3
 	ld a, [wNamingScreenType]
 	cp NAME_MON_SCREEN
 	jr nc, .pokemon1
@@ -419,7 +419,7 @@ PrintNicknameAndUnderscores: ; 680e (1:680e)
 .emptySpacesRemaining
 	ld c, a
 	ld b, $0
-	hlCoord 10, 3
+	coord hl, 10, 3
 	add hl, bc
 	ld [hl], $77 ; raised underscore tile id
 	ret
@@ -467,7 +467,7 @@ CalcStringLength: ; 68eb (1:68eb)
 	jr .loop
 
 PrintNamingText: ; 68f8 (1:68f8)
-	hlCoord 0, 1
+	coord hl, 0, 1
 	ld a, [wNamingScreenType]
 	ld de, YourTextString
 	and a
@@ -482,12 +482,12 @@ PrintNamingText: ; 68f8 (1:68f8)
 	pop af
 	ld [wd11e], a
 	call GetMonName
-	hlCoord 4, 1
+	coord hl, 4, 1
 	call PlaceString
 	ld hl, $1
 	add hl, bc
 	ld [hl], $c9
-	hlCoord 1, 3
+	coord hl, 1, 3
 	ld de, NicknameTextString
 	jr .placeString
 .notNickname
diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm
index fcdd5c50..00ae3912 100755
--- a/engine/menu/party_menu.asm
+++ b/engine/menu/party_menu.asm
@@ -30,7 +30,7 @@ RedrawPartyMenu_: ; 12ce3 (4:6ce3)
 	jp z,.printMessage
 	call ErasePartyMenuCursors
 	callba SendBlkPacket_PartyMenu
-	hlCoord 3, 0
+	coord hl, 3, 0
 	ld de,wPartySpecies
 	xor a
 	ld c,a
diff --git a/engine/menu/players_pc.asm b/engine/menu/players_pc.asm
index f436ae24..89974dd0 100755
--- a/engine/menu/players_pc.asm
+++ b/engine/menu/players_pc.asm
@@ -22,12 +22,12 @@ PlayerPCMenu: ; 790c (1:790c)
 	ld hl, wFlags_0xcd60
 	set 5, [hl]
 	call LoadScreenTilesFromBuffer2
-	hlCoord 0, 0
+	coord hl, 0, 0
 	ld b, $8
 	ld c, $e
 	call TextBoxBorder
 	call UpdateSprites
-	hlCoord 2, 2
+	coord hl, 2, 2
 	ld de, PlayersPCMenuEntries
 	call PlaceString
 	ld hl, wTopMenuItemY
diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm
index 80eedecd..08ce0da9 100755
--- a/engine/menu/pokedex.asm
+++ b/engine/menu/pokedex.asm
@@ -118,7 +118,7 @@ HandlePokedexSideMenu: ; 4006d (10:406d)
 	pop af
 	ld [wCurrentMenuItem],a
 	push bc
-	hlCoord 0, 3
+	coord hl, 0, 3
 	ld de,20
 	ld bc,$7f0d ; 13 blank tiles
 	call DrawTileLine ; cover up the menu cursor in the pokemon list
@@ -126,7 +126,7 @@ HandlePokedexSideMenu: ; 4006d (10:406d)
 	ret
 .buttonBPressed
 	push bc
-	hlCoord 15, 10
+	coord hl, 15, 10
 	ld de,20
 	ld bc,$7f07 ; 7 blank tiles
 	call DrawTileLine ; cover up the menu cursor in the side menu
@@ -153,43 +153,43 @@ HandlePokedexListMenu: ; 40111 (10:4111)
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED],a
 ; draw the horizontal line separating the seen and owned amounts from the menu
-	hlCoord 15, 8
+	coord hl, 15, 8
 	ld a,$7a ; horizontal line tile
 	ld [hli],a
 	ld [hli],a
 	ld [hli],a
 	ld [hli],a
 	ld [hli],a
-	hlCoord 14, 0
+	coord hl, 14, 0
 	ld [hl],$71 ; vertical line tile
-	hlCoord 14, 1
+	coord hl, 14, 1
 	call DrawPokedexVerticalLine
-	hlCoord 14, 9
+	coord hl, 14, 9
 	call DrawPokedexVerticalLine
 	ld hl,wPokedexSeen
 	ld b,wPokedexSeenEnd - wPokedexSeen
 	call CountSetBits
 	ld de,wd11e
-	hlCoord 16, 3
+	coord hl, 16, 3
 	ld bc,$0103
 	call PrintNumber ; print number of seen pokemon
 	ld hl,wPokedexOwned
 	ld b,wPokedexOwnedEnd - wPokedexOwned
 	call CountSetBits
 	ld de,wd11e
-	hlCoord 16, 6
+	coord hl, 16, 6
 	ld bc,$0103
 	call PrintNumber ; print number of owned pokemon
-	hlCoord 16, 2
+	coord hl, 16, 2
 	ld de,PokedexSeenText
 	call PlaceString
-	hlCoord 16, 5
+	coord hl, 16, 5
 	ld de,PokedexOwnText
 	call PlaceString
-	hlCoord 1, 1
+	coord hl, 1, 1
 	ld de,PokedexContentsText
 	call PlaceString
-	hlCoord 16, 10
+	coord hl, 16, 10
 	ld de,PokedexMenuItemsText
 	call PlaceString
 ; find the highest pokedex number among the pokemon the player has seen
@@ -211,10 +211,10 @@ HandlePokedexListMenu: ; 40111 (10:4111)
 .loop
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED],a
-	hlCoord 4, 2
+	coord hl, 4, 2
 	ld bc,$0e0a
 	call ClearScreenArea
-	hlCoord 1, 3
+	coord hl, 1, 3
 	ld a,[wListScrollOffset]
 	ld [wd11e],a
 	ld d,7
@@ -411,18 +411,18 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2)
 	push af
 	xor a
 	ld [hTilesetType],a
-	hlCoord 0, 0
+	coord hl, 0, 0
 	ld de,1
 	ld bc,$6414
 	call DrawTileLine ; draw top border
-	hlCoord 0, 17
+	coord hl, 0, 17
 	ld b,$6f
 	call DrawTileLine ; draw bottom border
-	hlCoord 0, 1
+	coord hl, 0, 1
 	ld de,20
 	ld bc,$6610
 	call DrawTileLine ; draw left border
-	hlCoord 19, 1
+	coord hl, 19, 1
 	ld b,$67
 	call DrawTileLine ; draw right border
 	ld a,$63 ; upper left corner tile
@@ -433,14 +433,14 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2)
 	Coorda 0, 17
 	ld a,$6e ; lower right corner tile
 	Coorda 19, 17
-	hlCoord 0, 9
+	coord hl, 0, 9
 	ld de,PokedexDataDividerLine
 	call PlaceString ; draw horizontal divider line
-	hlCoord 9, 6
+	coord hl, 9, 6
 	ld de,HeightWeightText
 	call PlaceString
 	call GetMonName
-	hlCoord 9, 2
+	coord hl, 9, 2
 	call PlaceString
 	ld hl,PokedexEntryPointers
 	ld a,[wd11e]
@@ -452,7 +452,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2)
 	ld a,[hli]
 	ld e,a
 	ld d,[hl] ; de = address of pokedex entry
-	hlCoord 9, 4
+	coord hl, 9, 4
 	call PlaceString ; print species name
 	ld h,b
 	ld l,c
@@ -460,7 +460,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2)
 	ld a,[wd11e]
 	push af
 	call IndexToPokedex
-	hlCoord 2, 8
+	coord hl, 2, 8
 	ld a, "№"
 	ld [hli],a
 	ld a,$f2
@@ -482,7 +482,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2)
 	call Delay3
 	call GBPalNormal
 	call GetMonHeader ; load pokemon picture location
-	hlCoord 1, 1
+	coord hl, 1, 1
 	call LoadFlippedFrontSpriteByMonIndex ; draw pokemon picture
 	ld a,[wcf91]
 	call PlayCry ; play pokemon cry
@@ -495,14 +495,14 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2)
 	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
-	hlCoord 12, 6
+	coord hl, 12, 6
 	ld bc,$0102
 	call PrintNumber ; print feet (height)
 	ld a,$60 ; feet symbol tile (one tick)
 	ld [hl],a
 	inc de
 	inc de ; de = address of inches (height)
-	hlCoord 15, 6
+	coord hl, 15, 6
 	ld bc,$8102
 	call PrintNumber ; print inches (height)
 	ld a,$61 ; inches symbol tile (two ticks)
@@ -524,10 +524,10 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2)
 	ld a,[de] ; a = lower byte of weight
 	ld [hl],a ; store lower byte of weight in [hDexWeight + 1]
 	ld de,hDexWeight
-	hlCoord 11, 8
+	coord hl, 11, 8
 	ld bc,$0205 ; no leading zeroes, right-aligned, 2 bytes, 5 digits
 	call PrintNumber ; print weight
-	hlCoord 14, 8
+	coord hl, 14, 8
 	ld a,[hDexWeight + 1]
 	sub a,10
 	ld a,[hDexWeight]
@@ -545,7 +545,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2)
 	ld [hDexWeight],a ; restore original value of [hDexWeight]
 	pop hl
 	inc hl ; hl = address of pokedex description text
-	bcCoord 1, 11
+	coord bc, 1, 11
 	ld a,2
 	ld [$fff4],a
 	call TextCommandProcessor ; print pokedex description text
diff --git a/engine/menu/prize_menu.asm b/engine/menu/prize_menu.asm
index f7206a7f..d1fa0c72 100755
--- a/engine/menu/prize_menu.asm
+++ b/engine/menu/prize_menu.asm
@@ -22,7 +22,7 @@ CeladonPrizeMenu: ; 5271b (14:671b)
 	ld a,$01
 	ld [wTopMenuItemX],a
 	call PrintPrizePrice
-	hlCoord 0, 2
+	coord hl, 0, 2
 	ld b,$08
 	ld c,$10
 	call TextBoxBorder
@@ -93,42 +93,42 @@ GetPrizeMenuId: ; 5278e (14:678e)
 	ld a,[W_PRIZE1]
 	ld [wd11e],a
 	call GetItemName
-	hlCoord 2, 4
+	coord hl, 2, 4
 	call PlaceString
 	ld a,[W_PRIZE2]
 	ld [wd11e],a
 	call GetItemName
-	hlCoord 2, 6
+	coord hl, 2, 6
 	call PlaceString
 	ld a,[W_PRIZE3]
 	ld [wd11e],a
 	call GetItemName
-	hlCoord 2, 8
+	coord hl, 2, 8
 	call PlaceString
 	jr .putNoThanksText
 .putMonName
 	ld a,[W_PRIZE1]
 	ld [wd11e],a
 	call GetMonName
-	hlCoord 2, 4
+	coord hl, 2, 4
 	call PlaceString
 	ld a,[W_PRIZE2]
 	ld [wd11e],a
 	call GetMonName
-	hlCoord 2, 6
+	coord hl, 2, 6
 	call PlaceString
 	ld a,[W_PRIZE3]
 	ld [wd11e],a
 	call GetMonName
-	hlCoord 2, 8
+	coord hl, 2, 8
 	call PlaceString
 .putNoThanksText
-	hlCoord 2, 10
+	coord hl, 2, 10
 	ld de,NoThanksText
 	call PlaceString
 ; put prices on the right side of the textbox
 	ld de,wd141
-	hlCoord 13, 5
+	coord hl, 13, 5
 ; reg. c:
 ; [low nybble] number of bytes
 ; [bit 765 = %100] space-padding (not zero-padding)
@@ -137,29 +137,29 @@ GetPrizeMenuId: ; 5278e (14:678e)
 ; used by text-command $02)
 	call PrintBCDNumber
 	ld de,wd143
-	hlCoord 13, 7
+	coord hl, 13, 7
 	ld c,(%1 << 7 | 2)
 	call PrintBCDNumber
 	ld de,wd145
-	hlCoord 13, 9
+	coord hl, 13, 9
 	ld c,(1 << 7 | 2)
 	jp PrintBCDNumber
 
 INCLUDE "data/prizes.asm"
 
 PrintPrizePrice: ; 5287a (14:687a)
-	hlCoord 11, 0
+	coord hl, 11, 0
 	ld b,$01
 	ld c,$07
 	call TextBoxBorder
 	call UpdateSprites
-	hlCoord 12, 0
+	coord hl, 12, 0
 	ld de,.CoinText
 	call PlaceString
-	hlCoord 13, 1
+	coord hl, 13, 1
 	ld de,.SixSpacesText
 	call PlaceString
-	hlCoord 13, 1
+	coord hl, 13, 1
 	ld de,wPlayerCoins
 	ld c,%10000010
 	call PrintBCDNumber
diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm
index 2804ef7b..0036d66e 100755
--- a/engine/menu/start_sub_menus.asm
+++ b/engine/menu/start_sub_menus.asm
@@ -285,7 +285,7 @@ StartMenu_Pokemon: ; 130a9 (4:70a9)
 
 ; writes a blank tile to all possible menu cursor positions on the party menu
 ErasePartyMenuCursors: ; 132ed (4:72ed)
-	hlCoord 0, 1
+	coord hl, 0, 1
 	ld bc,2 * 20 ; menu cursor positions are 2 rows apart
 	ld a,6 ; 6 menu cursor positions
 .loop
@@ -526,10 +526,10 @@ DrawTrainerInfo: ; 1349a (4:749a)
 	ld bc,(BANK(RedPicFront) << 8) | $01
 	predef DisplayPicCenteredOrUpperRight
 	call DisableLCD
-	hlCoord 0, 2
+	coord hl, 0, 2
 	ld a," "
 	call TrainerInfo_DrawVerticalLine
-	hlCoord 1, 2
+	coord hl, 1, 2
 	call TrainerInfo_DrawVerticalLine
 	ld hl,vChars2 + $70
 	ld de,vChars2
@@ -572,7 +572,7 @@ DrawTrainerInfo: ; 1349a (4:749a)
 	dec a
 	ld [hli],a
 	ld [hl],1
-	hlCoord 0, 0
+	coord hl, 0, 0
 	call TrainerInfo_DrawTextBox
 	ld hl,wTrainerInfoTextBoxWidthPlus1
 	ld a,16 + 1
@@ -580,27 +580,27 @@ DrawTrainerInfo: ; 1349a (4:749a)
 	dec a
 	ld [hli],a
 	ld [hl],3
-	hlCoord 1, 10
+	coord hl, 1, 10
 	call TrainerInfo_DrawTextBox
-	hlCoord 0, 10
+	coord hl, 0, 10
 	ld a,$d7
 	call TrainerInfo_DrawVerticalLine
-	hlCoord 19, 10
+	coord hl, 19, 10
 	call TrainerInfo_DrawVerticalLine
-	hlCoord 6, 9
+	coord hl, 6, 9
 	ld de,TrainerInfo_BadgesText
 	call PlaceString
-	hlCoord 2, 2
+	coord hl, 2, 2
 	ld de,TrainerInfo_NameMoneyTimeText
 	call PlaceString
-	hlCoord 7, 2
+	coord hl, 7, 2
 	ld de,wPlayerName
 	call PlaceString
-	hlCoord 8, 4
+	coord hl, 8, 4
 	ld de,wPlayerMoney
 	ld c,$e3
 	call PrintBCDNumber
-	hlCoord 9, 6
+	coord hl, 9, 6
 	ld de,W_PLAYTIMEHOURS + 1 ; hours
 	ld bc,$4103
 	call PrintNumber
@@ -713,7 +713,7 @@ SwitchPartyMon: ; 13613 (4:7613)
 
 SwitchPartyMon_ClearGfx: ; 13625 (4:7625)
 	push af
-	hlCoord 0, 0
+	coord hl, 0, 0
 	ld bc, SCREEN_WIDTH * 2
 	call AddNTimes
 	ld c, SCREEN_WIDTH * 2
diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm
index 3f73a84f..75de182b 100755
--- a/engine/menu/status_screen.asm
+++ b/engine/menu/status_screen.asm
@@ -105,7 +105,7 @@ StatusScreen: ; 12953 (4:6953)
 	push af
 	xor a
 	ld [hTilesetType], a
-	hlCoord 19, 1
+	coord hl, 19, 1
 	ld bc, $060a
 	call DrawLineBox ; Draws the box around name, HP and status
 	ld de, $fffa
@@ -113,54 +113,54 @@ StatusScreen: ; 12953 (4:6953)
 	ld [hl], $f2 ; . after No ("." is a different one)
 	dec hl
 	ld [hl], "№"
-	hlCoord 19, 9
+	coord hl, 19, 9
 	ld bc, $0806
 	call DrawLineBox ; Draws the box around types, ID No. and OT
-	hlCoord 10, 9
+	coord hl, 10, 9
 	ld de, Type1Text
 	call PlaceString ; "TYPE1/"
-	hlCoord 11, 3
+	coord hl, 11, 3
 	predef DrawHP
 	ld hl, wcf25
 	call GetHealthBarColor
 	ld b, $3
 	call GoPAL_SET ; SGB palette
-	hlCoord 16, 6
+	coord hl, 16, 6
 	ld de, wLoadedMonStatus
 	call PrintStatusCondition
 	jr nz, .StatusWritten
-	hlCoord 16, 6
+	coord hl, 16, 6
 	ld de, OKText
 	call PlaceString ; "OK"
 .StatusWritten
-	hlCoord 9, 6
+	coord hl, 9, 6
 	ld de, StatusText
 	call PlaceString ; "STATUS/"
-	hlCoord 14, 2
+	coord hl, 14, 2
 	call PrintLevel ; Pokémon level
 	ld a, [W_MONHDEXNUM]
 	ld [wd11e], a
 	ld [wd0b5], a
 	predef IndexToPokedex
-	hlCoord 3, 7
+	coord hl, 3, 7
 	ld de, wd11e
 	ld bc, $8103 ; Zero-padded, 3
 	call PrintNumber ; Pokémon no.
-	hlCoord 11, 10
+	coord hl, 11, 10
 	predef PrintMonType
 	ld hl, NamePointers2
 	call .GetStringPointer
 	ld d, h
 	ld e, l
-	hlCoord 9, 1
+	coord hl, 9, 1
 	call PlaceString ; Pokémon name
 	ld hl, OTPointers
 	call .GetStringPointer
 	ld d, h
 	ld e, l
-	hlCoord 12, 16
+	coord hl, 12, 16
 	call PlaceString ; OT
-	hlCoord 12, 14
+	coord hl, 12, 14
 	ld de, wLoadedMonOTID
 	ld bc, $8205 ; 5
 	call PrintNumber ; ID Number
@@ -168,7 +168,7 @@ StatusScreen: ; 12953 (4:6953)
 	call PrintStatsBox
 	call Delay3
 	call GBPalNormal
-	hlCoord 1, 0
+	coord hl, 1, 0
 	call LoadFlippedFrontSpriteByMonIndex ; draw Pokémon picture
 	ld a, [wcf91]
 	call PlayCry ; play Pokémon cry
@@ -247,19 +247,19 @@ PrintStatsBox: ; 12ae4 (4:6ae4)
 	ld a, d
 	and a ; a is 0 from the status screen
 	jr nz, .DifferentBox
-	hlCoord 0, 8
+	coord hl, 0, 8
 	ld b, $8
 	ld c, $8
 	call TextBoxBorder ; Draws the box
-	hlCoord 1, 9 ; Start printing stats from here
+	coord hl, 1, 9 ; Start printing stats from here
 	ld bc, $0019 ; Number offset
 	jr .PrintStats
 .DifferentBox
-	hlCoord 9, 2
+	coord hl, 9, 2
 	ld b, $8
 	ld c, $9
 	call TextBoxBorder
-	hlCoord 11, 3
+	coord hl, 11, 3
 	ld bc, $0018
 .PrintStats
 	push bc
@@ -306,16 +306,16 @@ StatusScreen2: ; 12b57 (4:6b57)
 	ld bc, NUM_MOVES
 	call CopyData
 	callab FormatMovesString
-	hlCoord 9, 2
+	coord hl, 9, 2
 	ld bc, $050a
 	call ClearScreenArea ; Clear under name
-	hlCoord 19, 3
+	coord hl, 19, 3
 	ld [hl], $78
-	hlCoord 0, 8
+	coord hl, 0, 8
 	ld b, $8
 	ld c, $12
 	call TextBoxBorder ; Draw move container
-	hlCoord 2, 9
+	coord hl, 2, 9
 	ld de, wMovesString
 	call PlaceString ; Print moves
 	ld a, [wNumMovesMinusOne]
@@ -324,7 +324,7 @@ StatusScreen2: ; 12b57 (4:6b57)
 	ld a, $4
 	sub c
 	ld b, a ; Number of moves ?
-	hlCoord 11, 10
+	coord hl, 11, 10
 	ld de, SCREEN_WIDTH * 2
 	ld a, $72 ; special P tile id
 	call StatusScreen_PrintPP ; Print "PP"
@@ -336,7 +336,7 @@ StatusScreen2: ; 12b57 (4:6b57)
 	call StatusScreen_PrintPP ; Fill the rest with --
 .InitPP ; 12bbb
 	ld hl, wLoadedMonMoves
-	deCoord 14, 10
+	coord de, 14, 10
 	ld b, 0
 .PrintPP ; 12bc3
 	ld a, [hli]
@@ -386,7 +386,7 @@ StatusScreen2: ; 12b57 (4:6b57)
 	cp $4
 	jr nz, .PrintPP
 .PPDone
-	hlCoord 9, 3
+	coord hl, 9, 3
 	ld de, EXPPointsText
 	call PlaceString
 	ld a, [wLoadedMonLevel] ; level
@@ -396,7 +396,7 @@ StatusScreen2: ; 12b57 (4:6b57)
 	inc a
 	ld [wLoadedMonLevel], a ; Increase temporarily if not 100
 .Level100
-	hlCoord 14, 6
+	coord hl, 14, 6
 	ld [hl], $70 ; 1-tile "to"
 	inc hl
 	inc hl
@@ -404,22 +404,22 @@ StatusScreen2: ; 12b57 (4:6b57)
 	pop af
 	ld [wLoadedMonLevel], a
 	ld de, wLoadedMonExp
-	hlCoord 12, 4
+	coord hl, 12, 4
 	ld bc, $0307
 	call PrintNumber ; exp
 	call .asm_12c86
 	ld de, wLoadedMonExp
-	hlCoord 7, 6
+	coord hl, 7, 6
 	ld bc, $0307
 	call PrintNumber
-	hlCoord 9, 0
+	coord hl, 9, 0
 	call StatusScreen_ClearName
-	hlCoord 9, 1
+	coord hl, 9, 1
 	call StatusScreen_ClearName
 	ld a, [W_MONHDEXNUM]
 	ld [wd11e], a
 	call GetMonName
-	hlCoord 9, 1
+	coord hl, 9, 1
 	call PlaceString
 	ld a, $1
 	ld [$ffba], a
diff --git a/engine/menu/vending_machine.asm b/engine/menu/vending_machine.asm
index 07cf8854..0f6c6a13 100755
--- a/engine/menu/vending_machine.asm
+++ b/engine/menu/vending_machine.asm
@@ -17,15 +17,15 @@ VendingMachineMenu: ; 74ee0 (1d:4ee0)
 	ld [wTopMenuItemX], a
 	ld hl, wd730
 	set 6, [hl]
-	hlCoord 0, 3
+	coord hl, 0, 3
 	ld b, 8
 	ld c, 12
 	call TextBoxBorder
 	call UpdateSprites
-	hlCoord 2, 5
+	coord hl, 2, 5
 	ld de, DrinkText
 	call PlaceString
-	hlCoord 9, 6
+	coord hl, 9, 6
 	ld de, DrinkPriceText
 	call PlaceString
 	ld hl, wd730