aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/route6.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/route6.asm
parentdata/evos_moves.asm (diff)
downloadpokeyellow-5aa4d6c777507ff7403f2f14ab602007b17f19ab.tar.gz
pokeyellow-5aa4d6c777507ff7403f2f14ab602007b17f19ab.tar.xz
pokeyellow-5aa4d6c777507ff7403f2f14ab602007b17f19ab.zip
Fewer underscores in constants
dannye
Diffstat (limited to 'data/mapObjects/route6.asm')
-rwxr-xr-xdata/mapObjects/route6.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/route6.asm b/data/mapObjects/route6.asm
index d901e865..19ac2a8a 100755
--- a/data/mapObjects/route6.asm
+++ b/data/mapObjects/route6.asm
@@ -11,11 +11,11 @@ Route6Object: ; 0x58022 (size=87)
db $f, $13, $7 ; Route6Text7
db $6 ; objects
- object SPRITE_BLACK_HAIR_BOY_1, $a, $15, STAY, RIGHT, $1, OPP_JR__TRAINER_M, $4
- object SPRITE_LASS, $b, $15, STAY, LEFT, $2, OPP_JR__TRAINER_F, $2
+ object SPRITE_BLACK_HAIR_BOY_1, $a, $15, STAY, RIGHT, $1, OPP_JR_TRAINER_M, $4
+ object SPRITE_LASS, $b, $15, STAY, LEFT, $2, OPP_JR_TRAINER_F, $2
object SPRITE_BUG_CATCHER, $0, $f, STAY, RIGHT, $3, OPP_BUG_CATCHER, $a
- object SPRITE_BLACK_HAIR_BOY_1, $b, $1f, STAY, LEFT, $4, OPP_JR__TRAINER_M, $5
- object SPRITE_LASS, $b, $1e, STAY, LEFT, $5, OPP_JR__TRAINER_F, $3
+ object SPRITE_BLACK_HAIR_BOY_1, $b, $1f, STAY, LEFT, $4, OPP_JR_TRAINER_M, $5
+ object SPRITE_LASS, $b, $1e, STAY, LEFT, $5, OPP_JR_TRAINER_F, $3
object SPRITE_BUG_CATCHER, $13, $1a, STAY, LEFT, $6, OPP_BUG_CATCHER, $b
; warp-to