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/ViridianCity.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/ViridianCity.asm')
| -rw-r--r-- | data/maps/objects/ViridianCity.asm | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/data/maps/objects/ViridianCity.asm b/data/maps/objects/ViridianCity.asm index 9e3e30bb..527634d6 100644 --- a/data/maps/objects/ViridianCity.asm +++ b/data/maps/objects/ViridianCity.asm @@ -1,29 +1,29 @@ ViridianCity_Object: db $f ; border block - def_warps - warp 23, 25, 0, VIRIDIAN_POKECENTER - warp 29, 19, 0, VIRIDIAN_MART - warp 21, 15, 0, VIRIDIAN_SCHOOL_HOUSE - warp 21, 9, 0, VIRIDIAN_NICKNAME_HOUSE - warp 32, 7, 0, VIRIDIAN_GYM + def_warp_events + warp_event 23, 25, VIRIDIAN_POKECENTER, 0 + warp_event 29, 19, VIRIDIAN_MART, 0 + warp_event 21, 15, VIRIDIAN_SCHOOL_HOUSE, 0 + warp_event 21, 9, VIRIDIAN_NICKNAME_HOUSE, 0 + warp_event 32, 7, VIRIDIAN_GYM, 0 - def_signs - sign 17, 17, 9 ; ViridianCityText8 - sign 19, 1, 10 ; ViridianCityText9 - sign 21, 29, 11 ; ViridianCityText10 - sign 30, 19, 12 ; MartSignText - sign 24, 25, 13 ; PokeCenterSignText - sign 27, 7, 14 ; ViridianCityText13 + def_bg_events + bg_event 17, 17, 9 ; ViridianCityText8 + bg_event 19, 1, 10 ; ViridianCityText9 + bg_event 21, 29, 11 ; ViridianCityText10 + bg_event 30, 19, 12 ; MartSignText + bg_event 24, 25, 13 ; PokeCenterSignText + bg_event 27, 7, 14 ; ViridianCityText13 - def_objects - object SPRITE_YOUNGSTER, 13, 20, WALK, ANY_DIR, 1 ; person - object SPRITE_GAMBLER, 30, 8, STAY, NONE, 2 ; person - object SPRITE_YOUNGSTER, 30, 25, WALK, ANY_DIR, 3 ; person - object SPRITE_GIRL, 17, 9, STAY, RIGHT, 4 ; person - object SPRITE_GAMBLER_ASLEEP, 18, 9, STAY, NONE, 5 ; person - object SPRITE_FISHER, 6, 23, STAY, DOWN, 6 ; person - object SPRITE_GAMBLER, 17, 5, WALK, LEFT_RIGHT, 7 ; person - object SPRITE_GAMBLER, 18, 9, STAY, NONE, 8 + def_object_events + object_event 13, 20, SPRITE_YOUNGSTER, WALK, ANY_DIR, 1 ; person + object_event 30, 8, SPRITE_GAMBLER, STAY, NONE, 2 ; person + object_event 30, 25, SPRITE_YOUNGSTER, WALK, ANY_DIR, 3 ; person + object_event 17, 9, SPRITE_GIRL, STAY, RIGHT, 4 ; person + object_event 18, 9, SPRITE_GAMBLER_ASLEEP, STAY, NONE, 5 ; person + object_event 6, 23, SPRITE_FISHER, STAY, DOWN, 6 ; person + object_event 17, 5, SPRITE_GAMBLER, WALK, LEFT_RIGHT, 7 ; person + object_event 18, 9, SPRITE_GAMBLER, STAY, NONE, 8 def_warps_to VIRIDIAN_CITY |