summaryrefslogtreecommitdiff
path: root/data/maps/sprite_sets.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/sprite_sets.asm
parent452803af278648b92cc71af2f714b7689737b969 (diff)
Update sprite names
These are based on the trainers that use them, and synced with pokegold/pokecrysal when possible
Diffstat (limited to 'data/maps/sprite_sets.asm')
-rwxr-xr-xdata/maps/sprite_sets.asm132
1 files changed, 66 insertions, 66 deletions
diff --git a/data/maps/sprite_sets.asm b/data/maps/sprite_sets.asm
index ee6ddef0..1cc0b128 100755
--- a/data/maps/sprite_sets.asm
+++ b/data/maps/sprite_sets.asm
@@ -61,130 +61,130 @@ SplitMapSpriteSets:
SpriteSets:
; sprite set $01
db SPRITE_BLUE
- db SPRITE_BUG_CATCHER
+ db SPRITE_YOUNGSTER
db SPRITE_GIRL
- db SPRITE_FISHER2
- db SPRITE_BLACK_HAIR_BOY_1
+ db SPRITE_FISHER
+ db SPRITE_COOLTRAINER_M
db SPRITE_GAMBLER
db SPRITE_SEEL
db SPRITE_OAK
db SPRITE_SWIMMER
- db SPRITE_BALL
- db SPRITE_LYING_OLD_MAN
+ db SPRITE_POKE_BALL
+ db SPRITE_GAMBLER_ASLEEP
; sprite set $02
- db SPRITE_BUG_CATCHER
+ db SPRITE_YOUNGSTER
db SPRITE_ROCKET
- db SPRITE_BLACK_HAIR_BOY_2
+ db SPRITE_SUPER_NERD
db SPRITE_HIKER
- db SPRITE_SLOWBRO
+ db SPRITE_MONSTER
db SPRITE_BLUE
db SPRITE_GUARD
- db SPRITE_LASS
- db SPRITE_BLACK_HAIR_BOY_1
- db SPRITE_BALL
- db SPRITE_LYING_OLD_MAN_UNUSED_2
+ db SPRITE_COOLTRAINER_F
+ db SPRITE_COOLTRAINER_M
+ db SPRITE_POKE_BALL
+ db SPRITE_UNUSED_GAMBLER_ASLEEP_2
; sprite set $03
db SPRITE_LITTLE_GIRL
db SPRITE_GIRL
- db SPRITE_BLACK_HAIR_BOY_2
+ db SPRITE_SUPER_NERD
db SPRITE_HIKER
db SPRITE_GAMBLER
- db SPRITE_SLOWBRO
- db SPRITE_LASS
- db SPRITE_BLACK_HAIR_BOY_1
+ db SPRITE_MONSTER
+ db SPRITE_COOLTRAINER_F
+ db SPRITE_COOLTRAINER_M
db SPRITE_GUARD
- db SPRITE_BALL
- db SPRITE_LYING_OLD_MAN_UNUSED_2
+ db SPRITE_POKE_BALL
+ db SPRITE_UNUSED_GAMBLER_ASLEEP_2
; sprite set $04
- db SPRITE_FOULARD_WOMAN
- db SPRITE_BLACK_HAIR_BOY_2
- db SPRITE_BUG_CATCHER
+ db SPRITE_BEAUTY
+ db SPRITE_SUPER_NERD
+ db SPRITE_YOUNGSTER
db SPRITE_GAMBLER
- db SPRITE_SLOWBRO
+ db SPRITE_MONSTER
db SPRITE_GUARD
db SPRITE_SAILOR
- db SPRITE_LASS
- db SPRITE_BLACK_HAIR_BOY_1
- db SPRITE_BALL
- db SPRITE_LYING_OLD_MAN_UNUSED_2
+ db SPRITE_COOLTRAINER_F
+ db SPRITE_COOLTRAINER_M
+ db SPRITE_POKE_BALL
+ db SPRITE_UNUSED_GAMBLER_ASLEEP_2
; sprite set $05
db SPRITE_LITTLE_GIRL
- db SPRITE_YOUNG_BOY
+ db SPRITE_LITTLE_BOY
db SPRITE_GIRL
- db SPRITE_FISHER2
- db SPRITE_FAT_BALD_GUY
- db SPRITE_OLD_PERSON
- db SPRITE_SLOWBRO
+ db SPRITE_FISHER
+ db SPRITE_MIDDLE_AGED_MAN
+ db SPRITE_GRAMPS
+ db SPRITE_MONSTER
db SPRITE_GUARD
db SPRITE_ROCKET
- db SPRITE_BALL
+ db SPRITE_POKE_BALL
db SPRITE_SNORLAX
; sprite set $06
- db SPRITE_BUG_CATCHER
- db SPRITE_GYM_HELPER
- db SPRITE_SLOWBRO
+ db SPRITE_YOUNGSTER
+ db SPRITE_GYM_GUIDE
+ db SPRITE_MONSTER
db SPRITE_BLUE
- db SPRITE_LASS
- db SPRITE_BLACK_HAIR_BOY_1
+ db SPRITE_COOLTRAINER_F
+ db SPRITE_COOLTRAINER_M
db SPRITE_SWIMMER
db SPRITE_GUARD
db SPRITE_GAMBLER
- db SPRITE_BALL
- db SPRITE_LYING_OLD_MAN_UNUSED_2
+ db SPRITE_POKE_BALL
+ db SPRITE_UNUSED_GAMBLER_ASLEEP_2
; sprite set $07
db SPRITE_ROCKET
- db SPRITE_OAK_AIDE
- db SPRITE_LAPRAS_GIVER
+ db SPRITE_SCIENTIST
+ db SPRITE_SILPH_WORKER
db SPRITE_ERIKA
db SPRITE_GENTLEMAN
db SPRITE_BIRD
db SPRITE_ROCKER
- db SPRITE_BLACK_HAIR_BOY_1
- db SPRITE_SLOWBRO
- db SPRITE_BALL
- db SPRITE_LYING_OLD_MAN_UNUSED_2
+ db SPRITE_COOLTRAINER_M
+ db SPRITE_MONSTER
+ db SPRITE_POKE_BALL
+ db SPRITE_UNUSED_GAMBLER_ASLEEP_2
; sprite set $08
db SPRITE_BIKER
- db SPRITE_BLACK_HAIR_BOY_2
- db SPRITE_FAT_BALD_GUY
- db SPRITE_LASS
- db SPRITE_BLACK_HAIR_BOY_1
- db SPRITE_FOULARD_WOMAN
- db SPRITE_FISHER2
+ db SPRITE_SUPER_NERD
+ db SPRITE_MIDDLE_AGED_MAN
+ db SPRITE_COOLTRAINER_F
+ db SPRITE_COOLTRAINER_M
+ db SPRITE_BEAUTY
+ db SPRITE_FISHER
db SPRITE_ROCKER
- db SPRITE_SLOWBRO
- db SPRITE_BALL
+ db SPRITE_MONSTER
+ db SPRITE_POKE_BALL
db SPRITE_SNORLAX
; sprite set $09
db SPRITE_BIKER
- db SPRITE_BLACK_HAIR_BOY_1
- db SPRITE_LAPRAS_GIVER
- db SPRITE_FISHER2
+ db SPRITE_COOLTRAINER_M
+ db SPRITE_SILPH_WORKER
+ db SPRITE_FISHER
db SPRITE_ROCKER
db SPRITE_HIKER
db SPRITE_GAMBLER
- db SPRITE_FAT_BALD_GUY
- db SPRITE_BLACK_HAIR_BOY_2
- db SPRITE_BALL
+ db SPRITE_MIDDLE_AGED_MAN
+ db SPRITE_SUPER_NERD
+ db SPRITE_POKE_BALL
db SPRITE_SNORLAX
; sprite set $0a
db SPRITE_BIRD
- db SPRITE_BLACK_HAIR_BOY_1
- db SPRITE_CLEFAIRY
- db SPRITE_FISHER2
+ db SPRITE_COOLTRAINER_M
+ db SPRITE_FAIRY
+ db SPRITE_FISHER
db SPRITE_GAMBLER
- db SPRITE_SLOWBRO
+ db SPRITE_MONSTER
db SPRITE_SEEL
db SPRITE_SWIMMER
- db SPRITE_BUG_CATCHER
- db SPRITE_BALL
- db SPRITE_OMANYTE
+ db SPRITE_YOUNGSTER
+ db SPRITE_POKE_BALL
+ db SPRITE_FOSSIL