Merge pull request #279 from Rangi42/master

Identify sprite and battle animation data
2026-04-08 19:40:40 +12:00 · 2020-07-19 23:04:16 -04:00 · 2020-07-19 23:04:16 -04:00 · 0177688ad4
commit 0177688ad4
parent d44c7c305c df62b8e81a
276 changed files with 4961 additions and 4491 deletions
--- a/2
+++ b/2
@ -122,6 +122,8 @@ gfx/intro_credits/blue_jigglypuff_3.2bpp: rgbgfx += -h
 gfx/intro_credits/red_nidorino_1.2bpp: rgbgfx += -h
 gfx/intro_credits/red_nidorino_2.2bpp: rgbgfx += -h
 gfx/intro_credits/red_nidorino_3.2bpp: rgbgfx += -h
+gfx/intro_credits/gengar.2bpp: rgbgfx += -h
+gfx/intro_credits/gengar.2bpp: tools/gfx += --remove-duplicates --preserve=0x19,0x76

 gfx/intro_credits/the_end.2bpp: tools/gfx += --interleave --png=$<

--- a/audio/low_health_alarm.asm
+++ b/audio/low_health_alarm.asm
@ -61,15 +61,20 @@ Music_DoLowHealthAlarm::
 	jr nz, .copyLoop
 	ret

+alarm_tone: MACRO
+	db \1 ; length
+	db \2 ; envelope
+	dw \3 ; frequency
+ENDM
+
 ;bytes to write to sound channel 1 registers for health alarm.
-;starting at FF11 (FF10 is always zeroed), so these bytes are:
-;length, envelope, freq lo, freq hi
+;starting at FF11 (FF10 is always zeroed).
 .toneDataHi
-	db $A0,$E2,$50,$87
+	alarm_tone $A0, $E2, $8750

 .toneDataLo
-	db $B0,$E2,$EE,$86
+	alarm_tone $B0, $E2, $86EE

 ;written to stop the alarm
 .toneDataSilence
-	db $00,$00,$00,$80
+	alarm_tone $00, $00, $8000
--- a/audio/play_battle_music.asm
+++ b/audio/play_battle_music.asm
@ -16,7 +16,7 @@ PlayBattleMusic::
 	ld a, [wCurOpponent]
 	cp OPP_ID_OFFSET
 	jr c, .wildBattle
-	cp OPP_SONY3
+	cp OPP_RIVAL3
 	jr z, .finalBattle
 	cp OPP_LANCE
 	jr nz, .normalTrainerBattle
