summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorU-Fish-PC\Daniel <corrnondacqb@yahoo.com>2014-06-25 16:58:27 -0400
committerU-Fish-PC\Daniel <corrnondacqb@yahoo.com>2014-06-25 16:58:27 -0400
commitbd533aa79bbe1998fd2b699bd7205da2de4fe55c (patch)
tree90d7000b49fc29d65a3a90a04074f7a7dd8a475f
parentb36f793667924f868282ce979fabab3e95d642a5 (diff)
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
Diffstat
-rwxr-xr-xengine/HoF_room_pc.asm18
-rwxr-xr-xengine/battle/1.asm6
-rwxr-xr-xengine/battle/1c.asm114
-rwxr-xr-xengine/battle/4_2.asm15
-rwxr-xr-xengine/battle/animations.asm33
-rwxr-xr-xengine/battle/core.asm201
-rwxr-xr-xengine/battle/d.asm12
-rwxr-xr-xengine/battle/e.asm12
-rwxr-xr-xengine/battle/e_2.asm6
-rwxr-xr-xengine/cable_club.asm6
-rwxr-xr-xengine/clear_save.asm3
-rwxr-xr-xengine/evolution.asm6
-rwxr-xr-xengine/hall_of_fame.asm48
-rwxr-xr-xengine/hidden_object_functions17.asm3
-rwxr-xr-xengine/hidden_object_functions3.asm3
-rwxr-xr-xengine/intro.asm9
-rwxr-xr-xengine/items/items.asm9
-rwxr-xr-xengine/learn_move.asm12
-rw-r--r--engine/menu/bills_pc.asm48
-rwxr-xr-xengine/menu/diploma.asm3
-rwxr-xr-xengine/menu/league_pc.asm12
-rwxr-xr-xengine/menu/main_menu.asm78
-rwxr-xr-xengine/menu/naming_screen.asm30
-rwxr-xr-xengine/menu/party_menu.asm3
-rwxr-xr-xengine/menu/players_pc.asm3
-rwxr-xr-xengine/menu/pokedex.asm99
-rwxr-xr-xengine/menu/prize_menu.asm45
-rwxr-xr-xengine/menu/start_sub_menus.asm48
-rwxr-xr-xengine/menu/status_screen.asm93
-rwxr-xr-xengine/menu/vending_machine.asm9
-rwxr-xr-xengine/oak_speech.asm12
-rwxr-xr-xengine/oak_speech2.asm12
-rwxr-xr-xengine/overworld/cinnabar_lab.asm3
-rwxr-xr-xengine/overworld/doors.asm3
-rwxr-xr-xengine/overworld/ledges.asm3
-rw-r--r--engine/overworld/movement.asm3
-rwxr-xr-xengine/overworld/player_animations.asm3
-rwxr-xr-xengine/overworld/pokemart.asm6
-rwxr-xr-xengine/save.asm27
-rwxr-xr-xengine/titlescreen.asm18
-rwxr-xr-xengine/town_map.asm36
-rwxr-xr-xengine/trade.asm45
-rwxr-xr-xengine/trade2.asm30
-rw-r--r--home.asm53
-rw-r--r--home/overworld.asm21
-rw-r--r--home/text.asm60
-rw-r--r--home/vcopy.asm9
-rw-r--r--macros.asm34
-rwxr-xr-xmain.asm93
-rwxr-xr-xscripts/bikeshop.asm6
-rwxr-xr-xscripts/celadongamecorner.asm24
-rwxr-xr-xscripts/celadonmartroof.asm3
-rwxr-xr-xscripts/vermiliondock.asm3
53 files changed, 519 insertions, 975 deletions
diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm
index 0ebb3b61..16a3c3f9 100755
--- a/engine/HoF_room_pc.asm
+++ b/engine/HoF_room_pc.asm
@@ -16,8 +16,7 @@ HallOfFamePC: ; 7405c (1d:405c)
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 @@ DisplayCreditsMon: ; 740cb (1d:40cb)
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 @@ Func_7417b: ; 7417b (1d:417b)
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 @@ Credits: ; 7418e (1d:418e)
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 @@ Credits: ; 7418e (1d:418e)
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
diff --git a/engine/battle/1.asm b/engine/battle/1.asm
index 7e744dba..04546313 100755
--- a/engine/battle/1.asm
+++ b/engine/battle/1.asm
@@ -67,12 +67,10 @@ Func_7861: ; 7861 (1:7861)
.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
diff --git a/engine/battle/1c.asm b/engine/battle/1c.asm
index 5523ba7d..b3b24007 100755
--- a/engine/battle/1c.asm
+++ b/engine/battle/1c.asm
@@ -2,8 +2,7 @@ Func_708ca: ; 708ca (1c:48ca)
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 @@ BattleTransition_Spiral: ; 70a72 (1c:4a72)
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 @@ BattleTransition_Shrink: ; 70b7f (1c:4b7f)
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 @@ BattleTransition_Split: ; 70bca (1c:4bca)
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_CopyTiles2: ; 70c3f (1c:4c3f)
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_VerticalStripes_: ; 70caa (1c:4caa)
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_Circle_Sub2: ; 70d50 (1c:4d50)
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
diff --git a/engine/battle/4_2.asm b/engine/battle/4_2.asm
index db9d076f..c5c62796 100755
--- a/engine/battle/4_2.asm
+++ b/engine/battle/4_2.asm
@@ -18,8 +18,7 @@ Func_137aa: ; 137aa (4:77aa)
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 @@ Func_13870: ; 13870 (4:7870)
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 @@ Func_13870: ; 13870 (4:7870)
.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 @@ RecoilEffect_: ; 1392c (4:792c)
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
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
index 8fad427a..cc598de4 100755
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -754,8 +754,7 @@ DoBallTossSpecialEffects: ; 78f3e (1e:4f3e)
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 @@ 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
- 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 @@ AnimationMoveMonHorizontally: ; 793f9 (1e:53f9)
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 @@ AnimationSquishMonPic: ; 794a1 (1e:54a1)
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 @@ Func_795f8: ; 795f8 (1e:55f8)
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 @@ Func_79793: ; 79793 (1e:5793)
xor a
ld [W_SPRITEFLIPPED], a
call GetMonHeader
- FuncCoord 12, 0
- ld hl, Coord
+ hlCoord 12, 0
call LoadFrontSpriteByMonIndex
jr .asm_797d3
.asm_797b0
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 4f382df7..b3495a29 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -96,8 +96,7 @@ Func_3c04c: ; 3c04c (f:404c)
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 @@ Func_3c04c: ; 3c04c (f:404c)
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 @@ Func_3c1ad: ; 3c1ad (f:41ad)
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 @@ HandlePoisonBurnLeechSeed_IncreaseEnemyHP: ; 3c4a3 (f:44a3)
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 @@ FaintEnemyPokemon ; 0x3c567
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 @@ Func_3c741: ; 3c741 (f:4741)
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 @@ Func_3c79b: ; 3c79b (f:479b)
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 @@ Func_3c92a: ; 3c92a (f:492a)
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 @@ Func_3c92a: ; 3c92a (f:492a)
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 @@ Func_3c92a: ; 3c92a (f:492a)
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 @@ Func_3cca4: ; 3cca4 (f:4ca4)
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 @@ Func_3cca4: ; 3cca4 (f:4ca4)
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 @@ Func_3ccfa: ; 3ccfa (f:4cfa)
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 @@ Func_3ccfa: ; 3ccfa (f:4cfa)
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_3cd5a: ; 3cd5a (f:4d5a)
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 @@ Func_3cd60: ; 3cd60 (f:4d60)
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 @@ Func_3cd60: ; 3cd60 (f:4d60)
.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 @@ Func_3cdec: ; 3cdec (f:4dec)
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_3cdec: ; 3cdec (f:4dec)
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 @@ InitBattleMenu: ; 3ceb3 (f:4eb3)
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 @@ RegularBattleMenu: ; 3cf1a (f:4f1a)
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 @@ RegularBattleMenu: ; 3cf1a (f:4f1a)
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 @@ asm_3d0f0: ; 3d0f0 (f:50f0)
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 @@ MoveSelectionMenu: ; 3d219 (f:5219)
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 @@ MoveSelectionMenu: ; 3d219 (f:5219)
.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 @@ MoveSelectionMenu: ; 3d219 (f:5219)
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 @@ Func_3d2fe: ; 3d2fe (f:52fe)
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 @@ Func_3d2fe: ; 3d2fe (f:52fe)
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 @@ asm_3d4ad: ; 3d4ad (f:54ad)
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 @@ Func_3d4b6: ; 3d4b6 (f:54b6)
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 @@ Func_3d4b6: ; 3d4b6 (f:54b6)
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 @@ ApplyDamageToEnemyPokemon: ; 3e142 (f:6142)
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 @@ ApplyDamageToPlayerPokemon: ; 3e200 (f:6200)
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 @@ Func_3ec92: ; 3ec92 (f:6c92)
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 @@ asm_3ef3d: ; 3ef3d (f:6f3d)
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 @@ InitWildBattle: ; 3ef8b (f:6f8b)
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 @@ Func_3efeb: ; 3efeb (f:6feb)
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 @@ LoadMonBackPic:
; 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
diff --git a/engine/battle/d.asm b/engine/battle/d.asm
index 5a1010b8..d23c9114 100755
--- 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
diff --git a/engine/battle/e.asm b/engine/battle/e.asm
index 3e9f3685..8b0476ca 100755
--- a/engine/battle/e.asm
+++ b/engine/battle/e.asm
@@ -67,8 +67,7 @@ _ScrollTrainerPicAfterBattle: ; 396d3 (e:56d3)
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 @@ AIRecoverHP: ; 3a6da (e:66da)
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 @@ PlacePlayerHUDTiles: ; 3a902 (e:6902)
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 @@ PlaceEnemyHUDTiles: ; 3a919 (e:6919)
ld de, wTrainerFacingDirection
ld bc, $3
call CopyData
- FuncCoord 1, 2
- ld hl, Coord
+ hlCoord 1, 2
ld de, $1
jr PlaceHUDTiles
diff --git a/engine/battle/e_2.asm b/engine/battle/e_2.asm
index f6d65301..665807fe 100755
--- a/engine/battle/e_2.asm
+++ b/engine/battle/e_2.asm
@@ -85,12 +85,10 @@ HealEffect_: ; 3b9ec (e:79ec)
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
diff --git a/engine/cable_club.asm b/engine/cable_club.asm
index 75d8bd00..fc049ceb 100755
--- a/engine/cable_club.asm
+++ b/engine/cable_club.asm
@@ -6,13 +6,11 @@ Func_5317: ; 5317 (1:5317)
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
diff --git a/engine/clear_save.asm b/engine/clear_save.asm
index 3a296e2e..5ef0d475 100755
--- a/engine/clear_save.asm
+++ b/engine/clear_save.asm
@@ -5,8 +5,7 @@ Func_1c98a: ; 1c98a (7:498a)
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
diff --git a/engine/evolution.asm b/engine/evolution.asm
index 8e511182..07ccdbda 100755
--- a/engine/evolution.asm
+++ b/engine/evolution.asm
@@ -99,8 +99,7 @@ Func_7beb4: ; 7beb4 (1e:7eb4)
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 @@ Func_7bed6: ; 7bed6 (1e:7ed6)
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
diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm
index caadce13..f4384b91 100755
--- a/engine/hall_of_fame.asm
+++ b/engine/hall_of_fame.asm
@@ -57,13 +57,11 @@ AnimateHallOfFame: ; 701a0 (1c:41a0)
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 @@ Func_70278: ; 70278 (1c:4278)
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 @@ Func_702e1: ; 702e1 (1c:42e1)
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,34 +199,28 @@ Func_7033e: ; 7033e (1c:433e)
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)
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 @@ Func_70377: ; 70377 (1c:4377)
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
diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm
index d2408a5b..f0126b65 100755
--- a/engine/hidden_object_functions17.asm
+++ b/engine/hidden_object_functions17.asm
@@ -77,8 +77,7 @@ DisplayMonFrontSpriteInBox: ; 5dbd9 (17:5bd9)
call LoadMonFrontSprite
ld a, $80
ld [$ffe1], a
- FuncCoord 10, 11
- ld hl, Coord
+ hlCoord 10, 11
predef Func_3f073
call WaitForTextScrollButtonPress
call LoadScreenTilesFromBuffer1
diff --git a/engine/hidden_object_functions3.asm b/engine/hidden_object_functions3.asm
index a71ef667..e613df2e 100755
--- a/engine/hidden_object_functions3.asm
+++ b/engine/hidden_object_functions3.asm
@@ -5,8 +5,7 @@ PrintBookshelfText: ; fb50 (3:7b50)
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
diff --git a/engine/intro.asm b/engine/intro.asm
index 2b8c2dbf..801324a5 100755
--- a/engine/intro.asm
+++ b/engine/intro.asm
@@ -204,8 +204,7 @@ Func_417f0: ; 417f0 (10:57f0)
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 @@ Func_4180e: ; 4180e (10:580e)
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 @@ Func_418e9: ; 418e9 (10:58e9)
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
diff --git a/engine/items/items.asm b/engine/items/items.asm
index fbb2ec8f..830f0dfc 100755
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -913,8 +913,7 @@ ItemUseMedicine: ; dabb (3:5abb)
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 @@ ItemUseTMHM: ; e479 (3:6479)
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 @@ TossItem_: ; e6f1 (3:66f1)
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
diff --git a/engine/learn_move.asm b/engine/learn_move.asm
index 0561abcd..bbfb41a3 100755
--- a/engine/learn_move.asm
+++ b/engine/learn_move.asm
@@ -76,8 +76,7 @@ DontAbandonLearning: ; 6e5b (1:6e5b)
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 @@ TryingToLearn: ; 6f07 (1:6f07)
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 @@ TryingToLearn: ; 6f07 (1:6f07)
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
diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm
index 2640bada..3edaadd8 100644
--- a/engine/menu/bills_pc.asm
+++ b/engine/menu/bills_pc.asm
@@ -32,18 +32,15 @@ Func_213c8:: ; 213c8 (8:53c8)
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 @@ Func_213c8:: ; 213c8 (8:53c8)
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 @@ Func_213c8:: ; 213c8 (8:53c8)
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 @@ BillsPCMenu:
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 @@ BillsPCMenu:
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,18 +170,15 @@ BillsPCMenu:
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
.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 @@ HMMoveArray: ; 21745 (8:5745)
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 @@ Func_2174b: ; 2174b (8:574b)
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
diff --git a/engine/menu/diploma.asm b/engine/menu/diploma.asm
index 3bf185fd..023c6177 100755
--- a/engine/menu/diploma.asm
+++ b/engine/menu/diploma.asm
@@ -33,8 +33,7 @@ DisplayDiploma: ; 566e2 (15:66e2)
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
diff --git a/engine/menu/league_pc.asm b/engine/menu/league_pc.asm
index 46f63420..4833e57d 100755
--- a/engine/menu/league_pc.asm
+++ b/engine/menu/league_pc.asm
@@ -93,22 +93,18 @@ Func_76610: ; 76610 (1d:6610)
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
diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm
index 06c85096..4044da43 100755
--- a/engine/menu/main_menu.asm
+++ b/engine/menu/main_menu.asm
@@ -33,24 +33,20 @@ MainMenu: ; 5af2 (1:5af2)
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 @@ LinkMenu: ; 5c0a (1:5c0a)
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 @@ LinkMenu: ; 5c0a (1:5c0a)
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 @@ TradeCenterText: ; 5d97 (1:5d97)
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 @@ SaveScreenInfoText: ; 5e6a (1:5e6a)
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 @@ SetCursorPositionsFromOptions: ; 604c (1:604c)
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 @@ SetCursorPositionsFromOptions: ; 604c (1:604c)
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 @@ SetCursorPositionsFromOptions: ; 604c (1:604c)
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
diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm
index e065d98d..17aa96e6 100755
--- a/engine/menu/naming_screen.asm
+++ b/engine/menu/naming_screen.asm
@@ -13,8 +13,7 @@ AskName: ; 64eb (1:64eb)
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 @@ DisplayNamingScreen: ; 6596 (1:6596)
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 @@ PrintAlphabet: ; 676f (1:676f)
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 @@ Func_680e: ; 680e (1:680e)
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 @@ Func_680e: ; 680e (1:680e)
.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 @@ CalcStringLength: ; 68eb (1:68eb)
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 @@ PrintNamingText: ; 68f8 (1:68f8)
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
diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm
index d0a74c11..4e47361b 100755
--- a/engine/menu/party_menu.asm
+++ b/engine/menu/party_menu.asm
@@ -30,8 +30,7 @@ RedrawPartyMenu_: ; 12ce3 (4:6ce3)
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
diff --git a/engine/menu/players_pc.asm b/engine/menu/players_pc.asm
index f29ef258..4ff1b16f 100755
--- a/engine/menu/players_pc.asm
+++ b/engine/menu/players_pc.asm
@@ -26,8 +26,7 @@ Func_790c: ; 790c (1:790c)
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
diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm
index 4d3f5aaa..63e440f8 100755
--- a/engine/menu/pokedex.asm
+++ b/engine/menu/pokedex.asm
@@ -118,8 +118,7 @@ HandlePokedexSideMenu: ; 4006d (10:406d)
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 @@ HandlePokedexSideMenu: ; 4006d (10:406d)
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,53 +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
- FuncCoord 15,8
- ld hl,Coord
+ hlCoord 15, 8
ld a,$7a ; horizontal line tile
ld [hli],a
ld [hli],a
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
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 @@ HandlePokedexListMenu: ; 40111 (10:4111)
.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 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2)
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 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2)
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 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2)
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 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2)
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,16 +492,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
- 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)
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 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2)
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 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2)
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
diff --git a/engine/menu/prize_menu.asm b/engine/menu/prize_menu.asm
index 63bdedee..141b9beb 100755
--- a/engine/menu/prize_menu.asm
+++ b/engine/menu/prize_menu.asm
@@ -22,8 +22,7 @@ CeladonPrizeMenu: ; 5271b (14:671b)
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,50 +93,42 @@ GetPrizeMenuId: ; 5278e (14:678e)
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
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,35 +137,29 @@ GetPrizeMenuId: ; 5278e (14:678e)
; 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
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
diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm
index bb23321b..7c6fe4d6 100755
--- a/engine/menu/start_sub_menus.asm
+++ b/engine/menu/start_sub_menus.asm
@@ -285,8 +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)
- 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 @@ StartMenu_Item: ; 13302 (4:7302)
.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 @@ DrawTrainerInfo: ; 1349a (4:749a)
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 @@ DrawTrainerInfo: ; 1349a (4:749a)
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 @@ DrawTrainerInfo: ; 1349a (4:749a)
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
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
diff --git a/engine/menu/vending_machine.asm b/engine/menu/vending_machine.asm
index 73dece40..c2968e2f 100755
--- a/engine/menu/vending_machine.asm
+++ b/engine/menu/vending_machine.asm
@@ -17,18 +17,15 @@ VendingMachineMenu: ; 74ee0 (1d:4ee0)
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
diff --git a/engine/oak_speech.asm b/engine/oak_speech.asm
index 314c34df..767b8b5a 100755
--- a/engine/oak_speech.asm
+++ b/engine/oak_speech.asm
@@ -68,8 +68,7 @@ OakSpeech: ; 6115 (1:6115)
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 @@ Func_61bc: ; 61bc (1:61bc)
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 @@ IntroPredef3B: ; 62a4 (1:62a4)
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
diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm
index 380ff7bf..9d994047 100755
--- a/engine/oak_speech2.asm
+++ b/engine/oak_speech2.asm
@@ -76,15 +76,13 @@ Func_69ec: ; 69ec (1:69ec)
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 @@ DisplayIntroNameTextBox: ; 6a6c (1:6a6c)
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
diff --git a/engine/overworld/cinnabar_lab.asm b/engine/overworld/cinnabar_lab.asm
index bb202333..eefa2176 100755
--- a/engine/overworld/cinnabar_lab.asm
+++ b/engine/overworld/cinnabar_lab.asm
@@ -101,8 +101,7 @@ Func_610c2: ; 610c2 (18:50c2)
push hl
ld [wd11e], a
call GetItemName
- FuncCoord 2, 2
- ld hl, Coord
+ hlCoord 2, 2
ld a, [$ffdb]
ld bc, $28
call AddNTimes
diff --git a/engine/overworld/doors.asm b/engine/overworld/doors.asm
index 6337f511..42ebb174 100755
--- a/engine/overworld/doors.asm
+++ b/engine/overworld/doors.asm
@@ -10,8 +10,7 @@ HandleDoors: ; 1a609 (6:6609)
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]
diff --git a/engine/overworld/ledges.asm b/engine/overworld/ledges.asm
index b64a1174..43df82e2 100755
--- a/engine/overworld/ledges.asm
+++ b/engine/overworld/ledges.asm
@@ -8,8 +8,7 @@ HandleLedges: ; 1a672 (6:6672)
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
diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm
index f8dd5fc4..f08a20cb 100644
--- a/engine/overworld/movement.asm
+++ b/engine/overworld/movement.asm
@@ -8,8 +8,7 @@ UpdatePlayerSprite: ; 4e31 (1:4e31)
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
diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm
index ee4c999d..a0d8175f 100755
--- a/engine/overworld/player_animations.asm
+++ b/engine/overworld/player_animations.asm
@@ -349,8 +349,7 @@ Func_70787: ; 70787 (1c:4787)
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
diff --git a/engine/overworld/pokemart.asm b/engine/overworld/pokemart.asm
index adae76de..3b06bd2c 100755
--- a/engine/overworld/pokemart.asm
+++ b/engine/overworld/pokemart.asm
@@ -77,8 +77,7 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20)
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 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20)
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
diff --git a/engine/save.asm b/engine/save.asm
index 1b8f1467..fcfbd133 100755
--- a/engine/save.asm
+++ b/engine/save.asm
@@ -151,12 +151,10 @@ SaveSAV: ;$770a
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 @@ NowSavingString:
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,16 +432,14 @@ Func_7393f: ; 7393f (1c:793f)
call TextBoxBorder
ld hl, ChooseABoxText
call PrintText
- FuncCoord 11, 0
- ld hl, Coord
+ hlCoord 11, 0
ld b, $c
ld c, $7
call TextBoxBorder
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,23 +448,19 @@ Func_7393f: ; 7393f (1c:793f)
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
.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
diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm
index 9698da56..10c5fad4 100755
--- a/engine/titlescreen.asm
+++ b/engine/titlescreen.asm
@@ -68,8 +68,7 @@ ENDC
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 @@ ENDC
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 @@ ENDC
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_4519: ; 4519 (1:4519)
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 @@ LoadCopyrightTiles: ; 4541 (1:4541)
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 @@ INCLUDE "data/title_mons.asm"
; prints version text (red, blue)
PrintGameVersionOnTitleScreen: ; 4598 (1:4598)
- FuncCoord 7, 8
- ld hl, Coord
+ hlCoord 7, 8
ld de, VersionOnTitleScreenText
jp PlaceString
diff --git a/engine/town_map.asm b/engine/town_map.asm
index ea2d3171..2cd37284 100755
--- a/engine/town_map.asm
+++ b/engine/town_map.asm
@@ -11,8 +11,7 @@ DisplayTownMap: ; 70e3e (1c:4e3e)
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 @@ Func_70e92: ; 70e92 (1c:4e92)
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 @@ LoadTownMap_Nest: ; 70f60 (1c:4f60)
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,33 +160,28 @@ LoadTownMap_Fly: ; 70f90 (1c:4f90)
ld b, $0
call Func_711c4
ld hl, wTrainerEngageDistance
- FuncCoord 18, 0
- ld de, Coord
+ deCoord 18, 0
.townMapFlyLoop
ld a, $7f
ld [de], a
push hl
push hl
- FuncCoord 3, 0
- ld hl, Coord
+ hlCoord 3, 0
ld bc, $10f
call ClearScreenArea
pop hl
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 @@ LoadTownMap_Fly: ; 70f90 (1c:4f90)
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 @@ LoadTownMap_Fly: ; 70f90 (1c:4f90)
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 @@ Func_711ef: ; 711ef (1c:51ef)
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
diff --git a/engine/trade.asm b/engine/trade.asm
index 3da1760f..54abdab6 100755
--- a/engine/trade.asm
+++ b/engine/trade.asm
@@ -181,8 +181,7 @@ Func_41245: ; 41245 (10:5245)
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 @@ Func_41298: ; 41298 (10:5298)
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 @@ Func_41336: ; 41336 (10:5336)
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 @@ Func_41336: ; 41336 (10:5336)
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_41411: ; 41411 (10:5411)
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,25 +411,21 @@ Func_4142d: ; 4142d (10:542d)
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
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,25 +449,21 @@ Func_4145c: ; 4145c (10:545c)
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
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_4149f: ; 4149f (10:549f)
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 @@ Func_415a4: ; 415a4 (10:55a4)
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
diff --git a/engine/trade2.asm b/engine/trade2.asm
index 496ce24b..b13a18b6 100755
--- 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
diff --git a/home.asm b/home.asm
index e9dc60c3..dc0b0889 100644
--- a/home.asm
+++ b/home.asm
@@ -1937,8 +1937,7 @@ DisplayListMenuID:: ; 2be6 (0:2be6)
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 @@ DisplayListMenuIDLoop:: ; 2c53 (0:2c53)
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,27 +2097,23 @@ DisplayListMenuIDLoop:: ; 2c53 (0:2c53)
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]
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 @@ DisplayChooseQuantityMenu:: ; 2d57 (0:2d57)
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 @@ DisplayChooseQuantityMenu:: ; 2d57 (0:2d57)
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 @@ ExitListMenu:: ; 2e3b (0:2e3b)
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 @@ PrintListMenuEntries:: ; 2e5a (0:2e5a)
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 @@ Func_35f4:: ; 35f4 (0:35f4)
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 @@ YesNoChoicePokeCenter:: ; 360a (0:360a)
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 @@ Func_361a:: ; 361a (0:361a)
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 @@ WaitForTextScrollButtonPress:: ; 3865 (0:3865)
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 @@ HandleMenuInputPokemonSelection:: ; 3ac2 (0:3ac2)
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 @@ PrintText:: ; 3c49 (0:3c49)
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
diff --git a/home/overworld.asm b/home/overworld.asm
index 872d63ee..cf36aba8 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -105,8 +105,7 @@ OverworldLoopLessDelay::
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 @@ CheckMapConnections:: ; 07ba (0:07ba)
; 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 @@ CheckForJumpingAndTilePairCollisions:: ; 0c2a (0:0c2a)
; 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 @@ MoveTileBlockMapPointerNorth:: ; 0e85 (0:0e85)
; 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 @@ ScheduleRowRedrawHelper:: ; 0ea6 (0:0ea6)
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 @@ ScheduleSouthRowRedraw:: ; 0eb2 (0:0eb2)
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 @@ ScheduleColumnRedrawHelper:: ; 0ef2 (0:0ef2)
ret
ScheduleWestColumnRedraw:: ; 0f08 (0:0f08)
- FuncCoord 0,0
- ld hl,Coord
+ hlCoord 0, 0
call ScheduleColumnRedrawHelper
ld a,[wd526]
ld [H_SCREENEDGEREDRAWADDR],a
diff --git a/home/text.asm b/home/text.asm
index 46c17b07..abcac9fd 100644
--- a/home/text.asm
+++ b/home/text.asm
@@ -76,8 +76,7 @@ PlaceNextChar:: ; 1956 (0:1956)
cp $4F
jr nz,.next3
pop hl
- FuncCoord 1, 16
- ld hl,Coord
+ hlCoord 1, 16
push hl
jp Next19E8
@@ -270,14 +269,12 @@ Char58:: ; 1a95 (0:1a95)
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,67 +287,56 @@ Char58Text:: ; 1ab3 (0:1ab3)
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
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 @@ Next1B18:: ; 1b18 (0:1b18)
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 @@ TextCommand03:: ; 1bb7 (0:1bb7)
; (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 @@ TextCommand06:: ; 1bcc (0:1bcc)
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 @@ TextCommand06:: ; 1bcc (0:1bcc)
; (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
diff --git a/home/vcopy.asm b/home/vcopy.asm
index 71487cf1..81fcb991 100644
--- a/home/vcopy.asm
+++ b/home/vcopy.asm
@@ -130,8 +130,7 @@ AutoBgMapTransfer:: ; 1d57 (0:1d57)
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 @@ AutoBgMapTransfer:: ; 1d57 (0:1d57)
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 @@ AutoBgMapTransfer:: ; 1d57 (0:1d57)
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
diff --git a/macros.asm b/macros.asm
index a99a80ea..8244c8c9 100644
--- a/macros.asm
+++ b/macros.asm
@@ -37,8 +37,38 @@ callab: MACRO
;\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
diff --git a/main.asm b/main.asm
index df42f937..32a3db2c 100755
--- a/main.asm
+++ b/main.asm
@@ -158,8 +158,7 @@ INCLUDE "engine/overworld/oam.asm"
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 @@ PrintWaitingText:
.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 @@ DisplayTextIDInit: ; 7096 (1:7096)
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 @@ DrawStartMenu: ; 710b (1:710b)
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 @@ DrawStartMenu: ; 710b (1:710b)
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 @@ Func_74ba: ; 74ba (1:74ba)
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,22 +1627,19 @@ Func_76e1: ; 76e1 (1:36e1)
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
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 @@ Func_76e1: ; 76e1 (1:36e1)
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 @@ Func_76e1: ; 76e1 (1:36e1)
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 @@ Func_c49d: ; c49d (3:449d)
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 @@ PrintSafariZoneSteps: ; c52f (3:452f)
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 @@ Func_c589: ; c589 (3:4589)
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 @@ Func_c5be: ; c5be (3:45be)
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 @@ Func_c5be: ; c5be (3:45be)
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 @@ Func_c5be: ; c5be (3:45be)
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 @@ Func_c5be: ; c5be (3:45be)
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 @@ DrawBadges: ; ea03 (3:6a03)
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
diff --git a/scripts/bikeshop.asm b/scripts/bikeshop.asm
index c30829e9..4bd26a7e 100755
--- a/scripts/bikeshop.asm
+++ b/scripts/bikeshop.asm
@@ -56,12 +56,10 @@ BikeShopText1: ; 1d745 (7:5745)
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
diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm
index 2d638044..9746f54e 100755
--- a/scripts/celadongamecorner.asm
+++ b/scripts/celadongamecorner.asm
@@ -467,40 +467,32 @@ CeladonGameCornerText_48f19: ; 48f19 (12:4f19)
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
diff --git a/scripts/celadonmartroof.asm b/scripts/celadonmartroof.asm
index 02f2959d..37025525 100755
--- a/scripts/celadonmartroof.asm
+++ b/scripts/celadonmartroof.asm
@@ -200,8 +200,7 @@ CeladonMartRoofScript_48532: ; 48532 (12:4532)
push hl
ld [wd11e], a
call GetItemName
- FuncCoord 2, 2
- ld hl, Coord
+ hlCoord 2, 2
ld a, [$ffdb]
ld bc, $28
call AddNTimes
diff --git a/scripts/vermiliondock.asm b/scripts/vermiliondock.asm
index 215bf467..03dc4377 100755
--- a/scripts/vermiliondock.asm
+++ b/scripts/vermiliondock.asm
@@ -53,8 +53,7 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b)
call DelayFrames
ld b, $9c
call CopyScreenTileBufferToVRAM
- FuncCoord 0, 10
- ld hl, Coord
+ hlCoord 0, 10
ld bc, $0078
ld a, $14
call FillMemory
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-05 19:26:54 +0000