Sync coordinate macros with pokecrystal

10 files changed, 39 insertions, 39 deletions

diff --git a/engine/events/cinnabar_lab.asm b/engine/events/cinnabar_lab.asm
index aaa0428e..bccc95d1 100755
--- a/engine/events/cinnabar_lab.asm
+++ b/engine/events/cinnabar_lab.asm
@@ -20,7 +20,7 @@ GiveFossilToCinnabarLab::
 	dec l
 	ld b, l
 	ld c, $d
-	coord hl, 0, 0
+	hlcoord 0, 0
 	call TextBoxBorder
 	call UpdateSprites
 	call PrintFossilsInBag
@@ -100,7 +100,7 @@ PrintFossilsInBag:
 	push hl
 	ld [wd11e], a
 	call GetItemName
-	coord hl, 2, 2
+	hlcoord 2, 2
 	ldh a, [hItemCounter]
 	ld bc, SCREEN_WIDTH * 2
 	call AddNTimes
diff --git a/engine/events/diploma.asm b/engine/events/diploma.asm
index 95dabab3..3248e152 100755
--- a/engine/events/diploma.asm
+++ b/engine/events/diploma.asm
@@ -14,7 +14,7 @@ DisplayDiploma::
 	ld bc, $10
 	ld a, BANK(CircleTile)
 	call FarCopyData2
-	coord hl, 0, 0
+	hlcoord 0, 0
 	lb bc, 16, 18
 	predef Diploma_TextBoxBorder
 	ld hl, DiplomaTextPointersAndCoords
@@ -35,7 +35,7 @@ DisplayDiploma::
 	pop bc
 	dec c
 	jr nz, .asm_56715
-	coord hl, 10, 4
+	hlcoord 10, 4
 	ld de, wPlayerName
 	call PlaceString
 	farcall DrawPlayerCharacter
@@ -85,15 +85,15 @@ UnusedPlayerNameLengthFunc:
 
 DiplomaTextPointersAndCoords:
 	dw DiplomaText
-	dwCoord 5, 2
+	dwcoord 5, 2
 	dw DiplomaPlayer
-	dwCoord 3, 4
+	dwcoord 3, 4
 	dw DiplomaEmptyText
-	dwCoord 15, 4
+	dwcoord 15, 4
 	dw DiplomaCongrats
-	dwCoord 2, 6
+	dwcoord 2, 6
 	dw DiplomaGameFreak
-	dwCoord 9, 16
+	dwcoord 9, 16
 
 DiplomaText:
 	db CIRCLE_TILE_ID, "Diploma", CIRCLE_TILE_ID, "@"
diff --git a/engine/events/hidden_objects/bills_house_pc.asm b/engine/events/hidden_objects/bills_house_pc.asm
index 92679d66..a73596b4 100644
--- a/engine/events/hidden_objects/bills_house_pc.asm
+++ b/engine/events/hidden_objects/bills_house_pc.asm
@@ -84,11 +84,11 @@ BillsHousePokemonList::
 .billsPokemonLoop
 	ld hl, wd730
 	set 6, [hl]
-	coord hl, 0, 0
+	hlcoord 0, 0
 	ld b, 10
 	ld c, 9
 	call TextBoxBorder
-	coord hl, 2, 2
+	hlcoord 2, 2
 	ld de, BillsMonListText
 	call PlaceString
 	ld hl, BillsHousePokemonListText2
diff --git a/engine/events/hidden_objects/book_or_sculpture.asm b/engine/events/hidden_objects/book_or_sculpture.asm
index 2f3334b8..e04f4047 100644
--- a/engine/events/hidden_objects/book_or_sculpture.asm
+++ b/engine/events/hidden_objects/book_or_sculpture.asm
@@ -4,7 +4,7 @@ BookOrSculptureText::
 	ld a, [wCurMapTileset]
 	cp MANSION ; Celadon Mansion tileset
 	jr nz, .ok