--- 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
--- 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
--- 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)
--- 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/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
--- a/data/battle_anims/base_coords.asm
+++ b/data/battle_anims/base_coords.asm
@ -0,0 +1,178 @@
+FrameBlockBaseCoords:
+	db $10, $68 ; BASECOORD_00
+	db $10, $70 ; BASECOORD_01
+	db $10, $78 ; BASECOORD_02
+	db $10, $80 ; BASECOORD_03
+	db $10, $88 ; BASECOORD_04
+	db $10, $90 ; BASECOORD_05
+	db $10, $98 ; BASECOORD_06
+	db $18, $68 ; BASECOORD_07
+	db $18, $70 ; BASECOORD_08
+	db $18, $78 ; BASECOORD_09
+	db $34, $28 ; BASECOORD_0A
+	db $18, $80 ; BASECOORD_0B
+	db $18, $88 ; BASECOORD_0C
+	db $18, $98 ; BASECOORD_0D
+	db $20, $68 ; BASECOORD_0E
+	db $20, $70 ; BASECOORD_0F
+	db $20, $78 ; BASECOORD_10
+	db $20, $80 ; BASECOORD_11
+	db $20, $88 ; BASECOORD_12
+	db $20, $90 ; BASECOORD_13
+	db $20, $98 ; BASECOORD_14
+	db $28, $68 ; BASECOORD_15
+	db $28, $70 ; BASECOORD_16
+	db $28, $78 ; BASECOORD_17
+	db $28, $80 ; BASECOORD_18
+	db $28, $88 ; BASECOORD_19
+	db $30, $68 ; BASECOORD_1A
+	db $30, $70 ; BASECOORD_1B
+	db $30, $78 ; BASECOORD_1C
+	db $30, $80 ; BASECOORD_1D
+	db $30, $90 ; BASECOORD_1E
+	db $30, $98 ; BASECOORD_1F
+	db $38, $68 ; BASECOORD_20
+	db $38, $78 ; BASECOORD_21
+	db $38, $80 ; BASECOORD_22
+	db $38, $88 ; BASECOORD_23
+	db $40, $68 ; BASECOORD_24
+	db $40, $70 ; BASECOORD_25
+	db $40, $78 ; BASECOORD_26
+	db $40, $80 ; BASECOORD_27
+	db $40, $88 ; BASECOORD_28
+	db $40, $98 ; BASECOORD_29
+	db $10, $60 ; BASECOORD_2A
+	db $18, $60 ; BASECOORD_2B
+	db $20, $60 ; BASECOORD_2C
+	db $28, $60 ; BASECOORD_2D
+	db $30, $60 ; BASECOORD_2E
+	db $40, $60 ; BASECOORD_2F
+	db $58, $28 ; BASECOORD_30
+	db $43, $38 ; BASECOORD_31
+	db $33, $48 ; BASECOORD_32
+	db $20, $58 ; BASECOORD_33
+	db $32, $78 ; BASECOORD_34
+	db $58, $58 ; BASECOORD_35
+	db $2C, $6C ; BASECOORD_36
+	db $34, $80 ; BASECOORD_37
+	db $48, $70 ; BASECOORD_38
+	db $42, $36 ; BASECOORD_39
+	db $38, $44 ; BASECOORD_3A
+	db $40, $52 ; BASECOORD_3B
+	db $48, $60 ; BASECOORD_3C
+	db $3E, $6E ; BASECOORD_3D
+	db $28, $7C ; BASECOORD_3E
+	db $28, $8A ; BASECOORD_3F
+	db $50, $3C ; BASECOORD_40
+	db $48, $50 ; BASECOORD_41
+	db $40, $64 ; BASECOORD_42
+	db $38, $38 ; BASECOORD_43
+	db $50, $30 ; BASECOORD_44
+	db $50, $38 ; BASECOORD_45
+	db $50, $40 ; BASECOORD_46
+	db $50, $48 ; BASECOORD_47
+	db $50, $50 ; BASECOORD_48
+	db $48, $58 ; BASECOORD_49
+	db $50, $44 ; BASECOORD_4A
+	db $48, $48 ; BASECOORD_4B
+	db $48, $4C ; BASECOORD_4C
+	db $40, $50 ; BASECOORD_4D
+	db $40, $54 ; BASECOORD_4E
+	db $38, $58 ; BASECOORD_4F
+	db $38, $5C ; BASECOORD_50
+	db $30, $64 ; BASECOORD_51
+	db $48, $40 ; BASECOORD_52
+	db $48, $39 ; BASECOORD_53
+	db $24, $88 ; BASECOORD_54
+	db $24, $70 ; BASECOORD_55
+	db $1C, $70 ; BASECOORD_56
+	db $1C, $88 ; BASECOORD_57
+	db $34, $68 ; BASECOORD_58
+	db $34, $88 ; BASECOORD_59
+	db $68, $50 ; BASECOORD_5A
+	db $60, $50 ; BASECOORD_5B
+	db $68, $60 ; BASECOORD_5C
+	db $58, $50 ; BASECOORD_5D
+	db $60, $60 ; BASECOORD_5E
+	db $68, $40 ; BASECOORD_5F
+	db $40, $40 ; BASECOORD_60
+	db $38, $40 ; BASECOORD_61
+	db $0B, $60 ; BASECOORD_62
+	db $44, $48 ; BASECOORD_63
+	db $40, $14 ; BASECOORD_64
+	db $48, $1C ; BASECOORD_65
+	db $50, $24 ; BASECOORD_66
+	db $4C, $24 ; BASECOORD_67
+	db $10, $62 ; BASECOORD_68
+	db $12, $62 ; BASECOORD_69
+	db $12, $60 ; BASECOORD_6A
+	db $20, $72 ; BASECOORD_6B
+	db $22, $72 ; BASECOORD_6C
+	db $22, $70 ; BASECOORD_6D
+	db $28, $62 ; BASECOORD_6E
+	db $50, $0A ; BASECOORD_6F
+	db $52, $0A ; BASECOORD_70
+	db $38, $30 ; BASECOORD_71
+	db $40, $48 ; BASECOORD_72
+	db $30, $48 ; BASECOORD_73
+	db $40, $30 ; BASECOORD_74
+	db $30, $40 ; BASECOORD_75
+	db $38, $48 ; BASECOORD_76
+	db $40, $4A ; BASECOORD_77
+	db $48, $4B ; BASECOORD_78
+	db $50, $4C ; BASECOORD_79
+	db $58, $4D ; BASECOORD_7A
+	db $60, $4D ; BASECOORD_7B
+	db $68, $4D ; BASECOORD_7C
+	db $38, $10 ; BASECOORD_7D
+	db $50, $10 ; BASECOORD_7E
+	db $38, $28 ; BASECOORD_7F
+	db $48, $18 ; BASECOORD_80
+	db $40, $20 ; BASECOORD_81
+	db $48, $20 ; BASECOORD_82
+	db $40, $3C ; BASECOORD_83
+	db $38, $50 ; BASECOORD_84
+	db $28, $64 ; BASECOORD_85
+	db $1C, $90 ; BASECOORD_86
+	db $24, $80 ; BASECOORD_87
+	db $2C, $70 ; BASECOORD_88
+	db $30, $38 ; BASECOORD_89
+	db $10, $50 ; BASECOORD_8A
+	db $3C, $40 ; BASECOORD_8B
+	db $40, $58 ; BASECOORD_8C
+	db $30, $58 ; BASECOORD_8D
+	db $58, $48 ; BASECOORD_8E
+	db $50, $58 ; BASECOORD_8F
+	db $48, $68 ; BASECOORD_90
+	db $40, $18 ; BASECOORD_91
+	db $28, $58 ; BASECOORD_92
+	db $40, $38 ; BASECOORD_93
+	db $48, $38 ; BASECOORD_94
+	db $08, $70 ; BASECOORD_95
+	db $44, $1C ; BASECOORD_96
+	db $3C, $58 ; BASECOORD_97
+	db $38, $60 ; BASECOORD_98
+	db $08, $60 ; BASECOORD_99
+	db $38, $70 ; BASECOORD_9A
+	db $38, $6C ; BASECOORD_9B
+	db $38, $64 ; BASECOORD_9C
+	db $1C, $74 ; BASECOORD_9D
+	db $2E, $74 ; BASECOORD_9E
+	db $34, $50 ; BASECOORD_9F
+	db $2F, $60 ; BASECOORD_A0
+	db $31, $70 ; BASECOORD_A1
+	db $4C, $30 ; BASECOORD_A2
+	db $3B, $40 ; BASECOORD_A3
+	db $2D, $50 ; BASECOORD_A4
+	db $26, $60 ; BASECOORD_A5
+	db $2D, $70 ; BASECOORD_A6
+	db $28, $50 ; BASECOORD_A7
+	db $1E, $60 ; BASECOORD_A8
+	db $29, $70 ; BASECOORD_A9
+	db $16, $60 ; BASECOORD_AA
+	db $14, $58 ; BASECOORD_AB
+	db $12, $54 ; BASECOORD_AC
+	db $14, $50 ; BASECOORD_AD
+	db $18, $4C ; BASECOORD_AE
+	db $1C, $48 ; BASECOORD_AF
+	db $48, $28 ; BASECOORD_B0
--- a/data/battle_anims/frame_blocks.asm
+++ b/data/battle_anims/frame_blocks.asm
--- a/data/battle_anims/special_effect_pointers.asm
+++ b/data/battle_anims/special_effect_pointers.asm
@ -0,0 +1,47 @@
+special_effect: MACRO
+	db \1
+	dw \2
+ENDM
+
+SpecialEffectPointers:
+	; special effect id, effect routine address
+	special_effect SE_DARK_SCREEN_FLASH,         AnimationFlashScreen             ; $FE
+	special_effect SE_DARK_SCREEN_PALETTE,       AnimationDarkScreenPalette       ; $FD
+	special_effect SE_RESET_SCREEN_PALETTE,      AnimationResetScreenPalette      ; $FC
+	special_effect SE_SHAKE_SCREEN,              AnimationShakeScreen             ; $FB
+	special_effect SE_WATER_DROPLETS_EVERYWHERE, AnimationWaterDropletsEverywhere ; $FA
+	special_effect SE_DARKEN_MON_PALETTE,        AnimationDarkenMonPalette        ; $F9
+	special_effect SE_FLASH_SCREEN_LONG,         AnimationFlashScreenLong         ; $F8
+	special_effect SE_SLIDE_MON_UP,              AnimationSlideMonUp              ; $F7
+	special_effect SE_SLIDE_MON_DOWN,            AnimationSlideMonDown            ; $F6
+	special_effect SE_FLASH_MON_PIC,             AnimationFlashMonPic             ; $F5
+	special_effect SE_SLIDE_MON_OFF,             AnimationSlideMonOff             ; $F4
+	special_effect SE_BLINK_MON,                 AnimationBlinkMon                ; $F3
+	special_effect SE_MOVE_MON_HORIZONTALLY,     AnimationMoveMonHorizontally     ; $F2
+	special_effect SE_RESET_MON_POSITION,        AnimationResetMonPosition        ; $F1
+	special_effect SE_LIGHT_SCREEN_PALETTE,      AnimationLightScreenPalette      ; $F0
+	special_effect SE_HIDE_MON_PIC,              AnimationHideMonPic              ; $EF
+	special_effect SE_SQUISH_MON_PIC,            AnimationSquishMonPic            ; $EE
+	special_effect SE_SHOOT_BALLS_UPWARD,        AnimationShootBallsUpward        ; $ED
+	special_effect SE_SHOOT_MANY_BALLS_UPWARD,   AnimationShootManyBallsUpward    ; $EC
+	special_effect SE_BOUNCE_UP_AND_DOWN,        AnimationBoundUpAndDown          ; $EB
+	special_effect SE_MINIMIZE_MON,              AnimationMinimizeMon             ; $EA
+	special_effect SE_SLIDE_MON_DOWN_AND_HIDE,   AnimationSlideMonDownAndHide     ; $E9
+	special_effect SE_TRANSFORM_MON,             AnimationTransformMon            ; $E8
+	special_effect SE_LEAVES_FALLING,            AnimationLeavesFalling           ; $E7
+	special_effect SE_PETALS_FALLING,            AnimationPetalsFalling           ; $E6
+	special_effect SE_SLIDE_MON_HALF_OFF,        AnimationSlideMonHalfOff         ; $E5
+	special_effect SE_SHAKE_ENEMY_HUD,           AnimationShakeEnemyHUD           ; $E4
+	special_effect SE_SHAKE_ENEMY_HUD_2,         AnimationShakeEnemyHUD           ; $E3 unused
+	special_effect SE_SPIRAL_BALLS_INWARD,       AnimationSpiralBallsInward       ; $E2
+	special_effect SE_DELAY_ANIMATION_10,        AnimationDelay10                 ; $E1
+	special_effect SE_FLASH_ENEMY_MON_PIC,       AnimationFlashEnemyMonPic        ; $E0 unused
+	special_effect SE_HIDE_ENEMY_MON_PIC,        AnimationHideEnemyMonPic         ; $DF
+	special_effect SE_BLINK_ENEMY_MON,           AnimationBlinkEnemyMon           ; $DE
+	special_effect SE_SHOW_MON_PIC,              AnimationShowMonPic              ; $DD
+	special_effect SE_SHOW_ENEMY_MON_PIC,        AnimationShowEnemyMonPic         ; $DC
+	special_effect SE_SLIDE_ENEMY_MON_OFF,       AnimationSlideEnemyMonOff        ; $DB
+	special_effect SE_SHAKE_BACK_AND_FORTH,      AnimationShakeBackAndForth       ; $DA
+	special_effect SE_SUBSTITUTE_MON,            AnimationSubstitute              ; $D9
+	special_effect SE_WAVY_SCREEN,               AnimationWavyScreen              ; $D8
+	db -1 ; end
--- a/data/battle_anims/special_effects.asm
+++ b/data/battle_anims/special_effects.asm
@ -0,0 +1,32 @@
+anim_special_effect: MACRO
+	db \1
+	dw \2
+ENDM
+
+AnimationIdSpecialEffects:
+	; animation id, effect routine address
+	anim_special_effect MEGA_PUNCH,            AnimationFlashScreen
+	anim_special_effect GUILLOTINE,            AnimationFlashScreen
+	anim_special_effect MEGA_KICK,             AnimationFlashScreen
+	anim_special_effect HEADBUTT,              AnimationFlashScreen
+	anim_special_effect TAIL_WHIP,             TailWhipAnimationUnused
+	anim_special_effect GROWL,                 DoGrowlSpecialEffects
+	anim_special_effect DISABLE,               AnimationFlashScreen
+	anim_special_effect BLIZZARD,              DoBlizzardSpecialEffects
+	anim_special_effect BUBBLEBEAM,            AnimationFlashScreen
+	anim_special_effect HYPER_BEAM,            FlashScreenEveryFourFrameBlocks
+	anim_special_effect THUNDERBOLT,           FlashScreenEveryEightFrameBlocks
+	anim_special_effect REFLECT,               AnimationFlashScreen
+	anim_special_effect SELFDESTRUCT,          DoExplodeSpecialEffects
+	anim_special_effect SPORE,                 AnimationFlashScreen
+	anim_special_effect EXPLOSION,             DoExplodeSpecialEffects
+	anim_special_effect ROCK_SLIDE,            DoRockSlideSpecialEffects
+	anim_special_effect TRADE_BALL_DROP_ANIM,  TradeHidePokemon
+	anim_special_effect TRADE_BALL_SHAKE_ANIM, TradeShakePokeball
+	anim_special_effect TRADE_BALL_TILT_ANIM,  TradeJumpPokeball
+	anim_special_effect TOSS_ANIM,             DoBallTossSpecialEffects
+	anim_special_effect SHAKE_ANIM,            DoBallShakeSpecialEffects
+	anim_special_effect POOF_ANIM,             DoPoofSpecialEffects
+	anim_special_effect GREATTOSS_ANIM,        DoBallTossSpecialEffects
+	anim_special_effect ULTRATOSS_ANIM,        DoBallTossSpecialEffects
+	db -1 ; end
--- a/data/battle_anims/subanimations.asm
+++ b/data/battle_anims/subanimations.asm
@ -0,0 +1,954 @@
+SubanimationPointers:
+	dw Subanimation00
+	dw Subanimation01
+	dw Subanimation02
+	dw Subanimation03
+	dw Subanimation04
+	dw Subanimation05
+	dw Subanimation06
+	dw Subanimation07
+	dw Subanimation08
+	dw Subanimation09
+	dw Subanimation0a
+	dw Subanimation0b
+	dw Subanimation0c
+	dw Subanimation0d
+	dw Subanimation0e
+	dw Subanimation0f
+	dw Subanimation10
+	dw Subanimation11
+	dw Subanimation12
+	dw Subanimation13
+	dw Subanimation14
+	dw Subanimation15
+	dw Subanimation16
+	dw Subanimation17
+	dw Subanimation18
+	dw Subanimation19
+	dw Subanimation1a
+	dw Subanimation1b
+	dw Subanimation1c
+	dw Subanimation1d
+	dw Subanimation1e
+	dw Subanimation1f
+	dw Subanimation20
+	dw Subanimation21
+	dw Subanimation22
+	dw Subanimation23
+	dw Subanimation24
+	dw Subanimation25
+	dw Subanimation26
+	dw Subanimation27
+	dw Subanimation28
+	dw Subanimation29
+	dw Subanimation2a
+	dw Subanimation2b
+	dw Subanimation2c
+	dw Subanimation2d
+	dw Subanimation2e
+	dw Subanimation2f
+	dw Subanimation30
+	dw Subanimation31
+	dw Subanimation32
+	dw Subanimation33
+	dw Subanimation34
+	dw Subanimation35
+	dw Subanimation36
+	dw Subanimation37
+	dw Subanimation38
+	dw Subanimation39
+	dw Subanimation3a
+	dw Subanimation3b
+	dw Subanimation3c
+	dw Subanimation3d
+	dw Subanimation3e
+	dw Subanimation3f
+	dw Subanimation40
+	dw Subanimation41
+	dw Subanimation42
+	dw Subanimation43
+	dw Subanimation44
+	dw Subanimation45
+	dw Subanimation46
+	dw Subanimation47
+	dw Subanimation48
+	dw Subanimation49
+	dw Subanimation4a
+	dw Subanimation4b
+	dw Subanimation4c
+	dw Subanimation4d
+	dw Subanimation4e
+	dw Subanimation4f
+	dw Subanimation50
+	dw Subanimation51
+	dw Subanimation52
+	dw Subanimation53
+	dw Subanimation54
+	dw Subanimation55
+
+; format:
+; subanim type, count
+; REPT count
+;     db frame block id, base coordinate id, frame block mode
+; endr
+
+subanim: MACRO
+	db (\1 << 5) | \2
+ENDM
+
+Subanimation04:
+	subanim SUBANIMTYPE_HFLIP, 3
+	db FRAMEBLOCK_02, BASECOORD_1A, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_02, BASECOORD_10, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_02, BASECOORD_03, FRAMEBLOCKMODE_00
+
+Subanimation05:
+	subanim SUBANIMTYPE_HFLIP, 1
+	db FRAMEBLOCK_02, BASECOORD_10, FRAMEBLOCKMODE_00
+
+Subanimation08:
+	subanim SUBANIMTYPE_NORMAL, 11
+	db FRAMEBLOCK_03, BASECOORD_30, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_44, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_94, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_60, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_76, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_9F, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_8D, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_A0, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_1A, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_A1, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_34, FRAMEBLOCKMODE_00
+
+Subanimation07:
+	subanim SUBANIMTYPE_NORMAL, 11
+	db FRAMEBLOCK_03, BASECOORD_30, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_A2, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_31, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_A3, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_32, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_A4, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_92, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_A5, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_15, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_A6, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_34, FRAMEBLOCKMODE_00
+
+Subanimation06:
+	subanim SUBANIMTYPE_NORMAL, 11
+	db FRAMEBLOCK_03, BASECOORD_30, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_A2, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_93, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_61, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_73, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_A7, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_33, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_A8, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_0E, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_A9, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_34, FRAMEBLOCKMODE_00
+
+Subanimation09:
+	subanim SUBANIMTYPE_NORMAL, 4
+	db FRAMEBLOCK_03, BASECOORD_21, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_04, BASECOORD_21, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_03, BASECOORD_21, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_05, BASECOORD_21, FRAMEBLOCKMODE_04
+
+Subanimation0a:
+	subanim SUBANIMTYPE_HFLIP, 6
+	db FRAMEBLOCK_06, BASECOORD_1B, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_07, BASECOORD_1B, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_08, BASECOORD_36, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_09, BASECOORD_36, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_0A, BASECOORD_15, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_0A, BASECOORD_15, FRAMEBLOCKMODE_00
+
+Subanimation0b:
+	subanim SUBANIMTYPE_NORMAL, 4
+	db FRAMEBLOCK_01, BASECOORD_2D, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_2F, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_35, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_4D, FRAMEBLOCKMODE_00
+
+Subanimation55:
+	subanim SUBANIMTYPE_HFLIP, 1
+	db FRAMEBLOCK_01, BASECOORD_9D, FRAMEBLOCKMODE_00
+
+Subanimation11:
+	subanim SUBANIMTYPE_HFLIP, 12
+	db FRAMEBLOCK_0B, BASECOORD_26, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_0C, BASECOORD_26, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_0B, BASECOORD_26, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_0C, BASECOORD_26, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_0B, BASECOORD_28, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_0C, BASECOORD_28, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_0B, BASECOORD_28, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_0C, BASECOORD_28, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_0B, BASECOORD_27, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_0C, BASECOORD_27, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_0B, BASECOORD_27, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_0C, BASECOORD_27, FRAMEBLOCKMODE_00
+
+Subanimation2b:
+	subanim SUBANIMTYPE_HFLIP, 11
+	db FRAMEBLOCK_0D, BASECOORD_03, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_0E, BASECOORD_03, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_0F, BASECOORD_03, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_0D, BASECOORD_11, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_0D, BASECOORD_11, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_0D, BASECOORD_37, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_0D, BASECOORD_37, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_10, BASECOORD_21, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_10, BASECOORD_21, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_11, BASECOORD_1B, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_11, BASECOORD_1B, FRAMEBLOCKMODE_00
+
+Subanimation2c:
+	subanim SUBANIMTYPE_HFLIP, 12
+	db FRAMEBLOCK_12, BASECOORD_01, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_12, BASECOORD_0F, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_12, BASECOORD_1B, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_12, BASECOORD_25, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_13, BASECOORD_38, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_13, BASECOORD_38, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_14, BASECOORD_38, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_14, BASECOORD_38, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_15, BASECOORD_38, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_15, BASECOORD_38, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_16, BASECOORD_38, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_16, BASECOORD_38, FRAMEBLOCKMODE_00
+
+Subanimation12:
+	subanim SUBANIMTYPE_COORDFLIP, 9
+	db FRAMEBLOCK_17, BASECOORD_30, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_17, BASECOORD_39, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_17, BASECOORD_3A, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_17, BASECOORD_3B, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_17, BASECOORD_3C, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_17, BASECOORD_3D, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_17, BASECOORD_3E, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_17, BASECOORD_3F, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_17, BASECOORD_1F, FRAMEBLOCKMODE_00
+
+Subanimation00:
+	subanim SUBANIMTYPE_HFLIP, 1
+	db FRAMEBLOCK_01, BASECOORD_17, FRAMEBLOCKMODE_00
+
+Subanimation01:
+	subanim SUBANIMTYPE_HFLIP, 2
+	db FRAMEBLOCK_01, BASECOORD_0F, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_01, BASECOORD_1D, FRAMEBLOCKMODE_00
+
+Subanimation02:
+	subanim SUBANIMTYPE_HFLIP, 3
+	db FRAMEBLOCK_01, BASECOORD_12, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_01, BASECOORD_15, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_01, BASECOORD_1C, FRAMEBLOCKMODE_00
+
+Subanimation03:
+	subanim SUBANIMTYPE_HFLIP, 4
+	db FRAMEBLOCK_01, BASECOORD_0B, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_01, BASECOORD_11, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_01, BASECOORD_18, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_01, BASECOORD_1D, FRAMEBLOCKMODE_00
+
+Subanimation0c:
+	subanim SUBANIMTYPE_HFLIP, 3
+	db FRAMEBLOCK_0C, BASECOORD_20, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_0C, BASECOORD_21, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_0C, BASECOORD_23, FRAMEBLOCKMODE_00
+
+Subanimation0d:
+	subanim SUBANIMTYPE_HFLIP, 6
+	db FRAMEBLOCK_0C, BASECOORD_20, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_0C, BASECOORD_15, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_0C, BASECOORD_21, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_0C, BASECOORD_17, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_0C, BASECOORD_23, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_0C, BASECOORD_19, FRAMEBLOCKMODE_00
+
+Subanimation0e:
+	subanim SUBANIMTYPE_HFLIP, 9
+	db FRAMEBLOCK_0C, BASECOORD_20, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_0C, BASECOORD_15, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_0C, BASECOORD_07, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_0C, BASECOORD_21, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_0C, BASECOORD_17, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_0C, BASECOORD_09, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_0C, BASECOORD_23, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_0C, BASECOORD_19, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_0C, BASECOORD_0C, FRAMEBLOCKMODE_00
+
+Subanimation1f:
+	subanim SUBANIMTYPE_REVERSE, 5
+	db FRAMEBLOCK_0C, BASECOORD_30, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_0C, BASECOORD_40, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_0C, BASECOORD_41, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_0C, BASECOORD_42, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_0C, BASECOORD_21, FRAMEBLOCKMODE_00
+
+Subanimation2e:
+	subanim SUBANIMTYPE_HVFLIP, 14
+	db FRAMEBLOCK_18, BASECOORD_43, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_75, BASECOORD_52, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_19, BASECOORD_43, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_75, BASECOORD_63, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_1A, BASECOORD_43, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_75, BASECOORD_4D, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_1B, BASECOORD_43, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_75, BASECOORD_97, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_1C, BASECOORD_43, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_75, BASECOORD_98, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_1D, BASECOORD_43, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_75, BASECOORD_58, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_1E, BASECOORD_43, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_75, BASECOORD_1B, FRAMEBLOCKMODE_00
+
+Subanimation2f:
+	subanim SUBANIMTYPE_HFLIP, 4
+	db FRAMEBLOCK_1F, BASECOORD_24, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_20, BASECOORD_20, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_21, BASECOORD_1A, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_22, BASECOORD_15, FRAMEBLOCKMODE_00
+
+Subanimation30:
+	subanim SUBANIMTYPE_HFLIP, 18
+	db FRAMEBLOCK_23, BASECOORD_00, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_23, BASECOORD_02, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_23, BASECOORD_04, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_23, BASECOORD_07, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_23, BASECOORD_02, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_23, BASECOORD_04, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_23, BASECOORD_0E, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_23, BASECOORD_02, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_23, BASECOORD_0C, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_25, BASECOORD_07, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_25, BASECOORD_0E, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_25, BASECOORD_15, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_24, BASECOORD_24, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_23, BASECOORD_1C, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_23, BASECOORD_23, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_23, BASECOORD_21, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_24, BASECOORD_28, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_24, BASECOORD_28, FRAMEBLOCKMODE_00
+
+Subanimation0f:
+	subanim SUBANIMTYPE_HFLIP, 12
+	db FRAMEBLOCK_26, BASECOORD_0E, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_26, BASECOORD_16, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_26, BASECOORD_1C, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_27, BASECOORD_0E, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_27, BASECOORD_16, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_27, BASECOORD_1C, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_28, BASECOORD_0E, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_28, BASECOORD_16, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_28, BASECOORD_1C, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_29, BASECOORD_0E, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_29, BASECOORD_16, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_29, BASECOORD_1C, FRAMEBLOCKMODE_00
+
+Subanimation16:
+	subanim SUBANIMTYPE_HFLIP, 12
+	db FRAMEBLOCK_2A, BASECOORD_05, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_2B, BASECOORD_05, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_2B, BASECOORD_0C, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_2A, BASECOORD_11, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_2B, BASECOORD_11, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_2B, BASECOORD_17, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_2A, BASECOORD_1B, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_2B, BASECOORD_1B, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_2B, BASECOORD_20, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_2A, BASECOORD_2F, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_2C, BASECOORD_00, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_2C, BASECOORD_00, FRAMEBLOCKMODE_00
+
+Subanimation10:
+	subanim SUBANIMTYPE_REVERSE, 8
+	db FRAMEBLOCK_2D, BASECOORD_44, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_2E, BASECOORD_45, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_2D, BASECOORD_46, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_2E, BASECOORD_47, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_2D, BASECOORD_48, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_2E, BASECOORD_49, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_2D, BASECOORD_2F, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_2E, BASECOORD_1A, FRAMEBLOCKMODE_00
+
+Subanimation31:
+	subanim SUBANIMTYPE_HVFLIP, 10
+	db FRAMEBLOCK_2F, BASECOORD_46, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_2F, BASECOORD_4A, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_2F, BASECOORD_4B, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_2F, BASECOORD_4C, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_2F, BASECOORD_4D, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_2F, BASECOORD_4E, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_2F, BASECOORD_4F, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_2F, BASECOORD_50, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_2F, BASECOORD_2E, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_2F, BASECOORD_51, FRAMEBLOCKMODE_00
+
+Subanimation13:
+	subanim SUBANIMTYPE_REVERSE, 6
+	db FRAMEBLOCK_30, BASECOORD_31, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_30, BASECOORD_32, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_30, BASECOORD_92, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_30, BASECOORD_0E, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_30, BASECOORD_0F, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_30, BASECOORD_10, FRAMEBLOCKMODE_00
+
+Subanimation14:
+	subanim SUBANIMTYPE_HFLIP, 9
+	db FRAMEBLOCK_30, BASECOORD_10, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_30, BASECOORD_10, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_31, BASECOORD_1C, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_31, BASECOORD_21, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_31, BASECOORD_26, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_30, BASECOORD_10, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_31, BASECOORD_1D, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_31, BASECOORD_22, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_31, BASECOORD_27, FRAMEBLOCKMODE_00
+
+Subanimation41:
+	subanim SUBANIMTYPE_REVERSE, 5
+	db FRAMEBLOCK_03, BASECOORD_31, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_32, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_92, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_0E, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_03, BASECOORD_10, FRAMEBLOCKMODE_00
+
+Subanimation42:
+	subanim SUBANIMTYPE_HFLIP, 3
+	db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_08, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_08, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_5A, BASECOORD_08, FRAMEBLOCKMODE_00
+
+Subanimation15:
+	subanim SUBANIMTYPE_HVFLIP, 2
+	db FRAMEBLOCK_35, BASECOORD_52, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_35, BASECOORD_53, FRAMEBLOCKMODE_00
+
+Subanimation17:
+	subanim SUBANIMTYPE_HFLIP, 4
+	db FRAMEBLOCK_36, BASECOORD_54, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_36, BASECOORD_55, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_37, BASECOORD_56, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_37, BASECOORD_57, FRAMEBLOCKMODE_00
+
+Subanimation18:
+	subanim SUBANIMTYPE_ENEMY, 4
+	db FRAMEBLOCK_36, BASECOORD_54, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_36, BASECOORD_55, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_37, BASECOORD_56, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_37, BASECOORD_57, FRAMEBLOCKMODE_00
+
+Subanimation40:
+	subanim SUBANIMTYPE_HFLIP, 6
+	db FRAMEBLOCK_17, BASECOORD_54, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_17, BASECOORD_55, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_17, BASECOORD_0E, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_17, BASECOORD_56, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_17, BASECOORD_57, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_17, BASECOORD_13, FRAMEBLOCKMODE_00
+
+Subanimation19:
+	subanim SUBANIMTYPE_REVERSE, 12
+	db FRAMEBLOCK_38, BASECOORD_31, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_39, BASECOORD_31, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_38, BASECOORD_32, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_39, BASECOORD_32, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_38, BASECOORD_92, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_39, BASECOORD_92, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_38, BASECOORD_0E, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_39, BASECOORD_0E, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_38, BASECOORD_0F, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_39, BASECOORD_0F, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_38, BASECOORD_10, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_39, BASECOORD_10, FRAMEBLOCKMODE_00
+
+Subanimation1a:
+	subanim SUBANIMTYPE_HFLIP, 16
+	db FRAMEBLOCK_3A, BASECOORD_08, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_3B, BASECOORD_08, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_3C, BASECOORD_08, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_3D, BASECOORD_08, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_3E, BASECOORD_08, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_3F, BASECOORD_08, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_3E, BASECOORD_08, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_3F, BASECOORD_08, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_3A, BASECOORD_0B, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_3B, BASECOORD_0B, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_3C, BASECOORD_0B, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_3D, BASECOORD_0B, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_3E, BASECOORD_0B, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_3F, BASECOORD_0B, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_3E, BASECOORD_0B, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_3F, BASECOORD_0B, FRAMEBLOCKMODE_00
+
+Subanimation1b:
+	subanim SUBANIMTYPE_REVERSE, 4
+	db FRAMEBLOCK_40, BASECOORD_31, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_40, BASECOORD_32, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_40, BASECOORD_92, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_40, BASECOORD_15, FRAMEBLOCKMODE_00
+
+Subanimation1c:
+	subanim SUBANIMTYPE_HFLIP, 3
+	db FRAMEBLOCK_41, BASECOORD_58, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_41, BASECOORD_59, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_41, BASECOORD_21, FRAMEBLOCKMODE_00
+
+Subanimation1d:
+	subanim SUBANIMTYPE_ENEMY, 15
+	db FRAMEBLOCK_24, BASECOORD_9A, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_23, BASECOORD_1B, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_24, BASECOORD_22, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_23, BASECOORD_16, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_23, BASECOORD_1D, FRAMEBLOCKMODE_02
+	db FRAMEBLOCK_24, BASECOORD_98, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_25, BASECOORD_2C, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_25, BASECOORD_2A, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_25, BASECOORD_99, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_25, BASECOORD_62, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_25, BASECOORD_99, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_25, BASECOORD_62, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_25, BASECOORD_99, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_25, BASECOORD_62, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_25, BASECOORD_99, FRAMEBLOCKMODE_03
+
+Subanimation1e:
+	subanim SUBANIMTYPE_NORMAL, 1
+	db FRAMEBLOCK_25, BASECOORD_75, FRAMEBLOCKMODE_00
+
+Subanimation20:
+	subanim SUBANIMTYPE_HFLIP, 2
+	db FRAMEBLOCK_42, BASECOORD_07, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_43, BASECOORD_07, FRAMEBLOCKMODE_00
+
+Subanimation21:
+	subanim SUBANIMTYPE_HFLIP, 3
+	db FRAMEBLOCK_44, BASECOORD_00, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_45, BASECOORD_08, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_46, BASECOORD_10, FRAMEBLOCKMODE_02
+
+Subanimation22:
+	subanim SUBANIMTYPE_REVERSE, 11
+	db FRAMEBLOCK_47, BASECOORD_10, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_47, BASECOORD_56, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_47, BASECOORD_07, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_47, BASECOORD_AA, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_47, BASECOORD_AB, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_47, BASECOORD_AC, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_47, BASECOORD_AD, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_47, BASECOORD_AE, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_47, BASECOORD_AF, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_47, BASECOORD_89, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_47, BASECOORD_B0, FRAMEBLOCKMODE_00
+
+Subanimation2d:
+	subanim SUBANIMTYPE_COORDFLIP, 6
+	db FRAMEBLOCK_44, BASECOORD_64, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_45, BASECOORD_65, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_46, BASECOORD_66, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_47, BASECOORD_66, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_47, BASECOORD_66, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_47, BASECOORD_66, FRAMEBLOCKMODE_00
+
+Subanimation39:
+	subanim SUBANIMTYPE_COORDFLIP, 1
+	db FRAMEBLOCK_47, BASECOORD_67, FRAMEBLOCKMODE_00
+
+Subanimation4e:
+	subanim SUBANIMTYPE_HFLIP, 1
+	db FRAMEBLOCK_71, BASECOORD_0F, FRAMEBLOCKMODE_03
+
+Subanimation4f:
+	subanim SUBANIMTYPE_HFLIP, 7
+	db FRAMEBLOCK_71, BASECOORD_0F, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_71, BASECOORD_08, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_71, BASECOORD_01, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_71, BASECOORD_95, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_72, BASECOORD_95, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_73, BASECOORD_95, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_74, BASECOORD_95, FRAMEBLOCKMODE_00
+
+Subanimation50:
+	subanim SUBANIMTYPE_HFLIP, 8
+	db FRAMEBLOCK_74, BASECOORD_95, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_73, BASECOORD_95, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_72, BASECOORD_95, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_71, BASECOORD_95, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_71, BASECOORD_01, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_71, BASECOORD_08, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_71, BASECOORD_0F, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_71, BASECOORD_16, FRAMEBLOCKMODE_00
+
+Subanimation29:
+	subanim SUBANIMTYPE_HFLIP, 29
+	db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_0F, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_4A, BASECOORD_68, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_4B, BASECOORD_2A, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_0F, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_4A, BASECOORD_68, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_4B, BASECOORD_2A, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_4C, BASECOORD_6A, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_4D, BASECOORD_69, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_6B, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_4C, BASECOORD_6A, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_4D, BASECOORD_69, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_4A, BASECOORD_68, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_4B, BASECOORD_2A, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_6C, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_4A, BASECOORD_68, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_4B, BASECOORD_2A, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_4C, BASECOORD_6A, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_4D, BASECOORD_69, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_6D, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_4C, BASECOORD_6A, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_4D, BASECOORD_2A, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_4A, BASECOORD_68, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_4B, BASECOORD_2A, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_0F, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_4A, BASECOORD_68, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_4B, BASECOORD_2A, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_4C, BASECOORD_6A, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_4D, BASECOORD_2A, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_6B, FRAMEBLOCKMODE_00
+
+Subanimation2a:
+	subanim SUBANIMTYPE_HFLIP, 4
+	db FRAMEBLOCK_4E, BASECOORD_2B, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_4F, BASECOORD_2B, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_50, BASECOORD_2B, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_50, BASECOORD_2B, FRAMEBLOCKMODE_00
+
+Subanimation23:
+	subanim SUBANIMTYPE_HFLIP, 2
+	db FRAMEBLOCK_51, BASECOORD_2D, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_51, BASECOORD_6E, FRAMEBLOCKMODE_00
+
+Subanimation24:
+	subanim SUBANIMTYPE_ENEMY, 2
+	db FRAMEBLOCK_51, BASECOORD_2D, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_51, BASECOORD_6E, FRAMEBLOCKMODE_00
+
+Subanimation25:
+	subanim SUBANIMTYPE_COORDFLIP, 2
+	db FRAMEBLOCK_52, BASECOORD_71, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_52, BASECOORD_72, FRAMEBLOCKMODE_00
+
+Subanimation26:
+	subanim SUBANIMTYPE_NORMAL, 2
+	db FRAMEBLOCK_52, BASECOORD_01, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_52, BASECOORD_2C, FRAMEBLOCKMODE_00
+
+Subanimation3a:
+	subanim SUBANIMTYPE_COORDFLIP, 3
+	db FRAMEBLOCK_53, BASECOORD_71, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_53, BASECOORD_7F, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_53, BASECOORD_81, FRAMEBLOCKMODE_00
+
+Subanimation3b:
+	subanim SUBANIMTYPE_NORMAL, 3
+	db FRAMEBLOCK_53, BASECOORD_01, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_53, BASECOORD_15, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_53, BASECOORD_2C, FRAMEBLOCKMODE_00
+
+Subanimation27:
+	subanim SUBANIMTYPE_ENEMY, 2
+	db FRAMEBLOCK_54, BASECOORD_01, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_54, BASECOORD_2C, FRAMEBLOCKMODE_00
+
+Subanimation28:
+	subanim SUBANIMTYPE_HVFLIP, 3
+	db FRAMEBLOCK_55, BASECOORD_73, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_56, BASECOORD_73, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_57, BASECOORD_73, FRAMEBLOCKMODE_00
+
+Subanimation32:
+	subanim SUBANIMTYPE_COORDFLIP, 3
+	db FRAMEBLOCK_47, BASECOORD_74, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_47, BASECOORD_43, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_47, BASECOORD_75, FRAMEBLOCKMODE_00
+
+Subanimation33:
+	subanim SUBANIMTYPE_HVFLIP, 6
+	db FRAMEBLOCK_58, BASECOORD_76, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_34, BASECOORD_76, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_58, BASECOORD_76, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_34, BASECOORD_76, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_58, BASECOORD_76, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_34, BASECOORD_76, FRAMEBLOCKMODE_00
+
+Subanimation3c:
+	subanim SUBANIMTYPE_COORDFLIP, 7
+	db FRAMEBLOCK_59, BASECOORD_79, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_59, BASECOORD_7B, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_59, BASECOORD_77, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_59, BASECOORD_7A, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_59, BASECOORD_78, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_59, BASECOORD_7C, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_59, BASECOORD_76, FRAMEBLOCKMODE_00
+
+Subanimation3d:
+	subanim SUBANIMTYPE_NORMAL, 8
+	db FRAMEBLOCK_3A, BASECOORD_4D, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_3B, BASECOORD_4D, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_3C, BASECOORD_4D, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_3D, BASECOORD_4D, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_3E, BASECOORD_4D, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_3F, BASECOORD_4D, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_3E, BASECOORD_4D, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_3F, BASECOORD_4D, FRAMEBLOCKMODE_00
+
+Subanimation34:
+	subanim SUBANIMTYPE_HVFLIP, 21
+	db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_7D, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_7D, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_5A, BASECOORD_7D, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_30, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_30, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_5A, BASECOORD_30, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_7E, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_7E, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_5A, BASECOORD_7E, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_7F, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_7F, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_5A, BASECOORD_7F, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_80, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_80, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_5A, BASECOORD_80, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_81, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_81, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_5A, BASECOORD_81, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_82, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_82, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_5A, BASECOORD_82, FRAMEBLOCKMODE_00
+
+Subanimation35:
+	subanim SUBANIMTYPE_HVFLIP, 4
+	db FRAMEBLOCK_5B, BASECOORD_83, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_5C, BASECOORD_84, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_5D, BASECOORD_85, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_5E, BASECOORD_09, FRAMEBLOCKMODE_00
+
+Subanimation36:
+	subanim SUBANIMTYPE_HFLIP, 8
+	db FRAMEBLOCK_5F, BASECOORD_2A, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_5F, BASECOORD_00, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_60, BASECOORD_2A, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_60, BASECOORD_00, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_61, BASECOORD_2A, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_61, BASECOORD_00, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_62, BASECOORD_2A, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_62, BASECOORD_00, FRAMEBLOCKMODE_00
+
+Subanimation37:
+	subanim SUBANIMTYPE_HVFLIP, 10
+	db FRAMEBLOCK_63, BASECOORD_89, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_64, BASECOORD_75, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_63, BASECOORD_76, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_65, BASECOORD_0D, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_65, BASECOORD_86, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_65, BASECOORD_12, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_65, BASECOORD_87, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_65, BASECOORD_17, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_65, BASECOORD_88, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_65, BASECOORD_1A, FRAMEBLOCKMODE_00
+
+Subanimation38:
+	subanim SUBANIMTYPE_HFLIP, 16
+	db FRAMEBLOCK_66, BASECOORD_8A, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_66, BASECOORD_33, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_66, BASECOORD_2E, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_67, BASECOORD_24, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_66, BASECOORD_01, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_66, BASECOORD_10, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_66, BASECOORD_1D, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_67, BASECOORD_28, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_66, BASECOORD_2A, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_66, BASECOORD_0E, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_66, BASECOORD_1B, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_67, BASECOORD_26, FRAMEBLOCKMODE_03
+	db FRAMEBLOCK_66, BASECOORD_03, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_66, BASECOORD_12, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_66, BASECOORD_1E, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_67, BASECOORD_29, FRAMEBLOCKMODE_00
+
+Subanimation3e:
+	subanim SUBANIMTYPE_REVERSE, 18
+	db FRAMEBLOCK_02, BASECOORD_31, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_34, BASECOORD_31, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_02, BASECOORD_31, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_02, BASECOORD_32, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_34, BASECOORD_32, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_02, BASECOORD_32, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_02, BASECOORD_92, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_34, BASECOORD_92, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_02, BASECOORD_92, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_02, BASECOORD_0E, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_34, BASECOORD_0E, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_02, BASECOORD_0E, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_02, BASECOORD_0F, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_34, BASECOORD_0F, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_02, BASECOORD_0F, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_02, BASECOORD_10, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_34, BASECOORD_10, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_02, BASECOORD_10, FRAMEBLOCKMODE_00
+
+Subanimation3f:
+	subanim SUBANIMTYPE_COORDFLIP, 18
+	db FRAMEBLOCK_68, BASECOORD_4B, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_68, BASECOORD_8C, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_68, BASECOORD_20, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_68, BASECOORD_1C, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_68, BASECOORD_19, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_68, BASECOORD_14, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_68, BASECOORD_76, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_68, BASECOORD_8D, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_68, BASECOORD_15, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_68, BASECOORD_10, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_68, BASECOORD_0C, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_68, BASECOORD_06, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_68, BASECOORD_8E, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_68, BASECOORD_8F, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_68, BASECOORD_90, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_68, BASECOORD_26, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_68, BASECOORD_23, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_68, BASECOORD_1F, FRAMEBLOCKMODE_00
+
+Subanimation44:
+	subanim SUBANIMTYPE_HVFLIP, 12
+	db FRAMEBLOCK_69, BASECOORD_4B, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_69, BASECOORD_8C, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_69, BASECOORD_20, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_69, BASECOORD_1C, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_69, BASECOORD_19, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_69, BASECOORD_14, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_69, BASECOORD_76, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_69, BASECOORD_8D, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_69, BASECOORD_15, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_69, BASECOORD_10, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_69, BASECOORD_0C, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_69, BASECOORD_06, FRAMEBLOCKMODE_00
+
+Subanimation43:
+	subanim SUBANIMTYPE_ENEMY, 3
+	db FRAMEBLOCK_6A, BASECOORD_07, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_6B, BASECOORD_0F, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_6C, BASECOORD_17, FRAMEBLOCKMODE_00
+
+Subanimation45:
+	subanim SUBANIMTYPE_HVFLIP, 4
+	db FRAMEBLOCK_6D, BASECOORD_8B, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_6D, BASECOORD_84, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_6D, BASECOORD_63, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_6D, BASECOORD_8C, FRAMEBLOCKMODE_00
+
+Subanimation46:
+	subanim SUBANIMTYPE_HVFLIP, 6
+	db FRAMEBLOCK_6D, BASECOORD_8B, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_6D, BASECOORD_84, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_6D, BASECOORD_63, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_6D, BASECOORD_8C, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_6D, BASECOORD_0A, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_6D, BASECOORD_89, FRAMEBLOCKMODE_00
+
+Subanimation47:
+	subanim SUBANIMTYPE_HVFLIP, 3
+	db FRAMEBLOCK_06, BASECOORD_82, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_07, BASECOORD_82, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_08, BASECOORD_96, FRAMEBLOCKMODE_00
+
+Subanimation48:
+	subanim SUBANIMTYPE_NORMAL, 6
+	db FRAMEBLOCK_03, BASECOORD_41, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_03, BASECOORD_48, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_04, BASECOORD_48, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_03, BASECOORD_48, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_05, BASECOORD_48, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_03, BASECOORD_48, FRAMEBLOCKMODE_03
+
+Subanimation49:
+	subanim SUBANIMTYPE_NORMAL, 4
+	db FRAMEBLOCK_04, BASECOORD_48, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_03, BASECOORD_48, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_05, BASECOORD_48, FRAMEBLOCKMODE_04
+	db FRAMEBLOCK_03, BASECOORD_48, FRAMEBLOCKMODE_03
+
+Subanimation4a:
+	subanim SUBANIMTYPE_NORMAL, 1
+	db FRAMEBLOCK_04, BASECOORD_84, FRAMEBLOCKMODE_03
+
+Subanimation4b:
+	subanim SUBANIMTYPE_NORMAL, 3
+	db FRAMEBLOCK_06, BASECOORD_72, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_07, BASECOORD_72, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_08, BASECOORD_72, FRAMEBLOCKMODE_00
+
+Subanimation4c:
+	subanim SUBANIMTYPE_COORDFLIP, 8
+	db FRAMEBLOCK_6F, BASECOORD_30, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_6E, BASECOORD_30, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_70, BASECOORD_30, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_6E, BASECOORD_30, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_6F, BASECOORD_30, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_6E, BASECOORD_30, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_70, BASECOORD_30, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_6E, BASECOORD_30, FRAMEBLOCKMODE_00
+
+Subanimation4d:
+	subanim SUBANIMTYPE_HVFLIP, 6
+	db FRAMEBLOCK_32, BASECOORD_4B, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_33, BASECOORD_4F, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_32, BASECOORD_20, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_33, BASECOORD_16, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_32, BASECOORD_19, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_33, BASECOORD_0D, FRAMEBLOCKMODE_00
+
+Subanimation51:
+	subanim SUBANIMTYPE_ENEMY, 6
+	db FRAMEBLOCK_76, BASECOORD_1B, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_34, BASECOORD_1B, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_76, BASECOORD_1B, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_34, BASECOORD_1B, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_76, BASECOORD_1B, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_34, BASECOORD_1B, FRAMEBLOCKMODE_00
+
+Subanimation52:
+	subanim SUBANIMTYPE_HFLIP, 7
+	db FRAMEBLOCK_77, BASECOORD_25, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_77, BASECOORD_9B, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_77, BASECOORD_1A, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_77, BASECOORD_9C, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_77, BASECOORD_2F, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_77, BASECOORD_50, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_77, BASECOORD_8C, FRAMEBLOCKMODE_00
+
+Subanimation53:
+	subanim SUBANIMTYPE_NORMAL, 12
+	db FRAMEBLOCK_78, BASECOORD_30, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_78, BASECOORD_A2, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_78, BASECOORD_93, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_78, BASECOORD_61, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_78, BASECOORD_73, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_78, BASECOORD_A7, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_78, BASECOORD_33, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_78, BASECOORD_A8, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_78, BASECOORD_0E, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_78, BASECOORD_A9, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_78, BASECOORD_34, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_01, BASECOORD_9E, FRAMEBLOCKMODE_00
+
+Subanimation54:
+	subanim SUBANIMTYPE_NORMAL, 11
+	db FRAMEBLOCK_79, BASECOORD_30, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_79, BASECOORD_A2, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_79, BASECOORD_93, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_79, BASECOORD_61, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_79, BASECOORD_73, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_79, BASECOORD_A7, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_79, BASECOORD_33, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_79, BASECOORD_A8, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_79, BASECOORD_0E, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_79, BASECOORD_A9, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_79, BASECOORD_34, FRAMEBLOCKMODE_00
--- a/data/icon_pointers.asm
+++ b/data/icon_pointers.asm
@ -7,9 +7,9 @@ ENDM

 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 @@ MonPartySpritePointers:
 	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/items/key_items.asm
