use encounter slot constants, fix some gfx

6 files changed, 472 insertions, 472 deletions

diff --git a/src/data/graphics.c b/src/data/graphics.c
index ce2f02b2c..20d8f91d0 100644
--- a/src/data/graphics.c
+++ b/src/data/graphics.c
@@ -713,7 +713,7 @@ const u8 gBattleAnimSpritePalette_256[] = INCBIN_U8("graphics/battle_anims/sprit
 const u8 gBattleAnimSpriteSheet_257[] = INCBIN_U8("graphics/battle_anims/sprites/257.4bpp.lz");
 const u8 gBattleAnimSpritePalette_257[] = INCBIN_U8("graphics/battle_anims/sprites/257.gbapal.lz");
 
-#include "pokemon_gfx.h"
+#include "graphics/pokemon.h"
 
 const u8 gMonFrontPic_UnownExclamationMark[] = INCBIN_U8("graphics/pokemon/unown/front_exclamation_mark.4bpp.lz");
 const u8 gMonBackPic_UnownExclamationMark[] = INCBIN_U8("graphics/pokemon/unown/back_exclamation_mark.4bpp.lz");
@@ -722,7 +722,7 @@ const u8 gMonFrontPic_UnownQuestionMark[] = INCBIN_U8("graphics/pokemon/unown/fr
 const u8 gMonBackPic_UnownQuestionMark[] = INCBIN_U8("graphics/pokemon/unown/back_question_mark.4bpp.lz");
 const u8 gMonIcon_UnownQuestionMark[] = INCBIN_U8("graphics/pokemon/unown/icon_question_mark.4bpp");
 
-#include "trainer_gfx.h"
+#include "graphics/trainers.h"
 
 const u8 gMonIcon_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/icon.4bpp");
 const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/footprint.1bpp");
@@ -936,7 +936,7 @@ const u8 gUnknown_08E788E4[] = INCBIN_U8("graphics/interface/berry_tag.bin.lz");
 const u8 gUnknown_08E78A84[] = INCBIN_U8("graphics/interface/berry_tag_title.bin.lz");
 const u8 gBerryCheckCircle_Gfx[] = INCBIN_U8("graphics/interface/check_berry_circle.4bpp.lz");
 
-#include "berry_gfx.h"
+#include "graphics/berries.h"
 
 const u8 gBattleAnimSpritePalette_282[] = INCBIN_U8("graphics/battle_anims/sprites/282.gbapal.lz");
 const u8 gBattleAnimSpriteSheet_282[] = INCBIN_U8("graphics/battle_anims/sprites/282.4bpp.lz");
diff --git a/src/data/berry_gfx.h b/src/data/graphics/berries.h
index 9970c4ba9..9970c4ba9 100644
--- a/src/data/berry_gfx.h
+++ b/src/data/graphics/berries.h
diff --git a/src/data/pokemon_gfx.h b/src/data/graphics/pokemon.h
index ea68afa2f..ea68afa2f 100644
--- a/src/data/pokemon_gfx.h
+++ b/src/data/graphics/pokemon.h
diff --git a/src/data/trainer_gfx.h b/src/data/graphics/trainers.h
index 9c0a95fe2..9c0a95fe2 100644
--- a/src/data/trainer_gfx.h
+++ b/src/data/graphics/trainers.h
diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c
index b1b462761..76c6a1c5c 100644
--- a/src/pokemon_icon.c
+++ b/src/pokemon_icon.c
@@ -18,446 +18,446 @@ struct MonIconSpriteTemplate
 
 const u8 * const gMonIconTable[] =
 {
-    gMonIcon_Bulbasaur,
-    gMonIcon_Bulbasaur,
-    gMonIcon_Ivysaur,
-    gMonIcon_Venusaur,
-    gMonIcon_Charmander,
-    gMonIcon_Charmeleon,
-    gMonIcon_Charizard,
-    gMonIcon_Squirtle,
-    gMonIcon_Wartortle,
-    gMonIcon_Blastoise,
-    gMonIcon_Caterpie,
-    gMonIcon_Metapod,
-    gMonIcon_Butterfree,
-    gMonIcon_Weedle,
-    gMonIcon_Kakuna,
-    gMonIcon_Beedrill,
-    gMonIcon_Pidgey,
-    gMonIcon_Pidgeotto,
-    gMonIcon_Pidgeot,
-    gMonIcon_Rattata,
-    gMonIcon_Raticate,
-    gMonIcon_Spearow,
-    gMonIcon_Fearow,
-    gMonIcon_Ekans,
-    gMonIcon_Arbok,
-    gMonIcon_Pikachu,
-    gMonIcon_Raichu,
-    gMonIcon_Sandshrew,
-    gMonIcon_Sandslash,
-    gMonIcon_NidoranF,
-    gMonIcon_Nidorina,
-    gMonIcon_Nidoqueen,
-    gMonIcon_NidoranM,
-    gMonIcon_Nidorino,
-    gMonIcon_Nidoking,
-    gMonIcon_Clefairy,
-    gMonIcon_Clefable,
-    gMonIcon_Vulpix,
-    gMonIcon_Ninetales,
-    gMonIcon_Jigglypuff,
-    gMonIcon_Wigglytuff,
-    gMonIcon_Zubat,
-    gMonIcon_Golbat,
-    gMonIcon_Oddish,
-    gMonIcon_Gloom,
-    gMonIcon_Vileplume,
-    gMonIcon_Paras,
-    gMonIcon_Parasect,
-    gMonIcon_Venonat,
-    gMonIcon_Venomoth,
-    gMonIcon_Diglett,
-    gMonIcon_Dugtrio,
-    gMonIcon_Meowth,
-    gMonIcon_Persian,
-    gMonIcon_Psyduck,
-    gMonIcon_Golduck,
-    gMonIcon_Mankey,
-    gMonIcon_Primeape,
-    gMonIcon_Growlithe,
-    gMonIcon_Arcanine,
-    gMonIcon_Poliwag,
-    gMonIcon_Poliwhirl,
-    gMonIcon_Poliwrath,
-    gMonIcon_Abra,
-    gMonIcon_Kadabra,
-    gMonIcon_Alakazam,
-    gMonIcon_Machop,
-    gMonIcon_Machoke,
-    gMonIcon_Machamp,
-    gMonIcon_Bellsprout,
-    gMonIcon_Weepinbell,
-    gMonIcon_Victreebel,
-    gMonIcon_Tentacool,
-    gMonIcon_Tentacruel,
-    gMonIcon_Geodude,
-    gMonIcon_Graveler,
-    gMonIcon_Golem,
-    gMonIcon_Ponyta,
-    gMonIcon_Rapidash,
-    gMonIcon_Slowpoke,
-    gMonIcon_Slowbro,
-    gMonIcon_Magnemite,
-    gMonIcon_Magneton,
-    gMonIcon_Farfetchd,
-    gMonIcon_Doduo,
-    gMonIcon_Dodrio,
-    gMonIcon_Seel,
-    gMonIcon_Dewgong,
-    gMonIcon_Grimer,
-    gMonIcon_Muk,
-    gMonIcon_Shellder,
-    gMonIcon_Cloyster,
-    gMonIcon_Gastly,
-    gMonIcon_Haunter,
-    gMonIcon_Gengar,
-    gMonIcon_Onix,
-    gMonIcon_Drowzee,
-    gMonIcon_Hypno,
-    gMonIcon_Krabby,
-    gMonIcon_Kingler,
-    gMonIcon_Voltorb,
-    gMonIcon_Electrode,
-    gMonIcon_Exeggcute,
-    gMonIcon_Exeggutor,
-    gMonIcon_Cubone,
-    gMonIcon_Marowak,
-    gMonIcon_Hitmonlee,
-    gMonIcon_Hitmonchan,
-    gMonIcon_Lickitung,
-    gMonIcon_Koffing,
-    gMonIcon_Weezing,
-    gMonIcon_Rhyhorn,
-    gMonIcon_Rhydon,
-    gMonIcon_Chansey,
-    gMonIcon_Tangela,
-    gMonIcon_Kangaskhan,
-    gMonIcon_Horsea,
-    gMonIcon_Seadra,
-    gMonIcon_Goldeen,
-    gMonIcon_Seaking,
-    gMonIcon_Staryu,
-    gMonIcon_Starmie,
-    gMonIcon_Mrmime,
-    gMonIcon_Scyther,
-    gMonIcon_Jynx,
-    gMonIcon_Electabuzz,
-    gMonIcon_Magmar,
-    gMonIcon_Pinsir,
-    gMonIcon_Tauros,
-    gMonIcon_Magikarp,
-    gMonIcon_Gyarados,
-    gMonIcon_Lapras,
-    gMonIcon_Ditto,
-    gMonIcon_Eevee,
-    gMonIcon_Vaporeon,
-    gMonIcon_Jolteon,
-    gMonIcon_Flareon,
-    gMonIcon_Porygon,
-    gMonIcon_Omanyte,
-    gMonIcon_Omastar,
-    gMonIcon_Kabuto,
-    gMonIcon_Kabutops,
-    gMonIcon_Aerodactyl,
-    gMonIcon_Snorlax,
-    gMonIcon_Articuno,
-    gMonIcon_Zapdos,
-    gMonIcon_Moltres,
-    gMonIcon_Dratini,
-    gMonIcon_Dragonair,
-    gMonIcon_Dragonite,
-    gMonIcon_Mewtwo,
-    gMonIcon_Mew,
-    gMonIcon_Chikorita,
-    gMonIcon_Bayleef,
-    gMonIcon_Meganium,
-    gMonIcon_Cyndaquil,
-    gMonIcon_Quilava,
-    gMonIcon_Typhlosion,
-    gMonIcon_Totodile,
-    gMonIcon_Croconaw,
-    gMonIcon_Feraligatr,
-    gMonIcon_Sentret,
-    gMonIcon_Furret,
-    gMonIcon_Hoothoot,
-    gMonIcon_Noctowl,
-    gMonIcon_Ledyba,
-    gMonIcon_Ledian,
-    gMonIcon_Spinarak,
-    gMonIcon_Ariados,
-    gMonIcon_Crobat,
-    gMonIcon_Chinchou,
-    gMonIcon_Lanturn,
-    gMonIcon_Pichu,
-    gMonIcon_Cleffa,
-    gMonIcon_Igglybuff,
-    gMonIcon_Togepi,
-    gMonIcon_Togetic,
-    gMonIcon_Natu,
-    gMonIcon_Xatu,
-    gMonIcon_Mareep,
-    gMonIcon_Flaaffy,
-    gMonIcon_Ampharos,
-    gMonIcon_Bellossom,
-    gMonIcon_Marill,
-    gMonIcon_Azumarill,
-    gMonIcon_Sudowoodo,
-    gMonIcon_Politoed,
-    gMonIcon_Hoppip,
-    gMonIcon_Skiploom,
-    gMonIcon_Jumpluff,
-    gMonIcon_Aipom,
-    gMonIcon_Sunkern,
-    gMonIcon_Sunflora,
-    gMonIcon_Yanma,
-    gMonIcon_Wooper,
-    gMonIcon_Quagsire,
-    gMonIcon_Espeon,
-    gMonIcon_Umbreon,
-    gMonIcon_Murkrow,
-    gMonIcon_Slowking,
-    gMonIcon_Misdreavus,
-    gMonIcon_UnownA,
-    gMonIcon_Wobbuffet,
-    gMonIcon_Girafarig,
-    gMonIcon_Pineco,
-    gMonIcon_Forretress,
-    gMonIcon_Dunsparce,
-    gMonIcon_Gligar,
-    gMonIcon_Steelix,
-    gMonIcon_Snubbull,
-    gMonIcon_Granbull,
-    gMonIcon_Qwilfish,
-    gMonIcon_Scizor,
-    gMonIcon_Shuckle,
-    gMonIcon_Heracross,
-    gMonIcon_Sneasel,
-    gMonIcon_Teddiursa,
-    gMonIcon_Ursaring,
-    gMonIcon_Slugma,
-    gMonIcon_Magcargo,
-    gMonIcon_Swinub,
-    gMonIcon_Piloswine,
-    gMonIcon_Corsola,
-    gMonIcon_Remoraid,
-    gMonIcon_Octillery,
-    gMonIcon_Delibird,
-    gMonIcon_Mantine,
-    gMonIcon_Skarmory,
-    gMonIcon_Houndour,
-    gMonIcon_Houndoom,
-    gMonIcon_Kingdra,
-    gMonIcon_Phanpy,
-    gMonIcon_Donphan,
-    gMonIcon_Porygon2,
-    gMonIcon_Stantler,
-    gMonIcon_Smeargle,
-    gMonIcon_Tyrogue,
-    gMonIcon_Hitmontop,
-    gMonIcon_Smoochum,
-    gMonIcon_Elekid,
-    gMonIcon_Magby,
-    gMonIcon_Miltank,
-    gMonIcon_Blissey,
-    gMonIcon_Raikou,
-    gMonIcon_Entei,
-    gMonIcon_Suicune,
-    gMonIcon_Larvitar,
-    gMonIcon_Pupitar,
-    gMonIcon_Tyranitar,
-    gMonIcon_Lugia,
-    gMonIcon_HoOh,
-    gMonIcon_Celebi,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_QuestionMark,
-    gMonIcon_Treecko,
-    gMonIcon_Grovyle,
-    gMonIcon_Sceptile,
-    gMonIcon_Torchic,
-    gMonIcon_Combusken,
-    gMonIcon_Blaziken,
-    gMonIcon_Mudkip,
-    gMonIcon_Marshtomp,
-    gMonIcon_Swampert,
-    gMonIcon_Poochyena,
-    gMonIcon_Mightyena,
-    gMonIcon_Zigzagoon,
-    gMonIcon_Linoone,
-    gMonIcon_Wurmple,
-    gMonIcon_Silcoon,
-    gMonIcon_Beautifly,
-    gMonIcon_Cascoon,
-    gMonIcon_Dustox,
-    gMonIcon_Lotad,
-    gMonIcon_Lombre,
-    gMonIcon_Ludicolo,
-    gMonIcon_Seedot,
-    gMonIcon_Nuzleaf,
-    gMonIcon_Shiftry,
-    gMonIcon_Nincada,
-    gMonIcon_Ninjask,
-    gMonIcon_Shedinja,
-    gMonIcon_Taillow,
-    gMonIcon_Swellow,
-    gMonIcon_Shroomish,
-    gMonIcon_Breloom,
-    gMonIcon_Spinda,
-    gMonIcon_Wingull,
-    gMonIcon_Pelipper,
-    gMonIcon_Surskit,
-    gMonIcon_Masquerain,
-    gMonIcon_Wailmer,
-    gMonIcon_Wailord,
-    gMonIcon_Skitty,
-    gMonIcon_Delcatty,
-    gMonIcon_Kecleon,
-    gMonIcon_Baltoy,
-    gMonIcon_Claydol,
-    gMonIcon_Nosepass,
-    gMonIcon_Torkoal,
-    gMonIcon_Sableye,
-    gMonIcon_Barboach,
-    gMonIcon_Whiscash,
-    gMonIcon_Luvdisc,
-    gMonIcon_Corphish,
-    gMonIcon_Crawdaunt,
-    gMonIcon_Feebas,
-    gMonIcon_Milotic,
-    gMonIcon_Carvanha,
-    gMonIcon_Sharpedo,
-    gMonIcon_Trapinch,
-    gMonIcon_Vibrava,
-    gMonIcon_Flygon,
-    gMonIcon_Makuhita,
-    gMonIcon_Hariyama,
-    gMonIcon_Electrike,
-    gMonIcon_Manectric,
-    gMonIcon_Numel,
-    gMonIcon_Camerupt,
-    gMonIcon_Spheal,
-    gMonIcon_Sealeo,
-    gMonIcon_Walrein,
-    gMonIcon_Cacnea,
-    gMonIcon_Cacturne,
-    gMonIcon_Snorunt,
-    gMonIcon_Glalie,
-    gMonIcon_Lunatone,
-    gMonIcon_Solrock,
-    gMonIcon_Azurill,
-    gMonIcon_Spoink,
-    gMonIcon_Grumpig,
-    gMonIcon_Plusle,
-    gMonIcon_Minun,
-    gMonIcon_Mawile,
-    gMonIcon_Meditite,
-    gMonIcon_Medicham,
-    gMonIcon_Swablu,
-    gMonIcon_Altaria,
-    gMonIcon_Wynaut,
-    gMonIcon_Duskull,
-    gMonIcon_Dusclops,
-    gMonIcon_Roselia,
-    gMonIcon_Slakoth,
-    gMonIcon_Vigoroth,
-    gMonIcon_Slaking,
-    gMonIcon_Gulpin,
-    gMonIcon_Swalot,
-    gMonIcon_Tropius,
-    gMonIcon_Whismur,
-    gMonIcon_Loudred,
-    gMonIcon_Exploud,
-    gMonIcon_Clamperl,
-    gMonIcon_Huntail,
-    gMonIcon_Gorebyss,
-    gMonIcon_Absol,
-    gMonIcon_Shuppet,
-    gMonIcon_Banette,
-    gMonIcon_Seviper,
-    gMonIcon_Zangoose,
-    gMonIcon_Relicanth,
-    gMonIcon_Aron,
-    gMonIcon_Lairon,
-    gMonIcon_Aggron,
-    gMonIcon_Castform,
-    gMonIcon_Volbeat,
-    gMonIcon_Illumise,
-    gMonIcon_Lileep,
-    gMonIcon_Cradily,
-    gMonIcon_Anorith,
-    gMonIcon_Armaldo,
-    gMonIcon_Ralts,
-    gMonIcon_Kirlia,
-    gMonIcon_Gardevoir,
-    gMonIcon_Bagon,
-    gMonIcon_Shelgon,
-    gMonIcon_Salamence,
-    gMonIcon_Beldum,
-    gMonIcon_Metang,
-    gMonIcon_Metagross,
-    gMonIcon_Regirock,
-    gMonIcon_Regice,
-    gMonIcon_Registeel,
-    gMonIcon_Kyogre,
-    gMonIcon_Groudon,
-    gMonIcon_Rayquaza,
-    gMonIcon_Latias,
-    gMonIcon_Latios,
-    gMonIcon_Jirachi,
-    gMonIcon_Deoxys,
-    gMonIcon_Chimecho,
-    gMonIcon_Egg,
-    gMonIcon_UnownB,
-    gMonIcon_UnownC,
-    gMonIcon_UnownD,
-    gMonIcon_UnownE,
-    gMonIcon_UnownF,
-    gMonIcon_UnownG,
-    gMonIcon_UnownH,
-    gMonIcon_UnownI,
-    gMonIcon_UnownJ,
-    gMonIcon_UnownK,
-    gMonIcon_UnownL,
-    gMonIcon_UnownM,
-    gMonIcon_UnownN,
-    gMonIcon_UnownO,
-    gMonIcon_UnownP,
-    gMonIcon_UnownQ,
-    gMonIcon_UnownR,
-    gMonIcon_UnownS,
-    gMonIcon_UnownT,
-    gMonIcon_UnownU,
-    gMonIcon_UnownV,
-    gMonIcon_UnownW,
-    gMonIcon_UnownX,
-    gMonIcon_UnownY,
-    gMonIcon_UnownZ,
-    gMonIcon_UnownExclamationMark,
-    gMonIcon_UnownQuestionMark,
+    [SPECIES_NONE] = gMonIcon_Bulbasaur,
+    [SPECIES_BULBASAUR] = gMonIcon_Bulbasaur,
+    [SPECIES_IVYSAUR] = gMonIcon_Ivysaur,
+    [SPECIES_VENUSAUR] = gMonIcon_Venusaur,
+    [SPECIES_CHARMANDER] = gMonIcon_Charmander,
+    [SPECIES_CHARMELEON] = gMonIcon_Charmeleon,
+    [SPECIES_CHARIZARD] = gMonIcon_Charizard,
+    [SPECIES_SQUIRTLE] = gMonIcon_Squirtle,
+    [SPECIES_WARTORTLE] = gMonIcon_Wartortle,
+    [SPECIES_BLASTOISE] = gMonIcon_Blastoise,
+    [SPECIES_CATERPIE] = gMonIcon_Caterpie,
+    [SPECIES_METAPOD] = gMonIcon_Metapod,
+    [SPECIES_BUTTERFREE] = gMonIcon_Butterfree,
+    [SPECIES_WEEDLE] = gMonIcon_Weedle,
+    [SPECIES_KAKUNA] = gMonIcon_Kakuna,
+    [SPECIES_BEEDRILL] = gMonIcon_Beedrill,
+    [SPECIES_PIDGEY] = gMonIcon_Pidgey,
+    [SPECIES_PIDGEOTTO] = gMonIcon_Pidgeotto,
+    [SPECIES_PIDGEOT] = gMonIcon_Pidgeot,
+    [SPECIES_RATTATA] = gMonIcon_Rattata,
+    [SPECIES_RATICATE] = gMonIcon_Raticate,
+    [SPECIES_SPEAROW] = gMonIcon_Spearow,
+    [SPECIES_FEAROW] = gMonIcon_Fearow,
+    [SPECIES_EKANS] = gMonIcon_Ekans,
+    [SPECIES_ARBOK] = gMonIcon_Arbok,
+    [SPECIES_PIKACHU] = gMonIcon_Pikachu,
+    [SPECIES_RAICHU] = gMonIcon_Raichu,
+    [SPECIES_SANDSHREW] = gMonIcon_Sandshrew,
+    [SPECIES_SANDSLASH] = gMonIcon_Sandslash,
+    [SPECIES_NIDORAN_F] = gMonIcon_NidoranF,
+    [SPECIES_NIDORINA] = gMonIcon_Nidorina,
+    [SPECIES_NIDOQUEEN] = gMonIcon_Nidoqueen,
+    [SPECIES_NIDORAN_M] = gMonIcon_NidoranM,
+    [SPECIES_NIDORINO] = gMonIcon_Nidorino,
+    [SPECIES_NIDOKING] = gMonIcon_Nidoking,
+    [SPECIES_CLEFAIRY] = gMonIcon_Clefairy,
+    [SPECIES_CLEFABLE] = gMonIcon_Clefable,
+    [SPECIES_VULPIX] = gMonIcon_Vulpix,
+    [SPECIES_NINETALES] = gMonIcon_Ninetales,
+    [SPECIES_JIGGLYPUFF] = gMonIcon_Jigglypuff,
+    [SPECIES_WIGGLYTUFF] = gMonIcon_Wigglytuff,
+    [SPECIES_ZUBAT] = gMonIcon_Zubat,
+    [SPECIES_GOLBAT] = gMonIcon_Golbat,
+    [SPECIES_ODDISH] = gMonIcon_Oddish,
+    [SPECIES_GLOOM] = gMonIcon_Gloom,
+    [SPECIES_VILEPLUME] = gMonIcon_Vileplume,
+    [SPECIES_PARAS] = gMonIcon_Paras,
+    [SPECIES_PARASECT] = gMonIcon_Parasect,
+    [SPECIES_VENONAT] = gMonIcon_Venonat,
+    [SPECIES_VENOMOTH] = gMonIcon_Venomoth,
+    [SPECIES_DIGLETT] = gMonIcon_Diglett,
+    [SPECIES_DUGTRIO] = gMonIcon_Dugtrio,
+    [SPECIES_MEOWTH] = gMonIcon_Meowth,
+    [SPECIES_PERSIAN] = gMonIcon_Persian,
+    [SPECIES_PSYDUCK] = gMonIcon_Psyduck,
+    [SPECIES_GOLDUCK] = gMonIcon_Golduck,
+    [SPECIES_MANKEY] = gMonIcon_Mankey,
+    [SPECIES_PRIMEAPE] = gMonIcon_Primeape,
+    [SPECIES_GROWLITHE] = gMonIcon_Growlithe,
+    [SPECIES_ARCANINE] = gMonIcon_Arcanine,
+    [SPECIES_POLIWAG] = gMonIcon_Poliwag,
+    [SPECIES_POLIWHIRL] = gMonIcon_Poliwhirl,
+    [SPECIES_POLIWRATH] = gMonIcon_Poliwrath,
+    [SPECIES_ABRA] = gMonIcon_Abra,
+    [SPECIES_KADABRA] = gMonIcon_Kadabra,
+    [SPECIES_ALAKAZAM] = gMonIcon_Alakazam,
+    [SPECIES_MACHOP] = gMonIcon_Machop,
+    [SPECIES_MACHOKE] = gMonIcon_Machoke,
+    [SPECIES_MACHAMP] = gMonIcon_Machamp,
+    [SPECIES_BELLSPROUT] = gMonIcon_Bellsprout,
+    [SPECIES_WEEPINBELL] = gMonIcon_Weepinbell,
+    [SPECIES_VICTREEBEL] = gMonIcon_Victreebel,
+    [SPECIES_TENTACOOL] = gMonIcon_Tentacool,
+    [SPECIES_TENTACRUEL] = gMonIcon_Tentacruel,
+    [SPECIES_GEODUDE] = gMonIcon_Geodude,
+    [SPECIES_GRAVELER] = gMonIcon_Graveler,
+    [SPECIES_GOLEM] = gMonIcon_Golem,
+    [SPECIES_PONYTA] = gMonIcon_Ponyta,
+    [SPECIES_RAPIDASH] = gMonIcon_Rapidash,
+    [SPECIES_SLOWPOKE] = gMonIcon_Slowpoke,
+    [SPECIES_SLOWBRO] = gMonIcon_Slowbro,
+    [SPECIES_MAGNEMITE] = gMonIcon_Magnemite,
+    [SPECIES_MAGNETON] = gMonIcon_Magneton,
+    [SPECIES_FARFETCHD] = gMonIcon_Farfetchd,
+    [SPECIES_DODUO] = gMonIcon_Doduo,
+    [SPECIES_DODRIO] = gMonIcon_Dodrio,
+    [SPECIES_SEEL] = gMonIcon_Seel,
+    [SPECIES_DEWGONG] = gMonIcon_Dewgong,
+    [SPECIES_GRIMER] = gMonIcon_Grimer,
+    [SPECIES_MUK] = gMonIcon_Muk,
+    [SPECIES_SHELLDER] = gMonIcon_Shellder,
+    [SPECIES_CLOYSTER] = gMonIcon_Cloyster,
+    [SPECIES_GASTLY] = gMonIcon_Gastly,
+    [SPECIES_HAUNTER] = gMonIcon_Haunter,
+    [SPECIES_GENGAR] = gMonIcon_Gengar,
+    [SPECIES_ONIX] = gMonIcon_Onix,
+    [SPECIES_DROWZEE] = gMonIcon_Drowzee,
+    [SPECIES_HYPNO] = gMonIcon_Hypno,
+    [SPECIES_KRABBY] = gMonIcon_Krabby,
+    [SPECIES_KINGLER] = gMonIcon_Kingler,
+    [SPECIES_VOLTORB] = gMonIcon_Voltorb,
+    [SPECIES_ELECTRODE] = gMonIcon_Electrode,
+    [SPECIES_EXEGGCUTE] = gMonIcon_Exeggcute,
+    [SPECIES_EXEGGUTOR] = gMonIcon_Exeggutor,
+    [SPECIES_CUBONE] = gMonIcon_Cubone,
+    [SPECIES_MAROWAK] = gMonIcon_Marowak,
+    [SPECIES_HITMONLEE] = gMonIcon_Hitmonlee,
+    [SPECIES_HITMONCHAN] = gMonIcon_Hitmonchan,
+    [SPECIES_LICKITUNG] = gMonIcon_Lickitung,
+    [SPECIES_KOFFING] = gMonIcon_Koffing,
+    [SPECIES_WEEZING] = gMonIcon_Weezing,
+    [SPECIES_RHYHORN] = gMonIcon_Rhyhorn,
+    [SPECIES_RHYDON] = gMonIcon_Rhydon,
+    [SPECIES_CHANSEY] = gMonIcon_Chansey,
+    [SPECIES_TANGELA] = gMonIcon_Tangela,
+    [SPECIES_KANGASKHAN] = gMonIcon_Kangaskhan,
+    [SPECIES_HORSEA] = gMonIcon_Horsea,
+    [SPECIES_SEADRA] = gMonIcon_Seadra,
+    [SPECIES_GOLDEEN] = gMonIcon_Goldeen,
+    [SPECIES_SEAKING] = gMonIcon_Seaking,
+    [SPECIES_STARYU] = gMonIcon_Staryu,
+    [SPECIES_STARMIE] = gMonIcon_Starmie,
+    [SPECIES_MR_MIME] = gMonIcon_Mrmime,
+    [SPECIES_SCYTHER] = gMonIcon_Scyther,
+    [SPECIES_JYNX] = gMonIcon_Jynx,
+    [SPECIES_ELECTABUZZ] = gMonIcon_Electabuzz,
+    [SPECIES_MAGMAR] = gMonIcon_Magmar,
+    [SPECIES_PINSIR] = gMonIcon_Pinsir,
+    [SPECIES_TAUROS] = gMonIcon_Tauros,
+    [SPECIES_MAGIKARP] = gMonIcon_Magikarp,
+    [SPECIES_GYARADOS] = gMonIcon_Gyarados,
+    [SPECIES_LAPRAS] = gMonIcon_Lapras,
+    [SPECIES_DITTO] = gMonIcon_Ditto,
+    [SPECIES_EEVEE] = gMonIcon_Eevee,
+    [SPECIES_VAPOREON] = gMonIcon_Vaporeon,
+    [SPECIES_JOLTEON] = gMonIcon_Jolteon,
+    [SPECIES_FLAREON] = gMonIcon_Flareon,
+    [SPECIES_PORYGON] = gMonIcon_Porygon,
+    [SPECIES_OMANYTE] = gMonIcon_Omanyte,
+    [SPECIES_OMASTAR] = gMonIcon_Omastar,
+    [SPECIES_KABUTO] = gMonIcon_Kabuto,
+    [SPECIES_KABUTOPS] = gMonIcon_Kabutops,
+    [SPECIES_AERODACTYL] = gMonIcon_Aerodactyl,
+    [SPECIES_SNORLAX] = gMonIcon_Snorlax,
+    [SPECIES_ARTICUNO] = gMonIcon_Articuno,
+    [SPECIES_ZAPDOS] = gMonIcon_Zapdos,
+    [SPECIES_MOLTRES] = gMonIcon_Moltres,
+    [SPECIES_DRATINI] = gMonIcon_Dratini,
+    [SPECIES_DRAGONAIR] = gMonIcon_Dragonair,
+    [SPECIES_DRAGONITE] = gMonIcon_Dragonite,
+    [SPECIES_MEWTWO] = gMonIcon_Mewtwo,
+    [SPECIES_MEW] = gMonIcon_Mew,
+    [SPECIES_CHIKORITA] = gMonIcon_Chikorita,
+    [SPECIES_BAYLEEF] = gMonIcon_Bayleef,
+    [SPECIES_MEGANIUM] = gMonIcon_Meganium,
+    [SPECIES_CYNDAQUIL] = gMonIcon_Cyndaquil,
+    [SPECIES_QUILAVA] = gMonIcon_Quilava,
+    [SPECIES_TYPHLOSION] = gMonIcon_Typhlosion,
+    [SPECIES_TOTODILE] = gMonIcon_Totodile,
+    [SPECIES_CROCONAW] = gMonIcon_Croconaw,
+    [SPECIES_FERALIGATR] = gMonIcon_Feraligatr,
+    [SPECIES_SENTRET] = gMonIcon_Sentret,
+    [SPECIES_FURRET] = gMonIcon_Furret,
+    [SPECIES_HOOTHOOT] = gMonIcon_Hoothoot,
+    [SPECIES_NOCTOWL] = gMonIcon_Noctowl,
+    [SPECIES_LEDYBA] = gMonIcon_Ledyba,
+    [SPECIES_LEDIAN] = gMonIcon_Ledian,
+    [SPECIES_SPINARAK] = gMonIcon_Spinarak,
+    [SPECIES_ARIADOS] = gMonIcon_Ariados,
+    [SPECIES_CROBAT] = gMonIcon_Crobat,
+    [SPECIES_CHINCHOU] = gMonIcon_Chinchou,
+    [SPECIES_LANTURN] = gMonIcon_Lanturn,
+    [SPECIES_PICHU] = gMonIcon_Pichu,
+    [SPECIES_CLEFFA] = gMonIcon_Cleffa,
+    [SPECIES_IGGLYBUFF] = gMonIcon_Igglybuff,
+    [SPECIES_TOGEPI] = gMonIcon_Togepi,
+    [SPECIES_TOGETIC] = gMonIcon_Togetic,
+    [SPECIES_NATU] = gMonIcon_Natu,
+    [SPECIES_XATU] = gMonIcon_Xatu,
+    [SPECIES_MAREEP] = gMonIcon_Mareep,
+    [SPECIES_FLAAFFY] = gMonIcon_Flaaffy,
+    [SPECIES_AMPHAROS] = gMonIcon_Ampharos,
+    [SPECIES_BELLOSSOM] = gMonIcon_Bellossom,
+    [SPECIES_MARILL] = gMonIcon_Marill,
+    [SPECIES_AZUMARILL] = gMonIcon_Azumarill,
+    [SPECIES_SUDOWOODO] = gMonIcon_Sudowoodo,
+    [SPECIES_POLITOED] = gMonIcon_Politoed,
+    [SPECIES_HOPPIP] = gMonIcon_Hoppip,
+    [SPECIES_SKIPLOOM] = gMonIcon_Skiploom,
+    [SPECIES_JUMPLUFF] = gMonIcon_Jumpluff,
+    [SPECIES_AIPOM] = gMonIcon_Aipom,
+    [SPECIES_SUNKERN] = gMonIcon_Sunkern,
+    [SPECIES_SUNFLORA] = gMonIcon_Sunflora,
+    [SPECIES_YANMA] = gMonIcon_Yanma,
+    [SPECIES_WOOPER] = gMonIcon_Wooper,
+    [SPECIES_QUAGSIRE] = gMonIcon_Quagsire,
+    [SPECIES_ESPEON] = gMonIcon_Espeon,
+    [SPECIES_UMBREON] = gMonIcon_Umbreon,
+    [SPECIES_MURKROW] = gMonIcon_Murkrow,
+    [SPECIES_SLOWKING] = gMonIcon_Slowking,
+    [SPECIES_MISDREAVUS] = gMonIcon_Misdreavus,
+    [SPECIES_UNOWN] = gMonIcon_UnownA,
+    [SPECIES_WOBBUFFET] = gMonIcon_Wobbuffet,
+    [SPECIES_GIRAFARIG] = gMonIcon_Girafarig,
+    [SPECIES_PINECO] = gMonIcon_Pineco,
+    [SPECIES_FORRETRESS] = gMonIcon_Forretress,
+    [SPECIES_DUNSPARCE] = gMonIcon_Dunsparce,
+    [SPECIES_GLIGAR] = gMonIcon_Gligar,
+    [SPECIES_STEELIX] = gMonIcon_Steelix,
+    [SPECIES_SNUBBULL] = gMonIcon_Snubbull,
+    [SPECIES_GRANBULL] = gMonIcon_Granbull,
+    [SPECIES_QWILFISH] = gMonIcon_Qwilfish,
+    [SPECIES_SCIZOR] = gMonIcon_Scizor,
+    [SPECIES_SHUCKLE] = gMonIcon_Shuckle,
+    [SPECIES_HERACROSS] = gMonIcon_Heracross,
+    [SPECIES_SNEASEL] = gMonIcon_Sneasel,
+    [SPECIES_TEDDIURSA] = gMonIcon_Teddiursa,
+    [SPECIES_URSARING] = gMonIcon_Ursaring,
+    [SPECIES_SLUGMA] = gMonIcon_Slugma,
+    [SPECIES_MAGCARGO] = gMonIcon_Magcargo,
+    [SPECIES_SWINUB] = gMonIcon_Swinub,
+    [SPECIES_PILOSWINE] = gMonIcon_Piloswine,
+    [SPECIES_CORSOLA] = gMonIcon_Corsola,
+    [SPECIES_REMORAID] = gMonIcon_Remoraid,
+    [SPECIES_OCTILLERY] = gMonIcon_Octillery,
+    [SPECIES_DELIBIRD] = gMonIcon_Delibird,
+    [SPECIES_MANTINE] = gMonIcon_Mantine,
+    [SPECIES_SKARMORY] = gMonIcon_Skarmory,
+    [SPECIES_HOUNDOUR] = gMonIcon_Houndour,
+    [SPECIES_HOUNDOOM] = gMonIcon_Houndoom,
+    [SPECIES_KINGDRA] = gMonIcon_Kingdra,
+    [SPECIES_PHANPY] = gMonIcon_Phanpy,
+    [SPECIES_DONPHAN] = gMonIcon_Donphan,
+    [SPECIES_PORYGON2] = gMonIcon_Porygon2,
+    [SPECIES_STANTLER] = gMonIcon_Stantler,
+    [SPECIES_SMEARGLE] = gMonIcon_Smeargle,
+    [SPECIES_TYROGUE] = gMonIcon_Tyrogue,
+    [SPECIES_HITMONTOP] = gMonIcon_Hitmontop,
+    [SPECIES_SMOOCHUM] = gMonIcon_Smoochum,
+    [SPECIES_ELEKID] = gMonIcon_Elekid,
+    [SPECIES_MAGBY] = gMonIcon_Magby,
+    [SPECIES_MILTANK] = gMonIcon_Miltank,
+    [SPECIES_BLISSEY] = gMonIcon_Blissey,
+    [SPECIES_RAIKOU] = gMonIcon_Raikou,
+    [SPECIES_ENTEI] = gMonIcon_Entei,
+    [SPECIES_SUICUNE] = gMonIcon_Suicune,
+    [SPECIES_LARVITAR] = gMonIcon_Larvitar,
+    [SPECIES_PUPITAR] = gMonIcon_Pupitar,
+    [SPECIES_TYRANITAR] = gMonIcon_Tyranitar,
+    [SPECIES_LUGIA] = gMonIcon_Lugia,
+    [SPECIES_HO_OH] = gMonIcon_HoOh,
+    [SPECIES_CELEBI] = gMonIcon_Celebi,
+    [SPECIES_OLD_UNOWN_B] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_C] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_D] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_E] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_F] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_G] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_H] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_I] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_J] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_K] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_L] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_M] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_N] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_O] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_P] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_Q] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_R] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_S] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_T] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_U] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_V] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_W] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_X] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_Y] = gMonIcon_QuestionMark,
+    [SPECIES_OLD_UNOWN_Z] = gMonIcon_QuestionMark,
+    [SPECIES_TREECKO] = gMonIcon_Treecko,
+    [SPECIES_GROVYLE] = gMonIcon_Grovyle,
+    [SPECIES_SCEPTILE] = gMonIcon_Sceptile,
+    [SPECIES_TORCHIC] = gMonIcon_Torchic,
+    [SPECIES_COMBUSKEN] = gMonIcon_Combusken,
+    [SPECIES_BLAZIKEN] = gMonIcon_Blaziken,
+    [SPECIES_MUDKIP] = gMonIcon_Mudkip,
+    [SPECIES_MARSHTOMP] = gMonIcon_Marshtomp,
+    [SPECIES_SWAMPERT] = gMonIcon_Swampert,
+    [SPECIES_POOCHYENA] = gMonIcon_Poochyena,
+    [SPECIES_MIGHTYENA] = gMonIcon_Mightyena,
+    [SPECIES_ZIGZAGOON] = gMonIcon_Zigzagoon,
+    [SPECIES_LINOONE] = gMonIcon_Linoone,
+    [SPECIES_WURMPLE] = gMonIcon_Wurmple,
+    [SPECIES_SILCOON] = gMonIcon_Silcoon,
+    [SPECIES_BEAUTIFLY] = gMonIcon_Beautifly,
+    [SPECIES_CASCOON] = gMonIcon_Cascoon,
+    [SPECIES_DUSTOX] = gMonIcon_Dustox,
+    [SPECIES_LOTAD] = gMonIcon_Lotad,
+    [SPECIES_LOMBRE] = gMonIcon_Lombre,
+    [SPECIES_LUDICOLO] = gMonIcon_Ludicolo,
+    [SPECIES_SEEDOT] = gMonIcon_Seedot,
+    [SPECIES_NUZLEAF] = gMonIcon_Nuzleaf,
+    [SPECIES_SHIFTRY] = gMonIcon_Shiftry,
+    [SPECIES_NINCADA] = gMonIcon_Nincada,
+    [SPECIES_NINJASK] = gMonIcon_Ninjask,
+    [SPECIES_SHEDINJA] = gMonIcon_Shedinja,
+    [SPECIES_TAILLOW] = gMonIcon_Taillow,
+    [SPECIES_SWELLOW] = gMonIcon_Swellow,
+    [SPECIES_SHROOMISH] = gMonIcon_Shroomish,
+    [SPECIES_BRELOOM] = gMonIcon_Breloom,
+    [SPECIES_SPINDA] = gMonIcon_Spinda,
+    [SPECIES_WINGULL] = gMonIcon_Wingull,
+    [SPECIES_PELIPPER] = gMonIcon_Pelipper,
+    [SPECIES_SURSKIT] = gMonIcon_Surskit,
+    [SPECIES_MASQUERAIN] = gMonIcon_Masquerain,
+    [SPECIES_WAILMER] = gMonIcon_Wailmer,
+    [SPECIES_WAILORD] = gMonIcon_Wailord,
+    [SPECIES_SKITTY] = gMonIcon_Skitty,
+    [SPECIES_DELCATTY] = gMonIcon_Delcatty,
+    [SPECIES_KECLEON] = gMonIcon_Kecleon,
+    [SPECIES_BALTOY] = gMonIcon_Baltoy,
+    [SPECIES_CLAYDOL] = gMonIcon_Claydol,
+    [SPECIES_NOSEPASS] = gMonIcon_Nosepass,
+    [SPECIES_TORKOAL] = gMonIcon_Torkoal,
+    [SPECIES_SABLEYE] = gMonIcon_Sableye,
+    [SPECIES_BARBOACH] = gMonIcon_Barboach,
+    [SPECIES_WHISCASH] = gMonIcon_Whiscash,
+    [SPECIES_LUVDISC] = gMonIcon_Luvdisc,
+    [SPECIES_CORPHISH] = gMonIcon_Corphish,
+    [SPECIES_CRAWDAUNT] = gMonIcon_Crawdaunt,
+    [SPECIES_FEEBAS] = gMonIcon_Feebas,
+    [SPECIES_MILOTIC] = gMonIcon_Milotic,
+    [SPECIES_CARVANHA] = gMonIcon_Carvanha,
+    [SPECIES_SHARPEDO] = gMonIcon_Sharpedo,
+    [SPECIES_TRAPINCH] = gMonIcon_Trapinch,
+    [SPECIES_VIBRAVA] = gMonIcon_Vibrava,
+    [SPECIES_FLYGON] = gMonIcon_Flygon,
+    [SPECIES_MAKUHITA] = gMonIcon_Makuhita,
+    [SPECIES_HARIYAMA] = gMonIcon_Hariyama,
+    [SPECIES_ELECTRIKE] = gMonIcon_Electrike,
+    [SPECIES_MANECTRIC] = gMonIcon_Manectric,
+    [SPECIES_NUMEL] = gMonIcon_Numel,
+    [SPECIES_CAMERUPT] = gMonIcon_Camerupt,
+    [SPECIES_SPHEAL] = gMonIcon_Spheal,
+    [SPECIES_SEALEO] = gMonIcon_Sealeo,
+    [SPECIES_WALREIN] = gMonIcon_Walrein,
+    [SPECIES_CACNEA] = gMonIcon_Cacnea,
+    [SPECIES_CACTURNE] = gMonIcon_Cacturne,
+    [SPECIES_SNORUNT] = gMonIcon_Snorunt,
+    [SPECIES_GLALIE] = gMonIcon_Glalie,
+    [SPECIES_LUNATONE] = gMonIcon_Lunatone,
+    [SPECIES_SOLROCK] = gMonIcon_Solrock,
+    [SPECIES_AZURILL] = gMonIcon_Azurill,
+    [SPECIES_SPOINK] = gMonIcon_Spoink,
+    [SPECIES_GRUMPIG] = gMonIcon_Grumpig,
+    [SPECIES_PLUSLE] = gMonIcon_Plusle,
+    [SPECIES_MINUN] = gMonIcon_Minun,
+    [SPECIES_MAWILE] = gMonIcon_Mawile,
+    [SPECIES_MEDITITE] = gMonIcon_Meditite,
+    [SPECIES_MEDICHAM] = gMonIcon_Medicham,
+    [SPECIES_SWABLU] = gMonIcon_Swablu,
+    [SPECIES_ALTARIA] = gMonIcon_Altaria,
+    [SPECIES_WYNAUT] = gMonIcon_Wynaut,
+    [SPECIES_DUSKULL] = gMonIcon_Duskull,
+    [SPECIES_DUSCLOPS] = gMonIcon_Dusclops,
+    [SPECIES_ROSELIA] = gMonIcon_Roselia,
+    [SPECIES_SLAKOTH] = gMonIcon_Slakoth,
+    [SPECIES_VIGOROTH] = gMonIcon_Vigoroth,
+    [SPECIES_SLAKING] = gMonIcon_Slaking,
+    [SPECIES_GULPIN] = gMonIcon_Gulpin,
+    [SPECIES_SWALOT] = gMonIcon_Swalot,
+    [SPECIES_TROPIUS] = gMonIcon_Tropius,
+    [SPECIES_WHISMUR] = gMonIcon_Whismur,
+    [SPECIES_LOUDRED] = gMonIcon_Loudred,
+    [SPECIES_EXPLOUD] = gMonIcon_Exploud,
+    [SPECIES_CLAMPERL] = gMonIcon_Clamperl,
+    [SPECIES_HUNTAIL] = gMonIcon_Huntail,
+    [SPECIES_GOREBYSS] = gMonIcon_Gorebyss,
+    [SPECIES_ABSOL] = gMonIcon_Absol,
+    [SPECIES_SHUPPET] = gMonIcon_Shuppet,
+    [SPECIES_BANETTE] = gMonIcon_Banette,
+    [SPECIES_SEVIPER] = gMonIcon_Seviper,
+    [SPECIES_ZANGOOSE] = gMonIcon_Zangoose,
+    [SPECIES_RELICANTH] = gMonIcon_Relicanth,
+    [SPECIES_ARON] = gMonIcon_Aron,
+    [SPECIES_LAIRON] = gMonIcon_Lairon,
+    [SPECIES_AGGRON] = gMonIcon_Aggron,
+    [SPECIES_CASTFORM] = gMonIcon_Castform,
+    [SPECIES_VOLBEAT] = gMonIcon_Volbeat,
+    [SPECIES_ILLUMISE] = gMonIcon_Illumise,
+    [SPECIES_LILEEP] = gMonIcon_Lileep,
+    [SPECIES_CRADILY] = gMonIcon_Cradily,
+    [SPECIES_ANORITH] = gMonIcon_Anorith,
+    [SPECIES_ARMALDO] = gMonIcon_Armaldo,
+    [SPECIES_RALTS] = gMonIcon_Ralts,
+    [SPECIES_KIRLIA] = gMonIcon_Kirlia,
+    [SPECIES_GARDEVOIR] = gMonIcon_Gardevoir,
+    [SPECIES_BAGON] = gMonIcon_Bagon,
+    [SPECIES_SHELGON] = gMonIcon_Shelgon,
+    [SPECIES_SALAMENCE] = gMonIcon_Salamence,
+    [SPECIES_BELDUM] = gMonIcon_Beldum,
+    [SPECIES_METANG] = gMonIcon_Metang,
+    [SPECIES_METAGROSS] = gMonIcon_Metagross,
+    [SPECIES_REGIROCK] = gMonIcon_Regirock,
+    [SPECIES_REGICE] = gMonIcon_Regice,
+    [SPECIES_REGISTEEL] = gMonIcon_Registeel,
+    [SPECIES_KYOGRE] = gMonIcon_Kyogre,
+    [SPECIES_GROUDON] = gMonIcon_Groudon,
+    [SPECIES_RAYQUAZA] = gMonIcon_Rayquaza,
+    [SPECIES_LATIAS] = gMonIcon_Latias,
+    [SPECIES_LATIOS] = gMonIcon_Latios,
+    [SPECIES_JIRACHI] = gMonIcon_Jirachi,
+    [SPECIES_DEOXYS] = gMonIcon_Deoxys,
+    [SPECIES_CHIMECHO] = gMonIcon_Chimecho,
+    [SPECIES_EGG] = gMonIcon_Egg,
+    [SPECIES_UNOWN_B] = gMonIcon_UnownB,
+    [SPECIES_UNOWN_C] = gMonIcon_UnownC,
+    [SPECIES_UNOWN_D] = gMonIcon_UnownD,
+    [SPECIES_UNOWN_E] = gMonIcon_UnownE,
+    [SPECIES_UNOWN_F] = gMonIcon_UnownF,
+    [SPECIES_UNOWN_G] = gMonIcon_UnownG,
+    [SPECIES_UNOWN_H] = gMonIcon_UnownH,
+    [SPECIES_UNOWN_I] = gMonIcon_UnownI,
+    [SPECIES_UNOWN_J] = gMonIcon_UnownJ,
+    [SPECIES_UNOWN_K] = gMonIcon_UnownK,
+    [SPECIES_UNOWN_L] = gMonIcon_UnownL,
+    [SPECIES_UNOWN_M] = gMonIcon_UnownM,
+    [SPECIES_UNOWN_N] = gMonIcon_UnownN,
+    [SPECIES_UNOWN_O] = gMonIcon_UnownO,
+    [SPECIES_UNOWN_P] = gMonIcon_UnownP,
+    [SPECIES_UNOWN_Q] = gMonIcon_UnownQ,
+    [SPECIES_UNOWN_R] = gMonIcon_UnownR,
+    [SPECIES_UNOWN_S] = gMonIcon_UnownS,
+    [SPECIES_UNOWN_T] = gMonIcon_UnownT,
+    [SPECIES_UNOWN_U] = gMonIcon_UnownU,
+    [SPECIES_UNOWN_V] = gMonIcon_UnownV,
+    [SPECIES_UNOWN_W] = gMonIcon_UnownW,
+    [SPECIES_UNOWN_X] = gMonIcon_UnownX,
+    [SPECIES_UNOWN_Y] = gMonIcon_UnownY,
+    [SPECIES_UNOWN_Z] = gMonIcon_UnownZ,
+    [SPECIES_UNOWN_EMARK] = gMonIcon_UnownExclamationMark,
+    [SPECIES_UNOWN_QMARK] = gMonIcon_UnownQuestionMark,
 };
 
 const u8 gMonIconPaletteIndices[] =
diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index ec689b3b7..0680570fc 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -149,47 +149,47 @@ u16 FeebasDebug_GetTrueNumberOfWaterTilesInMapThird(u8 arg0)
 
 static u8 ChooseWildMonIndex_Land(void)
 {
-    u8 rand = Random() % 100;
+    u8 rand = Random() % ENCOUNTER_CHANCE_LAND_MONS_TOTAL;
 
-    if (rand < 20)                  //20% chance
+    if (rand < ENCOUNTER_CHANCE_LAND_MONS_SLOT_0)
         return 0;
-    if (rand >= 20 && rand < 40)    //20% chance
+    else if (rand >= ENCOUNTER_CHANCE_LAND_MONS_SLOT_0 && rand < ENCOUNTER_CHANCE_LAND_MONS_SLOT_1)
         return 1;
-    if (rand >= 40 && rand < 50)    //10% chance
+    else if (rand >= ENCOUNTER_CHANCE_LAND_MONS_SLOT_1 && rand < ENCOUNTER_CHANCE_LAND_MONS_SLOT_2)
         return 2;
-    if (rand >= 50 && rand < 60)    //10% chance
+    else if (rand >= ENCOUNTER_CHANCE_LAND_MONS_SLOT_2 && rand < ENCOUNTER_CHANCE_LAND_MONS_SLOT_3)
         return 3;
-    if (rand >= 60 && rand < 70)    //10% chance
+    else if (rand >= ENCOUNTER_CHANCE_LAND_MONS_SLOT_3 && rand < ENCOUNTER_CHANCE_LAND_MONS_SLOT_4)
         return 4;
-    if (rand >= 70 && rand < 80)    //10% chance
+    else if (rand >= ENCOUNTER_CHANCE_LAND_MONS_SLOT_4 && rand < ENCOUNTER_CHANCE_LAND_MONS_SLOT_5)
         return 5;
-    if (rand >= 80 && rand < 85)    //5% chance
+    else if (rand >= ENCOUNTER_CHANCE_LAND_MONS_SLOT_5 && rand < ENCOUNTER_CHANCE_LAND_MONS_SLOT_6)
         return 6;
-    if (rand >= 85 && rand < 90)    //5% chance
+    else if (rand >= ENCOUNTER_CHANCE_LAND_MONS_SLOT_6 && rand < ENCOUNTER_CHANCE_LAND_MONS_SLOT_7)
         return 7;
-    if (rand >= 90 && rand < 94)    //4% chance
+    else if (rand >= ENCOUNTER_CHANCE_LAND_MONS_SLOT_7 && rand < ENCOUNTER_CHANCE_LAND_MONS_SLOT_8)
         return 8;
-    if (rand >= 94 && rand < 98)    //4% chance
+    else if (rand >= ENCOUNTER_CHANCE_LAND_MONS_SLOT_8 && rand < ENCOUNTER_CHANCE_LAND_MONS_SLOT_9)
         return 9;
-    if (rand == 98)                 //1% chance
+    else if (rand == ENCOUNTER_CHANCE_LAND_MONS_SLOT_9)
         return 10;
-    else                            //1% chance
+    else
         return 11;
 }
 
 static u8 ChooseWildMonIndex_Water(void)
 {
-    u8 rand = Random() % 100;
+    u8 rand = Random() % ENCOUNTER_CHANCE_WATER_MONS_TOTAL;
 
-    if (rand < 60)                  //60% chance
+    if (rand < ENCOUNTER_CHANCE_WATER_MONS_SLOT_0)
         return 0;
-    if (rand >= 60 && rand < 90)    //30% chance
+    else if (rand >= ENCOUNTER_CHANCE_WATER_MONS_SLOT_0 && rand < ENCOUNTER_CHANCE_WATER_MONS_SLOT_1)
         return 1;
-    if (rand >= 90 && rand < 95)    //5% chance
+    else if (rand >= ENCOUNTER_CHANCE_WATER_MONS_SLOT_1 && rand < ENCOUNTER_CHANCE_WATER_MONS_SLOT_2)
         return 2;
-    if (rand >= 95 && rand < 99)    //4% chance
+    else if (rand >= ENCOUNTER_CHANCE_WATER_MONS_SLOT_2 && rand < ENCOUNTER_CHANCE_WATER_MONS_SLOT_3)
         return 3;
-    else                            //1% chance
+    else
         return 4;
 }
 
