aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/cinnabarisland.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/cinnabarisland.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/cinnabarisland.asm')
-rwxr-xr-xdata/mapObjects/cinnabarisland.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/cinnabarisland.asm b/data/mapObjects/cinnabarisland.asm
index f2a53d7c..1dcaa6e2 100755
--- a/data/mapObjects/cinnabarisland.asm
+++ b/data/mapObjects/cinnabarisland.asm
@@ -15,9 +15,9 @@ CinnabarIslandObject: ; 0x1c022 (size=71)
db $b, $9, $6 ; CinnabarIslandText6
db $3, $d, $7 ; CinnabarIslandText7
- db $2 ; people
- db SPRITE_GIRL, $5 + 4, $c + 4, $fe, $2, $1 ; person
- db SPRITE_GAMBLER, $6 + 4, $e + 4, $ff, $ff, $2 ; person
+ db $2 ; objects
+ object SPRITE_GIRL, $c, $5, WALK, $2, $1 ; person
+ object SPRITE_GAMBLER, $e, $6, FACE, STAY, $2 ; person
; warp-to
EVENT_DISP CINNABAR_ISLAND_WIDTH, $3, $6 ; MANSION_1