aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/safarizoneeast.asm
diff options
context:
space:
mode:
authorU-Fish-PC\Daniel <corrnondacqb@yahoo.com>2014-05-21 15:49:59 -0400
committerU-Fish-PC\Daniel <corrnondacqb@yahoo.com>2014-05-21 15:49:59 -0400
commita02c3279102dca60deee70141c31af9fcfa1ff75 (patch)
tree66ee36f2019b9a862363f36346eb229ce9bfe54a /data/mapObjects/safarizoneeast.asm
parentMore misc relabelling (diff)
downloadpokeyellow-a02c3279102dca60deee70141c31af9fcfa1ff75.tar.gz
pokeyellow-a02c3279102dca60deee70141c31af9fcfa1ff75.tar.xz
pokeyellow-a02c3279102dca60deee70141c31af9fcfa1ff75.zip
Use more constants in object data
Diffstat (limited to 'data/mapObjects/safarizoneeast.asm')
-rwxr-xr-xdata/mapObjects/safarizoneeast.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/safarizoneeast.asm b/data/mapObjects/safarizoneeast.asm
index 678276a9..26aa1cc1 100755
--- a/data/mapObjects/safarizoneeast.asm
+++ b/data/mapObjects/safarizoneeast.asm
@@ -14,10 +14,10 @@ SafariZoneEastObject: ; 0x4588b (size=81)
db $17, $5, $7 ; SafariZoneEastText7
db $4 ; people
- db SPRITE_BALL, $a + 4, $15 + 4, $ff, $ff, $81, FULL_RESTORE ; item
- db SPRITE_BALL, $7 + 4, $3 + 4, $ff, $ff, $82, MAX_POTION ; item
- db SPRITE_BALL, $d + 4, $14 + 4, $ff, $ff, $83, CARBOS ; item
- db SPRITE_BALL, $c + 4, $f + 4, $ff, $ff, $84, TM_37 ; item
+ 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
; warp-to
EVENT_DISP SAFARI_ZONE_EAST_WIDTH, $4, $0 ; SAFARI_ZONE_NORTH