aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/CinnabarGym.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/CinnabarGym.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/CinnabarGym.asm')
-rwxr-xr-xdata/maps/objects/CinnabarGym.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/objects/CinnabarGym.asm b/data/maps/objects/CinnabarGym.asm
index f0b200f0..6548ddb8 100755
--- a/data/maps/objects/CinnabarGym.asm
+++ b/data/maps/objects/CinnabarGym.asm
@@ -8,15 +8,15 @@ CinnabarGym_Object:
db 0 ; signs
db 9 ; objects
- object SPRITE_FAT_BALD_GUY, 3, 3, STAY, DOWN, 1, OPP_BLAINE, 1
- object SPRITE_BLACK_HAIR_BOY_2, 17, 2, STAY, DOWN, 2, OPP_SUPER_NERD, 9
- object SPRITE_BLACK_HAIR_BOY_2, 17, 8, STAY, DOWN, 3, OPP_BURGLAR, 4
- object SPRITE_BLACK_HAIR_BOY_2, 11, 4, STAY, DOWN, 4, OPP_SUPER_NERD, 10
- object SPRITE_BLACK_HAIR_BOY_2, 11, 8, STAY, DOWN, 5, OPP_BURGLAR, 5
- object SPRITE_BLACK_HAIR_BOY_2, 11, 14, STAY, DOWN, 6, OPP_SUPER_NERD, 11
- object SPRITE_BLACK_HAIR_BOY_2, 3, 14, STAY, DOWN, 7, OPP_BURGLAR, 6
- object SPRITE_BLACK_HAIR_BOY_2, 3, 8, STAY, DOWN, 8, OPP_SUPER_NERD, 12
- object SPRITE_GYM_HELPER, 16, 13, STAY, DOWN, 9 ; person
+ object SPRITE_MIDDLE_AGED_MAN, 3, 3, STAY, DOWN, 1, OPP_BLAINE, 1
+ object SPRITE_SUPER_NERD, 17, 2, STAY, DOWN, 2, OPP_SUPER_NERD, 9
+ object SPRITE_SUPER_NERD, 17, 8, STAY, DOWN, 3, OPP_BURGLAR, 4
+ object SPRITE_SUPER_NERD, 11, 4, STAY, DOWN, 4, OPP_SUPER_NERD, 10
+ object SPRITE_SUPER_NERD, 11, 8, STAY, DOWN, 5, OPP_BURGLAR, 5
+ object SPRITE_SUPER_NERD, 11, 14, STAY, DOWN, 6, OPP_SUPER_NERD, 11
+ object SPRITE_SUPER_NERD, 3, 14, STAY, DOWN, 7, OPP_BURGLAR, 6
+ object SPRITE_SUPER_NERD, 3, 8, STAY, DOWN, 8, OPP_SUPER_NERD, 12
+ object SPRITE_GYM_GUIDE, 16, 13, STAY, DOWN, 9 ; person
; warp-to
warp_to 16, 17, CINNABAR_GYM_WIDTH