summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorIIMarckus <iimarckus@gmail.com>2014-10-17 13:24:51 -0600
committerIIMarckus <iimarckus@gmail.com>2014-10-17 13:24:51 -0600
commit9004b33ab7986b617ca950e41b42d677d5378913 (patch)
tree4dd8d8dfcc2839dc687493b25362b714f353c72e /data
parentdeb2db01cb7cf36f0f6302cb548f096c5d312c1c (diff)
Add a shifted person object on Route 19 in Yellow.
Diffstat (limited to 'data')
-rwxr-xr-xdata/mapObjects/route19.asm4
1 files changed, 4 insertions, 0 deletions
diff --git a/data/mapObjects/route19.asm b/data/mapObjects/route19.asm
index 7d3a342c..c6f80b6c 100755
--- a/data/mapObjects/route19.asm
+++ b/data/mapObjects/route19.asm
@@ -26,7 +26,11 @@ ENDC
db SPRITE_SWIMMER, $19 + 4, $d + 4, $ff, $d2, TRAINER | $3, SWIMMER + $C8, $4
db SPRITE_SWIMMER, $1b + 4, $4 + 4, $ff, $d3, TRAINER | $4, SWIMMER + $C8, $5
db SPRITE_SWIMMER, $1f + 4, $10 + 4, $ff, $d1, TRAINER | $5, SWIMMER + $C8, $6
+IF DEF(_OPTION_BEACH_HOUSE)
+ db SPRITE_SWIMMER, $d + 4, $9 + 4, $ff, $d0, TRAINER | $6, SWIMMER + $C8, $7
+ELSE
db SPRITE_SWIMMER, $b + 4, $9 + 4, $ff, $d0, TRAINER | $6, SWIMMER + $C8, $7
+ENDC
db SPRITE_SWIMMER, $2b + 4, $8 + 4, $ff, $d2, TRAINER | $7, BEAUTY + $C8, $c
db SPRITE_SWIMMER, $2b + 4, $b + 4, $ff, $d3, TRAINER | $8, BEAUTY + $C8, $d
db SPRITE_SWIMMER, $2a + 4, $9 + 4, $ff, $d1, TRAINER | $9, SWIMMER + $C8, $8