diff options
| author | dannye <33dannye@gmail.com> | 2021-09-26 22:38:47 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-09-26 22:43:09 -0500 |
| commit | 501a21fa5dc6f01c0563316c9cd209cccb1eef45 (patch) | |
| tree | c2fe5cc6caa9d8117df3008031d7a26317058acb /data/maps/objects/PokemonMansion3F.asm | |
| parent | Switch from Travis CI to GitHub Actions (diff) | |
| parent | Fix typos (#334) (diff) | |
| download | pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.tar.gz pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.tar.xz pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/maps/objects/PokemonMansion3F.asm')
| -rw-r--r-- | data/maps/objects/PokemonMansion3F.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/maps/objects/PokemonMansion3F.asm b/data/maps/objects/PokemonMansion3F.asm index fdf16a8d..7cb94a3e 100644 --- a/data/maps/objects/PokemonMansion3F.asm +++ b/data/maps/objects/PokemonMansion3F.asm @@ -1,18 +1,18 @@ PokemonMansion3F_Object: db $1 ; border block - def_warps - warp 7, 10, 1, POKEMON_MANSION_2F - warp 6, 1, 3, POKEMON_MANSION_2F - warp 25, 14, 2, POKEMON_MANSION_2F + def_warp_events + warp_event 7, 10, POKEMON_MANSION_2F, 1 + warp_event 6, 1, POKEMON_MANSION_2F, 3 + warp_event 25, 14, POKEMON_MANSION_2F, 2 - def_signs + def_bg_events - def_objects - object SPRITE_SUPER_NERD, 5, 11, WALK, LEFT_RIGHT, 1, OPP_BURGLAR, 8 - object SPRITE_SCIENTIST, 20, 11, STAY, LEFT, 2, OPP_SCIENTIST, 12 - object SPRITE_POKE_BALL, 1, 16, STAY, NONE, 3, MAX_POTION - object SPRITE_POKE_BALL, 25, 5, STAY, NONE, 4, IRON - object SPRITE_POKEDEX, 6, 12, STAY, NONE, 5 ; person + def_object_events + object_event 5, 11, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 1, OPP_BURGLAR, 8 + object_event 20, 11, SPRITE_SCIENTIST, STAY, LEFT, 2, OPP_SCIENTIST, 12 + object_event 1, 16, SPRITE_POKE_BALL, STAY, NONE, 3, MAX_POTION + object_event 25, 5, SPRITE_POKE_BALL, STAY, NONE, 4, IRON + object_event 6, 12, SPRITE_POKEDEX, STAY, NONE, 5 ; person def_warps_to POKEMON_MANSION_3F |