summaryrefslogtreecommitdiff
path: root/data/maps/objects/Route20.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/Route20.asm
parentd44c7c305c3f94b59e3e2c008408779836a0020a (diff)
parentdf62b8e81a4b0964d5f21dcc37916f996b5bd241 (diff)
Merge pull request #279 from Rangi42/master
Identify sprite and battle animation data
Diffstat (limited to 'data/maps/objects/Route20.asm')
-rwxr-xr-xdata/maps/objects/Route20.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/data/maps/objects/Route20.asm b/data/maps/objects/Route20.asm
index 7bceef97..c2a26861 100755
--- a/data/maps/objects/Route20.asm
+++ b/data/maps/objects/Route20.asm
@@ -16,7 +16,7 @@ Route20_Object:
object SPRITE_SWIMMER, 55, 14, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 24
object SPRITE_SWIMMER, 38, 13, STAY, DOWN, 5, OPP_SWIMMER, 10
object SPRITE_SWIMMER, 87, 13, STAY, UP, 6, OPP_SWIMMER, 11
- object SPRITE_BLACK_HAIR_BOY_1, 34, 9, STAY, UP, 7, OPP_BIRD_KEEPER, 11
+ object SPRITE_COOLTRAINER_M, 34, 9, STAY, UP, 7, OPP_BIRD_KEEPER, 11
object SPRITE_SWIMMER, 25, 7, STAY, UP, 8, OPP_BEAUTY, 7
object SPRITE_SWIMMER, 24, 12, STAY, DOWN, 9, OPP_JR_TRAINER_F, 16
object SPRITE_SWIMMER, 15, 8, STAY, UP, 10, OPP_BEAUTY, 8