diff options
| author | dannye <33dannye@gmail.com> | 2021-09-26 22:56:02 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-09-26 22:56:02 -0500 |
| commit | 94ed208164c3f6484a26923c5bc7664b9a3c4002 (patch) | |
| tree | e6141c9f312ae0edf4b4741a729b03fea1ddebf5 /data/maps/objects/PokemonMansion1F.asm | |
| parent | Merge branch 'master' of https://github.com/pret/pokered (diff) | |
| parent | Align `object_event` coordinates (diff) | |
| download | pokeyellow-94ed208164c3f6484a26923c5bc7664b9a3c4002.tar.gz pokeyellow-94ed208164c3f6484a26923c5bc7664b9a3c4002.tar.xz pokeyellow-94ed208164c3f6484a26923c5bc7664b9a3c4002.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/maps/objects/PokemonMansion1F.asm')
| -rw-r--r-- | data/maps/objects/PokemonMansion1F.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/maps/objects/PokemonMansion1F.asm b/data/maps/objects/PokemonMansion1F.asm index a6ef0ecb..69003a3f 100644 --- a/data/maps/objects/PokemonMansion1F.asm +++ b/data/maps/objects/PokemonMansion1F.asm @@ -15,7 +15,7 @@ PokemonMansion1F_Object: def_object_events object_event 17, 17, SPRITE_SCIENTIST, STAY, LEFT, 1, OPP_SCIENTIST, 4 - object_event 14, 3, SPRITE_POKE_BALL, STAY, NONE, 2, ESCAPE_ROPE + object_event 14, 3, SPRITE_POKE_BALL, STAY, NONE, 2, ESCAPE_ROPE object_event 18, 21, SPRITE_POKE_BALL, STAY, NONE, 3, CARBOS def_warps_to POKEMON_MANSION_1F |