diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2014-05-01 22:43:19 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2014-05-01 22:43:19 -0500 |
| commit | 6fbb99786f73b0ba198dec8530088aba46734304 (patch) | |
| tree | 4bbaf274cad5e78e4f4098b785cad1a8242fde90 /maps/second_map_headers.asm | |
| parent | 0e29ab2428e0f0dfb8bd7442d1010acaad285cd8 (diff) | |
| parent | 7e4744fdaf9ec1a9d260a2e7717af3023a49d326 (diff) | |
Merge pull request #248 from yenatch/master
Trainer card graphics, Kanto Special stats, unused item constants, mobile adapter lib
Diffstat (limited to 'maps/second_map_headers.asm')
| -rw-r--r-- | maps/second_map_headers.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/maps/second_map_headers.asm b/maps/second_map_headers.asm index 70e7d69ad..4ad9c6475 100644 --- a/maps/second_map_headers.asm +++ b/maps/second_map_headers.asm @@ -587,7 +587,7 @@ Route30_SecondMapHeader: ; 0x9500c ; NORTH to Route 31 db GROUP_ROUTE_31, MAP_ROUTE_31 ; connected map (group, id) - dw $7288 ; strip pointer + dw (Route31_BlockData + ((ROUTE_31_HEIGHT - 3) * ROUTE_31_WIDTH) + 7) ; strip pointer dw ($C703 + 253) ; strip destination db 13, ROUTE_31_WIDTH ; (connection strip length, connected map width) db ((ROUTE_31_HEIGHT * 2) - 1), 20 ; yoffset, xoffset @@ -1351,7 +1351,7 @@ Route1_SecondMapHeader: ; 0x9530c ; NORTH to Viridian City db GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY ; connected map (group, id) - dw $6d9c ; strip pointer + dw (ViridianCity_BlockData + ((VIRIDIAN_CITY_HEIGHT - 3) * VIRIDIAN_CITY_WIDTH) + 7) ; strip pointer dw ($C703 + 253) ; strip destination db 13, VIRIDIAN_CITY_WIDTH ; (connection strip length, connected map width) db ((VIRIDIAN_CITY_HEIGHT * 2) - 1), 20 ; yoffset, xoffset @@ -1611,7 +1611,7 @@ Route18_SecondMapHeader: ; 0x95414 ; WEST to Route 17 db GROUP_ROUTE_17, MAP_ROUTE_17 ; connected map (group, id) - dw $7152 ; strip pointer + dw (Route17_BlockData + ((ROUTE_17_HEIGHT - 10) * ROUTE_17_WIDTH) + 7) ; strip pointer dw $c800 ; strip destination db 10, ROUTE_17_WIDTH ; (connection strip length, connected map width) db 76, ((ROUTE_17_WIDTH * 2) - 1) ; yoffset, xoffset @@ -2443,7 +2443,7 @@ Route10North_SecondMapHeader: ; 0x95768 ; NORTH to Route 9 db GROUP_ROUTE_9, MAP_ROUTE_9 ; connected map (group, id) - dw $7eae ; strip pointer + dw (Route9_BlockData + ((ROUTE_9_HEIGHT - 3) * ROUTE_9_WIDTH) + 17) ; strip pointer dw ($C703 + 253) ; strip destination db 13, ROUTE_9_WIDTH ; (connection strip length, connected map width) db ((ROUTE_9_HEIGHT * 2) - 1), 40 ; yoffset, xoffset |