diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-10 17:30:27 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-10 17:30:27 -0500 |
| commit | c8575823a0e3694cba7c63e7ef468c55bb301804 (patch) | |
| tree | 8dc753dc443b6b84d5649705415d66794781a88e /engine/warp_connection.asm | |
| parent | 28d5169a119ece438cc39b442adaa018b9a376e3 (diff) | |
Battle data goes in data/battle/
TreeMons, like fish groups, have constants
Diffstat (limited to 'engine/warp_connection.asm')
| -rwxr-xr-x | engine/warp_connection.asm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/engine/warp_connection.asm b/engine/warp_connection.asm index a0784caac..3a7292633 100755 --- a/engine/warp_connection.asm +++ b/engine/warp_connection.asm @@ -174,8 +174,11 @@ LoadWarpData: ; 1046c6 call GetAnyMapEnvironment call CheckIndoorMap ret nz + +; MOUNT_MOON_SQUARE and TIN_TOWER_ROOF are outdoor maps within indoor maps. +; Dig and Escape Rope should not take you to them. ld a, [wPrevMapGroup] - cp GROUP_MOUNT_MOON_SQUARE + cp GROUP_MOUNT_MOON_SQUARE ; GROUP_TIN_TOWER_ROOF jr nz, .not_mt_moon_or_tin_tower ld a, [wPrevMapNumber] cp MAP_MOUNT_MOON_SQUARE @@ -183,6 +186,7 @@ LoadWarpData: ; 1046c6 cp MAP_TIN_TOWER_ROOF ret z .not_mt_moon_or_tin_tower + ld a, [wPrevWarp] ld [wDigWarpNumber], a ld a, [wPrevMapGroup] @@ -206,6 +210,8 @@ LoadWarpData: ; 1046c6 ld b, a ld a, [wNextMapNumber] ld c, a + +; Respawn in Pokémon Centers. call GetAnyMapTileset ld a, c cp TILESET_POKECENTER @@ -214,6 +220,7 @@ LoadWarpData: ; 1046c6 jr z, .pokecenter_pokecom ret .pokecenter_pokecom + ld a, [wPrevMapGroup] ld [wLastSpawnMapGroup], a ld a, [wPrevMapNumber] |