diff --git a/macros.asm b/macros.asm index a9948ae6a..aa8876055 100644 --- a/macros.asm +++ b/macros.asm @@ -117,24 +117,16 @@ A# EQU 11 B_ EQU 12 -; It's better to use *coord than FuncCoord. -FuncCoord: MACRO -Coord = $c4a0 + 20 * \2 + \1 - ENDM - bccoord: MACRO - FuncCoord \1, \2 - ld bc, Coord + ld bc, TileMap + SCREEN_WIDTH * \2 + \1 ENDM decoord: MACRO - FuncCoord \1, \2 - ld de, Coord + ld de, TileMap + SCREEN_WIDTH * \2 + \1 ENDM hlcoord: MACRO - FuncCoord \1, \2 - ld hl, Coord + ld hl, TileMap + SCREEN_WIDTH * \2 + \1 ENDM diff --git a/main.asm b/main.asm index 5a34c0d3f..2db73204b 100644 --- a/main.asm +++ b/main.asm @@ -75181,8 +75181,7 @@ Unknown_8c490: ; 8c490 macro_8c490: MACRO db \1 dw \2 - FuncCoord \3, \4 - dw Coord + dw TileMap + SCREEN_WIDTH * \4 + \3 ENDM macro_8c490 0, Unknown_8c538, 1, 6