+++ b/data/items/key_items.asm
@ -1,12 +1,103 @@
+key_item_bits: MACRO
+_bit = 0
+_byte = 0
+REPT _NARG
+_byte = _byte | ((\1) << _bit)
+_bit = _bit + 1
+IF _bit == 8
+	db _byte
+_byte = 0
+_bit = 0
+ENDC
+SHIFT
+ENDR
+IF _bit > 0
+	db _byte
+ENDC
+ENDM
+
 KeyItemBitfield:
-	db %11110000
-	db %00000001
-	db %11110000
-	db %01001111
-	db %00000000
-	db %10011111
-	db %00000000
-	db %11000000
-	db %11110000
-	db %00111011
-	db %00000000
+	key_item_bits \
+	FALSE, \ ; MASTER_BALL
+	FALSE, \ ; ULTRA_BALL
+	FALSE, \ ; GREAT_BALL
+	FALSE, \ ; POKE_BALL
+	TRUE,  \ ; TOWN_MAP
+	TRUE,  \ ; BICYCLE
+	TRUE,  \ ; SURFBOARD
+	TRUE,  \ ; SAFARI_BALL
+	TRUE,  \ ; POKEDEX
+	FALSE, \ ; MOON_STONE
+	FALSE, \ ; ANTIDOTE
+	FALSE, \ ; BURN_HEAL
+	FALSE, \ ; ICE_HEAL
+	FALSE, \ ; AWAKENING
+	FALSE, \ ; PARLYZ_HEAL
+	FALSE, \ ; FULL_RESTORE
+	FALSE, \ ; MAX_POTION
+	FALSE, \ ; HYPER_POTION
+	FALSE, \ ; SUPER_POTION
+	FALSE, \ ; POTION
+	TRUE,  \ ; BOULDERBADGE
+	TRUE,  \ ; CASCADEBADGE
+	TRUE,  \ ; THUNDERBADGE
+	TRUE,  \ ; RAINBOWBADGE
+	TRUE,  \ ; SOULBADGE
+	TRUE,  \ ; MARSHBADGE
+	TRUE,  \ ; VOLCANOBADGE
+	TRUE,  \ ; EARTHBADGE
+	FALSE, \ ; ESCAPE_ROPE
+	FALSE, \ ; REPEL
+	TRUE,  \ ; OLD_AMBER
+	FALSE, \ ; FIRE_STONE
+	FALSE, \ ; THUNDER_STONE
+	FALSE, \ ; WATER_STONE
+	FALSE, \ ; HP_UP
+	FALSE, \ ; PROTEIN
+	FALSE, \ ; IRON
+	FALSE, \ ; CARBOS
+	FALSE, \ ; CALCIUM
+	FALSE, \ ; RARE_CANDY
+	TRUE,  \ ; DOME_FOSSIL
+	TRUE,  \ ; HELIX_FOSSIL
+	TRUE,  \ ; SECRET_KEY
+	TRUE,  \ ; UNUSED_ITEM
+	TRUE,  \ ; BIKE_VOUCHER
+	FALSE, \ ; X_ACCURACY
+	FALSE, \ ; LEAF_STONE
+	TRUE,  \ ; CARD_KEY
+	FALSE, \ ; NUGGET
+	FALSE, \ ; PP_UP_2
+	FALSE, \ ; POKE_DOLL
+	FALSE, \ ; FULL_HEAL
+	FALSE, \ ; REVIVE
+	FALSE, \ ; MAX_REVIVE
+	FALSE, \ ; GUARD_SPEC
+	FALSE, \ ; SUPER_REPEL
+	FALSE, \ ; MAX_REPEL
+	FALSE, \ ; DIRE_HIT
+	FALSE, \ ; COIN
+	FALSE, \ ; FRESH_WATER
+	FALSE, \ ; SODA_POP
+	FALSE, \ ; LEMONADE
+	TRUE,  \ ; S_S_TICKET
+	TRUE,  \ ; GOLD_TEETH
+	FALSE, \ ; X_ATTACK
+	FALSE, \ ; X_DEFEND
+	FALSE, \ ; X_SPEED
+	FALSE, \ ; X_SPECIAL
+	TRUE,  \ ; COIN_CASE
+	TRUE,  \ ; OAKS_PARCEL
+	TRUE,  \ ; ITEMFINDER
+	TRUE,  \ ; SILPH_SCOPE
+	TRUE,  \ ; POKE_FLUTE
+	TRUE,  \ ; LIFT_KEY
+	FALSE, \ ; EXP_ALL
+	TRUE,  \ ; OLD_ROD
+	TRUE,  \ ; GOOD_ROD
+	TRUE,  \ ; SUPER_ROD
+	FALSE, \ ; PP_UP
+	FALSE, \ ; ETHER
+	FALSE, \ ; MAX_ETHER
+	FALSE, \ ; ELIXER
+	FALSE    ; MAX_ELIXER
--- a/data/maps/objects/BikeShop.asm
+++ b/data/maps/objects/BikeShop.asm
@ -8,9 +8,9 @@ BikeShop_Object:
 	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 @@ BillsHouse_Object:
 	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 @@ BluesHouse_Object:
 	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 @@ CeladonChiefHouse_Object:
 	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 @@ CeladonCity_Object:

 	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 @@ CeladonDiner_Object:

 	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 @@ CeladonGym_Object:

 	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 @@ CeladonHotel_Object:
 	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 @@ CeladonMansion1F_Object:
 	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 @@ CeladonMansion3F_Object:
 	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 @@ CeladonMansionRoofHouse_Object:

 	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 @@ CeladonMart1F_Object:
 	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 @@ CeladonMart2F_Object:
 	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 @@ CeladonMart3F_Object:
 	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 @@ CeladonMart4F_Object:
 	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 @@ CeladonMart5F_Object:
 	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 @@ CeladonMartRoof_Object:
 	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 @@ CeladonPokecenter_Object:
 	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 @@ CeruleanBadgeHouse_Object:
 	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 @@ CeruleanCave1F_Object:
 	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 @@ CeruleanCave2F_Object:
 	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 @@ CeruleanCaveB1F_Object:
 	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 @@ CeruleanCity_Object:
 	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 @@ CeruleanGym_Object:

 	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 @@ CeruleanMart_Object:
 	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 @@ CeruleanPokecenter_Object:

 	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 @@ CeruleanTradeHouse_Object:
 	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 @@ CeruleanTrashedHouse_Object:
 	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 @@ CinnabarGym_Object:
 	db 0 ; signs

 	db 9 ; objects
