From 76b882d9523915ca8ced96e8c5e889ca2728241e Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 16 Jul 2020 12:32:19 -0400 Subject: Reformat map scripts' coordinate and movement data 'dbmapcoord' has X, Y order like other coordinate-related data macros --- macros/coords.asm | 5 +++++ macros/scripts/maps.asm | 8 ++++++++ 2 files changed, 13 insertions(+) (limited to 'macros') diff --git a/macros/coords.asm b/macros/coords.asm index 7cbbca3d..6b16e7f7 100644 --- a/macros/coords.asm +++ b/macros/coords.asm @@ -83,3 +83,8 @@ lda_coord: MACRO ld a, [(\2) * SCREEN_WIDTH + (\1) + wTileMap] ENDC ENDM + +dbmapcoord: MACRO +; x, y + db \2, \1 +ENDM diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index f2009209..8722b4d0 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -67,6 +67,14 @@ trainer: MACRO dw \3, \5, \4, \4 ENDM +;\1 x position +;\2 y position +;\3 movement data +map_coord_movement: MACRO + dbmapcoord \1, \2 + dw \3 +ENDM + ;\1 map name ;\2 map id -- cgit v1.3.1-sl0p