aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/vermilioncity.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2015-07-18 22:22:51 -0500
committerdannye <corrnondacqb@yahoo.com>2015-07-18 22:22:51 -0500
commit0e48333fb864b0c8b6914fe1b5e57929d5258080 (patch)
tree02a69d268fd1234b0a3da2745065130f7193118c /data/mapObjects/vermilioncity.asm
parentConsolidate coord macros (diff)
downloadpokeyellow-0e48333fb864b0c8b6914fe1b5e57929d5258080.tar.gz
pokeyellow-0e48333fb864b0c8b6914fe1b5e57929d5258080.tar.xz
pokeyellow-0e48333fb864b0c8b6914fe1b5e57929d5258080.zip
Map object macro
closes https://github.com/iimarckus/pokered/issues/89
Diffstat (limited to 'data/mapObjects/vermilioncity.asm')
-rwxr-xr-xdata/mapObjects/vermilioncity.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/data/mapObjects/vermilioncity.asm b/data/mapObjects/vermilioncity.asm
index a7a6a6b4..b8ec91d4 100755
--- a/data/mapObjects/vermilioncity.asm
+++ b/data/mapObjects/vermilioncity.asm
@@ -21,13 +21,13 @@ VermilionCityObject: ; 0x189ba (size=133)
db $13, $7, $c ; VermilionCityText12
db $f, $1d, $d ; VermilionCityText13
- db $6 ; people
- db SPRITE_FOULARD_WOMAN, $7 + 4, $13 + 4, $fe, $2, $1 ; person
- db SPRITE_GAMBLER, $6 + 4, $e + 4, $ff, $ff, $2 ; person
- db SPRITE_SAILOR, $1e + 4, $13 + 4, $ff, $d1, $3 ; person
- db SPRITE_GAMBLER, $7 + 4, $1e + 4, $ff, $ff, $4 ; person
- db SPRITE_SLOWBRO, $9 + 4, $1d + 4, $fe, $1, $5 ; person
- db SPRITE_SAILOR, $1b + 4, $19 + 4, $fe, $2, $6 ; person
+ db $6 ; objects
+ object SPRITE_FOULARD_WOMAN, $13, $7, WALK, $2, $1 ; person
+ object SPRITE_GAMBLER, $e, $6, FACE, STAY, $2 ; person
+ object SPRITE_SAILOR, $13, $1e, FACE, UP, $3 ; person
+ object SPRITE_GAMBLER, $1e, $7, FACE, STAY, $4 ; person
+ object SPRITE_SLOWBRO, $1d, $9, WALK, $1, $5 ; person
+ object SPRITE_SAILOR, $19, $1b, WALK, $2, $6 ; person
; warp-to
EVENT_DISP VERMILION_CITY_WIDTH, $3, $b ; VERMILION_POKECENTER