diff options
| author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-06-25 16:58:27 -0400 |
|---|---|---|
| committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-06-25 16:58:27 -0400 |
| commit | bd533aa79bbe1998fd2b699bd7205da2de4fe55c (patch) | |
| tree | 90d7000b49fc29d65a3a90a04074f7a7dd8a475f /engine/overworld | |
| parent | b36f793667924f868282ce979fabab3e95d642a5 (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/overworld')
| -rwxr-xr-x | engine/overworld/cinnabar_lab.asm | 3 | ||||
| -rwxr-xr-x | engine/overworld/doors.asm | 3 | ||||
| -rwxr-xr-x | engine/overworld/ledges.asm | 3 | ||||
| -rw-r--r-- | engine/overworld/movement.asm | 3 | ||||
| -rwxr-xr-x | engine/overworld/player_animations.asm | 3 | ||||
| -rwxr-xr-x | engine/overworld/pokemart.asm | 6 |
6 files changed, 7 insertions, 14 deletions
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 |