merge

35 files changed, 1426 insertions, 76 deletions

diff --git a/include/battle.h b/include/battle.h
index 47cb7cf8e..2b6773660 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -243,12 +243,11 @@ struct BattleStruct /* 0x2000000 */
     /*0x16001*/ u8 turnEffectsBank;
     /*0x16002*/ u8 animTurn;
     /*0x16003*/ u8 scriptingActive;
-    /*0x16004*/ u8 wrappedMove1[4];
-    /*0x16008*/ u8 wrappedMove2[4];
+    /*0x16004*/ u8 wrappedMove[8];
     /*0x1600C*/ u8 cmd49StateTracker;
     /*0x1600D*/ u8 unk1600D;
     /*0x1600E*/ u8 turncountersTracker;
-    /*0x1600F*/ u8 cmd23StateTracker;
+    /*0x1600F*/ u8 atk23StateTracker;
     /*0x16010*/ u8 moveTarget[4];
     /*0x16014*/ u8 unk16014;
     /*0x16015*/ u8 unk16015;
diff --git a/include/data/field_map_obj/anim_func_ptrs.h b/include/data/field_map_obj/anim_func_ptrs.h
index 63575727d..1d1fac71e 100644
--- a/include/data/field_map_obj/anim_func_ptrs.h
+++ b/include/data/field_map_obj/anim_func_ptrs.h
@@ -1,5 +1,5 @@
 //
-// Created by scott on 6/18/2017.
+
 //
 
 #ifndef POKERUBY_ANIM_FUNC_PTRS_H
diff --git a/include/data/field_map_obj/base_oam.h b/include/data/field_map_obj/base_oam.h
index 8595f97e7..49c14e8c2 100644
--- a/include/data/field_map_obj/base_oam.h
+++ b/include/data/field_map_obj/base_oam.h
@@ -1,5 +1,5 @@
 //
-// Created by scott on 6/17/2017.
+
 //
 
 #ifndef POKERUBY_BASE_OAM_H
diff --git a/include/data/field_map_obj/berry_tree_graphics_tables.h b/include/data/field_map_obj/berry_tree_graphics_tables.h
index 53a0fd482..5b60fee6f 100644
--- a/include/data/field_map_obj/berry_tree_graphics_tables.h
+++ b/include/data/field_map_obj/berry_tree_graphics_tables.h
@@ -1,5 +1,5 @@
 //
-// Created by scott on 6/17/2017.
+
 //
 
 #ifndef POKERUBY_BERRY_TREE_GRAPHICS_TABLES_H
diff --git a/include/data/field_map_obj/callback_subroutine_pointers.h b/include/data/field_map_obj/callback_subroutine_pointers.h
index d24a47184..a324066b7 100644
--- a/include/data/field_map_obj/callback_subroutine_pointers.h
+++ b/include/data/field_map_obj/callback_subroutine_pointers.h
@@ -1,5 +1,5 @@
 //
-// Created by scott on 6/18/2017.
+
 //
 
 #ifndef POKERUBY_CALLBACK_SUBROUTINE_POINTERS_H
@@ -394,7 +394,7 @@ u8 (*const gUnknown_08375588[])(struct MapObject *, struct Sprite *) = {
     sub_805F3C4
 };
 
