summaryrefslogtreecommitdiff
path: root/constants.asm
diff options
context:
space:
mode:
Diffstat (limited to 'constants.asm')
-rw-r--r--constants.asm34
1 files changed, 17 insertions, 17 deletions
diff --git a/constants.asm b/constants.asm
index fa23c0da..6275215c 100644
--- a/constants.asm
+++ b/constants.asm
@@ -1190,30 +1190,30 @@ TRAINER EQU $40
FRZ EQU %00100000
SLP EQU %00000111
-SPRITE_HIRO EQU $01
-SPRITE_RIVAL EQU $02
+SPRITE_RED EQU $01
+SPRITE_BLUE EQU $02
SPRITE_OAK EQU $03
-SPRITE_BLONDE_BOY EQU $04
-SPRITE_MACHOKE_SLOWBRO EQU $05
-SPRITE_BLONDE_PONYTAIL_GIRL EQU $06
+SPRITE_BUG_CATCHER EQU $04
+SPRITE_SLOWBRO EQU $05
+SPRITE_LASS EQU $06
SPRITE_BLACK_HAIR_BOY_1 EQU $07
SPRITE_LITTLE_GIRL EQU $08
SPRITE_BIRD EQU $09
SPRITE_FAT_BALD_GUY EQU $0a
-SPRITE_MONK EQU $0b
+SPRITE_GAMBLER EQU $0b
SPRITE_BLACK_HAIR_BOY_2 EQU $0c
SPRITE_GIRL EQU $0d
SPRITE_HIKER EQU $0e
SPRITE_FOULARD_WOMAN EQU $0f
SPRITE_GENTLEMAN EQU $10
-SPRITE_SISTER EQU $11
+SPRITE_DAISY EQU $11
SPRITE_BIKER EQU $12
SPRITE_SAILOR EQU $13
SPRITE_COOK EQU $14
-SPRITE_SUNGLASSES_GUY EQU $15
+SPRITE_BIKE_SHOP_GUY EQU $15
SPRITE_MR_FUJI EQU $16
SPRITE_GIOVANNI EQU $17
-SPRITE_ROCKET_GRUNT EQU $18
+SPRITE_ROCKET EQU $18
SPRITE_MEDIUM EQU $19
SPRITE_WAITER EQU $1a
SPRITE_ERIKA EQU $1b
@@ -1222,7 +1222,7 @@ SPRITE_BRUNETTE_GIRL EQU $1d
SPRITE_LANCE EQU $1e
SPRITE_OAK_SCIENTIST_AIDE EQU $1f
SPRITE_OAK_AIDE EQU $20
-SPRITE_PUNK EQU $21
+SPRITE_ROCKER EQU $21
SPRITE_SWIMMER EQU $22
SPRITE_WHITE_PLAYER EQU $23
SPRITE_GYM_HELPER EQU $24
@@ -1234,18 +1234,18 @@ SPRITE_NURSE EQU $29
SPRITE_CABLE_CLUB_WOMAN EQU $2a
SPRITE_MR_MASTERBALL EQU $2b
SPRITE_LAPRAS_GIVER EQU $2c
-SPRITE_BALDING_FAT_GUY EQU $2d
+SPRITE_WARDEN EQU $2d
SPRITE_SS_CAPTAIN EQU $2e
-SPRITE_FAT_MAN EQU $2f
-SPRITE_DOJO_GUY EQU $30
-SPRITE_GUARD_COP EQU $31
-SPRITE_COP_GUARD EQU $32
+SPRITE_FISHER2 EQU $2f
+SPRITE_BLACKBELT EQU $30
+SPRITE_GUARD EQU $31
+;SPRITE_COP_GUARD EQU $32
SPRITE_MOM EQU $33
SPRITE_BALDING_GUY EQU $34
-SPRITE_YOUNG_GIRL EQU $35
+SPRITE_YOUNG_BOY EQU $35
SPRITE_GAMEBOY_KID EQU $36
SPRITE_GAMEBOY_KID_COPY EQU $37
-SPRITE_CLEFAIRYLIKE EQU $38
+SPRITE_CLEFAIRY EQU $38
SPRITE_AGATHA EQU $39
SPRITE_BRUNO EQU $3a
SPRITE_LORELEI EQU $3b