summaryrefslogtreecommitdiff
path: root/data/mapObjects
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-26 15:46:46 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-26 15:46:46 -0400
commitb53be53ba38ccae62b450e48b2501bea43000ddd (patch)
tree85fa6d79d95d0e31f99a9daffdfcbd81241e5eb9 /data/mapObjects
parent25cadbde5bcbdc39ee294bb419fb0e30de3b1411 (diff)
Phase 1 of viridian city script disassembly
Diffstat (limited to 'data/mapObjects')
-rwxr-xr-xdata/mapObjects/viridiancity.asm15
1 files changed, 8 insertions, 7 deletions
diff --git a/data/mapObjects/viridiancity.asm b/data/mapObjects/viridiancity.asm
index a2d2815f..79b177f4 100755
--- a/data/mapObjects/viridiancity.asm
+++ b/data/mapObjects/viridiancity.asm
@@ -9,14 +9,14 @@ ViridianCityObject: ; 0x18384 (size=104)
db $7, $20, $0, VIRIDIAN_GYM
db $6 ; signs
- db $11, $11, $8 ; ViridianCityText8
- db $1, $13, $9 ; ViridianCityText9
- db $1d, $15, $a ; ViridianCityText10
- db $13, $1e, $b ; MartSignText
- db $19, $18, $c ; PokeCenterSignText
- db $7, $1b, $d ; ViridianCityText13
+ db $11, $11, $9 ; ViridianCityText8
+ db $1, $13, $a ; ViridianCityText9
+ db $1d, $15, $b ; ViridianCityText10
+ db $13, $1e, $c ; MartSignText
+ db $19, $18, $d ; PokeCenterSignText
+ db $7, $1b, $e ; ViridianCityText13
- db $7 ; objects
+ db $8 ; objects
object SPRITE_BUG_CATCHER, $d, $14, WALK, $0, $1 ; person
object SPRITE_GAMBLER, $1e, $8, STAY, NONE, $2 ; person
object SPRITE_BUG_CATCHER, $1e, $19, WALK, $0, $3 ; person
@@ -24,6 +24,7 @@ ViridianCityObject: ; 0x18384 (size=104)
object SPRITE_LYING_OLD_MAN, $12, $9, STAY, NONE, $5 ; person
object SPRITE_FISHER2, $6, $17, STAY, DOWN, $6 ; person
object SPRITE_GAMBLER, $11, $5, WALK, $2, $7 ; person
+ object SPRITE_GAMBLER, $12, $9, STAY, NONE, $8
; warp-to
EVENT_DISP VIRIDIAN_CITY_WIDTH, $19, $17 ; VIRIDIAN_POKECENTER