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/PokemonTower7F.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/PokemonTower7F.asm')
| -rw-r--r-- | data/maps/objects/PokemonTower7F.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/objects/PokemonTower7F.asm b/data/maps/objects/PokemonTower7F.asm index e5fe486b..4f30e4e9 100644 --- a/data/maps/objects/PokemonTower7F.asm +++ b/data/maps/objects/PokemonTower7F.asm @@ -1,14 +1,14 @@ PokemonTower7F_Object: db $1 ; border block - def_warps - warp 9, 16, 1, POKEMON_TOWER_6F + def_warp_events + warp_event 9, 16, POKEMON_TOWER_6F, 1 - def_signs + def_bg_events - def_objects - object SPRITE_JESSIE, 10, 8, STAY, DOWN, 1 - object SPRITE_JAMES, 11, 8, STAY, DOWN, 2 - object SPRITE_MR_FUJI, 10, 3, STAY, DOWN, 3 + def_object_events + object_event 10, 8, SPRITE_JESSIE, STAY, DOWN, 1 + object_event 11, 8, SPRITE_JAMES, STAY, DOWN, 2 + object_event 10, 3, SPRITE_MR_FUJI, STAY, DOWN, 3 def_warps_to POKEMON_TOWER_7F |