diff options
Diffstat (limited to 'data/maps/objects/PokemonMansion1F.asm')
-rwxr-xr-x | data/maps/objects/PokemonMansion1F.asm | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/data/maps/objects/PokemonMansion1F.asm b/data/maps/objects/PokemonMansion1F.asm index 7d89e914..6edd6bce 100755 --- a/data/maps/objects/PokemonMansion1F.asm +++ b/data/maps/objects/PokemonMansion1F.asm @@ -1,7 +1,7 @@ PokemonMansion1F_Object: db $2e ; border block - db 8 ; warps + def_warps warp 4, 27, 0, LAST_MAP warp 5, 27, 0, LAST_MAP warp 6, 27, 0, LAST_MAP @@ -11,19 +11,11 @@ PokemonMansion1F_Object: warp 26, 27, 0, LAST_MAP warp 27, 27, 0, LAST_MAP - db 0 ; signs + def_signs - db 3 ; objects + def_objects object SPRITE_SCIENTIST, 17, 17, STAY, LEFT, 1, OPP_SCIENTIST, 4 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 |