-	object SPRITE_FAT_BALD_GUY, 3, 3, STAY, DOWN, 1, OPP_BLAINE, 1
-	object SPRITE_BLACK_HAIR_BOY_2, 17, 2, STAY, DOWN, 2, OPP_SUPER_NERD, 9
-	object SPRITE_BLACK_HAIR_BOY_2, 17, 8, STAY, DOWN, 3, OPP_BURGLAR, 4
-	object SPRITE_BLACK_HAIR_BOY_2, 11, 4, STAY, DOWN, 4, OPP_SUPER_NERD, 10
-	object SPRITE_BLACK_HAIR_BOY_2, 11, 8, STAY, DOWN, 5, OPP_BURGLAR, 5
-	object SPRITE_BLACK_HAIR_BOY_2, 11, 14, STAY, DOWN, 6, OPP_SUPER_NERD, 11
-	object SPRITE_BLACK_HAIR_BOY_2, 3, 14, STAY, DOWN, 7, OPP_BURGLAR, 6
-	object SPRITE_BLACK_HAIR_BOY_2, 3, 8, STAY, DOWN, 8, OPP_SUPER_NERD, 12
-	object SPRITE_GYM_HELPER, 16, 13, STAY, DOWN, 9 ; person
+	object SPRITE_MIDDLE_AGED_MAN, 3, 3, STAY, DOWN, 1, OPP_BLAINE, 1
+	object SPRITE_SUPER_NERD, 17, 2, STAY, DOWN, 2, OPP_SUPER_NERD, 9
+	object SPRITE_SUPER_NERD, 17, 8, STAY, DOWN, 3, OPP_BURGLAR, 4
+	object SPRITE_SUPER_NERD, 11, 4, STAY, DOWN, 4, OPP_SUPER_NERD, 10
+	object SPRITE_SUPER_NERD, 11, 8, STAY, DOWN, 5, OPP_BURGLAR, 5
+	object SPRITE_SUPER_NERD, 11, 14, STAY, DOWN, 6, OPP_SUPER_NERD, 11
+	object SPRITE_SUPER_NERD, 3, 14, STAY, DOWN, 7, OPP_BURGLAR, 6
+	object SPRITE_SUPER_NERD, 3, 8, STAY, DOWN, 8, OPP_SUPER_NERD, 12
+	object SPRITE_GYM_GUIDE, 16, 13, STAY, DOWN, 9 ; person

 	; warp-to
 	warp_to 16, 17, CINNABAR_GYM_WIDTH
