summaryrefslogtreecommitdiff
path: root/data/mapObjects/route15.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2015-12-22 16:06:11 -0500
committerluckytyphlosion <alan.rj.huang@gmail.com>2015-12-22 16:06:11 -0500
commit5aa4d6c777507ff7403f2f14ab602007b17f19ab (patch)
tree82fd7aadc36baf46d888b90f3447103d8eaac06f /data/mapObjects/route15.asm
parent9178fc7183b6f43dc901637a7497e9f3084fc668 (diff)
Fewer underscores in constants
dannye
Diffstat (limited to 'data/mapObjects/route15.asm')
-rwxr-xr-xdata/mapObjects/route15.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/route15.asm b/data/mapObjects/route15.asm
index 95016038..e0d19e5c 100755
--- a/data/mapObjects/route15.asm
+++ b/data/mapObjects/route15.asm
@@ -11,16 +11,16 @@ Route15Object: ; 0x5894e (size=126)
db $9, $27, $c ; Route15Text12
db $b ; objects
- object SPRITE_LASS, $29, $b, STAY, DOWN, $1, OPP_JR__TRAINER_F, $14
- object SPRITE_LASS, $35, $a, STAY, LEFT, $2, OPP_JR__TRAINER_F, $15
+ object SPRITE_LASS, $29, $b, STAY, DOWN, $1, OPP_JR_TRAINER_F, $14
+ object SPRITE_LASS, $35, $a, STAY, LEFT, $2, OPP_JR_TRAINER_F, $15
object SPRITE_BLACK_HAIR_BOY_1, $1f, $d, STAY, UP, $3, OPP_BIRD_KEEPER, $6
object SPRITE_BLACK_HAIR_BOY_1, $23, $d, STAY, UP, $4, OPP_BIRD_KEEPER, $7
object SPRITE_FOULARD_WOMAN, $35, $b, STAY, DOWN, $5, OPP_BEAUTY, $9
object SPRITE_FOULARD_WOMAN, $29, $a, STAY, RIGHT, $6, OPP_BEAUTY, $a
object SPRITE_BIKER, $30, $a, STAY, DOWN, $7, OPP_BIKER, $3
object SPRITE_BIKER, $2e, $a, STAY, DOWN, $8, OPP_BIKER, $4
- object SPRITE_LASS, $25, $5, STAY, RIGHT, $9, OPP_JR__TRAINER_F, $16
- object SPRITE_LASS, $12, $d, STAY, UP, $a, OPP_JR__TRAINER_F, $17
+ object SPRITE_LASS, $25, $5, STAY, RIGHT, $9, OPP_JR_TRAINER_F, $16
+ object SPRITE_LASS, $12, $d, STAY, UP, $a, OPP_JR_TRAINER_F, $17
object SPRITE_BALL, $12, $5, STAY, NONE, $b, TM_20
; warp-to