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/PokemonMansionB1F.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/PokemonMansionB1F.asm')
| -rw-r--r-- | data/maps/objects/PokemonMansionB1F.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/objects/PokemonMansionB1F.asm b/data/maps/objects/PokemonMansionB1F.asm index cd5d6763..9dfdb37d 100644 --- a/data/maps/objects/PokemonMansionB1F.asm +++ b/data/maps/objects/PokemonMansionB1F.asm @@ -9,11 +9,11 @@ PokemonMansionB1F_Object: def_object_events object_event 16, 23, SPRITE_SUPER_NERD, STAY, NONE, 1, OPP_BURGLAR, 9 object_event 27, 11, SPRITE_SCIENTIST, STAY, DOWN, 2, OPP_SCIENTIST, 13 - object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, 3, RARE_CANDY - object_event 1, 22, SPRITE_POKE_BALL, STAY, NONE, 4, FULL_RESTORE + object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, 3, RARE_CANDY + object_event 1, 22, SPRITE_POKE_BALL, STAY, NONE, 4, FULL_RESTORE object_event 19, 25, SPRITE_POKE_BALL, STAY, NONE, 5, TM_BLIZZARD - object_event 5, 4, SPRITE_POKE_BALL, STAY, NONE, 6, TM_SOLARBEAM + object_event 5, 4, SPRITE_POKE_BALL, STAY, NONE, 6, TM_SOLARBEAM object_event 16, 20, SPRITE_POKEDEX, STAY, NONE, 7 ; person - object_event 5, 13, SPRITE_POKE_BALL, STAY, NONE, 8, SECRET_KEY + object_event 5, 13, SPRITE_POKE_BALL, STAY, NONE, 8, SECRET_KEY def_warps_to POKEMON_MANSION_B1F |