@@ -208,29 +208,29 @@ static u8 ChooseWildMonIndex_Fishing(u8 rod)
     switch (rod)
     {
     case OLD_ROD:
-        if (rand < 70)  //70% chance
+        if (rand < ENCOUNTER_CHANCE_FISHING_MONS_SLOT_0)
             wildMonIndex = 0;
-        else            //30% chance
+        else
             wildMonIndex = 1;
         break;
     case GOOD_ROD:
-        if (rand < 60)                  //60% chance
+        if (rand < ENCOUNTER_CHANCE_FISHING_MONS_SLOT_2)
             wildMonIndex = 2;
-        if (rand >= 60 && rand < 80)    //20% chance
+        if (rand >= ENCOUNTER_CHANCE_FISHING_MONS_SLOT_2 && rand < ENCOUNTER_CHANCE_FISHING_MONS_SLOT_3)
             wildMonIndex = 3;
-        if (rand >= 80 && rand < 100)   //20% chance
+        if (rand >= ENCOUNTER_CHANCE_FISHING_MONS_SLOT_3 && rand < ENCOUNTER_CHANCE_FISHING_MONS_SLOT_4)
             wildMonIndex = 4;
         break;
     case SUPER_ROD:
-        if (rand < 40)                  //40% chance
+        if (rand < ENCOUNTER_CHANCE_FISHING_MONS_SLOT_5)
             wildMonIndex = 5;
-        if (rand >= 40 && rand < 80)    //40% chance
+        if (rand >= ENCOUNTER_CHANCE_FISHING_MONS_SLOT_5 && rand < ENCOUNTER_CHANCE_FISHING_MONS_SLOT_6)
             wildMonIndex = 6;
-        if (rand >= 80 && rand < 95)    //15% chance
+        if (rand >= ENCOUNTER_CHANCE_FISHING_MONS_SLOT_6 && rand < ENCOUNTER_CHANCE_FISHING_MONS_SLOT_7)
             wildMonIndex = 7;
-        if (rand >= 95 && rand < 99)    //4% chance
+        if (rand >= ENCOUNTER_CHANCE_FISHING_MONS_SLOT_7 && rand < ENCOUNTER_CHANCE_FISHING_MONS_SLOT_8)
             wildMonIndex = 8;
-        if (rand == 99)                 //1% chance
+        if (rand == ENCOUNTER_CHANCE_FISHING_MONS_SLOT_8)
             wildMonIndex = 9;
         break;
     }