summaryrefslogtreecommitdiff
path: root/data/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'data/graphics')
-rw-r--r--data/graphics/berries/graphics.inc172
-rw-r--r--data/graphics/berries/graphics_table.inc45
-rw-r--r--data/graphics/pokemon/icon_palette_indices.inc442
-rw-r--r--data/graphics/pokemon/icon_palette_table.inc11
-rw-r--r--data/graphics/pokemon/icon_table.inc442
-rw-r--r--data/graphics/trainers/graphics.inc338
6 files changed, 255 insertions, 1195 deletions
diff --git a/data/graphics/berries/graphics.inc b/data/graphics/berries/graphics.inc
index 19207ee32..e8edf9a3b 100644
--- a/data/graphics/berries/graphics.inc
+++ b/data/graphics/berries/graphics.inc
@@ -1,343 +1,343 @@
.align 2
gBerryPic_Cheri:: @ 8E78D00
- .incbin "graphics/berries/cheri/pic.4bpp.lz"
+ .incbin "graphics/berries/cheri.4bpp.lz"
.align 2
gBerryPic_Oran:: @ 8E78E54
- .incbin "graphics/berries/oran/pic.4bpp.lz"
+ .incbin "graphics/berries/oran.4bpp.lz"
.align 2
gBerryPic_Pecha:: @ 8E78FC8
- .incbin "graphics/berries/pecha/pic.4bpp.lz"
+ .incbin "graphics/berries/pecha.4bpp.lz"
.align 2
gBerryPic_Rawst:: @ 8E7913C
- .incbin "graphics/berries/rawst/pic.4bpp.lz"
+ .incbin "graphics/berries/rawst.4bpp.lz"
.align 2
gBerryPic_Aspear:: @ 8E792D4
- .incbin "graphics/berries/aspear/pic.4bpp.lz"
+ .incbin "graphics/berries/aspear.4bpp.lz"
.align 2
gBerryPic_Leppa:: @ 8E7947C
- .incbin "graphics/berries/leppa/pic.4bpp.lz"
+ .incbin "graphics/berries/leppa.4bpp.lz"
.align 2
gBerryPic_Chesto:: @ 8E795EC
- .incbin "graphics/berries/chesto/pic.4bpp.lz"
+ .incbin "graphics/berries/chesto.4bpp.lz"
.align 2
gBerryPic_Persim:: @ 8E797D0
- .incbin "graphics/berries/persim/pic.4bpp.lz"
+ .incbin "graphics/berries/persim.4bpp.lz"
.align 2
gBerryPic_Lum:: @ 8E79920
- .incbin "graphics/berries/lum/pic.4bpp.lz"
+ .incbin "graphics/berries/lum.4bpp.lz"
.align 2
gBerryPic_Sitrus:: @ 8E79A3C
- .incbin "graphics/berries/sitrus/pic.4bpp.lz"
+ .incbin "graphics/berries/sitrus.4bpp.lz"
.align 2
gBerryPic_Figy:: @ 8E79BE0
- .incbin "graphics/berries/figy/pic.4bpp.lz"
+ .incbin "graphics/berries/figy.4bpp.lz"
.align 2
gBerryPic_Wiki:: @ 8E79D8C
- .incbin "graphics/berries/wiki/pic.4bpp.lz"
+ .incbin "graphics/berries/wiki.4bpp.lz"
.align 2
gBerryPic_Mago:: @ 8E79F80
- .incbin "graphics/berries/mago/pic.4bpp.lz"
+ .incbin "graphics/berries/mago.4bpp.lz"
.align 2
gBerryPic_Aguav:: @ 8E7A134
- .incbin "graphics/berries/aguav/pic.4bpp.lz"
+ .incbin "graphics/berries/aguav.4bpp.lz"
.align 2
gBerryPic_Iapapa:: @ 8E7A2A8
- .incbin "graphics/berries/iapapa/pic.4bpp.lz"
+ .incbin "graphics/berries/iapapa.4bpp.lz"
.align 2
gBerryPic_Razz:: @ 8E7A560
- .incbin "graphics/berries/razz/pic.4bpp.lz"
+ .incbin "graphics/berries/razz.4bpp.lz"
.align 2
gBerryPic_Bluk:: @ 8E7A790
- .incbin "graphics/berries/bluk/pic.4bpp.lz"
+ .incbin "graphics/berries/bluk.4bpp.lz"
.align 2
gBerryPic_Nanab:: @ 8E7A978
- .incbin "graphics/berries/nanab/pic.4bpp.lz"
+ .incbin "graphics/berries/nanab.4bpp.lz"
.align 2
gBerryPic_Wepear:: @ 8E7AAEC
- .incbin "graphics/berries/wepear/pic.4bpp.lz"
+ .incbin "graphics/berries/wepear.4bpp.lz"
.align 2
gBerryPic_Pinap:: @ 8E7ACB4
- .incbin "graphics/berries/pinap/pic.4bpp.lz"
+ .incbin "graphics/berries/pinap.4bpp.lz"
.align 2
gBerryPic_Pomeg:: @ 8E7AEC8
- .incbin "graphics/berries/pomeg/pic.4bpp.lz"
+ .incbin "graphics/berries/pomeg.4bpp.lz"
.align 2
gBerryPic_Kelpsy:: @ 8E7B070
- .incbin "graphics/berries/kelpsy/pic.4bpp.lz"
+ .incbin "graphics/berries/kelpsy.4bpp.lz"
.align 2
gBerryPic_Qualot:: @ 8E7B218
- .incbin "graphics/berries/qualot/pic.4bpp.lz"
+ .incbin "graphics/berries/qualot.4bpp.lz"
.align 2
gBerryPic_Hondew:: @ 8E7B3E4
- .incbin "graphics/berries/hondew/pic.4bpp.lz"
+ .incbin "graphics/berries/hondew.4bpp.lz"
.align 2
gBerryPic_Grepa:: @ 8E7B63C
- .incbin "graphics/berries/grepa/pic.4bpp.lz"
+ .incbin "graphics/berries/grepa.4bpp.lz"
.align 2
gBerryPic_Tamato:: @ 8E7B7CC
- .incbin "graphics/berries/tamato/pic.4bpp.lz"
+ .incbin "graphics/berries/tamato.4bpp.lz"
.align 2
gBerryPic_Cornn:: @ 8E7BA90
- .incbin "graphics/berries/cornn/pic.4bpp.lz"
+ .incbin "graphics/berries/cornn.4bpp.lz"
.align 2
gBerryPic_Magost:: @ 8E7BC94
- .incbin "graphics/berries/magost/pic.4bpp.lz"
+ .incbin "graphics/berries/magost.4bpp.lz"
.align 2
gBerryPic_Rabuta:: @ 8E7BE38
- .incbin "graphics/berries/rabuta/pic.4bpp.lz"
+ .incbin "graphics/berries/rabuta.4bpp.lz"
.align 2
gBerryPic_Nomel:: @ 8E7C12C
- .incbin "graphics/berries/nomel/pic.4bpp.lz"
+ .incbin "graphics/berries/nomel.4bpp.lz"
.align 2
gBerryPic_Spelon:: @ 8E7C308
- .incbin "graphics/berries/spelon/pic.4bpp.lz"
+ .incbin "graphics/berries/spelon.4bpp.lz"
.align 2
gBerryPic_Pamtre:: @ 8E7C4F8
- .incbin "graphics/berries/pamtre/pic.4bpp.lz"
+ .incbin "graphics/berries/pamtre.4bpp.lz"
.align 2
gBerryPic_Watmel:: @ 8E7C748
- .incbin "graphics/berries/watmel/pic.4bpp.lz"
+ .incbin "graphics/berries/watmel.4bpp.lz"
.align 2
gBerryPic_Durin:: @ 8E7CA2C
- .incbin "graphics/berries/durin/pic.4bpp.lz"
+ .incbin "graphics/berries/durin.4bpp.lz"
.align 2
gBerryPic_Belue:: @ 8E7CDF8
- .incbin "graphics/berries/belue/pic.4bpp.lz"
+ .incbin "graphics/berries/belue.4bpp.lz"
.align 2
gBerryPic_Liechi:: @ 8E7D0D0
- .incbin "graphics/berries/liechi/pic.4bpp.lz"
+ .incbin "graphics/berries/liechi.4bpp.lz"
.align 2
gBerryPic_Ganlon:: @ 8E7D328
- .incbin "graphics/berries/ganlon/pic.4bpp.lz"
+ .incbin "graphics/berries/ganlon.4bpp.lz"
.align 2
gBerryPic_Salac:: @ 8E7D4C0
- .incbin "graphics/berries/salac/pic.4bpp.lz"
+ .incbin "graphics/berries/salac.4bpp.lz"
.align 2
gBerryPic_Petaya:: @ 8E7D704
- .incbin "graphics/berries/petaya/pic.4bpp.lz"
+ .incbin "graphics/berries/petaya.4bpp.lz"
.align 2
gBerryPic_Apicot:: @ 8E7D9AC
- .incbin "graphics/berries/apicot/pic.4bpp.lz"
+ .incbin "graphics/berries/apicot.4bpp.lz"
.align 2
gBerryPic_Lansat:: @ 8E7DB3C
- .incbin "graphics/berries/lansat/pic.4bpp.lz"
+ .incbin "graphics/berries/lansat.4bpp.lz"
.align 2
gBerryPic_Starf:: @ 8E7DD30
- .incbin "graphics/berries/starf/pic.4bpp.lz"
+ .incbin "graphics/berries/starf.4bpp.lz"
.align 2
gBerryPic_Enigma:: @ 8E7DF00
- .incbin "graphics/berries/enigma/pic.4bpp.lz"
+ .incbin "graphics/berries/enigma.4bpp.lz"
.align 2
gBerryPalette_Cheri:: @ 8E7E118
- .incbin "graphics/berries/cheri/palette.gbapal.lz"
+ .incbin "graphics/berries/cheri.gbapal.lz"
.align 2
gBerryPalette_Oran:: @ 8E7E140
- .incbin "graphics/berries/oran/palette.gbapal.lz"
+ .incbin "graphics/berries/oran.gbapal.lz"
.align 2
gBerryPalette_Pecha:: @ 8E7E168
- .incbin "graphics/berries/pecha/palette.gbapal.lz"
+ .incbin "graphics/berries/pecha.gbapal.lz"
.align 2
gBerryPalette_Rawst:: @ 8E7E190
- .incbin "graphics/berries/rawst/palette.gbapal.lz"
+ .incbin "graphics/berries/rawst.gbapal.lz"
.align 2
gBerryPalette_Aspear:: @ 8E7E1B8
- .incbin "graphics/berries/aspear/palette.gbapal.lz"
+ .incbin "graphics/berries/aspear.gbapal.lz"
.align 2
gBerryPalette_Leppa:: @ 8E7E1E0
- .incbin "graphics/berries/leppa/palette.gbapal.lz"
+ .incbin "graphics/berries/leppa.gbapal.lz"
.align 2
gBerryPalette_Chesto:: @ 8E7E208
- .incbin "graphics/berries/chesto/palette.gbapal.lz"
+ .incbin "graphics/berries/chesto.gbapal.lz"
.align 2
gBerryPalette_Persim:: @ 8E7E230
- .incbin "graphics/berries/persim/palette.gbapal.lz"
+ .incbin "graphics/berries/persim.gbapal.lz"
.align 2
gBerryPalette_Lum:: @ 8E7E258
- .incbin "graphics/berries/lum/palette.gbapal.lz"
+ .incbin "graphics/berries/lum.gbapal.lz"
.align 2
gBerryPalette_Sitrus:: @ 8E7E280
- .incbin "graphics/berries/sitrus/palette.gbapal.lz"
+ .incbin "graphics/berries/sitrus.gbapal.lz"
.align 2
gBerryPalette_Figy:: @ 8E7E2A8
- .incbin "graphics/berries/figy/palette.gbapal.lz"
+ .incbin "graphics/berries/figy.gbapal.lz"
.align 2
gBerryPalette_Wiki:: @ 8E7E2D0
- .incbin "graphics/berries/wiki/palette.gbapal.lz"
+ .incbin "graphics/berries/wiki.gbapal.lz"
.align 2
gBerryPalette_Mago:: @ 8E7E2F8
- .incbin "graphics/berries/mago/palette.gbapal.lz"
+ .incbin "graphics/berries/mago.gbapal.lz"
.align 2
gBerryPalette_Aguav:: @ 8E7E320
- .incbin "graphics/berries/aguav/palette.gbapal.lz"
+ .incbin "graphics/berries/aguav.gbapal.lz"
.align 2
gBerryPalette_Iapapa:: @ 8E7E348
- .incbin "graphics/berries/iapapa/palette.gbapal.lz"
+ .incbin "graphics/berries/iapapa.gbapal.lz"
.align 2
gBerryPalette_Razz:: @ 8E7E370
- .incbin "graphics/berries/razz/palette.gbapal.lz"
+ .incbin "graphics/berries/razz.gbapal.lz"
.align 2
gBerryPalette_Bluk:: @ 8E7E398
- .incbin "graphics/berries/bluk/palette.gbapal.lz"
+ .incbin "graphics/berries/bluk.gbapal.lz"
.align 2
gBerryPalette_Nanab:: @ 8E7E3C0
- .incbin "graphics/berries/nanab/palette.gbapal.lz"
+ .incbin "graphics/berries/nanab.gbapal.lz"
.align 2
gBerryPalette_Wepear:: @ 8E7E3E8
- .incbin "graphics/berries/wepear/palette.gbapal.lz"
+ .incbin "graphics/berries/wepear.gbapal.lz"
.align 2
gBerryPalette_Pinap:: @ 8E7E410
- .incbin "graphics/berries/pinap/palette.gbapal.lz"
+ .incbin "graphics/berries/pinap.gbapal.lz"
.align 2
gBerryPalette_Pomeg:: @ 8E7E438
- .incbin "graphics/berries/pomeg/palette.gbapal.lz"
+ .incbin "graphics/berries/pomeg.gbapal.lz"
.align 2
gBerryPalette_Kelpsy:: @ 8E7E460
- .incbin "graphics/berries/kelpsy/palette.gbapal.lz"
+ .incbin "graphics/berries/kelpsy.gbapal.lz"
.align 2
gBerryPalette_Qualot:: @ 8E7E488
- .incbin "graphics/berries/qualot/palette.gbapal.lz"
+ .incbin "graphics/berries/qualot.gbapal.lz"
.align 2
gBerryPalette_Hondew:: @ 8E7E4B0
- .incbin "graphics/berries/hondew/palette.gbapal.lz"
+ .incbin "graphics/berries/hondew.gbapal.lz"
.align 2
gBerryPalette_Grepa:: @ 8E7E4D8
- .incbin "graphics/berries/grepa/palette.gbapal.lz"
+ .incbin "graphics/berries/grepa.gbapal.lz"
.align 2
gBerryPalette_Tamato:: @ 8E7E500
- .incbin "graphics/berries/tamato/palette.gbapal.lz"
+ .incbin "graphics/berries/tamato.gbapal.lz"
.align 2
gBerryPalette_Cornn:: @ 8E7E528
- .incbin "graphics/berries/cornn/palette.gbapal.lz"
+ .incbin "graphics/berries/cornn.gbapal.lz"
.align 2
gBerryPalette_Magost:: @ 8E7E550
- .incbin "graphics/berries/magost/palette.gbapal.lz"
+ .incbin "graphics/berries/magost.gbapal.lz"
.align 2
gBerryPalette_Rabuta:: @ 8E7E578
- .incbin "graphics/berries/rabuta/palette.gbapal.lz"
+ .incbin "graphics/berries/rabuta.gbapal.lz"
.align 2
gBerryPalette_Nomel:: @ 8E7E5A0
- .incbin "graphics/berries/nomel/palette.gbapal.lz"
+ .incbin "graphics/berries/nomel.gbapal.lz"
.align 2
gBerryPalette_Spelon:: @ 8E7E5C8
- .incbin "graphics/berries/spelon/palette.gbapal.lz"
+ .incbin "graphics/berries/spelon.gbapal.lz"
.align 2
gBerryPalette_Pamtre:: @ 8E7E5F0
- .incbin "graphics/berries/pamtre/palette.gbapal.lz"
+ .incbin "graphics/berries/pamtre.gbapal.lz"
.align 2
gBerryPalette_Watmel:: @ 8E7E618
- .incbin "graphics/berries/watmel/palette.gbapal.lz"
+ .incbin "graphics/berries/watmel.gbapal.lz"
.align 2
gBerryPalette_Durin:: @ 8E7E640
- .incbin "graphics/berries/durin/palette.gbapal.lz"
+ .incbin "graphics/berries/durin.gbapal.lz"
.align 2
gBerryPalette_Belue:: @ 8E7E668
- .incbin "graphics/berries/belue/palette.gbapal.lz"
+ .incbin "graphics/berries/belue.gbapal.lz"
.align 2
gBerryPalette_Liechi:: @ 8E7E690
- .incbin "graphics/berries/liechi/palette.gbapal.lz"
+ .incbin "graphics/berries/liechi.gbapal.lz"
.align 2
gBerryPalette_Ganlon:: @ 8E7E6B8
- .incbin "graphics/berries/ganlon/palette.gbapal.lz"
+ .incbin "graphics/berries/ganlon.gbapal.lz"
.align 2
gBerryPalette_Salac:: @ 8E7E6E0
- .incbin "graphics/berries/salac/palette.gbapal.lz"
+ .incbin "graphics/berries/salac.gbapal.lz"
.align 2
gBerryPalette_Petaya:: @ 8E7E708
- .incbin "graphics/berries/petaya/palette.gbapal.lz"
+ .incbin "graphics/berries/petaya.gbapal.lz"
.align 2
gBerryPalette_Apicot:: @ 8E7E730
- .incbin "graphics/berries/apicot/palette.gbapal.lz"
+ .incbin "graphics/berries/apicot.gbapal.lz"
.align 2
gBerryPalette_Lansat:: @ 8E7E758
- .incbin "graphics/berries/lansat/palette.gbapal.lz"
+ .incbin "graphics/berries/lansat.gbapal.lz"
.align 2
gBerryPalette_Starf:: @ 8E7E780
- .incbin "graphics/berries/starf/palette.gbapal.lz"
+ .incbin "graphics/berries/starf.gbapal.lz"
.align 2
gBerryPalette_Enigma:: @ 8E7E7A8
- .incbin "graphics/berries/enigma/palette.gbapal.lz"
+ .incbin "graphics/berries/enigma.gbapal.lz"
diff --git a/data/graphics/berries/graphics_table.inc b/data/graphics/berries/graphics_table.inc
deleted file mode 100644
index 78af1c48b..000000000
--- a/data/graphics/berries/graphics_table.inc
+++ /dev/null
@@ -1,45 +0,0 @@
- .align 2
-gBerryGraphicsTable:: @ 83C1E1C
- .4byte gBerryPic_Cheri, gBerryPalette_Cheri
- .4byte gBerryPic_Chesto, gBerryPalette_Chesto
- .4byte gBerryPic_Pecha, gBerryPalette_Pecha
- .4byte gBerryPic_Rawst, gBerryPalette_Rawst
- .4byte gBerryPic_Aspear, gBerryPalette_Aspear
- .4byte gBerryPic_Leppa, gBerryPalette_Leppa
- .4byte gBerryPic_Oran, gBerryPalette_Oran
- .4byte gBerryPic_Persim, gBerryPalette_Persim
- .4byte gBerryPic_Lum, gBerryPalette_Lum
- .4byte gBerryPic_Sitrus, gBerryPalette_Sitrus
- .4byte gBerryPic_Figy, gBerryPalette_Figy
- .4byte gBerryPic_Wiki, gBerryPalette_Wiki
- .4byte gBerryPic_Mago, gBerryPalette_Mago
- .4byte gBerryPic_Aguav, gBerryPalette_Aguav
- .4byte gBerryPic_Iapapa, gBerryPalette_Iapapa
- .4byte gBerryPic_Razz, gBerryPalette_Razz
- .4byte gBerryPic_Bluk, gBerryPalette_Bluk
- .4byte gBerryPic_Nanab, gBerryPalette_Nanab
- .4byte gBerryPic_Wepear, gBerryPalette_Wepear
- .4byte gBerryPic_Pinap, gBerryPalette_Pinap
- .4byte gBerryPic_Pomeg, gBerryPalette_Pomeg
- .4byte gBerryPic_Kelpsy, gBerryPalette_Kelpsy
- .4byte gBerryPic_Qualot, gBerryPalette_Qualot
- .4byte gBerryPic_Hondew, gBerryPalette_Hondew
- .4byte gBerryPic_Grepa, gBerryPalette_Grepa
- .4byte gBerryPic_Tamato, gBerryPalette_Tamato
- .4byte gBerryPic_Cornn, gBerryPalette_Cornn
- .4byte gBerryPic_Magost, gBerryPalette_Magost
- .4byte gBerryPic_Rabuta, gBerryPalette_Rabuta
- .4byte gBerryPic_Nomel, gBerryPalette_Nomel
- .4byte gBerryPic_Spelon, gBerryPalette_Spelon
- .4byte gBerryPic_Pamtre, gBerryPalette_Pamtre
- .4byte gBerryPic_Watmel, gBerryPalette_Watmel
- .4byte gBerryPic_Durin, gBerryPalette_Durin
- .4byte gBerryPic_Belue, gBerryPalette_Belue
- .4byte gBerryPic_Liechi, gBerryPalette_Liechi
- .4byte gBerryPic_Ganlon, gBerryPalette_Ganlon
- .4byte gBerryPic_Salac, gBerryPalette_Salac
- .4byte gBerryPic_Petaya, gBerryPalette_Petaya
- .4byte gBerryPic_Apicot, gBerryPalette_Apicot
- .4byte gBerryPic_Lansat, gBerryPalette_Lansat
- .4byte gBerryPic_Starf, gBerryPalette_Starf
- .4byte gBerryPic_Enigma, gBerryPalette_Enigma
diff --git a/data/graphics/pokemon/icon_palette_indices.inc b/data/graphics/pokemon/icon_palette_indices.inc
deleted file mode 100644
index f37ec2a7a..000000000
--- a/data/graphics/pokemon/icon_palette_indices.inc
+++ /dev/null
@@ -1,442 +0,0 @@
- .align 2
-gMonIconPaletteIndices:: @ 83BC400
- .byte 0 @ ??????????
- .byte 1 @ Bulbasaur
- .byte 1 @ Ivysaur
- .byte 1 @ Venusaur
- .byte 0 @ Charmander
- .byte 0 @ Charmeleon
- .byte 0 @ Charizard
- .byte 0 @ Squirtle
- .byte 2 @ Wartortle
- .byte 2 @ Blastoise
- .byte 1 @ Caterpie
- .byte 1 @ Metapod
- .byte 0 @ Butterfree
- .byte 1 @ Weedle
- .byte 2 @ Kakuna
- .byte 2 @ Beedrill
- .byte 0 @ Pidgey
- .byte 0 @ Pidgeotto
- .byte 0 @ Pidgeot
- .byte 2 @ Rattata
- .byte 1 @ Raticate
- .byte 0 @ Spearow
- .byte 0 @ Fearow
- .byte 2 @ Ekans
- .byte 2 @ Arbok
- .byte 2 @ Pikachu
- .byte 0 @ Raichu
- .byte 2 @ Sandshrew
- .byte 2 @ Sandslash
- .byte 2 @ Nidoran♀
- .byte 2 @ Nidorina
- .byte 2 @ Nidoqueen
- .byte 2 @ Nidoran♂
- .byte 2 @ Nidorino
- .byte 2 @ Nidoking
- .byte 0 @ Clefairy
- .byte 0 @ Clefable
- .byte 2 @ Vulpix
- .byte 1 @ Ninetales
- .byte 0 @ Jigglypuff
- .byte 0 @ Wigglytuff
- .byte 2 @ Zubat
- .byte 2 @ Golbat
- .byte 1 @ Oddish
- .byte 0 @ Gloom
- .byte 0 @ Vileplume
- .byte 0 @ Paras
- .byte 0 @ Parasect
- .byte 0 @ Venonat
- .byte 2 @ Venomoth
- .byte 2 @ Diglett
- .byte 2 @ Dugtrio
- .byte 1 @ Meowth
- .byte 1 @ Persian
- .byte 1 @ Psyduck
- .byte 2 @ Golduck
- .byte 1 @ Mankey
- .byte 2 @ Primeape
- .byte 0 @ Growlithe
- .byte 0 @ Arcanine
- .byte 0 @ Poliwag
- .byte 0 @ Poliwhirl
- .byte 0 @ Poliwrath
- .byte 2 @ Abra
- .byte 2 @ Kadabra
- .byte 2 @ Alakazam
- .byte 0 @ Machop
- .byte 2 @ Machoke
- .byte 0 @ Machamp
- .byte 1 @ Bellsprout
- .byte 1 @ Weepinbell
- .byte 1 @ Victreebel
- .byte 2 @ Tentacool
- .byte 2 @ Tentacruel
- .byte 1 @ Geodude
- .byte 1 @ Graveler
- .byte 1 @ Golem
- .byte 0 @ Ponyta
- .byte 0 @ Rapidash
- .byte 0 @ Slowpoke
- .byte 0 @ Slowbro
- .byte 0 @ Magnemite
- .byte 0 @ Magneton
- .byte 1 @ Farfetch'd
- .byte 2 @ Doduo
- .byte 2 @ Dodrio
- .byte 2 @ Seel
- .byte 2 @ Dewgong
- .byte 2 @ Grimer
- .byte 2 @ Muk
- .byte 2 @ Shellder
- .byte 2 @ Cloyster
- .byte 2 @ Gastly
- .byte 2 @ Haunter
- .byte 2 @ Gengar
- .byte 2 @ Onix
- .byte 2 @ Drowzee
- .byte 1 @ Hypno
- .byte 2 @ Krabby
- .byte 2 @ Kingler
- .byte 0 @ Voltorb
- .byte 0 @ Electrode
- .byte 0 @ Exeggcute
- .byte 1 @ Exeggutor
- .byte 1 @ Cubone
- .byte 1 @ Marowak
- .byte 2 @ Hitmonlee
- .byte 2 @ Hitmonchan
- .byte 1 @ Lickitung
- .byte 2 @ Koffing
- .byte 2 @ Weezing
- .byte 1 @ Rhyhorn
- .byte 1 @ Rhydon
- .byte 0 @ Chansey
- .byte 0 @ Tangela
- .byte 1 @ Kangaskhan
- .byte 0 @ Horsea
- .byte 0 @ Seadra
- .byte 0 @ Goldeen
- .byte 0 @ Seaking
- .byte 2 @ Staryu
- .byte 2 @ Starmie
- .byte 0 @ Mr. mime
- .byte 1 @ Scyther
- .byte 2 @ Jynx
- .byte 1 @ Electabuzz
- .byte 0 @ Magmar
- .byte 2 @ Pinsir
- .byte 2 @ Tauros
- .byte 0 @ Magikarp
- .byte 0 @ Gyarados
- .byte 2 @ Lapras
- .byte 2 @ Ditto
- .byte 2 @ Eevee
- .byte 0 @ Vaporeon
- .byte 0 @ Jolteon
- .byte 0 @ Flareon
- .byte 0 @ Porygon
- .byte 0 @ Omanyte
- .byte 0 @ Omastar
- .byte 2 @ Kabuto
- .byte 2 @ Kabutops
- .byte 0 @ Aerodactyl
- .byte 1 @ Snorlax
- .byte 0 @ Articuno
- .byte 0 @ Zapdos
- .byte 0 @ Moltres
- .byte 0 @ Dratini
- .byte 0 @ Dragonair
- .byte 2 @ Dragonite
- .byte 2 @ Mewtwo
- .byte 0 @ Mew
- .byte 1 @ Chikorita
- .byte 1 @ Bayleef
- .byte 1 @ Meganium
- .byte 1 @ Cyndaquil
- .byte 1 @ Quilava
- .byte 1 @ Typhlosion
- .byte 2 @ Totodile
- .byte 2 @ Croconaw
- .byte 2 @ Feraligatr
- .byte 2 @ Sentret
- .byte 2 @ Furret
- .byte 2 @ Hoothoot
- .byte 2 @ Noctowl
- .byte 0 @ Ledyba
- .byte 0 @ Ledian
- .byte 1 @ Spinarak
- .byte 0 @ Ariados
- .byte 2 @ Crobat
- .byte 2 @ Chinchou
- .byte 0 @ Lanturn
- .byte 0 @ Pichu
- .byte 0 @ Cleffa
- .byte 1 @ Igglybuff
- .byte 2 @ Togepi
- .byte 2 @ Togetic
- .byte 0 @ Natu
- .byte 0 @ Xatu
- .byte 2 @ Mareep
- .byte 0 @ Flaaffy
- .byte 0 @ Ampharos
- .byte 1 @ Bellossom
- .byte 2 @ Marill
- .byte 2 @ Azumarill
- .byte 1 @ Sudowoodo
- .byte 1 @ Politoed
- .byte 1 @ Hoppip
- .byte 1 @ Skiploom
- .byte 2 @ Jumpluff
- .byte 2 @ Aipom
- .byte 1 @ Sunkern
- .byte 1 @ Sunflora
- .byte 1 @ Yanma
- .byte 0 @ Wooper
- .byte 0 @ Quagsire
- .byte 2 @ Espeon
- .byte 2 @ Umbreon
- .byte 2 @ Murkrow
- .byte 0 @ Slowking
- .byte 0 @ Misdreavus
- .byte 0 @ Unown A
- .byte 0 @ Wobbuffet
- .byte 1 @ Girafarig
- .byte 0 @ Pineco
- .byte 2 @ Forretress
- .byte 2 @ Dunsparce
- .byte 2 @ Gligar
- .byte 0 @ Steelix
- .byte 0 @ Snubbull
- .byte 2 @ Granbull
- .byte 0 @ Qwilfish
- .byte 0 @ Scizor
- .byte 1 @ Shuckle
- .byte 2 @ Heracross
- .byte 0 @ Sneasel
- .byte 0 @ Teddiursa
- .byte 2 @ Ursaring
- .byte 0 @ Slugma
- .byte 0 @ Magcargo
- .byte 2 @ Swinub
- .byte 2 @ Piloswine
- .byte 0 @ Corsola
- .byte 0 @ Remoraid
- .byte 0 @ Octillery
- .byte 0 @ Delibird
- .byte 2 @ Mantine
- .byte 0 @ Skarmory
- .byte 0 @ Houndour
- .byte 0 @ Houndoom
- .byte 0 @ Kingdra
- .byte 0 @ Phanpy
- .byte 0 @ Donphan
- .byte 0 @ Porygon2
- .byte 2 @ Stantler
- .byte 1 @ Smeargle
- .byte 2 @ Tyrogue
- .byte 2 @ Hitmontop
- .byte 1 @ Smoochum
- .byte 1 @ Elekid
- .byte 1 @ Magby
- .byte 1 @ Miltank
- .byte 1 @ Blissey
- .byte 0 @ Raikou
- .byte 2 @ Entei
- .byte 0 @ Suicune
- .byte 1 @ Larvitar
- .byte 0 @ Pupitar
- .byte 1 @ Tyranitar
- .byte 0 @ Lugia
- .byte 1 @ Ho-Oh
- .byte 1 @ Celebi
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 0 @ ?
- .byte 1 @ Treecko
- .byte 0 @ Grovyle
- .byte 1 @ Sceptile
- .byte 0 @ Torchic
- .byte 0 @ Combusken
- .byte 0 @ Blaziken
- .byte 0 @ Mudkip
- .byte 0 @ Marshtomp
- .byte 0 @ Swampert
- .byte 2 @ Poochyena
- .byte 2 @ Mightyena
- .byte 2 @ Zigzagoon
- .byte 2 @ Linoone
- .byte 0 @ Wurmple
- .byte 2 @ Silcoon
- .byte 0 @ Beautifly
- .byte 2 @ Cascoon
- .byte 1 @ Dustox
- .byte 1 @ Lotad
- .byte 1 @ Lombre
- .byte 1 @ Ludicolo
- .byte 1 @ Seedot
- .byte 1 @ Nuzleaf
- .byte 0 @ Shiftry
- .byte 1 @ Nincada
- .byte 1 @ Ninjask
- .byte 1 @ Shedinja
- .byte 2 @ Taillow
- .byte 2 @ Swellow
- .byte 1 @ Shroomish
- .byte 1 @ Breloom
- .byte 1 @ Spinda
- .byte 0 @ Wingull
- .byte 0 @ Pelipper
- .byte 2 @ Surskit
- .byte 0 @ Masquerain
- .byte 2 @ Wailmer
- .byte 0 @ Wailord
- .byte 0 @ Skitty
- .byte 2 @ Delcatty
- .byte 1 @ Kecleon
- .byte 1 @ Baltoy
- .byte 0 @ Claydol
- .byte 0 @ Nosepass
- .byte 1 @ Torkoal
- .byte 2 @ Sableye
- .byte 0 @ Barboach
- .byte 0 @ Whiscash
- .byte 0 @ Luvdisc
- .byte 0 @ Corphish
- .byte 0 @ Crawdaunt
- .byte 2 @ Feebas
- .byte 0 @ Milotic
- .byte 0 @ Carvanha
- .byte 0 @ Sharpedo
- .byte 1 @ Trapinch
- .byte 1 @ Vibrava
- .byte 1 @ Flygon
- .byte 2 @ Makuhita
- .byte 1 @ Hariyama
- .byte 1 @ Electrike
- .byte 0 @ Manectric
- .byte 1 @ Numel
- .byte 0 @ Camerupt
- .byte 2 @ Spheal
- .byte 2 @ Sealeo
- .byte 0 @ Walrein
- .byte 1 @ Cacnea
- .byte 1 @ Cacturne
- .byte 2 @ Snorunt
- .byte 0 @ Glalie
- .byte 1 @ Lunatone
- .byte 0 @ Solrock
- .byte 2 @ Azurill
- .byte 0 @ Spoink
- .byte 2 @ Grumpig
- .byte 0 @ Plusle
- .byte 0 @ Minun
- .byte 2 @ Mawile
- .byte 0 @ Meditite
- .byte 0 @ Medicham
- .byte 0 @ Swablu
- .byte 0 @ Altaria
- .byte 0 @ Wynaut
- .byte 0 @ Duskull
- .byte 0 @ Dusclops
- .byte 0 @ Roselia
- .byte 2 @ Slakoth
- .byte 2 @ Vigoroth
- .byte 1 @ Slaking
- .byte 1 @ Gulpin
- .byte 2 @ Swalot
- .byte 1 @ Tropius
- .byte 0 @ Whismur
- .byte 2 @ Loudred
- .byte 2 @ Exploud
- .byte 0 @ Clamperl
- .byte 0 @ Huntail
- .byte 0 @ Gorebyss
- .byte 0 @ Absol
- .byte 0 @ Shuppet
- .byte 0 @ Banette
- .byte 2 @ Seviper
- .byte 0 @ Zangoose
- .byte 1 @ Relicanth
- .byte 2 @ Aron
- .byte 2 @ Lairon
- .byte 2 @ Aggron
- .byte 0 @ Castform
- .byte 0 @ Volbeat
- .byte 2 @ Illumise
- .byte 2 @ Lileep
- .byte 0 @ Cradily
- .byte 0 @ Anorith
- .byte 0 @ Armaldo
- .byte 1 @ Ralts
- .byte 1 @ Kirlia
- .byte 1 @ Gardevoir
- .byte 2 @ Bagon
- .byte 2 @ Shelgon
- .byte 0 @ Salamence
- .byte 0 @ Beldum
- .byte 0 @ Metang
- .byte 0 @ Metagross
- .byte 2 @ Regirock
- .byte 2 @ Regice
- .byte 2 @ Registeel
- .byte 2 @ Kyogre
- .byte 0 @ Groudon
- .byte 1 @ Rayquaza
- .byte 0 @ Latias
- .byte 2 @ Latios
- .byte 0 @ Jirachi
- .byte 0 @ Deoxys
- .byte 0 @ Chimecho
- .byte 1 @ Egg
- .byte 0 @ Unown B
- .byte 0 @ Unown C
- .byte 0 @ Unown D
- .byte 0 @ Unown E
- .byte 0 @ Unown F
- .byte 0 @ Unown G
- .byte 0 @ Unown H
- .byte 0 @ Unown I
- .byte 0 @ Unown J
- .byte 0 @ Unown K
- .byte 0 @ Unown L
- .byte 0 @ Unown M
- .byte 0 @ Unown N
- .byte 0 @ Unown O
- .byte 0 @ Unown P
- .byte 0 @ Unown Q
- .byte 0 @ Unown R
- .byte 0 @ Unown S
- .byte 0 @ Unown T
- .byte 0 @ Unown U
- .byte 0 @ Unown V
- .byte 0 @ Unown W
- .byte 0 @ Unown X
- .byte 0 @ Unown Y
- .byte 0 @ Unown Z
- .byte 0 @ Unown Exclamation Mark
- .byte 0 @ Unown Question Mark
diff --git a/data/graphics/pokemon/icon_palette_table.inc b/data/graphics/pokemon/icon_palette_table.inc
deleted file mode 100644
index d9da61ab2..000000000
--- a/data/graphics/pokemon/icon_palette_table.inc
+++ /dev/null
@@ -1,11 +0,0 @@
- .align 2
-gMonIconPaletteTable:: @ 83BC5B8
- obj_pal gMonIconPalettes + 0 * 32, 56000
- obj_pal gMonIconPalettes + 1 * 32, 56001
- obj_pal gMonIconPalettes + 2 * 32, 56002
-
-@ These palettes are actually part of the title screen BG palette and are not
-@ used for Pokémon icons.
- obj_pal gMonIconPalettes + 3 * 32, 56003
- obj_pal gMonIconPalettes + 4 * 32, 56004
- obj_pal gMonIconPalettes + 5 * 32, 56005
diff --git a/data/graphics/pokemon/icon_table.inc b/data/graphics/pokemon/icon_table.inc
deleted file mode 100644
index eeb064208..000000000
--- a/data/graphics/pokemon/icon_table.inc
+++ /dev/null
@@ -1,442 +0,0 @@
- .align 2
-gMonIconTable:: @ 83BBD20
- .4byte gMonIcon_Bulbasaur
- .4byte gMonIcon_Bulbasaur
- .4byte gMonIcon_Ivysaur
- .4byte gMonIcon_Venusaur
- .4byte gMonIcon_Charmander
- .4byte gMonIcon_Charmeleon
- .4byte gMonIcon_Charizard
- .4byte gMonIcon_Squirtle
- .4byte gMonIcon_Wartortle
- .4byte gMonIcon_Blastoise
- .4byte gMonIcon_Caterpie
- .4byte gMonIcon_Metapod
- .4byte gMonIcon_Butterfree
- .4byte gMonIcon_Weedle
- .4byte gMonIcon_Kakuna
- .4byte gMonIcon_Beedrill
- .4byte gMonIcon_Pidgey
- .4byte gMonIcon_Pidgeotto
- .4byte gMonIcon_Pidgeot
- .4byte gMonIcon_Rattata
- .4byte gMonIcon_Raticate
- .4byte gMonIcon_Spearow
- .4byte gMonIcon_Fearow
- .4byte gMonIcon_Ekans
- .4byte gMonIcon_Arbok
- .4byte gMonIcon_Pikachu
- .4byte gMonIcon_Raichu
- .4byte gMonIcon_Sandshrew
- .4byte gMonIcon_Sandslash
- .4byte gMonIcon_NidoranF
- .4byte gMonIcon_Nidorina
- .4byte gMonIcon_Nidoqueen
- .4byte gMonIcon_NidoranM
- .4byte gMonIcon_Nidorino
- .4byte gMonIcon_Nidoking
- .4byte gMonIcon_Clefairy
- .4byte gMonIcon_Clefable
- .4byte gMonIcon_Vulpix
- .4byte gMonIcon_Ninetales
- .4byte gMonIcon_Jigglypuff
- .4byte gMonIcon_Wigglytuff
- .4byte gMonIcon_Zubat
- .4byte gMonIcon_Golbat
- .4byte gMonIcon_Oddish
- .4byte gMonIcon_Gloom
- .4byte gMonIcon_Vileplume
- .4byte gMonIcon_Paras
- .4byte gMonIcon_Parasect
- .4byte gMonIcon_Venonat
- .4byte gMonIcon_Venomoth
- .4byte gMonIcon_Diglett
- .4byte gMonIcon_Dugtrio
- .4byte gMonIcon_Meowth
- .4byte gMonIcon_Persian
- .4byte gMonIcon_Psyduck
- .4byte gMonIcon_Golduck
- .4byte gMonIcon_Mankey
- .4byte gMonIcon_Primeape
- .4byte gMonIcon_Growlithe
- .4byte gMonIcon_Arcanine
- .4byte gMonIcon_Poliwag
- .4byte gMonIcon_Poliwhirl
- .4byte gMonIcon_Poliwrath
- .4byte gMonIcon_Abra
- .4byte gMonIcon_Kadabra
- .4byte gMonIcon_Alakazam
- .4byte gMonIcon_Machop
- .4byte gMonIcon_Machoke
- .4byte gMonIcon_Machamp
- .4byte gMonIcon_Bellsprout
- .4byte gMonIcon_Weepinbell
- .4byte gMonIcon_Victreebel
- .4byte gMonIcon_Tentacool
- .4byte gMonIcon_Tentacruel
- .4byte gMonIcon_Geodude
- .4byte gMonIcon_Graveler
- .4byte gMonIcon_Golem
- .4byte gMonIcon_Ponyta
- .4byte gMonIcon_Rapidash
- .4byte gMonIcon_Slowpoke
- .4byte gMonIcon_Slowbro
- .4byte gMonIcon_Magnemite
- .4byte gMonIcon_Magneton
- .4byte gMonIcon_Farfetchd
- .4byte gMonIcon_Doduo
- .4byte gMonIcon_Dodrio
- .4byte gMonIcon_Seel
- .4byte gMonIcon_Dewgong
- .4byte gMonIcon_Grimer
- .4byte gMonIcon_Muk
- .4byte gMonIcon_Shellder
- .4byte gMonIcon_Cloyster
- .4byte gMonIcon_Gastly
- .4byte gMonIcon_Haunter
- .4byte gMonIcon_Gengar
- .4byte gMonIcon_Onix
- .4byte gMonIcon_Drowzee
- .4byte gMonIcon_Hypno
- .4byte gMonIcon_Krabby
- .4byte gMonIcon_Kingler
- .4byte gMonIcon_Voltorb
- .4byte gMonIcon_Electrode
- .4byte gMonIcon_Exeggcute
- .4byte gMonIcon_Exeggutor
- .4byte gMonIcon_Cubone
- .4byte gMonIcon_Marowak
- .4byte gMonIcon_Hitmonlee
- .4byte gMonIcon_Hitmonchan
- .4byte gMonIcon_Lickitung
- .4byte gMonIcon_Koffing
- .4byte gMonIcon_Weezing
- .4byte gMonIcon_Rhyhorn
- .4byte gMonIcon_Rhydon
- .4byte gMonIcon_Chansey
- .4byte gMonIcon_Tangela
- .4byte gMonIcon_Kangaskhan
- .4byte gMonIcon_Horsea
- .4byte gMonIcon_Seadra
- .4byte gMonIcon_Goldeen
- .4byte gMonIcon_Seaking
- .4byte gMonIcon_Staryu
- .4byte gMonIcon_Starmie
- .4byte gMonIcon_Mrmime
- .4byte gMonIcon_Scyther
- .4byte gMonIcon_Jynx
- .4byte gMonIcon_Electabuzz
- .4byte gMonIcon_Magmar
- .4byte gMonIcon_Pinsir
- .4byte gMonIcon_Tauros
- .4byte gMonIcon_Magikarp
- .4byte gMonIcon_Gyarados
- .4byte gMonIcon_Lapras
- .4byte gMonIcon_Ditto
- .4byte gMonIcon_Eevee
- .4byte gMonIcon_Vaporeon
- .4byte gMonIcon_Jolteon
- .4byte gMonIcon_Flareon
- .4byte gMonIcon_Porygon
- .4byte gMonIcon_Omanyte
- .4byte gMonIcon_Omastar
- .4byte gMonIcon_Kabuto
- .4byte gMonIcon_Kabutops
- .4byte gMonIcon_Aerodactyl
- .4byte gMonIcon_Snorlax
- .4byte gMonIcon_Articuno
- .4byte gMonIcon_Zapdos
- .4byte gMonIcon_Moltres
- .4byte gMonIcon_Dratini
- .4byte gMonIcon_Dragonair
- .4byte gMonIcon_Dragonite
- .4byte gMonIcon_Mewtwo
- .4byte gMonIcon_Mew
- .4byte gMonIcon_Chikorita
- .4byte gMonIcon_Bayleef
- .4byte gMonIcon_Meganium
- .4byte gMonIcon_Cyndaquil
- .4byte gMonIcon_Quilava
- .4byte gMonIcon_Typhlosion
- .4byte gMonIcon_Totodile
- .4byte gMonIcon_Croconaw
- .4byte gMonIcon_Feraligatr
- .4byte gMonIcon_Sentret
- .4byte gMonIcon_Furret
- .4byte gMonIcon_Hoothoot
- .4byte gMonIcon_Noctowl
- .4byte gMonIcon_Ledyba
- .4byte gMonIcon_Ledian
- .4byte gMonIcon_Spinarak
- .4byte gMonIcon_Ariados
- .4byte gMonIcon_Crobat
- .4byte gMonIcon_Chinchou
- .4byte gMonIcon_Lanturn
- .4byte gMonIcon_Pichu
- .4byte gMonIcon_Cleffa
- .4byte gMonIcon_Igglybuff
- .4byte gMonIcon_Togepi
- .4byte gMonIcon_Togetic
- .4byte gMonIcon_Natu
- .4byte gMonIcon_Xatu
- .4byte gMonIcon_Mareep
- .4byte gMonIcon_Flaaffy
- .4byte gMonIcon_Ampharos
- .4byte gMonIcon_Bellossom
- .4byte gMonIcon_Marill
- .4byte gMonIcon_Azumarill
- .4byte gMonIcon_Sudowoodo
- .4byte gMonIcon_Politoed
- .4byte gMonIcon_Hoppip
- .4byte gMonIcon_Skiploom
- .4byte gMonIcon_Jumpluff
- .4byte gMonIcon_Aipom
- .4byte gMonIcon_Sunkern
- .4byte gMonIcon_Sunflora
- .4byte gMonIcon_Yanma
- .4byte gMonIcon_Wooper
- .4byte gMonIcon_Quagsire
- .4byte gMonIcon_Espeon
- .4byte gMonIcon_Umbreon
- .4byte gMonIcon_Murkrow
- .4byte gMonIcon_Slowking
- .4byte gMonIcon_Misdreavus
- .4byte gMonIcon_UnownA
- .4byte gMonIcon_Wobbuffet
- .4byte gMonIcon_Girafarig
- .4byte gMonIcon_Pineco
- .4byte gMonIcon_Forretress
- .4byte gMonIcon_Dunsparce
- .4byte gMonIcon_Gligar
- .4byte gMonIcon_Steelix
- .4byte gMonIcon_Snubbull
- .4byte gMonIcon_Granbull
- .4byte gMonIcon_Qwilfish
- .4byte gMonIcon_Scizor
- .4byte gMonIcon_Shuckle
- .4byte gMonIcon_Heracross
- .4byte gMonIcon_Sneasel
- .4byte gMonIcon_Teddiursa
- .4byte gMonIcon_Ursaring
- .4byte gMonIcon_Slugma
- .4byte gMonIcon_Magcargo
- .4byte gMonIcon_Swinub
- .4byte gMonIcon_Piloswine
- .4byte gMonIcon_Corsola
- .4byte gMonIcon_Remoraid
- .4byte gMonIcon_Octillery
- .4byte gMonIcon_Delibird
- .4byte gMonIcon_Mantine
- .4byte gMonIcon_Skarmory
- .4byte gMonIcon_Houndour
- .4byte gMonIcon_Houndoom
- .4byte gMonIcon_Kingdra
- .4byte gMonIcon_Phanpy
- .4byte gMonIcon_Donphan
- .4byte gMonIcon_Porygon2
- .4byte gMonIcon_Stantler
- .4byte gMonIcon_Smeargle
- .4byte gMonIcon_Tyrogue
- .4byte gMonIcon_Hitmontop
- .4byte gMonIcon_Smoochum
- .4byte gMonIcon_Elekid
- .4byte gMonIcon_Magby
- .4byte gMonIcon_Miltank
- .4byte gMonIcon_Blissey
- .4byte gMonIcon_Raikou
- .4byte gMonIcon_Entei
- .4byte gMonIcon_Suicune
- .4byte gMonIcon_Larvitar
- .4byte gMonIcon_Pupitar
- .4byte gMonIcon_Tyranitar
- .4byte gMonIcon_Lugia
- .4byte gMonIcon_HoOh
- .4byte gMonIcon_Celebi
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_QuestionMark
- .4byte gMonIcon_Treecko
- .4byte gMonIcon_Grovyle
- .4byte gMonIcon_Sceptile
- .4byte gMonIcon_Torchic
- .4byte gMonIcon_Combusken
- .4byte gMonIcon_Blaziken
- .4byte gMonIcon_Mudkip
- .4byte gMonIcon_Marshtomp
- .4byte gMonIcon_Swampert
- .4byte gMonIcon_Poochyena
- .4byte gMonIcon_Mightyena
- .4byte gMonIcon_Zigzagoon
- .4byte gMonIcon_Linoone
- .4byte gMonIcon_Wurmple
- .4byte gMonIcon_Silcoon
- .4byte gMonIcon_Beautifly
- .4byte gMonIcon_Cascoon
- .4byte gMonIcon_Dustox
- .4byte gMonIcon_Lotad
- .4byte gMonIcon_Lombre
- .4byte gMonIcon_Ludicolo
- .4byte gMonIcon_Seedot
- .4byte gMonIcon_Nuzleaf
- .4byte gMonIcon_Shiftry
- .4byte gMonIcon_Nincada
- .4byte gMonIcon_Ninjask
- .4byte gMonIcon_Shedinja
- .4byte gMonIcon_Taillow
- .4byte gMonIcon_Swellow
- .4byte gMonIcon_Shroomish
- .4byte gMonIcon_Breloom
- .4byte gMonIcon_Spinda
- .4byte gMonIcon_Wingull
- .4byte gMonIcon_Pelipper
- .4byte gMonIcon_Surskit
- .4byte gMonIcon_Masquerain
- .4byte gMonIcon_Wailmer
- .4byte gMonIcon_Wailord
- .4byte gMonIcon_Skitty
- .4byte gMonIcon_Delcatty
- .4byte gMonIcon_Kecleon
- .4byte gMonIcon_Baltoy
- .4byte gMonIcon_Claydol
- .4byte gMonIcon_Nosepass
- .4byte gMonIcon_Torkoal
- .4byte gMonIcon_Sableye
- .4byte gMonIcon_Barboach
- .4byte gMonIcon_Whiscash
- .4byte gMonIcon_Luvdisc
- .4byte gMonIcon_Corphish
- .4byte gMonIcon_Crawdaunt
- .4byte gMonIcon_Feebas
- .4byte gMonIcon_Milotic
- .4byte gMonIcon_Carvanha
- .4byte gMonIcon_Sharpedo
- .4byte gMonIcon_Trapinch
- .4byte gMonIcon_Vibrava
- .4byte gMonIcon_Flygon
- .4byte gMonIcon_Makuhita
- .4byte gMonIcon_Hariyama
- .4byte gMonIcon_Electrike
- .4byte gMonIcon_Manectric
- .4byte gMonIcon_Numel
- .4byte gMonIcon_Camerupt
- .4byte gMonIcon_Spheal
- .4byte gMonIcon_Sealeo
- .4byte gMonIcon_Walrein
- .4byte gMonIcon_Cacnea
- .4byte gMonIcon_Cacturne
- .4byte gMonIcon_Snorunt
- .4byte gMonIcon_Glalie
- .4byte gMonIcon_Lunatone
- .4byte gMonIcon_Solrock
- .4byte gMonIcon_Azurill
- .4byte gMonIcon_Spoink
- .4byte gMonIcon_Grumpig
- .4byte gMonIcon_Plusle
- .4byte gMonIcon_Minun
- .4byte gMonIcon_Mawile
- .4byte gMonIcon_Meditite
- .4byte gMonIcon_Medicham
- .4byte gMonIcon_Swablu
- .4byte gMonIcon_Altaria
- .4byte gMonIcon_Wynaut
- .4byte gMonIcon_Duskull
- .4byte gMonIcon_Dusclops
- .4byte gMonIcon_Roselia
- .4byte gMonIcon_Slakoth
- .4byte gMonIcon_Vigoroth
- .4byte gMonIcon_Slaking
- .4byte gMonIcon_Gulpin
- .4byte gMonIcon_Swalot
- .4byte gMonIcon_Tropius
- .4byte gMonIcon_Whismur
- .4byte gMonIcon_Loudred
- .4byte gMonIcon_Exploud
- .4byte gMonIcon_Clamperl
- .4byte gMonIcon_Huntail
- .4byte gMonIcon_Gorebyss
- .4byte gMonIcon_Absol
- .4byte gMonIcon_Shuppet
- .4byte gMonIcon_Banette
- .4byte gMonIcon_Seviper
- .4byte gMonIcon_Zangoose
- .4byte gMonIcon_Relicanth
- .4byte gMonIcon_Aron
- .4byte gMonIcon_Lairon
- .4byte gMonIcon_Aggron
- .4byte gMonIcon_Castform
- .4byte gMonIcon_Volbeat
- .4byte gMonIcon_Illumise
- .4byte gMonIcon_Lileep
- .4byte gMonIcon_Cradily
- .4byte gMonIcon_Anorith
- .4byte gMonIcon_Armaldo
- .4byte gMonIcon_Ralts
- .4byte gMonIcon_Kirlia
- .4byte gMonIcon_Gardevoir
- .4byte gMonIcon_Bagon
- .4byte gMonIcon_Shelgon
- .4byte gMonIcon_Salamence
- .4byte gMonIcon_Beldum
- .4byte gMonIcon_Metang
- .4byte gMonIcon_Metagross
- .4byte gMonIcon_Regirock
- .4byte gMonIcon_Regice
- .4byte gMonIcon_Registeel
- .4byte gMonIcon_Kyogre
- .4byte gMonIcon_Groudon
- .4byte gMonIcon_Rayquaza
- .4byte gMonIcon_Latias
- .4byte gMonIcon_Latios
- .4byte gMonIcon_Jirachi
- .4byte gMonIcon_Deoxys
- .4byte gMonIcon_Chimecho
- .4byte gMonIcon_Egg
- .4byte gMonIcon_UnownB
- .4byte gMonIcon_UnownC
- .4byte gMonIcon_UnownD
- .4byte gMonIcon_UnownE
- .4byte gMonIcon_UnownF
- .4byte gMonIcon_UnownG
- .4byte gMonIcon_UnownH
- .4byte gMonIcon_UnownI
- .4byte gMonIcon_UnownJ
- .4byte gMonIcon_UnownK
- .4byte gMonIcon_UnownL
- .4byte gMonIcon_UnownM
- .4byte gMonIcon_UnownN
- .4byte gMonIcon_UnownO
- .4byte gMonIcon_UnownP
- .4byte gMonIcon_UnownQ
- .4byte gMonIcon_UnownR
- .4byte gMonIcon_UnownS
- .4byte gMonIcon_UnownT
- .4byte gMonIcon_UnownU
- .4byte gMonIcon_UnownV
- .4byte gMonIcon_UnownW
- .4byte gMonIcon_UnownX
- .4byte gMonIcon_UnownY
- .4byte gMonIcon_UnownZ
- .4byte gMonIcon_UnownExclamationMark
- .4byte gMonIcon_UnownQuestionMark
diff --git a/data/graphics/trainers/graphics.inc b/data/graphics/trainers/graphics.inc
index 09f34ca31..3a2be8723 100644
--- a/data/graphics/trainers/graphics.inc
+++ b/data/graphics/trainers/graphics.inc
@@ -1,675 +1,675 @@
.align 2
gTrainerFrontPic_Lass:: @ 8E48D38
- .incbin "graphics/trainers/lass/front.4bpp.lz"
+ .incbin "graphics/trainers/lass.4bpp.lz"
.align 2
gTrainerFrontPic_Youngster:: @ 8E49010
- .incbin "graphics/trainers/youngster/front.4bpp.lz"
+ .incbin "graphics/trainers/youngster.4bpp.lz"
.align 2
gTrainerFrontPic_Brendan:: @ 8E492B8
- .incbin "graphics/trainers/brendan/front.4bpp.lz"
+ .incbin "graphics/trainers/brendan.4bpp.lz"
.align 2
gTrainerFrontPic_May:: @ 8E495CC
- .incbin "graphics/trainers/may/front.4bpp.lz"
+ .incbin "graphics/trainers/may.4bpp.lz"
.align 2
gTrainerFrontPic_Hiker:: @ 8E498CC
- .incbin "graphics/trainers/hiker/front.4bpp.lz"
+ .incbin "graphics/trainers/hiker.4bpp.lz"
.align 2
gTrainerFrontPic_Beauty:: @ 8E49D4C
- .incbin "graphics/trainers/beauty/front.4bpp.lz"
+ .incbin "graphics/trainers/beauty.4bpp.lz"
.align 2
gTrainerFrontPic_Fisherman:: @ 8E4A034
- .incbin "graphics/trainers/fisherman/front.4bpp.lz"
+ .incbin "graphics/trainers/fisherman.4bpp.lz"
.align 2
gTrainerFrontPic_Lady:: @ 8E4A418
- .incbin "graphics/trainers/lady/front.4bpp.lz"
+ .incbin "graphics/trainers/lady.4bpp.lz"
.align 2
gTrainerFrontPic_CyclingTriathleteM:: @ 8E4A7CC
- .incbin "graphics/trainers/cycling_triathlete_m/front.4bpp.lz"
+ .incbin "graphics/trainers/cycling_triathlete_m.4bpp.lz"
.align 2
gTrainerFrontPic_AquaGruntM:: @ 8E4ABDC
- .incbin "graphics/trainers/aqua_grunt_m/front.4bpp.lz"
+ .incbin "graphics/trainers/aqua_grunt_m.4bpp.lz"
.align 2
gTrainerFrontPic_Twins:: @ 8E4AF3C
- .incbin "graphics/trainers/twins/front.4bpp.lz"
+ .incbin "graphics/trainers/twins.4bpp.lz"
.align 2
gTrainerFrontPic_SwimmerF:: @ 8E4B300
- .incbin "graphics/trainers/swimmer_f/front.4bpp.lz"
+ .incbin "graphics/trainers/swimmer_f.4bpp.lz"
.align 2
gTrainerFrontPic_BugCatcher:: @ 8E4B5D0
- .incbin "graphics/trainers/bug_catcher/front.4bpp.lz"
+ .incbin "graphics/trainers/bug_catcher.4bpp.lz"
.align 2
gTrainerFrontPic_SchoolKidM:: @ 8E4B8FC
- .incbin "graphics/trainers/school_kid_m/front.4bpp.lz"
+ .incbin "graphics/trainers/school_kid_m.4bpp.lz"
.align 2
gTrainerFrontPic_RichBoy:: @ 8E4BBBC
- .incbin "graphics/trainers/rich_boy/front.4bpp.lz"
+ .incbin "graphics/trainers/rich_boy.4bpp.lz"
.align 2
gTrainerFrontPic_SrAndJr:: @ 8E4BE70
- .incbin "graphics/trainers/sr_and_jr/front.4bpp.lz"
+ .incbin "graphics/trainers/sr_and_jr.4bpp.lz"
.align 2
gTrainerFrontPic_BlackBelt:: @ 8E4C2E0
- .incbin "graphics/trainers/black_belt/front.4bpp.lz"
+ .incbin "graphics/trainers/black_belt.4bpp.lz"
.align 2
gTrainerFrontPic_Wally:: @ 8E4C644
- .incbin "graphics/trainers/wally/front.4bpp.lz"
+ .incbin "graphics/trainers/wally.4bpp.lz"
.align 2
gTrainerFrontPic_AquaGruntF:: @ 8E4C914
- .incbin "graphics/trainers/aqua_grunt_f/front.4bpp.lz"
+ .incbin "graphics/trainers/aqua_grunt_f.4bpp.lz"
.align 2
gTrainerFrontPic_TuberF:: @ 8E4CC50
- .incbin "graphics/trainers/tuber_f/front.4bpp.lz"
+ .incbin "graphics/trainers/tuber_f.4bpp.lz"
.align 2
gTrainerFrontPic_HexManiac:: @ 8E4CEF4
- .incbin "graphics/trainers/hex_maniac/front.4bpp.lz"
+ .incbin "graphics/trainers/hex_maniac.4bpp.lz"
.align 2
gTrainerFrontPic_PokemonBreederF:: @ 8E4D260
- .incbin "graphics/trainers/pokemon_breeder_f/front.4bpp.lz"
+ .incbin "graphics/trainers/pokemon_breeder_f.4bpp.lz"
.align 2
gTrainerFrontPic_MagmaGruntM:: @ 8E4D594
- .incbin "graphics/trainers/magma_grunt_m/front.4bpp.lz"
+ .incbin "graphics/trainers/magma_grunt_m.4bpp.lz"
.align 2
gTrainerFrontPic_MagmaGruntF:: @ 8E4D914
- .incbin "graphics/trainers/magma_grunt_f/front.4bpp.lz"
+ .incbin "graphics/trainers/magma_grunt_f.4bpp.lz"
.align 2
gTrainerFrontPic_Interviewer:: @ 8E4DCA0
- .incbin "graphics/trainers/interviewer/front.4bpp.lz"
+ .incbin "graphics/trainers/interviewer.4bpp.lz"
.align 2
gTrainerFrontPic_TuberM:: @ 8E4E144
- .incbin "graphics/trainers/tuber_m/front.4bpp.lz"
+ .incbin "graphics/trainers/tuber_m.4bpp.lz"
.align 2
gTrainerFrontPic_YoungCouple:: @ 8E4E3D0
- .incbin "graphics/trainers/young_couple/front.4bpp.lz"
+ .incbin "graphics/trainers/young_couple.4bpp.lz"
.align 2
gTrainerFrontPic_Guitarist:: @ 8E4E790
- .incbin "graphics/trainers/guitarist/front.4bpp.lz"
+ .incbin "graphics/trainers/guitarist.4bpp.lz"
.align 2
gTrainerFrontPic_Gentleman:: @ 8E4EB14
- .incbin "graphics/trainers/gentleman/front.4bpp.lz"
+ .incbin "graphics/trainers/gentleman.4bpp.lz"
.align 2
gTrainerFrontPic_Steven:: @ 8E4EE14
- .incbin "graphics/trainers/steven/front.4bpp.lz"
+ .incbin "graphics/trainers/steven.4bpp.lz"
.align 2
gTrainerFrontPic_Maxie:: @ 8E4F14C
- .incbin "graphics/trainers/maxie/front.4bpp.lz"
+ .incbin "graphics/trainers/maxie.4bpp.lz"
.align 2
gTrainerFrontPic_RunningTriathleteF:: @ 8E4F440
- .incbin "graphics/trainers/running_triathlete_f/front.4bpp.lz"
+ .incbin "graphics/trainers/running_triathlete_f.4bpp.lz"
.align 2
gTrainerFrontPic_RunningTriathleteM:: @ 8E4F6E4
- .incbin "graphics/trainers/running_triathlete_m/front.4bpp.lz"
+ .incbin "graphics/trainers/running_triathlete_m.4bpp.lz"
.align 2
gTrainerFrontPic_BattleGirl:: @ 8E4F99C
- .incbin "graphics/trainers/battle_girl/front.4bpp.lz"
+ .incbin "graphics/trainers/battle_girl.4bpp.lz"
.align 2
gTrainerFrontPic_CyclingTriathleteF:: @ 8E4FCBC
- .incbin "graphics/trainers/cycling_triathlete_f/front.4bpp.lz"
+ .incbin "graphics/trainers/cycling_triathlete_f.4bpp.lz"
.align 2
gTrainerFrontPic_SwimmerM:: @ 8E500C8
- .incbin "graphics/trainers/swimmer_m/front.4bpp.lz"
+ .incbin "graphics/trainers/swimmer_m.4bpp.lz"
.align 2
gTrainerFrontPic_PokefanF:: @ 8E50388
- .incbin "graphics/trainers/pokefan_f/front.4bpp.lz"
+ .incbin "graphics/trainers/pokefan_f.4bpp.lz"
.align 2
gTrainerFrontPic_ExpertM:: @ 8E50754
- .incbin "graphics/trainers/expert_m/front.4bpp.lz"
+ .incbin "graphics/trainers/expert_m.4bpp.lz"
.align 2
gTrainerFrontPic_ExpertF:: @ 8E50A94
- .incbin "graphics/trainers/expert_f/front.4bpp.lz"
+ .incbin "graphics/trainers/expert_f.4bpp.lz"
.align 2
gTrainerFrontPic_SwimmingTriathleteM:: @ 8E50DB0
- .incbin "graphics/trainers/swimming_triathlete_m/front.4bpp.lz"
+ .incbin "graphics/trainers/swimming_triathlete_m.4bpp.lz"
.align 2
gTrainerFrontPic_SwimmingTriathleteF:: @ 8E510DC
- .incbin "graphics/trainers/swimming_triathlete_f/front.4bpp.lz"
+ .incbin "graphics/trainers/swimming_triathlete_f.4bpp.lz"
.align 2
gTrainerFrontPic_DragonTamer:: @ 8E513B8
- .incbin "graphics/trainers/dragon_tamer/front.4bpp.lz"
+ .incbin "graphics/trainers/dragon_tamer.4bpp.lz"
.align 2
gTrainerFrontPic_BirdKeeper:: @ 8E5170C
- .incbin "graphics/trainers/bird_keeper/front.4bpp.lz"
+ .incbin "graphics/trainers/bird_keeper.4bpp.lz"
.align 2
gTrainerFrontPic_NinjaBoy:: @ 8E51A44
- .incbin "graphics/trainers/ninja_boy/front.4bpp.lz"
+ .incbin "graphics/trainers/ninja_boy.4bpp.lz"
.align 2
gTrainerFrontPic_ParasolLady:: @ 8E51D20
- .incbin "graphics/trainers/parasol_lady/front.4bpp.lz"
+ .incbin "graphics/trainers/parasol_lady.4bpp.lz"
.align 2
gTrainerFrontPic_BugManiac:: @ 8E52058
- .incbin "graphics/trainers/bug_maniac/front.4bpp.lz"
+ .incbin "graphics/trainers/bug_maniac.4bpp.lz"
.align 2
gTrainerFrontPic_Sailor:: @ 8E524A8
- .incbin "graphics/trainers/sailor/front.4bpp.lz"
+ .incbin "graphics/trainers/sailor.4bpp.lz"
.align 2
gTrainerFrontPic_Collector:: @ 8E52858
- .incbin "graphics/trainers/collector/front.4bpp.lz"
+ .incbin "graphics/trainers/collector.4bpp.lz"
.align 2
gTrainerFrontPic_PokemonBreederM:: @ 8E52C5C
- .incbin "graphics/trainers/pokemon_breeder_m/front.4bpp.lz"
+ .incbin "graphics/trainers/pokemon_breeder_m.4bpp.lz"
.align 2
gTrainerFrontPic_PokemonRangerM:: @ 8E52F8C
- .incbin "graphics/trainers/pokemon_ranger_m/front.4bpp.lz"
+ .incbin "graphics/trainers/pokemon_ranger_m.4bpp.lz"
.align 2
gTrainerFrontPic_PokemonRangerF:: @ 8E532D4
- .incbin "graphics/trainers/pokemon_ranger_f/front.4bpp.lz"
+ .incbin "graphics/trainers/pokemon_ranger_f.4bpp.lz"
.align 2
gTrainerFrontPic_MagmaAdminM:: @ 8E53608
- .incbin "graphics/trainers/magma_admin_m/front.4bpp.lz"
+ .incbin "graphics/trainers/magma_admin_m.4bpp.lz"
.align 2
gTrainerFrontPic_MagmaAdminF:: @ 8E539E0
- .incbin "graphics/trainers/magma_admin_f/front.4bpp.lz"
+ .incbin "graphics/trainers/magma_admin_f.4bpp.lz"
.align 2
gTrainerFrontPic_AromaLady:: @ 8E53D90
- .incbin "graphics/trainers/aroma_lady/front.4bpp.lz"
+ .incbin "graphics/trainers/aroma_lady.4bpp.lz"
.align 2
gTrainerFrontPic_RuinManiac:: @ 8E54054
- .incbin "graphics/trainers/ruin_maniac/front.4bpp.lz"
+ .incbin "graphics/trainers/ruin_maniac.4bpp.lz"
.align 2
gTrainerFrontPic_CoolTrainerM:: @ 8E543F0
- .incbin "graphics/trainers/cool_trainer_m/front.4bpp.lz"
+ .incbin "graphics/trainers/cool_trainer_m.4bpp.lz"
.align 2
gTrainerFrontPic_CoolTrainerF:: @ 8E546D8
- .incbin "graphics/trainers/cool_trainer_f/front.4bpp.lz"
+ .incbin "graphics/trainers/cool_trainer_f.4bpp.lz"
.align 2
gTrainerFrontPic_Pokemaniac:: @ 8E549EC
- .incbin "graphics/trainers/pokemaniac/front.4bpp.lz"
+ .incbin "graphics/trainers/pokemaniac.4bpp.lz"
.align 2
gTrainerFrontPic_Kindler:: @ 8E54D5C
- .incbin "graphics/trainers/kindler/front.4bpp.lz"
+ .incbin "graphics/trainers/kindler.4bpp.lz"
.align 2
gTrainerFrontPic_Camper:: @ 8E550C8
- .incbin "graphics/trainers/camper/front.4bpp.lz"
+ .incbin "graphics/trainers/camper.4bpp.lz"
.align 2
gTrainerFrontPic_Picnicker:: @ 8E553B0
- .incbin "graphics/trainers/picnicker/front.4bpp.lz"
+ .incbin "graphics/trainers/picnicker.4bpp.lz"
.align 2
gTrainerFrontPic_PsychicM:: @ 8E55690
- .incbin "graphics/trainers/psychic_m/front.4bpp.lz"
+ .incbin "graphics/trainers/psychic_m.4bpp.lz"
.align 2
gTrainerFrontPic_PsychicF:: @ 8E559BC
- .incbin "graphics/trainers/psychic_f/front.4bpp.lz"
+ .incbin "graphics/trainers/psychic_f.4bpp.lz"
.align 2
gTrainerFrontPic_SchoolKidF:: @ 8E55CE4
- .incbin "graphics/trainers/school_kid_f/front.4bpp.lz"
+ .incbin "graphics/trainers/school_kid_f.4bpp.lz"
.align 2
gTrainerFrontPic_PokefanM:: @ 8E55F80
- .incbin "graphics/trainers/pokefan_m/front.4bpp.lz"
+ .incbin "graphics/trainers/pokefan_m.4bpp.lz"
.align 2
gTrainerFrontPic_SisAndBro:: @ 8E5633C
- .incbin "graphics/trainers/sis_and_bro/front.4bpp.lz"
+ .incbin "graphics/trainers/sis_and_bro.4bpp.lz"
.align 2
gTrainerFrontPic_OldCouple:: @ 8E56788
- .incbin "graphics/trainers/old_couple/front.4bpp.lz"
+ .incbin "graphics/trainers/old_couple.4bpp.lz"
.align 2
gTrainerFrontPic_AquaAdminM:: @ 8E56C98
- .incbin "graphics/trainers/aqua_admin_m/front.4bpp.lz"
+ .incbin "graphics/trainers/aqua_admin_m.4bpp.lz"
.align 2
gTrainerFrontPic_AquaAdminF:: @ 8E5704C
- .incbin "graphics/trainers/aqua_admin_f/front.4bpp.lz"
+ .incbin "graphics/trainers/aqua_admin_f.4bpp.lz"
.align 2
gTrainerFrontPic_UnusedAqua:: @ 8E57410
- .incbin "graphics/trainers/unused_aqua/front.4bpp.lz"
+ .incbin "graphics/trainers/unused_aqua.4bpp.lz"
.align 2
gTrainerFrontPic_Archie:: @ 8E5778C
- .incbin "graphics/trainers/archie/front.4bpp.lz"
+ .incbin "graphics/trainers/archie.4bpp.lz"
.align 2
gTrainerBackPic_Brendan:: @ 8E57AC8
- .incbin "graphics/trainers/brendan/back.4bpp.lz"
+ .incbin "graphics/trainers/brendan_back.4bpp.lz"
.align 2
gTrainerBackPic_May:: @ 8E5889C
- .incbin "graphics/trainers/may/back.4bpp.lz"
+ .incbin "graphics/trainers/may_back.4bpp.lz"
.align 2
gTrainerBackPic_Wally:: @ 8E59588
- .incbin "graphics/trainers/wally/back.4bpp.lz"
+ .incbin "graphics/trainers/wally_back.4bpp.lz"
.align 2
gTrainerPalette_Lass:: @ 8E59FD8
- .incbin "graphics/trainers/lass/palette.gbapal.lz"
+ .incbin "graphics/trainers/lass.gbapal.lz"
.align 2
gTrainerPalette_Youngster:: @ 8E5A000
- .incbin "graphics/trainers/youngster/palette.gbapal.lz"
+ .incbin "graphics/trainers/youngster.gbapal.lz"
.align 2
gTrainerPalette_Brendan:: @ 8E5A028
- .incbin "graphics/trainers/brendan/palette.gbapal.lz"
+ .incbin "graphics/trainers/brendan.gbapal.lz"
.align 2
gTrainerPalette_May:: @ 8E5A050
- .incbin "graphics/trainers/may/palette.gbapal.lz"
+ .incbin "graphics/trainers/may.gbapal.lz"
.align 2
gTrainerPalette_Hiker:: @ 8E5A078
- .incbin "graphics/trainers/hiker/palette.gbapal.lz"
+ .incbin "graphics/trainers/hiker.gbapal.lz"
.align 2
gTrainerPalette_Beauty:: @ 8E5A0A0
- .incbin "graphics/trainers/beauty/palette.gbapal.lz"
+ .incbin "graphics/trainers/beauty.gbapal.lz"
.align 2
gTrainerPalette_Fisherman:: @ 8E5A0C8
- .incbin "graphics/trainers/fisherman/palette.gbapal.lz"
+ .incbin "graphics/trainers/fisherman.gbapal.lz"
.align 2
gTrainerPalette_Lady:: @ 8E5A0F0
- .incbin "graphics/trainers/lady/palette.gbapal.lz"
+ .incbin "graphics/trainers/lady.gbapal.lz"
.align 2
gTrainerPalette_CyclingTriathleteM:: @ 8E5A118
- .incbin "graphics/trainers/cycling_triathlete_m/palette.gbapal.lz"
+ .incbin "graphics/trainers/cycling_triathlete_m.gbapal.lz"
.align 2
gTrainerPalette_AquaGruntM:: @ 8E5A140
- .incbin "graphics/trainers/aqua_grunt_m/palette.gbapal.lz"
+ .incbin "graphics/trainers/aqua_grunt_m.gbapal.lz"
.align 2
gTrainerPalette_Twins:: @ 8E5A168
- .incbin "graphics/trainers/twins/palette.gbapal.lz"
+ .incbin "graphics/trainers/twins.gbapal.lz"
.align 2
gTrainerPalette_SwimmerF:: @ 8E5A190
- .incbin "graphics/trainers/swimmer_f/palette.gbapal.lz"
+ .incbin "graphics/trainers/swimmer_f.gbapal.lz"
.align 2
gTrainerPalette_BugCatcher:: @ 8E5A1B8
- .incbin "graphics/trainers/bug_catcher/palette.gbapal.lz"
+ .incbin "graphics/trainers/bug_catcher.gbapal.lz"
.align 2
gTrainerPalette_SchoolKidM:: @ 8E5A1E0
- .incbin "graphics/trainers/school_kid_m/palette.gbapal.lz"
+ .incbin "graphics/trainers/school_kid_m.gbapal.lz"
.align 2
gTrainerPalette_RichBoy:: @ 8E5A208
- .incbin "graphics/trainers/rich_boy/palette.gbapal.lz"
+ .incbin "graphics/trainers/rich_boy.gbapal.lz"
.align 2
gTrainerPalette_SrAndJr:: @ 8E5A230
- .incbin "graphics/trainers/sr_and_jr/palette.gbapal.lz"
+ .incbin "graphics/trainers/sr_and_jr.gbapal.lz"
.align 2
gTrainerPalette_BlackBelt:: @ 8E5A258
- .incbin "graphics/trainers/black_belt/palette.gbapal.lz"
+ .incbin "graphics/trainers/black_belt.gbapal.lz"
.align 2
gTrainerPalette_Wally:: @ 8E5A280
- .incbin "graphics/trainers/wally/palette.gbapal.lz"
+ .incbin "graphics/trainers/wally.gbapal.lz"
.align 2
gTrainerPalette_AquaGruntF:: @ 8E5A2A8
- .incbin "graphics/trainers/aqua_grunt_f/palette.gbapal.lz"
+ .incbin "graphics/trainers/aqua_grunt_f.gbapal.lz"
.align 2
gTrainerPalette_TuberF:: @ 8E5A2D0
- .incbin "graphics/trainers/tuber_f/palette.gbapal.lz"
+ .incbin "graphics/trainers/tuber_f.gbapal.lz"
.align 2
gTrainerPalette_HexManiac:: @ 8E5A2F8
- .incbin "graphics/trainers/hex_maniac/palette.gbapal.lz"
+ .incbin "graphics/trainers/hex_maniac.gbapal.lz"
.align 2
gTrainerPalette_PokemonBreederF:: @ 8E5A320
- .incbin "graphics/trainers/pokemon_breeder_f/palette.gbapal.lz"
+ .incbin "graphics/trainers/pokemon_breeder_f.gbapal.lz"
.align 2
gTrainerPalette_MagmaGruntM:: @ 8E5A348
- .incbin "graphics/trainers/magma_grunt_m/palette.gbapal.lz"
+ .incbin "graphics/trainers/magma_grunt_m.gbapal.lz"
.align 2
gTrainerPalette_MagmaGruntF:: @ 8E5A370
- .incbin "graphics/trainers/magma_grunt_f/palette.gbapal.lz"
+ .incbin "graphics/trainers/magma_grunt_f.gbapal.lz"
.align 2
gTrainerPalette_Interviewer:: @ 8E5A398
- .incbin "graphics/trainers/interviewer/palette.gbapal.lz"
+ .incbin "graphics/trainers/interviewer.gbapal.lz"
.align 2
gTrainerPalette_TuberM:: @ 8E5A3C0
- .incbin "graphics/trainers/tuber_m/palette.gbapal.lz"
+ .incbin "graphics/trainers/tuber_m.gbapal.lz"
.align 2
gTrainerPalette_YoungCouple:: @ 8E5A3E8
- .incbin "graphics/trainers/young_couple/palette.gbapal.lz"
+ .incbin "graphics/trainers/young_couple.gbapal.lz"
.align 2
gTrainerPalette_Guitarist:: @ 8E5A410
- .incbin "graphics/trainers/guitarist/palette.gbapal.lz"
+ .incbin "graphics/trainers/guitarist.gbapal.lz"
.align 2
gTrainerPalette_Gentleman:: @ 8E5A438
- .incbin "graphics/trainers/gentleman/palette.gbapal.lz"
+ .incbin "graphics/trainers/gentleman.gbapal.lz"
.align 2
gTrainerPalette_Steven:: @ 8E5A460
- .incbin "graphics/trainers/steven/palette.gbapal.lz"
+ .incbin "graphics/trainers/steven.gbapal.lz"
.align 2
gTrainerPalette_Maxie:: @ 8E5A488
- .incbin "graphics/trainers/maxie/palette.gbapal.lz"
+ .incbin "graphics/trainers/maxie.gbapal.lz"
.align 2
gTrainerPalette_RunningTriathleteF:: @ 8E5A4B0
- .incbin "graphics/trainers/running_triathlete_f/palette.gbapal.lz"
+ .incbin "graphics/trainers/running_triathlete_f.gbapal.lz"
.align 2
gTrainerPalette_RunningTriathleteM:: @ 8E5A4D8
- .incbin "graphics/trainers/running_triathlete_m/palette.gbapal.lz"
+ .incbin "graphics/trainers/running_triathlete_m.gbapal.lz"
.align 2
gTrainerPalette_BattleGirl:: @ 8E5A500
- .incbin "graphics/trainers/battle_girl/palette.gbapal.lz"
+ .incbin "graphics/trainers/battle_girl.gbapal.lz"
.align 2
gTrainerPalette_CyclingTriathleteF:: @ 8E5A528
- .incbin "graphics/trainers/cycling_triathlete_f/palette.gbapal.lz"
+ .incbin "graphics/trainers/cycling_triathlete_f.gbapal.lz"
.align 2
gTrainerPalette_SwimmerM:: @ 8E5A550
- .incbin "graphics/trainers/swimmer_m/palette.gbapal.lz"
+ .incbin "graphics/trainers/swimmer_m.gbapal.lz"
.align 2
gTrainerPalette_PokefanF:: @ 8E5A578
- .incbin "graphics/trainers/pokefan_f/palette.gbapal.lz"
+ .incbin "graphics/trainers/pokefan_f.gbapal.lz"
.align 2
gTrainerPalette_ExpertM:: @ 8E5A5A0
- .incbin "graphics/trainers/expert_m/palette.gbapal.lz"
+ .incbin "graphics/trainers/expert_m.gbapal.lz"
.align 2
gTrainerPalette_ExpertF:: @ 8E5A5C8
- .incbin "graphics/trainers/expert_f/palette.gbapal.lz"
+ .incbin "graphics/trainers/expert_f.gbapal.lz"
.align 2
gTrainerPalette_SwimmingTriathleteM:: @ 8E5A5F0
- .incbin "graphics/trainers/swimming_triathlete_m/palette.gbapal.lz"
+ .incbin "graphics/trainers/swimming_triathlete_m.gbapal.lz"
.align 2
gTrainerPalette_SwimmingTriathleteF:: @ 8E5A618
- .incbin "graphics/trainers/swimming_triathlete_f/palette.gbapal.lz"
+ .incbin "graphics/trainers/swimming_triathlete_f.gbapal.lz"
.align 2
gTrainerPalette_DragonTamer:: @ 8E5A640
- .incbin "graphics/trainers/dragon_tamer/palette.gbapal.lz"
+ .incbin "graphics/trainers/dragon_tamer.gbapal.lz"
.align 2
gTrainerPalette_BirdKeeper:: @ 8E5A668
- .incbin "graphics/trainers/bird_keeper/palette.gbapal.lz"
+ .incbin "graphics/trainers/bird_keeper.gbapal.lz"
.align 2
gTrainerPalette_NinjaBoy:: @ 8E5A690
- .incbin "graphics/trainers/ninja_boy/palette.gbapal.lz"
+ .incbin "graphics/trainers/ninja_boy.gbapal.lz"
.align 2
gTrainerPalette_ParasolLady:: @ 8E5A6B8
- .incbin "graphics/trainers/parasol_lady/palette.gbapal.lz"
+ .incbin "graphics/trainers/parasol_lady.gbapal.lz"
.align 2
gTrainerPalette_BugManiac:: @ 8E5A6E0
- .incbin "graphics/trainers/bug_maniac/palette.gbapal.lz"
+ .incbin "graphics/trainers/bug_maniac.gbapal.lz"
.align 2
gTrainerPalette_Sailor:: @ 8E5A708
- .incbin "graphics/trainers/sailor/palette.gbapal.lz"
+ .incbin "graphics/trainers/sailor.gbapal.lz"
.align 2
gTrainerPalette_Collector:: @ 8E5A730
- .incbin "graphics/trainers/collector/palette.gbapal.lz"
+ .incbin "graphics/trainers/collector.gbapal.lz"
.align 2
gTrainerPalette_PokemonBreederM:: @ 8E5A758
- .incbin "graphics/trainers/pokemon_breeder_m/palette.gbapal.lz"
+ .incbin "graphics/trainers/pokemon_breeder_m.gbapal.lz"
.align 2
gTrainerPalette_PokemonRangerM:: @ 8E5A780
- .incbin "graphics/trainers/pokemon_ranger_m/palette.gbapal.lz"
+ .incbin "graphics/trainers/pokemon_ranger_m.gbapal.lz"
.align 2
gTrainerPalette_PokemonRangerF:: @ 8E5A7A8
- .incbin "graphics/trainers/pokemon_ranger_f/palette.gbapal.lz"
+ .incbin "graphics/trainers/pokemon_ranger_f.gbapal.lz"
.align 2
gTrainerPalette_MagmaAdminM:: @ 8E5A7D0
- .incbin "graphics/trainers/magma_admin_m/palette.gbapal.lz"
+ .incbin "graphics/trainers/magma_admin_m.gbapal.lz"
.align 2
gTrainerPalette_MagmaAdminF:: @ 8E5A7F8
- .incbin "graphics/trainers/magma_admin_f/palette.gbapal.lz"
+ .incbin "graphics/trainers/magma_admin_f.gbapal.lz"
.align 2
gTrainerPalette_AromaLady:: @ 8E5A820
- .incbin "graphics/trainers/aroma_lady/palette.gbapal.lz"
+ .incbin "graphics/trainers/aroma_lady.gbapal.lz"
.align 2
gTrainerPalette_RuinManiac:: @ 8E5A848
- .incbin "graphics/trainers/ruin_maniac/palette.gbapal.lz"
+ .incbin "graphics/trainers/ruin_maniac.gbapal.lz"
.align 2
gTrainerPalette_CoolTrainerM:: @ 8E5A870
- .incbin "graphics/trainers/cool_trainer_m/palette.gbapal.lz"
+ .incbin "graphics/trainers/cool_trainer_m.gbapal.lz"
.align 2
gTrainerPalette_CoolTrainerF:: @ 8E5A898
- .incbin "graphics/trainers/cool_trainer_f/palette.gbapal.lz"
+ .incbin "graphics/trainers/cool_trainer_f.gbapal.lz"
.align 2
gTrainerPalette_Pokemaniac:: @ 8E5A8C0
- .incbin "graphics/trainers/pokemaniac/palette.gbapal.lz"
+ .incbin "graphics/trainers/pokemaniac.gbapal.lz"
.align 2
gTrainerPalette_Kindler:: @ 8E5A8E8
- .incbin "graphics/trainers/kindler/palette.gbapal.lz"
+ .incbin "graphics/trainers/kindler.gbapal.lz"
.align 2
gTrainerPalette_Camper:: @ 8E5A910
- .incbin "graphics/trainers/camper/palette.gbapal.lz"
+ .incbin "graphics/trainers/camper.gbapal.lz"
.align 2
gTrainerPalette_Picnicker:: @ 8E5A938
- .incbin "graphics/trainers/picnicker/palette.gbapal.lz"
+ .incbin "graphics/trainers/picnicker.gbapal.lz"
.align 2
gTrainerPalette_PsychicM:: @ 8E5A960
- .incbin "graphics/trainers/psychic_m/palette.gbapal.lz"
+ .incbin "graphics/trainers/psychic_m.gbapal.lz"
.align 2
gTrainerPalette_PsychicF:: @ 8E5A988
- .incbin "graphics/trainers/psychic_f/palette.gbapal.lz"
+ .incbin "graphics/trainers/psychic_f.gbapal.lz"
.align 2
gTrainerPalette_SchoolKidF:: @ 8E5A9B0
- .incbin "graphics/trainers/school_kid_f/palette.gbapal.lz"
+ .incbin "graphics/trainers/school_kid_f.gbapal.lz"
.align 2
gTrainerPalette_PokefanM:: @ 8E5A9D8
- .incbin "graphics/trainers/pokefan_m/palette.gbapal.lz"
+ .incbin "graphics/trainers/pokefan_m.gbapal.lz"
.align 2
gTrainerPalette_SisAndBro:: @ 8E5AA00
- .incbin "graphics/trainers/sis_and_bro/palette.gbapal.lz"
+ .incbin "graphics/trainers/sis_and_bro.gbapal.lz"
.align 2
gTrainerPalette_OldCouple:: @ 8E5AA28
- .incbin "graphics/trainers/old_couple/palette.gbapal.lz"
+ .incbin "graphics/trainers/old_couple.gbapal.lz"
.align 2
gTrainerPalette_AquaAdminM:: @ 8E5AA50
- .incbin "graphics/trainers/aqua_admin_m/palette.gbapal.lz"
+ .incbin "graphics/trainers/aqua_admin_m.gbapal.lz"
.align 2
gTrainerPalette_AquaAdminF:: @ 8E5AA78
- .incbin "graphics/trainers/aqua_admin_f/palette.gbapal.lz"
+ .incbin "graphics/trainers/aqua_admin_f.gbapal.lz"
.align 2
gTrainerPalette_UnusedAqua:: @ 8E5AAA0
- .incbin "graphics/trainers/unused_aqua/palette.gbapal.lz"
+ .incbin "graphics/trainers/unused_aqua.gbapal.lz"
.align 2
gTrainerPalette_Archie:: @ 8E5AAC8
- .incbin "graphics/trainers/archie/palette.gbapal.lz"
+ .incbin "graphics/trainers/archie.gbapal.lz"
.align 2
gTrainerFrontPic_Roxanne:: @ 8E5AAF0
- .incbin "graphics/trainers/roxanne/front.4bpp.lz"
+ .incbin "graphics/trainers/roxanne.4bpp.lz"
.align 2
gTrainerFrontPic_Brawly:: @ 8E5ADDC
- .incbin "graphics/trainers/brawly/front.4bpp.lz"
+ .incbin "graphics/trainers/brawly.4bpp.lz"
.align 2
gTrainerFrontPic_Wattson:: @ 8E5B170
- .incbin "graphics/trainers/wattson/front.4bpp.lz"
+ .incbin "graphics/trainers/wattson.4bpp.lz"
.align 2
gTrainerFrontPic_Flannery:: @ 8E5B4B8
- .incbin "graphics/trainers/flannery/front.4bpp.lz"
+ .incbin "graphics/trainers/flannery.4bpp.lz"
.align 2
gTrainerFrontPic_Norman:: @ 8E5B838
- .incbin "graphics/trainers/norman/front.4bpp.lz"
+ .incbin "graphics/trainers/norman.4bpp.lz"
.align 2
gTrainerFrontPic_Winona:: @ 8E5BB74
- .incbin "graphics/trainers/winona/front.4bpp.lz"
+ .incbin "graphics/trainers/winona.4bpp.lz"
.align 2
gTrainerFrontPic_TateAndLiza:: @ 8E5BEF4
- .incbin "graphics/trainers/tate_and_liza/front.4bpp.lz"
+ .incbin "graphics/trainers/tate_and_liza.4bpp.lz"
.align 2
gTrainerFrontPic_Wallace:: @ 8E5C338
- .incbin "graphics/trainers/wallace/front.4bpp.lz"
+ .incbin "graphics/trainers/wallace.4bpp.lz"
.align 2
gTrainerFrontPic_Sidney:: @ 8E5C6B0
- .incbin "graphics/trainers/sidney/front.4bpp.lz"
+ .incbin "graphics/trainers/sidney.4bpp.lz"
.align 2
gTrainerFrontPic_Phoebe:: @ 8E5C9E4
- .incbin "graphics/trainers/phoebe/front.4bpp.lz"
+ .incbin "graphics/trainers/phoebe.4bpp.lz"
.align 2
gTrainerFrontPic_Glacia:: @ 8E5CCE4
- .incbin "graphics/trainers/glacia/front.4bpp.lz"
+ .incbin "graphics/trainers/glacia.4bpp.lz"
.align 2
gTrainerFrontPic_Drake:: @ 8E5D068
- .incbin "graphics/trainers/drake/front.4bpp.lz"
+ .incbin "graphics/trainers/drake.4bpp.lz"
.align 2
gTrainerPalette_Roxanne:: @ 8E5D410
- .incbin "graphics/trainers/roxanne/palette.gbapal.lz"
+ .incbin "graphics/trainers/roxanne.gbapal.lz"
.align 2
gTrainerPalette_Brawly:: @ 8E5D438
- .incbin "graphics/trainers/brawly/palette.gbapal.lz"
+ .incbin "graphics/trainers/brawly.gbapal.lz"
.align 2
gTrainerPalette_Wattson:: @ 8E5D460
- .incbin "graphics/trainers/wattson/palette.gbapal.lz"
+ .incbin "graphics/trainers/wattson.gbapal.lz"
.align 2
gTrainerPalette_Flannery:: @ 8E5D488
- .incbin "graphics/trainers/flannery/palette.gbapal.lz"
+ .incbin "graphics/trainers/flannery.gbapal.lz"
.align 2
gTrainerPalette_Norman:: @ 8E5D4B0
- .incbin "graphics/trainers/norman/palette.gbapal.lz"
+ .incbin "graphics/trainers/norman.gbapal.lz"
.align 2
gTrainerPalette_Winona:: @ 8E5D4D8
- .incbin "graphics/trainers/winona/palette.gbapal.lz"
+ .incbin "graphics/trainers/winona.gbapal.lz"
.align 2
gTrainerPalette_TateAndLiza:: @ 8E5D500
- .incbin "graphics/trainers/tate_and_liza/palette.gbapal.lz"
+ .incbin "graphics/trainers/tate_and_liza.gbapal.lz"
.align 2
gTrainerPalette_Wallace:: @ 8E5D528
- .incbin "graphics/trainers/wallace/palette.gbapal.lz"
+ .incbin "graphics/trainers/wallace.gbapal.lz"
.align 2
gTrainerPalette_Sidney:: @ 8E5D550
- .incbin "graphics/trainers/sidney/palette.gbapal.lz"
+ .incbin "graphics/trainers/sidney.gbapal.lz"
.align 2
gTrainerPalette_Phoebe:: @ 8E5D578
- .incbin "graphics/trainers/phoebe/palette.gbapal.lz"
+ .incbin "graphics/trainers/phoebe.gbapal.lz"
.align 2
gTrainerPalette_Glacia:: @ 8E5D5A0
- .incbin "graphics/trainers/glacia/palette.gbapal.lz"
+ .incbin "graphics/trainers/glacia.gbapal.lz"
.align 2
gTrainerPalette_Drake:: @ 8E5D5C8
- .incbin "graphics/trainers/drake/palette.gbapal.lz"
+ .incbin "graphics/trainers/drake.gbapal.lz"
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-06 09:29:52 +0000