-u8 (*const gUnknown_08375594[])(struct MapObject *, struct Sprite *, u8, bool8 (*const)(u8)) = {
+u8 (*const gUnknown_08375594[])(struct MapObject *, struct Sprite *, u8, bool8(u8)) = {
     sub_805F3EC,
     sub_805F3F0,
     sub_805F438,
diff --git a/include/data/field_map_obj/field_effect_object_template_pointers.h b/include/data/field_map_obj/field_effect_object_template_pointers.h
index 8e19747ce..320af1ff8 100644
--- a/include/data/field_map_obj/field_effect_object_template_pointers.h
+++ b/include/data/field_map_obj/field_effect_object_template_pointers.h
@@ -1,5 +1,5 @@
 //
-// Created by scott on 6/17/2017.
+
 //
 
 #ifndef POKERUBY_FIELD_EFFECT_OBJECT_TEMPLATE_POINTERS_H
diff --git a/include/data/field_map_obj/field_effect_objects.h b/include/data/field_map_obj/field_effect_objects.h
index dc8a38542..9d3ae343d 100644
--- a/include/data/field_map_obj/field_effect_objects.h
+++ b/include/data/field_map_obj/field_effect_objects.h
@@ -1,5 +1,5 @@
 //
-// Created by scott on 6/17/2017.
+
 //
 
 #ifndef POKERUBY_FIELD_EFFECT_OBJECTS_H
diff --git a/include/data/field_map_obj/map_object_anims.h b/include/data/field_map_obj/map_object_anims.h
index 0d6e299ee..0993f3efd 100644
--- a/include/data/field_map_obj/map_object_anims.h
+++ b/include/data/field_map_obj/map_object_anims.h
@@ -1,5 +1,5 @@
 //
-// Created by scott on 6/17/2017.
+
 //
 
 #ifndef POKERUBY_MAP_OBJECT_ANIMS_H
diff --git a/include/data/field_map_obj/map_object_graphics_info.h b/include/data/field_map_obj/map_object_graphics_info.h
index 818c5b90c..7b021b66d 100644
--- a/include/data/field_map_obj/map_object_graphics_info.h
+++ b/include/data/field_map_obj/map_object_graphics_info.h
@@ -1,5 +1,5 @@
 //
-// Created by scott on 6/17/2017.
+
 //
 
 #ifndef POKERUBY_MAP_OBJECT_GRAPHICS_INFO_H
diff --git a/include/data/field_map_obj/map_object_graphics_info_pointers.h b/include/data/field_map_obj/map_object_graphics_info_pointers.h
index c36827709..22a052b0d 100644
--- a/include/data/field_map_obj/map_object_graphics_info_pointers.h
+++ b/include/data/field_map_obj/map_object_graphics_info_pointers.h
@@ -1,5 +1,5 @@
 //
-// Created by scott on 6/17/2017.
+
 //
 
 #ifndef POKERUBY_MAP_OBJECT_GRAPHICS_INFO_POINTERS_H
diff --git a/include/data/field_map_obj/map_object_pic_tables.h b/include/data/field_map_obj/map_object_pic_tables.h
index 37d579512..ecb5c8836 100644
--- a/include/data/field_map_obj/map_object_pic_tables.h
+++ b/include/data/field_map_obj/map_object_pic_tables.h
@@ -1,5 +1,5 @@
 //
-// Created by scott on 6/17/2017.
+
 //
 
 #ifndef POKERUBY_MAP_OBJECT_PIC_TABLES_H
diff --git a/include/data/field_map_obj/map_object_subsprites.h b/include/data/field_map_obj/map_object_subsprites.h
index f928db88a..951d71e99 100644
--- a/include/data/field_map_obj/map_object_subsprites.h
+++ b/include/data/field_map_obj/map_object_subsprites.h
@@ -1,5 +1,5 @@
 //
-// Created by scott on 6/17/2017.
+
 //
 
 #ifndef POKERUBY_MAP_OBJECT_SUBSPRITES_H
diff --git a/include/data/pokemon/base_stats.h b/include/data/pokemon/base_stats.h
index eadfbfe30..37f59e1c6 100644
--- a/include/data/pokemon/base_stats.h
+++ b/include/data/pokemon/base_stats.h
@@ -1,5 +1,5 @@
 //
-// Created by Scott Norton on 6/27/17.
+
 //
 
 #ifndef POKERUBY_BASE_STATS_H
diff --git a/include/data/pokemon/cry_ids.h b/include/data/pokemon/cry_ids.h
index d965a41cf..6207a92f0 100644
--- a/include/data/pokemon/cry_ids.h
+++ b/include/data/pokemon/cry_ids.h
@@ -1,5 +1,5 @@
 //
-// Created by Scott Norton on 6/27/17.
+
 //
 
 #ifndef POKERUBY_CRY_IDS_H
diff --git a/include/data/pokemon/dex_order.h b/include/data/pokemon/dex_order.h
index 6f8582533..cbb7182ed 100644
--- a/include/data/pokemon/dex_order.h
+++ b/include/data/pokemon/dex_order.h
@@ -1,5 +1,5 @@
 //
-// Created by Scott Norton on 6/27/17.
+
 //
 
 #ifndef POKERUBY_DEX_ORDER_H
diff --git a/include/data/pokemon/egg_moves.h b/include/data/pokemon/egg_moves.h
new file mode 100644
index 000000000..ab1b1dd33
--- /dev/null
+++ b/include/data/pokemon/egg_moves.h
@@ -0,0 +1,1318 @@
+//
+
+//
+
+#ifndef POKERUBY_DAYCARE_H
+#define POKERUBY_DAYCARE_H
+
+#define EGG_MOVES_SPECIES_OFFSET 20000
+#define egg_moves(species, moves...) (SPECIES_##species + EGG_MOVES_SPECIES_OFFSET), moves
+
+#endif //POKERUBY_DAYCARE_H
+
+const u16 gEggMoves[] = {
+    egg_moves(BULBASAUR,
+              MOVE_LIGHT_SCREEN,
+              MOVE_SKULL_BASH,
+              MOVE_SAFEGUARD,
+              MOVE_CHARM,
+              MOVE_PETAL_DANCE,
+              MOVE_MAGICAL_LEAF,
+              MOVE_GRASS_WHISTLE,
+              MOVE_CURSE),
+
+    egg_moves(CHARMANDER,
+              MOVE_BELLY_DRUM,
+              MOVE_ANCIENT_POWER,
+              MOVE_ROCK_SLIDE,
+              MOVE_BITE,
+              MOVE_OUTRAGE,
+              MOVE_BEAT_UP,
+              MOVE_SWORDS_DANCE,
+              MOVE_DRAGON_DANCE),
+
+    egg_moves(SQUIRTLE,
+              MOVE_MIRROR_COAT,
+              MOVE_HAZE,
+              MOVE_MIST,
+              MOVE_FORESIGHT,
+              MOVE_FLAIL,
+              MOVE_REFRESH,
+              MOVE_MUD_SPORT,
+              MOVE_YAWN),
+
+    egg_moves(PIDGEY,
+              MOVE_PURSUIT,
+              MOVE_FAINT_ATTACK,
+              MOVE_FORESIGHT,
+              MOVE_STEEL_WING,
+              MOVE_AIR_CUTTER),
+
+    egg_moves(RATTATA,
+              MOVE_SCREECH,
+              MOVE_FLAME_WHEEL,
+              MOVE_FURY_SWIPES,
+              MOVE_BITE,
+              MOVE_COUNTER,
+              MOVE_REVERSAL,
+              MOVE_UPROAR,
+              MOVE_SWAGGER),
+
+    egg_moves(SPEAROW,
+              MOVE_FAINT_ATTACK,
+              MOVE_FALSE_SWIPE,
+              MOVE_SCARY_FACE,
+              MOVE_QUICK_ATTACK,
+              MOVE_TRI_ATTACK,
+              MOVE_ASTONISH,
+              MOVE_SKY_ATTACK),
+
+    egg_moves(EKANS,
+              MOVE_PURSUIT,
+              MOVE_SLAM,
+              MOVE_SPITE,
+              MOVE_BEAT_UP,
+              MOVE_POISON_FANG),
+
+    egg_moves(SANDSHREW,
+              MOVE_FLAIL,
+              MOVE_SAFEGUARD,
+              MOVE_COUNTER,
+              MOVE_RAPID_SPIN,
+              MOVE_ROCK_SLIDE,
+              MOVE_METAL_CLAW,
+              MOVE_SWORDS_DANCE,
+              MOVE_CRUSH_CLAW),
+
+    egg_moves(NIDORAN_F,
+              MOVE_SUPERSONIC,
+              MOVE_DISABLE,
+              MOVE_TAKE_DOWN,
+              MOVE_FOCUS_ENERGY,
+              MOVE_CHARM,
+              MOVE_COUNTER,
+              MOVE_BEAT_UP),
+
+    egg_moves(NIDORAN_M,
+              MOVE_COUNTER,
+              MOVE_DISABLE,
+              MOVE_SUPERSONIC,
+              MOVE_TAKE_DOWN,
+              MOVE_AMNESIA,
+              MOVE_CONFUSION,
+              MOVE_BEAT_UP),
+
+    egg_moves(VULPIX,
+              MOVE_FAINT_ATTACK,
+              MOVE_HYPNOSIS,
+              MOVE_FLAIL,
+              MOVE_SPITE,
+              MOVE_DISABLE,
+              MOVE_HOWL,
+              MOVE_PSYCH_UP,
+              MOVE_HEAT_WAVE),
+
+    egg_moves(ZUBAT,
+              MOVE_QUICK_ATTACK,
+              MOVE_PURSUIT,
+              MOVE_FAINT_ATTACK,
+              MOVE_GUST,
+              MOVE_WHIRLWIND,
+              MOVE_CURSE),
+
+    egg_moves(ODDISH,
+              MOVE_SWORDS_DANCE,
+              MOVE_RAZOR_LEAF,
+              MOVE_FLAIL,
+              MOVE_SYNTHESIS,
+              MOVE_CHARM,
+              MOVE_INGRAIN),
+
+    egg_moves(PARAS,
+              MOVE_FALSE_SWIPE,
+              MOVE_SCREECH,
+              MOVE_COUNTER,
+              MOVE_PSYBEAM,
+              MOVE_FLAIL,
+              MOVE_SWEET_SCENT,
+              MOVE_LIGHT_SCREEN,
+              MOVE_PURSUIT),
+
+    egg_moves(VENONAT,
+              MOVE_BATON_PASS,
+              MOVE_SCREECH,
+              MOVE_GIGA_DRAIN,
+              MOVE_SIGNAL_BEAM),
+
+    egg_moves(DIGLETT,
+              MOVE_FAINT_ATTACK,
+              MOVE_SCREECH,
+              MOVE_ANCIENT_POWER,
+              MOVE_PURSUIT,
+              MOVE_BEAT_UP,
+              MOVE_UPROAR,
+              MOVE_ROCK_SLIDE),
+
+    egg_moves(MEOWTH,
+              MOVE_SPITE,
+              MOVE_CHARM,
+              MOVE_HYPNOSIS,
+              MOVE_AMNESIA,
+              MOVE_PSYCH_UP,
+              MOVE_ASSIST),
+
+    egg_moves(PSYDUCK,
+              MOVE_HYPNOSIS,
+              MOVE_PSYBEAM,
+              MOVE_FORESIGHT,
+              MOVE_LIGHT_SCREEN,
+              MOVE_FUTURE_SIGHT,
+              MOVE_PSYCHIC,
+              MOVE_CROSS_CHOP,
+              MOVE_REFRESH),
+
+    egg_moves(MANKEY,
+              MOVE_ROCK_SLIDE,
+              MOVE_FORESIGHT,
+              MOVE_MEDITATE,
+              MOVE_COUNTER,
+              MOVE_REVERSAL,
+              MOVE_BEAT_UP,
+              MOVE_REVENGE,
+              MOVE_SMELLING_SALT),
+
+    egg_moves(GROWLITHE,
+              MOVE_BODY_SLAM,
+              MOVE_SAFEGUARD,
+              MOVE_CRUNCH,
+              MOVE_THRASH,
+              MOVE_FIRE_SPIN,
+              MOVE_HOWL,
+              MOVE_HEAT_WAVE),
+
+    egg_moves(POLIWAG,
+              MOVE_MIST,
+              MOVE_SPLASH,
+              MOVE_BUBBLE_BEAM,
+              MOVE_HAZE,
+              MOVE_MIND_READER,
+              MOVE_WATER_SPORT,
+              MOVE_ICE_BALL),
+
+    egg_moves(ABRA,
+              MOVE_ENCORE,
+              MOVE_BARRIER,
+              MOVE_KNOCK_OFF,
+              MOVE_FIRE_PUNCH,
+              MOVE_THUNDER_PUNCH,
+              MOVE_ICE_PUNCH),
+
+    egg_moves(MACHOP,
+              MOVE_LIGHT_SCREEN,
+              MOVE_MEDITATE,
+              MOVE_ROLLING_KICK,
+              MOVE_ENCORE,
+              MOVE_SMELLING_SALT,
+              MOVE_COUNTER,
+              MOVE_ROCK_SLIDE),
+
+    egg_moves(BELLSPROUT,
+              MOVE_SWORDS_DANCE,
+              MOVE_ENCORE,
+              MOVE_REFLECT,
+              MOVE_SYNTHESIS,
+              MOVE_LEECH_LIFE,
+              MOVE_INGRAIN,
+              MOVE_MAGICAL_LEAF),
+
+    egg_moves(TENTACOOL,
+              MOVE_AURORA_BEAM,
+              MOVE_MIRROR_COAT,
+              MOVE_RAPID_SPIN,
+              MOVE_HAZE,
+              MOVE_SAFEGUARD,
+              MOVE_CONFUSE_RAY),
+
+    egg_moves(GEODUDE,
+              MOVE_MEGA_PUNCH,
+              MOVE_ROCK_SLIDE,
+              MOVE_BLOCK),
+
+    egg_moves(PONYTA,
+              MOVE_FLAME_WHEEL,
+              MOVE_THRASH,
+              MOVE_DOUBLE_KICK,
+              MOVE_HYPNOSIS,
+              MOVE_CHARM,
+              MOVE_DOUBLE_EDGE),
+
+    egg_moves(SLOWPOKE,
+              MOVE_SAFEGUARD,
+              MOVE_BELLY_DRUM,
+              MOVE_FUTURE_SIGHT,
+              MOVE_STOMP,
+              MOVE_MUD_SPORT,
+              MOVE_SLEEP_TALK,
+              MOVE_SNORE),
+
+    egg_moves(FARFETCHD,
+              MOVE_STEEL_WING,
+              MOVE_FORESIGHT,
+              MOVE_MIRROR_MOVE,
+              MOVE_GUST,
+              MOVE_QUICK_ATTACK,
+              MOVE_FLAIL,
+              MOVE_FEATHER_DANCE,
+              MOVE_CURSE),
+
+    egg_moves(DODUO,
+              MOVE_QUICK_ATTACK,
+              MOVE_SUPERSONIC,
+              MOVE_HAZE,
+              MOVE_FAINT_ATTACK,
+              MOVE_FLAIL,
+              MOVE_ENDEAVOR),
+
+    egg_moves(SEEL,
+              MOVE_LICK,
+              MOVE_PERISH_SONG,
+              MOVE_DISABLE,
+              MOVE_HORN_DRILL,
+              MOVE_SLAM,
+              MOVE_ENCORE,
+              MOVE_FAKE_OUT,
+              MOVE_ICICLE_SPEAR),
+
+    egg_moves(GRIMER,
+              MOVE_HAZE,
+              MOVE_MEAN_LOOK,
+              MOVE_LICK,
+              MOVE_IMPRISON,
+              MOVE_CURSE,
+              MOVE_SHADOW_PUNCH,
+              MOVE_EXPLOSION),
+
+    egg_moves(SHELLDER,
+              MOVE_BUBBLE_BEAM,
+              MOVE_TAKE_DOWN,
+              MOVE_BARRIER,
+              MOVE_RAPID_SPIN,
+              MOVE_SCREECH,
+              MOVE_ICICLE_SPEAR),
+
+    egg_moves(GASTLY,
+              MOVE_PSYWAVE,
+              MOVE_PERISH_SONG,
+              MOVE_HAZE,
+              MOVE_ASTONISH,
+              MOVE_WILL_O_WISP,
+              MOVE_GRUDGE,
+              MOVE_EXPLOSION),
+
+    egg_moves(ONIX,
+              MOVE_ROCK_SLIDE,
+              MOVE_FLAIL,
+              MOVE_EXPLOSION,
+              MOVE_BLOCK),
+
+    egg_moves(DROWZEE,
+              MOVE_BARRIER,
+              MOVE_ASSIST,
+              MOVE_ROLE_PLAY,
+              MOVE_FIRE_PUNCH,
+              MOVE_THUNDER_PUNCH,
+              MOVE_ICE_PUNCH),
+
+    egg_moves(KRABBY,
+              MOVE_DIG,
+              MOVE_HAZE,
+              MOVE_AMNESIA,
+              MOVE_FLAIL,
+              MOVE_SLAM,
+              MOVE_KNOCK_OFF,
+              MOVE_SWORDS_DANCE),
+
+    egg_moves(EXEGGCUTE,
+              MOVE_SYNTHESIS,
+              MOVE_MOONLIGHT,
+              MOVE_REFLECT,
+              MOVE_ANCIENT_POWER,
+              MOVE_PSYCH_UP,
+              MOVE_INGRAIN,
+              MOVE_CURSE),
+
+    egg_moves(CUBONE,
+              MOVE_ROCK_SLIDE,
+              MOVE_ANCIENT_POWER,
+              MOVE_BELLY_DRUM,
+              MOVE_SCREECH,
+              MOVE_SKULL_BASH,
+              MOVE_PERISH_SONG,
+              MOVE_SWORDS_DANCE),
+
+    egg_moves(LICKITUNG,
+              MOVE_BELLY_DRUM,
+              MOVE_MAGNITUDE,
+              MOVE_BODY_SLAM,
+              MOVE_CURSE,
+              MOVE_SMELLING_SALT,
+              MOVE_SLEEP_TALK,
+              MOVE_SNORE,
+              MOVE_SUBSTITUTE),
+
+    egg_moves(KOFFING,
+              MOVE_SCREECH,
+              MOVE_PSYWAVE,
+              MOVE_PSYBEAM,
+              MOVE_DESTINY_BOND,
+              MOVE_PAIN_SPLIT,
+              MOVE_WILL_O_WISP),
+
+    egg_moves(RHYHORN,
+              MOVE_CRUNCH,
+              MOVE_REVERSAL,
+              MOVE_ROCK_SLIDE,
+              MOVE_COUNTER,
+              MOVE_MAGNITUDE,
+              MOVE_SWORDS_DANCE,
+              MOVE_CURSE,
+              MOVE_CRUSH_CLAW),
+
+    egg_moves(CHANSEY,
+              MOVE_PRESENT,
+              MOVE_METRONOME,
+              MOVE_HEAL_BELL,
+              MOVE_AROMATHERAPY,
+              MOVE_SUBSTITUTE),
+
+    egg_moves(TANGELA,
+              MOVE_FLAIL,
+              MOVE_CONFUSION,
+              MOVE_MEGA_DRAIN,
+              MOVE_REFLECT,
+              MOVE_AMNESIA,
+              MOVE_LEECH_SEED,
+              MOVE_NATURE_POWER),
+
+    egg_moves(KANGASKHAN,
+              MOVE_STOMP,
+              MOVE_FORESIGHT,
+              MOVE_FOCUS_ENERGY,
+              MOVE_SAFEGUARD,
+              MOVE_DISABLE,
+              MOVE_COUNTER,
+              MOVE_CRUSH_CLAW,
+              MOVE_SUBSTITUTE),
+
+    egg_moves(HORSEA,
+              MOVE_FLAIL,
+              MOVE_AURORA_BEAM,
+              MOVE_OCTAZOOKA,
+              MOVE_DISABLE,
+              MOVE_SPLASH,
+              MOVE_DRAGON_RAGE,
+              MOVE_DRAGON_BREATH),
+
+    egg_moves(GOLDEEN,
+              MOVE_PSYBEAM,
+              MOVE_HAZE,
+              MOVE_HYDRO_PUMP,
+              MOVE_SLEEP_TALK,
+              MOVE_MUD_SPORT),
+
+    egg_moves(MR_MIME,
+              MOVE_FUTURE_SIGHT,
+              MOVE_HYPNOSIS,
+              MOVE_MIMIC,
+              MOVE_PSYCH_UP,
+              MOVE_FAKE_OUT,
+              MOVE_TRICK),
+
+    egg_moves(SCYTHER,
+              MOVE_COUNTER,
+              MOVE_SAFEGUARD,
+              MOVE_BATON_PASS,
+              MOVE_RAZOR_WIND,
+              MOVE_REVERSAL,
+              MOVE_LIGHT_SCREEN,
+              MOVE_ENDURE,
+              MOVE_SILVER_WIND),
+
+    egg_moves(PINSIR,
+              MOVE_FURY_ATTACK,
+              MOVE_FLAIL,
+              MOVE_FALSE_SWIPE,
+              MOVE_FAINT_ATTACK),
+
+    egg_moves(LAPRAS,
+              MOVE_FORESIGHT,
+              MOVE_SUBSTITUTE,
+              MOVE_TICKLE,
+              MOVE_REFRESH,
+              MOVE_DRAGON_DANCE,
+              MOVE_CURSE,
+              MOVE_SLEEP_TALK,
+              MOVE_HORN_DRILL),
+
+    egg_moves(EEVEE,
+              MOVE_CHARM,
+              MOVE_FLAIL,
+              MOVE_ENDURE,
+              MOVE_CURSE,
+              MOVE_TICKLE,
+              MOVE_WISH),
+
+    egg_moves(OMANYTE,
+              MOVE_BUBBLE_BEAM,
+              MOVE_AURORA_BEAM,
+              MOVE_SLAM,
+              MOVE_SUPERSONIC,
+              MOVE_HAZE,
+              MOVE_ROCK_SLIDE,
+              MOVE_SPIKES),
+
+    egg_moves(KABUTO,
+              MOVE_BUBBLE_BEAM,
+              MOVE_AURORA_BEAM,
+              MOVE_RAPID_SPIN,
+              MOVE_DIG,
+              MOVE_FLAIL,
+              MOVE_KNOCK_OFF,
+              MOVE_CONFUSE_RAY),
+
+    egg_moves(AERODACTYL,
+              MOVE_WHIRLWIND,
+              MOVE_PURSUIT,
+              MOVE_FORESIGHT,
+              MOVE_STEEL_WING,
+              MOVE_DRAGON_BREATH,
+              MOVE_CURSE),
+
+    egg_moves(SNORLAX,
+              MOVE_LICK,
+              MOVE_CHARM,
+              MOVE_DOUBLE_EDGE,
+              MOVE_CURSE,
+              MOVE_FISSURE,
+              MOVE_SUBSTITUTE),
+
+    egg_moves(DRATINI,
+              MOVE_LIGHT_SCREEN,
+              MOVE_MIST,
+              MOVE_HAZE,
+              MOVE_SUPERSONIC,
+              MOVE_DRAGON_BREATH,
+              MOVE_DRAGON_DANCE),
+
+    egg_moves(CHIKORITA,
+              MOVE_VINE_WHIP,
+              MOVE_LEECH_SEED,
+              MOVE_COUNTER,
+              MOVE_ANCIENT_POWER,
+              MOVE_FLAIL,
+              MOVE_NATURE_POWER,
+              MOVE_INGRAIN,
+              MOVE_GRASS_WHISTLE),
+
+    egg_moves(CYNDAQUIL,
+              MOVE_FURY_SWIPES,
+              MOVE_QUICK_ATTACK,
+              MOVE_REVERSAL,
+              MOVE_THRASH,
+              MOVE_FORESIGHT,
+              MOVE_COVET,
+              MOVE_HOWL,
+              MOVE_CRUSH_CLAW),
+
+    egg_moves(TOTODILE,
+              MOVE_CRUNCH,
+              MOVE_THRASH,
+              MOVE_HYDRO_PUMP,
+              MOVE_ANCIENT_POWER,
+              MOVE_ROCK_SLIDE,
+              MOVE_MUD_SPORT,
+              MOVE_WATER_SPORT,
+              MOVE_DRAGON_CLAW),
+
+    egg_moves(SENTRET,
+              MOVE_DOUBLE_EDGE,
+              MOVE_PURSUIT,
+              MOVE_SLASH,
+              MOVE_FOCUS_ENERGY,
+              MOVE_REVERSAL,
+              MOVE_SUBSTITUTE,
+              MOVE_TRICK,
+              MOVE_ASSIST),
+
+    egg_moves(HOOTHOOT,
+              MOVE_MIRROR_MOVE,
+              MOVE_SUPERSONIC,
+              MOVE_FAINT_ATTACK,
+              MOVE_WING_ATTACK,
+              MOVE_WHIRLWIND,
+              MOVE_SKY_ATTACK,
+              MOVE_FEATHER_DANCE),
+
+    egg_moves(LEDYBA,
+              MOVE_PSYBEAM,
+              MOVE_BIDE,
+              MOVE_SILVER_WIND),
+
+    egg_moves(SPINARAK,
+              MOVE_PSYBEAM,
+              MOVE_DISABLE,
+              MOVE_SONIC_BOOM,
+              MOVE_BATON_PASS,
+              MOVE_PURSUIT,
+              MOVE_SIGNAL_BEAM),
+
+    egg_moves(CHINCHOU,
+              MOVE_FLAIL,
+              MOVE_SCREECH,
+              MOVE_AMNESIA),
+
+    egg_moves(PICHU,
+              MOVE_REVERSAL,
+              MOVE_BIDE,
+              MOVE_PRESENT,
+              MOVE_ENCORE,
+              MOVE_DOUBLE_SLAP,
+              MOVE_WISH,
+              MOVE_CHARGE),
+
+    egg_moves(CLEFFA,
+              MOVE_PRESENT,
+              MOVE_METRONOME,
+              MOVE_AMNESIA,
+              MOVE_BELLY_DRUM,
+              MOVE_SPLASH,
+              MOVE_MIMIC,
+              MOVE_WISH,
+              MOVE_SUBSTITUTE),
+
+    egg_moves(IGGLYBUFF,
+              MOVE_PERISH_SONG,
+              MOVE_PRESENT,
+              MOVE_FAINT_ATTACK,
+              MOVE_WISH,
+              MOVE_FAKE_TEARS),
+
+    egg_moves(TOGEPI,
+              MOVE_PRESENT,
+              MOVE_MIRROR_MOVE,
+              MOVE_PECK,
+              MOVE_FORESIGHT,
+              MOVE_FUTURE_SIGHT,
+              MOVE_SUBSTITUTE,
+              MOVE_PSYCH_UP),
+
+    egg_moves(NATU,
+              MOVE_HAZE,
+              MOVE_DRILL_PECK,
+              MOVE_QUICK_ATTACK,
+              MOVE_FAINT_ATTACK,
+              MOVE_STEEL_WING,
+              MOVE_PSYCH_UP,
+              MOVE_FEATHER_DANCE,
+              MOVE_REFRESH),
+
+    egg_moves(MAREEP,
+              MOVE_TAKE_DOWN,
+              MOVE_BODY_SLAM,
+              MOVE_SAFEGUARD,
+              MOVE_SCREECH,
+              MOVE_REFLECT,
+              MOVE_ODOR_SLEUTH,
+              MOVE_CHARGE),
+
+    egg_moves(MARILL,
+              MOVE_LIGHT_SCREEN,
+              MOVE_PRESENT,
+              MOVE_AMNESIA,
+              MOVE_FUTURE_SIGHT,
+              MOVE_BELLY_DRUM,
+              MOVE_PERISH_SONG,
+              MOVE_SUPERSONIC,
+              MOVE_SUBSTITUTE),
+
+    egg_moves(SUDOWOODO,
+              MOVE_SELF_DESTRUCT),
+
+    egg_moves(HOPPIP,
+              MOVE_CONFUSION,
+              MOVE_ENCORE,
+              MOVE_DOUBLE_EDGE,
+              MOVE_REFLECT,
+              MOVE_AMNESIA,
+              MOVE_HELPING_HAND,
+              MOVE_PSYCH_UP),
+
+    egg_moves(AIPOM,
+              MOVE_COUNTER,
+              MOVE_SCREECH,
+              MOVE_PURSUIT,
+              MOVE_AGILITY,
+              MOVE_SPITE,
+              MOVE_SLAM,
+              MOVE_DOUBLE_SLAP,
+              MOVE_BEAT_UP),
+
+    egg_moves(SUNKERN,
+              MOVE_GRASS_WHISTLE,
+              MOVE_ENCORE,
+              MOVE_LEECH_SEED,
+              MOVE_NATURE_POWER,
+              MOVE_CURSE,
+              MOVE_HELPING_HAND),
+
+    egg_moves(YANMA,
+              MOVE_WHIRLWIND,
+              MOVE_REVERSAL,
+              MOVE_LEECH_LIFE,
+              MOVE_SIGNAL_BEAM,
+              MOVE_SILVER_WIND),
+
+    egg_moves(WOOPER,
+              MOVE_BODY_SLAM,
+              MOVE_ANCIENT_POWER,
+              MOVE_SAFEGUARD,
+              MOVE_CURSE,
+              MOVE_MUD_SPORT,
+              MOVE_STOCKPILE,
+              MOVE_SWALLOW,
+              MOVE_SPIT_UP),
+
+    egg_moves(MURKROW,
+              MOVE_WHIRLWIND,
+              MOVE_DRILL_PECK,
+              MOVE_MIRROR_MOVE,
+              MOVE_WING_ATTACK,
+              MOVE_SKY_ATTACK,
+              MOVE_CONFUSE_RAY,
+              MOVE_FEATHER_DANCE,
+              MOVE_PERISH_SONG),
+
+    egg_moves(MISDREAVUS,
+              MOVE_SCREECH,
+              MOVE_DESTINY_BOND,
+              MOVE_PSYCH_UP,
+              MOVE_IMPRISON),
+
+    egg_moves(GIRAFARIG,
+              MOVE_TAKE_DOWN,
+              MOVE_AMNESIA,
+              MOVE_FORESIGHT,
+              MOVE_FUTURE_SIGHT,
+              MOVE_BEAT_UP,
+              MOVE_PSYCH_UP,
+              MOVE_WISH,
+              MOVE_MAGIC_COAT),
+
+    egg_moves(PINECO,
+              MOVE_REFLECT,
+              MOVE_PIN_MISSILE,
+              MOVE_FLAIL,
+              MOVE_SWIFT,
+              MOVE_COUNTER,
+              MOVE_SAND_TOMB),
+
+    egg_moves(DUNSPARCE,
+              MOVE_BIDE,
+              MOVE_ANCIENT_POWER,
+              MOVE_ROCK_SLIDE,
+              MOVE_BITE,
+              MOVE_HEADBUTT,
+              MOVE_ASTONISH,
+              MOVE_CURSE),
+
+    egg_moves(GLIGAR,
+              MOVE_METAL_CLAW,
+              MOVE_WING_ATTACK,
+              MOVE_RAZOR_WIND,
+              MOVE_COUNTER,
+              MOVE_SAND_TOMB),
+
+    egg_moves(SNUBBULL,
+              MOVE_METRONOME,
+              MOVE_FAINT_ATTACK,
+              MOVE_REFLECT,
+              MOVE_PRESENT,
+              MOVE_CRUNCH,
+              MOVE_HEAL_BELL,
+              MOVE_SNORE,
+              MOVE_SMELLING_SALT),
+
+    egg_moves(QWILFISH,
+              MOVE_FLAIL,
+              MOVE_HAZE,
+              MOVE_BUBBLE_BEAM,
+              MOVE_SUPERSONIC,
+              MOVE_ASTONISH),
+
+    egg_moves(SHUCKLE,
+              MOVE_SWEET_SCENT),
+
+    egg_moves(HERACROSS,
+              MOVE_HARDEN,
+              MOVE_BIDE,
+              MOVE_FLAIL,
+              MOVE_FALSE_SWIPE),
+
+    egg_moves(SNEASEL,
+              MOVE_COUNTER,
+              MOVE_SPITE,
+              MOVE_FORESIGHT,
+              MOVE_REFLECT,
+              MOVE_BITE,
+              MOVE_CRUSH_CLAW,
+              MOVE_FAKE_OUT),
+
+    egg_moves(TEDDIURSA,
+              MOVE_CRUNCH,
+              MOVE_TAKE_DOWN,
+              MOVE_SEISMIC_TOSS,
+              MOVE_COUNTER,
+              MOVE_METAL_CLAW,
+              MOVE_FAKE_TEARS,
+              MOVE_YAWN,
+              MOVE_SLEEP_TALK),
+
+    egg_moves(SLUGMA,
+              MOVE_ACID_ARMOR,
+              MOVE_HEAT_WAVE),
+
+    egg_moves(SWINUB,
+              MOVE_TAKE_DOWN,
+              MOVE_BITE,
+              MOVE_BODY_SLAM,
+              MOVE_ROCK_SLIDE,
+              MOVE_ANCIENT_POWER,
+              MOVE_MUD_SHOT,
+              MOVE_ICICLE_SPEAR,
+              MOVE_DOUBLE_EDGE),
+
+    egg_moves(CORSOLA,
+              MOVE_ROCK_SLIDE,
+              MOVE_SCREECH,
+              MOVE_MIST,
+              MOVE_AMNESIA,
+              MOVE_BARRIER,
+              MOVE_INGRAIN,
+              MOVE_CONFUSE_RAY,
+              MOVE_ICICLE_SPEAR),
+
+    egg_moves(REMORAID,
+              MOVE_AURORA_BEAM,
+              MOVE_OCTAZOOKA,
+              MOVE_SUPERSONIC,
+              MOVE_HAZE,
+              MOVE_SCREECH,
+              MOVE_THUNDER_WAVE,
+              MOVE_ROCK_BLAST),
+
+    egg_moves(DELIBIRD,
+              MOVE_AURORA_BEAM,
+              MOVE_QUICK_ATTACK,
+              MOVE_FUTURE_SIGHT,
+              MOVE_SPLASH,
+              MOVE_RAPID_SPIN,
+              MOVE_ICE_BALL),
+
+    egg_moves(MANTINE,
+              MOVE_TWISTER,
+              MOVE_HYDRO_PUMP,
+              MOVE_HAZE,
+              MOVE_SLAM,
+              MOVE_MUD_SPORT,
+              MOVE_ROCK_SLIDE),
+
+    egg_moves(SKARMORY,
+              MOVE_DRILL_PECK,
+              MOVE_PURSUIT,
+              MOVE_WHIRLWIND,
+              MOVE_SKY_ATTACK,
+              MOVE_CURSE),
+
+    egg_moves(HOUNDOUR,
+              MOVE_FIRE_SPIN,
+              MOVE_RAGE,
+              MOVE_PURSUIT,
+              MOVE_COUNTER,
+              MOVE_SPITE,
+              MOVE_REVERSAL,
+              MOVE_BEAT_UP,
+              MOVE_WILL_O_WISP),
+
+    egg_moves(PHANPY,
+              MOVE_FOCUS_ENERGY,
+              MOVE_BODY_SLAM,
+              MOVE_ANCIENT_POWER,
+              MOVE_SNORE,
+              MOVE_COUNTER,
+              MOVE_FISSURE),
+
+    egg_moves(STANTLER,
+              MOVE_SPITE,
+              MOVE_DISABLE,
+              MOVE_BITE,
+              MOVE_SWAGGER,
+              MOVE_PSYCH_UP,
+              MOVE_EXTRASENSORY),
+
+    egg_moves(TYROGUE,
+              MOVE_RAPID_SPIN,
+              MOVE_HI_JUMP_KICK,
+              MOVE_MACH_PUNCH,
+              MOVE_MIND_READER,
+              MOVE_HELPING_HAND),
+
+    egg_moves(SMOOCHUM,
+              MOVE_MEDITATE,
+              MOVE_PSYCH_UP,
+              MOVE_FAKE_OUT,
+              MOVE_WISH,
+              MOVE_ICE_PUNCH),
+
+    egg_moves(ELEKID,
+              MOVE_KARATE_CHOP,
+              MOVE_BARRIER,
+              MOVE_ROLLING_KICK,
+              MOVE_MEDITATE,
+              MOVE_CROSS_CHOP,
+              MOVE_FIRE_PUNCH,
+              MOVE_ICE_PUNCH),
+
+    egg_moves(MAGBY,
+              MOVE_KARATE_CHOP,
+              MOVE_MEGA_PUNCH,
+              MOVE_BARRIER,
+              MOVE_SCREECH,
+              MOVE_CROSS_CHOP,
+              MOVE_THUNDER_PUNCH),
+
+    egg_moves(MILTANK,
+              MOVE_PRESENT,
+              MOVE_REVERSAL,
+              MOVE_SEISMIC_TOSS,
+              MOVE_ENDURE,
+              MOVE_PSYCH_UP,
+              MOVE_CURSE,
+              MOVE_HELPING_HAND,
+              MOVE_SLEEP_TALK),
+
+    egg_moves(LARVITAR,
+              MOVE_PURSUIT,
+              MOVE_STOMP,
+              MOVE_OUTRAGE,
+              MOVE_FOCUS_ENERGY,
+              MOVE_ANCIENT_POWER,
+              MOVE_DRAGON_DANCE,
+              MOVE_CURSE),
+
+    egg_moves(TREECKO,
+              MOVE_CRUNCH,
+              MOVE_MUD_SPORT,
+              MOVE_ENDEAVOR,
+              MOVE_LEECH_SEED,
+              MOVE_DRAGON_BREATH,
+              MOVE_CRUSH_CLAW),
+
+    egg_moves(TORCHIC,
+              MOVE_COUNTER,
+              MOVE_REVERSAL,
+              MOVE_ENDURE,
+              MOVE_SWAGGER,
+              MOVE_ROCK_SLIDE,
+              MOVE_SMELLING_SALT),
+
+    egg_moves(MUDKIP,
+              MOVE_REFRESH,
+              MOVE_UPROAR,
+              MOVE_CURSE,
+              MOVE_STOMP,
+              MOVE_ICE_BALL,
+              MOVE_MIRROR_COAT),
+
+    egg_moves(POOCHYENA,
+              MOVE_ASTONISH,
+              MOVE_POISON_FANG,
+              MOVE_COVET,
+              MOVE_LEER,
+              MOVE_YAWN),
+
+    egg_moves(ZIGZAGOON,
+              MOVE_CHARM,
+              MOVE_PURSUIT,
+              MOVE_SUBSTITUTE,
+              MOVE_TICKLE,
+              MOVE_TRICK),
+
+    egg_moves(LOTAD,
+              MOVE_SYNTHESIS,
+              MOVE_RAZOR_LEAF,
+              MOVE_SWEET_SCENT,
+              MOVE_LEECH_SEED,
+              MOVE_FLAIL,
+              MOVE_WATER_GUN),
+
+    egg_moves(SEEDOT,
+              MOVE_LEECH_SEED,
+              MOVE_AMNESIA,
+              MOVE_QUICK_ATTACK,
+              MOVE_RAZOR_WIND,
+              MOVE_TAKE_DOWN,
+              MOVE_FALSE_SWIPE),
+
+    egg_moves(NINCADA,
+              MOVE_ENDURE,
+              MOVE_FAINT_ATTACK,
+              MOVE_GUST,
+              MOVE_SILVER_WIND),
+
+    egg_moves(TAILLOW,
+              MOVE_PURSUIT,
+              MOVE_SUPERSONIC,
+              MOVE_REFRESH,
+              MOVE_MIRROR_MOVE,
+              MOVE_RAGE,
+              MOVE_SKY_ATTACK),
+
+    egg_moves(SHROOMISH,
+              MOVE_FAKE_TEARS,
+              MOVE_SWAGGER,
+              MOVE_CHARM,
+              MOVE_FALSE_SWIPE,
+              MOVE_HELPING_HAND),
+
+    egg_moves(SPINDA,
+              MOVE_ENCORE,
+              MOVE_ROCK_SLIDE,
+              MOVE_ASSIST,
+              MOVE_DISABLE,
+              MOVE_BATON_PASS,
+              MOVE_WISH,
+              MOVE_TRICK,
+              MOVE_SMELLING_SALT),
+
+    egg_moves(WINGULL,
+              MOVE_MIST,
+              MOVE_TWISTER,
+              MOVE_AGILITY,
+              MOVE_GUST,
+              MOVE_WATER_SPORT),
+
+    egg_moves(SURSKIT,
+              MOVE_FORESIGHT,
+              MOVE_MUD_SHOT,
+              MOVE_PSYBEAM,
+              MOVE_HYDRO_PUMP,
+              MOVE_MIND_READER),
+
+    egg_moves(WAILMER,
+              MOVE_DOUBLE_EDGE,
+              MOVE_THRASH,
+              MOVE_SWAGGER,
+              MOVE_SNORE,
+              MOVE_SLEEP_TALK,
+              MOVE_CURSE,
+              MOVE_FISSURE,
+              MOVE_TICKLE),
+
+    egg_moves(SKITTY,
+              MOVE_HELPING_HAND,
+              MOVE_PSYCH_UP,
+              MOVE_UPROAR,
+              MOVE_FAKE_TEARS,
+              MOVE_WISH,
+              MOVE_BATON_PASS,
+              MOVE_SUBSTITUTE,
+              MOVE_TICKLE),
+
+    egg_moves(KECLEON,
+              MOVE_DISABLE,
+              MOVE_MAGIC_COAT,
+              MOVE_TRICK),
+
+    egg_moves(NOSEPASS,
+              MOVE_MAGNITUDE,
+              MOVE_ROLLOUT,
+              MOVE_EXPLOSION),
+
+    egg_moves(TORKOAL,
+              MOVE_ERUPTION,
+              MOVE_ENDURE,
+              MOVE_SLEEP_TALK,
+              MOVE_YAWN),
+
+    egg_moves(SABLEYE,
+              MOVE_PSYCH_UP,
+              MOVE_RECOVER,
+              MOVE_MOONLIGHT),
+
+    egg_moves(BARBOACH,
+              MOVE_THRASH,
+              MOVE_WHIRLPOOL,
+              MOVE_SPARK),
+
+    egg_moves(LUVDISC,
+              MOVE_SPLASH,
+              MOVE_SUPERSONIC,
+              MOVE_WATER_SPORT,
+              MOVE_MUD_SPORT),
+
+    egg_moves(CORPHISH,
+              MOVE_MUD_SPORT,
+              MOVE_ENDEAVOR,
+              MOVE_BODY_SLAM,
+              MOVE_ANCIENT_POWER),
+
+    egg_moves(FEEBAS,
+              MOVE_MIRROR_COAT,
+              MOVE_DRAGON_BREATH,
+              MOVE_MUD_SPORT,
+              MOVE_HYPNOSIS,
+              MOVE_LIGHT_SCREEN,
+              MOVE_CONFUSE_RAY),
+
+    egg_moves(CARVANHA,
+              MOVE_HYDRO_PUMP,
+              MOVE_DOUBLE_EDGE,
+              MOVE_THRASH),
+
+    egg_moves(TRAPINCH,
+              MOVE_FOCUS_ENERGY,
+              MOVE_QUICK_ATTACK,
+              MOVE_GUST),
+
+    egg_moves(MAKUHITA,
+              MOVE_FAINT_ATTACK,
+              MOVE_DETECT,
+              MOVE_FORESIGHT,
+              MOVE_HELPING_HAND,
+              MOVE_CROSS_CHOP,
+              MOVE_REVENGE,
+              MOVE_DYNAMIC_PUNCH,
+              MOVE_COUNTER),
+
+    egg_moves(ELECTRIKE,
+              MOVE_CRUNCH,
+              MOVE_HEADBUTT,
+              MOVE_UPROAR,
+              MOVE_CURSE,
+              MOVE_SWIFT),
+
+    egg_moves(NUMEL,
+              MOVE_HOWL,
+              MOVE_SCARY_FACE,
+              MOVE_BODY_SLAM,
+              MOVE_ROLLOUT,
+              MOVE_DEFENSE_CURL,
+              MOVE_STOMP),
+
+    egg_moves(SPHEAL,
+              MOVE_WATER_SPORT,
+              MOVE_STOCKPILE,
+              MOVE_SWALLOW,
+              MOVE_SPIT_UP,
+              MOVE_YAWN,
+              MOVE_ROCK_SLIDE,
+              MOVE_CURSE,
+              MOVE_FISSURE),
+
+    egg_moves(CACNEA,
+              MOVE_GRASS_WHISTLE,
+              MOVE_ACID,
+              MOVE_TEETER_DANCE,
+              MOVE_DYNAMIC_PUNCH,
+              MOVE_COUNTER),
+
+    egg_moves(SNORUNT,
+              MOVE_BLOCK,
+              MOVE_SPIKES),
+
+    egg_moves(AZURILL,
+              MOVE_ENCORE,
+              MOVE_SING,
+              MOVE_REFRESH,
+              MOVE_SLAM,
+              MOVE_TICKLE),
+
+    egg_moves(SPOINK,
+              MOVE_FUTURE_SIGHT,
+              MOVE_EXTRASENSORY,
+              MOVE_SUBSTITUTE,
+              MOVE_TRICK),
+
+    egg_moves(PLUSLE,
+              MOVE_SUBSTITUTE,
+              MOVE_WISH),
+
+    egg_moves(MINUN,
+              MOVE_SUBSTITUTE,
+              MOVE_WISH),
+
+    egg_moves(MAWILE,
+              MOVE_SWORDS_DANCE,
+              MOVE_FALSE_SWIPE,
+              MOVE_POISON_FANG,
+              MOVE_PSYCH_UP,
+              MOVE_ANCIENT_POWER,
+              MOVE_TICKLE),
+
+    egg_moves(MEDITITE,
+              MOVE_FIRE_PUNCH,
+              MOVE_THUNDER_PUNCH,
+              MOVE_ICE_PUNCH,
+              MOVE_FORESIGHT,
+              MOVE_FAKE_OUT,
+              MOVE_BATON_PASS,
+              MOVE_DYNAMIC_PUNCH),
+
+    egg_moves(SWABLU,
+              MOVE_AGILITY,
+              MOVE_HAZE,
+              MOVE_PURSUIT,
+              MOVE_RAGE),
+
+    egg_moves(DUSKULL,
+              MOVE_IMPRISON,
+              MOVE_DESTINY_BOND,
+              MOVE_PAIN_SPLIT,
+              MOVE_GRUDGE,
+              MOVE_MEMENTO,
+              MOVE_FAINT_ATTACK),
+
+    egg_moves(ROSELIA,
+              MOVE_SPIKES,
+              MOVE_SYNTHESIS,
+              MOVE_PIN_MISSILE,
+              MOVE_COTTON_SPORE),
+
+    egg_moves(SLAKOTH,
+              MOVE_PURSUIT,
+              MOVE_SLASH,
+              MOVE_BODY_SLAM,
+              MOVE_SNORE,
+              MOVE_CRUSH_CLAW,
+              MOVE_CURSE,
+              MOVE_SLEEP_TALK),
+
+    egg_moves(GULPIN,
+              MOVE_DREAM_EATER,
+              MOVE_ACID_ARMOR,
+              MOVE_SMOG,
+              MOVE_PAIN_SPLIT),
+
+    egg_moves(TROPIUS,
+              MOVE_HEADBUTT,
+              MOVE_SLAM,
+              MOVE_RAZOR_WIND,
+              MOVE_LEECH_SEED,
+              MOVE_NATURE_POWER),
+
+    egg_moves(WHISMUR,
+              MOVE_TAKE_DOWN,
+              MOVE_SNORE,
+              MOVE_SWAGGER,
+              MOVE_EXTRASENSORY,
+              MOVE_SMELLING_SALT),
+
+    egg_moves(CLAMPERL,
+              MOVE_REFRESH,
+              MOVE_MUD_SPORT,
+              MOVE_BODY_SLAM,
+              MOVE_SUPERSONIC,
+              MOVE_BARRIER,
+              MOVE_CONFUSE_RAY),
+
+    egg_moves(ABSOL,
+              MOVE_BATON_PASS,
+              MOVE_FAINT_ATTACK,
+              MOVE_DOUBLE_EDGE,
+              MOVE_MAGIC_COAT,
+              MOVE_CURSE,
+              MOVE_SUBSTITUTE),
+
+    egg_moves(SHUPPET,
+              MOVE_DISABLE,
+              MOVE_DESTINY_BOND,
+              MOVE_FORESIGHT,
+              MOVE_ASTONISH,
+              MOVE_IMPRISON),
+
+    egg_moves(SEVIPER,
+              MOVE_STOCKPILE,
+              MOVE_SWALLOW,
+              MOVE_SPIT_UP,
+              MOVE_BODY_SLAM),
+
+    egg_moves(ZANGOOSE,
+              MOVE_FLAIL,
+              MOVE_DOUBLE_KICK,
+              MOVE_RAZOR_WIND,
+              MOVE_COUNTER,
+              MOVE_ROAR,
+              MOVE_CURSE),
+
+    egg_moves(RELICANTH,
+              MOVE_MAGNITUDE,
+              MOVE_SKULL_BASH,
+              MOVE_WATER_SPORT,
+              MOVE_AMNESIA,
+              MOVE_SLEEP_TALK,
+              MOVE_ROCK_SLIDE),
+
+    egg_moves(ARON,
+              MOVE_ENDEAVOR,
+              MOVE_BODY_SLAM,
+              MOVE_STOMP,
+              MOVE_SMELLING_SALT),
+
+    egg_moves(CASTFORM,
+              MOVE_FUTURE_SIGHT,
+              MOVE_PSYCH_UP),
+
+    egg_moves(VOLBEAT,
+              MOVE_BATON_PASS,
+              MOVE_SILVER_WIND,
+              MOVE_TRICK),
+
+    egg_moves(ILLUMISE,
+              MOVE_BATON_PASS,
+              MOVE_SILVER_WIND,
+              MOVE_GROWTH),
+
+    egg_moves(LILEEP,
+              MOVE_BARRIER,
+              MOVE_RECOVER,
+              MOVE_MIRROR_COAT,
+              MOVE_ROCK_SLIDE),
+
+    egg_moves(ANORITH,
+              MOVE_RAPID_SPIN,
+              MOVE_KNOCK_OFF,
+              MOVE_SWORDS_DANCE,
+              MOVE_ROCK_SLIDE),
+
+    egg_moves(RALTS,
+              MOVE_DISABLE,
+              MOVE_WILL_O_WISP,
+              MOVE_MEAN_LOOK,
+              MOVE_MEMENTO,
+              MOVE_DESTINY_BOND),
+
+    egg_moves(BAGON,
+              MOVE_HYDRO_PUMP,
+              MOVE_THRASH,
+              MOVE_DRAGON_RAGE,
+              MOVE_TWISTER,
+              MOVE_DRAGON_DANCE),
+
+    egg_moves(CHIMECHO,
+              MOVE_DISABLE,
+              MOVE_CURSE,
+              MOVE_HYPNOSIS,
+              MOVE_DREAM_EATER),
+
+    0xFFFF
+};
diff --git a/include/data/pokemon/evolution.h b/include/data/pokemon/evolution.h
index 51e993347..919416fee 100644
--- a/include/data/pokemon/evolution.h
+++ b/include/data/pokemon/evolution.h
@@ -1,5 +1,5 @@
 //
-// Created by Scott Norton on 6/27/17.
+
 //
 
 #ifndef POKERUBY_EVOLUTION_H
diff --git a/include/data/pokemon/experience_tables.h b/include/data/pokemon/experience_tables.h
index 70c5e88ed..2fb416fe9 100644
--- a/include/data/pokemon/experience_tables.h
+++ b/include/data/pokemon/experience_tables.h
@@ -1,5 +1,5 @@
 //
-// Created by Scott Norton on 6/27/17.
+
 //
 
 #ifndef POKERUBY_EXPERIENCE_TABLES_H
diff --git a/include/data/pokemon/item_effects.h b/include/data/pokemon/item_effects.h
index b07573933..cd06228dd 100644
--- a/include/data/pokemon/item_effects.h
+++ b/include/data/pokemon/item_effects.h
@@ -1,5 +1,5 @@
 //
-// Created by Scott Norton on 6/27/17.
+
 //
 
 #ifndef POKERUBY_ITEM_EFFECTS_H
diff --git a/include/data/pokemon/level_up_learnset_pointers.h b/include/data/pokemon/level_up_learnset_pointers.h
index 753947d51..19761c996 100644
--- a/include/data/pokemon/level_up_learnset_pointers.h
+++ b/include/data/pokemon/level_up_learnset_pointers.h
@@ -1,5 +1,5 @@
 //
-// Created by Scott Norton on 6/27/17.
+
 //
 
 #ifndef POKERUBY_LEVEL_UP_LEARNSET_POINTERS_H
diff --git a/include/data/pokemon/level_up_learnsets.h b/include/data/pokemon/level_up_learnsets.h
index 5b79f4bc0..bc1de82de 100644
--- a/include/data/pokemon/level_up_learnsets.h
+++ b/include/data/pokemon/level_up_learnsets.h
@@ -1,5 +1,5 @@
 //
-// Created by Scott Norton on 6/27/17.
+
 //
 
 #ifndef POKERUBY_LEVEL_UP_LEARNSETS_H
diff --git a/include/data/pokemon/nature_stats.h b/include/data/pokemon/nature_stats.h
index 27bd98f9d..fcef2a0ac 100644
--- a/include/data/pokemon/nature_stats.h
+++ b/include/data/pokemon/nature_stats.h
@@ -1,5 +1,5 @@
 //
-// Created by Scott Norton on 6/27/17.
+
 //
 
 #ifndef POKERUBY_NATURE_STATS_H
diff --git a/include/data/pokemon/spinda_spots.h b/include/data/pokemon/spinda_spots.h
index 234cdf00e..d045e0734 100644
--- a/include/data/pokemon/spinda_spots.h
+++ b/include/data/pokemon/spinda_spots.h
@@ -1,5 +1,5 @@
 //
-// Created by Scott Norton on 6/27/17.
+
 //
 
 #ifndef POKERUBY_SPINDA_SPOTS_H
diff --git a/include/data/pokemon/tmhm_learnsets.h b/include/data/pokemon/tmhm_learnsets.h
index fa48f7f5c..02cd22d56 100644
--- a/include/data/pokemon/tmhm_learnsets.h
+++ b/include/data/pokemon/tmhm_learnsets.h
@@ -1,5 +1,5 @@
 //
-// Created by Scott Norton on 6/27/17.
+
 //
 
 #ifndef POKERUBY_TMHM_LEARNSETS_H
diff --git a/include/data/pokemon/trainer_class_lookups.h b/include/data/pokemon/trainer_class_lookups.h
index 0aea322a0..c86e795c4 100644
--- a/include/data/pokemon/trainer_class_lookups.h
+++ b/include/data/pokemon/trainer_class_lookups.h
@@ -1,5 +1,5 @@
 //
-// Created by Scott Norton on 6/27/17.
+
 //
 
 #ifndef POKERUBY_TRAINER_CLASS_LOOKUPS_H
diff --git a/include/daycare.h b/include/daycare.h
index b90c50610..e3aec68d3 100644
--- a/include/daycare.h
+++ b/include/daycare.h
@@ -1,9 +1,9 @@
 #ifndef GUARD_DAYCARE_H
 #define GUARD_DAYCARE_H
 
-u8 Daycare_CountPokemon(struct BoxPokemon *);
-void sub_8041324(struct BoxPokemon *, struct RecordMixing_UnknownStruct *);
-void sub_8041790(int i);
+u8 Daycare_CountPokemon(struct DayCareData *);
+void sub_8041324(struct BoxPokemon *, struct RecordMixingDayCareMail *);
+void sub_8041790(u16 i);
 u16 sub_8041870(u16);
 void sub_8041940(void);
 void sub_8041950(void);
diff --git a/include/field_camera.h b/include/field_camera.h
index 4ce207541..17126d190 100644
--- a/include/field_camera.h
+++ b/include/field_camera.h
@@ -11,7 +11,7 @@ struct CameraSomething
     s32 unk14;
 };
 
-extern struct Camera gUnknown_0202E844;
+extern struct Camera gCamera;
 
 void move_tilemap_camera_to_upper_left_corner(void);
 void sub_8057A58(void);
diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h
index 11e96254d..7bba24fa6 100644
--- a/include/field_effect_helpers.h
+++ b/include/field_effect_helpers.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_FIELD_EFFECT_HELPERS_H
 #define GUARD_FIELD_EFFECT_HELPERS_H
 
+extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
+
 void sub_812869C(struct MapObject *);
 bool8 sub_81286C4(struct MapObject *);
 void oamc_shadow(struct Sprite *);
@@ -26,9 +28,9 @@ void sub_8126BC4(u8 unk_1B, u8 r6, s16 x, s16 y);
 void sub_8127ED0(u8, u8);
 void sub_8127F28(u8, u8, s16);
 u8 sub_8128124(u8 id);
-void ash(s16, s16, u16, u8);
+void ash(s16, s16, u16, s16);
 void SetUpReflection(struct MapObject *mapObj, struct Sprite *sprite, u8 a);
 u32 oe_exec_and_other_stuff(u8 fieldEffectId, struct MapObject *mapObject);
-u8 sub_8126FF0(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y);
+u8 sub_8126FF0(u8, u8, u8, s16, s16);
 
 #endif // GUARD_FIELD_EFFECT_HELPERS_H
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index d2a1a9b1f..641a28ed3 100644
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -3,6 +3,8 @@
 
 #include "sprite.h"
 
+extern const u8 gUnknown_0830FD14[];
+
 #define fieldmap_object_cb(setup, callback, table) \
 static u8 callback(struct MapObject *, struct Sprite *);\
 void setup(struct Sprite *sprite)\
@@ -54,17 +56,15 @@ u8 sub_805CCAC(s16 a0, s16 a1, s16 a2, s16 a3);
 u8 sub_805CCE8(s16 a0, s16 a1, s16 a2, s16 a3);
 u8 sub_805CD24(s16 a0, s16 a1, s16 a2, s16 a3);
 
-u8 sub_805F3EC(struct MapObject *, struct Sprite *, u8, bool8 (*const)(u8));
-u8 sub_805F3F0(struct MapObject *, struct Sprite *, u8, bool8 (*const)(u8));
-u8 sub_805F438(struct MapObject *, struct Sprite *, u8, bool8 (*const)(u8));
-u8 sub_805F4F0(struct MapObject *, struct Sprite *, u8, bool8 (*const)(u8));
-u8 sub_805F5A8(struct MapObject *, struct Sprite *, u8, bool8 (*const)(u8));
-u8 sub_805F660(struct MapObject *, struct Sprite *, u8, bool8 (*const)(u8));
-u8 cph_IM_DIFFERENT(struct MapObject *, struct Sprite *, u8, bool8 (*const)(u8));
-u8 sub_805F760(struct MapObject *, struct Sprite *, u8, bool8 (*const)(u8));
-u8 oac_hopping(struct MapObject *, struct Sprite *, u8, bool8 (*const)(u8));
-u8 sub_805F3EC(struct MapObject *, struct Sprite *, u8, bool8 (*const)(u8));
-u8 sub_805F3EC(struct MapObject *, struct Sprite *, u8, bool8 (*const)(u8));
+u8 sub_805F3EC(struct MapObject *, struct Sprite *, u8, bool8(u8));
+u8 sub_805F3F0(struct MapObject *, struct Sprite *, u8, bool8(u8));
+u8 sub_805F438(struct MapObject *, struct Sprite *, u8, bool8(u8));
+u8 sub_805F4F0(struct MapObject *, struct Sprite *, u8, bool8(u8));
+u8 sub_805F5A8(struct MapObject *, struct Sprite *, u8, bool8(u8));
+u8 sub_805F660(struct MapObject *, struct Sprite *, u8, bool8(u8));
+u8 cph_IM_DIFFERENT(struct MapObject *, struct Sprite *, u8, bool8(u8));
+u8 sub_805F760(struct MapObject *, struct Sprite *, u8, bool8(u8));
+u8 oac_hopping(struct MapObject *, struct Sprite *, u8, bool8(u8));
 
 extern struct CameraSomething gUnknown_03004880;
 extern u16 gUnknown_03004898;
@@ -318,7 +318,7 @@ u8 get_go_fast_image_anim_num(u8);
 u8 get_go_faster_image_anim_num(u8);
 u8 sub_805FD78(u8);
 
-int state_to_direction(u8, u8, u8);
+u32 state_to_direction(u8, u32, u32);
 
 void sub_805AA98();
 void sub_805AAB0(void);
@@ -379,14 +379,14 @@ u8 sub_805FDF8(u8);
 u8 sub_805FE08(u8);
 void npc_set_running_behaviour_etc(struct MapObject *, u8);
 u8 npc_running_behaviour_by_direction(u8);
-u8 npc_block_way(struct MapObject *, s16, s16, u8);
+u8 npc_block_way(struct MapObject *, s16, s16, u32);
 u8 sub_8060024(struct MapObject *, s16, s16, u8);
 u8 sub_8060234(u8, u8, u8);
 void sub_8060288(u8, u8, u8);
 void sub_8060388(s16, s16, s16 *, s16 *);
 void sub_80603CC(s16 x, s16 y, s16 *pInt, s16 *pInt1);
 void GetFieldObjectMovingCameraOffset(s16 *, s16 *);
-void FieldObjectMoveDestCoords(struct MapObject *pObject, u8 unk_19, s16 *pInt, s16 *pInt1);
+void FieldObjectMoveDestCoords(struct MapObject *pObject, u32 unk_19, s16 *pInt, s16 *pInt1);
 bool8 FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(struct MapObject *);
 bool8 FieldObjectIsSpecialAnimActive(struct MapObject *);
 bool8 FieldObjectSetSpecialAnim(struct MapObject *, u8);
@@ -396,21 +396,23 @@ void FieldObjectClearAnim(struct MapObject *);
 bool8 FieldObjectCheckIfSpecialAnimFinishedOrInactive(struct MapObject *);
 u8 FieldObjectClearAnimIfSpecialAnimFinished(struct MapObject *);
 u8 FieldObjectGetSpecialAnim(struct MapObject *);
-u8 GetFaceDirectionAnimId(u8);
-u8 GetSimpleGoAnimId(u8);
-u8 GetGoSpeed0AnimId(u8 a);
-u8 sub_8060744(u8 a);
-u8 d2s_08064034(u8 a);
-u8 sub_806079C(u8 a);
-u8 sub_80607F4(u8 a);
-u8 GetJumpLedgeAnimId(u8 a);
-u8 sub_806084C(u8);
-u8 sub_8060878(u8);
-u8 sub_80608D0(u8);
-u8 GetStepInPlaceDelay32AnimId(u8 a);
-u8 GetStepInPlaceDelay16AnimId(u8);
-u8 GetStepInPlaceDelay8AnimId(u8 a);
-u8 GetStepInPlaceDelay4AnimId(u8 a);
+u8 GetFaceDirectionAnimId(u32);
+u8 GetSimpleGoAnimId(u32);
+u8 GetGoSpeed0AnimId(u32);
+u8 sub_8060744(u32);
+u8 d2s_08064034(u32);
+u8 sub_806079C(u32);
+u8 sub_80607C8(u32);
+u8 sub_80607F4(u32);
+u8 GetJumpLedgeAnimId(u32);
+u8 sub_806084C(u32);
+u8 sub_8060878(u32);
+u8 sub_80608A4(u32);
+u8 sub_80608D0(u32);
+u8 GetStepInPlaceDelay32AnimId(u32);
+u8 GetStepInPlaceDelay16AnimId(u32);
+u8 GetStepInPlaceDelay8AnimId(u32);
+u8 GetStepInPlaceDelay4AnimId(u32);
 u8 FieldObjectFaceOppositeDirection(struct MapObject *, u8);
 u8 sub_80609D8(u8);
 u8 sub_8060A04(u8);
@@ -427,5 +429,9 @@ void sub_80634D0(struct MapObject *, struct Sprite *);
 u8 SpawnSpecialFieldObjectParametrized(u8, u8, u8, s16, s16, u8);
 void CameraObjectSetFollowedObjectId(u8);
 u8 sub_805ADDC(u8);
+void sub_8060320(u32, s16 *, s16 *, s16, s16);
+u8 obj_unfreeze(struct Sprite *, s16, s16, u8);
+u16 npc_paltag_by_palslot(u8);
+void sub_8060470(s16 *, s16 *, s16, s16);
 
 #endif // GUARD_FIELD_MAP_OBJ_H
diff --git a/include/global.h b/include/global.h
index 79269937f..ac28507e8 100644
--- a/include/global.h
+++ b/include/global.h
@@ -560,18 +560,34 @@ struct GabbyAndTyData
     /*2b1b*/ u8 valB_5:3;
 };
 
