Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use MAP_CONNECTION_PADDING_WIDTH in MACRO connection

Browse Source 
Fixes #1033
This commit is contained in:
Rangi
2023-08-15 19:54:16 -04:00
parent 9c0ef02d4b
commit f3b31087e3
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
data/maps/attributes.asm
View File

@@ -31,52 +31,52 @@ MACRO connection
; Calculate tile offsets for source (current) and target maps ; Calculate tile offsets for source (current) and target maps
DEF _src = 0 DEF _src = 0
DEF _tgt = (\4) + 3 DEF _tgt = (\4) + MAP_CONNECTION_PADDING_WIDTH
if _tgt < 0 if _tgt < 0
DEF _src = -_tgt DEF _src = -_tgt
DEF _tgt = 0 DEF _tgt = 0
endc endc
if !STRCMP("\1", "north") if !STRCMP("\1", "north")
DEF _blk = \3_WIDTH * (\3_HEIGHT - 3) + _src DEF _blk = \3_WIDTH * (\3_HEIGHT - MAP_CONNECTION_PADDING_WIDTH) + _src
DEF _map = _tgt DEF _map = _tgt
DEF _win = (\3_WIDTH + 6) * \3_HEIGHT + 1 DEF _win = (\3_WIDTH + MAP_CONNECTION_PADDING_WIDTH * 2) * \3_HEIGHT + 1
DEF _y = \3_HEIGHT * 2 - 1 DEF _y = \3_HEIGHT * 2 - 1
DEF _x = (\4) * -2 DEF _x = (\4) * -2
DEF _len = CURRENT_MAP_WIDTH + 3 - (\4) DEF _len = CURRENT_MAP_WIDTH + MAP_CONNECTION_PADDING_WIDTH - (\4)
if _len > \3_WIDTH if _len > \3_WIDTH
DEF _len = \3_WIDTH DEF _len = \3_WIDTH
endc endc
elif !STRCMP("\1", "south") elif !STRCMP("\1", "south")
DEF _blk = _src DEF _blk = _src
DEF _map = (CURRENT_MAP_WIDTH + 6) * (CURRENT_MAP_HEIGHT + 3) + _tgt DEF _map = (CURRENT_MAP_WIDTH + MAP_CONNECTION_PADDING_WIDTH * 2) * (CURRENT_MAP_HEIGHT + MAP_CONNECTION_PADDING_WIDTH) + _tgt
DEF _win = \3_WIDTH + 7 DEF _win = \3_WIDTH + MAP_CONNECTION_PADDING_WIDTH * 2 + 1
DEF _y = 0 DEF _y = 0
DEF _x = (\4) * -2 DEF _x = (\4) * -2
DEF _len = CURRENT_MAP_WIDTH + 3 - (\4) DEF _len = CURRENT_MAP_WIDTH + MAP_CONNECTION_PADDING_WIDTH - (\4)
if _len > \3_WIDTH if _len > \3_WIDTH
DEF _len = \3_WIDTH DEF _len = \3_WIDTH
endc endc
elif !STRCMP("\1", "west") elif !STRCMP("\1", "west")
DEF _blk = (\3_WIDTH * _src) + \3_WIDTH - 3 DEF _blk = (\3_WIDTH * _src) + \3_WIDTH - MAP_CONNECTION_PADDING_WIDTH
DEF _map = (CURRENT_MAP_WIDTH + 6) * _tgt DEF _map = (CURRENT_MAP_WIDTH + MAP_CONNECTION_PADDING_WIDTH * 2) * _tgt
DEF _win = (\3_WIDTH + 6) * 2 - 6 DEF _win = (\3_WIDTH + MAP_CONNECTION_PADDING_WIDTH * 2) * 2 - MAP_CONNECTION_PADDING_WIDTH * 2
DEF _y = (\4) * -2 DEF _y = (\4) * -2
DEF _x = \3_WIDTH * 2 - 1 DEF _x = \3_WIDTH * 2 - 1
DEF _len = CURRENT_MAP_HEIGHT + 3 - (\4) DEF _len = CURRENT_MAP_HEIGHT + MAP_CONNECTION_PADDING_WIDTH - (\4)
if _len > \3_HEIGHT if _len > \3_HEIGHT
DEF _len = \3_HEIGHT DEF _len = \3_HEIGHT
endc endc
elif !STRCMP("\1", "east") elif !STRCMP("\1", "east")
DEF _blk = (\3_WIDTH * _src) DEF _blk = (\3_WIDTH * _src)
DEF _map = (CURRENT_MAP_WIDTH + 6) * _tgt + CURRENT_MAP_WIDTH + 3 DEF _map = (CURRENT_MAP_WIDTH + MAP_CONNECTION_PADDING_WIDTH * 2) * _tgt + CURRENT_MAP_WIDTH + MAP_CONNECTION_PADDING_WIDTH
DEF _win = \3_WIDTH + 7 DEF _win = \3_WIDTH + MAP_CONNECTION_PADDING_WIDTH * 2 + 1
DEF _y = (\4) * -2 DEF _y = (\4) * -2
DEF _x = 0 DEF _x = 0
DEF _len = CURRENT_MAP_HEIGHT + 3 - (\4) DEF _len = CURRENT_MAP_HEIGHT + MAP_CONNECTION_PADDING_WIDTH - (\4)
if _len > \3_HEIGHT if _len > \3_HEIGHT
DEF _len = \3_HEIGHT DEF _len = \3_HEIGHT
endc endc