Merge pull request #122 from ultima-soul/data_dump

Port/dump some data and convert to C

1 files changed, 33 insertions, 33 deletions

diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c
index b07a46c7d..f3492593c 100644
--- a/src/pokemon_icon.c
+++ b/src/pokemon_icon.c
@@ -56,10 +56,10 @@ const u8 *const gMonIconTable[] = {
     [SPECIES_RAICHU]      = gMonIcon_Raichu,
     [SPECIES_SANDSHREW]   = gMonIcon_Sandshrew,
     [SPECIES_SANDSLASH]   = gMonIcon_Sandslash,
-    [SPECIES_NIDORAN_F]   = gMonIcon_Nidoran_f,
+    [SPECIES_NIDORAN_F]   = gMonIcon_NidoranF,
     [SPECIES_NIDORINA]    = gMonIcon_Nidorina,
     [SPECIES_NIDOQUEEN]   = gMonIcon_Nidoqueen,
-    [SPECIES_NIDORAN_M]   = gMonIcon_Nidoran_m,
+    [SPECIES_NIDORAN_M]   = gMonIcon_NidoranM,
     [SPECIES_NIDORINO]    = gMonIcon_Nidorino,
     [SPECIES_NIDOKING]    = gMonIcon_Nidoking,
     [SPECIES_CLEFAIRY]    = gMonIcon_Clefairy,
@@ -110,7 +110,7 @@ const u8 *const gMonIconTable[] = {
     [SPECIES_SLOWBRO]     = gMonIcon_Slowbro,
     [SPECIES_MAGNEMITE]   = gMonIcon_Magnemite,
     [SPECIES_MAGNETON]    = gMonIcon_Magneton,
-    [SPECIES_FARFETCHD]   = gMonIcon_Farfetch_d,
+    [SPECIES_FARFETCHD]   = gMonIcon_Farfetchd,
     [SPECIES_DODUO]       = gMonIcon_Doduo,
     [SPECIES_DODRIO]      = gMonIcon_Dodrio,
     [SPECIES_SEEL]        = gMonIcon_Seel,
@@ -149,7 +149,7 @@ const u8 *const gMonIconTable[] = {
     [SPECIES_SEAKING]     = gMonIcon_Seaking,
     [SPECIES_STARYU]      = gMonIcon_Staryu,
     [SPECIES_STARMIE]     = gMonIcon_Starmie,
-    [SPECIES_MR_MIME]     = gMonIcon_Mr_Mime,
+    [SPECIES_MR_MIME]     = gMonIcon_Mrmime,
     [SPECIES_SCYTHER]     = gMonIcon_Scyther,
     [SPECIES_JYNX]        = gMonIcon_Jynx,
     [SPECIES_ELECTABUZZ]  = gMonIcon_Electabuzz,
@@ -228,7 +228,7 @@ const u8 *const gMonIconTable[] = {
     [SPECIES_MURKROW]     = gMonIcon_Murkrow,
     [SPECIES_SLOWKING]    = gMonIcon_Slowking,
     [SPECIES_MISDREAVUS]  = gMonIcon_Misdreavus,
-    [SPECIES_UNOWN]       = gMonIcon_Unown_A,
+    [SPECIES_UNOWN]       = gMonIcon_UnownA,
     [SPECIES_WOBBUFFET]   = gMonIcon_Wobbuffet,
     [SPECIES_GIRAFARIG]   = gMonIcon_Girafarig,
     [SPECIES_PINECO]      = gMonIcon_Pineco,
@@ -277,7 +277,7 @@ const u8 *const gMonIconTable[] = {
     [SPECIES_PUPITAR]     = gMonIcon_Pupitar,
     [SPECIES_TYRANITAR]   = gMonIcon_Tyranitar,
     [SPECIES_LUGIA]       = gMonIcon_Lugia,
-    [SPECIES_HO_OH]       = gMonIcon_Ho_Oh,
+    [SPECIES_HO_OH]       = gMonIcon_HoOh,
     [SPECIES_CELEBI]      = gMonIcon_Celebi,
     [SPECIES_OLD_UNOWN_B] = gMonIcon_QuestionMark,
     [SPECIES_OLD_UNOWN_C] = gMonIcon_QuestionMark,
@@ -440,33 +440,33 @@ const u8 *const gMonIconTable[] = {
     [SPECIES_DEOXYS]      = gMonIcon_Deoxys,
     [SPECIES_CHIMECHO]    = gMonIcon_Chimecho,
     [SPECIES_EGG]         = gMonIcon_Egg,
-    [SPECIES_UNOWN_B]     = gMonIcon_Unown_B,
-    [SPECIES_UNOWN_C]     = gMonIcon_Unown_C,
-    [SPECIES_UNOWN_D]     = gMonIcon_Unown_D,
-    [SPECIES_UNOWN_E]     = gMonIcon_Unown_E,
-    [SPECIES_UNOWN_F]     = gMonIcon_Unown_F,
-    [SPECIES_UNOWN_G]     = gMonIcon_Unown_G,
-    [SPECIES_UNOWN_H]     = gMonIcon_Unown_H,
-    [SPECIES_UNOWN_I]     = gMonIcon_Unown_I,
-    [SPECIES_UNOWN_J]     = gMonIcon_Unown_J,
-    [SPECIES_UNOWN_K]     = gMonIcon_Unown_K,
-    [SPECIES_UNOWN_L]     = gMonIcon_Unown_L,
-    [SPECIES_UNOWN_M]     = gMonIcon_Unown_M,
-    [SPECIES_UNOWN_N]     = gMonIcon_Unown_N,
-    [SPECIES_UNOWN_O]     = gMonIcon_Unown_O,
-    [SPECIES_UNOWN_P]     = gMonIcon_Unown_P,
-    [SPECIES_UNOWN_Q]     = gMonIcon_Unown_Q,
-    [SPECIES_UNOWN_R]     = gMonIcon_Unown_R,
-    [SPECIES_UNOWN_S]     = gMonIcon_Unown_S,
-    [SPECIES_UNOWN_T]     = gMonIcon_Unown_T,
-    [SPECIES_UNOWN_U]     = gMonIcon_Unown_U,
-    [SPECIES_UNOWN_V]     = gMonIcon_Unown_V,
-    [SPECIES_UNOWN_W]     = gMonIcon_Unown_W,
-    [SPECIES_UNOWN_X]     = gMonIcon_Unown_X,
-    [SPECIES_UNOWN_Y]     = gMonIcon_Unown_Y,
-    [SPECIES_UNOWN_Z]     = gMonIcon_Unown_Z,
-    [SPECIES_UNOWN_EMARK] = gMonIcon_Unown_ExclamationMark,
-    [SPECIES_UNOWN_QMARK] = gMonIcon_Unown_QuestionMark
+    [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[] = {