-struct RecordMixing_UnknownStructSub
+struct DayCareMail
 {
-    u32 unk0;
-    u8 data[0x34];
-    //u8 data[0x38];
+    /*0x00*/ struct MailStruct message;
+    /*0x24*/ u8 names[19];
 };
 
-struct RecordMixing_UnknownStruct
+struct DayCareStepCountersEtc {
+    u32 steps[2];
+    u16 personalityLo;
+    u8 unk_11a;
+};
+
+struct RecordMixingDayCareMail
 {
-    struct RecordMixing_UnknownStructSub data[2];
+    struct DayCareMail mail[2];
     u32 unk70;
-    u16 unk74[0x2];
+    u16 unk74[2];
+};
+
+struct DayCareMisc
+{
+    struct DayCareMail mail[2];
+    struct DayCareStepCountersEtc countersEtc;
+};
+
+struct DayCareData {
+    struct BoxPokemon mons[2];
+    struct DayCareMisc misc;
 };
 
 struct LinkBattleRecord
@@ -670,11 +686,7 @@ struct SaveBlock1 /* 0x02025734 */
     /*0x2DD4*/ struct EasyChatPair easyChatPairs[5]; //Dewford trend [0] and some other stuff
     /*0x2DFC*/ u8 filler_2DFC[0x8];
     /*0x2E04*/ SB_Struct sbStruct;
