diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-08-17 17:47:28 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-08-17 18:08:54 -0400 |
| commit | 4373aafac152f64621bf3d8c6b8d037cd9c76f7b (patch) | |
| tree | cd1c88a283f52e0d98211b84f181f169c4f3e526 /data/maps/objects/PokemonMansion1F.asm | |
| parent | Use map constants for SilphCoElevator warps (diff) | |
| download | pokeyellow-4373aafac152f64621bf3d8c6b8d037cd9c76f7b.tar.gz pokeyellow-4373aafac152f64621bf3d8c6b8d037cd9c76f7b.tar.xz pokeyellow-4373aafac152f64621bf3d8c6b8d037cd9c76f7b.zip | |
Use def_warps_to macro for automatic warp_to entries
Diffstat (limited to 'data/maps/objects/PokemonMansion1F.asm')
| -rwxr-xr-x | data/maps/objects/PokemonMansion1F.asm | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/data/maps/objects/PokemonMansion1F.asm b/data/maps/objects/PokemonMansion1F.asm index 43d0a6e2..6edd6bce 100755 --- a/data/maps/objects/PokemonMansion1F.asm +++ b/data/maps/objects/PokemonMansion1F.asm @@ -18,12 +18,4 @@ PokemonMansion1F_Object: object SPRITE_POKE_BALL, 14, 3, STAY, NONE, 2, ESCAPE_ROPE object SPRITE_POKE_BALL, 18, 21, STAY, NONE, 3, CARBOS - ; warp-to - warp_to 4, 27, POKEMON_MANSION_1F_WIDTH - warp_to 5, 27, POKEMON_MANSION_1F_WIDTH - warp_to 6, 27, POKEMON_MANSION_1F_WIDTH - warp_to 7, 27, POKEMON_MANSION_1F_WIDTH - warp_to 5, 10, POKEMON_MANSION_1F_WIDTH ; POKEMON_MANSION_2F - warp_to 21, 23, POKEMON_MANSION_1F_WIDTH ; POKEMON_MANSION_B1F - warp_to 26, 27, POKEMON_MANSION_1F_WIDTH - warp_to 27, 27, POKEMON_MANSION_1F_WIDTH + def_warps_to POKEMON_MANSION_1F |