aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/CeruleanCity.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/CeruleanCity.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/CeruleanCity.asm')
-rwxr-xr-xdata/maps/objects/CeruleanCity.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/objects/CeruleanCity.asm b/data/maps/objects/CeruleanCity.asm
index d5adcfd7..858fcb28 100755
--- a/data/maps/objects/CeruleanCity.asm
+++ b/data/maps/objects/CeruleanCity.asm
@@ -24,14 +24,14 @@ CeruleanCity_Object:
db 11 ; objects
object SPRITE_BLUE, 20, 2, STAY, DOWN, 1 ; person
object SPRITE_ROCKET, 30, 8, STAY, NONE, 2, OPP_ROCKET, 5
- object SPRITE_BLACK_HAIR_BOY_1, 31, 20, STAY, DOWN, 3 ; person
- object SPRITE_BLACK_HAIR_BOY_2, 15, 18, WALK, 1, 4 ; person
- object SPRITE_BLACK_HAIR_BOY_2, 9, 21, WALK, 2, 5 ; person
+ object SPRITE_COOLTRAINER_M, 31, 20, STAY, DOWN, 3 ; person
+ object SPRITE_SUPER_NERD, 15, 18, WALK, 1, 4 ; person
+ object SPRITE_SUPER_NERD, 9, 21, WALK, 2, 5 ; person
object SPRITE_GUARD, 28, 12, STAY, DOWN, 6 ; person
- object SPRITE_LASS, 29, 26, STAY, LEFT, 7 ; person
- object SPRITE_SLOWBRO, 28, 26, STAY, DOWN, 8 ; person
- object SPRITE_LASS, 9, 27, WALK, 2, 9 ; person
- object SPRITE_BLACK_HAIR_BOY_2, 4, 12, STAY, DOWN, 10 ; person
+ object SPRITE_COOLTRAINER_F, 29, 26, STAY, LEFT, 7 ; person
+ object SPRITE_MONSTER, 28, 26, STAY, DOWN, 8 ; person
+ object SPRITE_COOLTRAINER_F, 9, 27, WALK, 2, 9 ; person
+ object SPRITE_SUPER_NERD, 4, 12, STAY, DOWN, 10 ; person
object SPRITE_GUARD, 27, 12, STAY, DOWN, 11 ; person
; warp-to