aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/vermilioncity.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/vermilioncity.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/vermilioncity.asm')
-rwxr-xr-xdata/mapObjects/vermilioncity.asm19
1 files changed, 10 insertions, 9 deletions
diff --git a/data/mapObjects/vermilioncity.asm b/data/mapObjects/vermilioncity.asm
index c5602be1..3bfbc947 100755
--- a/data/mapObjects/vermilioncity.asm
+++ b/data/mapObjects/vermilioncity.asm
@@ -13,21 +13,22 @@ VermilionCityObject: ; 0x189ba (size=133)
db $3, $7, $0, VERMILION_HOUSE_2
db $7 ; signs
- db $3, $1b, $7 ; VermilionCityText7
- db $d, $25, $8 ; VermilionCityText8
- db $d, $18, $9 ; MartSignText
- db $3, $c, $a ; PokeCenterSignText
- db $d, $7, $b ; VermilionCityText11
- db $13, $7, $c ; VermilionCityText12
- db $f, $1d, $d ; VermilionCityText13
+ db $3, $1b, $8 ; VermilionCityText7
+ db $d, $25, $9 ; VermilionCityText8
+ db $d, $18, $a ; MartSignText
+ db $3, $c, $b ; PokeCenterSignText
+ db $d, $7, $c ; VermilionCityText11
+ db $13, $7, $d ; VermilionCityText12
+ db $f, $1d, $e ; VermilionCityText13
- db $6 ; objects
- object SPRITE_FOULARD_WOMAN, $13, $7, WALK, $2, $1 ; person
+ db $7 ; objects
+ object SPRITE_LASS, $13, $7, WALK, $2, $1 ; person
object SPRITE_GAMBLER, $e, $6, STAY, NONE, $2 ; person
object SPRITE_SAILOR, $13, $1e, STAY, UP, $3 ; person
object SPRITE_GAMBLER, $1e, $7, STAY, NONE, $4 ; person
object SPRITE_SLOWBRO, $1d, $9, WALK, $1, $5 ; person
object SPRITE_SAILOR, $19, $1b, WALK, $2, $6 ; person
+ object SPRITE_OFFICER_JENNY, $13, $f, STAY, NONE, $7 ; person
; warp-to
EVENT_DISP VERMILION_CITY_WIDTH, $3, $b ; VERMILION_POKECENTER