diff options
| author | yenatch <yenatch@gmail.com> | 2018-04-09 21:30:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-09 21:30:24 -0400 |
| commit | 40b537d45b4b8937038126f7e5d2d21ccee460c0 (patch) | |
| tree | 881a090b80b2c22985fc6d1231b03c6721a83462 /data/maps | |
| parent | e4b41fad4fd3787ca2e61adb5377ba8f68fca7ef (diff) | |
| parent | 53ff57ca663dc5bf9c3731022b0eb0dc73f2207f (diff) | |
Merge pull request #503 from Rangi42/master
Factor wMisc into meaningful parts; move most code out of home.asm
Diffstat (limited to 'data/maps')
| -rw-r--r-- | data/maps/attributes.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index 31532b36f..f6e961406 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -27,39 +27,39 @@ connection: MACRO if "\1" == "north" map_id \3 dw \2_Blocks + \3_WIDTH * (\3_HEIGHT - 3) + \5 - dw wOverworldMap + \4 + 3 + dw wOverworldMapBlocks + \4 + 3 db \6 db \3_WIDTH db \3_HEIGHT * 2 - 1 db (\4 - \5) * -2 - dw wOverworldMap + \3_HEIGHT * (\3_WIDTH + 6) + 1 + dw wOverworldMapBlocks + \3_HEIGHT * (\3_WIDTH + 6) + 1 elif "\1" == "south" map_id \3 dw \2_Blocks + \5 - dw wOverworldMap + (CURRENT_MAP_HEIGHT + 3) * (CURRENT_MAP_WIDTH + 6) + \4 + 3 + dw wOverworldMapBlocks + (CURRENT_MAP_HEIGHT + 3) * (CURRENT_MAP_WIDTH + 6) + \4 + 3 db \6 db \3_WIDTH db 0 db (\4 - \5) * -2 - dw wOverworldMap + \3_WIDTH + 7 + dw wOverworldMapBlocks + \3_WIDTH + 7 elif "\1" == "west" map_id \3 dw \2_Blocks + (\3_WIDTH * \5) + \3_WIDTH - 3 - dw wOverworldMap + (CURRENT_MAP_WIDTH + 6) * (\4 + 3) + dw wOverworldMapBlocks + (CURRENT_MAP_WIDTH + 6) * (\4 + 3) db \6 db \3_WIDTH db (\4 - \5) * -2 db \3_WIDTH * 2 - 1 - dw wOverworldMap + \3_WIDTH * 2 + 6 + dw wOverworldMapBlocks + \3_WIDTH * 2 + 6 elif "\1" == "east" map_id \3 dw \2_Blocks + (\3_WIDTH * \5) - dw wOverworldMap + (CURRENT_MAP_WIDTH + 6) * (\4 + 3 + 1) - 3 + dw wOverworldMapBlocks + (CURRENT_MAP_WIDTH + 6) * (\4 + 3 + 1) - 3 db \6 db \3_WIDTH db (\4 - \5) * -2 db 0 - dw wOverworldMap + \3_WIDTH + 7 + dw wOverworldMapBlocks + \3_WIDTH + 7 endc ENDM |