aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/safarizoneeast.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/safarizoneeast.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/safarizoneeast.asm')
-rwxr-xr-xdata/mapObjects/safarizoneeast.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/mapObjects/safarizoneeast.asm b/data/mapObjects/safarizoneeast.asm
index 26aa1cc1..a02aa9b1 100755
--- a/data/mapObjects/safarizoneeast.asm
+++ b/data/mapObjects/safarizoneeast.asm
@@ -13,11 +13,11 @@ SafariZoneEastObject: ; 0x4588b (size=81)
db $4, $6, $6 ; SafariZoneEastText6
db $17, $5, $7 ; SafariZoneEastText7
- db $4 ; people
- db SPRITE_BALL, $a + 4, $15 + 4, $ff, $ff, ITEM | $1, FULL_RESTORE
- db SPRITE_BALL, $7 + 4, $3 + 4, $ff, $ff, ITEM | $2, MAX_POTION
- db SPRITE_BALL, $d + 4, $14 + 4, $ff, $ff, ITEM | $3, CARBOS
- db SPRITE_BALL, $c + 4, $f + 4, $ff, $ff, ITEM | $4, TM_37
+ db $4 ; objects
+ object SPRITE_BALL, $15, $a, FACE, STAY, $1, FULL_RESTORE
+ object SPRITE_BALL, $3, $7, FACE, STAY, $2, MAX_POTION
+ object SPRITE_BALL, $14, $d, FACE, STAY, $3, CARBOS
+ object SPRITE_BALL, $f, $c, FACE, STAY, $4, TM_37
; warp-to
EVENT_DISP SAFARI_ZONE_EAST_WIDTH, $4, $0 ; SAFARI_ZONE_NORTH