-	aCoord 8, 6
+	lda_coord 8, 6
 	cp $38
 	jr nz, .ok
 	ld hl, DiglettSculptureText
diff --git a/engine/events/hidden_objects/bookshelves.asm b/engine/events/hidden_objects/bookshelves.asm
index 23c087cc..b58444af 100644
--- a/engine/events/hidden_objects/bookshelves.asm
+++ b/engine/events/hidden_objects/bookshelves.asm
@@ -6,7 +6,7 @@ PrintBookshelfText::
 ; facing up
 	ld a, [wCurMapTileset]
 	ld b, a
-	aCoord 8, 7
+	lda_coord 8, 7
 	ld c, a
 	ld hl, BookshelfTileIDs
 .loop
diff --git a/engine/events/hidden_objects/museum_fossils.asm b/engine/events/hidden_objects/museum_fossils.asm
index ef53ed89..5d7e08fd 100644
--- a/engine/events/hidden_objects/museum_fossils.asm
+++ b/engine/events/hidden_objects/museum_fossils.asm
@@ -42,7 +42,7 @@ DisplayMonFrontSpriteInBox:
 	call LoadMonFrontSprite
 	ld a, $80
 	ldh [hStartTileID], a
-	coord hl, 10, 11
+	hlcoord 10, 11
 	predef AnimateSendingOutMon
 	call WaitForTextScrollButtonPress
 	call LoadScreenTilesFromBuffer1
diff --git a/engine/events/hidden_objects/school_blackboard.asm b/engine/events/hidden_objects/school_blackboard.asm
index 48b97d73..de4700d4 100644
--- a/engine/events/hidden_objects/school_blackboard.asm
+++ b/engine/events/hidden_objects/school_blackboard.asm
@@ -26,11 +26,11 @@ LinkCableHelp::
 .linkHelpLoop
 	ld hl, wd730
 	set 6, [hl]
-	coord hl, 0, 0
+	hlcoord 0, 0
 	ld b, 8
 	ld c, 13
 	call TextBoxBorder
-	coord hl, 2, 2
+	hlcoord 2, 2
 	ld de, HowToLinkText
 	call PlaceString
 	ld hl, LinkCableHelpText2
@@ -110,13 +110,13 @@ ViridianSchoolBlackboard::
 .blackboardLoop
 	ld hl, wd730
 	set 6, [hl]
-	coord hl, 0, 0
+	hlcoord 0, 0
 	lb bc, 6, 10
 	call TextBoxBorder
-	coord hl, 1, 2
+	hlcoord 1, 2
 	ld de, StatusAilmentText1
 	call PlaceString
-	coord hl, 6, 2
+	hlcoord 6, 2
 	ld de, StatusAilmentText2
 	call PlaceString
 	ld hl, ViridianSchoolBlackboardText2
diff --git a/engine/events/pokemart.asm b/engine/events/pokemart.asm
index 3345f540..c7cb8115 100755
--- a/engine/events/pokemart.asm
+++ b/engine/events/pokemart.asm
@@ -84,7 +84,7 @@ DisplayPokemartDialogue_::
 	ld hl, PokemartTellSellPriceText
 	lb bc, 14, 1 ; location that PrintText always prints to, this is useless
 	call PrintText
-	coord hl, 14, 7
+	hlcoord 14, 7
 	lb bc, 8, 15
 	ld a, TWO_OPTION_MENU
 	ld [wTextBoxID], a
@@ -162,7 +162,7 @@ DisplayPokemartDialogue_::
 	call CopyStringToCF4B ; copy name to wcf4b
 	ld hl, PokemartTellBuyPriceText
 	call PrintText
-	coord hl, 14, 7
+	hlcoord 14, 7
 	lb bc, 8, 15
 	ld a, TWO_OPTION_MENU
 	ld [wTextBoxID], a
