4 files changed, 0 insertions, 987 deletions
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/pokemon_icon.s b/data/pokemon_icon.s
deleted file mode 100644
index ff5aa33dc..000000000
--- a/data/pokemon_icon.s
+++ /dev/null
@@ -1,92 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-@ 83BBD20
-	.include "data/graphics/pokemon/icon_table.inc"
-
-@ 83BC400
-	.include "data/graphics/pokemon/icon_palette_indices.inc"
-
-@ 83BC5B8
-	.include "data/graphics/pokemon/icon_palette_table.inc"
-
-	.align 2
-gOamData_83BC5E8:: @ 83BC5E8
-	.2byte 0x0000
-	.2byte 0x8000
-	.2byte 0x0400
-
-	.align 2
-gSpriteAnim_83BC5F0:: @ 83BC5F0
-	obj_image_anim_frame 0, 6
-	obj_image_anim_frame 1, 6
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnim_83BC5FC:: @ 83BC5FC
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 1, 8
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnim_83BC608:: @ 83BC608
-	obj_image_anim_frame 0, 14
-	obj_image_anim_frame 1, 14
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnim_83BC614:: @ 83BC614
-	obj_image_anim_frame 0, 22
-	obj_image_anim_frame 1, 22
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnim_83BC620:: @ 83BC620
-	obj_image_anim_frame 0, 29
-	obj_image_anim_frame 0, 29
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_83BC62C:: @ 83BC62C
-	.4byte gSpriteAnim_83BC5F0
-	.4byte gSpriteAnim_83BC5FC
-	.4byte gSpriteAnim_83BC608
-	.4byte gSpriteAnim_83BC614
-	.4byte gSpriteAnim_83BC620
-
-	.align 2
-gSpriteAffineAnim_83BC640:: @ 83BC640
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 10
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83BC650:: @ 83BC650
-	obj_rot_scal_anim_frame 0xFFFE, 0xFFFE, 0, 122
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83BC660:: @ 83BC660
-	.4byte gSpriteAffineAnim_83BC640
-	.4byte gSpriteAffineAnim_83BC650
-
-	.align 1
-gSpriteImageSizes:: @ 83BC668
-	@ square
-	.2byte  0x20 @ 1×1
-	.2byte  0x80 @ 2×2
-	.2byte 0x200 @ 4×4
-	.2byte 0x800 @ 8×8
-
-	@ horizontal rectangle
-	.2byte  0x40 @ 2×1
-	.2byte  0x80 @ 4×1
-	.2byte 0x100 @ 4×2
-	.2byte 0x400 @ 8×4
-
-	@ vertical rectangle
-	.2byte  0x40 @ 1×2
-	.2byte  0x80 @ 1×4
-	.2byte 0x100 @ 2×4
-	.2byte 0x400 @ 4×8