summaryrefslogtreecommitdiff
path: root/engine/oak_speech.asm
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 /engine/oak_speech.asm
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 'engine/oak_speech.asm')
-rwxr-xr-xengine/oak_speech.asm12
1 files changed, 4 insertions, 8 deletions
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