aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/fuchsiapokecenter.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2016-06-03 17:54:53 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2016-06-03 17:54:53 -0400
commit8cdf73265f95e9a55112f373804867244512878d (patch)
tree64f4263b86839e1eb9770688ad890683fa89c503 /data/mapObjects/fuchsiapokecenter.asm
parentUpdate extras with fixed gbz80disasm.py (diff)
parentFix tileset incbin statement alignment (diff)
downloadpokeyellow-8cdf73265f95e9a55112f373804867244512878d.tar.gz
pokeyellow-8cdf73265f95e9a55112f373804867244512878d.tar.xz
pokeyellow-8cdf73265f95e9a55112f373804867244512878d.zip
Merge pull request #10 from PikalaxALT/master
Next batch of scripts, etc.
Diffstat (limited to 'data/mapObjects/fuchsiapokecenter.asm')
-rwxr-xr-xdata/mapObjects/fuchsiapokecenter.asm5
1 files changed, 3 insertions, 2 deletions
diff --git a/data/mapObjects/fuchsiapokecenter.asm b/data/mapObjects/fuchsiapokecenter.asm
index 19b2c950..8a1c392b 100755
--- a/data/mapObjects/fuchsiapokecenter.asm
+++ b/data/mapObjects/fuchsiapokecenter.asm
@@ -7,11 +7,12 @@ FuchsiaPokecenterObject: ; 0x7507d (size=44)
db $0 ; signs
- db $4 ; objects
+ db $5 ; objects
object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person
- object SPRITE_ROCKER, $2, $3, STAY, NONE, $2 ; person
+ object SPRITE_ROCKER, $4, $3, STAY, UP, $2 ; person
object SPRITE_LASS, $6, $5, WALK, $2, $3 ; person
object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person
+ object SPRITE_CHANSEY, $4, $1, STAY, DOWN, $5 ; person
; warp-to
EVENT_DISP FUCHSIA_POKECENTER_WIDTH, $7, $3