-    /*0x2F9C*/ struct BoxPokemon daycareData[2];
-    /*0x303C*/ struct RecordMixing_UnknownStruct filler_303C;
-    /*0x30AC*/ u8 filler_30B4[0x2];
-    /*0x30B6*/ u8 filler_30B6;
-    /*0x30B7*/ u8 filler_30B7[1];
+    /*0x2F9C*/ struct DayCareData daycareData;
     /*0x30B8*/ struct LinkBattleRecord linkBattleRecords[5];
     /*0x3108*/ u8 filler_3108[8];
     /*0x3110*/ u8 giftRibbons[7];
diff --git a/include/mail_data.h b/include/mail_data.h
index df4b385a1..2659c0d37 100644
--- a/include/mail_data.h
+++ b/include/mail_data.h
@@ -11,6 +11,6 @@ u8 GiveMailToMon2(struct Pokemon *, struct MailStruct *);
 void TakeMailFromMon(struct Pokemon *);
 u8 TakeMailFromMon2(struct Pokemon *);
 bool8 ItemIsMail(u16);
-bool8 ItemIsMail(u16);
+bool8 MonHasMail(struct Pokemon *);
 
 #endif // GUARD_MAIL_DATA_H
diff --git a/include/pokemon.h b/include/pokemon.h
index 9c6f16442..5d76a8a05 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -93,6 +93,8 @@
 #define MON_DATA_SPATK2            87
 #define MON_DATA_SPDEF2            88
 
