summaryrefslogtreecommitdiff
path: root/constants
diff options
context:
space:
mode:
Diffstat (limited to 'constants')
-rw-r--r--constants/gfx_constants.asm11
-rw-r--r--constants/move_animation_constants.asm416
-rwxr-xr-xconstants/oam_constants.asm5
-rwxr-xr-xconstants/sprite_constants.asm147
-rwxr-xr-xconstants/trainer_constants.asm96
5 files changed, 550 insertions, 125 deletions
diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm
index 6446a51f..d6d162c7 100644
--- a/constants/gfx_constants.asm
+++ b/constants/gfx_constants.asm
@@ -29,3 +29,14 @@ TRANSFERBOTTOM EQU 2
; hRedrawRowOrColumnMode
REDRAW_COL EQU 1
REDRAW_ROW EQU 2
+
+; tile list ids
+ const_def
+ const TILEMAP_MON_PIC
+ const TILEMAP_SLIDE_DOWN_MON_PIC_7X5
+ const TILEMAP_SLIDE_DOWN_MON_PIC_7X3
+ const TILEMAP_GENGAR_INTRO_1
+ const TILEMAP_GENGAR_INTRO_2
+ const TILEMAP_GENGAR_INTRO_3
+ const TILEMAP_GAME_BOY
+ const TILEMAP_LINK_CABLE
diff --git a/constants/move_animation_constants.asm b/constants/move_animation_constants.asm
index d2025f4e..6f3839d6 100644
--- a/constants/move_animation_constants.asm
+++ b/constants/move_animation_constants.asm
@@ -1,6 +1,7 @@
; special effects that are part of move animations
-
- const_def $D8
+ const_def $C0
+FIRST_SE_ID EQU const_value
+ const_skip $18
const SE_WAVY_SCREEN ; $D8 used in Psywave/Night Shade/Psychic etc.
const SE_SUBSTITUTE_MON ; $D9 used in Substitute (turns the pokemon into a mini sprite)
const SE_SHAKE_BACK_AND_FORTH ; $DA used in Double Team
@@ -40,3 +41,414 @@
const SE_RESET_SCREEN_PALETTE ; $FC used in Leer/Thunderpunch/etc.
const SE_DARK_SCREEN_PALETTE ; $FD used in Hyper Beam/Thunderpunch/etc.
const SE_DARK_SCREEN_FLASH ; $FE used in Cut/Take Down/etc.
+
+; subanimations that are part of move animations
+ const_def
+ const SUBANIM_00
+ const SUBANIM_01
+ const SUBANIM_02
+ const SUBANIM_03
+ const SUBANIM_04
+ const SUBANIM_05
+ const SUBANIM_06
+ const SUBANIM_07
+ const SUBANIM_08
+ const SUBANIM_09
+ const SUBANIM_0A
+ const SUBANIM_0B
+ const SUBANIM_0C
+ const SUBANIM_0D
+ const SUBANIM_0E
+ const SUBANIM_0F
+ const SUBANIM_10
+ const SUBANIM_11
+ const SUBANIM_12
+ const SUBANIM_13
+ const SUBANIM_14
+ const SUBANIM_15
+ const SUBANIM_16
+ const SUBANIM_17
+ const SUBANIM_18
+ const SUBANIM_19
+ const SUBANIM_1A
+ const SUBANIM_1B
+ const SUBANIM_1C
+ const SUBANIM_1D
+ const SUBANIM_1E
+ const SUBANIM_1F
+ const SUBANIM_20
+ const SUBANIM_21
+ const SUBANIM_22
+ const SUBANIM_23
+ const SUBANIM_24
+ const SUBANIM_25
+ const SUBANIM_26
+ const SUBANIM_27
+ const SUBANIM_28
+ const SUBANIM_29
+ const SUBANIM_2A
+ const SUBANIM_2B
+ const SUBANIM_2C
+ const SUBANIM_2D
+ const SUBANIM_2E
+ const SUBANIM_2F
+ const SUBANIM_30
+ const SUBANIM_31
+ const SUBANIM_32
+ const SUBANIM_33
+ const SUBANIM_34
+ const SUBANIM_35
+ const SUBANIM_36
+ const SUBANIM_37
+ const SUBANIM_38
+ const SUBANIM_39
+ const SUBANIM_3A
+ const SUBANIM_3B
+ const SUBANIM_3C
+ const SUBANIM_3D
+ const SUBANIM_3E
+ const SUBANIM_3F
+ const SUBANIM_40
+ const SUBANIM_41
+ const SUBANIM_42
+ const SUBANIM_43
+ const SUBANIM_44
+ const SUBANIM_45
+ const SUBANIM_46
+ const SUBANIM_47
+ const SUBANIM_48
+ const SUBANIM_49
+ const SUBANIM_4A
+ const SUBANIM_4B
+ const SUBANIM_4C
+ const SUBANIM_4D
+ const SUBANIM_4E
+ const SUBANIM_4F
+ const SUBANIM_50
+ const SUBANIM_51
+ const SUBANIM_52
+ const SUBANIM_53
+ const SUBANIM_54
+ const SUBANIM_55
+
+; types of subanimations
+ const_def
+ const SUBANIMTYPE_NORMAL
+ const SUBANIMTYPE_HVFLIP
+ const SUBANIMTYPE_HFLIP
+ const SUBANIMTYPE_COORDFLIP
+ const SUBANIMTYPE_REVERSE
+ const SUBANIMTYPE_ENEMY
+
+; frame blocks that are part of subanimations
+ const_def
+ const FRAMEBLOCK_00
+ const FRAMEBLOCK_01
+ const FRAMEBLOCK_02
+ const FRAMEBLOCK_03
+ const FRAMEBLOCK_04
+ const FRAMEBLOCK_05
+ const FRAMEBLOCK_06
+ const FRAMEBLOCK_07
+ const FRAMEBLOCK_08
+ const FRAMEBLOCK_09
+ const FRAMEBLOCK_0A
+ const FRAMEBLOCK_0B
+ const FRAMEBLOCK_0C
+ const FRAMEBLOCK_0D
+ const FRAMEBLOCK_0E
+ const FRAMEBLOCK_0F
+ const FRAMEBLOCK_10
+ const FRAMEBLOCK_11
+ const FRAMEBLOCK_12
+ const FRAMEBLOCK_13
+ const FRAMEBLOCK_14
+ const FRAMEBLOCK_15
+ const FRAMEBLOCK_16
+ const FRAMEBLOCK_17
+ const FRAMEBLOCK_18
+ const FRAMEBLOCK_19
+ const FRAMEBLOCK_1A
+ const FRAMEBLOCK_1B
+ const FRAMEBLOCK_1C
+ const FRAMEBLOCK_1D
+ const FRAMEBLOCK_1E
+ const FRAMEBLOCK_1F
+ const FRAMEBLOCK_20
+ const FRAMEBLOCK_21
+ const FRAMEBLOCK_22
+ const FRAMEBLOCK_23
+ const FRAMEBLOCK_24
+ const FRAMEBLOCK_25
+ const FRAMEBLOCK_26
+ const FRAMEBLOCK_27
+ const FRAMEBLOCK_28
+ const FRAMEBLOCK_29
+ const FRAMEBLOCK_2A
+ const FRAMEBLOCK_2B
+ const FRAMEBLOCK_2C
+ const FRAMEBLOCK_2D
+ const FRAMEBLOCK_2E
+ const FRAMEBLOCK_2F
+ const FRAMEBLOCK_30
+ const FRAMEBLOCK_31
+ const FRAMEBLOCK_32
+ const FRAMEBLOCK_33
+ const FRAMEBLOCK_34
+ const FRAMEBLOCK_35
+ const FRAMEBLOCK_36
+ const FRAMEBLOCK_37
+ const FRAMEBLOCK_38
+ const FRAMEBLOCK_39
+ const FRAMEBLOCK_3A
+ const FRAMEBLOCK_3B
+ const FRAMEBLOCK_3C
+ const FRAMEBLOCK_3D
+ const FRAMEBLOCK_3E
+ const FRAMEBLOCK_3F
+ const FRAMEBLOCK_40
+ const FRAMEBLOCK_41
+ const FRAMEBLOCK_42
+ const FRAMEBLOCK_43
+ const FRAMEBLOCK_44
+ const FRAMEBLOCK_45
+ const FRAMEBLOCK_46
+ const FRAMEBLOCK_47
+ const FRAMEBLOCK_SMALL_BLACK_CIRCLE
+ const FRAMEBLOCK_LARGE_BLACK_CIRCLE
+ const FRAMEBLOCK_4A
+ const FRAMEBLOCK_4B
+ const FRAMEBLOCK_4C
+ const FRAMEBLOCK_4D
+ const FRAMEBLOCK_4E
+ const FRAMEBLOCK_4F
+ const FRAMEBLOCK_50
+ const FRAMEBLOCK_51
+ const FRAMEBLOCK_52
+ const FRAMEBLOCK_53
+ const FRAMEBLOCK_54
+ const FRAMEBLOCK_55
+ const FRAMEBLOCK_56
+ const FRAMEBLOCK_57
+ const FRAMEBLOCK_58
+ const FRAMEBLOCK_59
+ const FRAMEBLOCK_5A
+ const FRAMEBLOCK_5B
+ const FRAMEBLOCK_5C
+ const FRAMEBLOCK_5D
+ const FRAMEBLOCK_5E
+ const FRAMEBLOCK_5F
+ const FRAMEBLOCK_60
+ const FRAMEBLOCK_61
+ const FRAMEBLOCK_62
+ const FRAMEBLOCK_63
+ const FRAMEBLOCK_64
+ const FRAMEBLOCK_65
+ const FRAMEBLOCK_66
+ const FRAMEBLOCK_67
+ const FRAMEBLOCK_68
+ const FRAMEBLOCK_69
+ const FRAMEBLOCK_6A
+ const FRAMEBLOCK_6B
+ const FRAMEBLOCK_6C
+ const FRAMEBLOCK_6D
+ const FRAMEBLOCK_6E
+ const FRAMEBLOCK_6F
+ const FRAMEBLOCK_70
+ const FRAMEBLOCK_71
+ const FRAMEBLOCK_72
+ const FRAMEBLOCK_73
+ const FRAMEBLOCK_74
+ const FRAMEBLOCK_75
+ const FRAMEBLOCK_76
+ const FRAMEBLOCK_77
+ const FRAMEBLOCK_78
+ const FRAMEBLOCK_79
+
+; base coordinates that are part of subanimations
+ const_def
+ const BASECOORD_00
+ const BASECOORD_01
+ const BASECOORD_02
+ const BASECOORD_03
+ const BASECOORD_04
+ const BASECOORD_05
+ const BASECOORD_06
+ const BASECOORD_07
+ const BASECOORD_08
+ const BASECOORD_09
+ const BASECOORD_0A
+ const BASECOORD_0B
+ const BASECOORD_0C
+ const BASECOORD_0D
+ const BASECOORD_0E
+ const BASECOORD_0F
+ const BASECOORD_10
+ const BASECOORD_11
+ const BASECOORD_12
+ const BASECOORD_13
+ const BASECOORD_14
+ const BASECOORD_15
+ const BASECOORD_16
+ const BASECOORD_17
+ const BASECOORD_18
+ const BASECOORD_19
+ const BASECOORD_1A
+ const BASECOORD_1B
+ const BASECOORD_1C
+ const BASECOORD_1D
+ const BASECOORD_1E
+ const BASECOORD_1F
+ const BASECOORD_20
+ const BASECOORD_21
+ const BASECOORD_22
+ const BASECOORD_23
+ const BASECOORD_24
+ const BASECOORD_25
+ const BASECOORD_26
+ const BASECOORD_27
+ const BASECOORD_28
+ const BASECOORD_29
+ const BASECOORD_2A
+ const BASECOORD_2B
+ const BASECOORD_2C
+ const BASECOORD_2D
+ const BASECOORD_2E
+ const BASECOORD_2F
+ const BASECOORD_30
+ const BASECOORD_31
+ const BASECOORD_32
+ const BASECOORD_33
+ const BASECOORD_34
+ const BASECOORD_35
+ const BASECOORD_36
+ const BASECOORD_37
+ const BASECOORD_38
+ const BASECOORD_39
+ const BASECOORD_3A
+ const BASECOORD_3B
+ const BASECOORD_3C
+ const BASECOORD_3D
+ const BASECOORD_3E
+ const BASECOORD_3F
+ const BASECOORD_40
+ const BASECOORD_41
+ const BASECOORD_42
+ const BASECOORD_43
+ const BASECOORD_44
+ const BASECOORD_45
+ const BASECOORD_46
+ const BASECOORD_47
+ const BASECOORD_48
+ const BASECOORD_49
+ const BASECOORD_4A
+ const BASECOORD_4B
+ const BASECOORD_4C
+ const BASECOORD_4D
+ const BASECOORD_4E
+ const BASECOORD_4F
+ const BASECOORD_50
+ const BASECOORD_51
+ const BASECOORD_52
+ const BASECOORD_53
+ const BASECOORD_54
+ const BASECOORD_55
+ const BASECOORD_56
+ const BASECOORD_57
+ const BASECOORD_58
+ const BASECOORD_59
+ const BASECOORD_5A
+ const BASECOORD_5B
+ const BASECOORD_5C
+ const BASECOORD_5D
+ const BASECOORD_5E
+ const BASECOORD_5F
+ const BASECOORD_60
+ const BASECOORD_61
+ const BASECOORD_62
+ const BASECOORD_63
+ const BASECOORD_64
+ const BASECOORD_65
+ const BASECOORD_66
+ const BASECOORD_67
+ const BASECOORD_68
+ const BASECOORD_69
+ const BASECOORD_6A
+ const BASECOORD_6B
+ const BASECOORD_6C
+ const BASECOORD_6D
+ const BASECOORD_6E
+ const BASECOORD_6F
+ const BASECOORD_70
+ const BASECOORD_71
+ const BASECOORD_72
+ const BASECOORD_73
+ const BASECOORD_74
+ const BASECOORD_75
+ const BASECOORD_76
+ const BASECOORD_77
+ const BASECOORD_78
+ const BASECOORD_79
+ const BASECOORD_7A
+ const BASECOORD_7B
+ const BASECOORD_7C
+ const BASECOORD_7D
+ const BASECOORD_7E
+ const BASECOORD_7F
+ const BASECOORD_80
+ const BASECOORD_81
+ const BASECOORD_82
+ const BASECOORD_83
+ const BASECOORD_84
+ const BASECOORD_85
+ const BASECOORD_86
+ const BASECOORD_87
+ const BASECOORD_88
+ const BASECOORD_89
+ const BASECOORD_8A
+ const BASECOORD_8B
+ const BASECOORD_8C
+ const BASECOORD_8D
+ const BASECOORD_8E
+ const BASECOORD_8F
+ const BASECOORD_90
+ const BASECOORD_91
+ const BASECOORD_92
+ const BASECOORD_93
+ const BASECOORD_94
+ const BASECOORD_95
+ const BASECOORD_96
+ const BASECOORD_97
+ const BASECOORD_98
+ const BASECOORD_99
+ const BASECOORD_9A
+ const BASECOORD_9B
+ const BASECOORD_9C
+ const BASECOORD_9D
+ const BASECOORD_9E
+ const BASECOORD_9F
+ const BASECOORD_A0
+ const BASECOORD_A1
+ const BASECOORD_A2
+ const BASECOORD_A3
+ const BASECOORD_A4
+ const BASECOORD_A5
+ const BASECOORD_A6
+ const BASECOORD_A7
+ const BASECOORD_A8
+ const BASECOORD_A9
+ const BASECOORD_AA
+ const BASECOORD_AB
+ const BASECOORD_AC
+ const BASECOORD_AD
+ const BASECOORD_AE
+ const BASECOORD_AF
+ const BASECOORD_B0
+
+; frame block modes that are part of subanimations
+ const_def
+ const FRAMEBLOCKMODE_00
+ const FRAMEBLOCKMODE_01
+ const FRAMEBLOCKMODE_02
+ const FRAMEBLOCKMODE_03
+ const FRAMEBLOCKMODE_04
diff --git a/constants/oam_constants.asm b/constants/oam_constants.asm
index 2d34048d..f0f06025 100755
--- a/constants/oam_constants.asm
+++ b/constants/oam_constants.asm
@@ -13,6 +13,7 @@ OAM_Y_FLIP EQU 6
OAM_PRIORITY EQU 7 ; 0: OBJ above BG, 1: OBJ behind BG (colors 1-3)
; OAM attribute masks
-OAM_HFLIP EQU 1 << OAM_X_FLIP ; horizontal flip
-OAM_VFLIP EQU 1 << OAM_Y_FLIP ; vertical flip
+OAM_OBP1 EQU 1 << OAM_OBP_NUM ; OBJ palette 1
+OAM_HFLIP EQU 1 << OAM_X_FLIP ; horizontal flip
+OAM_VFLIP EQU 1 << OAM_Y_FLIP ; vertical flip
OAM_BEHIND_BG EQU 1 << OAM_PRIORITY ; behind bg (except color 0)
diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm
index 939ab2df..dc8352de 100755
--- 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
diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm
index 878fac26..8e29b715 100755
--- a/constants/trainer_constants.asm
+++ b/constants/trainer_constants.asm
@@ -6,51 +6,51 @@ OPP_\1 EQU OPP_ID_OFFSET + \1
ENDM
const_def
- trainer_const NOBODY ; $00
- trainer_const YOUNGSTER ; $01
- trainer_const BUG_CATCHER ; $02
- trainer_const LASS ; $03
- trainer_const SAILOR ; $04
- trainer_const JR_TRAINER_M ; $05
- trainer_const JR_TRAINER_F ; $06
- trainer_const POKEMANIAC ; $07
- trainer_const SUPER_NERD ; $08
- trainer_const HIKER ; $09
- trainer_const BIKER ; $0A
- trainer_const BURGLAR ; $0B
- trainer_const ENGINEER ; $0C
- trainer_const JUGGLER_X ; $0D
- trainer_const FISHER ; $0E
- trainer_const SWIMMER ; $0F
- trainer_const CUE_BALL ; $10
- trainer_const GAMBLER ; $11
- trainer_const BEAUTY ; $12
- trainer_const PSYCHIC_TR ; $13
- trainer_const ROCKER ; $14
- trainer_const JUGGLER ; $15
- trainer_const TAMER ; $16
- trainer_const BIRD_KEEPER ; $17
- trainer_const BLACKBELT ; $18
- trainer_const SONY1 ; $19
- trainer_const PROF_OAK ; $1A
- trainer_const CHIEF ; $1B
- trainer_const SCIENTIST ; $1C
- trainer_const GIOVANNI ; $1D
- trainer_const ROCKET ; $1E
- trainer_const COOLTRAINER_M ; $1F
- trainer_const COOLTRAINER_F ; $20
- trainer_const BRUNO ; $21
- trainer_const BROCK ; $22
- trainer_const MISTY ; $23
- trainer_const LT_SURGE ; $24
- trainer_const ERIKA ; $25
- trainer_const KOGA ; $26
- trainer_const BLAINE ; $27
- trainer_const SABRINA ; $28
- trainer_const GENTLEMAN ; $29
- trainer_const SONY2 ; $2A
- trainer_const SONY3 ; $2B
- trainer_const LORELEI ; $2C
- trainer_const CHANNELER ; $2D
- trainer_const AGATHA ; $2E
- trainer_const LANCE ; $2F
+ trainer_const NOBODY ; $00
+ trainer_const YOUNGSTER ; $01
+ trainer_const BUG_CATCHER ; $02
+ trainer_const LASS ; $03
+ trainer_const SAILOR ; $04
+ trainer_const JR_TRAINER_M ; $05
+ trainer_const JR_TRAINER_F ; $06
+ trainer_const POKEMANIAC ; $07
+ trainer_const SUPER_NERD ; $08
+ trainer_const HIKER ; $09
+ trainer_const BIKER ; $0A
+ trainer_const BURGLAR ; $0B
+ trainer_const ENGINEER ; $0C
+ trainer_const UNUSED_JUGGLER ; $0D
+ trainer_const FISHER ; $0E
+ trainer_const SWIMMER ; $0F
+ trainer_const CUE_BALL ; $10
+ trainer_const GAMBLER ; $11
+ trainer_const BEAUTY ; $12
+ trainer_const PSYCHIC_TR ; $13
+ trainer_const ROCKER ; $14
+ trainer_const JUGGLER ; $15
+ trainer_const TAMER ; $16
+ trainer_const BIRD_KEEPER ; $17
+ trainer_const BLACKBELT ; $18
+ trainer_const RIVAL1 ; $19
+ trainer_const PROF_OAK ; $1A
+ trainer_const CHIEF ; $1B
+ trainer_const SCIENTIST ; $1C
+ trainer_const GIOVANNI ; $1D
+ trainer_const ROCKET ; $1E
+ trainer_const COOLTRAINER_M ; $1F
+ trainer_const COOLTRAINER_F ; $20
+ trainer_const BRUNO ; $21
+ trainer_const BROCK ; $22
+ trainer_const MISTY ; $23
+ trainer_const LT_SURGE ; $24
+ trainer_const ERIKA ; $25
+ trainer_const KOGA ; $26
+ trainer_const BLAINE ; $27
+ trainer_const SABRINA ; $28
+ trainer_const GENTLEMAN ; $29
+ trainer_const RIVAL2 ; $2A
+ trainer_const RIVAL3 ; $2B
+ trainer_const LORELEI ; $2C
+ trainer_const CHANNELER ; $2D
+ trainer_const AGATHA ; $2E
+ trainer_const LANCE ; $2F