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/PokemonTower1F.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/PokemonTower1F.asm')
| -rw-r--r-- | data/maps/objects/PokemonTower1F.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/maps/objects/PokemonTower1F.asm b/data/maps/objects/PokemonTower1F.asm index b73c7562..109ffd50 100644 --- a/data/maps/objects/PokemonTower1F.asm +++ b/data/maps/objects/PokemonTower1F.asm @@ -1,18 +1,18 @@ PokemonTower1F_Object: db $1 ; border block - def_warps - warp 10, 17, 1, LAST_MAP - warp 11, 17, 1, LAST_MAP - warp 18, 9, 1, POKEMON_TOWER_2F + def_warp_events + warp_event 10, 17, LAST_MAP, 1 + warp_event 11, 17, LAST_MAP, 1 + warp_event 18, 9, POKEMON_TOWER_2F, 1 - def_signs + def_bg_events - def_objects - object SPRITE_LINK_RECEPTIONIST, 15, 13, STAY, UP, 1 ; person - object SPRITE_MIDDLE_AGED_WOMAN, 6, 8, STAY, NONE, 2 ; person - object SPRITE_BALDING_GUY, 8, 12, STAY, NONE, 3 ; person - object SPRITE_GIRL, 13, 7, STAY, NONE, 4 ; person - object SPRITE_CHANNELER, 17, 7, STAY, LEFT, 5 ; person + def_object_events + object_event 15, 13, SPRITE_LINK_RECEPTIONIST, STAY, UP, 1 ; person + object_event 6, 8, SPRITE_MIDDLE_AGED_WOMAN, STAY, NONE, 2 ; person + object_event 8, 12, SPRITE_BALDING_GUY, STAY, NONE, 3 ; person + object_event 13, 7, SPRITE_GIRL, STAY, NONE, 4 ; person + object_event 17, 7, SPRITE_CHANNELER, STAY, LEFT, 5 ; person def_warps_to POKEMON_TOWER_1F |