dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Use species defines in gMonIconTable

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