summaryrefslogtreecommitdiff
path: root/scripts
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 /scripts
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 (limited to 'scripts')
-rwxr-xr-xscripts/bikeshop.asm6
-rwxr-xr-xscripts/celadongamecorner.asm24
-rwxr-xr-xscripts/celadonmartroof.asm3
-rwxr-xr-xscripts/vermiliondock.asm3
4 files changed, 12 insertions, 24 deletions
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