summaryrefslogtreecommitdiff
path: root/data/maps/objects/Route4.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-19 23:04:16 -0400
committerGitHub <noreply@github.com>2020-07-19 23:04:16 -0400
commit0177688ad4d923c4970009fa87df48605bb43ed6 (patch)
tree4c44fbb1813e78eb00f7c1690d2c23099a49113b /data/maps/objects/Route4.asm
parentd44c7c305c3f94b59e3e2c008408779836a0020a (diff)
parentdf62b8e81a4b0964d5f21dcc37916f996b5bd241 (diff)
Merge pull request #279 from Rangi42/master
Identify sprite and battle animation data
Diffstat (limited to 'data/maps/objects/Route4.asm')
-rwxr-xr-xdata/maps/objects/Route4.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/Route4.asm b/data/maps/objects/Route4.asm
index 0c34f6db..6683e14d 100755
--- a/data/maps/objects/Route4.asm
+++ b/data/maps/objects/Route4.asm
@@ -12,9 +12,9 @@ Route4_Object:
sign 27, 7, 6 ; Route4Text6
db 3 ; objects
- object SPRITE_LASS, 9, 8, WALK, 0, 1 ; person
- object SPRITE_LASS, 63, 3, STAY, RIGHT, 2, OPP_LASS, 4
- object SPRITE_BALL, 57, 3, STAY, NONE, 3, TM_WHIRLWIND
+ object SPRITE_COOLTRAINER_F, 9, 8, WALK, 0, 1 ; person
+ object SPRITE_COOLTRAINER_F, 63, 3, STAY, RIGHT, 2, OPP_LASS, 4
+ object SPRITE_POKE_BALL, 57, 3, STAY, NONE, 3, TM_WHIRLWIND
; warp-to
warp_to 11, 5, ROUTE_4_WIDTH ; MT_MOON_POKECENTER