summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-02 11:46:39 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-02 11:46:39 -0400
commit92f96e8c783d62359b19d6db26995b2b4a965417 (patch)
tree0fe2f4e87bfff2a3ccee1c4e855738bb340348a1
parente6f75432928ccd915016162a68df43b0adf6ce04 (diff)
Use STRCMP, not ==, to compare multi-character strings
-rw-r--r--data/maps/attributes.asm8
-rw-r--r--macros/code.asm2
2 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm
index 5f5f2f1c..afc857f0 100644
--- a/data/maps/attributes.asm
+++ b/data/maps/attributes.asm
@@ -37,7 +37,7 @@ _src = -_tgt
_tgt = 0
endc
-if "\1" == "north"
+if !STRCMP("\1", "north")
_blk = \3_WIDTH * (\3_HEIGHT - 3) + _src
_map = _tgt
_win = (\3_WIDTH + 6) * \3_HEIGHT + 1
@@ -48,7 +48,7 @@ if _len > \3_WIDTH
_len = \3_WIDTH
endc
-elif "\1" == "south"
+elif !STRCMP("\1", "south")
_blk = _src
_map = (CURRENT_MAP_WIDTH + 6) * (CURRENT_MAP_HEIGHT + 3) + _tgt
_win = \3_WIDTH + 7
@@ -59,7 +59,7 @@ if _len > \3_WIDTH
_len = \3_WIDTH
endc
-elif "\1" == "west"
+elif !STRCMP("\1", "west")
_blk = (\3_WIDTH * _src) + \3_WIDTH - 3
_map = (CURRENT_MAP_WIDTH + 6) * _tgt
_win = (\3_WIDTH + 6) * 2 - 6
@@ -70,7 +70,7 @@ if _len > \3_HEIGHT
_len = \3_HEIGHT
endc
-elif "\1" == "east"
+elif !STRCMP("\1", "east")
_blk = (\3_WIDTH * _src)
_map = (CURRENT_MAP_WIDTH + 6) * _tgt + CURRENT_MAP_WIDTH + 3
_win = \3_WIDTH + 7
diff --git a/macros/code.asm b/macros/code.asm
index 9de3dd1e..e393d495 100644
--- a/macros/code.asm
+++ b/macros/code.asm
@@ -11,7 +11,7 @@ ENDM
; Design patterns
jumptable: MACRO
-if "\2" == "hl"
+if !STRCMP("\2", "hl")
ld a, [hl]
else
ld a, [\2]