aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/pewterpokecenter.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2016-05-30 18:20:41 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2016-05-30 18:20:41 -0400
commit3330662296eabb6b3b7f0eed1c79003c8873c712 (patch)
treedae9a2f40425a236a3ef6ecce453cf16b4359c26 /data/mapObjects/pewterpokecenter.asm
parentBank7 misc functions (diff)
parentDigletts Cave Route 11 Entrance (diff)
downloadpokeyellow-3330662296eabb6b3b7f0eed1c79003c8873c712.tar.gz
pokeyellow-3330662296eabb6b3b7f0eed1c79003c8873c712.tar.xz
pokeyellow-3330662296eabb6b3b7f0eed1c79003c8873c712.zip
Merge pull request #9 from PikalaxALT/master
Disassemble banks 3A, 3F, and all outdoor maps
Diffstat (limited to 'data/mapObjects/pewterpokecenter.asm')
-rwxr-xr-xdata/mapObjects/pewterpokecenter.asm6
1 files changed, 4 insertions, 2 deletions
diff --git a/data/mapObjects/pewterpokecenter.asm b/data/mapObjects/pewterpokecenter.asm
index 86757244..d3f87326 100755
--- a/data/mapObjects/pewterpokecenter.asm
+++ b/data/mapObjects/pewterpokecenter.asm
@@ -7,11 +7,13 @@ PewterPokecenterObject: ; 0x5c60d (size=44)
db $0 ; signs
- db $4 ; objects
+ db $6 ; objects
object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person
object SPRITE_GENTLEMAN, $b, $7, STAY, LEFT, $2 ; person
- object SPRITE_CLEFAIRY, $1, $3, STAY, DOWN, $3 ; person
+ object SPRITE_JIGGLYPUFF, $1, $3, STAY, DOWN, $3 ; person
object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person
+ object SPRITE_LASS, $4, $3, STAY, UP, $5 ; person
+ object SPRITE_CHANSEY, $4, $1, STAY, DOWN, $6 ; person
; warp-to
EVENT_DISP PEWTER_POKECENTER_WIDTH, $7, $3