diff options
| author | obskyr <powpowd@gmail.com> | 2018-07-03 04:25:41 +0200 |
|---|---|---|
| committer | obskyr <powpowd@gmail.com> | 2018-07-03 04:27:25 +0200 |
| commit | 9ee9fe5c8f74571c41540085ac1566090ae1936b (patch) | |
| tree | ea63c5cda3e21aa97fdc362a198bc7cbc0d10ce2 /home | |
| parent | 5a8a294140c870b1a979980c6e7e61cea5883452 (diff) | |
| parent | 67388aeeda060f7d08e7e2b6ca90097b978886f6 (diff) | |
Merge branch 'master' of https://github.com/mid-kid/pokegold-spaceworld into master
Once again, manually. Hoo boy.
Diffstat (limited to 'home')
| -rw-r--r-- | home/map.asm | 8 | ||||
| -rw-r--r-- | home/tileset.asm | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/home/map.asm b/home/map.asm index 7c691cb..d33242a 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1036,7 +1036,7 @@ Function275e:: ; 275e ; TODO: is this used? GetCoordOfUpperLeftCorner:: ; 277a - ld hl, wOverworldMap + ld hl, wOverworldMapBlocks ld a, [wXCoord] bit 0, a jr nz, .increment_then_halve1 @@ -1324,12 +1324,12 @@ ENDR ChangeMap:: ; 294d - ld hl, wOverworldMap - ld bc, wOverworldMapEnd - wOverworldMap + ld hl, wOverworldMapBlocks + ld bc, wOverworldMapBlocksEnd - wOverworldMapBlocks ld a, 0 call ByteFill - ld hl, wOverworldMap + ld hl, wOverworldMapBlocks ld a, [wMapWidth] ldh [hConnectedMapWidth], a add a, 6 diff --git a/home/tileset.asm b/home/tileset.asm index aabf249..38b9779 100644 --- a/home/tileset.asm +++ b/home/tileset.asm @@ -331,7 +331,7 @@ GetBlockLocation:: ; 2ef8 add a, 6 ld c, a ld b, 0 - ld hl, wOverworldMap + 1 + ld hl, wOverworldMapBlocks + 1 add hl, bc ld a, e srl a |