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/battle/4_2.asm | |
| 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/battle/4_2.asm')
| -rwxr-xr-x | engine/battle/4_2.asm | 15 |
1 files changed, 5 insertions, 10 deletions
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 |