diff options
| author | surskitty <surskitty@gmail.com> | 2018-02-03 22:18:56 -0500 |
|---|---|---|
| committer | surskitty <surskitty@gmail.com> | 2018-02-03 22:18:56 -0500 |
| commit | e668b6cf3a7760303edd181baa69901a94a7d653 (patch) | |
| tree | b9de2e272aceb5ca4d24830a64ee4fd87e9fb40e /data/maps/data.asm | |
| parent | 2edf131b056c6d2b1ec9eb48b97fba31b0f953c7 (diff) | |
| parent | b35eb72290b964b98844afbe741bb7ede34b9ef3 (diff) | |
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'data/maps/data.asm')
| -rw-r--r-- | data/maps/data.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/data.asm b/data/maps/data.asm index 0cdfb0826..6344f0572 100644 --- a/data/maps/data.asm +++ b/data/maps/data.asm @@ -24,12 +24,12 @@ if "\1" == "north" ;\7: this map id map \2 dw \3_Blocks + \2_WIDTH * (\2_HEIGHT - 3) + \5 - dw OverworldMap + \4 + 3 + dw wOverworldMap + \4 + 3 db \6 db \2_WIDTH db \2_HEIGHT * 2 - 1 db (\4 - \5) * -2 - dw OverworldMap + \2_HEIGHT * (\2_WIDTH + 6) + 1 + dw wOverworldMap + \2_HEIGHT * (\2_WIDTH + 6) + 1 endc if "\1" == "south" @@ -41,12 +41,12 @@ if "\1" == "south" ;\7: this map id map \2 dw \3_Blocks + \5 - dw OverworldMap + (\7_HEIGHT + 3) * (\7_WIDTH + 6) + \4 + 3 + dw wOverworldMap + (\7_HEIGHT + 3) * (\7_WIDTH + 6) + \4 + 3 db \6 db \2_WIDTH db 0 db (\4 - \5) * -2 - dw OverworldMap + \2_WIDTH + 7 + dw wOverworldMap + \2_WIDTH + 7 endc if "\1" == "west" @@ -58,12 +58,12 @@ if "\1" == "west" ;\7: this map id map \2 dw \3_Blocks + (\2_WIDTH * \5) + \2_WIDTH - 3 - dw OverworldMap + (\7_WIDTH + 6) * (\4 + 3) + dw wOverworldMap + (\7_WIDTH + 6) * (\4 + 3) db \6 db \2_WIDTH db (\4 - \5) * -2 db \2_WIDTH * 2 - 1 - dw OverworldMap + \2_WIDTH * 2 + 6 + dw wOverworldMap + \2_WIDTH * 2 + 6 endc if "\1" == "east" @@ -75,12 +75,12 @@ if "\1" == "east" ;\7: this map id map \2 dw \3_Blocks + (\2_WIDTH * \5) - dw OverworldMap + (\7_WIDTH + 6) * (\4 + 3 + 1) - 3 + dw wOverworldMap + (\7_WIDTH + 6) * (\4 + 3 + 1) - 3 db \6 db \2_WIDTH db (\4 - \5) * -2 db 0 - dw OverworldMap + \2_WIDTH + 7 + dw wOverworldMap + \2_WIDTH + 7 endc ENDM |