aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/safarizoneresthouse3.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/safarizoneresthouse3.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/safarizoneresthouse3.asm')
-rwxr-xr-xdata/mapObjects/safarizoneresthouse3.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/safarizoneresthouse3.asm b/data/mapObjects/safarizoneresthouse3.asm
index 70365365..af7265d5 100755
--- a/data/mapObjects/safarizoneresthouse3.asm
+++ b/data/mapObjects/safarizoneresthouse3.asm
@@ -7,10 +7,10 @@ SafariZoneRestHouse3Object: ; 0x45d8e (size=38)
db $0 ; signs
- db $3 ; people
- db SPRITE_OAK_AIDE, $3 + 4, $1 + 4, $fe, $1, $1 ; person
- db SPRITE_ROCKER, $2 + 4, $4 + 4, $ff, $ff, $2 ; person
- db SPRITE_LAPRAS_GIVER, $2 + 4, $5 + 4, $ff, $ff, $3 ; person
+ db $3 ; objects
+ object SPRITE_OAK_AIDE, $1, $3, WALK, $1, $1 ; person
+ object SPRITE_ROCKER, $4, $2, FACE, STAY, $2 ; person
+ object SPRITE_LAPRAS_GIVER, $5, $2, FACE, STAY, $3 ; person
; warp-to
EVENT_DISP SAFARI_ZONE_REST_HOUSE_3_WIDTH, $7, $2 ; SAFARI_ZONE_EAST