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

1 files changed, 31 insertions, 62 deletions

diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm
index 3b830244..65b06e9d 100755
--- a/engine/menu/status_screen.asm
+++ b/engine/menu/status_screen.asm
@@ -40,8 +40,7 @@ StatusScreen: ; 12953 (4:6953)
 	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 @@ StatusScreen: ; 12953 (4:6953)
 	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 @@ StatusScreen: ; 12953 (4:6953)
 	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 @@ PrintStatsBox: ; 12ae4 (4:6ae4)
 	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 @@ StatusScreen2: ; 12b57 (4:6b57)
 	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 @@ StatusScreen2: ; 12b57 (4:6b57)
 	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 @@ StatusScreen2: ; 12b57 (4:6b57)
 	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 @@ StatusScreen2: ; 12b57 (4:6b57)
 	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 @@ StatusScreen2: ; 12b57 (4:6b57)
 	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 @@ StatusScreen2: ; 12b57 (4:6b57)
 	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