ref: 2454296d32b078123ecfc6434e43d0cb20e12c94
parent: 452803af278648b92cc71af2f714b7689737b969
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Fri Jul 17 08:48:15 EDT 2020
Update sprite names These are based on the trainers that use them, and synced with pokegold/pokecrysal when possible
--- a/constants/sprite_constants.asm
+++ b/constants/sprite_constants.asm
@@ -1,75 +1,76 @@
; overworld sprites
const_def
- const SPRITE_NONE ; $00
- const SPRITE_RED ; $01
- const SPRITE_BLUE ; $02
- const SPRITE_OAK ; $03
- const SPRITE_BUG_CATCHER ; $04
- const SPRITE_SLOWBRO ; $05
- const SPRITE_LASS ; $06
- const SPRITE_BLACK_HAIR_BOY_1 ; $07
- const SPRITE_LITTLE_GIRL ; $08
- const SPRITE_BIRD ; $09
- const SPRITE_FAT_BALD_GUY ; $0a
- const SPRITE_GAMBLER ; $0b
- const SPRITE_BLACK_HAIR_BOY_2 ; $0c
- const SPRITE_GIRL ; $0d
- const SPRITE_HIKER ; $0e
- const SPRITE_FOULARD_WOMAN ; $0f
- const SPRITE_GENTLEMAN ; $10
- const SPRITE_DAISY ; $11
- const SPRITE_BIKER ; $12
- const SPRITE_SAILOR ; $13
- const SPRITE_COOK ; $14
- const SPRITE_BIKE_SHOP_GUY ; $15
- const SPRITE_MR_FUJI ; $16
- const SPRITE_GIOVANNI ; $17
- const SPRITE_ROCKET ; $18
- const SPRITE_MEDIUM ; $19
- const SPRITE_WAITER ; $1a
- const SPRITE_ERIKA ; $1b
- const SPRITE_MOM_GEISHA ; $1c
- const SPRITE_BRUNETTE_GIRL ; $1d
- const SPRITE_LANCE ; $1e
- const SPRITE_OAK_SCIENTIST_AIDE ; $1f
- const SPRITE_OAK_AIDE ; $20
- const SPRITE_ROCKER ; $21
- const SPRITE_SWIMMER ; $22
- const SPRITE_WHITE_PLAYER ; $23
- const SPRITE_GYM_HELPER ; $24
- const SPRITE_OLD_PERSON ; $25
- const SPRITE_MART_GUY ; $26
- const SPRITE_FISHER ; $27
- const SPRITE_OLD_MEDIUM_WOMAN ; $28
- const SPRITE_NURSE ; $29
- const SPRITE_CABLE_CLUB_WOMAN ; $2a
- const SPRITE_MR_MASTERBALL ; $2b
- const SPRITE_LAPRAS_GIVER ; $2c
- const SPRITE_WARDEN ; $2d
- const SPRITE_SS_CAPTAIN ; $2e
- const SPRITE_FISHER2 ; $2f
- const SPRITE_BLACKBELT ; $30
- const SPRITE_GUARD ; $31
- const SPRITE_COP_GUARD ; $32
- const SPRITE_MOM ; $33
- const SPRITE_BALDING_GUY ; $34
- const SPRITE_YOUNG_BOY ; $35
- const SPRITE_GAMEBOY_KID ; $36
- const SPRITE_GAMEBOY_KID_COPY ; $37
- const SPRITE_CLEFAIRY ; $38
- const SPRITE_AGATHA ; $39
- const SPRITE_BRUNO ; $3a
- const SPRITE_LORELEI ; $3b
- const SPRITE_SEEL ; $3c
- const SPRITE_BALL ; $3d
- const SPRITE_OMANYTE ; $3e
- const SPRITE_BOULDER ; $3f
- const SPRITE_PAPER_SHEET ; $40
- const SPRITE_BOOK_MAP_DEX ; $41
- const SPRITE_CLIPBOARD ; $42
- const SPRITE_SNORLAX ; $43
- const SPRITE_OLD_AMBER_COPY ; $44
- const SPRITE_OLD_AMBER ; $45
- const SPRITE_LYING_OLD_MAN_UNUSED_1 ; $46
- const SPRITE_LYING_OLD_MAN_UNUSED_2 ; $47
- const SPRITE_LYING_OLD_MAN ; $48
+ const SPRITE_NONE ; $00
+ const SPRITE_RED ; $01
+ const SPRITE_BLUE ; $02
+ const SPRITE_OAK ; $03
+ const SPRITE_YOUNGSTER ; $04
+ const SPRITE_MONSTER ; $05
+ const SPRITE_COOLTRAINER_F ; $06
+ const SPRITE_COOLTRAINER_M ; $07
+ const SPRITE_LITTLE_GIRL ; $08
+ const SPRITE_BIRD ; $09
+ const SPRITE_MIDDLE_AGED_MAN ; $0a
+ const SPRITE_GAMBLER ; $0b
+ const SPRITE_SUPER_NERD ; $0c
+ const SPRITE_GIRL ; $0d
+ const SPRITE_HIKER ; $0e
+ const SPRITE_BEAUTY ; $0f
+ const SPRITE_GENTLEMAN ; $10
+ const SPRITE_DAISY ; $11
+ const SPRITE_BIKER ; $12
+ const SPRITE_SAILOR ; $13
+ const SPRITE_COOK ; $14
+ const SPRITE_BIKE_SHOP_CLERK ; $15
+ const SPRITE_MR_FUJI ; $16
+ const SPRITE_GIOVANNI ; $17
+ const SPRITE_ROCKET ; $18
+ const SPRITE_CHANNELER ; $19
+ const SPRITE_WAITER ; $1a
+ const SPRITE_ERIKA ; $1b
+ const SPRITE_MIDDLE_AGED_WOMAN ; $1c
+ const SPRITE_BRUNETTE_GIRL ; $1d
+ const SPRITE_LANCE ; $1e
+ const SPRITE_UNUSED_SCIENTIST ; $1f
+ const SPRITE_SCIENTIST ; $20
+ const SPRITE_ROCKER ; $21
+ const SPRITE_SWIMMER ; $22
+ const SPRITE_SAFARI_ZONE_WORKER ; $23
+ const SPRITE_GYM_GUIDE ; $24
+ const SPRITE_GRAMPS ; $25
+ const SPRITE_CLERK ; $26
+ const SPRITE_FISHING_GURU ; $27
+ const SPRITE_GRANNY ; $28
+ const SPRITE_NURSE ; $29
+ const SPRITE_LINK_RECEPTIONIST ; $2a
+ const SPRITE_SILPH_PRESIDENT ; $2b
+ const SPRITE_SILPH_WORKER ; $2c
+ const SPRITE_WARDEN ; $2d
+ const SPRITE_CAPTAIN ; $2e
+ const SPRITE_FISHER ; $2f
+ const SPRITE_KOGA ; $30
+ const SPRITE_GUARD ; $31
+ const SPRITE_UNUSED_GUARD ; $32
+ const SPRITE_MOM ; $33
+ const SPRITE_BALDING_GUY ; $34
+ const SPRITE_LITTLE_BOY ; $35
+ const SPRITE_UNUSED_GAMEBOY_KID ; $36
+ const SPRITE_GAMEBOY_KID ; $37
+ const SPRITE_FAIRY ; $38
+ const SPRITE_AGATHA ; $39
+ const SPRITE_BRUNO ; $3a
+ const SPRITE_LORELEI ; $3b
+ const SPRITE_SEEL ; $3c
+FIRST_STILL_SPRITE EQU const_value
+ const SPRITE_POKE_BALL ; $3d
+ const SPRITE_FOSSIL ; $3e
+ const SPRITE_BOULDER ; $3f
+ const SPRITE_PAPER ; $40
+ const SPRITE_POKEDEX ; $41
+ const SPRITE_CLIPBOARD ; $42
+ const SPRITE_SNORLAX ; $43
+ const SPRITE_UNUSED_OLD_AMBER ; $44
+ const SPRITE_OLD_AMBER ; $45
+ const SPRITE_UNUSED_GAMBLER_ASLEEP_1 ; $46
+ const SPRITE_UNUSED_GAMBLER_ASLEEP_2 ; $47
+ const SPRITE_GAMBLER_ASLEEP ; $48
--- a/data/icon_pointers.asm
+++ b/data/icon_pointers.asm
@@ -7,9 +7,9 @@
MonPartySpritePointers:
; gfx pointer, gfx tile offset, # tiles, vSprites tile offset
- mon_icon_header SlowbroSprite, 12, 4, $00
- mon_icon_header BallSprite, 0, 8, $04
- mon_icon_header ClefairySprite, 12, 4, $0c
+ mon_icon_header MonsterSprite, 12, 4, $00
+ mon_icon_header PokeBallSprite, 0, 8, $04
+ mon_icon_header FairySprite, 12, 4, $0c
mon_icon_header BirdSprite, 12, 4, $10
mon_icon_header SeelSprite, 0, 4, $14
mon_icon_header BugIconFrame2, 0, 1, $18
@@ -21,9 +21,9 @@
mon_icon_header QuadrupedIconFrame1, 0, 1, $24
mon_icon_header QuadrupedIconFrame1, 1, 1, $26
mon_icon_header TradeBubbleIconGFX, 0, 4, $38
- mon_icon_header SlowbroSprite, 0, 4, $40
- mon_icon_header BallSprite, 0, 8, $44
- mon_icon_header ClefairySprite, 0, 4, $4c
+ mon_icon_header MonsterSprite, 0, 4, $40
+ mon_icon_header PokeBallSprite, 0, 8, $44
+ mon_icon_header FairySprite, 0, 4, $4c
mon_icon_header BirdSprite, 0, 4, $50
mon_icon_header SeelSprite, 12, 4, $54
mon_icon_header BugIconFrame1, 0, 1, $58
--- a/data/maps/objects/BikeShop.asm
+++ b/data/maps/objects/BikeShop.asm
@@ -8,9 +8,9 @@
db 0 ; signs
db 3 ; objects
- object SPRITE_BIKE_SHOP_GUY, 6, 2, STAY, NONE, 1 ; person
- object SPRITE_MOM_GEISHA, 5, 6, WALK, 1, 2 ; person
- object SPRITE_BUG_CATCHER, 1, 3, STAY, UP, 3 ; person
+ object SPRITE_BIKE_SHOP_CLERK, 6, 2, STAY, NONE, 1 ; person
+ object SPRITE_MIDDLE_AGED_WOMAN, 5, 6, WALK, 1, 2 ; person
+ object SPRITE_YOUNGSTER, 1, 3, STAY, UP, 3 ; person
; warp-to
warp_to 2, 7, BIKE_SHOP_WIDTH
--- a/data/maps/objects/BillsHouse.asm
+++ b/data/maps/objects/BillsHouse.asm
@@ -8,9 +8,9 @@
db 0 ; signs
db 3 ; objects
- object SPRITE_SLOWBRO, 6, 5, STAY, NONE, 1 ; person
- object SPRITE_BLACK_HAIR_BOY_2, 4, 4, STAY, NONE, 2 ; person
- object SPRITE_BLACK_HAIR_BOY_2, 6, 5, STAY, NONE, 3 ; person
+ object SPRITE_MONSTER, 6, 5, STAY, NONE, 1 ; person
+ object SPRITE_SUPER_NERD, 4, 4, STAY, NONE, 2 ; person
+ object SPRITE_SUPER_NERD, 6, 5, STAY, NONE, 3 ; person
; warp-to
warp_to 2, 7, BILLS_HOUSE_WIDTH
--- a/data/maps/objects/BluesHouse.asm
+++ b/data/maps/objects/BluesHouse.asm
@@ -10,7 +10,7 @@
db 3 ; objects
object SPRITE_DAISY, 2, 3, STAY, RIGHT, 1 ; Daisy, sitting by map
object SPRITE_DAISY, 6, 4, WALK, 1, 2, 0 ; Daisy, walking around
- object SPRITE_BOOK_MAP_DEX, 3, 3, STAY, NONE, 3, 0 ; map on table
+ object SPRITE_POKEDEX, 3, 3, STAY, NONE, 3, 0 ; map on table
; warp-to
warp_to 2, 7, BLUES_HOUSE_WIDTH
--- a/data/maps/objects/CeladonChiefHouse.asm
+++ b/data/maps/objects/CeladonChiefHouse.asm
@@ -8,7 +8,7 @@
db 0 ; signs
db 3 ; objects
- object SPRITE_OLD_PERSON, 4, 2, STAY, DOWN, 1 ; person
+ object SPRITE_GRAMPS, 4, 2, STAY, DOWN, 1 ; person
object SPRITE_ROCKET, 1, 4, WALK, 0, 2 ; person
object SPRITE_SAILOR, 5, 6, STAY, LEFT, 3 ; person
--- a/data/maps/objects/CeladonCity.asm
+++ b/data/maps/objects/CeladonCity.asm
@@ -29,12 +29,12 @@
db 9 ; objects
object SPRITE_LITTLE_GIRL, 8, 17, WALK, 0, 1 ; person
- object SPRITE_OLD_PERSON, 11, 28, STAY, UP, 2 ; person
+ object SPRITE_GRAMPS, 11, 28, STAY, UP, 2 ; person
object SPRITE_GIRL, 14, 19, WALK, 1, 3 ; person
- object SPRITE_OLD_PERSON, 25, 22, STAY, DOWN, 4 ; person
- object SPRITE_OLD_PERSON, 22, 16, STAY, DOWN, 5 ; person
- object SPRITE_FISHER2, 32, 12, STAY, LEFT, 6 ; person
- object SPRITE_SLOWBRO, 30, 12, STAY, RIGHT, 7 ; person
+ object SPRITE_GRAMPS, 25, 22, STAY, DOWN, 4 ; person
+ object SPRITE_GRAMPS, 22, 16, STAY, DOWN, 5 ; person
+ object SPRITE_FISHER, 32, 12, STAY, LEFT, 6 ; person
+ object SPRITE_MONSTER, 30, 12, STAY, RIGHT, 7 ; person
object SPRITE_ROCKET, 32, 29, WALK, 2, 8 ; person
object SPRITE_ROCKET, 42, 14, WALK, 2, 9 ; person
--- a/data/maps/objects/CeladonDiner.asm
+++ b/data/maps/objects/CeladonDiner.asm
@@ -9,10 +9,10 @@
db 5 ; objects
object SPRITE_COOK, 8, 5, WALK, 2, 1 ; person
- object SPRITE_MOM_GEISHA, 7, 2, STAY, NONE, 2 ; person
- object SPRITE_FAT_BALD_GUY, 1, 4, STAY, DOWN, 3 ; person
- object SPRITE_FISHER2, 5, 3, STAY, RIGHT, 4 ; person
- object SPRITE_GYM_HELPER, 0, 1, STAY, DOWN, 5 ; person
+ object SPRITE_MIDDLE_AGED_WOMAN, 7, 2, STAY, NONE, 2 ; person
+ object SPRITE_MIDDLE_AGED_MAN, 1, 4, STAY, DOWN, 3 ; person
+ object SPRITE_FISHER, 5, 3, STAY, RIGHT, 4 ; person
+ object SPRITE_GYM_GUIDE, 0, 1, STAY, DOWN, 5 ; person
; warp-to
warp_to 3, 7, CELADON_DINER_WIDTH
--- a/data/maps/objects/CeladonGym.asm
+++ b/data/maps/objects/CeladonGym.asm
@@ -9,13 +9,13 @@
db 8 ; objects
object SPRITE_ERIKA, 4, 3, STAY, DOWN, 1, OPP_ERIKA, 1
- object SPRITE_LASS, 2, 11, STAY, RIGHT, 2, OPP_LASS, 17
- object SPRITE_FOULARD_WOMAN, 7, 10, STAY, LEFT, 3, OPP_BEAUTY, 1
- object SPRITE_LASS, 9, 5, STAY, DOWN, 4, OPP_JR_TRAINER_F, 11
- object SPRITE_FOULARD_WOMAN, 1, 5, STAY, DOWN, 5, OPP_BEAUTY, 2
- object SPRITE_LASS, 6, 3, STAY, DOWN, 6, OPP_LASS, 18
- object SPRITE_FOULARD_WOMAN, 3, 3, STAY, DOWN, 7, OPP_BEAUTY, 3
- object SPRITE_LASS, 5, 3, STAY, DOWN, 8, OPP_COOLTRAINER_F, 1
+ object SPRITE_COOLTRAINER_F, 2, 11, STAY, RIGHT, 2, OPP_LASS, 17
+ object SPRITE_BEAUTY, 7, 10, STAY, LEFT, 3, OPP_BEAUTY, 1
+ object SPRITE_COOLTRAINER_F, 9, 5, STAY, DOWN, 4, OPP_JR_TRAINER_F, 11
+ object SPRITE_BEAUTY, 1, 5, STAY, DOWN, 5, OPP_BEAUTY, 2
+ object SPRITE_COOLTRAINER_F, 6, 3, STAY, DOWN, 6, OPP_LASS, 18
+ object SPRITE_BEAUTY, 3, 3, STAY, DOWN, 7, OPP_BEAUTY, 3
+ object SPRITE_COOLTRAINER_F, 5, 3, STAY, DOWN, 8, OPP_COOLTRAINER_F, 1
; warp-to
warp_to 4, 17, CELADON_GYM_WIDTH
--- a/data/maps/objects/CeladonHotel.asm
+++ b/data/maps/objects/CeladonHotel.asm
@@ -8,9 +8,9 @@
db 0 ; signs
db 3 ; objects
- object SPRITE_OLD_MEDIUM_WOMAN, 3, 1, STAY, DOWN, 1 ; person
- object SPRITE_FOULARD_WOMAN, 2, 4, STAY, NONE, 2 ; person
- object SPRITE_BLACK_HAIR_BOY_2, 8, 4, WALK, 2, 3 ; person
+ object SPRITE_GRANNY, 3, 1, STAY, DOWN, 1 ; person
+ object SPRITE_BEAUTY, 2, 4, STAY, NONE, 2 ; person
+ object SPRITE_SUPER_NERD, 8, 4, WALK, 2, 3 ; person
; warp-to
warp_to 3, 7, CELADON_HOTEL_WIDTH
--- a/data/maps/objects/CeladonMansion1F.asm
+++ b/data/maps/objects/CeladonMansion1F.asm
@@ -12,10 +12,10 @@
sign 4, 9, 5 ; CeladonMansion1Text5
db 4 ; objects
- object SPRITE_SLOWBRO, 0, 5, STAY, RIGHT, 1 ; person
- object SPRITE_OLD_MEDIUM_WOMAN, 1, 5, STAY, DOWN, 2 ; person
- object SPRITE_CLEFAIRY, 1, 8, WALK, 2, 3 ; person
- object SPRITE_SLOWBRO, 4, 4, WALK, 1, 4 ; person
+ object SPRITE_MONSTER, 0, 5, STAY, RIGHT, 1 ; person
+ object SPRITE_GRANNY, 1, 5, STAY, DOWN, 2 ; person
+ object SPRITE_FAIRY, 1, 8, WALK, 2, 3 ; person
+ object SPRITE_MONSTER, 4, 4, WALK, 1, 4 ; person
; warp-to
warp_to 4, 11, CELADON_MANSION_1F_WIDTH
--- a/data/maps/objects/CeladonMansion3F.asm
+++ b/data/maps/objects/CeladonMansion3F.asm
@@ -14,10 +14,10 @@
sign 4, 9, 8 ; CeladonMansion3Text8
db 4 ; objects
- object SPRITE_BIKE_SHOP_GUY, 0, 4, STAY, UP, 1 ; person
- object SPRITE_MART_GUY, 3, 4, STAY, UP, 2 ; person
- object SPRITE_BLACK_HAIR_BOY_2, 0, 7, STAY, UP, 3 ; person
- object SPRITE_LAPRAS_GIVER, 2, 3, STAY, NONE, 4 ; person
+ object SPRITE_BIKE_SHOP_CLERK, 0, 4, STAY, UP, 1 ; person
+ object SPRITE_CLERK, 3, 4, STAY, UP, 2 ; person
+ object SPRITE_SUPER_NERD, 0, 7, STAY, UP, 3 ; person
+ object SPRITE_SILPH_WORKER, 2, 3, STAY, NONE, 4 ; person
; warp-to
warp_to 6, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_2F
--- a/data/maps/objects/CeladonMansionRoofHouse.asm
+++ b/data/maps/objects/CeladonMansionRoofHouse.asm
@@ -9,7 +9,7 @@
db 2 ; objects
object SPRITE_HIKER, 2, 2, STAY, DOWN, 1 ; person
- object SPRITE_BALL, 4, 3, STAY, NONE, 2 ; person
+ object SPRITE_POKE_BALL, 4, 3, STAY, NONE, 2 ; person
; warp-to
warp_to 2, 7, CELADON_MANSION_ROOF_HOUSE_WIDTH ; CELADON_MANSION_ROOF
--- a/data/maps/objects/CeladonMart1F.asm
+++ b/data/maps/objects/CeladonMart1F.asm
@@ -14,7 +14,7 @@
sign 14, 1, 3 ; CeladonMart1Text3
db 1 ; objects
- object SPRITE_CABLE_CLUB_WOMAN, 8, 3, STAY, DOWN, 1 ; person
+ object SPRITE_LINK_RECEPTIONIST, 8, 3, STAY, DOWN, 1 ; person
; warp-to
warp_to 2, 7, CELADON_MART_1F_WIDTH
--- a/data/maps/objects/CeladonMart2F.asm
+++ b/data/maps/objects/CeladonMart2F.asm
@@ -10,9 +10,9 @@
sign 14, 1, 5 ; CeladonMart2Text5
db 4 ; objects
- object SPRITE_MART_GUY, 5, 3, STAY, DOWN, 1 ; person
- object SPRITE_MART_GUY, 6, 3, STAY, DOWN, 2 ; person
- object SPRITE_FAT_BALD_GUY, 19, 5, STAY, NONE, 3 ; person
+ object SPRITE_CLERK, 5, 3, STAY, DOWN, 1 ; person
+ object SPRITE_CLERK, 6, 3, STAY, DOWN, 2 ; person
+ object SPRITE_MIDDLE_AGED_MAN, 19, 5, STAY, NONE, 3 ; person
object SPRITE_GIRL, 14, 4, WALK, 1, 4 ; person
; warp-to
--- a/data/maps/objects/CeladonMart3F.asm
+++ b/data/maps/objects/CeladonMart3F.asm
@@ -21,11 +21,11 @@
sign 10, 1, 17 ; CeladonMart3Text17
db 5 ; objects
- object SPRITE_MART_GUY, 16, 5, STAY, NONE, 1 ; person
- object SPRITE_GAMEBOY_KID_COPY, 11, 6, STAY, RIGHT, 2 ; person
- object SPRITE_GAMEBOY_KID_COPY, 7, 2, STAY, DOWN, 3 ; person
- object SPRITE_GAMEBOY_KID_COPY, 8, 2, STAY, DOWN, 4 ; person
- object SPRITE_YOUNG_BOY, 2, 5, STAY, UP, 5 ; person
+ object SPRITE_CLERK, 16, 5, STAY, NONE, 1 ; person
+ object SPRITE_GAMEBOY_KID, 11, 6, STAY, RIGHT, 2 ; person
+ object SPRITE_GAMEBOY_KID, 7, 2, STAY, DOWN, 3 ; person
+ object SPRITE_GAMEBOY_KID, 8, 2, STAY, DOWN, 4 ; person
+ object SPRITE_LITTLE_BOY, 2, 5, STAY, UP, 5 ; person
; warp-to
warp_to 12, 1, CELADON_MART_3F_WIDTH ; CELADON_MART_4F
--- a/data/maps/objects/CeladonMart4F.asm
+++ b/data/maps/objects/CeladonMart4F.asm
@@ -10,9 +10,9 @@
sign 14, 1, 4 ; CeladonMart4Text4
db 3 ; objects
- object SPRITE_MART_GUY, 5, 7, STAY, NONE, 1 ; person
- object SPRITE_BLACK_HAIR_BOY_2, 15, 5, WALK, 2, 2 ; person
- object SPRITE_BUG_CATCHER, 5, 2, WALK, 2, 3 ; person
+ object SPRITE_CLERK, 5, 7, STAY, NONE, 1 ; person
+ object SPRITE_SUPER_NERD, 15, 5, WALK, 2, 2 ; person
+ object SPRITE_YOUNGSTER, 5, 2, WALK, 2, 3 ; person
; warp-to
warp_to 12, 1, CELADON_MART_4F_WIDTH ; CELADON_MART_3F
--- a/data/maps/objects/CeladonMart5F.asm
+++ b/data/maps/objects/CeladonMart5F.asm
@@ -12,8 +12,8 @@
db 4 ; objects
object SPRITE_GENTLEMAN, 14, 5, WALK, 1, 1 ; person
object SPRITE_SAILOR, 2, 6, STAY, NONE, 2 ; person
- object SPRITE_MART_GUY, 5, 3, STAY, DOWN, 3 ; person
- object SPRITE_MART_GUY, 6, 3, STAY, DOWN, 4 ; person
+ object SPRITE_CLERK, 5, 3, STAY, DOWN, 3 ; person
+ object SPRITE_CLERK, 6, 3, STAY, DOWN, 4 ; person
; warp-to
warp_to 12, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_ROOF
--- a/data/maps/objects/CeladonMartRoof.asm
+++ b/data/maps/objects/CeladonMartRoof.asm
@@ -11,7 +11,7 @@
sign 13, 2, 6 ; CeladonMartRoofText6
db 2 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, 10, 4, STAY, LEFT, 1 ; person
+ object SPRITE_SUPER_NERD, 10, 4, STAY, LEFT, 1 ; person
object SPRITE_LITTLE_GIRL, 5, 5, WALK, 0, 2 ; person
; warp-to
--- a/data/maps/objects/CeladonPokecenter.asm
+++ b/data/maps/objects/CeladonPokecenter.asm
@@ -10,8 +10,8 @@
db 4 ; objects
object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
object SPRITE_GENTLEMAN, 7, 3, WALK, 2, 2 ; person
- object SPRITE_FOULARD_WOMAN, 10, 5, WALK, 0, 3 ; person
- object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person
+ object SPRITE_BEAUTY, 10, 5, WALK, 0, 3 ; person
+ object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person
; warp-to
warp_to 3, 7, CELADON_POKECENTER_WIDTH
--- a/data/maps/objects/CeruleanBadgeHouse.asm
+++ b/data/maps/objects/CeruleanBadgeHouse.asm
@@ -9,7 +9,7 @@
db 0 ; signs
db 1 ; objects
- object SPRITE_FAT_BALD_GUY, 5, 3, STAY, RIGHT, 1 ; person
+ object SPRITE_MIDDLE_AGED_MAN, 5, 3, STAY, RIGHT, 1 ; person
; warp-to
warp_to 2, 0, CERULEAN_BADGE_HOUSE_WIDTH
--- a/data/maps/objects/CeruleanCave1F.asm
+++ b/data/maps/objects/CeruleanCave1F.asm
@@ -15,9 +15,9 @@
db 0 ; signs
db 3 ; objects
- object SPRITE_BALL, 7, 13, STAY, NONE, 1, FULL_RESTORE
- object SPRITE_BALL, 19, 3, STAY, NONE, 2, MAX_ELIXER
- object SPRITE_BALL, 5, 0, STAY, NONE, 3, NUGGET
+ object SPRITE_POKE_BALL, 7, 13, STAY, NONE, 1, FULL_RESTORE
+ object SPRITE_POKE_BALL, 19, 3, STAY, NONE, 2, MAX_ELIXER
+ object SPRITE_POKE_BALL, 5, 0, STAY, NONE, 3, NUGGET
; warp-to
warp_to 24, 17, CERULEAN_CAVE_1F_WIDTH
--- a/data/maps/objects/CeruleanCave2F.asm
+++ b/data/maps/objects/CeruleanCave2F.asm
@@ -12,9 +12,9 @@
db 0 ; signs
db 3 ; objects
- object SPRITE_BALL, 29, 9, STAY, NONE, 1, PP_UP
- object SPRITE_BALL, 4, 15, STAY, NONE, 2, ULTRA_BALL
- object SPRITE_BALL, 13, 6, STAY, NONE, 3, FULL_RESTORE
+ object SPRITE_POKE_BALL, 29, 9, STAY, NONE, 1, PP_UP
+ object SPRITE_POKE_BALL, 4, 15, STAY, NONE, 2, ULTRA_BALL
+ object SPRITE_POKE_BALL, 13, 6, STAY, NONE, 3, FULL_RESTORE
; warp-to
warp_to 29, 1, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F
--- a/data/maps/objects/CeruleanCaveB1F.asm
+++ b/data/maps/objects/CeruleanCaveB1F.asm
@@ -7,9 +7,9 @@
db 0 ; signs
db 3 ; objects
- object SPRITE_SLOWBRO, 27, 13, STAY, DOWN, 1, MEWTWO, 70
- object SPRITE_BALL, 16, 9, STAY, NONE, 2, ULTRA_BALL
- object SPRITE_BALL, 18, 1, STAY, NONE, 3, MAX_REVIVE
+ object SPRITE_MONSTER, 27, 13, STAY, DOWN, 1, MEWTWO, 70
+ object SPRITE_POKE_BALL, 16, 9, STAY, NONE, 2, ULTRA_BALL
+ object SPRITE_POKE_BALL, 18, 1, STAY, NONE, 3, MAX_REVIVE
; warp-to
warp_to 3, 6, CERULEAN_CAVE_B1F_WIDTH ; CERULEAN_CAVE_1F
--- a/data/maps/objects/CeruleanCity.asm
+++ b/data/maps/objects/CeruleanCity.asm
@@ -24,14 +24,14 @@
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
--- a/data/maps/objects/CeruleanGym.asm
+++ b/data/maps/objects/CeruleanGym.asm
@@ -9,9 +9,9 @@
db 4 ; objects
object SPRITE_BRUNETTE_GIRL, 4, 2, STAY, DOWN, 1, OPP_MISTY, 1
- object SPRITE_LASS, 2, 3, STAY, RIGHT, 2, OPP_JR_TRAINER_F, 1
+ object SPRITE_COOLTRAINER_F, 2, 3, STAY, RIGHT, 2, OPP_JR_TRAINER_F, 1
object SPRITE_SWIMMER, 8, 7, STAY, LEFT, 3, OPP_SWIMMER, 1
- object SPRITE_GYM_HELPER, 7, 10, STAY, DOWN, 4 ; person
+ object SPRITE_GYM_GUIDE, 7, 10, STAY, DOWN, 4 ; person
; warp-to
warp_to 4, 13, CERULEAN_GYM_WIDTH
--- a/data/maps/objects/CeruleanMart.asm
+++ b/data/maps/objects/CeruleanMart.asm
@@ -8,9 +8,9 @@
db 0 ; signs
db 3 ; objects
- object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person
- object SPRITE_BLACK_HAIR_BOY_1, 3, 4, WALK, 1, 2 ; person
- object SPRITE_LASS, 6, 2, WALK, 2, 3 ; person
+ object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person
+ object SPRITE_COOLTRAINER_M, 3, 4, WALK, 1, 2 ; person
+ object SPRITE_COOLTRAINER_F, 6, 2, WALK, 2, 3 ; person
; warp-to
warp_to 3, 7, CERULEAN_MART_WIDTH
--- a/data/maps/objects/CeruleanPokecenter.asm
+++ b/data/maps/objects/CeruleanPokecenter.asm
@@ -9,9 +9,9 @@
db 4 ; objects
object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
- object SPRITE_BLACK_HAIR_BOY_2, 10, 5, WALK, 0, 2 ; person
+ object SPRITE_SUPER_NERD, 10, 5, WALK, 0, 2 ; person
object SPRITE_GENTLEMAN, 4, 3, STAY, DOWN, 3 ; person
- object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person
+ object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person
; warp-to
warp_to 3, 7, CERULEAN_POKECENTER_WIDTH
--- a/data/maps/objects/CeruleanTradeHouse.asm
+++ b/data/maps/objects/CeruleanTradeHouse.asm
@@ -8,7 +8,7 @@
db 0 ; signs
db 2 ; objects
- object SPRITE_OLD_MEDIUM_WOMAN, 5, 4, STAY, LEFT, 1 ; person
+ object SPRITE_GRANNY, 5, 4, STAY, LEFT, 1 ; person
object SPRITE_GAMBLER, 1, 2, STAY, NONE, 2 ; person
; warp-to
--- a/data/maps/objects/CeruleanTrashedHouse.asm
+++ b/data/maps/objects/CeruleanTrashedHouse.asm
@@ -10,7 +10,7 @@
sign 3, 0, 3 ; CeruleanHouseTrashedText3
db 2 ; objects
- object SPRITE_FISHER, 2, 1, STAY, DOWN, 1 ; person
+ object SPRITE_FISHING_GURU, 2, 1, STAY, DOWN, 1 ; person
object SPRITE_GIRL, 5, 6, WALK, 2, 2 ; person
; warp-to
--- a/data/maps/objects/CinnabarGym.asm
+++ b/data/maps/objects/CinnabarGym.asm
@@ -8,15 +8,15 @@
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
--- a/data/maps/objects/CinnabarLab.asm
+++ b/data/maps/objects/CinnabarLab.asm
@@ -15,7 +15,7 @@
sign 17, 4, 5 ; Lab1Text5
db 1 ; objects
- object SPRITE_FISHER, 1, 3, STAY, NONE, 1 ; person
+ object SPRITE_FISHING_GURU, 1, 3, STAY, NONE, 1 ; person
; warp-to
warp_to 2, 7, CINNABAR_LAB_WIDTH
--- a/data/maps/objects/CinnabarLabFossilRoom.asm
+++ b/data/maps/objects/CinnabarLabFossilRoom.asm
@@ -8,8 +8,8 @@
db 0 ; signs
db 2 ; objects
- object SPRITE_OAK_AIDE, 5, 2, WALK, 2, 1 ; person
- object SPRITE_OAK_AIDE, 7, 6, STAY, UP, 2 ; person
+ object SPRITE_SCIENTIST, 5, 2, WALK, 2, 1 ; person
+ object SPRITE_SCIENTIST, 7, 6, STAY, UP, 2 ; person
; warp-to
warp_to 2, 7, CINNABAR_LAB_FOSSIL_ROOM_WIDTH ; CINNABAR_LAB
--- a/data/maps/objects/CinnabarLabMetronomeRoom.asm
+++ b/data/maps/objects/CinnabarLabMetronomeRoom.asm
@@ -11,8 +11,8 @@
sign 2, 1, 5 ; Lab3Text5
db 2 ; objects
- object SPRITE_OAK_AIDE, 7, 2, STAY, DOWN, 1 ; person
- object SPRITE_OAK_AIDE, 2, 3, WALK, 2, 2 ; person
+ object SPRITE_SCIENTIST, 7, 2, STAY, DOWN, 1 ; person
+ object SPRITE_SCIENTIST, 2, 3, WALK, 2, 2 ; person
; warp-to
warp_to 2, 7, CINNABAR_LAB_METRONOME_ROOM_WIDTH ; CINNABAR_LAB
--- a/data/maps/objects/CinnabarLabTradeRoom.asm
+++ b/data/maps/objects/CinnabarLabTradeRoom.asm
@@ -8,9 +8,9 @@
db 0 ; signs
db 3 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, 3, 2, STAY, DOWN, 1 ; person
- object SPRITE_OLD_PERSON, 1, 4, STAY, NONE, 2 ; person
- object SPRITE_FOULARD_WOMAN, 5, 5, STAY, UP, 3 ; person
+ object SPRITE_SUPER_NERD, 3, 2, STAY, DOWN, 1 ; person
+ object SPRITE_GRAMPS, 1, 4, STAY, NONE, 2 ; person
+ object SPRITE_BEAUTY, 5, 5, STAY, UP, 3 ; person
; warp-to
warp_to 2, 7, CINNABAR_LAB_TRADE_ROOM_WIDTH ; CINNABAR_LAB
--- a/data/maps/objects/CinnabarMart.asm
+++ b/data/maps/objects/CinnabarMart.asm
@@ -8,9 +8,9 @@
db 0 ; signs
db 3 ; objects
- object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person
+ object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person
object SPRITE_ERIKA, 6, 2, STAY, NONE, 2 ; person
- object SPRITE_OAK_AIDE, 3, 4, STAY, NONE, 3 ; person
+ object SPRITE_SCIENTIST, 3, 4, STAY, NONE, 3 ; person
; warp-to
warp_to 3, 7, CINNABAR_MART_WIDTH
--- a/data/maps/objects/CinnabarPokecenter.asm
+++ b/data/maps/objects/CinnabarPokecenter.asm
@@ -9,9 +9,9 @@
db 4 ; objects
object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
- object SPRITE_LASS, 9, 4, WALK, 0, 2 ; person
+ object SPRITE_COOLTRAINER_F, 9, 4, WALK, 0, 2 ; person
object SPRITE_GENTLEMAN, 2, 6, STAY, NONE, 3 ; person
- object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person
+ object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person
; warp-to
warp_to 3, 7, CINNABAR_POKECENTER_WIDTH
--- a/data/maps/objects/CopycatsHouse1F.asm
+++ b/data/maps/objects/CopycatsHouse1F.asm
@@ -9,9 +9,9 @@
db 0 ; signs
db 3 ; objects
- object SPRITE_MOM_GEISHA, 2, 2, STAY, DOWN, 1 ; person
- object SPRITE_FAT_BALD_GUY, 5, 4, STAY, LEFT, 2 ; person
- object SPRITE_CLEFAIRY, 1, 4, WALK, 1, 3 ; person
+ object SPRITE_MIDDLE_AGED_WOMAN, 2, 2, STAY, DOWN, 1 ; person
+ object SPRITE_MIDDLE_AGED_MAN, 5, 4, STAY, LEFT, 2 ; person
+ object SPRITE_FAIRY, 1, 4, WALK, 1, 3 ; person
; warp-to
warp_to 2, 7, COPYCATS_HOUSE_1F_WIDTH
--- a/data/maps/objects/CopycatsHouse2F.asm
+++ b/data/maps/objects/CopycatsHouse2F.asm
@@ -11,9 +11,9 @@
db 5 ; objects
object SPRITE_BRUNETTE_GIRL, 4, 3, WALK, 0, 1 ; person
object SPRITE_BIRD, 4, 6, WALK, 2, 2 ; person
- object SPRITE_SLOWBRO, 5, 1, STAY, DOWN, 3 ; person
+ object SPRITE_MONSTER, 5, 1, STAY, DOWN, 3 ; person
object SPRITE_BIRD, 2, 0, STAY, DOWN, 4 ; person
- object SPRITE_CLEFAIRY, 1, 6, STAY, RIGHT, 5 ; person
+ object SPRITE_FAIRY, 1, 6, STAY, RIGHT, 5 ; person
; warp-to
warp_to 7, 1, COPYCATS_HOUSE_2F_WIDTH ; COPYCATS_HOUSE_1F
--- a/data/maps/objects/DiglettsCaveRoute2.asm
+++ b/data/maps/objects/DiglettsCaveRoute2.asm
@@ -9,7 +9,7 @@
db 0 ; signs
db 1 ; objects
- object SPRITE_FISHER, 3, 3, STAY, NONE, 1 ; person
+ object SPRITE_FISHING_GURU, 3, 3, STAY, NONE, 1 ; person
; warp-to
warp_to 2, 7, DIGLETTS_CAVE_ROUTE_2_WIDTH
--- a/data/maps/objects/FightingDojo.asm
+++ b/data/maps/objects/FightingDojo.asm
@@ -13,8 +13,8 @@
object SPRITE_HIKER, 3, 6, STAY, RIGHT, 3, OPP_BLACKBELT, 3
object SPRITE_HIKER, 5, 5, STAY, LEFT, 4, OPP_BLACKBELT, 4
object SPRITE_HIKER, 5, 7, STAY, LEFT, 5, OPP_BLACKBELT, 5
- object SPRITE_BALL, 4, 1, STAY, NONE, 6 ; person
- object SPRITE_BALL, 5, 1, STAY, NONE, 7 ; person
+ object SPRITE_POKE_BALL, 4, 1, STAY, NONE, 6 ; person
+ object SPRITE_POKE_BALL, 5, 1, STAY, NONE, 7 ; person
; warp-to
warp_to 4, 11, FIGHTING_DOJO_WIDTH
--- a/data/maps/objects/FuchsiaBillsGrandpasHouse.asm
+++ b/data/maps/objects/FuchsiaBillsGrandpasHouse.asm
@@ -8,9 +8,9 @@
db 0 ; signs
db 3 ; objects
- object SPRITE_MOM_GEISHA, 2, 3, STAY, RIGHT, 1 ; person
+ object SPRITE_MIDDLE_AGED_WOMAN, 2, 3, STAY, RIGHT, 1 ; person
object SPRITE_GAMBLER, 7, 2, STAY, UP, 2 ; person
- object SPRITE_BUG_CATCHER, 5, 5, STAY, NONE, 3 ; person
+ object SPRITE_YOUNGSTER, 5, 5, STAY, NONE, 3 ; person
; warp-to
warp_to 2, 7, FUCHSIA_BILLS_GRANDPAS_HOUSE_WIDTH
--- a/data/maps/objects/FuchsiaCity.asm
+++ b/data/maps/objects/FuchsiaCity.asm
@@ -29,16 +29,16 @@
sign 7, 7, 24 ; FuchsiaCityText24
db 10 ; objects
- object SPRITE_BUG_CATCHER, 10, 12, WALK, 2, 1 ; person
+ object SPRITE_YOUNGSTER, 10, 12, WALK, 2, 1 ; person
object SPRITE_GAMBLER, 28, 17, WALK, 2, 2 ; person
- object SPRITE_FISHER2, 30, 14, STAY, DOWN, 3 ; person
- object SPRITE_BUG_CATCHER, 24, 8, STAY, UP, 4 ; person
- object SPRITE_CLEFAIRY, 31, 5, WALK, 0, 5 ; person
- object SPRITE_BALL, 25, 6, STAY, NONE, 6 ; person
- object SPRITE_SLOWBRO, 12, 6, WALK, 2, 7 ; person
- object SPRITE_SLOWBRO, 30, 12, WALK, 2, 8 ; person
+ object SPRITE_FISHER, 30, 14, STAY, DOWN, 3 ; person
+ object SPRITE_YOUNGSTER, 24, 8, STAY, UP, 4 ; person
+ object SPRITE_FAIRY, 31, 5, WALK, 0, 5 ; person
+ object SPRITE_POKE_BALL, 25, 6, STAY, NONE, 6 ; person
+ object SPRITE_MONSTER, 12, 6, WALK, 2, 7 ; person
+ object SPRITE_MONSTER, 30, 12, WALK, 2, 8 ; person
object SPRITE_SEEL, 8, 17, WALK, 0, 9 ; person
- object SPRITE_OMANYTE, 6, 5, STAY, NONE, 10 ; person
+ object SPRITE_FOSSIL, 6, 5, STAY, NONE, 10 ; person
; warp-to
warp_to 5, 13, FUCHSIA_CITY_WIDTH ; FUCHSIA_MART
--- a/data/maps/objects/FuchsiaGoodRodHouse.asm
+++ b/data/maps/objects/FuchsiaGoodRodHouse.asm
@@ -9,7 +9,7 @@
db 0 ; signs
db 1 ; objects
- object SPRITE_FISHER, 5, 3, STAY, RIGHT, 1 ; person
+ object SPRITE_FISHING_GURU, 5, 3, STAY, RIGHT, 1 ; person
; warp-to
warp_to 2, 0, FUCHSIA_GOOD_ROD_HOUSE_WIDTH
--- a/data/maps/objects/FuchsiaGym.asm
+++ b/data/maps/objects/FuchsiaGym.asm
@@ -8,7 +8,7 @@
db 0 ; signs
db 8 ; objects
- object SPRITE_BLACKBELT, 4, 10, STAY, DOWN, 1, OPP_KOGA, 1
+ object SPRITE_KOGA, 4, 10, STAY, DOWN, 1, OPP_KOGA, 1
object SPRITE_ROCKER, 8, 13, STAY, DOWN, 2, OPP_JUGGLER, 7
object SPRITE_ROCKER, 7, 8, STAY, RIGHT, 3, OPP_JUGGLER, 3
object SPRITE_ROCKER, 1, 12, STAY, DOWN, 4, OPP_JUGGLER, 8
@@ -15,7 +15,7 @@
object SPRITE_ROCKER, 3, 5, STAY, UP, 5, OPP_TAMER, 1
object SPRITE_ROCKER, 8, 2, STAY, DOWN, 6, OPP_TAMER, 2
object SPRITE_ROCKER, 2, 7, STAY, LEFT, 7, OPP_JUGGLER, 4
- object SPRITE_GYM_HELPER, 7, 15, STAY, DOWN, 8 ; person
+ object SPRITE_GYM_GUIDE, 7, 15, STAY, DOWN, 8 ; person
; warp-to
warp_to 4, 17, FUCHSIA_GYM_WIDTH
--- a/data/maps/objects/FuchsiaMart.asm
+++ b/data/maps/objects/FuchsiaMart.asm
@@ -8,9 +8,9 @@
db 0 ; signs
db 3 ; objects
- object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person
- object SPRITE_FAT_BALD_GUY, 4, 2, STAY, NONE, 2 ; person
- object SPRITE_LASS, 6, 5, WALK, 1, 3 ; person
+ object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person
+ object SPRITE_MIDDLE_AGED_MAN, 4, 2, STAY, NONE, 2 ; person
+ object SPRITE_COOLTRAINER_F, 6, 5, WALK, 1, 3 ; person
; warp-to
warp_to 3, 7, FUCHSIA_MART_WIDTH
--- a/data/maps/objects/FuchsiaMeetingRoom.asm
+++ b/data/maps/objects/FuchsiaMeetingRoom.asm
@@ -8,9 +8,9 @@
db 0 ; signs
db 3 ; objects
- object SPRITE_WHITE_PLAYER, 4, 1, STAY, DOWN, 1 ; person
- object SPRITE_WHITE_PLAYER, 0, 2, STAY, UP, 2 ; person
- object SPRITE_WHITE_PLAYER, 10, 1, STAY, DOWN, 3 ; person
+ object SPRITE_SAFARI_ZONE_WORKER, 4, 1, STAY, DOWN, 1 ; person
+ object SPRITE_SAFARI_ZONE_WORKER, 0, 2, STAY, UP, 2 ; person
+ object SPRITE_SAFARI_ZONE_WORKER, 10, 1, STAY, DOWN, 3 ; person
; warp-to
warp_to 4, 7, FUCHSIA_MEETING_ROOM_WIDTH
--- a/data/maps/objects/FuchsiaPokecenter.asm
+++ b/data/maps/objects/FuchsiaPokecenter.asm
@@ -10,8 +10,8 @@
db 4 ; objects
object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
object SPRITE_ROCKER, 2, 3, STAY, NONE, 2 ; person
- object SPRITE_LASS, 6, 5, WALK, 2, 3 ; person
- object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person
+ object SPRITE_COOLTRAINER_F, 6, 5, WALK, 2, 3 ; person
+ object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person
; warp-to
warp_to 3, 7, FUCHSIA_POKECENTER_WIDTH
--- a/data/maps/objects/GameCorner.asm
+++ b/data/maps/objects/GameCorner.asm
@@ -10,15 +10,15 @@
sign 9, 4, 12 ; CeladonGameCornerText12
db 11 ; objects
- object SPRITE_FOULARD_WOMAN, 2, 6, STAY, DOWN, 1 ; person
- object SPRITE_MART_GUY, 5, 6, STAY, DOWN, 2 ; person
- object SPRITE_FAT_BALD_GUY, 2, 10, STAY, LEFT, 3 ; person
- object SPRITE_FOULARD_WOMAN, 2, 13, STAY, LEFT, 4 ; person
- object SPRITE_FISHER, 5, 11, STAY, RIGHT, 5 ; person
- object SPRITE_MOM_GEISHA, 8, 11, STAY, LEFT, 6 ; person
- object SPRITE_GYM_HELPER, 8, 14, STAY, LEFT, 7 ; person
+ object SPRITE_BEAUTY, 2, 6, STAY, DOWN, 1 ; person
+ object SPRITE_CLERK, 5, 6, STAY, DOWN, 2 ; person
+ object SPRITE_MIDDLE_AGED_MAN, 2, 10, STAY, LEFT, 3 ; person
+ object SPRITE_BEAUTY, 2, 13, STAY, LEFT, 4 ; person
+ object SPRITE_FISHING_GURU, 5, 11, STAY, RIGHT, 5 ; person
+ object SPRITE_MIDDLE_AGED_WOMAN, 8, 11, STAY, LEFT, 6 ; person
+ object SPRITE_GYM_GUIDE, 8, 14, STAY, LEFT, 7 ; person
object SPRITE_GAMBLER, 11, 15, STAY, RIGHT, 8 ; person
- object SPRITE_MART_GUY, 14, 11, STAY, LEFT, 9 ; person
+ object SPRITE_CLERK, 14, 11, STAY, LEFT, 9 ; person
object SPRITE_GENTLEMAN, 17, 13, STAY, RIGHT, 10 ; person
object SPRITE_ROCKET, 9, 5, STAY, UP, 11, OPP_ROCKET, 7
--- a/data/maps/objects/IndigoPlateauLobby.asm
+++ b/data/maps/objects/IndigoPlateauLobby.asm
@@ -10,10 +10,10 @@
db 5 ; objects
object SPRITE_NURSE, 7, 5, STAY, DOWN, 1 ; person
- object SPRITE_GYM_HELPER, 4, 9, STAY, RIGHT, 2 ; person
- object SPRITE_LASS, 5, 1, STAY, DOWN, 3 ; person
- object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 4 ; person
- object SPRITE_CABLE_CLUB_WOMAN, 13, 6, STAY, DOWN, 5 ; person
+ object SPRITE_GYM_GUIDE, 4, 9, STAY, RIGHT, 2 ; person
+ object SPRITE_COOLTRAINER_F, 5, 1, STAY, DOWN, 3 ; person
+ object SPRITE_CLERK, 0, 5, STAY, RIGHT, 4 ; person
+ object SPRITE_LINK_RECEPTIONIST, 13, 6, STAY, DOWN, 5 ; person
; warp-to
warp_to 7, 11, INDIGO_PLATEAU_LOBBY_WIDTH
--- a/data/maps/objects/LavenderCuboneHouse.asm
+++ b/data/maps/objects/LavenderCuboneHouse.asm
@@ -8,7 +8,7 @@
db 0 ; signs
db 2 ; objects
- object SPRITE_SLOWBRO, 3, 5, STAY, UP, 1 ; person
+ object SPRITE_MONSTER, 3, 5, STAY, UP, 1 ; person
object SPRITE_BRUNETTE_GIRL, 2, 4, STAY, RIGHT, 2 ; person
; warp-to
--- a/data/maps/objects/LavenderMart.asm
+++ b/data/maps/objects/LavenderMart.asm
@@ -8,9 +8,9 @@
db 0 ; signs
db 3 ; objects
- object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person
+ object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person
object SPRITE_BALDING_GUY, 3, 4, STAY, NONE, 2 ; person
- object SPRITE_BLACK_HAIR_BOY_1, 7, 2, STAY, NONE, 3 ; person
+ object SPRITE_COOLTRAINER_M, 7, 2, STAY, NONE, 3 ; person
; warp-to
warp_to 3, 7, LAVENDER_MART_WIDTH
--- a/data/maps/objects/LavenderPokecenter.asm
+++ b/data/maps/objects/LavenderPokecenter.asm
@@ -11,7 +11,7 @@
object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
object SPRITE_GENTLEMAN, 5, 3, STAY, NONE, 2 ; person
object SPRITE_LITTLE_GIRL, 2, 6, WALK, 1, 3 ; person
- object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person
+ object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person
; warp-to
warp_to 3, 7, LAVENDER_POKECENTER_WIDTH
--- a/data/maps/objects/LavenderTown.asm
+++ b/data/maps/objects/LavenderTown.asm
@@ -19,8 +19,8 @@
db 3 ; objects
object SPRITE_LITTLE_GIRL, 15, 9, WALK, 0, 1 ; person
- object SPRITE_BLACK_HAIR_BOY_1, 9, 10, STAY, NONE, 2 ; person
- object SPRITE_BLACK_HAIR_BOY_2, 8, 7, WALK, 2, 3 ; person
+ object SPRITE_COOLTRAINER_M, 9, 10, STAY, NONE, 2 ; person
+ object SPRITE_SUPER_NERD, 8, 7, WALK, 2, 3 ; person
; warp-to
warp_to 3, 5, LAVENDER_TOWN_WIDTH ; LAVENDER_POKECENTER
--- a/data/maps/objects/MrFujisHouse.asm
+++ b/data/maps/objects/MrFujisHouse.asm
@@ -8,12 +8,12 @@
db 0 ; signs
db 6 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, 3, 5, STAY, NONE, 1 ; person
+ object SPRITE_SUPER_NERD, 3, 5, STAY, NONE, 1 ; person
object SPRITE_LITTLE_GIRL, 6, 3, STAY, DOWN, 2 ; person
- object SPRITE_SLOWBRO, 6, 4, STAY, UP, 3 ; person
- object SPRITE_SLOWBRO, 1, 3, STAY, NONE, 4 ; person
+ object SPRITE_MONSTER, 6, 4, STAY, UP, 3 ; person
+ object SPRITE_MONSTER, 1, 3, STAY, NONE, 4 ; person
object SPRITE_MR_FUJI, 3, 1, STAY, NONE, 5 ; person
- object SPRITE_BOOK_MAP_DEX, 3, 3, STAY, NONE, 6 ; person
+ object SPRITE_POKEDEX, 3, 3, STAY, NONE, 6 ; person
; warp-to
warp_to 2, 7, MR_FUJIS_HOUSE_WIDTH
--- a/data/maps/objects/MrPsychicsHouse.asm
+++ b/data/maps/objects/MrPsychicsHouse.asm
@@ -8,7 +8,7 @@
db 0 ; signs
db 1 ; objects
- object SPRITE_FISHER, 5, 3, STAY, LEFT, 1 ; person
+ object SPRITE_FISHING_GURU, 5, 3, STAY, LEFT, 1 ; person
; warp-to
warp_to 2, 7, MR_PSYCHICS_HOUSE_WIDTH
--- a/data/maps/objects/MtMoon1F.asm
+++ b/data/maps/objects/MtMoon1F.asm
@@ -13,18 +13,18 @@
db 13 ; objects
object SPRITE_HIKER, 5, 6, STAY, DOWN, 1, OPP_HIKER, 1
- object SPRITE_BUG_CATCHER, 12, 16, STAY, RIGHT, 2, OPP_YOUNGSTER, 3
- object SPRITE_LASS, 30, 4, STAY, DOWN, 3, OPP_LASS, 5
- object SPRITE_BLACK_HAIR_BOY_2, 24, 31, STAY, UP, 4, OPP_SUPER_NERD, 1
- object SPRITE_LASS, 16, 23, STAY, DOWN, 5, OPP_LASS, 6
- object SPRITE_BUG_CATCHER, 7, 22, STAY, DOWN, 6, OPP_BUG_CATCHER, 7
- object SPRITE_BUG_CATCHER, 30, 27, STAY, RIGHT, 7, OPP_BUG_CATCHER, 8
- object SPRITE_BALL, 2, 20, STAY, NONE, 8, POTION
- object SPRITE_BALL, 2, 2, STAY, NONE, 9, MOON_STONE
- object SPRITE_BALL, 35, 31, STAY, NONE, 10, RARE_CANDY
- object SPRITE_BALL, 36, 23, STAY, NONE, 11, ESCAPE_ROPE
- object SPRITE_BALL, 20, 33, STAY, NONE, 12, POTION
- object SPRITE_BALL, 5, 32, STAY, NONE, 13, TM_WATER_GUN
+ object SPRITE_YOUNGSTER, 12, 16, STAY, RIGHT, 2, OPP_YOUNGSTER, 3
+ object SPRITE_COOLTRAINER_F, 30, 4, STAY, DOWN, 3, OPP_LASS, 5
+ object SPRITE_SUPER_NERD, 24, 31, STAY, UP, 4, OPP_SUPER_NERD, 1
+ object SPRITE_COOLTRAINER_F, 16, 23, STAY, DOWN, 5, OPP_LASS, 6
+ object SPRITE_YOUNGSTER, 7, 22, STAY, DOWN, 6, OPP_BUG_CATCHER, 7
+ object SPRITE_YOUNGSTER, 30, 27, STAY, RIGHT, 7, OPP_BUG_CATCHER, 8
+ object SPRITE_POKE_BALL, 2, 20, STAY, NONE, 8, POTION
+ object SPRITE_POKE_BALL, 2, 2, STAY, NONE, 9, MOON_STONE
+ object SPRITE_POKE_BALL, 35, 31, STAY, NONE, 10, RARE_CANDY
+ object SPRITE_POKE_BALL, 36, 23, STAY, NONE, 11, ESCAPE_ROPE
+ object SPRITE_POKE_BALL, 20, 33, STAY, NONE, 12, POTION
+ object SPRITE_POKE_BALL, 5, 32, STAY, NONE, 13, TM_WATER_GUN
; warp-to
warp_to 14, 35, MT_MOON_1F_WIDTH
--- a/data/maps/objects/MtMoonB2F.asm
+++ b/data/maps/objects/MtMoonB2F.asm
@@ -10,15 +10,15 @@
db 0 ; signs
db 9 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, 12, 8, STAY, RIGHT, 1, OPP_SUPER_NERD, 2
+ object SPRITE_SUPER_NERD, 12, 8, STAY, RIGHT, 1, OPP_SUPER_NERD, 2
object SPRITE_ROCKET, 11, 16, STAY, DOWN, 2, OPP_ROCKET, 1
object SPRITE_ROCKET, 15, 22, STAY, DOWN, 3, OPP_ROCKET, 2
object SPRITE_ROCKET, 29, 11, STAY, UP, 4, OPP_ROCKET, 3
object SPRITE_ROCKET, 29, 17, STAY, LEFT, 5, OPP_ROCKET, 4
- object SPRITE_OMANYTE, 12, 6, STAY, NONE, 6 ; person
- object SPRITE_OMANYTE, 13, 6, STAY, NONE, 7 ; person
- object SPRITE_BALL, 25, 21, STAY, NONE, 8, HP_UP
- object SPRITE_BALL, 29, 5, STAY, NONE, 9, TM_MEGA_PUNCH
+ object SPRITE_FOSSIL, 12, 6, STAY, NONE, 6 ; person
+ object SPRITE_FOSSIL, 13, 6, STAY, NONE, 7 ; person
+ object SPRITE_POKE_BALL, 25, 21, STAY, NONE, 8, HP_UP
+ object SPRITE_POKE_BALL, 29, 5, STAY, NONE, 9, TM_MEGA_PUNCH
; warp-to
warp_to 25, 9, MT_MOON_B2F_WIDTH ; MT_MOON_B1F
--- a/data/maps/objects/MtMoonPokecenter.asm
+++ b/data/maps/objects/MtMoonPokecenter.asm
@@ -9,11 +9,11 @@
db 6 ; objects
object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
- object SPRITE_BUG_CATCHER, 4, 3, STAY, UP, 2 ; person
+ object SPRITE_YOUNGSTER, 4, 3, STAY, UP, 2 ; person
object SPRITE_GENTLEMAN, 7, 3, STAY, UP, 3 ; person
- object SPRITE_FAT_BALD_GUY, 10, 6, WALK, 2, 4 ; person
+ object SPRITE_MIDDLE_AGED_MAN, 10, 6, WALK, 2, 4 ; person
object SPRITE_CLIPBOARD, 7, 2, STAY, NONE, 5 ; person
- object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 6 ; person
+ object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 6 ; person
; warp-to
warp_to 3, 7, MT_MOON_POKECENTER_WIDTH
--- a/data/maps/objects/Museum1F.asm
+++ b/data/maps/objects/Museum1F.asm
@@ -11,10 +11,10 @@
db 0 ; signs
db 5 ; objects
- object SPRITE_OAK_AIDE, 12, 4, STAY, LEFT, 1 ; person
+ object SPRITE_SCIENTIST, 12, 4, STAY, LEFT, 1 ; person
object SPRITE_GAMBLER, 1, 4, STAY, NONE, 2 ; person
- object SPRITE_OAK_AIDE, 15, 2, STAY, DOWN, 3 ; person
- object SPRITE_OAK_AIDE, 17, 4, STAY, NONE, 4 ; person
+ object SPRITE_SCIENTIST, 15, 2, STAY, DOWN, 3 ; person
+ object SPRITE_SCIENTIST, 17, 4, STAY, NONE, 4 ; person
object SPRITE_OLD_AMBER, 16, 2, STAY, NONE, 5 ; person
; warp-to
--- a/data/maps/objects/Museum2F.asm
+++ b/data/maps/objects/Museum2F.asm
@@ -9,9 +9,9 @@
sign 2, 5, 7 ; Museum2FText7
db 5 ; objects
- object SPRITE_BUG_CATCHER, 1, 7, WALK, 2, 1 ; person
- object SPRITE_OLD_PERSON, 0, 5, STAY, DOWN, 2 ; person
- object SPRITE_OAK_AIDE, 7, 5, STAY, DOWN, 3 ; person
+ object SPRITE_YOUNGSTER, 1, 7, WALK, 2, 1 ; person
+ object SPRITE_GRAMPS, 0, 5, STAY, DOWN, 2 ; person
+ object SPRITE_SCIENTIST, 7, 5, STAY, DOWN, 3 ; person
object SPRITE_BRUNETTE_GIRL, 11, 5, STAY, NONE, 4 ; person
object SPRITE_HIKER, 12, 5, STAY, DOWN, 5 ; person
--- a/data/maps/objects/NameRatersHouse.asm
+++ b/data/maps/objects/NameRatersHouse.asm
@@ -8,7 +8,7 @@
db 0 ; signs
db 1 ; objects
- object SPRITE_MR_MASTERBALL, 5, 3, STAY, LEFT, 1 ; person
+ object SPRITE_SILPH_PRESIDENT, 5, 3, STAY, LEFT, 1 ; person
; warp-to
warp_to 2, 7, NAME_RATERS_HOUSE_WIDTH
--- a/data/maps/objects/OaksLab.asm
+++ b/data/maps/objects/OaksLab.asm
@@ -9,16 +9,16 @@
db 11 ; objects
object SPRITE_BLUE, 4, 3, STAY, NONE, 1, OPP_SONY1, 1
- object SPRITE_BALL, 6, 3, STAY, NONE, 2 ; person
- object SPRITE_BALL, 7, 3, STAY, NONE, 3 ; person
- object SPRITE_BALL, 8, 3, STAY, NONE, 4 ; person
+ object SPRITE_POKE_BALL, 6, 3, STAY, NONE, 2 ; person
+ object SPRITE_POKE_BALL, 7, 3, STAY, NONE, 3 ; person
+ object SPRITE_POKE_BALL, 8, 3, STAY, NONE, 4 ; person
object SPRITE_OAK, 5, 2, STAY, DOWN, 5 ; person
- object SPRITE_BOOK_MAP_DEX, 2, 1, STAY, NONE, 6 ; person
- object SPRITE_BOOK_MAP_DEX, 3, 1, STAY, NONE, 7 ; person
+ object SPRITE_POKEDEX, 2, 1, STAY, NONE, 6 ; person
+ object SPRITE_POKEDEX, 3, 1, STAY, NONE, 7 ; person
object SPRITE_OAK, 5, 10, STAY, UP, 8 ; person
object SPRITE_GIRL, 1, 9, WALK, 1, 9 ; person
- object SPRITE_OAK_AIDE, 2, 10, STAY, NONE, 10 ; person
- object SPRITE_OAK_AIDE, 8, 10, STAY, NONE, 11 ; person
+ object SPRITE_SCIENTIST, 2, 10, STAY, NONE, 10 ; person
+ object SPRITE_SCIENTIST, 8, 10, STAY, NONE, 11 ; person
; warp-to
warp_to 4, 11, OAKS_LAB_WIDTH
--- a/data/maps/objects/PalletTown.asm
+++ b/data/maps/objects/PalletTown.asm
@@ -15,7 +15,7 @@
db 3 ; objects
object SPRITE_OAK, 8, 5, STAY, NONE, 1 ; person
object SPRITE_GIRL, 3, 8, WALK, 0, 2 ; person
- object SPRITE_FISHER2, 11, 14, WALK, 0, 3 ; person
+ object SPRITE_FISHER, 11, 14, WALK, 0, 3 ; person
; warp-to
warp_to 5, 5, PALLET_TOWN_WIDTH ; REDS_HOUSE_1F
--- a/data/maps/objects/PewterCity.asm
+++ b/data/maps/objects/PewterCity.asm
@@ -20,11 +20,11 @@
sign 25, 23, 12 ; PewterCityText12
db 5 ; objects
- object SPRITE_LASS, 8, 15, STAY, NONE, 1 ; person
- object SPRITE_BLACK_HAIR_BOY_1, 17, 25, STAY, NONE, 2 ; person
- object SPRITE_BLACK_HAIR_BOY_2, 27, 17, STAY, NONE, 3 ; person
- object SPRITE_BLACK_HAIR_BOY_2, 26, 25, WALK, 2, 4 ; person
- object SPRITE_BUG_CATCHER, 35, 16, STAY, DOWN, 5 ; person
+ object SPRITE_COOLTRAINER_F, 8, 15, STAY, NONE, 1 ; person
+ object SPRITE_COOLTRAINER_M, 17, 25, STAY, NONE, 2 ; person
+ object SPRITE_SUPER_NERD, 27, 17, STAY, NONE, 3 ; person
+ object SPRITE_SUPER_NERD, 26, 25, WALK, 2, 4 ; person
+ object SPRITE_YOUNGSTER, 35, 16, STAY, DOWN, 5 ; person
; warp-to
warp_to 14, 7, PEWTER_CITY_WIDTH ; MUSEUM_1F
--- a/data/maps/objects/PewterGym.asm
+++ b/data/maps/objects/PewterGym.asm
@@ -8,9 +8,9 @@
db 0 ; signs
db 3 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, 4, 1, STAY, DOWN, 1, OPP_BROCK, 1
- object SPRITE_BLACK_HAIR_BOY_1, 3, 6, STAY, RIGHT, 2, OPP_JR_TRAINER_M, 1
- object SPRITE_GYM_HELPER, 7, 10, STAY, DOWN, 3 ; person
+ object SPRITE_SUPER_NERD, 4, 1, STAY, DOWN, 1, OPP_BROCK, 1
+ object SPRITE_COOLTRAINER_M, 3, 6, STAY, RIGHT, 2, OPP_JR_TRAINER_M, 1
+ object SPRITE_GYM_GUIDE, 7, 10, STAY, DOWN, 3 ; person
; warp-to
warp_to 4, 13, PEWTER_GYM_WIDTH
--- a/data/maps/objects/PewterMart.asm
+++ b/data/maps/objects/PewterMart.asm
@@ -8,9 +8,9 @@
db 0 ; signs
db 3 ; objects
- object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person
- object SPRITE_BUG_CATCHER, 3, 3, WALK, 1, 2 ; person
- object SPRITE_BLACK_HAIR_BOY_2, 5, 5, STAY, NONE, 3 ; person
+ object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person
+ object SPRITE_YOUNGSTER, 3, 3, WALK, 1, 2 ; person
+ object SPRITE_SUPER_NERD, 5, 5, STAY, NONE, 3 ; person
; warp-to
warp_to 3, 7, PEWTER_MART_WIDTH
--- a/data/maps/objects/PewterNidoranHouse.asm
+++ b/data/maps/objects/PewterNidoranHouse.asm
@@ -8,9 +8,9 @@
db 0 ; signs
db 3 ; objects
- object SPRITE_SLOWBRO, 4, 5, STAY, LEFT, 1 ; person
- object SPRITE_YOUNG_BOY, 3, 5, STAY, RIGHT, 2 ; person
- object SPRITE_FAT_BALD_GUY, 1, 2, STAY, NONE, 3 ; person
+ object SPRITE_MONSTER, 4, 5, STAY, LEFT, 1 ; person
+ object SPRITE_LITTLE_BOY, 3, 5, STAY, RIGHT, 2 ; person
+ object SPRITE_MIDDLE_AGED_MAN, 1, 2, STAY, NONE, 3 ; person
; warp-to
warp_to 2, 7, PEWTER_NIDORAN_HOUSE_WIDTH
--- a/data/maps/objects/PewterPokecenter.asm
+++ b/data/maps/objects/PewterPokecenter.asm
@@ -10,8 +10,8 @@
db 4 ; objects
object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
object SPRITE_GENTLEMAN, 11, 7, STAY, LEFT, 2 ; person
- object SPRITE_CLEFAIRY, 1, 3, STAY, DOWN, 3 ; person
- object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person
+ object SPRITE_FAIRY, 1, 3, STAY, DOWN, 3 ; person
+ object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person
; warp-to
warp_to 3, 7, PEWTER_POKECENTER_WIDTH
--- a/data/maps/objects/PewterSpeechHouse.asm
+++ b/data/maps/objects/PewterSpeechHouse.asm
@@ -9,7 +9,7 @@
db 2 ; objects
object SPRITE_GAMBLER, 2, 3, STAY, RIGHT, 1 ; person
- object SPRITE_BUG_CATCHER, 4, 5, STAY, NONE, 2 ; person
+ object SPRITE_YOUNGSTER, 4, 5, STAY, NONE, 2 ; person
; warp-to
warp_to 2, 7, PEWTER_SPEECH_HOUSE_WIDTH
--- a/data/maps/objects/PokemonFanClub.asm
+++ b/data/maps/objects/PokemonFanClub.asm
@@ -10,12 +10,12 @@
sign 6, 0, 8 ; FanClubText8
db 6 ; objects
- object SPRITE_FISHER2, 6, 3, STAY, LEFT, 1 ; person
+ object SPRITE_FISHER, 6, 3, STAY, LEFT, 1 ; person
object SPRITE_GIRL, 1, 3, STAY, RIGHT, 2 ; person
- object SPRITE_CLEFAIRY, 6, 4, STAY, LEFT, 3 ; person
+ object SPRITE_FAIRY, 6, 4, STAY, LEFT, 3 ; person
object SPRITE_SEEL, 1, 4, STAY, RIGHT, 4 ; person
object SPRITE_GENTLEMAN, 3, 1, STAY, DOWN, 5 ; person
- object SPRITE_CABLE_CLUB_WOMAN, 5, 1, STAY, DOWN, 6 ; person
+ object SPRITE_LINK_RECEPTIONIST, 5, 1, STAY, DOWN, 6 ; person
; warp-to
warp_to 2, 7, POKEMON_FAN_CLUB_WIDTH
--- a/data/maps/objects/PokemonMansion1F.asm
+++ b/data/maps/objects/PokemonMansion1F.asm
@@ -14,9 +14,9 @@
db 0 ; signs
db 3 ; objects
- object SPRITE_OAK_AIDE, 17, 17, STAY, LEFT, 1, OPP_SCIENTIST, 4
- object SPRITE_BALL, 14, 3, STAY, NONE, 2, ESCAPE_ROPE
- object SPRITE_BALL, 18, 21, STAY, NONE, 3, CARBOS
+ object SPRITE_SCIENTIST, 17, 17, STAY, LEFT, 1, OPP_SCIENTIST, 4
+ object SPRITE_POKE_BALL, 14, 3, STAY, NONE, 2, ESCAPE_ROPE
+ object SPRITE_POKE_BALL, 18, 21, STAY, NONE, 3, CARBOS
; warp-to
warp_to 4, 27, POKEMON_MANSION_1F_WIDTH
--- a/data/maps/objects/PokemonMansion2F.asm
+++ b/data/maps/objects/PokemonMansion2F.asm
@@ -10,10 +10,10 @@
db 0 ; signs
db 4 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, 3, 17, WALK, 2, 1, OPP_BURGLAR, 7
- object SPRITE_BALL, 28, 7, STAY, NONE, 2, CALCIUM
- object SPRITE_BOOK_MAP_DEX, 18, 2, STAY, NONE, 3 ; person
- object SPRITE_BOOK_MAP_DEX, 3, 22, STAY, NONE, 4 ; person
+ object SPRITE_SUPER_NERD, 3, 17, WALK, 2, 1, OPP_BURGLAR, 7
+ object SPRITE_POKE_BALL, 28, 7, STAY, NONE, 2, CALCIUM
+ object SPRITE_POKEDEX, 18, 2, STAY, NONE, 3 ; person
+ object SPRITE_POKEDEX, 3, 22, STAY, NONE, 4 ; person
; warp-to
warp_to 5, 10, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_1F
--- a/data/maps/objects/PokemonMansion3F.asm
+++ b/data/maps/objects/PokemonMansion3F.asm
@@ -9,11 +9,11 @@
db 0 ; signs
db 5 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, 5, 11, WALK, 2, 1, OPP_BURGLAR, 8
- object SPRITE_OAK_AIDE, 20, 11, STAY, LEFT, 2, OPP_SCIENTIST, 12
- object SPRITE_BALL, 1, 16, STAY, NONE, 3, MAX_POTION
- object SPRITE_BALL, 25, 5, STAY, NONE, 4, IRON
- object SPRITE_BOOK_MAP_DEX, 6, 12, STAY, NONE, 5 ; person
+ object SPRITE_SUPER_NERD, 5, 11, WALK, 2, 1, OPP_BURGLAR, 8
+ object SPRITE_SCIENTIST, 20, 11, STAY, LEFT, 2, OPP_SCIENTIST, 12
+ object SPRITE_POKE_BALL, 1, 16, STAY, NONE, 3, MAX_POTION
+ object SPRITE_POKE_BALL, 25, 5, STAY, NONE, 4, IRON
+ object SPRITE_POKEDEX, 6, 12, STAY, NONE, 5 ; person
; warp-to
warp_to 7, 10, POKEMON_MANSION_3F_WIDTH ; POKEMON_MANSION_2F
--- a/data/maps/objects/PokemonMansionB1F.asm
+++ b/data/maps/objects/PokemonMansionB1F.asm
@@ -7,14 +7,14 @@
db 0 ; signs
db 8 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, 16, 23, STAY, NONE, 1, OPP_BURGLAR, 9
- object SPRITE_OAK_AIDE, 27, 11, STAY, DOWN, 2, OPP_SCIENTIST, 13
- object SPRITE_BALL, 10, 2, STAY, NONE, 3, RARE_CANDY
- object SPRITE_BALL, 1, 22, STAY, NONE, 4, FULL_RESTORE
- object SPRITE_BALL, 19, 25, STAY, NONE, 5, TM_BLIZZARD
- object SPRITE_BALL, 5, 4, STAY, NONE, 6, TM_SOLARBEAM
- object SPRITE_BOOK_MAP_DEX, 16, 20, STAY, NONE, 7 ; person
- object SPRITE_BALL, 5, 13, STAY, NONE, 8, SECRET_KEY
+ object SPRITE_SUPER_NERD, 16, 23, STAY, NONE, 1, OPP_BURGLAR, 9
+ object SPRITE_SCIENTIST, 27, 11, STAY, DOWN, 2, OPP_SCIENTIST, 13
+ object SPRITE_POKE_BALL, 10, 2, STAY, NONE, 3, RARE_CANDY
+ object SPRITE_POKE_BALL, 1, 22, STAY, NONE, 4, FULL_RESTORE
+ object SPRITE_POKE_BALL, 19, 25, STAY, NONE, 5, TM_BLIZZARD
+ object SPRITE_POKE_BALL, 5, 4, STAY, NONE, 6, TM_SOLARBEAM
+ object SPRITE_POKEDEX, 16, 20, STAY, NONE, 7 ; person
+ object SPRITE_POKE_BALL, 5, 13, STAY, NONE, 8, SECRET_KEY
; warp-to
warp_to 23, 22, POKEMON_MANSION_B1F_WIDTH ; POKEMON_MANSION_1F
--- a/data/maps/objects/PokemonTower1F.asm
+++ b/data/maps/objects/PokemonTower1F.asm
@@ -9,11 +9,11 @@
db 0 ; signs
db 5 ; objects
- object SPRITE_CABLE_CLUB_WOMAN, 15, 13, STAY, UP, 1 ; person
- object SPRITE_MOM_GEISHA, 6, 8, STAY, NONE, 2 ; person
+ object SPRITE_LINK_RECEPTIONIST, 15, 13, STAY, UP, 1 ; person
+ object SPRITE_MIDDLE_AGED_WOMAN, 6, 8, STAY, NONE, 2 ; person
object SPRITE_BALDING_GUY, 8, 12, STAY, NONE, 3 ; person
object SPRITE_GIRL, 13, 7, STAY, NONE, 4 ; person
- object SPRITE_MEDIUM, 17, 7, STAY, LEFT, 5 ; person
+ object SPRITE_CHANNELER, 17, 7, STAY, LEFT, 5 ; person
; warp-to
warp_to 10, 17, POKEMON_TOWER_1F_WIDTH
--- a/data/maps/objects/PokemonTower2F.asm
+++ b/data/maps/objects/PokemonTower2F.asm
@@ -9,7 +9,7 @@
db 2 ; objects
object SPRITE_BLUE, 14, 5, STAY, NONE, 1 ; person
- object SPRITE_MEDIUM, 3, 7, STAY, RIGHT, 2 ; person
+ object SPRITE_CHANNELER, 3, 7, STAY, RIGHT, 2 ; person
; warp-to
warp_to 3, 9, POKEMON_TOWER_2F_WIDTH ; POKEMON_TOWER_3F
--- a/data/maps/objects/PokemonTower3F.asm
+++ b/data/maps/objects/PokemonTower3F.asm
@@ -8,10 +8,10 @@
db 0 ; signs
db 4 ; objects
- object SPRITE_MEDIUM, 12, 3, STAY, LEFT, 1, OPP_CHANNELER, 5
- object SPRITE_MEDIUM, 9, 8, STAY, DOWN, 2, OPP_CHANNELER, 6
- object SPRITE_MEDIUM, 10, 13, STAY, DOWN, 3, OPP_CHANNELER, 8
- object SPRITE_BALL, 12, 1, STAY, NONE, 4, ESCAPE_ROPE
+ object SPRITE_CHANNELER, 12, 3, STAY, LEFT, 1, OPP_CHANNELER, 5
+ object SPRITE_CHANNELER, 9, 8, STAY, DOWN, 2, OPP_CHANNELER, 6
+ object SPRITE_CHANNELER, 10, 13, STAY, DOWN, 3, OPP_CHANNELER, 8
+ object SPRITE_POKE_BALL, 12, 1, STAY, NONE, 4, ESCAPE_ROPE
; warp-to
warp_to 3, 9, POKEMON_TOWER_3F_WIDTH ; POKEMON_TOWER_2F
--- a/data/maps/objects/PokemonTower4F.asm
+++ b/data/maps/objects/PokemonTower4F.asm
@@ -8,12 +8,12 @@
db 0 ; signs
db 6 ; objects
- object SPRITE_MEDIUM, 5, 10, STAY, RIGHT, 1, OPP_CHANNELER, 9
- object SPRITE_MEDIUM, 15, 7, STAY, DOWN, 2, OPP_CHANNELER, 10
- object SPRITE_MEDIUM, 14, 12, STAY, LEFT, 3, OPP_CHANNELER, 12
- object SPRITE_BALL, 12, 10, STAY, NONE, 4, ELIXER
- object SPRITE_BALL, 9, 10, STAY, NONE, 5, AWAKENING
- object SPRITE_BALL, 12, 16, STAY, NONE, 6, HP_UP
+ object SPRITE_CHANNELER, 5, 10, STAY, RIGHT, 1, OPP_CHANNELER, 9
+ object SPRITE_CHANNELER, 15, 7, STAY, DOWN, 2, OPP_CHANNELER, 10
+ object SPRITE_CHANNELER, 14, 12, STAY, LEFT, 3, OPP_CHANNELER, 12
+ object SPRITE_POKE_BALL, 12, 10, STAY, NONE, 4, ELIXER
+ object SPRITE_POKE_BALL, 9, 10, STAY, NONE, 5, AWAKENING
+ object SPRITE_POKE_BALL, 12, 16, STAY, NONE, 6, HP_UP
; warp-to
warp_to 3, 9, POKEMON_TOWER_4F_WIDTH ; POKEMON_TOWER_5F
--- a/data/maps/objects/PokemonTower5F.asm
+++ b/data/maps/objects/PokemonTower5F.asm
@@ -8,12 +8,12 @@
db 0 ; signs
db 6 ; objects
- object SPRITE_MEDIUM, 12, 8, STAY, NONE, 1 ; person
- object SPRITE_MEDIUM, 17, 7, STAY, LEFT, 2, OPP_CHANNELER, 14
- object SPRITE_MEDIUM, 14, 3, STAY, LEFT, 3, OPP_CHANNELER, 16
- object SPRITE_MEDIUM, 6, 10, STAY, RIGHT, 4, OPP_CHANNELER, 17
- object SPRITE_MEDIUM, 9, 16, STAY, RIGHT, 5, OPP_CHANNELER, 18
- object SPRITE_BALL, 6, 14, STAY, NONE, 6, NUGGET
+ object SPRITE_CHANNELER, 12, 8, STAY, NONE, 1 ; person
+ object SPRITE_CHANNELER, 17, 7, STAY, LEFT, 2, OPP_CHANNELER, 14
+ object SPRITE_CHANNELER, 14, 3, STAY, LEFT, 3, OPP_CHANNELER, 16
+ object SPRITE_CHANNELER, 6, 10, STAY, RIGHT, 4, OPP_CHANNELER, 17
+ object SPRITE_CHANNELER, 9, 16, STAY, RIGHT, 5, OPP_CHANNELER, 18
+ object SPRITE_POKE_BALL, 6, 14, STAY, NONE, 6, NUGGET
; warp-to
warp_to 3, 9, POKEMON_TOWER_5F_WIDTH ; POKEMON_TOWER_4F
--- a/data/maps/objects/PokemonTower6F.asm
+++ b/data/maps/objects/PokemonTower6F.asm
@@ -8,11 +8,11 @@
db 0 ; signs
db 5 ; objects
- object SPRITE_MEDIUM, 12, 10, STAY, RIGHT, 1, OPP_CHANNELER, 19
- object SPRITE_MEDIUM, 9, 5, STAY, DOWN, 2, OPP_CHANNELER, 20
- object SPRITE_MEDIUM, 16, 5, STAY, LEFT, 3, OPP_CHANNELER, 21
- object SPRITE_BALL, 6, 8, STAY, NONE, 4, RARE_CANDY
- object SPRITE_BALL, 14, 14, STAY, NONE, 5, X_ACCURACY
+ object SPRITE_CHANNELER, 12, 10, STAY, RIGHT, 1, OPP_CHANNELER, 19
+ object SPRITE_CHANNELER, 9, 5, STAY, DOWN, 2, OPP_CHANNELER, 20
+ object SPRITE_CHANNELER, 16, 5, STAY, LEFT, 3, OPP_CHANNELER, 21
+ object SPRITE_POKE_BALL, 6, 8, STAY, NONE, 4, RARE_CANDY
+ object SPRITE_POKE_BALL, 14, 14, STAY, NONE, 5, X_ACCURACY
; warp-to
warp_to 18, 9, POKEMON_TOWER_6F_WIDTH ; POKEMON_TOWER_5F
--- a/data/maps/objects/PowerPlant.asm
+++ b/data/maps/objects/PowerPlant.asm
@@ -9,20 +9,20 @@
db 0 ; signs
db 14 ; objects
- object SPRITE_BALL, 9, 20, STAY, NONE, 1, VOLTORB, 40
- object SPRITE_BALL, 32, 18, STAY, NONE, 2, VOLTORB, 40
- object SPRITE_BALL, 21, 25, STAY, NONE, 3, VOLTORB, 40
- object SPRITE_BALL, 25, 18, STAY, NONE, 4, ELECTRODE, 43
- object SPRITE_BALL, 23, 34, STAY, NONE, 5, VOLTORB, 40
- object SPRITE_BALL, 26, 28, STAY, NONE, 6, VOLTORB, 40
- object SPRITE_BALL, 21, 14, STAY, NONE, 7, ELECTRODE, 43
- object SPRITE_BALL, 37, 32, STAY, NONE, 8, VOLTORB, 40
+ object SPRITE_POKE_BALL, 9, 20, STAY, NONE, 1, VOLTORB, 40
+ object SPRITE_POKE_BALL, 32, 18, STAY, NONE, 2, VOLTORB, 40
+ object SPRITE_POKE_BALL, 21, 25, STAY, NONE, 3, VOLTORB, 40
+ object SPRITE_POKE_BALL, 25, 18, STAY, NONE, 4, ELECTRODE, 43
+ object SPRITE_POKE_BALL, 23, 34, STAY, NONE, 5, VOLTORB, 40
+ object SPRITE_POKE_BALL, 26, 28, STAY, NONE, 6, VOLTORB, 40
+ object SPRITE_POKE_BALL, 21, 14, STAY, NONE, 7, ELECTRODE, 43
+ object SPRITE_POKE_BALL, 37, 32, STAY, NONE, 8, VOLTORB, 40
object SPRITE_BIRD, 4, 9, STAY, UP, 9, ZAPDOS, 50
- object SPRITE_BALL, 7, 25, STAY, NONE, 10, CARBOS
- object SPRITE_BALL, 28, 3, STAY, NONE, 11, HP_UP
- object SPRITE_BALL, 34, 3, STAY, NONE, 12, RARE_CANDY
- object SPRITE_BALL, 26, 32, STAY, NONE, 13, TM_THUNDER
- object SPRITE_BALL, 20, 32, STAY, NONE, 14, TM_REFLECT
+ object SPRITE_POKE_BALL, 7, 25, STAY, NONE, 10, CARBOS
+ object SPRITE_POKE_BALL, 28, 3, STAY, NONE, 11, HP_UP
+ object SPRITE_POKE_BALL, 34, 3, STAY, NONE, 12, RARE_CANDY
+ object SPRITE_POKE_BALL, 26, 32, STAY, NONE, 13, TM_THUNDER
+ object SPRITE_POKE_BALL, 20, 32, STAY, NONE, 14, TM_REFLECT
; warp-to
warp_to 4, 35, POWER_PLANT_WIDTH
--- a/data/maps/objects/RockTunnel1F.asm
+++ b/data/maps/objects/RockTunnel1F.asm
@@ -18,10 +18,10 @@
object SPRITE_HIKER, 7, 5, STAY, DOWN, 1, OPP_HIKER, 12
object SPRITE_HIKER, 5, 16, STAY, DOWN, 2, OPP_HIKER, 13
object SPRITE_HIKER, 17, 15, STAY, LEFT, 3, OPP_HIKER, 14
- object SPRITE_BLACK_HAIR_BOY_2, 23, 8, STAY, LEFT, 4, OPP_POKEMANIAC, 7
- object SPRITE_LASS, 37, 21, STAY, LEFT, 5, OPP_JR_TRAINER_F, 17
- object SPRITE_LASS, 22, 24, STAY, DOWN, 6, OPP_JR_TRAINER_F, 18
- object SPRITE_LASS, 32, 24, STAY, RIGHT, 7, OPP_JR_TRAINER_F, 19
+ object SPRITE_SUPER_NERD, 23, 8, STAY, LEFT, 4, OPP_POKEMANIAC, 7
+ object SPRITE_COOLTRAINER_F, 37, 21, STAY, LEFT, 5, OPP_JR_TRAINER_F, 17
+ object SPRITE_COOLTRAINER_F, 22, 24, STAY, DOWN, 6, OPP_JR_TRAINER_F, 18
+ object SPRITE_COOLTRAINER_F, 32, 24, STAY, RIGHT, 7, OPP_JR_TRAINER_F, 19
; warp-to
warp_to 15, 3, ROCK_TUNNEL_1F_WIDTH
--- a/data/maps/objects/RockTunnelB1F.asm
+++ b/data/maps/objects/RockTunnelB1F.asm
@@ -10,14 +10,14 @@
db 0 ; signs
db 8 ; objects
- object SPRITE_LASS, 11, 13, STAY, DOWN, 1, OPP_JR_TRAINER_F, 9
+ object SPRITE_COOLTRAINER_F, 11, 13, STAY, DOWN, 1, OPP_JR_TRAINER_F, 9
object SPRITE_HIKER, 6, 10, STAY, DOWN, 2, OPP_HIKER, 9
- object SPRITE_BLACK_HAIR_BOY_2, 3, 5, STAY, DOWN, 3, OPP_POKEMANIAC, 3
- object SPRITE_BLACK_HAIR_BOY_2, 20, 21, STAY, RIGHT, 4, OPP_POKEMANIAC, 4
+ object SPRITE_SUPER_NERD, 3, 5, STAY, DOWN, 3, OPP_POKEMANIAC, 3
+ object SPRITE_SUPER_NERD, 20, 21, STAY, RIGHT, 4, OPP_POKEMANIAC, 4
object SPRITE_HIKER, 30, 10, STAY, DOWN, 5, OPP_HIKER, 10
- object SPRITE_LASS, 14, 28, STAY, RIGHT, 6, OPP_JR_TRAINER_F, 10
+ object SPRITE_COOLTRAINER_F, 14, 28, STAY, RIGHT, 6, OPP_JR_TRAINER_F, 10
object SPRITE_HIKER, 33, 5, STAY, RIGHT, 7, OPP_HIKER, 11
- object SPRITE_BLACK_HAIR_BOY_2, 26, 30, STAY, DOWN, 8, OPP_POKEMANIAC, 5
+ object SPRITE_SUPER_NERD, 26, 30, STAY, DOWN, 8, OPP_POKEMANIAC, 5
; warp-to
warp_to 33, 25, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F
--- a/data/maps/objects/RockTunnelPokecenter.asm
+++ b/data/maps/objects/RockTunnelPokecenter.asm
@@ -10,8 +10,8 @@
db 4 ; objects
object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
object SPRITE_GENTLEMAN, 7, 3, WALK, 2, 2 ; person
- object SPRITE_FISHER2, 2, 5, STAY, NONE, 3 ; person
- object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person
+ object SPRITE_FISHER, 2, 5, STAY, NONE, 3 ; person
+ object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person
; warp-to
warp_to 3, 7, ROCK_TUNNEL_POKECENTER_WIDTH
--- a/data/maps/objects/RocketHideoutB1F.asm
+++ b/data/maps/objects/RocketHideoutB1F.asm
@@ -16,8 +16,8 @@
object SPRITE_ROCKET, 18, 17, STAY, DOWN, 3, OPP_ROCKET, 10
object SPRITE_ROCKET, 15, 25, STAY, RIGHT, 4, OPP_ROCKET, 11
object SPRITE_ROCKET, 28, 18, STAY, LEFT, 5, OPP_ROCKET, 12
- object SPRITE_BALL, 11, 14, STAY, NONE, 6, ESCAPE_ROPE
- object SPRITE_BALL, 9, 17, STAY, NONE, 7, HYPER_POTION
+ object SPRITE_POKE_BALL, 11, 14, STAY, NONE, 6, ESCAPE_ROPE
+ object SPRITE_POKE_BALL, 9, 17, STAY, NONE, 7, HYPER_POTION
; warp-to
warp_to 23, 2, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_B2F
--- a/data/maps/objects/RocketHideoutB2F.asm
+++ b/data/maps/objects/RocketHideoutB2F.asm
@@ -12,10 +12,10 @@
db 5 ; objects
object SPRITE_ROCKET, 20, 12, STAY, DOWN, 1, OPP_ROCKET, 13
- object SPRITE_BALL, 1, 11, STAY, NONE, 2, MOON_STONE
- object SPRITE_BALL, 16, 8, STAY, NONE, 3, NUGGET
- object SPRITE_BALL, 6, 12, STAY, NONE, 4, TM_HORN_DRILL
- object SPRITE_BALL, 3, 21, STAY, NONE, 5, SUPER_POTION
+ object SPRITE_POKE_BALL, 1, 11, STAY, NONE, 2, MOON_STONE
+ object SPRITE_POKE_BALL, 16, 8, STAY, NONE, 3, NUGGET
+ object SPRITE_POKE_BALL, 6, 12, STAY, NONE, 4, TM_HORN_DRILL
+ object SPRITE_POKE_BALL, 3, 21, STAY, NONE, 5, SUPER_POTION
; warp-to
warp_to 27, 8, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_B1F
--- a/data/maps/objects/RocketHideoutB3F.asm
+++ b/data/maps/objects/RocketHideoutB3F.asm
@@ -10,8 +10,8 @@
db 4 ; objects
object SPRITE_ROCKET, 10, 22, STAY, RIGHT, 1, OPP_ROCKET, 14
object SPRITE_ROCKET, 26, 12, STAY, UP, 2, OPP_ROCKET, 15
- object SPRITE_BALL, 26, 17, STAY, NONE, 3, TM_DOUBLE_EDGE
- object SPRITE_BALL, 20, 14, STAY, NONE, 4, RARE_CANDY
+ object SPRITE_POKE_BALL, 26, 17, STAY, NONE, 3, TM_DOUBLE_EDGE
+ object SPRITE_POKE_BALL, 20, 14, STAY, NONE, 4, RARE_CANDY
; warp-to
warp_to 25, 6, ROCKET_HIDEOUT_B3F_WIDTH ; ROCKET_HIDEOUT_B2F
--- a/data/maps/objects/RocketHideoutB4F.asm
+++ b/data/maps/objects/RocketHideoutB4F.asm
@@ -13,11 +13,11 @@
object SPRITE_ROCKET, 23, 12, STAY, DOWN, 2, OPP_ROCKET, 16
object SPRITE_ROCKET, 26, 12, STAY, DOWN, 3, OPP_ROCKET, 17
object SPRITE_ROCKET, 11, 2, STAY, DOWN, 4, OPP_ROCKET, 18
- object SPRITE_BALL, 10, 12, STAY, NONE, 5, HP_UP
- object SPRITE_BALL, 9, 4, STAY, NONE, 6, TM_RAZOR_WIND
- object SPRITE_BALL, 12, 20, STAY, NONE, 7, IRON
- object SPRITE_BALL, 25, 2, STAY, NONE, 8, SILPH_SCOPE
- object SPRITE_BALL, 10, 2, STAY, NONE, 9, LIFT_KEY
+ object SPRITE_POKE_BALL, 10, 12, STAY, NONE, 5, HP_UP
+ object SPRITE_POKE_BALL, 9, 4, STAY, NONE, 6, TM_RAZOR_WIND
+ object SPRITE_POKE_BALL, 12, 20, STAY, NONE, 7, IRON
+ object SPRITE_POKE_BALL, 25, 2, STAY, NONE, 8, SILPH_SCOPE
+ object SPRITE_POKE_BALL, 10, 2, STAY, NONE, 9, LIFT_KEY
; warp-to
warp_to 19, 10, ROCKET_HIDEOUT_B4F_WIDTH ; ROCKET_HIDEOUT_B3F
--- a/data/maps/objects/Route1.asm
+++ b/data/maps/objects/Route1.asm
@@ -7,8 +7,8 @@
sign 9, 27, 3 ; Route1Text3
db 2 ; objects
- object SPRITE_BUG_CATCHER, 5, 24, WALK, 1, 1 ; person
- object SPRITE_BUG_CATCHER, 15, 13, WALK, 2, 2 ; person
+ object SPRITE_YOUNGSTER, 5, 24, WALK, 1, 1 ; person
+ object SPRITE_YOUNGSTER, 15, 13, WALK, 2, 2 ; person
; warp-to (unused)
warp_to 2, 7, 4
--- a/data/maps/objects/Route10.asm
+++ b/data/maps/objects/Route10.asm
@@ -14,12 +14,12 @@
sign 5, 41, 10 ; Route10Text10
db 6 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, 10, 44, STAY, LEFT, 1, OPP_POKEMANIAC, 1
+ object SPRITE_SUPER_NERD, 10, 44, STAY, LEFT, 1, OPP_POKEMANIAC, 1
object SPRITE_HIKER, 3, 57, STAY, UP, 2, OPP_HIKER, 7
- object SPRITE_BLACK_HAIR_BOY_2, 14, 64, STAY, LEFT, 3, OPP_POKEMANIAC, 2
- object SPRITE_LASS, 7, 25, STAY, LEFT, 4, OPP_JR_TRAINER_F, 7
+ object SPRITE_SUPER_NERD, 14, 64, STAY, LEFT, 3, OPP_POKEMANIAC, 2
+ object SPRITE_COOLTRAINER_F, 7, 25, STAY, LEFT, 4, OPP_JR_TRAINER_F, 7
object SPRITE_HIKER, 3, 61, STAY, DOWN, 5, OPP_HIKER, 8
- object SPRITE_LASS, 7, 54, STAY, DOWN, 6, OPP_JR_TRAINER_F, 8
+ object SPRITE_COOLTRAINER_F, 7, 54, STAY, DOWN, 6, OPP_JR_TRAINER_F, 8
; warp-to
warp_to 11, 19, ROUTE_10_WIDTH ; ROCK_TUNNEL_POKECENTER
--- a/data/maps/objects/Route11.asm
+++ b/data/maps/objects/Route11.asm
@@ -14,14 +14,14 @@
db 10 ; objects
object SPRITE_GAMBLER, 10, 14, STAY, DOWN, 1, OPP_GAMBLER, 1
object SPRITE_GAMBLER, 26, 9, STAY, DOWN, 2, OPP_GAMBLER, 2
- object SPRITE_BUG_CATCHER, 13, 5, STAY, LEFT, 3, OPP_YOUNGSTER, 9
- object SPRITE_BLACK_HAIR_BOY_2, 36, 11, STAY, DOWN, 4, OPP_ENGINEER, 2
- object SPRITE_BUG_CATCHER, 22, 4, STAY, UP, 5, OPP_YOUNGSTER, 10
+ object SPRITE_YOUNGSTER, 13, 5, STAY, LEFT, 3, OPP_YOUNGSTER, 9
+ object SPRITE_SUPER_NERD, 36, 11, STAY, DOWN, 4, OPP_ENGINEER, 2
+ object SPRITE_YOUNGSTER, 22, 4, STAY, UP, 5, OPP_YOUNGSTER, 10
object SPRITE_GAMBLER, 45, 7, STAY, DOWN, 6, OPP_GAMBLER, 3
object SPRITE_GAMBLER, 33, 3, STAY, UP, 7, OPP_GAMBLER, 4
- object SPRITE_BUG_CATCHER, 43, 5, STAY, RIGHT, 8, OPP_YOUNGSTER, 11
- object SPRITE_BLACK_HAIR_BOY_2, 45, 16, STAY, LEFT, 9, OPP_ENGINEER, 3
- object SPRITE_BUG_CATCHER, 22, 12, STAY, UP, 10, OPP_YOUNGSTER, 12
+ object SPRITE_YOUNGSTER, 43, 5, STAY, RIGHT, 8, OPP_YOUNGSTER, 11
+ object SPRITE_SUPER_NERD, 45, 16, STAY, LEFT, 9, OPP_ENGINEER, 3
+ object SPRITE_YOUNGSTER, 22, 12, STAY, UP, 10, OPP_YOUNGSTER, 12
; warp-to
warp_to 49, 8, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F
--- a/data/maps/objects/Route11Gate2F.asm
+++ b/data/maps/objects/Route11Gate2F.asm
@@ -9,8 +9,8 @@
sign 6, 2, 4 ; Route11GateUpstairsText4
db 2 ; objects
- object SPRITE_BUG_CATCHER, 4, 2, WALK, 2, 1 ; person
- object SPRITE_OAK_AIDE, 2, 6, STAY, NONE, 2 ; person
+ object SPRITE_YOUNGSTER, 4, 2, WALK, 2, 1 ; person
+ object SPRITE_SCIENTIST, 2, 6, STAY, NONE, 2 ; person
; warp-to
warp_to 7, 7, ROUTE_11_GATE_2F_WIDTH ; ROUTE_11_GATE_1F
--- a/data/maps/objects/Route12.asm
+++ b/data/maps/objects/Route12.asm
@@ -13,15 +13,15 @@
db 10 ; objects
object SPRITE_SNORLAX, 10, 62, STAY, DOWN, 1 ; person
- object SPRITE_FISHER2, 14, 31, STAY, LEFT, 2, OPP_FISHER, 3
- object SPRITE_FISHER2, 5, 39, STAY, UP, 3, OPP_FISHER, 4
- object SPRITE_BLACK_HAIR_BOY_1, 11, 92, STAY, LEFT, 4, OPP_JR_TRAINER_M, 9
- object SPRITE_BLACK_HAIR_BOY_2, 14, 76, STAY, UP, 5, OPP_ROCKER, 2
- object SPRITE_FISHER2, 12, 40, STAY, LEFT, 6, OPP_FISHER, 5
- object SPRITE_FISHER2, 9, 52, STAY, RIGHT, 7, OPP_FISHER, 6
- object SPRITE_FISHER2, 6, 87, STAY, DOWN, 8, OPP_FISHER, 11
- object SPRITE_BALL, 14, 35, STAY, NONE, 9, TM_PAY_DAY
- object SPRITE_BALL, 5, 89, STAY, NONE, 10, IRON
+ object SPRITE_FISHER, 14, 31, STAY, LEFT, 2, OPP_FISHER, 3
+ object SPRITE_FISHER, 5, 39, STAY, UP, 3, OPP_FISHER, 4
+ object SPRITE_COOLTRAINER_M, 11, 92, STAY, LEFT, 4, OPP_JR_TRAINER_M, 9
+ object SPRITE_SUPER_NERD, 14, 76, STAY, UP, 5, OPP_ROCKER, 2
+ object SPRITE_FISHER, 12, 40, STAY, LEFT, 6, OPP_FISHER, 5
+ object SPRITE_FISHER, 9, 52, STAY, RIGHT, 7, OPP_FISHER, 6
+ object SPRITE_FISHER, 6, 87, STAY, DOWN, 8, OPP_FISHER, 11
+ object SPRITE_POKE_BALL, 14, 35, STAY, NONE, 9, TM_PAY_DAY
+ object SPRITE_POKE_BALL, 5, 89, STAY, NONE, 10, IRON
; warp-to
warp_to 10, 15, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F
--- a/data/maps/objects/Route12SuperRodHouse.asm
+++ b/data/maps/objects/Route12SuperRodHouse.asm
@@ -8,7 +8,7 @@
db 0 ; signs
db 1 ; objects
- object SPRITE_FISHER, 2, 4, STAY, RIGHT, 1 ; person
+ object SPRITE_FISHING_GURU, 2, 4, STAY, RIGHT, 1 ; person
; warp-to
warp_to 2, 7, ROUTE_12_SUPER_ROD_HOUSE_WIDTH
--- a/data/maps/objects/Route13.asm
+++ b/data/maps/objects/Route13.asm
@@ -9,13 +9,13 @@
sign 31, 11, 13 ; Route13Text13
db 10 ; objects
- object SPRITE_BLACK_HAIR_BOY_1, 49, 10, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 1
- object SPRITE_LASS, 48, 10, STAY, DOWN, 2, OPP_JR_TRAINER_F, 12
- object SPRITE_LASS, 27, 9, STAY, DOWN, 3, OPP_JR_TRAINER_F, 13
- object SPRITE_LASS, 23, 10, STAY, LEFT, 4, OPP_JR_TRAINER_F, 14
- object SPRITE_LASS, 50, 5, STAY, DOWN, 5, OPP_JR_TRAINER_F, 15
- object SPRITE_BLACK_HAIR_BOY_1, 12, 4, STAY, RIGHT, 6, OPP_BIRD_KEEPER, 2
- object SPRITE_FOULARD_WOMAN, 33, 6, STAY, DOWN, 7, OPP_BEAUTY, 4
- object SPRITE_FOULARD_WOMAN, 32, 6, STAY, DOWN, 8, OPP_BEAUTY, 5
+ object SPRITE_COOLTRAINER_M, 49, 10, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 1
+ object SPRITE_COOLTRAINER_F, 48, 10, STAY, DOWN, 2, OPP_JR_TRAINER_F, 12
+ object SPRITE_COOLTRAINER_F, 27, 9, STAY, DOWN, 3, OPP_JR_TRAINER_F, 13
+ object SPRITE_COOLTRAINER_F, 23, 10, STAY, LEFT, 4, OPP_JR_TRAINER_F, 14
+ object SPRITE_COOLTRAINER_F, 50, 5, STAY, DOWN, 5, OPP_JR_TRAINER_F, 15
+ object SPRITE_COOLTRAINER_M, 12, 4, STAY, RIGHT, 6, OPP_BIRD_KEEPER, 2
+ object SPRITE_BEAUTY, 33, 6, STAY, DOWN, 7, OPP_BEAUTY, 4
+ object SPRITE_BEAUTY, 32, 6, STAY, DOWN, 8, OPP_BEAUTY, 5
object SPRITE_BIKER, 10, 7, STAY, UP, 9, OPP_BIKER, 1
- object SPRITE_BLACK_HAIR_BOY_1, 7, 13, STAY, UP, 10, OPP_BIRD_KEEPER, 3
+ object SPRITE_COOLTRAINER_M, 7, 13, STAY, UP, 10, OPP_BIRD_KEEPER, 3
--- a/data/maps/objects/Route14.asm
+++ b/data/maps/objects/Route14.asm
@@ -7,12 +7,12 @@
sign 17, 13, 11 ; Route14Text11
db 10 ; objects
- object SPRITE_BLACK_HAIR_BOY_1, 4, 4, STAY, DOWN, 1, OPP_BIRD_KEEPER, 14
- object SPRITE_BLACK_HAIR_BOY_1, 15, 6, STAY, DOWN, 2, OPP_BIRD_KEEPER, 15
- object SPRITE_BLACK_HAIR_BOY_1, 12, 11, STAY, DOWN, 3, OPP_BIRD_KEEPER, 16
- object SPRITE_BLACK_HAIR_BOY_1, 14, 15, STAY, UP, 4, OPP_BIRD_KEEPER, 17
- object SPRITE_BLACK_HAIR_BOY_1, 15, 31, STAY, LEFT, 5, OPP_BIRD_KEEPER, 4
- object SPRITE_BLACK_HAIR_BOY_1, 6, 49, STAY, UP, 6, OPP_BIRD_KEEPER, 5
+ object SPRITE_COOLTRAINER_M, 4, 4, STAY, DOWN, 1, OPP_BIRD_KEEPER, 14
+ object SPRITE_COOLTRAINER_M, 15, 6, STAY, DOWN, 2, OPP_BIRD_KEEPER, 15
+ object SPRITE_COOLTRAINER_M, 12, 11, STAY, DOWN, 3, OPP_BIRD_KEEPER, 16
+ object SPRITE_COOLTRAINER_M, 14, 15, STAY, UP, 4, OPP_BIRD_KEEPER, 17
+ object SPRITE_COOLTRAINER_M, 15, 31, STAY, LEFT, 5, OPP_BIRD_KEEPER, 4
+ object SPRITE_COOLTRAINER_M, 6, 49, STAY, UP, 6, OPP_BIRD_KEEPER, 5
object SPRITE_BIKER, 5, 39, STAY, DOWN, 7, OPP_BIKER, 13
object SPRITE_BIKER, 4, 30, STAY, RIGHT, 8, OPP_BIKER, 14
object SPRITE_BIKER, 15, 30, STAY, LEFT, 9, OPP_BIKER, 15
--- a/data/maps/objects/Route15.asm
+++ b/data/maps/objects/Route15.asm
@@ -11,17 +11,17 @@
sign 39, 9, 12 ; Route15Text12
db 11 ; objects
- object SPRITE_LASS, 41, 11, STAY, DOWN, 1, OPP_JR_TRAINER_F, 20
- object SPRITE_LASS, 53, 10, STAY, LEFT, 2, OPP_JR_TRAINER_F, 21
- object SPRITE_BLACK_HAIR_BOY_1, 31, 13, STAY, UP, 3, OPP_BIRD_KEEPER, 6
- object SPRITE_BLACK_HAIR_BOY_1, 35, 13, STAY, UP, 4, OPP_BIRD_KEEPER, 7
- object SPRITE_FOULARD_WOMAN, 53, 11, STAY, DOWN, 5, OPP_BEAUTY, 9
- object SPRITE_FOULARD_WOMAN, 41, 10, STAY, RIGHT, 6, OPP_BEAUTY, 10
+ object SPRITE_COOLTRAINER_F, 41, 11, STAY, DOWN, 1, OPP_JR_TRAINER_F, 20
+ object SPRITE_COOLTRAINER_F, 53, 10, STAY, LEFT, 2, OPP_JR_TRAINER_F, 21
+ object SPRITE_COOLTRAINER_M, 31, 13, STAY, UP, 3, OPP_BIRD_KEEPER, 6
+ object SPRITE_COOLTRAINER_M, 35, 13, STAY, UP, 4, OPP_BIRD_KEEPER, 7
+ object SPRITE_BEAUTY, 53, 11, STAY, DOWN, 5, OPP_BEAUTY, 9
+ object SPRITE_BEAUTY, 41, 10, STAY, RIGHT, 6, OPP_BEAUTY, 10
object SPRITE_BIKER, 48, 10, STAY, DOWN, 7, OPP_BIKER, 3
object SPRITE_BIKER, 46, 10, STAY, DOWN, 8, OPP_BIKER, 4
- object SPRITE_LASS, 37, 5, STAY, RIGHT, 9, OPP_JR_TRAINER_F, 22
- object SPRITE_LASS, 18, 13, STAY, UP, 10, OPP_JR_TRAINER_F, 23
- object SPRITE_BALL, 18, 5, STAY, NONE, 11, TM_RAGE
+ object SPRITE_COOLTRAINER_F, 37, 5, STAY, RIGHT, 9, OPP_JR_TRAINER_F, 22
+ object SPRITE_COOLTRAINER_F, 18, 13, STAY, UP, 10, OPP_JR_TRAINER_F, 23
+ object SPRITE_POKE_BALL, 18, 5, STAY, NONE, 11, TM_RAGE
; warp-to
warp_to 7, 8, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F
--- a/data/maps/objects/Route15Gate2F.asm
+++ b/data/maps/objects/Route15Gate2F.asm
@@ -8,7 +8,7 @@
sign 6, 2, 2 ; Route15GateUpstairsText2
db 1 ; objects
- object SPRITE_OAK_AIDE, 4, 2, STAY, DOWN, 1
+ object SPRITE_SCIENTIST, 4, 2, STAY, DOWN, 1
; warp-to
warp_to 7, 7, ROUTE_15_GATE_2F_WIDTH ; ROUTE_15_GATE_1F
--- a/data/maps/objects/Route16Gate2F.asm
+++ b/data/maps/objects/Route16Gate2F.asm
@@ -9,7 +9,7 @@
sign 6, 2, 4 ; Route16GateUpstairsText4
db 2 ; objects
- object SPRITE_YOUNG_BOY, 4, 2, STAY, NONE, 1 ; person
+ object SPRITE_LITTLE_BOY, 4, 2, STAY, NONE, 1 ; person
object SPRITE_LITTLE_GIRL, 2, 5, WALK, 2, 2 ; person
; warp-to
--- a/data/maps/objects/Route18.asm
+++ b/data/maps/objects/Route18.asm
@@ -12,9 +12,9 @@
sign 33, 5, 5 ; Route18Text5
db 3 ; objects
- object SPRITE_BLACK_HAIR_BOY_1, 36, 11, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 8
- object SPRITE_BLACK_HAIR_BOY_1, 40, 15, STAY, LEFT, 2, OPP_BIRD_KEEPER, 9
- object SPRITE_BLACK_HAIR_BOY_1, 42, 13, STAY, LEFT, 3, OPP_BIRD_KEEPER, 10
+ object SPRITE_COOLTRAINER_M, 36, 11, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 8
+ object SPRITE_COOLTRAINER_M, 40, 15, STAY, LEFT, 2, OPP_BIRD_KEEPER, 9
+ object SPRITE_COOLTRAINER_M, 42, 13, STAY, LEFT, 3, OPP_BIRD_KEEPER, 10
; warp-to
warp_to 33, 8, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F
--- a/data/maps/objects/Route18Gate2F.asm
+++ b/data/maps/objects/Route18Gate2F.asm
@@ -9,7 +9,7 @@
sign 6, 2, 3 ; Route18GateUpstairsText3
db 1 ; objects
- object SPRITE_BUG_CATCHER, 4, 2, WALK, 2, 1 ; person
+ object SPRITE_YOUNGSTER, 4, 2, WALK, 2, 1 ; person
; warp-to
warp_to 7, 7, ROUTE_18_GATE_2F_WIDTH ; ROUTE_18_GATE_1F
--- a/data/maps/objects/Route19.asm
+++ b/data/maps/objects/Route19.asm
@@ -7,8 +7,8 @@
sign 11, 9, 11 ; Route19Text11
db 10 ; objects
- object SPRITE_BLACK_HAIR_BOY_1, 8, 7, STAY, LEFT, 1, OPP_SWIMMER, 2
- object SPRITE_BLACK_HAIR_BOY_1, 13, 7, STAY, LEFT, 2, OPP_SWIMMER, 3
+ object SPRITE_COOLTRAINER_M, 8, 7, STAY, LEFT, 1, OPP_SWIMMER, 2
+ object SPRITE_COOLTRAINER_M, 13, 7, STAY, LEFT, 2, OPP_SWIMMER, 3
object SPRITE_SWIMMER, 13, 25, STAY, LEFT, 3, OPP_SWIMMER, 4
object SPRITE_SWIMMER, 4, 27, STAY, RIGHT, 4, OPP_SWIMMER, 5
object SPRITE_SWIMMER, 16, 31, STAY, UP, 5, OPP_SWIMMER, 6
--- a/data/maps/objects/Route2.asm
+++ b/data/maps/objects/Route2.asm
@@ -14,8 +14,8 @@
sign 11, 11, 4 ; Route2Text4
db 2 ; objects
- object SPRITE_BALL, 13, 54, STAY, NONE, 1, MOON_STONE
- object SPRITE_BALL, 13, 45, STAY, NONE, 2, HP_UP
+ object SPRITE_POKE_BALL, 13, 54, STAY, NONE, 1, MOON_STONE
+ object SPRITE_POKE_BALL, 13, 45, STAY, NONE, 2, HP_UP
; warp-to
warp_to 12, 9, ROUTE_2_WIDTH ; DIGLETTS_CAVE_ROUTE_2
--- a/data/maps/objects/Route20.asm
+++ b/data/maps/objects/Route20.asm
@@ -16,7 +16,7 @@
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
--- a/data/maps/objects/Route21.asm
+++ b/data/maps/objects/Route21.asm
@@ -6,12 +6,12 @@
db 0 ; signs
db 9 ; objects
- object SPRITE_FISHER2, 4, 24, STAY, LEFT, 1, OPP_FISHER, 7
- object SPRITE_FISHER2, 6, 25, STAY, DOWN, 2, OPP_FISHER, 9
+ object SPRITE_FISHER, 4, 24, STAY, LEFT, 1, OPP_FISHER, 7
+ object SPRITE_FISHER, 6, 25, STAY, DOWN, 2, OPP_FISHER, 9
object SPRITE_SWIMMER, 10, 31, STAY, UP, 3, OPP_SWIMMER, 12
object SPRITE_SWIMMER, 12, 30, STAY, RIGHT, 4, OPP_CUE_BALL, 9
object SPRITE_SWIMMER, 16, 63, STAY, DOWN, 5, OPP_SWIMMER, 13
object SPRITE_SWIMMER, 5, 71, STAY, RIGHT, 6, OPP_SWIMMER, 14
object SPRITE_SWIMMER, 15, 71, STAY, LEFT, 7, OPP_SWIMMER, 15
- object SPRITE_FISHER2, 14, 56, STAY, LEFT, 8, OPP_FISHER, 8
- object SPRITE_FISHER2, 17, 57, STAY, RIGHT, 9, OPP_FISHER, 10
+ object SPRITE_FISHER, 14, 56, STAY, LEFT, 8, OPP_FISHER, 8
+ object SPRITE_FISHER, 17, 57, STAY, RIGHT, 9, OPP_FISHER, 10
--- a/data/maps/objects/Route24.asm
+++ b/data/maps/objects/Route24.asm
@@ -6,11 +6,11 @@
db 0 ; signs
db 8 ; objects
- object SPRITE_BLACK_HAIR_BOY_1, 11, 15, STAY, LEFT, 1, OPP_ROCKET, 6
- object SPRITE_BLACK_HAIR_BOY_1, 5, 20, STAY, UP, 2, OPP_JR_TRAINER_M, 2
- object SPRITE_BLACK_HAIR_BOY_1, 11, 19, STAY, LEFT, 3, OPP_JR_TRAINER_M, 3
- object SPRITE_LASS, 10, 22, STAY, RIGHT, 4, OPP_LASS, 7
- object SPRITE_BUG_CATCHER, 11, 25, STAY, LEFT, 5, OPP_YOUNGSTER, 4
- object SPRITE_LASS, 10, 28, STAY, RIGHT, 6, OPP_LASS, 8
- object SPRITE_BUG_CATCHER, 11, 31, STAY, LEFT, 7, OPP_BUG_CATCHER, 9
- object SPRITE_BALL, 10, 5, STAY, NONE, 8, TM_THUNDER_WAVE
+ object SPRITE_COOLTRAINER_M, 11, 15, STAY, LEFT, 1, OPP_ROCKET, 6
+ object SPRITE_COOLTRAINER_M, 5, 20, STAY, UP, 2, OPP_JR_TRAINER_M, 2
+ object SPRITE_COOLTRAINER_M, 11, 19, STAY, LEFT, 3, OPP_JR_TRAINER_M, 3
+ object SPRITE_COOLTRAINER_F, 10, 22, STAY, RIGHT, 4, OPP_LASS, 7
+ object SPRITE_YOUNGSTER, 11, 25, STAY, LEFT, 5, OPP_YOUNGSTER, 4
+ object SPRITE_COOLTRAINER_F, 10, 28, STAY, RIGHT, 6, OPP_LASS, 8
+ object SPRITE_YOUNGSTER, 11, 31, STAY, LEFT, 7, OPP_BUG_CATCHER, 9
+ object SPRITE_POKE_BALL, 10, 5, STAY, NONE, 8, TM_THUNDER_WAVE
--- a/data/maps/objects/Route25.asm
+++ b/data/maps/objects/Route25.asm
@@ -8,16 +8,16 @@
sign 43, 3, 11 ; Route25Text11
db 10 ; objects
- object SPRITE_BUG_CATCHER, 14, 2, STAY, DOWN, 1, OPP_YOUNGSTER, 5
- object SPRITE_BUG_CATCHER, 18, 5, STAY, UP, 2, OPP_YOUNGSTER, 6
- object SPRITE_BLACK_HAIR_BOY_1, 24, 4, STAY, DOWN, 3, OPP_JR_TRAINER_M, 2
- object SPRITE_LASS, 18, 8, STAY, RIGHT, 4, OPP_LASS, 9
- object SPRITE_BUG_CATCHER, 32, 3, STAY, LEFT, 5, OPP_YOUNGSTER, 7
- object SPRITE_LASS, 37, 4, STAY, DOWN, 6, OPP_LASS, 10
+ object SPRITE_YOUNGSTER, 14, 2, STAY, DOWN, 1, OPP_YOUNGSTER, 5
+ object SPRITE_YOUNGSTER, 18, 5, STAY, UP, 2, OPP_YOUNGSTER, 6
+ object SPRITE_COOLTRAINER_M, 24, 4, STAY, DOWN, 3, OPP_JR_TRAINER_M, 2
+ object SPRITE_COOLTRAINER_F, 18, 8, STAY, RIGHT, 4, OPP_LASS, 9
+ object SPRITE_YOUNGSTER, 32, 3, STAY, LEFT, 5, OPP_YOUNGSTER, 7
+ object SPRITE_COOLTRAINER_F, 37, 4, STAY, DOWN, 6, OPP_LASS, 10
object SPRITE_HIKER, 8, 4, STAY, RIGHT, 7, OPP_HIKER, 2
object SPRITE_HIKER, 23, 9, STAY, UP, 8, OPP_HIKER, 3
object SPRITE_HIKER, 13, 7, STAY, RIGHT, 9, OPP_HIKER, 4
- object SPRITE_BALL, 22, 2, STAY, NONE, 10, TM_SEISMIC_TOSS
+ object SPRITE_POKE_BALL, 22, 2, STAY, NONE, 10, TM_SEISMIC_TOSS
; warp-to
warp_to 45, 3, ROUTE_25_WIDTH ; BILLS_HOUSE
--- a/data/maps/objects/Route2Gate.asm
+++ b/data/maps/objects/Route2Gate.asm
@@ -10,8 +10,8 @@
db 0 ; signs
db 2 ; objects
- object SPRITE_OAK_AIDE, 1, 4, STAY, LEFT, 1 ; person
- object SPRITE_BUG_CATCHER, 5, 4, WALK, 2, 2 ; person
+ object SPRITE_SCIENTIST, 1, 4, STAY, LEFT, 1 ; person
+ object SPRITE_YOUNGSTER, 5, 4, WALK, 2, 2 ; person
; warp-to
warp_to 4, 0, ROUTE_2_GATE_WIDTH
--- a/data/maps/objects/Route2TradeHouse.asm
+++ b/data/maps/objects/Route2TradeHouse.asm
@@ -8,8 +8,8 @@
db 0 ; signs
db 2 ; objects
- object SPRITE_OAK_AIDE, 2, 4, STAY, RIGHT, 1 ; person
- object SPRITE_GAMEBOY_KID_COPY, 4, 1, STAY, DOWN, 2 ; person
+ object SPRITE_SCIENTIST, 2, 4, STAY, RIGHT, 1 ; person
+ object SPRITE_GAMEBOY_KID, 4, 1, STAY, DOWN, 2 ; person
; warp-to
warp_to 2, 7, ROUTE_2_TRADE_HOUSE_WIDTH
--- a/data/maps/objects/Route3.asm
+++ b/data/maps/objects/Route3.asm
@@ -7,12 +7,12 @@
sign 59, 9, 10 ; Route3Text10
db 9 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, 57, 11, STAY, NONE, 1 ; person
- object SPRITE_BUG_CATCHER, 10, 6, STAY, RIGHT, 2, OPP_BUG_CATCHER, 4
- object SPRITE_BUG_CATCHER, 14, 4, STAY, DOWN, 3, OPP_YOUNGSTER, 1
- object SPRITE_LASS, 16, 9, STAY, LEFT, 4, OPP_LASS, 1
- object SPRITE_BUG_CATCHER, 19, 5, STAY, DOWN, 5, OPP_BUG_CATCHER, 5
- object SPRITE_LASS, 23, 4, STAY, LEFT, 6, OPP_LASS, 2
- object SPRITE_BUG_CATCHER, 22, 9, STAY, LEFT, 7, OPP_YOUNGSTER, 2
- object SPRITE_BUG_CATCHER, 24, 6, STAY, RIGHT, 8, OPP_BUG_CATCHER, 6
- object SPRITE_LASS, 33, 10, STAY, UP, 9, OPP_LASS, 3
+ object SPRITE_SUPER_NERD, 57, 11, STAY, NONE, 1 ; person
+ object SPRITE_YOUNGSTER, 10, 6, STAY, RIGHT, 2, OPP_BUG_CATCHER, 4
+ object SPRITE_YOUNGSTER, 14, 4, STAY, DOWN, 3, OPP_YOUNGSTER, 1
+ object SPRITE_COOLTRAINER_F, 16, 9, STAY, LEFT, 4, OPP_LASS, 1
+ object SPRITE_YOUNGSTER, 19, 5, STAY, DOWN, 5, OPP_BUG_CATCHER, 5
+ object SPRITE_COOLTRAINER_F, 23, 4, STAY, LEFT, 6, OPP_LASS, 2
+ object SPRITE_YOUNGSTER, 22, 9, STAY, LEFT, 7, OPP_YOUNGSTER, 2
+ object SPRITE_YOUNGSTER, 24, 6, STAY, RIGHT, 8, OPP_BUG_CATCHER, 6
+ object SPRITE_COOLTRAINER_F, 33, 10, STAY, UP, 9, OPP_LASS, 3
--- a/data/maps/objects/Route4.asm
+++ b/data/maps/objects/Route4.asm
@@ -12,9 +12,9 @@
sign 27, 7, 6 ; Route4Text6
db 3 ; objects
- object SPRITE_LASS, 9, 8, WALK, 0, 1 ; person
- object SPRITE_LASS, 63, 3, STAY, RIGHT, 2, OPP_LASS, 4
- object SPRITE_BALL, 57, 3, STAY, NONE, 3, TM_WHIRLWIND
+ object SPRITE_COOLTRAINER_F, 9, 8, WALK, 0, 1 ; person
+ object SPRITE_COOLTRAINER_F, 63, 3, STAY, RIGHT, 2, OPP_LASS, 4
+ object SPRITE_POKE_BALL, 57, 3, STAY, NONE, 3, TM_WHIRLWIND
; warp-to
warp_to 11, 5, ROUTE_4_WIDTH ; MT_MOON_POKECENTER
--- a/data/maps/objects/Route6.asm
+++ b/data/maps/objects/Route6.asm
@@ -11,12 +11,12 @@
sign 19, 15, 7 ; Route6Text7
db 6 ; objects
- object SPRITE_BLACK_HAIR_BOY_1, 10, 21, STAY, RIGHT, 1, OPP_JR_TRAINER_M, 4
- object SPRITE_LASS, 11, 21, STAY, LEFT, 2, OPP_JR_TRAINER_F, 2
- object SPRITE_BUG_CATCHER, 0, 15, STAY, RIGHT, 3, OPP_BUG_CATCHER, 10
- object SPRITE_BLACK_HAIR_BOY_1, 11, 31, STAY, LEFT, 4, OPP_JR_TRAINER_M, 5
- object SPRITE_LASS, 11, 30, STAY, LEFT, 5, OPP_JR_TRAINER_F, 3
- object SPRITE_BUG_CATCHER, 19, 26, STAY, LEFT, 6, OPP_BUG_CATCHER, 11
+ object SPRITE_COOLTRAINER_M, 10, 21, STAY, RIGHT, 1, OPP_JR_TRAINER_M, 4
+ object SPRITE_COOLTRAINER_F, 11, 21, STAY, LEFT, 2, OPP_JR_TRAINER_F, 2
+ object SPRITE_YOUNGSTER, 0, 15, STAY, RIGHT, 3, OPP_BUG_CATCHER, 10
+ object SPRITE_COOLTRAINER_M, 11, 31, STAY, LEFT, 4, OPP_JR_TRAINER_M, 5
+ object SPRITE_COOLTRAINER_F, 11, 30, STAY, LEFT, 5, OPP_JR_TRAINER_F, 3
+ object SPRITE_YOUNGSTER, 19, 26, STAY, LEFT, 6, OPP_BUG_CATCHER, 11
; warp-to
warp_to 9, 1, ROUTE_6_WIDTH ; ROUTE_6_GATE
--- a/data/maps/objects/Route8.asm
+++ b/data/maps/objects/Route8.asm
@@ -12,15 +12,15 @@
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
--- a/data/maps/objects/Route9.asm
+++ b/data/maps/objects/Route9.asm
@@ -7,13 +7,13 @@
sign 25, 7, 11 ; Route9Text11
db 10 ; objects
- object SPRITE_LASS, 13, 10, STAY, LEFT, 1, OPP_JR_TRAINER_F, 5
- object SPRITE_BLACK_HAIR_BOY_1, 24, 7, STAY, LEFT, 2, OPP_JR_TRAINER_M, 7
- object SPRITE_BLACK_HAIR_BOY_1, 31, 7, STAY, RIGHT, 3, OPP_JR_TRAINER_M, 8
- object SPRITE_LASS, 48, 8, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 6
+ object SPRITE_COOLTRAINER_F, 13, 10, STAY, LEFT, 1, OPP_JR_TRAINER_F, 5
+ object SPRITE_COOLTRAINER_M, 24, 7, STAY, LEFT, 2, OPP_JR_TRAINER_M, 7
+ object SPRITE_COOLTRAINER_M, 31, 7, STAY, RIGHT, 3, OPP_JR_TRAINER_M, 8
+ object SPRITE_COOLTRAINER_F, 48, 8, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 6
object SPRITE_HIKER, 16, 15, STAY, LEFT, 5, OPP_HIKER, 11
object SPRITE_HIKER, 43, 3, STAY, LEFT, 6, OPP_HIKER, 6
- object SPRITE_BUG_CATCHER, 22, 2, STAY, DOWN, 7, OPP_BUG_CATCHER, 13
+ object SPRITE_YOUNGSTER, 22, 2, STAY, DOWN, 7, OPP_BUG_CATCHER, 13
object SPRITE_HIKER, 45, 15, STAY, RIGHT, 8, OPP_HIKER, 5
- object SPRITE_BUG_CATCHER, 40, 8, STAY, RIGHT, 9, OPP_BUG_CATCHER, 14
- object SPRITE_BALL, 10, 15, STAY, NONE, 10, TM_TELEPORT
+ object SPRITE_YOUNGSTER, 40, 8, STAY, RIGHT, 9, OPP_BUG_CATCHER, 14
+ object SPRITE_POKE_BALL, 10, 15, STAY, NONE, 10, TM_TELEPORT
--- a/data/maps/objects/SSAnne1FRooms.asm
+++ b/data/maps/objects/SSAnne1FRooms.asm
@@ -14,14 +14,14 @@
db 11 ; objects
object SPRITE_GENTLEMAN, 2, 3, STAY, LEFT, 1, OPP_GENTLEMAN, 1
object SPRITE_GENTLEMAN, 11, 4, STAY, UP, 2, OPP_GENTLEMAN, 2
- object SPRITE_BUG_CATCHER, 11, 14, STAY, UP, 3, OPP_YOUNGSTER, 8
- object SPRITE_LASS, 13, 11, STAY, LEFT, 4, OPP_LASS, 11
+ object SPRITE_YOUNGSTER, 11, 14, STAY, UP, 3, OPP_YOUNGSTER, 8
+ object SPRITE_COOLTRAINER_F, 13, 11, STAY, LEFT, 4, OPP_LASS, 11
object SPRITE_GIRL, 22, 3, WALK, 1, 5 ; person
- object SPRITE_FAT_BALD_GUY, 0, 14, STAY, NONE, 6 ; person
+ object SPRITE_MIDDLE_AGED_MAN, 0, 14, STAY, NONE, 6 ; person
object SPRITE_LITTLE_GIRL, 2, 11, STAY, DOWN, 7 ; person
- object SPRITE_CLEFAIRY, 3, 11, STAY, DOWN, 8 ; person
+ object SPRITE_FAIRY, 3, 11, STAY, DOWN, 8 ; person
object SPRITE_GIRL, 10, 13, STAY, RIGHT, 9 ; person
- object SPRITE_BALL, 12, 15, STAY, NONE, 10, TM_BODY_SLAM
+ object SPRITE_POKE_BALL, 12, 15, STAY, NONE, 10, TM_BODY_SLAM
object SPRITE_GENTLEMAN, 21, 13, WALK, 2, 11 ; person
; warp-to
--- a/data/maps/objects/SSAnne2FRooms.asm
+++ b/data/maps/objects/SSAnne2FRooms.asm
@@ -19,18 +19,18 @@
db 13 ; objects
object SPRITE_GENTLEMAN, 10, 2, STAY, RIGHT, 1, OPP_GENTLEMAN, 3
- object SPRITE_FISHER2, 13, 4, STAY, LEFT, 2, OPP_FISHER, 1
+ object SPRITE_FISHER, 13, 4, STAY, LEFT, 2, OPP_FISHER, 1
object SPRITE_GENTLEMAN, 0, 14, STAY, RIGHT, 3, OPP_GENTLEMAN, 5
- object SPRITE_LASS, 2, 11, STAY, DOWN, 4, OPP_LASS, 12
+ object SPRITE_COOLTRAINER_F, 2, 11, STAY, DOWN, 4, OPP_LASS, 12
object SPRITE_GENTLEMAN, 1, 2, STAY, DOWN, 5 ; person
- object SPRITE_BALL, 12, 1, STAY, NONE, 6, MAX_ETHER
+ object SPRITE_POKE_BALL, 12, 1, STAY, NONE, 6, MAX_ETHER
object SPRITE_GENTLEMAN, 21, 2, STAY, DOWN, 7 ; person
- object SPRITE_OLD_PERSON, 22, 1, STAY, DOWN, 8 ; person
- object SPRITE_BALL, 0, 12, STAY, NONE, 9, RARE_CANDY
+ object SPRITE_GRAMPS, 22, 1, STAY, DOWN, 8 ; person
+ object SPRITE_POKE_BALL, 0, 12, STAY, NONE, 9, RARE_CANDY
object SPRITE_GENTLEMAN, 12, 12, STAY, DOWN, 10 ; person
- object SPRITE_YOUNG_BOY, 11, 14, STAY, NONE, 11 ; person
+ object SPRITE_LITTLE_BOY, 11, 14, STAY, NONE, 11 ; person
object SPRITE_BRUNETTE_GIRL, 22, 12, STAY, LEFT, 12 ; person
- object SPRITE_FOULARD_WOMAN, 20, 12, STAY, RIGHT, 13 ; person
+ object SPRITE_BEAUTY, 20, 12, STAY, RIGHT, 13 ; person
; warp-to
warp_to 2, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
--- a/data/maps/objects/SSAnneB1FRooms.asm
+++ b/data/maps/objects/SSAnneB1FRooms.asm
@@ -21,12 +21,12 @@
object SPRITE_SAILOR, 12, 3, STAY, LEFT, 3, OPP_SAILOR, 5
object SPRITE_SAILOR, 22, 2, STAY, DOWN, 4, OPP_SAILOR, 6
object SPRITE_SAILOR, 0, 2, STAY, RIGHT, 5, OPP_SAILOR, 7
- object SPRITE_FISHER2, 0, 4, STAY, RIGHT, 6, OPP_FISHER, 2
- object SPRITE_BLACK_HAIR_BOY_2, 10, 13, STAY, RIGHT, 7 ; person
- object SPRITE_SLOWBRO, 11, 12, STAY, NONE, 8 ; person
- object SPRITE_BALL, 20, 2, STAY, NONE, 9, ETHER
- object SPRITE_BALL, 10, 2, STAY, NONE, 10, TM_REST
- object SPRITE_BALL, 12, 11, STAY, NONE, 11, MAX_POTION
+ object SPRITE_FISHER, 0, 4, STAY, RIGHT, 6, OPP_FISHER, 2
+ object SPRITE_SUPER_NERD, 10, 13, STAY, RIGHT, 7 ; person
+ object SPRITE_MONSTER, 11, 12, STAY, NONE, 8 ; person
+ object SPRITE_POKE_BALL, 20, 2, STAY, NONE, 9, ETHER
+ object SPRITE_POKE_BALL, 10, 2, STAY, NONE, 10, TM_REST
+ object SPRITE_POKE_BALL, 12, 11, STAY, NONE, 11, MAX_POTION
; warp-to
warp_to 2, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
--- a/data/maps/objects/SSAnneBow.asm
+++ b/data/maps/objects/SSAnneBow.asm
@@ -8,9 +8,9 @@
db 0 ; signs
db 5 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, 5, 2, STAY, UP, 1 ; person
+ object SPRITE_SUPER_NERD, 5, 2, STAY, UP, 1 ; person
object SPRITE_SAILOR, 4, 9, STAY, NONE, 2 ; person
- object SPRITE_BLACK_HAIR_BOY_1, 7, 11, STAY, NONE, 3 ; person
+ object SPRITE_COOLTRAINER_M, 7, 11, STAY, NONE, 3 ; person
object SPRITE_SAILOR, 4, 4, STAY, DOWN, 4, OPP_SAILOR, 1
object SPRITE_SAILOR, 10, 8, STAY, UP, 5, OPP_SAILOR, 2
--- a/data/maps/objects/SSAnneCaptainsRoom.asm
+++ b/data/maps/objects/SSAnneCaptainsRoom.asm
@@ -9,7 +9,7 @@
sign 1, 2, 3 ; SSAnne7Text3
db 1 ; objects
- object SPRITE_SS_CAPTAIN, 4, 2, STAY, UP, 1 ; person
+ object SPRITE_CAPTAIN, 4, 2, STAY, UP, 1 ; person
; warp-to
warp_to 0, 7, SS_ANNE_CAPTAINS_ROOM_WIDTH ; SS_ANNE_2F
--- a/data/maps/objects/SafariZoneCenter.asm
+++ b/data/maps/objects/SafariZoneCenter.asm
@@ -17,7 +17,7 @@
sign 14, 22, 3 ; SafariZoneCenterText3
db 1 ; objects
- object SPRITE_BALL, 14, 10, STAY, NONE, 1, NUGGET
+ object SPRITE_POKE_BALL, 14, 10, STAY, NONE, 1, NUGGET
; warp-to
warp_to 14, 25, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_GATE
--- a/data/maps/objects/SafariZoneCenterRestHouse.asm
+++ b/data/maps/objects/SafariZoneCenterRestHouse.asm
@@ -9,7 +9,7 @@
db 2 ; objects
object SPRITE_GIRL, 3, 2, STAY, DOWN, 1 ; person
- object SPRITE_OAK_AIDE, 1, 4, WALK, 1, 2 ; person
+ object SPRITE_SCIENTIST, 1, 4, WALK, 1, 2 ; person
; warp-to
warp_to 2, 7, SAFARI_ZONE_CENTER_REST_HOUSE_WIDTH ; SAFARI_ZONE_CENTER
--- a/data/maps/objects/SafariZoneEast.asm
+++ b/data/maps/objects/SafariZoneEast.asm
@@ -14,10 +14,10 @@
sign 5, 23, 7 ; SafariZoneEastText7
db 4 ; objects
- object SPRITE_BALL, 21, 10, STAY, NONE, 1, FULL_RESTORE
- object SPRITE_BALL, 3, 7, STAY, NONE, 2, MAX_POTION
- object SPRITE_BALL, 20, 13, STAY, NONE, 3, CARBOS
- object SPRITE_BALL, 15, 12, STAY, NONE, 4, TM_EGG_BOMB
+ object SPRITE_POKE_BALL, 21, 10, STAY, NONE, 1, FULL_RESTORE
+ object SPRITE_POKE_BALL, 3, 7, STAY, NONE, 2, MAX_POTION
+ object SPRITE_POKE_BALL, 20, 13, STAY, NONE, 3, CARBOS
+ object SPRITE_POKE_BALL, 15, 12, STAY, NONE, 4, TM_EGG_BOMB
; warp-to
warp_to 0, 4, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_NORTH
--- a/data/maps/objects/SafariZoneEastRestHouse.asm
+++ b/data/maps/objects/SafariZoneEastRestHouse.asm
@@ -8,9 +8,9 @@
db 0 ; signs
db 3 ; objects
- object SPRITE_OAK_AIDE, 1, 3, WALK, 1, 1 ; person
+ object SPRITE_SCIENTIST, 1, 3, WALK, 1, 1 ; person
object SPRITE_ROCKER, 4, 2, STAY, NONE, 2 ; person
- object SPRITE_LAPRAS_GIVER, 5, 2, STAY, NONE, 3 ; person
+ object SPRITE_SILPH_WORKER, 5, 2, STAY, NONE, 3 ; person
; warp-to
warp_to 2, 7, SAFARI_ZONE_EAST_REST_HOUSE_WIDTH ; SAFARI_ZONE_EAST
--- a/data/maps/objects/SafariZoneGate.asm
+++ b/data/maps/objects/SafariZoneGate.asm
@@ -10,8 +10,8 @@
db 0 ; signs
db 2 ; objects
- object SPRITE_WHITE_PLAYER, 6, 2, STAY, LEFT, 1 ; person
- object SPRITE_WHITE_PLAYER, 1, 4, STAY, RIGHT, 2 ; person
+ object SPRITE_SAFARI_ZONE_WORKER, 6, 2, STAY, LEFT, 1 ; person
+ object SPRITE_SAFARI_ZONE_WORKER, 1, 4, STAY, RIGHT, 2 ; person
; warp-to
warp_to 3, 5, SAFARI_ZONE_GATE_WIDTH
--- a/data/maps/objects/SafariZoneNorth.asm
+++ b/data/maps/objects/SafariZoneNorth.asm
@@ -20,8 +20,8 @@
sign 26, 28, 7 ; SafariZoneNorthText7
db 2 ; objects
- object SPRITE_BALL, 25, 1, STAY, NONE, 1, PROTEIN
- object SPRITE_BALL, 19, 7, STAY, NONE, 2, TM_SKULL_BASH
+ object SPRITE_POKE_BALL, 25, 1, STAY, NONE, 1, PROTEIN
+ object SPRITE_POKE_BALL, 19, 7, STAY, NONE, 2, TM_SKULL_BASH
; warp-to
warp_to 2, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST
--- a/data/maps/objects/SafariZoneNorthRestHouse.asm
+++ b/data/maps/objects/SafariZoneNorthRestHouse.asm
@@ -8,8 +8,8 @@
db 0 ; signs
db 3 ; objects
- object SPRITE_OAK_AIDE, 6, 3, WALK, 2, 1 ; person
- object SPRITE_WHITE_PLAYER, 3, 4, STAY, NONE, 2 ; person
+ object SPRITE_SCIENTIST, 6, 3, WALK, 2, 1 ; person
+ object SPRITE_SAFARI_ZONE_WORKER, 3, 4, STAY, NONE, 2 ; person
object SPRITE_GENTLEMAN, 1, 5, WALK, 1, 3 ; person
; warp-to
--- a/data/maps/objects/SafariZoneSecretHouse.asm
+++ b/data/maps/objects/SafariZoneSecretHouse.asm
@@ -8,7 +8,7 @@
db 0 ; signs
db 1 ; objects
- object SPRITE_FISHER, 3, 3, STAY, DOWN, 1 ; person
+ object SPRITE_FISHING_GURU, 3, 3, STAY, DOWN, 1 ; person
; warp-to
warp_to 2, 7, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; SAFARI_ZONE_WEST
--- a/data/maps/objects/SafariZoneWest.asm
+++ b/data/maps/objects/SafariZoneWest.asm
@@ -18,10 +18,10 @@
sign 24, 22, 8 ; SafariZoneWestText8
db 4 ; objects
- object SPRITE_BALL, 8, 20, STAY, NONE, 1, MAX_POTION
- object SPRITE_BALL, 9, 7, STAY, NONE, 2, TM_DOUBLE_TEAM
- object SPRITE_BALL, 18, 18, STAY, NONE, 3, MAX_REVIVE
- object SPRITE_BALL, 19, 7, STAY, NONE, 4, GOLD_TEETH
+ object SPRITE_POKE_BALL, 8, 20, STAY, NONE, 1, MAX_POTION
+ object SPRITE_POKE_BALL, 9, 7, STAY, NONE, 2, TM_DOUBLE_TEAM
+ object SPRITE_POKE_BALL, 18, 18, STAY, NONE, 3, MAX_REVIVE
+ object SPRITE_POKE_BALL, 19, 7, STAY, NONE, 4, GOLD_TEETH
; warp-to
warp_to 20, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH
--- a/data/maps/objects/SafariZoneWestRestHouse.asm
+++ b/data/maps/objects/SafariZoneWestRestHouse.asm
@@ -8,8 +8,8 @@
db 0 ; signs
db 3 ; objects
- object SPRITE_OAK_AIDE, 4, 4, WALK, 0, 1 ; person
- object SPRITE_BLACK_HAIR_BOY_1, 0, 2, STAY, RIGHT, 2 ; person
+ object SPRITE_SCIENTIST, 4, 4, WALK, 0, 1 ; person
+ object SPRITE_COOLTRAINER_M, 0, 2, STAY, RIGHT, 2 ; person
object SPRITE_ERIKA, 6, 2, STAY, DOWN, 3 ; person
; warp-to
--- a/data/maps/objects/SaffronCity.asm
+++ b/data/maps/objects/SaffronCity.asm
@@ -31,8 +31,8 @@
object SPRITE_ROCKET, 11, 25, WALK, 2, 5 ; person
object SPRITE_ROCKET, 32, 13, WALK, 2, 6 ; person
object SPRITE_ROCKET, 18, 30, WALK, 2, 7 ; person
- object SPRITE_OAK_AIDE, 8, 14, WALK, 0, 8 ; person
- object SPRITE_LAPRAS_GIVER, 23, 23, STAY, NONE, 9 ; person
+ object SPRITE_SCIENTIST, 8, 14, WALK, 0, 8 ; person
+ object SPRITE_SILPH_WORKER, 23, 23, STAY, NONE, 9 ; person
object SPRITE_ERIKA, 17, 30, WALK, 2, 10 ; person
object SPRITE_GENTLEMAN, 30, 12, STAY, DOWN, 11 ; person
object SPRITE_BIRD, 31, 12, STAY, DOWN, 12 ; person
--- a/data/maps/objects/SaffronGym.asm
+++ b/data/maps/objects/SaffronGym.asm
@@ -39,14 +39,14 @@
db 9 ; objects
object SPRITE_GIRL, 9, 8, STAY, DOWN, 1, OPP_SABRINA, 1
- object SPRITE_MEDIUM, 10, 1, STAY, DOWN, 2, OPP_CHANNELER, 22
- object SPRITE_BUG_CATCHER, 17, 1, STAY, DOWN, 3, OPP_PSYCHIC_TR, 1
- object SPRITE_MEDIUM, 3, 7, STAY, DOWN, 4, OPP_CHANNELER, 23
- object SPRITE_BUG_CATCHER, 17, 7, STAY, DOWN, 5, OPP_PSYCHIC_TR, 2
- object SPRITE_MEDIUM, 3, 13, STAY, DOWN, 6, OPP_CHANNELER, 24
- object SPRITE_BUG_CATCHER, 17, 13, STAY, DOWN, 7, OPP_PSYCHIC_TR, 3
- object SPRITE_BUG_CATCHER, 3, 1, STAY, DOWN, 8, OPP_PSYCHIC_TR, 4
- object SPRITE_GYM_HELPER, 10, 15, STAY, DOWN, 9 ; person
+ object SPRITE_CHANNELER, 10, 1, STAY, DOWN, 2, OPP_CHANNELER, 22
+ object SPRITE_YOUNGSTER, 17, 1, STAY, DOWN, 3, OPP_PSYCHIC_TR, 1
+ object SPRITE_CHANNELER, 3, 7, STAY, DOWN, 4, OPP_CHANNELER, 23
+ object SPRITE_YOUNGSTER, 17, 7, STAY, DOWN, 5, OPP_PSYCHIC_TR, 2
+ object SPRITE_CHANNELER, 3, 13, STAY, DOWN, 6, OPP_CHANNELER, 24
+ object SPRITE_YOUNGSTER, 17, 13, STAY, DOWN, 7, OPP_PSYCHIC_TR, 3
+ object SPRITE_YOUNGSTER, 3, 1, STAY, DOWN, 8, OPP_PSYCHIC_TR, 4
+ object SPRITE_GYM_GUIDE, 10, 15, STAY, DOWN, 9 ; person
; warp-to
warp_to 8, 17, SAFFRON_GYM_WIDTH
--- a/data/maps/objects/SaffronMart.asm
+++ b/data/maps/objects/SaffronMart.asm
@@ -8,9 +8,9 @@
db 0 ; signs
db 3 ; objects
- object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person
- object SPRITE_BLACK_HAIR_BOY_2, 4, 2, STAY, NONE, 2 ; person
- object SPRITE_LASS, 6, 5, WALK, 0, 3 ; person
+ object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person
+ object SPRITE_SUPER_NERD, 4, 2, STAY, NONE, 2 ; person
+ object SPRITE_COOLTRAINER_F, 6, 5, WALK, 0, 3 ; person
; warp-to
warp_to 3, 7, SAFFRON_MART_WIDTH
--- a/data/maps/objects/SaffronPidgeyHouse.asm
+++ b/data/maps/objects/SaffronPidgeyHouse.asm
@@ -10,8 +10,8 @@
db 4 ; objects
object SPRITE_BRUNETTE_GIRL, 2, 3, STAY, RIGHT, 1 ; person
object SPRITE_BIRD, 0, 4, WALK, 1, 2 ; person
- object SPRITE_BUG_CATCHER, 4, 1, STAY, DOWN, 3 ; person
- object SPRITE_PAPER_SHEET, 3, 3, STAY, NONE, 4 ; person
+ object SPRITE_YOUNGSTER, 4, 1, STAY, DOWN, 3 ; person
+ object SPRITE_PAPER, 3, 3, STAY, NONE, 4 ; person
; warp-to
warp_to 2, 7, SAFFRON_PIDGEY_HOUSE_WIDTH
--- a/data/maps/objects/SaffronPokecenter.asm
+++ b/data/maps/objects/SaffronPokecenter.asm
@@ -9,9 +9,9 @@
db 4 ; objects
object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
- object SPRITE_FOULARD_WOMAN, 5, 5, STAY, NONE, 2 ; person
+ object SPRITE_BEAUTY, 5, 5, STAY, NONE, 2 ; person
object SPRITE_GENTLEMAN, 8, 3, STAY, DOWN, 3 ; person
- object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person
+ object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person
; warp-to
warp_to 3, 7, SAFFRON_POKECENTER_WIDTH
--- a/data/maps/objects/SilphCo10F.asm
+++ b/data/maps/objects/SilphCo10F.asm
@@ -13,11 +13,11 @@
db 6 ; objects
object SPRITE_ROCKET, 1, 9, STAY, RIGHT, 1, OPP_ROCKET, 39
- object SPRITE_OAK_AIDE, 10, 2, STAY, LEFT, 2, OPP_SCIENTIST, 11
+ object SPRITE_SCIENTIST, 10, 2, STAY, LEFT, 2, OPP_SCIENTIST, 11
object SPRITE_ERIKA, 9, 15, WALK, 0, 3 ; person
- object SPRITE_BALL, 2, 12, STAY, NONE, 4, TM_EARTHQUAKE
- object SPRITE_BALL, 4, 14, STAY, NONE, 5, RARE_CANDY
- object SPRITE_BALL, 5, 11, STAY, NONE, 6, CARBOS
+ object SPRITE_POKE_BALL, 2, 12, STAY, NONE, 4, TM_EARTHQUAKE
+ object SPRITE_POKE_BALL, 4, 14, STAY, NONE, 5, RARE_CANDY
+ object SPRITE_POKE_BALL, 5, 11, STAY, NONE, 6, CARBOS
; warp-to
warp_to 8, 0, SILPH_CO_10F_WIDTH ; SILPH_CO_9F
--- a/data/maps/objects/SilphCo11F.asm
+++ b/data/maps/objects/SilphCo11F.asm
@@ -10,8 +10,8 @@
db 0 ; signs
db 5 ; objects
- object SPRITE_MR_MASTERBALL, 7, 5, STAY, DOWN, 1 ; person
- object SPRITE_FOULARD_WOMAN, 10, 5, STAY, DOWN, 2 ; person
+ object SPRITE_SILPH_PRESIDENT, 7, 5, STAY, DOWN, 1 ; person
+ object SPRITE_BEAUTY, 10, 5, STAY, DOWN, 2 ; person
object SPRITE_GIOVANNI, 6, 9, STAY, DOWN, 3, OPP_GIOVANNI, 2
object SPRITE_ROCKET, 3, 16, STAY, UP, 4, OPP_ROCKET, 41
object SPRITE_ROCKET, 15, 9, STAY, UP, 5, OPP_ROCKET, 40
--- a/data/maps/objects/SilphCo1F.asm
+++ b/data/maps/objects/SilphCo1F.asm
@@ -11,7 +11,7 @@
db 0 ; signs
db 1 ; objects
- object SPRITE_CABLE_CLUB_WOMAN, 4, 2, STAY, DOWN, 1 ; person
+ object SPRITE_LINK_RECEPTIONIST, 4, 2, STAY, DOWN, 1 ; person
; warp-to
warp_to 10, 17, SILPH_CO_1F_WIDTH
--- a/data/maps/objects/SilphCo2F.asm
+++ b/data/maps/objects/SilphCo2F.asm
@@ -14,8 +14,8 @@
db 5 ; objects
object SPRITE_ERIKA, 10, 1, STAY, UP, 1 ; person
- object SPRITE_OAK_AIDE, 5, 12, STAY, DOWN, 2, OPP_SCIENTIST, 2
- object SPRITE_OAK_AIDE, 24, 13, STAY, LEFT, 3, OPP_SCIENTIST, 3
+ object SPRITE_SCIENTIST, 5, 12, STAY, DOWN, 2, OPP_SCIENTIST, 2
+ object SPRITE_SCIENTIST, 24, 13, STAY, LEFT, 3, OPP_SCIENTIST, 3
object SPRITE_ROCKET, 16, 11, STAY, UP, 4, OPP_ROCKET, 23
object SPRITE_ROCKET, 24, 7, STAY, UP, 5, OPP_ROCKET, 24
--- a/data/maps/objects/SilphCo3F.asm
+++ b/data/maps/objects/SilphCo3F.asm
@@ -16,10 +16,10 @@
db 0 ; signs
db 4 ; objects
- object SPRITE_LAPRAS_GIVER, 24, 8, STAY, NONE, 1 ; person
+ object SPRITE_SILPH_WORKER, 24, 8, STAY, NONE, 1 ; person
object SPRITE_ROCKET, 20, 7, STAY, LEFT, 2, OPP_ROCKET, 25
- object SPRITE_OAK_AIDE, 7, 9, STAY, DOWN, 3, OPP_SCIENTIST, 4
- object SPRITE_BALL, 8, 5, STAY, NONE, 4, HYPER_POTION
+ object SPRITE_SCIENTIST, 7, 9, STAY, DOWN, 3, OPP_SCIENTIST, 4
+ object SPRITE_POKE_BALL, 8, 5, STAY, NONE, 4, HYPER_POTION
; warp-to
warp_to 26, 0, SILPH_CO_3F_WIDTH ; SILPH_CO_2F
--- a/data/maps/objects/SilphCo4F.asm
+++ b/data/maps/objects/SilphCo4F.asm
@@ -13,13 +13,13 @@
db 0 ; signs
db 7 ; objects
- object SPRITE_LAPRAS_GIVER, 6, 2, STAY, NONE, 1 ; person
+ object SPRITE_SILPH_WORKER, 6, 2, STAY, NONE, 1 ; person
object SPRITE_ROCKET, 9, 14, STAY, RIGHT, 2, OPP_ROCKET, 26
- object SPRITE_OAK_AIDE, 14, 6, STAY, LEFT, 3, OPP_SCIENTIST, 5
+ object SPRITE_SCIENTIST, 14, 6, STAY, LEFT, 3, OPP_SCIENTIST, 5
object SPRITE_ROCKET, 26, 10, STAY, UP, 4, OPP_ROCKET, 27
- object SPRITE_BALL, 3, 9, STAY, NONE, 5, FULL_HEAL
- object SPRITE_BALL, 4, 7, STAY, NONE, 6, MAX_REVIVE
- object SPRITE_BALL, 5, 8, STAY, NONE, 7, ESCAPE_ROPE
+ object SPRITE_POKE_BALL, 3, 9, STAY, NONE, 5, FULL_HEAL
+ object SPRITE_POKE_BALL, 4, 7, STAY, NONE, 6, MAX_REVIVE
+ object SPRITE_POKE_BALL, 5, 8, STAY, NONE, 7, ESCAPE_ROPE
; warp-to
warp_to 24, 0, SILPH_CO_4F_WIDTH ; SILPH_CO_3F
--- a/data/maps/objects/SilphCo5F.asm
+++ b/data/maps/objects/SilphCo5F.asm
@@ -13,14 +13,14 @@
db 0 ; signs
db 11 ; objects
- object SPRITE_LAPRAS_GIVER, 13, 9, STAY, NONE, 1 ; person
+ object SPRITE_SILPH_WORKER, 13, 9, STAY, NONE, 1 ; person
object SPRITE_ROCKET, 8, 16, STAY, RIGHT, 2, OPP_ROCKET, 28
- object SPRITE_OAK_AIDE, 8, 3, STAY, RIGHT, 3, OPP_SCIENTIST, 6
+ object SPRITE_SCIENTIST, 8, 3, STAY, RIGHT, 3, OPP_SCIENTIST, 6
object SPRITE_ROCKER, 18, 10, STAY, UP, 4, OPP_JUGGLER, 1
object SPRITE_ROCKET, 28, 4, STAY, UP, 5, OPP_ROCKET, 29
- object SPRITE_BALL, 2, 13, STAY, NONE, 6, TM_TAKE_DOWN
- object SPRITE_BALL, 4, 6, STAY, NONE, 7, PROTEIN
- object SPRITE_BALL, 21, 16, STAY, NONE, 8, CARD_KEY
+ object SPRITE_POKE_BALL, 2, 13, STAY, NONE, 6, TM_TAKE_DOWN
+ object SPRITE_POKE_BALL, 4, 6, STAY, NONE, 7, PROTEIN
+ object SPRITE_POKE_BALL, 21, 16, STAY, NONE, 8, CARD_KEY
object SPRITE_CLIPBOARD, 22, 12, STAY, NONE, 9 ; person
object SPRITE_CLIPBOARD, 25, 10, STAY, NONE, 10 ; person
object SPRITE_CLIPBOARD, 24, 6, STAY, NONE, 11 ; person
--- a/data/maps/objects/SilphCo6F.asm
+++ b/data/maps/objects/SilphCo6F.asm
@@ -11,16 +11,16 @@
db 0 ; signs
db 10 ; objects
- object SPRITE_LAPRAS_GIVER, 10, 6, STAY, NONE, 1 ; person
- object SPRITE_LAPRAS_GIVER, 20, 6, STAY, NONE, 2 ; person
+ object SPRITE_SILPH_WORKER, 10, 6, STAY, NONE, 1 ; person
+ object SPRITE_SILPH_WORKER, 20, 6, STAY, NONE, 2 ; person
object SPRITE_ERIKA, 21, 6, STAY, DOWN, 3 ; person
object SPRITE_ERIKA, 11, 10, STAY, RIGHT, 4 ; person
- object SPRITE_LAPRAS_GIVER, 18, 13, STAY, UP, 5 ; person
+ object SPRITE_SILPH_WORKER, 18, 13, STAY, UP, 5 ; person
object SPRITE_ROCKET, 17, 3, STAY, RIGHT, 6, OPP_ROCKET, 30
- object SPRITE_OAK_AIDE, 7, 8, STAY, DOWN, 7, OPP_SCIENTIST, 7
+ object SPRITE_SCIENTIST, 7, 8, STAY, DOWN, 7, OPP_SCIENTIST, 7
object SPRITE_ROCKET, 14, 15, STAY, LEFT, 8, OPP_ROCKET, 31
- object SPRITE_BALL, 3, 12, STAY, NONE, 9, HP_UP
- object SPRITE_BALL, 2, 15, STAY, NONE, 10, X_ACCURACY
+ object SPRITE_POKE_BALL, 3, 12, STAY, NONE, 9, HP_UP
+ object SPRITE_POKE_BALL, 2, 15, STAY, NONE, 10, X_ACCURACY
; warp-to
warp_to 16, 0, SILPH_CO_6F_WIDTH ; SILPH_CO_7F
--- a/data/maps/objects/SilphCo7F.asm
+++ b/data/maps/objects/SilphCo7F.asm
@@ -12,17 +12,17 @@
db 0 ; signs
db 11 ; objects
- object SPRITE_LAPRAS_GIVER, 1, 5, STAY, NONE, 1 ; person
- object SPRITE_LAPRAS_GIVER, 13, 13, STAY, UP, 2 ; person
- object SPRITE_LAPRAS_GIVER, 7, 10, STAY, NONE, 3 ; person
+ object SPRITE_SILPH_WORKER, 1, 5, STAY, NONE, 1 ; person
+ object SPRITE_SILPH_WORKER, 13, 13, STAY, UP, 2 ; person
+ object SPRITE_SILPH_WORKER, 7, 10, STAY, NONE, 3 ; person
object SPRITE_ERIKA, 10, 8, STAY, NONE, 4 ; person
object SPRITE_ROCKET, 13, 1, STAY, DOWN, 5, OPP_ROCKET, 32
- object SPRITE_OAK_AIDE, 2, 13, STAY, DOWN, 6, OPP_SCIENTIST, 8
+ object SPRITE_SCIENTIST, 2, 13, STAY, DOWN, 6, OPP_SCIENTIST, 8
object SPRITE_ROCKET, 20, 2, STAY, LEFT, 7, OPP_ROCKET, 33
object SPRITE_ROCKET, 19, 14, STAY, RIGHT, 8, OPP_ROCKET, 34
object SPRITE_BLUE, 3, 7, STAY, UP, 9 ; person
- object SPRITE_BALL, 1, 9, STAY, NONE, 10, CALCIUM
- object SPRITE_BALL, 24, 11, STAY, NONE, 11, TM_SWORDS_DANCE
+ object SPRITE_POKE_BALL, 1, 9, STAY, NONE, 10, CALCIUM
+ object SPRITE_POKE_BALL, 24, 11, STAY, NONE, 11, TM_SWORDS_DANCE
; warp-to
warp_to 16, 0, SILPH_CO_7F_WIDTH ; SILPH_CO_8F
--- a/data/maps/objects/SilphCo8F.asm
+++ b/data/maps/objects/SilphCo8F.asm
@@ -13,9 +13,9 @@
db 0 ; signs
db 4 ; objects
- object SPRITE_LAPRAS_GIVER, 4, 2, STAY, NONE, 1 ; person
+ object SPRITE_SILPH_WORKER, 4, 2, STAY, NONE, 1 ; person
object SPRITE_ROCKET, 19, 2, STAY, LEFT, 2, OPP_ROCKET, 35
- object SPRITE_OAK_AIDE, 10, 2, STAY, DOWN, 3, OPP_SCIENTIST, 9
+ object SPRITE_SCIENTIST, 10, 2, STAY, DOWN, 3, OPP_SCIENTIST, 9
object SPRITE_ROCKET, 12, 15, STAY, RIGHT, 4, OPP_ROCKET, 36
; warp-to
--- a/data/maps/objects/SilphCo9F.asm
+++ b/data/maps/objects/SilphCo9F.asm
@@ -13,7 +13,7 @@
db 4 ; objects
object SPRITE_NURSE, 3, 14, STAY, DOWN, 1 ; person
object SPRITE_ROCKET, 2, 4, STAY, UP, 2, OPP_ROCKET, 37
- object SPRITE_OAK_AIDE, 21, 13, STAY, DOWN, 3, OPP_SCIENTIST, 10
+ object SPRITE_SCIENTIST, 21, 13, STAY, DOWN, 3, OPP_SCIENTIST, 10
object SPRITE_ROCKET, 13, 16, STAY, UP, 4, OPP_ROCKET, 38
; warp-to
--- a/data/maps/objects/UndergroundPathRoute7.asm
+++ b/data/maps/objects/UndergroundPathRoute7.asm
@@ -9,7 +9,7 @@
db 0 ; signs
db 1 ; objects
- object SPRITE_FAT_BALD_GUY, 2, 4, STAY, NONE, 1 ; person
+ object SPRITE_MIDDLE_AGED_MAN, 2, 4, STAY, NONE, 1 ; person
; warp-to
warp_to 3, 7, UNDERGROUND_PATH_ROUTE_7_WIDTH
--- a/data/maps/objects/UndergroundPathRoute7Copy.asm
+++ b/data/maps/objects/UndergroundPathRoute7Copy.asm
@@ -10,7 +10,7 @@
db 2 ; objects
object SPRITE_GIRL, 3, 2, STAY, NONE, 1 ; person
- object SPRITE_FAT_BALD_GUY, 2, 4, STAY, NONE, 2 ; person
+ object SPRITE_MIDDLE_AGED_MAN, 2, 4, STAY, NONE, 2 ; person
; warp-to
warp_to 3, 7, UNDERGROUND_PATH_ROUTE_7_COPY_WIDTH
--- a/data/maps/objects/VermilionCity.asm
+++ b/data/maps/objects/VermilionCity.asm
@@ -22,11 +22,11 @@
sign 29, 15, 13 ; VermilionCityText13
db 6 ; objects
- object SPRITE_FOULARD_WOMAN, 19, 7, WALK, 2, 1 ; person
+ object SPRITE_BEAUTY, 19, 7, WALK, 2, 1 ; person
object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person
object SPRITE_SAILOR, 19, 30, STAY, UP, 3 ; person
object SPRITE_GAMBLER, 30, 7, STAY, NONE, 4 ; person
- object SPRITE_SLOWBRO, 29, 9, WALK, 1, 5 ; person
+ object SPRITE_MONSTER, 29, 9, WALK, 1, 5 ; person
object SPRITE_SAILOR, 25, 27, WALK, 2, 6 ; person
; warp-to
--- a/data/maps/objects/VermilionGym.asm
+++ b/data/maps/objects/VermilionGym.asm
@@ -10,9 +10,9 @@
db 5 ; objects
object SPRITE_ROCKER, 5, 1, STAY, DOWN, 1, OPP_LT_SURGE, 1
object SPRITE_GENTLEMAN, 9, 6, STAY, LEFT, 2, OPP_GENTLEMAN, 3
- object SPRITE_BLACK_HAIR_BOY_2, 3, 8, STAY, LEFT, 3, OPP_ROCKER, 1
+ object SPRITE_SUPER_NERD, 3, 8, STAY, LEFT, 3, OPP_ROCKER, 1
object SPRITE_SAILOR, 0, 10, STAY, RIGHT, 4, OPP_SAILOR, 8
- object SPRITE_GYM_HELPER, 4, 14, STAY, DOWN, 5 ; person
+ object SPRITE_GYM_GUIDE, 4, 14, STAY, DOWN, 5 ; person
; warp-to
warp_to 4, 17, VERMILION_GYM_WIDTH
--- a/data/maps/objects/VermilionMart.asm
+++ b/data/maps/objects/VermilionMart.asm
@@ -8,9 +8,9 @@
db 0 ; signs
db 3 ; objects
- object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person
- object SPRITE_BLACK_HAIR_BOY_1, 5, 6, STAY, NONE, 2 ; person
- object SPRITE_LASS, 3, 3, WALK, 2, 3 ; person
+ object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person
+ object SPRITE_COOLTRAINER_M, 5, 6, STAY, NONE, 2 ; person
+ object SPRITE_COOLTRAINER_F, 3, 3, WALK, 2, 3 ; person
; warp-to
warp_to 3, 7, VERMILION_MART_WIDTH
--- a/data/maps/objects/VermilionOldRodHouse.asm
+++ b/data/maps/objects/VermilionOldRodHouse.asm
@@ -8,7 +8,7 @@
db 0 ; signs
db 1 ; objects
- object SPRITE_FISHER, 2, 4, STAY, RIGHT, 1 ; person
+ object SPRITE_FISHING_GURU, 2, 4, STAY, RIGHT, 1 ; person
; warp-to
warp_to 2, 7, VERMILION_OLD_ROD_HOUSE_WIDTH
--- a/data/maps/objects/VermilionPidgeyHouse.asm
+++ b/data/maps/objects/VermilionPidgeyHouse.asm
@@ -8,9 +8,9 @@
db 0 ; signs
db 3 ; objects
- object SPRITE_BUG_CATCHER, 5, 3, STAY, LEFT, 1 ; person
+ object SPRITE_YOUNGSTER, 5, 3, STAY, LEFT, 1 ; person
object SPRITE_BIRD, 3, 5, WALK, 2, 2 ; person
- object SPRITE_PAPER_SHEET, 4, 3, STAY, NONE, 3 ; person
+ object SPRITE_PAPER, 4, 3, STAY, NONE, 3 ; person
; warp-to
warp_to 2, 7, VERMILION_PIDGEY_HOUSE_WIDTH
--- a/data/maps/objects/VermilionPokecenter.asm
+++ b/data/maps/objects/VermilionPokecenter.asm
@@ -9,9 +9,9 @@
db 4 ; objects
object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
- object SPRITE_FISHER, 10, 5, STAY, NONE, 2 ; person
+ object SPRITE_FISHING_GURU, 10, 5, STAY, NONE, 2 ; person
object SPRITE_SAILOR, 5, 4, STAY, NONE, 3 ; person
- object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person
+ object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person
; warp-to
warp_to 3, 7, VERMILION_POKECENTER_WIDTH
--- a/data/maps/objects/VictoryRoad1F.asm
+++ b/data/maps/objects/VictoryRoad1F.asm
@@ -9,10 +9,10 @@
db 0 ; signs
db 7 ; objects
- object SPRITE_LASS, 7, 5, STAY, RIGHT, 1, OPP_COOLTRAINER_F, 5
- object SPRITE_BLACK_HAIR_BOY_1, 3, 2, STAY, DOWN, 2, OPP_COOLTRAINER_M, 5
- object SPRITE_BALL, 11, 0, STAY, NONE, 3, TM_SKY_ATTACK
- object SPRITE_BALL, 9, 2, STAY, NONE, 4, RARE_CANDY
+ object SPRITE_COOLTRAINER_F, 7, 5, STAY, RIGHT, 1, OPP_COOLTRAINER_F, 5
+ object SPRITE_COOLTRAINER_M, 3, 2, STAY, DOWN, 2, OPP_COOLTRAINER_M, 5
+ object SPRITE_POKE_BALL, 11, 0, STAY, NONE, 3, TM_SKY_ATTACK
+ object SPRITE_POKE_BALL, 9, 2, STAY, NONE, 4, RARE_CANDY
object SPRITE_BOULDER, 5, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 5 ; person
object SPRITE_BOULDER, 14, 2, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person
object SPRITE_BOULDER, 2, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person
--- a/data/maps/objects/VictoryRoad2F.asm
+++ b/data/maps/objects/VictoryRoad2F.asm
@@ -14,15 +14,15 @@
db 13 ; objects
object SPRITE_HIKER, 12, 9, STAY, LEFT, 1, OPP_BLACKBELT, 9
- object SPRITE_BLACK_HAIR_BOY_2, 21, 13, STAY, LEFT, 2, OPP_JUGGLER, 2
- object SPRITE_BLACK_HAIR_BOY_1, 19, 8, STAY, DOWN, 3, OPP_TAMER, 5
- object SPRITE_BLACK_HAIR_BOY_2, 4, 2, STAY, DOWN, 4, OPP_POKEMANIAC, 6
- object SPRITE_BLACK_HAIR_BOY_2, 26, 3, STAY, LEFT, 5, OPP_JUGGLER, 5
+ object SPRITE_SUPER_NERD, 21, 13, STAY, LEFT, 2, OPP_JUGGLER, 2
+ object SPRITE_COOLTRAINER_M, 19, 8, STAY, DOWN, 3, OPP_TAMER, 5
+ object SPRITE_SUPER_NERD, 4, 2, STAY, DOWN, 4, OPP_POKEMANIAC, 6
+ object SPRITE_SUPER_NERD, 26, 3, STAY, LEFT, 5, OPP_JUGGLER, 5
object SPRITE_BIRD, 11, 5, STAY, UP, 6, MOLTRES, 50
- object SPRITE_BALL, 27, 5, STAY, NONE, 7, TM_SUBMISSION
- object SPRITE_BALL, 18, 9, STAY, NONE, 8, FULL_HEAL
- object SPRITE_BALL, 9, 11, STAY, NONE, 9, TM_MEGA_KICK
- object SPRITE_BALL, 11, 0, STAY, NONE, 10, GUARD_SPEC
+ object SPRITE_POKE_BALL, 27, 5, STAY, NONE, 7, TM_SUBMISSION
+ object SPRITE_POKE_BALL, 18, 9, STAY, NONE, 8, FULL_HEAL
+ object SPRITE_POKE_BALL, 9, 11, STAY, NONE, 9, TM_MEGA_KICK
+ object SPRITE_POKE_BALL, 11, 0, STAY, NONE, 10, GUARD_SPEC
object SPRITE_BOULDER, 4, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 11 ; person
object SPRITE_BOULDER, 5, 5, STAY, BOULDER_MOVEMENT_BYTE_2, 12 ; person
object SPRITE_BOULDER, 23, 16, STAY, BOULDER_MOVEMENT_BYTE_2, 13 ; person
--- a/data/maps/objects/VictoryRoad3F.asm
+++ b/data/maps/objects/VictoryRoad3F.asm
@@ -10,12 +10,12 @@
db 0 ; signs
db 10 ; objects
- object SPRITE_BLACK_HAIR_BOY_1, 28, 5, STAY, LEFT, 1, OPP_COOLTRAINER_M, 2
- object SPRITE_LASS, 7, 13, STAY, RIGHT, 2, OPP_COOLTRAINER_F, 2
- object SPRITE_BLACK_HAIR_BOY_1, 6, 14, STAY, LEFT, 3, OPP_COOLTRAINER_M, 3
- object SPRITE_LASS, 13, 3, STAY, RIGHT, 4, OPP_COOLTRAINER_F, 3
- object SPRITE_BALL, 26, 5, STAY, NONE, 5, MAX_REVIVE
- object SPRITE_BALL, 7, 7, STAY, NONE, 6, TM_EXPLOSION
+ object SPRITE_COOLTRAINER_M, 28, 5, STAY, LEFT, 1, OPP_COOLTRAINER_M, 2
+ object SPRITE_COOLTRAINER_F, 7, 13, STAY, RIGHT, 2, OPP_COOLTRAINER_F, 2
+ object SPRITE_COOLTRAINER_M, 6, 14, STAY, LEFT, 3, OPP_COOLTRAINER_M, 3
+ object SPRITE_COOLTRAINER_F, 13, 3, STAY, RIGHT, 4, OPP_COOLTRAINER_F, 3
+ object SPRITE_POKE_BALL, 26, 5, STAY, NONE, 5, MAX_REVIVE
+ object SPRITE_POKE_BALL, 7, 7, STAY, NONE, 6, TM_EXPLOSION
object SPRITE_BOULDER, 22, 3, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person
object SPRITE_BOULDER, 13, 12, STAY, BOULDER_MOVEMENT_BYTE_2, 8 ; person
object SPRITE_BOULDER, 24, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 9 ; person
--- a/data/maps/objects/ViridianCity.asm
+++ b/data/maps/objects/ViridianCity.asm
@@ -17,12 +17,12 @@
sign 27, 7, 13 ; ViridianCityText13
db 7 ; objects
- object SPRITE_BUG_CATCHER, 13, 20, WALK, 0, 1 ; person
+ object SPRITE_YOUNGSTER, 13, 20, WALK, 0, 1 ; person
object SPRITE_GAMBLER, 30, 8, STAY, NONE, 2 ; person
- object SPRITE_BUG_CATCHER, 30, 25, WALK, 0, 3 ; person
+ object SPRITE_YOUNGSTER, 30, 25, WALK, 0, 3 ; person
object SPRITE_GIRL, 17, 9, STAY, RIGHT, 4 ; person
- object SPRITE_LYING_OLD_MAN, 18, 9, STAY, NONE, 5 ; person
- object SPRITE_FISHER2, 6, 23, STAY, DOWN, 6 ; person
+ object SPRITE_GAMBLER_ASLEEP, 18, 9, STAY, NONE, 5 ; person
+ object SPRITE_FISHER, 6, 23, STAY, DOWN, 6 ; person
object SPRITE_GAMBLER, 17, 5, WALK, 2, 7 ; person
; warp-to
--- a/data/maps/objects/ViridianForest.asm
+++ b/data/maps/objects/ViridianForest.asm
@@ -18,14 +18,14 @@
sign 2, 1, 14 ; ViridianForestText14
db 8 ; objects
- object SPRITE_BUG_CATCHER, 16, 43, STAY, NONE, 1 ; person
- object SPRITE_BUG_CATCHER, 30, 33, STAY, LEFT, 2, OPP_BUG_CATCHER, 1
- object SPRITE_BUG_CATCHER, 30, 19, STAY, LEFT, 3, OPP_BUG_CATCHER, 2
- object SPRITE_BUG_CATCHER, 2, 18, STAY, LEFT, 4, OPP_BUG_CATCHER, 3
- object SPRITE_BALL, 25, 11, STAY, NONE, 5, ANTIDOTE
- object SPRITE_BALL, 12, 29, STAY, NONE, 6, POTION
- object SPRITE_BALL, 1, 31, STAY, NONE, 7, POKE_BALL
- object SPRITE_BUG_CATCHER, 27, 40, STAY, NONE, 8 ; person
+ object SPRITE_YOUNGSTER, 16, 43, STAY, NONE, 1 ; person
+ object SPRITE_YOUNGSTER, 30, 33, STAY, LEFT, 2, OPP_BUG_CATCHER, 1
+ object SPRITE_YOUNGSTER, 30, 19, STAY, LEFT, 3, OPP_BUG_CATCHER, 2
+ object SPRITE_YOUNGSTER, 2, 18, STAY, LEFT, 4, OPP_BUG_CATCHER, 3
+ object SPRITE_POKE_BALL, 25, 11, STAY, NONE, 5, ANTIDOTE
+ object SPRITE_POKE_BALL, 12, 29, STAY, NONE, 6, POTION
+ object SPRITE_POKE_BALL, 1, 31, STAY, NONE, 7, POKE_BALL
+ object SPRITE_YOUNGSTER, 27, 40, STAY, NONE, 8 ; person
; warp-to
warp_to 1, 0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_NORTH_GATE
--- a/data/maps/objects/ViridianForestNorthGate.asm
+++ b/data/maps/objects/ViridianForestNorthGate.asm
@@ -10,8 +10,8 @@
db 0 ; signs
db 2 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, 3, 2, STAY, NONE, 1 ; person
- object SPRITE_OLD_PERSON, 2, 5, STAY, NONE, 2 ; person
+ object SPRITE_SUPER_NERD, 3, 2, STAY, NONE, 1 ; person
+ object SPRITE_GRAMPS, 2, 5, STAY, NONE, 2 ; person
; warp-to
warp_to 4, 0, VIRIDIAN_FOREST_NORTH_GATE_WIDTH
--- a/data/maps/objects/ViridianGym.asm
+++ b/data/maps/objects/ViridianGym.asm
@@ -9,16 +9,16 @@
db 11 ; objects
object SPRITE_GIOVANNI, 2, 1, STAY, DOWN, 1, OPP_GIOVANNI, 3
- object SPRITE_BLACK_HAIR_BOY_1, 12, 7, STAY, DOWN, 2, OPP_COOLTRAINER_M, 9
+ object SPRITE_COOLTRAINER_M, 12, 7, STAY, DOWN, 2, OPP_COOLTRAINER_M, 9
object SPRITE_HIKER, 11, 11, STAY, UP, 3, OPP_BLACKBELT, 6
object SPRITE_ROCKER, 10, 7, STAY, DOWN, 4, OPP_TAMER, 3
object SPRITE_HIKER, 3, 7, STAY, LEFT, 5, OPP_BLACKBELT, 7
- object SPRITE_BLACK_HAIR_BOY_1, 13, 5, STAY, RIGHT, 6, OPP_COOLTRAINER_M, 10
+ object SPRITE_COOLTRAINER_M, 13, 5, STAY, RIGHT, 6, OPP_COOLTRAINER_M, 10
object SPRITE_HIKER, 10, 1, STAY, DOWN, 7, OPP_BLACKBELT, 8
object SPRITE_ROCKER, 2, 16, STAY, RIGHT, 8, OPP_TAMER, 4
- object SPRITE_BLACK_HAIR_BOY_1, 6, 5, STAY, DOWN, 9, OPP_COOLTRAINER_M, 1
- object SPRITE_GYM_HELPER, 16, 15, STAY, DOWN, 10 ; person
- object SPRITE_BALL, 16, 9, STAY, NONE, 11, REVIVE
+ object SPRITE_COOLTRAINER_M, 6, 5, STAY, DOWN, 9, OPP_COOLTRAINER_M, 1
+ object SPRITE_GYM_GUIDE, 16, 15, STAY, DOWN, 10 ; person
+ object SPRITE_POKE_BALL, 16, 9, STAY, NONE, 11, REVIVE
; warp-to
warp_to 16, 17, VIRIDIAN_GYM_WIDTH
--- a/data/maps/objects/ViridianMart.asm
+++ b/data/maps/objects/ViridianMart.asm
@@ -8,9 +8,9 @@
db 0 ; signs
db 3 ; objects
- object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person
- object SPRITE_BUG_CATCHER, 5, 5, WALK, 1, 2 ; person
- object SPRITE_BLACK_HAIR_BOY_1, 3, 3, STAY, NONE, 3 ; person
+ object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person
+ object SPRITE_YOUNGSTER, 5, 5, WALK, 1, 2 ; person
+ object SPRITE_COOLTRAINER_M, 3, 3, STAY, NONE, 3 ; person
; warp-to
warp_to 3, 7, VIRIDIAN_MART_WIDTH
--- a/data/maps/objects/ViridianPokecenter.asm
+++ b/data/maps/objects/ViridianPokecenter.asm
@@ -10,8 +10,8 @@
db 4 ; objects
object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
object SPRITE_GENTLEMAN, 10, 5, WALK, 1, 2 ; person
- object SPRITE_BLACK_HAIR_BOY_1, 4, 3, STAY, NONE, 3 ; person
- object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person
+ object SPRITE_COOLTRAINER_M, 4, 3, STAY, NONE, 3 ; person
+ object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person
; warp-to
warp_to 3, 7, VIRIDIAN_POKECENTER_WIDTH
--- a/data/maps/objects/ViridianSchoolHouse.asm
+++ b/data/maps/objects/ViridianSchoolHouse.asm
@@ -9,7 +9,7 @@
db 2 ; objects
object SPRITE_BRUNETTE_GIRL, 3, 5, STAY, UP, 1 ; person
- object SPRITE_LASS, 4, 1, STAY, DOWN, 2 ; person
+ object SPRITE_COOLTRAINER_F, 4, 1, STAY, DOWN, 2 ; person
; warp-to
warp_to 2, 7, VIRIDIAN_SCHOOL_HOUSE_WIDTH
--- a/data/maps/objects/WardensHouse.asm
+++ b/data/maps/objects/WardensHouse.asm
@@ -11,7 +11,7 @@
db 3 ; objects
object SPRITE_WARDEN, 2, 3, STAY, NONE, 1 ; person
- object SPRITE_BALL, 8, 3, STAY, NONE, 2, RARE_CANDY
+ object SPRITE_POKE_BALL, 8, 3, STAY, NONE, 2, RARE_CANDY
object SPRITE_BOULDER, 8, 4, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person
; warp-to
--- a/data/maps/sprite_sets.asm
+++ b/data/maps/sprite_sets.asm
@@ -61,130 +61,130 @@
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
--- a/data/sprites/sprites.asm
+++ b/data/sprites/sprites.asm
@@ -6,75 +6,75 @@
SpriteSheetPointerTable:
; graphics, tile count
- overworld_sprite RedSprite, 12 ; SPRITE_RED
- overworld_sprite BlueSprite, 12 ; SPRITE_BLUE
- overworld_sprite OakSprite, 12 ; SPRITE_OAK
- overworld_sprite BugCatcherSprite, 12 ; SPRITE_BUG_CATCHER
- overworld_sprite SlowbroSprite, 12 ; SPRITE_SLOWBRO
- overworld_sprite LassSprite, 12 ; SPRITE_LASS
- overworld_sprite BlackHairBoy1Sprite, 12 ; SPRITE_BLACK_HAIR_BOY_1
- overworld_sprite LittleGirlSprite, 12 ; SPRITE_LITTLE_GIRL
- overworld_sprite BirdSprite, 12 ; SPRITE_BIRD
- overworld_sprite FatBaldGuySprite, 12 ; SPRITE_FAT_BALD_GUY
- overworld_sprite GamblerSprite, 12 ; SPRITE_GAMBLER
- overworld_sprite BlackHairBoy2Sprite, 12 ; SPRITE_BLACK_HAIR_BOY_2
- overworld_sprite GirlSprite, 12 ; SPRITE_GIRL
- overworld_sprite HikerSprite, 12 ; SPRITE_HIKER
- overworld_sprite FoulardWomanSprite, 12 ; SPRITE_FOULARD_WOMAN
- overworld_sprite GentlemanSprite, 12 ; SPRITE_GENTLEMAN
- overworld_sprite DaisySprite, 12 ; SPRITE_DAISY
- overworld_sprite BikerSprite, 12 ; SPRITE_BIKER
- overworld_sprite SailorSprite, 12 ; SPRITE_SAILOR
- overworld_sprite CookSprite, 12 ; SPRITE_COOK
- overworld_sprite BikeShopGuySprite, 12 ; SPRITE_BIKE_SHOP_GUY
- overworld_sprite MrFujiSprite, 12 ; SPRITE_MR_FUJI
- overworld_sprite GiovanniSprite, 12 ; SPRITE_GIOVANNI
- overworld_sprite RocketSprite, 12 ; SPRITE_ROCKET
- overworld_sprite MediumSprite, 12 ; SPRITE_MEDIUM
- overworld_sprite WaiterSprite, 12 ; SPRITE_WAITER
- overworld_sprite ErikaSprite, 12 ; SPRITE_ERIKA
- overworld_sprite MomGeishaSprite, 12 ; SPRITE_MOM_GEISHA
- overworld_sprite BrunetteGirlSprite, 12 ; SPRITE_BRUNETTE_GIRL
- overworld_sprite LanceSprite, 12 ; SPRITE_LANCE
- overworld_sprite OakAideSprite, 12 ; SPRITE_OAK_SCIENTIST_AIDE
- overworld_sprite OakAideSprite, 12 ; SPRITE_OAK_AIDE
- overworld_sprite RockerSprite, 12 ; SPRITE_ROCKER
- overworld_sprite SwimmerSprite, 12 ; SPRITE_SWIMMER
- overworld_sprite WhitePlayerSprite, 12 ; SPRITE_WHITE_PLAYER
- overworld_sprite GymHelperSprite, 12 ; SPRITE_GYM_HELPER
- overworld_sprite OldPersonSprite, 12 ; SPRITE_OLD_PERSON
- overworld_sprite MartGuySprite, 12 ; SPRITE_MART_GUY
- overworld_sprite FisherSprite, 12 ; SPRITE_FISHER
- overworld_sprite OldMediumWomanSprite, 12 ; SPRITE_OLD_MEDIUM_WOMAN
- overworld_sprite NurseSprite, 12 ; SPRITE_NURSE
- overworld_sprite CableClubWomanSprite, 12 ; SPRITE_CABLE_CLUB_WOMAN
- overworld_sprite MrMasterballSprite, 12 ; SPRITE_MR_MASTERBALL
- overworld_sprite LaprasGiverSprite, 12 ; SPRITE_LAPRAS_GIVER
- overworld_sprite WardenSprite, 12 ; SPRITE_WARDEN
- overworld_sprite SsCaptainSprite, 12 ; SPRITE_SS_CAPTAIN
- overworld_sprite Fisher2Sprite, 12 ; SPRITE_FISHER2
- overworld_sprite BlackbeltSprite, 12 ; SPRITE_BLACKBELT
- overworld_sprite GuardSprite, 12 ; SPRITE_GUARD
- overworld_sprite GuardSprite, 12 ; $32
- overworld_sprite MomSprite, 12 ; SPRITE_MOM
- overworld_sprite BaldingGuySprite, 12 ; SPRITE_BALDING_GUY
- overworld_sprite YoungBoySprite, 12 ; SPRITE_YOUNG_BOY
- overworld_sprite GameboyKidSprite, 12 ; SPRITE_GAMEBOY_KID
- overworld_sprite GameboyKidSprite, 12 ; SPRITE_GAMEBOY_KID_COPY
- overworld_sprite ClefairySprite, 12 ; SPRITE_CLEFAIRY
- overworld_sprite AgathaSprite, 12 ; SPRITE_AGATHA
- overworld_sprite BrunoSprite, 12 ; SPRITE_BRUNO
- overworld_sprite LoreleiSprite, 12 ; SPRITE_LORELEI
- overworld_sprite SeelSprite, 12 ; SPRITE_SEEL
- overworld_sprite BallSprite, 4 ; SPRITE_BALL
- overworld_sprite OmanyteSprite, 4 ; SPRITE_OMANYTE
- overworld_sprite BoulderSprite, 4 ; SPRITE_BOULDER
- overworld_sprite PaperSheetSprite, 4 ; SPRITE_PAPER_SHEET
- overworld_sprite BookMapDexSprite, 4 ; SPRITE_BOOK_MAP_DEX
- overworld_sprite ClipboardSprite, 4 ; SPRITE_CLIPBOARD
- overworld_sprite SnorlaxSprite, 4 ; SPRITE_SNORLAX
- overworld_sprite OldAmberSprite, 4 ; SPRITE_OLD_AMBER_COPY
- overworld_sprite OldAmberSprite, 4 ; SPRITE_OLD_AMBER
- overworld_sprite LyingOldManSprite, 4 ; SPRITE_LYING_OLD_MAN_UNUSED_1
- overworld_sprite LyingOldManSprite, 4 ; SPRITE_LYING_OLD_MAN_UNUSED_2
- overworld_sprite LyingOldManSprite, 4 ; SPRITE_LYING_OLD_MAN
+ overworld_sprite RedSprite, 12 ; SPRITE_RED
+ overworld_sprite BlueSprite, 12 ; SPRITE_BLUE
+ overworld_sprite OakSprite, 12 ; SPRITE_OAK
+ overworld_sprite YoungsterSprite, 12 ; SPRITE_YOUNGSTER
+ overworld_sprite MonsterSprite, 12 ; SPRITE_MONSTER
+ overworld_sprite CooltrainerFSprite, 12 ; SPRITE_COOLTRAINER_F
+ overworld_sprite CooltrainerMSprite, 12 ; SPRITE_COOLTRAINER_M
+ overworld_sprite LittleGirlSprite, 12 ; SPRITE_LITTLE_GIRL
+ overworld_sprite BirdSprite, 12 ; SPRITE_BIRD
+ overworld_sprite MiddleAgedManSprite, 12 ; SPRITE_MIDDLE_AGED_MAN
+ overworld_sprite GamblerSprite, 12 ; SPRITE_GAMBLER
+ overworld_sprite SuperNerdSprite, 12 ; SPRITE_SUPER_NERD
+ overworld_sprite GirlSprite, 12 ; SPRITE_GIRL
+ overworld_sprite HikerSprite, 12 ; SPRITE_HIKER
+ overworld_sprite BeautySprite, 12 ; SPRITE_BEAUTY
+ overworld_sprite GentlemanSprite, 12 ; SPRITE_GENTLEMAN
+ overworld_sprite DaisySprite, 12 ; SPRITE_DAISY
+ overworld_sprite BikerSprite, 12 ; SPRITE_BIKER
+ overworld_sprite SailorSprite, 12 ; SPRITE_SAILOR
+ overworld_sprite CookSprite, 12 ; SPRITE_COOK
+ overworld_sprite BikeShopClerkSprite, 12 ; SPRITE_BIKE_SHOP_CLERK
+ overworld_sprite MrFujiSprite, 12 ; SPRITE_MR_FUJI
+ overworld_sprite GiovanniSprite, 12 ; SPRITE_GIOVANNI
+ overworld_sprite RocketSprite, 12 ; SPRITE_ROCKET
+ overworld_sprite ChannelerSprite, 12 ; SPRITE_CHANNELER
+ overworld_sprite WaiterSprite, 12 ; SPRITE_WAITER
+ overworld_sprite ErikaSprite, 12 ; SPRITE_ERIKA
+ overworld_sprite MiddleAgedWomanSprite, 12 ; SPRITE_MIDDLE_AGED_WOMAN
+ overworld_sprite BrunetteGirlSprite, 12 ; SPRITE_BRUNETTE_GIRL
+ overworld_sprite LanceSprite, 12 ; SPRITE_LANCE
+ overworld_sprite ScientistSprite, 12 ; SPRITE_UNUSED_SCIENTIST
+ overworld_sprite ScientistSprite, 12 ; SPRITE_SCIENTIST
+ overworld_sprite RockerSprite, 12 ; SPRITE_ROCKER
+ overworld_sprite SwimmerSprite, 12 ; SPRITE_SWIMMER
+ overworld_sprite SafariZoneWorkerSprite, 12 ; SPRITE_SAFARI_ZONE_WORKER
+ overworld_sprite GymGuideSprite, 12 ; SPRITE_GYM_GUIDE
+ overworld_sprite GrampsSprite, 12 ; SPRITE_GRAMPS
+ overworld_sprite ClerkSprite, 12 ; SPRITE_CLERK
+ overworld_sprite FishingGuruSprite, 12 ; SPRITE_FISHING_GURU
+ overworld_sprite GrannySprite, 12 ; SPRITE_GRANNY
+ overworld_sprite NurseSprite, 12 ; SPRITE_NURSE
+ overworld_sprite LinkReceptionistSprite, 12 ; SPRITE_LINK_RECEPTIONIST
+ overworld_sprite SilphPresidentSprite, 12 ; SPRITE_SILPH_PRESIDENT
+ overworld_sprite SilphWorkerSprite, 12 ; SPRITE_SILPH_WORKER
+ overworld_sprite WardenSprite, 12 ; SPRITE_WARDEN
+ overworld_sprite CaptainSprite, 12 ; SPRITE_CAPTAIN
+ overworld_sprite FisherSprite, 12 ; SPRITE_FISHER
+ overworld_sprite KogaSprite, 12 ; SPRITE_KOGA
+ overworld_sprite GuardSprite, 12 ; SPRITE_GUARD
+ overworld_sprite GuardSprite, 12 ; SPRITE_UNUSED_GUARD
+ overworld_sprite MomSprite, 12 ; SPRITE_MOM
+ overworld_sprite BaldingGuySprite, 12 ; SPRITE_BALDING_GUY
+ overworld_sprite LittleBoySprite, 12 ; SPRITE_LITTLE_BOY
+ overworld_sprite GameboyKidSprite, 12 ; SPRITE_UNUSED_GAMEBOY_KID
+ overworld_sprite GameboyKidSprite, 12 ; SPRITE_GAMEBOY_KID
+ overworld_sprite FairySprite, 12 ; SPRITE_FAIRY
+ overworld_sprite AgathaSprite, 12 ; SPRITE_AGATHA
+ overworld_sprite BrunoSprite, 12 ; SPRITE_BRUNO
+ overworld_sprite LoreleiSprite, 12 ; SPRITE_LORELEI
+ overworld_sprite SeelSprite, 12 ; SPRITE_SEEL
+ overworld_sprite PokeBallSprite, 4 ; SPRITE_POKE_BALL
+ overworld_sprite FossilSprite, 4 ; SPRITE_FOSSIL
+ overworld_sprite BoulderSprite, 4 ; SPRITE_BOULDER
+ overworld_sprite PaperSprite, 4 ; SPRITE_PAPER
+ overworld_sprite PokedexSprite, 4 ; SPRITE_POKEDEX
+ overworld_sprite ClipboardSprite, 4 ; SPRITE_CLIPBOARD
+ overworld_sprite SnorlaxSprite, 4 ; SPRITE_SNORLAX
+ overworld_sprite OldAmberSprite, 4 ; SPRITE_UNUSED_OLD_AMBER
+ overworld_sprite OldAmberSprite, 4 ; SPRITE_OLD_AMBER
+ overworld_sprite GamblerAsleepSprite, 4 ; SPRITE_UNUSED_GAMBLER_ASLEEP_1
+ overworld_sprite GamblerAsleepSprite, 4 ; SPRITE_UNUSED_GAMBLER_ASLEEP_2
+ overworld_sprite GamblerAsleepSprite, 4 ; SPRITE_GAMBLER_ASLEEP
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -1901,39 +1901,39 @@
ldh a, [hWhoseTurn]
and a
jr z, .playerTurn
- ld hl, SlowbroSprite ; facing down sprite
+ ld hl, MonsterSprite tile 0 ; facing down sprite
ld de, wTempPic + $120
- call CopySlowbroSpriteData
- ld hl, SlowbroSprite + $10
+ call CopyMonsterSpriteData
+ ld hl, MonsterSprite tile 1
ld de, wTempPic + $120 + $70
- call CopySlowbroSpriteData
- ld hl, SlowbroSprite + $20
+ call CopyMonsterSpriteData
+ ld hl, MonsterSprite tile 2
ld de, wTempPic + $120 + $10
- call CopySlowbroSpriteData
- ld hl, SlowbroSprite + $30
+ call CopyMonsterSpriteData
+ ld hl, MonsterSprite tile 3
ld de, wTempPic + $120 + $10 + $70
- call CopySlowbroSpriteData
+ call CopyMonsterSpriteData
jr .next
.playerTurn
- ld hl, SlowbroSprite + $40 ; facing up sprite
+ ld hl, MonsterSprite tile 4 ; facing up sprite
ld de, wTempPic + $120 + $70
- call CopySlowbroSpriteData
- ld hl, SlowbroSprite + $50
+ call CopyMonsterSpriteData
+ ld hl, MonsterSprite tile 5
ld de, wTempPic + $120 + $e0
- call CopySlowbroSpriteData
- ld hl, SlowbroSprite + $60
+ call CopyMonsterSpriteData
+ ld hl, MonsterSprite tile 6
ld de, wTempPic + $120 + $80
- call CopySlowbroSpriteData
- ld hl, SlowbroSprite + $70
+ call CopyMonsterSpriteData
+ ld hl, MonsterSprite tile 7
ld de, wTempPic + $120 + $f0
- call CopySlowbroSpriteData
+ call CopyMonsterSpriteData
.next
call CopyTempPicToMonPic
jp AnimationShowMonPic
-CopySlowbroSpriteData:
- ld bc, $10
- ld a, BANK(SlowbroSprite)
+CopyMonsterSpriteData:
+ ld bc, 1 tiles
+ ld a, BANK(MonsterSprite)
jp FarCopyData2
HideSubstituteShowMonAnim:
--- a/engine/overworld/map_sprites.asm
+++ b/engine/overworld/map_sprites.asm
@@ -98,7 +98,7 @@
push af
ld a, [hl] ; [x#SPRITESTATEDATA2_IMAGEBASEOFFSET]
ld b, a ; b = current sprite picture ID
- cp SPRITE_BALL ; is it a 4-tile sprite?
+ cp FIRST_STILL_SPRITE ; is it a 4-tile sprite?
jr c, .notFourTileSprite
pop af
ldh a, [hFourTileSpriteCount]
--- a/gfx/sprites.asm
+++ b/gfx/sprites.asm
@@ -1,73 +1,73 @@
SECTION "NPC Sprites 1", ROMX
-OakAideSprite:: INCBIN "gfx/sprites/oak_aide.2bpp"
-RockerSprite:: INCBIN "gfx/sprites/rocker.2bpp"
-SwimmerSprite:: INCBIN "gfx/sprites/swimmer.2bpp"
-WhitePlayerSprite:: INCBIN "gfx/sprites/white_player.2bpp"
-GymHelperSprite:: INCBIN "gfx/sprites/gym_helper.2bpp"
-OldPersonSprite:: INCBIN "gfx/sprites/old_person.2bpp"
-MartGuySprite:: INCBIN "gfx/sprites/mart_guy.2bpp"
-FisherSprite:: INCBIN "gfx/sprites/fisher.2bpp"
-OldMediumWomanSprite:: INCBIN "gfx/sprites/old_medium_woman.2bpp"
-NurseSprite:: INCBIN "gfx/sprites/nurse.2bpp"
-CableClubWomanSprite:: INCBIN "gfx/sprites/cable_club_woman.2bpp"
-MrMasterballSprite:: INCBIN "gfx/sprites/mr_masterball.2bpp"
-LaprasGiverSprite:: INCBIN "gfx/sprites/lapras_giver.2bpp"
-WardenSprite:: INCBIN "gfx/sprites/warden.2bpp"
-SsCaptainSprite:: INCBIN "gfx/sprites/ss_captain.2bpp"
-Fisher2Sprite:: INCBIN "gfx/sprites/fisher2.2bpp"
-BlackbeltSprite:: INCBIN "gfx/sprites/blackbelt.2bpp"
-GuardSprite:: INCBIN "gfx/sprites/guard.2bpp"
-BallSprite:: INCBIN "gfx/sprites/ball.2bpp"
-OmanyteSprite:: INCBIN "gfx/sprites/omanyte.2bpp"
-BoulderSprite:: INCBIN "gfx/sprites/boulder.2bpp"
-PaperSheetSprite:: INCBIN "gfx/sprites/paper_sheet.2bpp"
-BookMapDexSprite:: INCBIN "gfx/sprites/book_map_dex.2bpp"
-ClipboardSprite:: INCBIN "gfx/sprites/clipboard.2bpp"
-SnorlaxSprite:: INCBIN "gfx/sprites/snorlax.2bpp"
-OldAmberSprite:: INCBIN "gfx/sprites/old_amber.2bpp"
-LyingOldManSprite:: INCBIN "gfx/sprites/lying_old_man.2bpp"
+ScientistSprite:: INCBIN "gfx/sprites/scientist.2bpp"
+RockerSprite:: INCBIN "gfx/sprites/rocker.2bpp"
+SwimmerSprite:: INCBIN "gfx/sprites/swimmer.2bpp"
+SafariZoneWorkerSprite:: INCBIN "gfx/sprites/safari_zone_worker.2bpp"
+GymGuideSprite:: INCBIN "gfx/sprites/gym_guide.2bpp"
+GrampsSprite:: INCBIN "gfx/sprites/gramps.2bpp"
+ClerkSprite:: INCBIN "gfx/sprites/clerk.2bpp"
+FishingGuruSprite:: INCBIN "gfx/sprites/fishing_guru.2bpp"
+GrannySprite:: INCBIN "gfx/sprites/granny.2bpp"
+NurseSprite:: INCBIN "gfx/sprites/nurse.2bpp"
+LinkReceptionistSprite:: INCBIN "gfx/sprites/link_receptionist.2bpp"
+SilphPresidentSprite:: INCBIN "gfx/sprites/silph_president.2bpp"
+SilphWorkerSprite:: INCBIN "gfx/sprites/silph_worker.2bpp"
+WardenSprite:: INCBIN "gfx/sprites/warden.2bpp"
+CaptainSprite:: INCBIN "gfx/sprites/captain.2bpp"
+FisherSprite:: INCBIN "gfx/sprites/fisher.2bpp"
+KogaSprite:: INCBIN "gfx/sprites/koga.2bpp"
+GuardSprite:: INCBIN "gfx/sprites/guard.2bpp"
+PokeBallSprite:: INCBIN "gfx/sprites/poke_ball.2bpp"
+FossilSprite:: INCBIN "gfx/sprites/fossil.2bpp"
+BoulderSprite:: INCBIN "gfx/sprites/boulder.2bpp"
+PaperSprite:: INCBIN "gfx/sprites/paper.2bpp"
+PokedexSprite:: INCBIN "gfx/sprites/pokedex.2bpp"
+ClipboardSprite:: INCBIN "gfx/sprites/clipboard.2bpp"
+SnorlaxSprite:: INCBIN "gfx/sprites/snorlax.2bpp"
+OldAmberSprite:: INCBIN "gfx/sprites/old_amber.2bpp"
+GamblerAsleepSprite:: INCBIN "gfx/sprites/gambler_asleep.2bpp"
SECTION "NPC Sprites 2", ROMX
-RedCyclingSprite:: INCBIN "gfx/sprites/cycling.2bpp"
-RedSprite:: INCBIN "gfx/sprites/red.2bpp"
-BlueSprite:: INCBIN "gfx/sprites/blue.2bpp"
-OakSprite:: INCBIN "gfx/sprites/oak.2bpp"
-BugCatcherSprite:: INCBIN "gfx/sprites/bug_catcher.2bpp"
-SlowbroSprite:: INCBIN "gfx/sprites/slowbro.2bpp"
-LassSprite:: INCBIN "gfx/sprites/lass.2bpp"
-BlackHairBoy1Sprite:: INCBIN "gfx/sprites/black_hair_boy_1.2bpp"
-LittleGirlSprite:: INCBIN "gfx/sprites/little_girl.2bpp"
-BirdSprite:: INCBIN "gfx/sprites/bird.2bpp"
-FatBaldGuySprite:: INCBIN "gfx/sprites/fat_bald_guy.2bpp"
-GamblerSprite:: INCBIN "gfx/sprites/gambler.2bpp"
-BlackHairBoy2Sprite:: INCBIN "gfx/sprites/black_hair_boy_2.2bpp"
-GirlSprite:: INCBIN "gfx/sprites/girl.2bpp"
-HikerSprite:: INCBIN "gfx/sprites/hiker.2bpp"
-FoulardWomanSprite:: INCBIN "gfx/sprites/foulard_woman.2bpp"
-GentlemanSprite:: INCBIN "gfx/sprites/gentleman.2bpp"
-DaisySprite:: INCBIN "gfx/sprites/daisy.2bpp"
-BikerSprite:: INCBIN "gfx/sprites/biker.2bpp"
-SailorSprite:: INCBIN "gfx/sprites/sailor.2bpp"
-CookSprite:: INCBIN "gfx/sprites/cook.2bpp"
-BikeShopGuySprite:: INCBIN "gfx/sprites/bike_shop_guy.2bpp"
-MrFujiSprite:: INCBIN "gfx/sprites/mr_fuji.2bpp"
-GiovanniSprite:: INCBIN "gfx/sprites/giovanni.2bpp"
-RocketSprite:: INCBIN "gfx/sprites/rocket.2bpp"
-MediumSprite:: INCBIN "gfx/sprites/medium.2bpp"
-WaiterSprite:: INCBIN "gfx/sprites/waiter.2bpp"
-ErikaSprite:: INCBIN "gfx/sprites/erika.2bpp"
-MomGeishaSprite:: INCBIN "gfx/sprites/mom_geisha.2bpp"
-BrunetteGirlSprite:: INCBIN "gfx/sprites/brunette_girl.2bpp"
-LanceSprite:: INCBIN "gfx/sprites/lance.2bpp"
-MomSprite:: INCBIN "gfx/sprites/mom.2bpp"
-BaldingGuySprite:: INCBIN "gfx/sprites/balding_guy.2bpp"
-YoungBoySprite:: INCBIN "gfx/sprites/young_boy.2bpp"
-GameboyKidSprite:: INCBIN "gfx/sprites/gameboy_kid.2bpp"
-ClefairySprite:: INCBIN "gfx/sprites/clefairy.2bpp"
-AgathaSprite:: INCBIN "gfx/sprites/agatha.2bpp"
-BrunoSprite:: INCBIN "gfx/sprites/bruno.2bpp"
-LoreleiSprite:: INCBIN "gfx/sprites/lorelei.2bpp"
-SeelSprite:: INCBIN "gfx/sprites/seel.2bpp"
+RedCyclingSprite:: INCBIN "gfx/sprites/cycling.2bpp"
+RedSprite:: INCBIN "gfx/sprites/red.2bpp"
+BlueSprite:: INCBIN "gfx/sprites/blue.2bpp"
+OakSprite:: INCBIN "gfx/sprites/oak.2bpp"
+YoungsterSprite:: INCBIN "gfx/sprites/youngster.2bpp"
+MonsterSprite:: INCBIN "gfx/sprites/monster.2bpp"
+CooltrainerFSprite:: INCBIN "gfx/sprites/cooltrainer_f.2bpp"
+CooltrainerMSprite:: INCBIN "gfx/sprites/cooltrainer_m.2bpp"
+LittleGirlSprite:: INCBIN "gfx/sprites/little_girl.2bpp"
+BirdSprite:: INCBIN "gfx/sprites/bird.2bpp"
+MiddleAgedManSprite:: INCBIN "gfx/sprites/middle_aged_man.2bpp"
+GamblerSprite:: INCBIN "gfx/sprites/gambler.2bpp"
+SuperNerdSprite:: INCBIN "gfx/sprites/super_nerd.2bpp"
+GirlSprite:: INCBIN "gfx/sprites/girl.2bpp"
+HikerSprite:: INCBIN "gfx/sprites/hiker.2bpp"
+BeautySprite:: INCBIN "gfx/sprites/beauty.2bpp"
+GentlemanSprite:: INCBIN "gfx/sprites/gentleman.2bpp"
+DaisySprite:: INCBIN "gfx/sprites/daisy.2bpp"
+BikerSprite:: INCBIN "gfx/sprites/biker.2bpp"
+SailorSprite:: INCBIN "gfx/sprites/sailor.2bpp"
+CookSprite:: INCBIN "gfx/sprites/cook.2bpp"
+BikeShopClerkSprite:: INCBIN "gfx/sprites/bike_shop_clerk.2bpp"
+MrFujiSprite:: INCBIN "gfx/sprites/mr_fuji.2bpp"
+GiovanniSprite:: INCBIN "gfx/sprites/giovanni.2bpp"
+RocketSprite:: INCBIN "gfx/sprites/rocket.2bpp"
+ChannelerSprite:: INCBIN "gfx/sprites/channeler.2bpp"
+WaiterSprite:: INCBIN "gfx/sprites/waiter.2bpp"
+ErikaSprite:: INCBIN "gfx/sprites/erika.2bpp"
+MiddleAgedWomanSprite:: INCBIN "gfx/sprites/middle_aged_woman.2bpp"
+BrunetteGirlSprite:: INCBIN "gfx/sprites/brunette_girl.2bpp"
+LanceSprite:: INCBIN "gfx/sprites/lance.2bpp"
+MomSprite:: INCBIN "gfx/sprites/mom.2bpp"
+BaldingGuySprite:: INCBIN "gfx/sprites/balding_guy.2bpp"
+LittleBoySprite:: INCBIN "gfx/sprites/little_boy.2bpp"
+GameboyKidSprite:: INCBIN "gfx/sprites/gameboy_kid.2bpp"
+FairySprite:: INCBIN "gfx/sprites/fairy.2bpp"
+AgathaSprite:: INCBIN "gfx/sprites/agatha.2bpp"
+BrunoSprite:: INCBIN "gfx/sprites/bruno.2bpp"
+LoreleiSprite:: INCBIN "gfx/sprites/lorelei.2bpp"
+SeelSprite:: INCBIN "gfx/sprites/seel.2bpp"
binary files a/gfx/sprites/ball.png /dev/null differ
binary files /dev/null b/gfx/sprites/beauty.png differ
binary files /dev/null b/gfx/sprites/bike_shop_clerk.png differ
binary files a/gfx/sprites/bike_shop_guy.png /dev/null differ
binary files a/gfx/sprites/black_hair_boy_1.png /dev/null differ
binary files a/gfx/sprites/black_hair_boy_2.png /dev/null differ
binary files a/gfx/sprites/blackbelt.png /dev/null differ
binary files a/gfx/sprites/book_map_dex.png /dev/null differ
binary files a/gfx/sprites/bug_catcher.png /dev/null differ
binary files a/gfx/sprites/cable_club_woman.png /dev/null differ
binary files /dev/null b/gfx/sprites/captain.png differ
binary files /dev/null b/gfx/sprites/channeler.png differ
binary files a/gfx/sprites/clefairy.png /dev/null differ
binary files /dev/null b/gfx/sprites/clerk.png differ
binary files /dev/null b/gfx/sprites/cooltrainer_f.png differ
binary files /dev/null b/gfx/sprites/cooltrainer_m.png differ
binary files /dev/null b/gfx/sprites/fairy.png differ
binary files a/gfx/sprites/fat_bald_guy.png /dev/null differ
binary files a/gfx/sprites/fisher.png b/gfx/sprites/fisher.png differ
binary files a/gfx/sprites/fisher2.png /dev/null differ
binary files /dev/null b/gfx/sprites/fishing_guru.png differ
binary files /dev/null b/gfx/sprites/fossil.png differ
binary files a/gfx/sprites/foulard_woman.png /dev/null differ
binary files /dev/null b/gfx/sprites/gambler_asleep.png differ
binary files /dev/null b/gfx/sprites/gramps.png differ
binary files /dev/null b/gfx/sprites/granny.png differ
binary files /dev/null b/gfx/sprites/gym_guide.png differ
binary files a/gfx/sprites/gym_helper.png /dev/null differ
binary files /dev/null b/gfx/sprites/koga.png differ
binary files a/gfx/sprites/lapras_giver.png /dev/null differ
binary files a/gfx/sprites/lass.png /dev/null differ
binary files /dev/null b/gfx/sprites/link_receptionist.png differ
binary files /dev/null b/gfx/sprites/little_boy.png differ
binary files a/gfx/sprites/lying_old_man.png /dev/null differ
binary files a/gfx/sprites/mart_guy.png /dev/null differ
binary files a/gfx/sprites/medium.png /dev/null differ
binary files /dev/null b/gfx/sprites/middle_aged_man.png differ
binary files /dev/null b/gfx/sprites/middle_aged_woman.png differ
binary files a/gfx/sprites/mom_geisha.png /dev/null differ
binary files /dev/null b/gfx/sprites/monster.png differ
binary files a/gfx/sprites/mr_masterball.png /dev/null differ
binary files a/gfx/sprites/oak_aide.png /dev/null differ
binary files a/gfx/sprites/old_medium_woman.png /dev/null differ
binary files a/gfx/sprites/old_person.png /dev/null differ
binary files a/gfx/sprites/omanyte.png /dev/null differ
binary files /dev/null b/gfx/sprites/paper.png differ
binary files a/gfx/sprites/paper_sheet.png /dev/null differ
binary files /dev/null b/gfx/sprites/poke_ball.png differ
binary files /dev/null b/gfx/sprites/pokedex.png differ
binary files /dev/null b/gfx/sprites/safari_zone_worker.png differ
binary files /dev/null b/gfx/sprites/scientist.png differ
binary files /dev/null b/gfx/sprites/silph_president.png differ
binary files /dev/null b/gfx/sprites/silph_worker.png differ
binary files a/gfx/sprites/slowbro.png /dev/null differ
binary files a/gfx/sprites/ss_captain.png /dev/null differ
binary files /dev/null b/gfx/sprites/super_nerd.png differ
binary files a/gfx/sprites/white_player.png /dev/null differ
binary files a/gfx/sprites/young_boy.png /dev/null differ
binary files /dev/null b/gfx/sprites/youngster.png differ