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/PokemonMansion1F.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/PokemonMansion1F.asm')
| -rw-r--r-- | data/maps/objects/PokemonMansion1F.asm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/data/maps/objects/PokemonMansion1F.asm b/data/maps/objects/PokemonMansion1F.asm index 70eef1a1..a6ef0ecb 100644 --- a/data/maps/objects/PokemonMansion1F.asm +++ b/data/maps/objects/PokemonMansion1F.asm @@ -1,21 +1,21 @@ PokemonMansion1F_Object: db $2e ; border block - def_warps - warp 4, 27, 0, LAST_MAP - warp 5, 27, 0, LAST_MAP - warp 6, 27, 0, LAST_MAP - warp 7, 27, 0, LAST_MAP - warp 5, 10, 0, POKEMON_MANSION_2F - warp 21, 23, 0, POKEMON_MANSION_B1F - warp 26, 27, 0, LAST_MAP - warp 27, 27, 0, LAST_MAP + def_warp_events + warp_event 4, 27, LAST_MAP, 0 + warp_event 5, 27, LAST_MAP, 0 + warp_event 6, 27, LAST_MAP, 0 + warp_event 7, 27, LAST_MAP, 0 + warp_event 5, 10, POKEMON_MANSION_2F, 0 + warp_event 21, 23, POKEMON_MANSION_B1F, 0 + warp_event 26, 27, LAST_MAP, 0 + warp_event 27, 27, LAST_MAP, 0 - def_signs + def_bg_events - 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 + 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 18, 21, SPRITE_POKE_BALL, STAY, NONE, 3, CARBOS def_warps_to POKEMON_MANSION_1F |