Merge branch 'master' into scaninc

1 files changed, 0 insertions, 52 deletions

diff --git a/src/egg_hatch.c b/src/egg_hatch.c
deleted file mode 100644
index 32fbe1547..000000000
--- a/src/egg_hatch.c
+++ /dev/null
@@ -1,52 +0,0 @@
-#include "global.h"
-#include "pokemon.h"
-
-void CreatedHatchedMon(struct Pokemon *egg, struct Pokemon *temp) {
-    u16 species;
-    u32 personality, pokerus;
-    u8 i, friendship, language, gameMet, markings;
-    u16 moves[4];
-    u32 ivs[6];
-
-
-    species = GetMonData(egg, MON_DATA_SPECIES);
-
-    for (i = 0; i < 4; i++)
-    {
-        moves[i] = GetMonData(egg, MON_DATA_MOVE1 + i);
-    }
-
-    personality = GetMonData(egg, MON_DATA_PERSONALITY);
-
-    for (i = 0; i < 6; i++)
-    {
-        ivs[i] = GetMonData(egg, MON_DATA_HP_IV + i);
-    }
-
-    gameMet = GetMonData(egg, MON_DATA_MET_GAME);
-    markings = GetMonData(egg, MON_DATA_MARKINGS);
-    pokerus = GetMonData(egg, MON_DATA_POKERUS);
-
-    CreateMon(temp, species, 5, 32, TRUE, personality, 0, 0);
-
-    for (i = 0; i < 4; i++)
-    {
-        SetMonData(temp, MON_DATA_MOVE1 + i, (const u8 *) &moves[i]);
-    }
-
-    for (i = 0; i < 6; i++)
-    {
-        SetMonData(temp, MON_DATA_HP_IV + i, (const u8 *) &ivs[i]);
-    }
-
-    language = GAME_LANGUAGE;
-    SetMonData(temp, MON_DATA_LANGUAGE, &language);
-    SetMonData(temp, MON_DATA_MET_GAME, &gameMet);
-    SetMonData(temp, MON_DATA_MARKINGS, &markings);
-
-    friendship = 120;
-    SetMonData(temp, MON_DATA_FRIENDSHIP, &friendship);
-    SetMonData(temp, MON_DATA_POKERUS, (const u8 *) &pokerus);
-
-    *egg = *temp;
-}