--- a/data/maps/objects/CinnabarLab.asm
+++ b/data/maps/objects/CinnabarLab.asm
@ -15,7 +15,7 @@ CinnabarLab_Object:
 	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 @@ CinnabarLabFossilRoom_Object:
 	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 @@ CinnabarLabMetronomeRoom_Object:
 	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 @@ CinnabarLabTradeRoom_Object:
 	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 @@ CinnabarMart_Object:
 	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 @@ CinnabarPokecenter_Object:

 	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 @@ CopycatsHouse1F_Object:
 	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 @@ CopycatsHouse2F_Object:
 	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 @@ DiglettsCaveRoute2_Object:
 	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 @@ FightingDojo_Object:
 	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 @@ FuchsiaBillsGrandpasHouse_Object:
 	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 @@ FuchsiaCity_Object:
 	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 @@ FuchsiaGoodRodHouse_Object:
 	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,14 +8,14 @@ FuchsiaGym_Object:
 	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
 	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 @@ FuchsiaMart_Object:
 	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 @@ FuchsiaMeetingRoom_Object:
 	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 @@ FuchsiaPokecenter_Object:
 	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 @@ GameCorner_Object:
 	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 @@ IndigoPlateauLobby_Object:

 	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 @@ LavenderCuboneHouse_Object:
 	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 @@ LavenderMart_Object:
 	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 @@ LavenderPokecenter_Object:
 	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 @@ LavenderTown_Object:

 	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 @@ MrFujisHouse_Object:
 	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 @@ MrPsychicsHouse_Object:
 	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 @@ MtMoon1F_Object:

 	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 @@ MtMoonB2F_Object:
 	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 @@ MtMoonPokecenter_Object:

 	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 @@ Museum1F_Object:
 	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 @@ Museum2F_Object:
 	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 @@ NameRatersHouse_Object:
 	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
