aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/ssanne1.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/ssanne1.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/ssanne1.asm')
-rwxr-xr-xdata/mapObjects/ssanne1.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/ssanne1.asm b/data/mapObjects/ssanne1.asm
index a1688f5c..d3e10966 100755
--- a/data/mapObjects/ssanne1.asm
+++ b/data/mapObjects/ssanne1.asm
@@ -16,9 +16,9 @@ SSAnne1Object: ; 0x61277 (size=104)
db $0 ; signs
- db $2 ; people
- db SPRITE_WAITER, $6 + 4, $c + 4, $fe, $2, $1 ; person
- db SPRITE_SAILOR, $5 + 4, $1b + 4, $ff, $ff, $2 ; person
+ db $2 ; objects
+ object SPRITE_WAITER, $c, $6, WALK, $2, $1 ; person
+ object SPRITE_SAILOR, $1b, $5, FACE, STAY, $2 ; person
; warp-to
EVENT_DISP SS_ANNE_1_WIDTH, $0, $1a ; VERMILION_DOCK