aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/route24.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/route24.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/route24.asm')
-rwxr-xr-xdata/mapObjects/route24.asm3
1 files changed, 2 insertions, 1 deletions
diff --git a/data/mapObjects/route24.asm b/data/mapObjects/route24.asm
index f8173c9d..115f08d3 100755
--- a/data/mapObjects/route24.asm
+++ b/data/mapObjects/route24.asm
@@ -5,7 +5,7 @@ Route24Object: ; 0x506a4 (size=67)
db $0 ; signs
- db $8 ; objects
+ db $9 ; objects
object SPRITE_BLACK_HAIR_BOY_1, $b, $f, STAY, LEFT, $1, OPP_ROCKET, $6
object SPRITE_BLACK_HAIR_BOY_1, $5, $14, STAY, UP, $2, OPP_JR_TRAINER_M, $2
object SPRITE_BLACK_HAIR_BOY_1, $b, $13, STAY, LEFT, $3, OPP_JR_TRAINER_M, $3
@@ -14,3 +14,4 @@ Route24Object: ; 0x506a4 (size=67)
object SPRITE_LASS, $a, $1c, STAY, RIGHT, $6, OPP_LASS, $8
object SPRITE_BUG_CATCHER, $b, $1f, STAY, LEFT, $7, OPP_BUG_CATCHER, $9
object SPRITE_BALL, $a, $5, STAY, NONE, $8, TM_45
+ object SPRITE_BLACK_HAIR_BOY_1, $6, $5, STAY, DOWN, $9