@ -8,17 +8,17 @@ OaksLab_Object:
 	db 0 ; signs

 	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_BLUE, 4, 3, STAY, NONE, 1, OPP_RIVAL1, 1
+	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 @@ PalletTown_Object:
 	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 @@ PewterCity_Object:
 	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 @@ PewterGym_Object:
 	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 @@ PewterMart_Object:
 	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 @@ PewterNidoranHouse_Object:
 	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 @@ PewterPokecenter_Object:
 	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 @@ PewterSpeechHouse_Object:

 	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 @@ PokemonFanClub_Object:
 	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 @@ PokemonMansion1F_Object:
 	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 @@ PokemonMansion2F_Object:
 	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 @@ PokemonMansion3F_Object:
 	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 @@ PokemonMansionB1F_Object:
 	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 @@ PokemonTower1F_Object:
 	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 @@ PokemonTower2F_Object:

 	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 @@ PokemonTower3F_Object:
 	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 @@ PokemonTower4F_Object:
 	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 @@ PokemonTower5F_Object:
 	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 @@ PokemonTower6F_Object:
 	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 @@ PowerPlant_Object:
 	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 @@ RockTunnel1F_Object:
 	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 @@ RockTunnelB1F_Object:
 	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 @@ RockTunnelPokecenter_Object:
 	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 @@ RocketHideoutB1F_Object:
 	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 @@ RocketHideoutB2F_Object:

 	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/Show more
+++ b/Show more