Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use STRCMP, not ==, to compare multi-character strings

This commit is contained in:
Rangi 2020-07-02 11:46:30 -04:00
parent fce6243b43
commit 26d764de5d
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/maps/attributes.asm
View File

@ -37,7 +37,7 @@ _src = -_tgt
_tgt = 0 _tgt = 0
endc endc
if "\1" == "north" if !STRCMP("\1", "north")
_blk = \3_WIDTH * (\3_HEIGHT - 3) + _src _blk = \3_WIDTH * (\3_HEIGHT - 3) + _src
_map = _tgt _map = _tgt
_win = (\3_WIDTH + 6) * \3_HEIGHT + 1 _win = (\3_WIDTH + 6) * \3_HEIGHT + 1
@ -48,7 +48,7 @@ if _len > \3_WIDTH
_len = \3_WIDTH _len = \3_WIDTH
endc endc
elif "\1" == "south" elif !STRCMP("\1", "south")
_blk = _src _blk = _src
_map = (CURRENT_MAP_WIDTH + 6) * (CURRENT_MAP_HEIGHT + 3) + _tgt _map = (CURRENT_MAP_WIDTH + 6) * (CURRENT_MAP_HEIGHT + 3) + _tgt
_win = \3_WIDTH + 7 _win = \3_WIDTH + 7
@ -59,7 +59,7 @@ if _len > \3_WIDTH
_len = \3_WIDTH _len = \3_WIDTH
endc endc
elif "\1" == "west" elif !STRCMP("\1", "west")
_blk = (\3_WIDTH * _src) + \3_WIDTH - 3 _blk = (\3_WIDTH * _src) + \3_WIDTH - 3
_map = (CURRENT_MAP_WIDTH + 6) * _tgt _map = (CURRENT_MAP_WIDTH + 6) * _tgt
_win = (\3_WIDTH + 6) * 2 - 6 _win = (\3_WIDTH + 6) * 2 - 6
@ -70,7 +70,7 @@ if _len > \3_HEIGHT
_len = \3_HEIGHT _len = \3_HEIGHT
endc endc
elif "\1" == "east" elif !STRCMP("\1", "east")
_blk = (\3_WIDTH * _src) _blk = (\3_WIDTH * _src)
_map = (CURRENT_MAP_WIDTH + 6) * _tgt + CURRENT_MAP_WIDTH + 3 _map = (CURRENT_MAP_WIDTH + 6) * _tgt + CURRENT_MAP_WIDTH + 3
_win = \3_WIDTH + 7 _win = \3_WIDTH + 7

2
macros/code.asm
View File

@ -11,7 +11,7 @@ ENDM
; Design patterns ; Design patterns
jumptable: MACRO jumptable: MACRO
if "\2" == "hl" if !STRCMP("\2", "hl")
ld a, [hl] ld a, [hl]
else else
ld a, [\2] ld a, [\2]

1
wram.asm
View File

@ -1664,6 +1664,7 @@ SECTION "WRAM 1", WRAMX
wGBCOnlyDecompressBuffer:: ; a $540-byte buffer that continues past this SECTION wGBCOnlyDecompressBuffer:: ; a $540-byte buffer that continues past this SECTION
wd000:: db wd000:: db
wDefaultSpawnpoint:: db wDefaultSpawnpoint:: db
UNION UNION