diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-29 23:23:57 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-29 23:23:57 -0400 |
| commit | ba5bc304f959d2387b45b9320808797272cf958a (patch) | |
| tree | 76028ce9aed1bcaaa5f700b4785df10c0f504c66 /engine/overworld | |
| parent | 7883e8f431a0b8f995c8f581af248b53896e5aa5 (diff) | |
Updates to more closely sync with pokegold
Diffstat (limited to 'engine/overworld')
| -rw-r--r-- | engine/overworld/warp_connection.asm | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/engine/overworld/warp_connection.asm b/engine/overworld/warp_connection.asm index a74f2015f..0b87de722 100644 --- a/engine/overworld/warp_connection.asm +++ b/engine/overworld/warp_connection.asm @@ -391,44 +391,42 @@ GetMapScreenCoords:: ld hl, wOverworldMapBlocks ld a, [wXCoord] bit 0, a - jr nz, .increment_then_halve1 + jr nz, .odd_x +; even x srl a - add $1 - jr .resume - -.increment_then_halve1 - add $1 + add 1 + jr .got_block_x +.odd_x + add 1 srl a - -.resume +.got_block_x ld c, a - ld b, $0 + ld b, 0 add hl, bc ld a, [wMapWidth] - add $6 + add MAP_CONNECTION_PADDING_WIDTH * 2 ld c, a - ld b, $0 + ld b, 0 ld a, [wYCoord] bit 0, a - jr nz, .increment_then_halve2 + jr nz, .odd_y +; even y srl a - add $1 - jr .resume2 - -.increment_then_halve2 - add $1 + add 1 + jr .got_block_y +.odd_y + add 1 srl a - -.resume2 +.got_block_y call AddNTimes ld a, l ld [wOverworldMapAnchor], a ld a, h ld [wOverworldMapAnchor + 1], a ld a, [wYCoord] - and $1 + and 1 ld [wMetatileStandingY], a ld a, [wXCoord] - and $1 + and 1 ld [wMetatileStandingX], a ret |