aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/Route8.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-17 12:48:15 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-17 12:48:15 -0400
commit2454296d32b078123ecfc6434e43d0cb20e12c94 (patch)
tree7d4b064c87d0d9b96d5f035fa8dab3cd8950fdb3 /data/maps/objects/Route8.asm
parent$c9 was "の" in Japanese (diff)
downloadpokeyellow-2454296d32b078123ecfc6434e43d0cb20e12c94.tar.gz
pokeyellow-2454296d32b078123ecfc6434e43d0cb20e12c94.tar.xz
pokeyellow-2454296d32b078123ecfc6434e43d0cb20e12c94.zip
Update sprite names
These are based on the trainers that use them, and synced with pokegold/pokecrysal when possible
Diffstat (limited to 'data/maps/objects/Route8.asm')
-rwxr-xr-xdata/maps/objects/Route8.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/objects/Route8.asm b/data/maps/objects/Route8.asm
index 137d70a0..5b0bc8fb 100755
--- a/data/maps/objects/Route8.asm
+++ b/data/maps/objects/Route8.asm
@@ -12,15 +12,15 @@ Route8_Object:
sign 17, 3, 10 ; Route8Text10
db 9 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, 8, 5, STAY, RIGHT, 1, OPP_SUPER_NERD, 3
+ object SPRITE_SUPER_NERD, 8, 5, STAY, RIGHT, 1, OPP_SUPER_NERD, 3
object SPRITE_GAMBLER, 13, 9, STAY, UP, 2, OPP_GAMBLER, 5
- object SPRITE_BLACK_HAIR_BOY_2, 42, 6, STAY, UP, 3, OPP_SUPER_NERD, 4
- object SPRITE_LASS, 26, 3, STAY, LEFT, 4, OPP_LASS, 13
- object SPRITE_BLACK_HAIR_BOY_2, 26, 4, STAY, RIGHT, 5, OPP_SUPER_NERD, 5
- object SPRITE_LASS, 26, 5, STAY, LEFT, 6, OPP_LASS, 14
- object SPRITE_LASS, 26, 6, STAY, RIGHT, 7, OPP_LASS, 15
+ object SPRITE_SUPER_NERD, 42, 6, STAY, UP, 3, OPP_SUPER_NERD, 4
+ object SPRITE_COOLTRAINER_F, 26, 3, STAY, LEFT, 4, OPP_LASS, 13
+ object SPRITE_SUPER_NERD, 26, 4, STAY, RIGHT, 5, OPP_SUPER_NERD, 5
+ object SPRITE_COOLTRAINER_F, 26, 5, STAY, LEFT, 6, OPP_LASS, 14
+ object SPRITE_COOLTRAINER_F, 26, 6, STAY, RIGHT, 7, OPP_LASS, 15
object SPRITE_GAMBLER, 46, 13, STAY, DOWN, 8, OPP_GAMBLER, 7
- object SPRITE_LASS, 51, 12, STAY, LEFT, 9, OPP_LASS, 16
+ object SPRITE_COOLTRAINER_F, 51, 12, STAY, LEFT, 9, OPP_LASS, 16
; warp-to
warp_to 1, 9, ROUTE_8_WIDTH ; ROUTE_8_GATE