macros: Fixed macro expansion bug in ulas

diff --git a/src/macros.inc b/src/macros.inc
index b4b6ee1858558551522836b6e272c75d4ca317aa..b60d23c0dfea34a4cd9528dbf9635c00f877ddd3 100644 (file)
--- a/src/macros.inc
+++ b/src/macros.inc
@@ -84,9 +84,9 @@
   ;   $2: value to assert 
 #macro assert
   cp $1, $2
-  jr nz, @noassert
+  jr nz, @noassert REL
   ld b, b
-@noassert
+@noassert:
 #endmacro
 
 

diff --git a/src/player.s b/src/player.s
index d28623fd9c84bc2571a61e46da799f9498c655d0..f4e19353cf1691dedaaa434a2bb84277af7ff3f7 100644 (file)
--- a/src/player.s
+++ b/src/player.s
@@ -219,7 +219,7 @@ try_abort_move_at:
   ; returns:
   ;   hl: cell ptr
 cursor_get_cell:
-  cursor_get_at_generic state_cells, MAP_W_DEF * c_size, c_size
+  cursor_get_at_generic state_cells, MAP_W * c_size, c_size
 
   ret
 
@@ -229,6 +229,6 @@ cursor_get_cell:
   ; retunrs:
   ;   hl: tile position
 cursor_get_tile:
-  cursor_get_at_generic SCRN0, MAP_W_DEF, 1 
+  cursor_get_at_generic SCRN0, MAP_W, 1 
 
   ret