+#define MAX_LEVEL 100
+
 #define MON_MALE       0x00
 #define MON_FEMALE     0xFE
 #define MON_GENDERLESS 0xFF
@@ -510,7 +512,7 @@ void sub_803ADE8(struct Pokemon *mon, struct UnknownPokemonStruct *src);
 void sub_803AF78(struct Pokemon *mon, struct UnknownPokemonStruct *dest);
 u16 CalculateBoxMonChecksum(struct BoxPokemon *boxMon);
 void CalculateMonStats(struct Pokemon *mon);
-void sub_803B4B4(struct Pokemon *src, struct Pokemon *dest);
+void sub_803B4B4(const struct BoxPokemon *src, struct Pokemon *dest);
 u8 GetLevelFromMonExp(struct Pokemon *mon);
 u8 GetLevelFromBoxMonExp(struct BoxPokemon *boxMon);
 u16 GiveMoveToMon(struct Pokemon *mon, u16 move);
@@ -599,5 +601,7 @@ u8 *sub_8040D08();
 bool32 sub_8040D3C(u16 species, u8 *name, u8 language);
 s8 sub_8040A54(struct Pokemon *, u8);
 u16 GetMonEVCount(struct Pokemon *);
+u8 GetLevelUpMovesBySpecies(u16, u16 *);
+u8 TryIncrementMonLevel(struct Pokemon *);
 
 #endif // GUARD_POKEMON_H
diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h
index bd4e7915b..9fe3436ef 100644
--- a/include/pokemon_storage_system.h
+++ b/include/pokemon_storage_system.h
@@ -2,5 +2,7 @@
 #define GUARD_POKEMON_STORAGE_SYSTEM_H
 
 void ResetPokemonStorageSystem(void);
+void BoxMonRestorePP(struct BoxPokemon *);
+void party_compaction(void);
 
 #endif // GUARD_POKEMON_STORAGE_SYSTEM_H
diff --git a/include/sprite.h b/include/sprite.h
index 5682a7c1d..0d84c8127 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -299,4 +299,6 @@ u8 SpriteTileAllocBitmapOp(u16 bit, u8 op);
 
 extern const union AffineAnimCmd *const gDummySpriteAffineAnimTable[];
 
+extern const struct SpriteTemplate gDummySpriteTemplate;
+
 #endif // GUARD_SPRITE_H
diff --git a/include/trade.h b/include/trade.h
index a4f05e8ed..f950aca53 100644
--- a/include/trade.h
+++ b/include/trade.h
@@ -1,3 +1,4 @@
+
 #ifndef GUARD_TRADE_H
 #define GUARD_TRADE_H
 
@@ -13,6 +14,10 @@ struct SomeTradeStruct
 
 extern struct SomeTradeStruct* gUnknown_03004828;
 
+extern const u8 gOtherText_MaleSymbol3[1];
+extern const u8 gOtherText_FemaleSymbol3[1];
+extern const u8 gOtherText_GenderlessSymbol[1];
+
 void sub_804E22C(void);
 
 #endif // GUARD_TRADE_H