diff --git a/engine/events/prize_menu.asm b/engine/events/prize_menu.asm
index 2d8bde90..d9320fe7 100755
--- a/engine/events/prize_menu.asm
+++ b/engine/events/prize_menu.asm
@@ -22,7 +22,7 @@ CeladonPrizeMenu::
 	ld a, $01
 	ld [wTopMenuItemX], a
 	call PrintPrizePrice
-	coord hl, 0, 2
+	hlcoord 0, 2
 	ld b, 8
 	ld c, 16
 	call TextBoxBorder
@@ -93,71 +93,71 @@ GetPrizeMenuId:
 	ld a, [wPrize1]
 	ld [wd11e], a
 	call GetItemName
-	coord hl, 2, 4
+	hlcoord 2, 4
 	call PlaceString
 	ld a, [wPrize2]
 	ld [wd11e], a
 	call GetItemName
-	coord hl, 2, 6
+	hlcoord 2, 6
 	call PlaceString
 	ld a, [wPrize3]
 	ld [wd11e], a
 	call GetItemName
-	coord hl, 2, 8
+	hlcoord 2, 8
 	call PlaceString
 	jr .putNoThanksText
 .putMonName
 	ld a, [wPrize1]
 	ld [wd11e], a
 	call GetMonName
-	coord hl, 2, 4
+	hlcoord 2, 4
 	call PlaceString
 	ld a, [wPrize2]
 	ld [wd11e], a
 	call GetMonName
-	coord hl, 2, 6
+	hlcoord 2, 6
 	call PlaceString
 	ld a, [wPrize3]
 	ld [wd11e], a
 	call GetMonName
-	coord hl, 2, 8
+	hlcoord 2, 8
 	call PlaceString
 .putNoThanksText
-	coord hl, 2, 10
+	hlcoord 2, 10
 	ld de, NoThanksText
 	call PlaceString
 ; put prices on the right side of the textbox
 	ld de, wPrize1Price
-	coord hl, 13, 5
+	hlcoord 13, 5
 ; reg. c:
 ; [low nybble] number of bytes
 ; [bits 765 = %100] space-padding (not zero-padding)
 	ld c, (1 << 7 | 2)
 	call PrintBCDNumber
 	ld de, wPrize2Price
-	coord hl, 13, 7
+	hlcoord 13, 7
 	ld c, (1 << 7 | 2)
 	call PrintBCDNumber
 	ld de, wPrize3Price
-	coord hl, 13, 9
+	hlcoord 13, 9
 	ld c, (1 << 7 | 2)
 	jp PrintBCDNumber
 
 INCLUDE "data/events/prizes.asm"
 
 PrintPrizePrice:
-	coord hl, 11, 0
+	hlcoord 11, 0
 	ld b, 1
 	ld c, 7
 	call TextBoxBorder
 	call UpdateSprites
-	coord hl, 12, 0
+	hlcoord 12, 0
 	ld de, .CoinString
 	call PlaceString
-	coord hl, 13, 1
+	hlcoord 13, 1
 	ld de, .SixSpacesString
 	call PlaceString
-	coord hl, 13, 1
+	hlcoord 13, 1
 	ld de, wPlayerCoins
 	ld c, %10000010
 	call PrintBCDNumber
diff --git a/engine/events/vending_machine.asm b/engine/events/vending_machine.asm
index 7bda91b0..a67f1c07 100755
--- a/engine/events/vending_machine.asm
+++ b/engine/events/vending_machine.asm
@@ -17,15 +17,15 @@ VendingMachineMenu::
 	ld [wTopMenuItemX], a
 	ld hl, wd730
 	set 6, [hl]
-	coord hl, 0, 3
+	hlcoord 0, 3
 	ld b, 8
 	ld c, 12
 	call TextBoxBorder
 	call UpdateSprites
-	coord hl, 2, 5
+	hlcoord 2, 5
 	ld de, DrinkText
 	call PlaceString
-	coord hl, 9, 6
+	hlcoord 9, 6
 	ld de, DrinkPriceText
 	call PlaceString
 	ld hl, wd730