Merge branch 'master' of https://github.com/pret/pokeemerald

13 files changed, 52 insertions, 2318 deletions

diff --git a/data/daycare.s b/data/daycare.s
deleted file mode 100644
index c249a668c..000000000
--- a/data/daycare.s
+++ /dev/null
@@ -1,24 +0,0 @@
-@ the third big chunk of data
-
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-
-
-@ 832ADD8
-	.include "data/egg_moves.inc"
-
-	.align 2
-gUnknown_0832B6C0:: @ 832B6C0
-	.incbin "baserom.gba", 0x32b6c0, 0x20
-
-gUnknown_0832B6E0:: @ 832B6E0
-	.incbin "baserom.gba", 0x32b6e0, 0x18
-
-gUnknown_0832B6F8:: @ 832B6F8
-	.incbin "baserom.gba", 0x32b6f8, 0x10
-
-gEggName:: @ 832B708
-	.string "タマゴ$" @ "tamago" ("egg" in Japanese)
diff --git a/data/egg_moves.inc b/data/egg_moves.inc
deleted file mode 100644
index 607f2aada..000000000
--- a/data/egg_moves.inc
+++ /dev/null
@@ -1,1306 +0,0 @@
-	.align 2
-gEggMoves:: @ 832ADD8
-	egg_moves_begin SPECIES_BULBASAUR
-	.2byte MOVE_LIGHT_SCREEN
-	.2byte MOVE_SKULL_BASH
-	.2byte MOVE_SAFEGUARD
-	.2byte MOVE_CHARM
-	.2byte MOVE_PETAL_DANCE
-	.2byte MOVE_MAGICAL_LEAF
-	.2byte MOVE_GRASS_WHISTLE
-	.2byte MOVE_CURSE
-
-	egg_moves_begin SPECIES_CHARMANDER
-	.2byte MOVE_BELLY_DRUM
-	.2byte MOVE_ANCIENT_POWER
-	.2byte MOVE_ROCK_SLIDE
-	.2byte MOVE_BITE
-	.2byte MOVE_OUTRAGE
-	.2byte MOVE_BEAT_UP
-	.2byte MOVE_SWORDS_DANCE
-	.2byte MOVE_DRAGON_DANCE
-
-	egg_moves_begin SPECIES_SQUIRTLE
-	.2byte MOVE_MIRROR_COAT
-	.2byte MOVE_HAZE
-	.2byte MOVE_MIST
-	.2byte MOVE_FORESIGHT
-	.2byte MOVE_FLAIL
-	.2byte MOVE_REFRESH
-	.2byte MOVE_MUD_SPORT
-	.2byte MOVE_YAWN
-
-	egg_moves_begin SPECIES_PIDGEY
-	.2byte MOVE_PURSUIT
-	.2byte MOVE_FAINT_ATTACK
-	.2byte MOVE_FORESIGHT
-	.2byte MOVE_STEEL_WING
-	.2byte MOVE_AIR_CUTTER
-
-	egg_moves_begin SPECIES_RATTATA
-	.2byte MOVE_SCREECH
-	.2byte MOVE_FLAME_WHEEL
-	.2byte MOVE_FURY_SWIPES
-	.2byte MOVE_BITE
-	.2byte MOVE_COUNTER
-	.2byte MOVE_REVERSAL
-	.2byte MOVE_UPROAR
-	.2byte MOVE_SWAGGER
-
-	egg_moves_begin SPECIES_SPEAROW
-	.2byte MOVE_FAINT_ATTACK
-	.2byte MOVE_FALSE_SWIPE
-	.2byte MOVE_SCARY_FACE
-	.2byte MOVE_QUICK_ATTACK
-	.2byte MOVE_TRI_ATTACK
-	.2byte MOVE_ASTONISH
-	.2byte MOVE_SKY_ATTACK
-
-	egg_moves_begin SPECIES_EKANS
-	.2byte MOVE_PURSUIT
-	.2byte MOVE_SLAM
-	.2byte MOVE_SPITE
-	.2byte MOVE_BEAT_UP
-	.2byte MOVE_POISON_FANG
-
-	egg_moves_begin SPECIES_SANDSHREW
-	.2byte MOVE_FLAIL
-	.2byte MOVE_SAFEGUARD
-	.2byte MOVE_COUNTER
-	.2byte MOVE_RAPID_SPIN
-	.2byte MOVE_ROCK_SLIDE
-	.2byte MOVE_METAL_CLAW
-	.2byte MOVE_SWORDS_DANCE
-	.2byte MOVE_CRUSH_CLAW
-
-	egg_moves_begin SPECIES_NIDORAN_F
-	.2byte MOVE_SUPERSONIC
-	.2byte MOVE_DISABLE
-	.2byte MOVE_TAKE_DOWN
-	.2byte MOVE_FOCUS_ENERGY
-	.2byte MOVE_CHARM
-	.2byte MOVE_COUNTER
-	.2byte MOVE_BEAT_UP
-
-	egg_moves_begin SPECIES_NIDORAN_M
-	.2byte MOVE_COUNTER
-	.2byte MOVE_DISABLE
-	.2byte MOVE_SUPERSONIC
-	.2byte MOVE_TAKE_DOWN
-	.2byte MOVE_AMNESIA
-	.2byte MOVE_CONFUSION
-	.2byte MOVE_BEAT_UP
-
-	egg_moves_begin SPECIES_VULPIX
-	.2byte MOVE_FAINT_ATTACK
-	.2byte MOVE_HYPNOSIS
-	.2byte MOVE_FLAIL
-	.2byte MOVE_SPITE
-	.2byte MOVE_DISABLE
-	.2byte MOVE_HOWL
-	.2byte MOVE_PSYCH_UP
-	.2byte MOVE_HEAT_WAVE
-
-	egg_moves_begin SPECIES_ZUBAT
-	.2byte MOVE_QUICK_ATTACK
-	.2byte MOVE_PURSUIT
-	.2byte MOVE_FAINT_ATTACK
-	.2byte MOVE_GUST
-	.2byte MOVE_WHIRLWIND
-	.2byte MOVE_CURSE
-
-	egg_moves_begin SPECIES_ODDISH
-	.2byte MOVE_SWORDS_DANCE
-	.2byte MOVE_RAZOR_LEAF
-	.2byte MOVE_FLAIL
-	.2byte MOVE_SYNTHESIS
-	.2byte MOVE_CHARM
-	.2byte MOVE_INGRAIN
-
-	egg_moves_begin SPECIES_PARAS
-	.2byte MOVE_FALSE_SWIPE
-	.2byte MOVE_SCREECH
-	.2byte MOVE_COUNTER
-	.2byte MOVE_PSYBEAM
-	.2byte MOVE_FLAIL
-	.2byte MOVE_SWEET_SCENT
-	.2byte MOVE_LIGHT_SCREEN
-	.2byte MOVE_PURSUIT
-
-	egg_moves_begin SPECIES_VENONAT
-	.2byte MOVE_BATON_PASS
-	.2byte MOVE_SCREECH
-	.2byte MOVE_GIGA_DRAIN
-	.2byte MOVE_SIGNAL_BEAM
-
-	egg_moves_begin SPECIES_DIGLETT
-	.2byte MOVE_FAINT_ATTACK
-	.2byte MOVE_SCREECH
-	.2byte MOVE_ANCIENT_POWER
-	.2byte MOVE_PURSUIT
-	.2byte MOVE_BEAT_UP
-	.2byte MOVE_UPROAR
-	.2byte MOVE_ROCK_SLIDE
-
-	egg_moves_begin SPECIES_MEOWTH
-	.2byte MOVE_SPITE
-	.2byte MOVE_CHARM
-	.2byte MOVE_HYPNOSIS
-	.2byte MOVE_AMNESIA
-	.2byte MOVE_PSYCH_UP
-	.2byte MOVE_ASSIST
-
-	egg_moves_begin SPECIES_PSYDUCK
-	.2byte MOVE_HYPNOSIS
-	.2byte MOVE_PSYBEAM
-	.2byte MOVE_FORESIGHT
-	.2byte MOVE_LIGHT_SCREEN
-	.2byte MOVE_FUTURE_SIGHT
-	.2byte MOVE_PSYCHIC
-	.2byte MOVE_CROSS_CHOP
-	.2byte MOVE_REFRESH
-
-	egg_moves_begin SPECIES_MANKEY
-	.2byte MOVE_ROCK_SLIDE
-	.2byte MOVE_FORESIGHT
-	.2byte MOVE_MEDITATE
-	.2byte MOVE_COUNTER
-	.2byte MOVE_REVERSAL
-	.2byte MOVE_BEAT_UP
-	.2byte MOVE_REVENGE
-	.2byte MOVE_SMELLING_SALT
-
-	egg_moves_begin SPECIES_GROWLITHE
-	.2byte MOVE_BODY_SLAM
-	.2byte MOVE_SAFEGUARD
-	.2byte MOVE_CRUNCH
-	.2byte MOVE_THRASH
-	.2byte MOVE_FIRE_SPIN
-	.2byte MOVE_HOWL
-	.2byte MOVE_HEAT_WAVE
-
-	egg_moves_begin SPECIES_POLIWAG
-	.2byte MOVE_MIST
-	.2byte MOVE_SPLASH
-	.2byte MOVE_BUBBLE_BEAM
-	.2byte MOVE_HAZE
-	.2byte MOVE_MIND_READER
-	.2byte MOVE_WATER_SPORT
-	.2byte MOVE_ICE_BALL
-
-	egg_moves_begin SPECIES_ABRA
-	.2byte MOVE_ENCORE
-	.2byte MOVE_BARRIER
-	.2byte MOVE_KNOCK_OFF
-	.2byte MOVE_FIRE_PUNCH
-	.2byte MOVE_THUNDER_PUNCH
-	.2byte MOVE_ICE_PUNCH
-
-	egg_moves_begin SPECIES_MACHOP
-	.2byte MOVE_LIGHT_SCREEN
-	.2byte MOVE_MEDITATE
-	.2byte MOVE_ROLLING_KICK
-	.2byte MOVE_ENCORE
-	.2byte MOVE_SMELLING_SALT
-	.2byte MOVE_COUNTER
-	.2byte MOVE_ROCK_SLIDE
-
-	egg_moves_begin SPECIES_BELLSPROUT
-	.2byte MOVE_SWORDS_DANCE
-	.2byte MOVE_ENCORE
-	.2byte MOVE_REFLECT
-	.2byte MOVE_SYNTHESIS
-	.2byte MOVE_LEECH_LIFE
-	.2byte MOVE_INGRAIN
-	.2byte MOVE_MAGICAL_LEAF
-
-	egg_moves_begin SPECIES_TENTACOOL
-	.2byte MOVE_AURORA_BEAM
-	.2byte MOVE_MIRROR_COAT
-	.2byte MOVE_RAPID_SPIN
-	.2byte MOVE_HAZE
-	.2byte MOVE_SAFEGUARD
-	.2byte MOVE_CONFUSE_RAY
-
-	egg_moves_begin SPECIES_GEODUDE
-	.2byte MOVE_MEGA_PUNCH
-	.2byte MOVE_ROCK_SLIDE
-	.2byte MOVE_BLOCK
-
-	egg_moves_begin SPECIES_PONYTA
-	.2byte MOVE_FLAME_WHEEL
-	.2byte MOVE_THRASH
-	.2byte MOVE_DOUBLE_KICK
-	.2byte MOVE_HYPNOSIS
-	.2byte MOVE_CHARM
-	.2byte MOVE_DOUBLE_EDGE
-
-	egg_moves_begin SPECIES_SLOWPOKE
-	.2byte MOVE_SAFEGUARD
-	.2byte MOVE_BELLY_DRUM
-	.2byte MOVE_FUTURE_SIGHT
-	.2byte MOVE_STOMP
-	.2byte MOVE_MUD_SPORT
-	.2byte MOVE_SLEEP_TALK
-	.2byte MOVE_SNORE
-
-	egg_moves_begin SPECIES_FARFETCH_D
-	.2byte MOVE_STEEL_WING
-	.2byte MOVE_FORESIGHT
-	.2byte MOVE_MIRROR_MOVE
-	.2byte MOVE_GUST
-	.2byte MOVE_QUICK_ATTACK
-	.2byte MOVE_FLAIL
-	.2byte MOVE_FEATHER_DANCE
-	.2byte MOVE_CURSE
-
-	egg_moves_begin SPECIES_DODUO
-	.2byte MOVE_QUICK_ATTACK
-	.2byte MOVE_SUPERSONIC
-	.2byte MOVE_HAZE
-	.2byte MOVE_FAINT_ATTACK
-	.2byte MOVE_FLAIL
-	.2byte MOVE_ENDEAVOR
-
-	egg_moves_begin SPECIES_SEEL
-	.2byte MOVE_LICK
-	.2byte MOVE_PERISH_SONG
-	.2byte MOVE_DISABLE
-	.2byte MOVE_HORN_DRILL
-	.2byte MOVE_SLAM
-	.2byte MOVE_ENCORE
-	.2byte MOVE_FAKE_OUT
-	.2byte MOVE_ICICLE_SPEAR
-
-	egg_moves_begin SPECIES_GRIMER
-	.2byte MOVE_HAZE
-	.2byte MOVE_MEAN_LOOK
-	.2byte MOVE_LICK
-	.2byte MOVE_IMPRISON
-	.2byte MOVE_CURSE
-	.2byte MOVE_SHADOW_PUNCH
-	.2byte MOVE_EXPLOSION
-
-	egg_moves_begin SPECIES_SHELLDER
-	.2byte MOVE_BUBBLE_BEAM
-	.2byte MOVE_TAKE_DOWN
-	.2byte MOVE_BARRIER
-	.2byte MOVE_RAPID_SPIN
-	.2byte MOVE_SCREECH
-	.2byte MOVE_ICICLE_SPEAR
-
-	egg_moves_begin SPECIES_GASTLY
-	.2byte MOVE_PSYWAVE
-	.2byte MOVE_PERISH_SONG
-	.2byte MOVE_HAZE
-	.2byte MOVE_ASTONISH
-	.2byte MOVE_WILL_O_WISP
-	.2byte MOVE_GRUDGE
-	.2byte MOVE_EXPLOSION
-
-	egg_moves_begin SPECIES_ONIX
-	.2byte MOVE_ROCK_SLIDE
-	.2byte MOVE_FLAIL
-	.2byte MOVE_EXPLOSION
-	.2byte MOVE_BLOCK
-
-	egg_moves_begin SPECIES_DROWZEE
-	.2byte MOVE_BARRIER
-	.2byte MOVE_ASSIST
-	.2byte MOVE_ROLE_PLAY
-	.2byte MOVE_FIRE_PUNCH
-	.2byte MOVE_THUNDER_PUNCH
-	.2byte MOVE_ICE_PUNCH
-
-	egg_moves_begin SPECIES_KRABBY
-	.2byte MOVE_DIG
-	.2byte MOVE_HAZE
-	.2byte MOVE_AMNESIA
-	.2byte MOVE_FLAIL
-	.2byte MOVE_SLAM
-	.2byte MOVE_KNOCK_OFF
-	.2byte MOVE_SWORDS_DANCE
-
-	egg_moves_begin SPECIES_EXEGGCUTE
-	.2byte MOVE_SYNTHESIS
-	.2byte MOVE_MOONLIGHT
-	.2byte MOVE_REFLECT
-	.2byte MOVE_ANCIENT_POWER
-	.2byte MOVE_PSYCH_UP
-	.2byte MOVE_INGRAIN
-	.2byte MOVE_CURSE
-
-	egg_moves_begin SPECIES_CUBONE
-	.2byte MOVE_ROCK_SLIDE
-	.2byte MOVE_ANCIENT_POWER
-	.2byte MOVE_BELLY_DRUM
-	.2byte MOVE_SCREECH
-	.2byte MOVE_SKULL_BASH
-	.2byte MOVE_PERISH_SONG
-	.2byte MOVE_SWORDS_DANCE
-
-	egg_moves_begin SPECIES_LICKITUNG
-	.2byte MOVE_BELLY_DRUM
-	.2byte MOVE_MAGNITUDE
-	.2byte MOVE_BODY_SLAM
-	.2byte MOVE_CURSE
-	.2byte MOVE_SMELLING_SALT
-	.2byte MOVE_SLEEP_TALK
-	.2byte MOVE_SNORE
-	.2byte MOVE_SUBSTITUTE
-
-	egg_moves_begin SPECIES_KOFFING
-	.2byte MOVE_SCREECH
-	.2byte MOVE_PSYWAVE
-	.2byte MOVE_PSYBEAM
-	.2byte MOVE_DESTINY_BOND
-	.2byte MOVE_PAIN_SPLIT
-	.2byte MOVE_WILL_O_WISP
-
-	egg_moves_begin SPECIES_RHYHORN
-	.2byte MOVE_CRUNCH
-	.2byte MOVE_REVERSAL
-	.2byte MOVE_ROCK_SLIDE
-	.2byte MOVE_COUNTER
-	.2byte MOVE_MAGNITUDE
-	.2byte MOVE_SWORDS_DANCE
-	.2byte MOVE_CURSE
-	.2byte MOVE_CRUSH_CLAW
-
-	egg_moves_begin SPECIES_CHANSEY
-	.2byte MOVE_PRESENT
-	.2byte MOVE_METRONOME
-	.2byte MOVE_HEAL_BELL
-	.2byte MOVE_AROMATHERAPY
-	.2byte MOVE_SUBSTITUTE
-
-	egg_moves_begin SPECIES_TANGELA
-	.2byte MOVE_FLAIL
-	.2byte MOVE_CONFUSION
-	.2byte MOVE_MEGA_DRAIN
-	.2byte MOVE_REFLECT
-	.2byte MOVE_AMNESIA
-	.2byte MOVE_LEECH_SEED
-	.2byte MOVE_NATURE_POWER
-
-	egg_moves_begin SPECIES_KANGASKHAN
-	.2byte MOVE_STOMP
-	.2byte MOVE_FORESIGHT
-	.2byte MOVE_FOCUS_ENERGY
-	.2byte MOVE_SAFEGUARD
-	.2byte MOVE_DISABLE
-	.2byte MOVE_COUNTER
-	.2byte MOVE_CRUSH_CLAW
-	.2byte MOVE_SUBSTITUTE
-
-	egg_moves_begin SPECIES_HORSEA
-	.2byte MOVE_FLAIL
-	.2byte MOVE_AURORA_BEAM
-	.2byte MOVE_OCTAZOOKA
-	.2byte MOVE_DISABLE
-	.2byte MOVE_SPLASH
-	.2byte MOVE_DRAGON_RAGE
-	.2byte MOVE_DRAGON_BREATH
-
-	egg_moves_begin SPECIES_GOLDEEN
-	.2byte MOVE_PSYBEAM
-	.2byte MOVE_HAZE
-	.2byte MOVE_HYDRO_PUMP
-	.2byte MOVE_SLEEP_TALK
-	.2byte MOVE_MUD_SPORT
-
-	egg_moves_begin SPECIES_MR_MIME
-	.2byte MOVE_FUTURE_SIGHT
-	.2byte MOVE_HYPNOSIS
-	.2byte MOVE_MIMIC
-	.2byte MOVE_PSYCH_UP
-	.2byte MOVE_FAKE_OUT
-	.2byte MOVE_TRICK
-
-	egg_moves_begin SPECIES_SCYTHER
-	.2byte MOVE_COUNTER
-	.2byte MOVE_SAFEGUARD
-	.2byte MOVE_BATON_PASS
-	.2byte MOVE_RAZOR_WIND
-	.2byte MOVE_REVERSAL
-	.2byte MOVE_LIGHT_SCREEN
-	.2byte MOVE_ENDURE
-	.2byte MOVE_SILVER_WIND
-
-	egg_moves_begin SPECIES_PINSIR
-	.2byte MOVE_FURY_ATTACK
-	.2byte MOVE_FLAIL
-	.2byte MOVE_FALSE_SWIPE
-	.2byte MOVE_FAINT_ATTACK
-
-	egg_moves_begin SPECIES_LAPRAS
-	.2byte MOVE_FORESIGHT
-	.2byte MOVE_SUBSTITUTE
-	.2byte MOVE_TICKLE
-	.2byte MOVE_REFRESH
-	.2byte MOVE_DRAGON_DANCE
-	.2byte MOVE_CURSE
-	.2byte MOVE_SLEEP_TALK
-	.2byte MOVE_HORN_DRILL
-
-	egg_moves_begin SPECIES_EEVEE
-	.2byte MOVE_CHARM
-	.2byte MOVE_FLAIL
-	.2byte MOVE_ENDURE
-	.2byte MOVE_CURSE
-	.2byte MOVE_TICKLE
-	.2byte MOVE_WISH
-
-	egg_moves_begin SPECIES_OMANYTE
-	.2byte MOVE_BUBBLE_BEAM
-	.2byte MOVE_AURORA_BEAM
-	.2byte MOVE_SLAM
-	.2byte MOVE_SUPERSONIC
-	.2byte MOVE_HAZE
-	.2byte MOVE_ROCK_SLIDE
-	.2byte MOVE_SPIKES
-
-	egg_moves_begin SPECIES_KABUTO
-	.2byte MOVE_BUBBLE_BEAM
-	.2byte MOVE_AURORA_BEAM
-	.2byte MOVE_RAPID_SPIN
-	.2byte MOVE_DIG
-	.2byte MOVE_FLAIL
-	.2byte MOVE_KNOCK_OFF
-	.2byte MOVE_CONFUSE_RAY
-
-	egg_moves_begin SPECIES_AERODACTYL
-	.2byte MOVE_WHIRLWIND
-	.2byte MOVE_PURSUIT
-	.2byte MOVE_FORESIGHT
-	.2byte MOVE_STEEL_WING
-	.2byte MOVE_DRAGON_BREATH
-	.2byte MOVE_CURSE
-
-	egg_moves_begin SPECIES_SNORLAX
-	.2byte MOVE_LICK
-	.2byte MOVE_CHARM
-	.2byte MOVE_DOUBLE_EDGE
-	.2byte MOVE_CURSE
-	.2byte MOVE_FISSURE
-	.2byte MOVE_SUBSTITUTE
-
-	egg_moves_begin SPECIES_DRATINI
-	.2byte MOVE_LIGHT_SCREEN
-	.2byte MOVE_MIST
-	.2byte MOVE_HAZE
-	.2byte MOVE_SUPERSONIC
-	.2byte MOVE_DRAGON_BREATH
-	.2byte MOVE_DRAGON_DANCE
-
-	egg_moves_begin SPECIES_CHIKORITA
-	.2byte MOVE_VINE_WHIP
-	.2byte MOVE_LEECH_SEED
-	.2byte MOVE_COUNTER
-	.2byte MOVE_ANCIENT_POWER
-	.2byte MOVE_FLAIL
-	.2byte MOVE_NATURE_POWER
-	.2byte MOVE_INGRAIN
-	.2byte MOVE_GRASS_WHISTLE
-
-	egg_moves_begin SPECIES_CYNDAQUIL
-	.2byte MOVE_FURY_SWIPES
-	.2byte MOVE_QUICK_ATTACK
-	.2byte MOVE_REVERSAL
-	.2byte MOVE_THRASH
-	.2byte MOVE_FORESIGHT
-	.2byte MOVE_COVET
-	.2byte MOVE_HOWL
-	.2byte MOVE_CRUSH_CLAW
-
-	egg_moves_begin SPECIES_TOTODILE
-	.2byte MOVE_CRUNCH
-	.2byte MOVE_THRASH
-	.2byte MOVE_HYDRO_PUMP
-	.2byte MOVE_ANCIENT_POWER
-	.2byte MOVE_ROCK_SLIDE
-	.2byte MOVE_MUD_SPORT
-	.2byte MOVE_WATER_SPORT
-	.2byte MOVE_DRAGON_CLAW
-
-	egg_moves_begin SPECIES_SENTRET
-	.2byte MOVE_DOUBLE_EDGE
-	.2byte MOVE_PURSUIT
-	.2byte MOVE_SLASH
-	.2byte MOVE_FOCUS_ENERGY
-	.2byte MOVE_REVERSAL
-	.2byte MOVE_SUBSTITUTE
-	.2byte MOVE_TRICK
-	.2byte MOVE_ASSIST
-
-	egg_moves_begin SPECIES_HOOTHOOT
-	.2byte MOVE_MIRROR_MOVE
-	.2byte MOVE_SUPERSONIC
-	.2byte MOVE_FAINT_ATTACK
-	.2byte MOVE_WING_ATTACK
-	.2byte MOVE_WHIRLWIND
-	.2byte MOVE_SKY_ATTACK
-	.2byte MOVE_FEATHER_DANCE
-
-	egg_moves_begin SPECIES_LEDYBA
-	.2byte MOVE_PSYBEAM
-	.2byte MOVE_BIDE
-	.2byte MOVE_SILVER_WIND
-
-	egg_moves_begin SPECIES_SPINARAK
-	.2byte MOVE_PSYBEAM
-	.2byte MOVE_DISABLE
-	.2byte MOVE_SONIC_BOOM
-	.2byte MOVE_BATON_PASS
-	.2byte MOVE_PURSUIT
-	.2byte MOVE_SIGNAL_BEAM
-
-	egg_moves_begin SPECIES_CHINCHOU
-	.2byte MOVE_FLAIL
-	.2byte MOVE_SCREECH
-	.2byte MOVE_AMNESIA
-
-	egg_moves_begin SPECIES_PICHU
-	.2byte MOVE_REVERSAL
-	.2byte MOVE_BIDE
-	.2byte MOVE_PRESENT
-	.2byte MOVE_ENCORE
-	.2byte MOVE_DOUBLE_SLAP
-	.2byte MOVE_WISH
-	.2byte MOVE_CHARGE
-
-	egg_moves_begin SPECIES_CLEFFA
-	.2byte MOVE_PRESENT
-	.2byte MOVE_METRONOME
-	.2byte MOVE_AMNESIA
-	.2byte MOVE_BELLY_DRUM
-	.2byte MOVE_SPLASH
-	.2byte MOVE_MIMIC
-	.2byte MOVE_WISH
-	.2byte MOVE_SUBSTITUTE
-
-	egg_moves_begin SPECIES_IGGLYBUFF
-	.2byte MOVE_PERISH_SONG
-	.2byte MOVE_PRESENT
-	.2byte MOVE_FAINT_ATTACK
-	.2byte MOVE_WISH
-	.2byte MOVE_FAKE_TEARS
-
-	egg_moves_begin SPECIES_TOGEPI
-	.2byte MOVE_PRESENT
-	.2byte MOVE_MIRROR_MOVE
-	.2byte MOVE_PECK
-	.2byte MOVE_FORESIGHT
-	.2byte MOVE_FUTURE_SIGHT
-	.2byte MOVE_SUBSTITUTE
-	.2byte MOVE_PSYCH_UP
-
-	egg_moves_begin SPECIES_NATU
-	.2byte MOVE_HAZE
-	.2byte MOVE_DRILL_PECK
-	.2byte MOVE_QUICK_ATTACK
-	.2byte MOVE_FAINT_ATTACK
-	.2byte MOVE_STEEL_WING
-	.2byte MOVE_PSYCH_UP
-	.2byte MOVE_FEATHER_DANCE
-	.2byte MOVE_REFRESH
-
-	egg_moves_begin SPECIES_MAREEP
-	.2byte MOVE_TAKE_DOWN
-	.2byte MOVE_BODY_SLAM
-	.2byte MOVE_SAFEGUARD
-	.2byte MOVE_SCREECH
-	.2byte MOVE_REFLECT
-	.2byte MOVE_ODOR_SLEUTH
-	.2byte MOVE_CHARGE
-
-	egg_moves_begin SPECIES_MARILL
-	.2byte MOVE_LIGHT_SCREEN
-	.2byte MOVE_PRESENT
-	.2byte MOVE_AMNESIA
-	.2byte MOVE_FUTURE_SIGHT
-	.2byte MOVE_BELLY_DRUM
-	.2byte MOVE_PERISH_SONG
-	.2byte MOVE_SUPERSONIC
-	.2byte MOVE_SUBSTITUTE
-
-	egg_moves_begin SPECIES_SUDOWOODO
-	.2byte MOVE_SELF_DESTRUCT
-
-	egg_moves_begin SPECIES_HOPPIP
-	.2byte MOVE_CONFUSION
-	.2byte MOVE_ENCORE
-	.2byte MOVE_DOUBLE_EDGE
-	.2byte MOVE_REFLECT
-	.2byte MOVE_AMNESIA
-	.2byte MOVE_HELPING_HAND
-	.2byte MOVE_PSYCH_UP
-
-	egg_moves_begin SPECIES_AIPOM
-	.2byte MOVE_COUNTER
-	.2byte MOVE_SCREECH
-	.2byte MOVE_PURSUIT
-	.2byte MOVE_AGILITY
-	.2byte MOVE_SPITE
-	.2byte MOVE_SLAM
-	.2byte MOVE_DOUBLE_SLAP
-	.2byte MOVE_BEAT_UP
-
-	egg_moves_begin SPECIES_SUNKERN
-	.2byte MOVE_GRASS_WHISTLE
-	.2byte MOVE_ENCORE
-	.2byte MOVE_LEECH_SEED
-	.2byte MOVE_NATURE_POWER
-	.2byte MOVE_CURSE
-	.2byte MOVE_HELPING_HAND
-
-	egg_moves_begin SPECIES_YANMA
-	.2byte MOVE_WHIRLWIND
-	.2byte MOVE_REVERSAL
-	.2byte MOVE_LEECH_LIFE
-	.2byte MOVE_SIGNAL_BEAM
-	.2byte MOVE_SILVER_WIND
-
-	egg_moves_begin SPECIES_WOOPER
-	.2byte MOVE_BODY_SLAM
-	.2byte MOVE_ANCIENT_POWER
-	.2byte MOVE_SAFEGUARD
-	.2byte MOVE_CURSE
-	.2byte MOVE_MUD_SPORT
-	.2byte MOVE_STOCKPILE
-	.2byte MOVE_SWALLOW
-	.2byte MOVE_SPIT_UP
-
-	egg_moves_begin SPECIES_MURKROW
-	.2byte MOVE_WHIRLWIND
-	.2byte MOVE_DRILL_PECK
-	.2byte MOVE_MIRROR_MOVE
-	.2byte MOVE_WING_ATTACK
-	.2byte MOVE_SKY_ATTACK
-	.2byte MOVE_CONFUSE_RAY
-	.2byte MOVE_FEATHER_DANCE
-	.2byte MOVE_PERISH_SONG
-
-	egg_moves_begin SPECIES_MISDREAVUS
-	.2byte MOVE_SCREECH
-	.2byte MOVE_DESTINY_BOND
-	.2byte MOVE_PSYCH_UP
-	.2byte MOVE_IMPRISON
-
-	egg_moves_begin SPECIES_GIRAFARIG
-	.2byte MOVE_TAKE_DOWN
-	.2byte MOVE_AMNESIA
-	.2byte MOVE_FORESIGHT
-	.2byte MOVE_FUTURE_SIGHT
-	.2byte MOVE_BEAT_UP
-	.2byte MOVE_PSYCH_UP
-	.2byte MOVE_WISH
-	.2byte MOVE_MAGIC_COAT
-
-	egg_moves_begin SPECIES_PINECO
-	.2byte MOVE_REFLECT
-	.2byte MOVE_PIN_MISSILE
-	.2byte MOVE_FLAIL
-	.2byte MOVE_SWIFT
-	.2byte MOVE_COUNTER
-	.2byte MOVE_SAND_TOMB
-
-	egg_moves_begin SPECIES_DUNSPARCE
-	.2byte MOVE_BIDE
-	.2byte MOVE_ANCIENT_POWER
-	.2byte MOVE_ROCK_SLIDE
-	.2byte MOVE_BITE
-	.2byte MOVE_HEADBUTT
-	.2byte MOVE_ASTONISH
-	.2byte MOVE_CURSE
-
-	egg_moves_begin SPECIES_GLIGAR
-	.2byte MOVE_METAL_CLAW
-	.2byte MOVE_WING_ATTACK
-	.2byte MOVE_RAZOR_WIND
-	.2byte MOVE_COUNTER
-	.2byte MOVE_SAND_TOMB
-
-	egg_moves_begin SPECIES_SNUBBULL
-	.2byte MOVE_METRONOME
-	.2byte MOVE_FAINT_ATTACK
-	.2byte MOVE_REFLECT
-	.2byte MOVE_PRESENT
-	.2byte MOVE_CRUNCH
-	.2byte MOVE_HEAL_BELL
-	.2byte MOVE_SNORE
-	.2byte MOVE_SMELLING_SALT
-
-	egg_moves_begin SPECIES_QWILFISH
-	.2byte MOVE_FLAIL
-	.2byte MOVE_HAZE
-	.2byte MOVE_BUBBLE_BEAM
-	.2byte MOVE_SUPERSONIC
-	.2byte MOVE_ASTONISH
-
-	egg_moves_begin SPECIES_SHUCKLE
-	.2byte MOVE_SWEET_SCENT
-
-	egg_moves_begin SPECIES_HERACROSS
-	.2byte MOVE_HARDEN
-	.2byte MOVE_BIDE
-	.2byte MOVE_FLAIL
-	.2byte MOVE_FALSE_SWIPE
-
-	egg_moves_begin SPECIES_SNEASEL
-	.2byte MOVE_COUNTER
-	.2byte MOVE_SPITE
-	.2byte MOVE_FORESIGHT
-	.2byte MOVE_REFLECT
-	.2byte MOVE_BITE
-	.2byte MOVE_CRUSH_CLAW
-	.2byte MOVE_FAKE_OUT
-
-	egg_moves_begin SPECIES_TEDDIURSA
-	.2byte MOVE_CRUNCH
-	.2byte MOVE_TAKE_DOWN
-	.2byte MOVE_SEISMIC_TOSS
-	.2byte MOVE_COUNTER
-	.2byte MOVE_METAL_CLAW
-	.2byte MOVE_FAKE_TEARS
-	.2byte MOVE_YAWN
-	.2byte MOVE_SLEEP_TALK
-
-	egg_moves_begin SPECIES_SLUGMA
-	.2byte MOVE_ACID_ARMOR
-	.2byte MOVE_HEAT_WAVE
-
-	egg_moves_begin SPECIES_SWINUB
-	.2byte MOVE_TAKE_DOWN
-	.2byte MOVE_BITE
-	.2byte MOVE_BODY_SLAM
-	.2byte MOVE_ROCK_SLIDE
-	.2byte MOVE_ANCIENT_POWER
-	.2byte MOVE_MUD_SHOT
-	.2byte MOVE_ICICLE_SPEAR
-	.2byte MOVE_DOUBLE_EDGE
-
-	egg_moves_begin SPECIES_CORSOLA
-	.2byte MOVE_ROCK_SLIDE
-	.2byte MOVE_SCREECH
-	.2byte MOVE_MIST
-	.2byte MOVE_AMNESIA
-	.2byte MOVE_BARRIER
-	.2byte MOVE_INGRAIN
-	.2byte MOVE_CONFUSE_RAY
-	.2byte MOVE_ICICLE_SPEAR
-
-	egg_moves_begin SPECIES_REMORAID
-	.2byte MOVE_AURORA_BEAM
-	.2byte MOVE_OCTAZOOKA
-	.2byte MOVE_SUPERSONIC
-	.2byte MOVE_HAZE
-	.2byte MOVE_SCREECH
-	.2byte MOVE_THUNDER_WAVE
-	.2byte MOVE_ROCK_BLAST
-
-	egg_moves_begin SPECIES_DELIBIRD
-	.2byte MOVE_AURORA_BEAM
-	.2byte MOVE_QUICK_ATTACK
-	.2byte MOVE_FUTURE_SIGHT
-	.2byte MOVE_SPLASH
-	.2byte MOVE_RAPID_SPIN
-	.2byte MOVE_ICE_BALL
-
-	egg_moves_begin SPECIES_MANTINE
-	.2byte MOVE_TWISTER
-	.2byte MOVE_HYDRO_PUMP
-	.2byte MOVE_HAZE
-	.2byte MOVE_SLAM
-	.2byte MOVE_MUD_SPORT
-	.2byte MOVE_ROCK_SLIDE
-
-	egg_moves_begin SPECIES_SKARMORY
-	.2byte MOVE_DRILL_PECK
-	.2byte MOVE_PURSUIT
-	.2byte MOVE_WHIRLWIND
-	.2byte MOVE_SKY_ATTACK
-	.2byte MOVE_CURSE
-
-	egg_moves_begin SPECIES_HOUNDOUR
-	.2byte MOVE_FIRE_SPIN
-	.2byte MOVE_RAGE
-	.2byte MOVE_PURSUIT
-	.2byte MOVE_COUNTER
-	.2byte MOVE_SPITE
-	.2byte MOVE_REVERSAL
-	.2byte MOVE_BEAT_UP
-	.2byte MOVE_WILL_O_WISP
-
-	egg_moves_begin SPECIES_PHANPY
-	.2byte MOVE_FOCUS_ENERGY
-	.2byte MOVE_BODY_SLAM
-	.2byte MOVE_ANCIENT_POWER
-	.2byte MOVE_SNORE
-	.2byte MOVE_COUNTER
-	.2byte MOVE_FISSURE
-
-	egg_moves_begin SPECIES_STANTLER
-	.2byte MOVE_SPITE
-	.2byte MOVE_DISABLE
-	.2byte MOVE_BITE
-	.2byte MOVE_SWAGGER
-	.2byte MOVE_PSYCH_UP
-	.2byte MOVE_EXTRASENSORY
-
-	egg_moves_begin SPECIES_TYROGUE
-	.2byte MOVE_RAPID_SPIN
-	.2byte MOVE_HI_JUMP_KICK
-	.2byte MOVE_MACH_PUNCH
-	.2byte MOVE_MIND_READER
-	.2byte MOVE_HELPING_HAND
-
-	egg_moves_begin SPECIES_SMOOCHUM
-	.2byte MOVE_MEDITATE
-	.2byte MOVE_PSYCH_UP
-	.2byte MOVE_FAKE_OUT
-	.2byte MOVE_WISH
-	.2byte MOVE_ICE_PUNCH
-
-	egg_moves_begin SPECIES_ELEKID
-	.2byte MOVE_KARATE_CHOP
-	.2byte MOVE_BARRIER
-	.2byte MOVE_ROLLING_KICK
-	.2byte MOVE_MEDITATE
-	.2byte MOVE_CROSS_CHOP
-	.2byte MOVE_FIRE_PUNCH
-	.2byte MOVE_ICE_PUNCH
-
-	egg_moves_begin SPECIES_MAGBY
-	.2byte MOVE_KARATE_CHOP
-	.2byte MOVE_MEGA_PUNCH
-	.2byte MOVE_BARRIER
-	.2byte MOVE_SCREECH
-	.2byte MOVE_CROSS_CHOP
-	.2byte MOVE_THUNDER_PUNCH
-
-	egg_moves_begin SPECIES_MILTANK
-	.2byte MOVE_PRESENT
-	.2byte MOVE_REVERSAL
-	.2byte MOVE_SEISMIC_TOSS
-	.2byte MOVE_ENDURE
-	.2byte MOVE_PSYCH_UP
-	.2byte MOVE_CURSE
-	.2byte MOVE_HELPING_HAND
-	.2byte MOVE_SLEEP_TALK
-
-	egg_moves_begin SPECIES_LARVITAR
-	.2byte MOVE_PURSUIT
-	.2byte MOVE_STOMP
-	.2byte MOVE_OUTRAGE
-	.2byte MOVE_FOCUS_ENERGY
-	.2byte MOVE_ANCIENT_POWER
-	.2byte MOVE_DRAGON_DANCE
-	.2byte MOVE_CURSE
-
-	egg_moves_begin SPECIES_TREECKO
-	.2byte MOVE_CRUNCH
-	.2byte MOVE_MUD_SPORT
-	.2byte MOVE_ENDEAVOR
-	.2byte MOVE_LEECH_SEED
-	.2byte MOVE_DRAGON_BREATH
-	.2byte MOVE_CRUSH_CLAW
-
-	egg_moves_begin SPECIES_TORCHIC
-	.2byte MOVE_COUNTER
-	.2byte MOVE_REVERSAL
-	.2byte MOVE_ENDURE
-	.2byte MOVE_SWAGGER
-	.2byte MOVE_ROCK_SLIDE
-	.2byte MOVE_SMELLING_SALT
-
-	egg_moves_begin SPECIES_MUDKIP
-	.2byte MOVE_REFRESH
-	.2byte MOVE_UPROAR
-	.2byte MOVE_CURSE
-	.2byte MOVE_STOMP
-	.2byte MOVE_ICE_BALL
-	.2byte MOVE_MIRROR_COAT
-
-	egg_moves_begin SPECIES_POOCHYENA
-	.2byte MOVE_ASTONISH
-	.2byte MOVE_POISON_FANG
-	.2byte MOVE_COVET
-	.2byte MOVE_LEER
-	.2byte MOVE_YAWN
-
-	egg_moves_begin SPECIES_ZIGZAGOON
-	.2byte MOVE_CHARM
-	.2byte MOVE_PURSUIT
-	.2byte MOVE_SUBSTITUTE
-	.2byte MOVE_TICKLE
-	.2byte MOVE_TRICK
-
-	egg_moves_begin SPECIES_LOTAD
-	.2byte MOVE_SYNTHESIS
-	.2byte MOVE_RAZOR_LEAF
-	.2byte MOVE_SWEET_SCENT
-	.2byte MOVE_LEECH_SEED
-	.2byte MOVE_FLAIL
-	.2byte MOVE_WATER_GUN
-
-	egg_moves_begin SPECIES_SEEDOT
-	.2byte MOVE_LEECH_SEED
-	.2byte MOVE_AMNESIA
-	.2byte MOVE_QUICK_ATTACK
-	.2byte MOVE_RAZOR_WIND
-	.2byte MOVE_TAKE_DOWN
-	.2byte MOVE_FALSE_SWIPE
-
-	egg_moves_begin SPECIES_NINCADA
-	.2byte MOVE_ENDURE
-	.2byte MOVE_FAINT_ATTACK
-	.2byte MOVE_GUST
-	.2byte MOVE_SILVER_WIND
-
-	egg_moves_begin SPECIES_TAILLOW
-	.2byte MOVE_PURSUIT
-	.2byte MOVE_SUPERSONIC
-	.2byte MOVE_REFRESH
-	.2byte MOVE_MIRROR_MOVE
-	.2byte MOVE_RAGE
-	.2byte MOVE_SKY_ATTACK
-
-	egg_moves_begin SPECIES_SHROOMISH
-	.2byte MOVE_FAKE_TEARS
-	.2byte MOVE_SWAGGER
-	.2byte MOVE_CHARM
-	.2byte MOVE_FALSE_SWIPE
-	.2byte MOVE_HELPING_HAND
-
-	egg_moves_begin SPECIES_SPINDA
-	.2byte MOVE_ENCORE
-	.2byte MOVE_ROCK_SLIDE
-	.2byte MOVE_ASSIST
-	.2byte MOVE_DISABLE
-	.2byte MOVE_BATON_PASS
-	.2byte MOVE_WISH
-	.2byte MOVE_TRICK
-	.2byte MOVE_SMELLING_SALT
-
-	egg_moves_begin SPECIES_WINGULL
-	.2byte MOVE_MIST
-	.2byte MOVE_TWISTER
-	.2byte MOVE_AGILITY
-	.2byte MOVE_GUST
-	.2byte MOVE_WATER_SPORT
-
-	egg_moves_begin SPECIES_SURSKIT
-	.2byte MOVE_FORESIGHT
-	.2byte MOVE_MUD_SHOT
-	.2byte MOVE_PSYBEAM
-	.2byte MOVE_HYDRO_PUMP
-	.2byte MOVE_MIND_READER
-
-	egg_moves_begin SPECIES_WAILMER
-	.2byte MOVE_DOUBLE_EDGE
-	.2byte MOVE_THRASH
-	.2byte MOVE_SWAGGER
-	.2byte MOVE_SNORE
-	.2byte MOVE_SLEEP_TALK
-	.2byte MOVE_CURSE
-	.2byte MOVE_FISSURE
-	.2byte MOVE_TICKLE
-
-	egg_moves_begin SPECIES_SKITTY
-	.2byte MOVE_HELPING_HAND
-	.2byte MOVE_PSYCH_UP
-	.2byte MOVE_UPROAR
-	.2byte MOVE_FAKE_TEARS
-	.2byte MOVE_WISH
-	.2byte MOVE_BATON_PASS
-	.2byte MOVE_SUBSTITUTE
-	.2byte MOVE_TICKLE
-
-	egg_moves_begin SPECIES_KECLEON
-	.2byte MOVE_DISABLE
-	.2byte MOVE_MAGIC_COAT
-	.2byte MOVE_TRICK
-
-	egg_moves_begin SPECIES_NOSEPASS
-	.2byte MOVE_MAGNITUDE
-	.2byte MOVE_ROLLOUT
-	.2byte MOVE_EXPLOSION
-
-	egg_moves_begin SPECIES_TORKOAL
-	.2byte MOVE_ERUPTION
-	.2byte MOVE_ENDURE
-	.2byte MOVE_SLEEP_TALK
-	.2byte MOVE_YAWN
-
-	egg_moves_begin SPECIES_SABLEYE
-	.2byte MOVE_PSYCH_UP
-	.2byte MOVE_RECOVER
-	.2byte MOVE_MOONLIGHT
-
-	egg_moves_begin SPECIES_BARBOACH
-	.2byte MOVE_THRASH
-	.2byte MOVE_WHIRLPOOL
-	.2byte MOVE_SPARK
-
-	egg_moves_begin SPECIES_LUVDISC
-	.2byte MOVE_SPLASH
-	.2byte MOVE_SUPERSONIC
-	.2byte MOVE_WATER_SPORT
-	.2byte MOVE_MUD_SPORT
-
-	egg_moves_begin SPECIES_CORPHISH
-	.2byte MOVE_MUD_SPORT
-	.2byte MOVE_ENDEAVOR
-	.2byte MOVE_BODY_SLAM
-	.2byte MOVE_ANCIENT_POWER
-
-	egg_moves_begin SPECIES_FEEBAS
-	.2byte MOVE_MIRROR_COAT
-	.2byte MOVE_DRAGON_BREATH
-	.2byte MOVE_MUD_SPORT
-	.2byte MOVE_HYPNOSIS
-	.2byte MOVE_LIGHT_SCREEN
-	.2byte MOVE_CONFUSE_RAY
-
-	egg_moves_begin SPECIES_CARVANHA
-	.2byte MOVE_HYDRO_PUMP
-	.2byte MOVE_DOUBLE_EDGE
-	.2byte MOVE_THRASH
-
-	egg_moves_begin SPECIES_TRAPINCH
-	.2byte MOVE_FOCUS_ENERGY
-	.2byte MOVE_QUICK_ATTACK
-	.2byte MOVE_GUST
-
-	egg_moves_begin SPECIES_MAKUHITA
-	.2byte MOVE_FAINT_ATTACK
-	.2byte MOVE_DETECT
-	.2byte MOVE_FORESIGHT
-	.2byte MOVE_HELPING_HAND
-	.2byte MOVE_CROSS_CHOP
-	.2byte MOVE_REVENGE
-	.2byte MOVE_DYNAMIC_PUNCH
-	.2byte MOVE_COUNTER
-
-	egg_moves_begin SPECIES_ELECTRIKE
-	.2byte MOVE_CRUNCH
-	.2byte MOVE_HEADBUTT
-	.2byte MOVE_UPROAR
-	.2byte MOVE_CURSE
-	.2byte MOVE_SWIFT
-
-	egg_moves_begin SPECIES_NUMEL
-	.2byte MOVE_HOWL
-	.2byte MOVE_SCARY_FACE
-	.2byte MOVE_BODY_SLAM
-	.2byte MOVE_ROLLOUT
-	.2byte MOVE_DEFENSE_CURL
-	.2byte MOVE_STOMP
-
-	egg_moves_begin SPECIES_SPHEAL
-	.2byte MOVE_WATER_SPORT
-	.2byte MOVE_STOCKPILE
-	.2byte MOVE_SWALLOW
-	.2byte MOVE_SPIT_UP
-	.2byte MOVE_YAWN
-	.2byte MOVE_ROCK_SLIDE
-	.2byte MOVE_CURSE
-	.2byte MOVE_FISSURE
-
-	egg_moves_begin SPECIES_CACNEA
-	.2byte MOVE_GRASS_WHISTLE
-	.2byte MOVE_ACID
-	.2byte MOVE_TEETER_DANCE
-	.2byte MOVE_DYNAMIC_PUNCH
-	.2byte MOVE_COUNTER
-
-	egg_moves_begin SPECIES_SNORUNT
-	.2byte MOVE_BLOCK
-	.2byte MOVE_SPIKES
-
-	egg_moves_begin SPECIES_AZURILL
-	.2byte MOVE_ENCORE
-	.2byte MOVE_SING
-	.2byte MOVE_REFRESH
-	.2byte MOVE_SLAM
-	.2byte MOVE_TICKLE
-
-	egg_moves_begin SPECIES_SPOINK
-	.2byte MOVE_FUTURE_SIGHT
-	.2byte MOVE_EXTRASENSORY
-	.2byte MOVE_SUBSTITUTE
-	.2byte MOVE_TRICK
-
-	egg_moves_begin SPECIES_PLUSLE
-	.2byte MOVE_SUBSTITUTE
-	.2byte MOVE_WISH
-
-	egg_moves_begin SPECIES_MINUN
-	.2byte MOVE_SUBSTITUTE
-	.2byte MOVE_WISH
-
-	egg_moves_begin SPECIES_MAWILE
-	.2byte MOVE_SWORDS_DANCE
-	.2byte MOVE_FALSE_SWIPE
-	.2byte MOVE_POISON_FANG
-	.2byte MOVE_PSYCH_UP
-	.2byte MOVE_ANCIENT_POWER
-	.2byte MOVE_TICKLE
-
-	egg_moves_begin SPECIES_MEDITITE
-	.2byte MOVE_FIRE_PUNCH
-	.2byte MOVE_THUNDER_PUNCH
-	.2byte MOVE_ICE_PUNCH
-	.2byte MOVE_FORESIGHT
-	.2byte MOVE_FAKE_OUT
-	.2byte MOVE_BATON_PASS
-	.2byte MOVE_DYNAMIC_PUNCH
-
-	egg_moves_begin SPECIES_SWABLU
-	.2byte MOVE_AGILITY
-	.2byte MOVE_HAZE
-	.2byte MOVE_PURSUIT
-	.2byte MOVE_RAGE
-
-	egg_moves_begin SPECIES_DUSKULL
-	.2byte MOVE_IMPRISON
-	.2byte MOVE_DESTINY_BOND
-	.2byte MOVE_PAIN_SPLIT
-	.2byte MOVE_GRUDGE
-	.2byte MOVE_MEMENTO
-	.2byte MOVE_FAINT_ATTACK
-
-	egg_moves_begin SPECIES_ROSELIA
-	.2byte MOVE_SPIKES
-	.2byte MOVE_SYNTHESIS
-	.2byte MOVE_PIN_MISSILE
-	.2byte MOVE_COTTON_SPORE
-
-	egg_moves_begin SPECIES_SLAKOTH
-	.2byte MOVE_PURSUIT
-	.2byte MOVE_SLASH
-	.2byte MOVE_BODY_SLAM
-	.2byte MOVE_SNORE
-	.2byte MOVE_CRUSH_CLAW
-	.2byte MOVE_CURSE
-	.2byte MOVE_SLEEP_TALK
-
-	egg_moves_begin SPECIES_GULPIN
-	.2byte MOVE_DREAM_EATER
-	.2byte MOVE_ACID_ARMOR
-	.2byte MOVE_SMOG
-	.2byte MOVE_PAIN_SPLIT
-
-	egg_moves_begin SPECIES_TROPIUS
-	.2byte MOVE_HEADBUTT
-	.2byte MOVE_SLAM
-	.2byte MOVE_RAZOR_WIND
-	.2byte MOVE_LEECH_SEED
-	.2byte MOVE_NATURE_POWER
-
-	egg_moves_begin SPECIES_WHISMUR
-	.2byte MOVE_TAKE_DOWN
-	.2byte MOVE_SNORE
-	.2byte MOVE_SWAGGER
-	.2byte MOVE_EXTRASENSORY
-	.2byte MOVE_SMELLING_SALT
-
-	egg_moves_begin SPECIES_CLAMPERL
-	.2byte MOVE_REFRESH
-	.2byte MOVE_MUD_SPORT
-	.2byte MOVE_BODY_SLAM
-	.2byte MOVE_SUPERSONIC
-	.2byte MOVE_BARRIER
-	.2byte MOVE_CONFUSE_RAY
-
-	egg_moves_begin SPECIES_ABSOL
-	.2byte MOVE_BATON_PASS
-	.2byte MOVE_FAINT_ATTACK
-	.2byte MOVE_DOUBLE_EDGE
-	.2byte MOVE_MAGIC_COAT
-	.2byte MOVE_CURSE
-	.2byte MOVE_SUBSTITUTE
-
-	egg_moves_begin SPECIES_SHUPPET
-	.2byte MOVE_DISABLE
-	.2byte MOVE_DESTINY_BOND
-	.2byte MOVE_FORESIGHT
-	.2byte MOVE_ASTONISH
-	.2byte MOVE_IMPRISON
-
-	egg_moves_begin SPECIES_SEVIPER
-	.2byte MOVE_STOCKPILE
-	.2byte MOVE_SWALLOW
-	.2byte MOVE_SPIT_UP
-	.2byte MOVE_BODY_SLAM
-
-	egg_moves_begin SPECIES_ZANGOOSE
-	.2byte MOVE_FLAIL
-	.2byte MOVE_DOUBLE_KICK
-	.2byte MOVE_RAZOR_WIND
-	.2byte MOVE_COUNTER
-	.2byte MOVE_ROAR
-	.2byte MOVE_CURSE
-
-	egg_moves_begin SPECIES_RELICANTH
-	.2byte MOVE_MAGNITUDE
-	.2byte MOVE_SKULL_BASH
-	.2byte MOVE_WATER_SPORT
-	.2byte MOVE_AMNESIA
-	.2byte MOVE_SLEEP_TALK
-	.2byte MOVE_ROCK_SLIDE
-
-	egg_moves_begin SPECIES_ARON
-	.2byte MOVE_ENDEAVOR
-	.2byte MOVE_BODY_SLAM
-	.2byte MOVE_STOMP
-	.2byte MOVE_SMELLING_SALT
-
-	egg_moves_begin SPECIES_CASTFORM
-	.2byte MOVE_FUTURE_SIGHT
-	.2byte MOVE_PSYCH_UP
-
-	egg_moves_begin SPECIES_VOLBEAT
-	.2byte MOVE_BATON_PASS
-	.2byte MOVE_SILVER_WIND
-	.2byte MOVE_TRICK
-
-	egg_moves_begin SPECIES_ILLUMISE
-	.2byte MOVE_BATON_PASS
-	.2byte MOVE_SILVER_WIND
-	.2byte MOVE_GROWTH
-
-	egg_moves_begin SPECIES_LILEEP
-	.2byte MOVE_BARRIER
-	.2byte MOVE_RECOVER
-	.2byte MOVE_MIRROR_COAT
-	.2byte MOVE_ROCK_SLIDE
-
-	egg_moves_begin SPECIES_ANORITH
-	.2byte MOVE_RAPID_SPIN
-	.2byte MOVE_KNOCK_OFF
-	.2byte MOVE_SWORDS_DANCE
-	.2byte MOVE_ROCK_SLIDE
-
-	egg_moves_begin SPECIES_RALTS
-	.2byte MOVE_DISABLE
-	.2byte MOVE_WILL_O_WISP
-	.2byte MOVE_MEAN_LOOK
-	.2byte MOVE_MEMENTO
-	.2byte MOVE_DESTINY_BOND
-
-	egg_moves_begin SPECIES_BAGON
-	.2byte MOVE_HYDRO_PUMP
-	.2byte MOVE_THRASH
-	.2byte MOVE_DRAGON_RAGE
-	.2byte MOVE_TWISTER
-	.2byte MOVE_DRAGON_DANCE
-
-	egg_moves_begin SPECIES_CHIMECHO
-	.2byte MOVE_DISABLE
-	.2byte MOVE_CURSE
-	.2byte MOVE_HYPNOSIS
-	.2byte MOVE_DREAM_EATER
-
-	.2byte -1
diff --git a/data/field_region_map.s b/data/field_region_map.s
deleted file mode 100644
index f179ba8ce..000000000
--- a/data/field_region_map.s
+++ /dev/null
@@ -1,14 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-    .align 2
-gUnknown_085E5068:: @ 85E5068 struct BgTemplate
-	.4byte 0x000001f0, 0x00002dca
-
-    .align 2
-gUnknown_085E5070:: @ 85E5070
-	window_template 0x00, 0x11, 0x11, 0x0c, 0x02, 0x0f, 0x0001
-	window_template 0x00, 0x16, 0x01, 0x07, 0x02, 0x0f, 0x0019
-	window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
diff --git a/data/heal_location.s b/data/heal_location.s
deleted file mode 100644
index 31aa1a351..000000000
--- a/data/heal_location.s
+++ /dev/null
@@ -1,11 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-	.align 2, 0
-
-gUnknown_0859F534:: @ 859F534
-	.incbin "baserom.gba", 0x59f534, 0x8
-
-gUnknown_0859F53C:: @ 859F53C
-	.incbin "baserom.gba", 0x59f53c, 0xd0
diff --git a/data/menu_helpers.s b/data/menu_helpers.s
index b43af0bc4..8d0e12939 100644
--- a/data/menu_helpers.s
+++ b/data/menu_helpers.s
@@ -11,4 +11,4 @@ gUnknown_0859F51C:: @ 859F51C
 	.incbin "baserom.gba", 0x59f51c, 0x8
 
 gUnknown_0859F524:: @ 859F524
-	.incbin "baserom.gba", 0x59f524, 0x10
+	.incbin "baserom.gba", 0x59f524, 0x18
diff --git a/data/region_map.s b/data/region_map.s
deleted file mode 100644
index 78e6cec2f..000000000
--- a/data/region_map.s
+++ /dev/null
@@ -1,101 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-	.align 2, 0
-
-gUnknown_0859F60C:: @ 859F60C
-	.incbin "baserom.gba", 0x59f60c, 0x44
-
-gUnknown_0859F650:: @ 859F650
-	.incbin "baserom.gba", 0x59f650, 0xec
-
-gUnknown_0859F73C:: @ 859F73C
-	.incbin "baserom.gba", 0x59f73c, 0x40
-
-gUnknown_0859F77C:: @ 859F77C
-	.incbin "baserom.gba", 0x59f77c, 0xd64
-
-gUnknown_085A04E0:: @ 85A04E0
-	.incbin "baserom.gba", 0x5a04e0, 0x34c
-
-gUnknown_085A082C:: @ 85A082C
-	.incbin "baserom.gba", 0x5a082c, 0x20
-
-gUnknown_085A084C:: @ 85A084C
-	.incbin "baserom.gba", 0x5a084c, 0x80
-
-gUnknown_085A08CC:: @ 85A08CC
-	.incbin "baserom.gba", 0x5a08cc, 0x20
-
-gUnknown_085A08EC:: @ 85A08EC
-	.incbin "baserom.gba", 0x5a08ec, 0x80
-
-gUnknown_085A096C:: @ 85A096C
-	.incbin "baserom.gba", 0x5a096c, 0x1a4
-
-@ 85A0B10
-	.include "data/region_map_entries.inc"
-
-gUnknown_085A1B24:: @ 85A1B24
-	.incbin "baserom.gba", 0x5a1b24, 0x60
-
-gUnknown_085A1B84:: @ 85A1B84
-	.incbin "baserom.gba", 0x5a1b84, 0x6
-
-gUnknown_085A1B8A:: @ 85A1B8A
-	.incbin "baserom.gba", 0x5a1b8a, 0x22
-
-gUnknown_085A1BAC:: @ 85A1BAC
-	.incbin "baserom.gba", 0x5a1bac, 0x20
-
-gUnknown_085A1BCC:: @ 85A1BCC
-	.incbin "baserom.gba", 0x5a1bcc, 0x34
-
-gUnknown_085A1C00:: @ 85A1C00
-	.incbin "baserom.gba", 0x5a1c00, 0x8
-
-gUnknown_085A1C08:: @ 85A1C08
-	.incbin "baserom.gba", 0x5a1c08, 0x18
-
-gUnknown_085A1C20:: @ 85A1C20
-	.incbin "baserom.gba", 0x5a1c20, 0x10
-
-gUnknown_085A1C30:: @ 85A1C30
-	.incbin "baserom.gba", 0x5a1c30, 0x4
-
-gUnknown_085A1C34:: @ 85A1C34
-	.incbin "baserom.gba", 0x5a1c34, 0x4
-
-gUnknown_085A1C38:: @ 85A1C38
-	.incbin "baserom.gba", 0x5a1c38, 0x20
-
-gUnknown_085A1C58:: @ 85A1C58
-	.incbin "baserom.gba", 0x5a1c58, 0x38
-
-gUnknown_085A1C90:: @ 85A1C90
-	.incbin "baserom.gba", 0x5a1c90, 0xd8
-
-gUnknown_085A1D68:: @ 85A1D68
-	.incbin "baserom.gba", 0x5a1d68, 0xd4
-
-gUnknown_085A1E3C:: @ 85A1E3C
-	.incbin "baserom.gba", 0x5a1e3c, 0xa0
-
-gUnknown_085A1EDC:: @ 85A1EDC
-	.incbin "baserom.gba", 0x5a1edc, 0x8
-
-gUnknown_085A1EE4:: @ 85A1EE4
-	.incbin "baserom.gba", 0x5a1ee4, 0xc
-
-gUnknown_085A1EF0:: @ 85A1EF0
-	.incbin "baserom.gba", 0x5a1ef0, 0x20
-
-gUnknown_085A1F10:: @ 85A1F10
-	.incbin "baserom.gba", 0x5a1f10, 0x8
-
-gUnknown_085A1F18:: @ 85A1F18
-	.incbin "baserom.gba", 0x5a1f18, 0x64
-
-gUnknown_085A1F7C:: @ 85A1F7C
-	.incbin "baserom.gba", 0x5a1f7c, 0x18
diff --git a/data/region_map_entries.inc b/data/region_map_entries.inc
deleted file mode 100644
index ced01648c..000000000
--- a/data/region_map_entries.inc
+++ /dev/null
@@ -1,809 +0,0 @@
-gMapName_LittlerootTown:: @ 85A0B10
-	.string "LITTLEROOT TOWN$"
-
-gMapName_OldaleTown:: @ 85A0B20
-	.string "OLDALE TOWN$"
-
-gMapName_DewfordTown:: @ 85A0B2C
-	.string "DEWFORD TOWN$"
-
-gMapName_LavaridgeTown:: @ 85A0B39
-	.string "LAVARIDGE TOWN$"
-
-gMapName_FallarborTown:: @ 85A0B48
-	.string "FALLARBOR TOWN$"
-
-gMapName_VerdanturfTown:: @ 85A0B57
-	.string "VERDANTURF TOWN$"
-
-gMapName_PacifidlogTown:: @ 85A0B67
-	.string "PACIFIDLOG TOWN$"
-
-gMapName_PetalburgCity:: @ 85A0B77
-	.string "PETALBURG CITY$"
-
-gMapName_SlateportCity:: @ 85A0B86
-	.string "SLATEPORT CITY$"
-
-gMapName_MauvilleCity:: @ 85A0B95
-	.string "MAUVILLE CITY$"
-
-gMapName_RustboroCity:: @ 85A0BA3
-	.string "RUSTBORO CITY$"
-
-gMapName_FortreeCity:: @ 85A0BB1
-	.string "FORTREE CITY$"
-
-gMapName_LilycoveCity:: @ 85A0BBE
-	.string "LILYCOVE CITY$"
-
-gMapName_MossdeepCity:: @ 85A0BCC
-	.string "MOSSDEEP CITY$"
-
-gMapName_SootopolisCity:: @ 85A0BDA
-	.string "SOOTOPOLIS CITY$"
-
-gMapName_EverGrandeCity:: @ 85A0BEA
-	.string "EVER GRANDE CITY$"
-
-gMapName_Route101:: @ 85A0BFB
-	.string "ROUTE 101$"
-
-gMapName_Route102:: @ 85A0C05
-	.string "ROUTE 102$"
-
-gMapName_Route103:: @ 85A0C0F
-	.string "ROUTE 103$"
-
-gMapName_Route104:: @ 85A0C19
-	.string "ROUTE 104$"
-
-gMapName_Route105:: @ 85A0C23
-	.string "ROUTE 105$"
-
-gMapName_Route106:: @ 85A0C2D
-	.string "ROUTE 106$"
-
-gMapName_Route107:: @ 85A0C37
-	.string "ROUTE 107$"
-
-gMapName_Route108:: @ 85A0C41
-	.string "ROUTE 108$"
-
-gMapName_Route109:: @ 85A0C4B
-	.string "ROUTE 109$"
-
-gMapName_Route110:: @ 85A0C55
-	.string "ROUTE 110$"
-
-gMapName_Route111:: @ 85A0C5F
-	.string "ROUTE 111$"
-
-gMapName_Route112:: @ 85A0C69
-	.string "ROUTE 112$"
-
-gMapName_Route113:: @ 85A0C73
-	.string "ROUTE 113$"
-
-gMapName_Route114:: @ 85A0C7D
-	.string "ROUTE 114$"
-
-gMapName_Route115:: @ 85A0C87
-	.string "ROUTE 115$"
-
-gMapName_Route116:: @ 85A0C91
-	.string "ROUTE 116$"
-
-gMapName_Route117:: @ 85A0C9B
-	.string "ROUTE 117$"
-
-gMapName_Route118:: @ 85A0CA5
-	.string "ROUTE 118$"
-
-gMapName_Route119:: @ 85A0CAF
-	.string "ROUTE 119$"
-
-gMapName_Route120:: @ 85A0CB9
-	.string "ROUTE 120$"
-
-gMapName_Route121:: @ 85A0CC3
-	.string "ROUTE 121$"
-
-gMapName_Route122:: @ 85A0CCD
-	.string "ROUTE 122$"
-
-gMapName_Route123:: @ 85A0CD7
-	.string "ROUTE 123$"
-
-gMapName_Route124:: @ 85A0CE1
-	.string "ROUTE 124$"
-
-gMapName_Route125:: @ 85A0CEB
-	.string "ROUTE 125$"
-
-gMapName_Route126:: @ 85A0CF5
-	.string "ROUTE 126$"
-
-gMapName_Route127:: @ 85A0CFF
-	.string "ROUTE 127$"
-
-gMapName_Route128:: @ 85A0D09
-	.string "ROUTE 128$"
-
-gMapName_Route129:: @ 85A0D13
-	.string "ROUTE 129$"
-
-gMapName_Route130:: @ 85A0D1D
-	.string "ROUTE 130$"
-
-gMapName_Route131:: @ 85A0D27
-	.string "ROUTE 131$"
-
-gMapName_Route132:: @ 85A0D31
-	.string "ROUTE 132$"
-
-gMapName_Route133:: @ 85A0D3B
-	.string "ROUTE 133$"
-
-gMapName_Route134:: @ 85A0D45
-	.string "ROUTE 134$"
-
-gMapName_Underwater:: @ 85A0D4F
-	.string "UNDERWATER$"
-
-gMapName_GraniteCave:: @ 85A0D5A
-	.string "GRANITE CAVE$"
-
-gMapName_MtChimney:: @ 85A0D67
-	.string "MT. CHIMNEY$"
-
-gMapName_SafariZone:: @ 85A0D73
-	.string "SAFARI ZONE$"
-
-gMapName_BattleFrontier:: @ 85A0D7F
-	.string "BATTLE FRONTIER$"
-
-gMapName_PetalburgWoods:: @ 85A0D8F
-	.string "PETALBURG WOODS$"
-
-gMapName_RusturfTunnel:: @ 85A0D9F
-	.string "RUSTURF TUNNEL$"
-
-gMapName_AbandonedShip:: @ 85A0DAE
-	.string "ABANDONED SHIP$"
-
-gMapName_NewMauville:: @ 85A0DBD
-	.string "NEW MAUVILLE$"
-
-gMapName_MeteorFalls:: @ 85A0DCA
-	.string "METEOR FALLS$"
-
-gMapName_MtPyre:: @ 85A0DD7
-	.string "MT. PYRE$"
-
-@ This was the Aqua or Magma hideout in Ruby/Sapphire, but each team has a
-@ hideout in Emerald with their own new region map entries, and this name
-@ doesn't seem to be used anymore.
-gMapName_AquaHideoutOld:: @ 85A0DE0
-	.string "{AQUA} HIDEOUT$"
-
-gMapName_ShoalCave:: @ 85A0DEB
-	.string "SHOAL CAVE$"
-
-gMapName_SeafloorCavern:: @ 85A0DF6
-	.string "SEAFLOOR CAVERN$"
-
-gMapName_VictoryRoad:: @ 85A0E06
-	.string "VICTORY ROAD$"
-
-gMapName_MirageIsland:: @ 85A0E13
-	.string "MIRAGE ISLAND$"
-
-gMapName_CaveOfOrigin:: @ 85A0E21
-	.string "CAVE OF ORIGIN$"
-
-gMapName_SouthernIsland:: @ 85A0E30
-	.string "SOUTHERN ISLAND$"
-
-gMapName_FieryPath:: @ 85A0E40
-	.string "FIERY PATH$"
-
-gMapName_JaggedPass:: @ 85A0E4B
-	.string "JAGGED PASS$"
-
-gMapName_SealedChamber:: @ 85A0E57
-	.string "SEALED CHAMBER$"
-
-gMapName_ScorchedSlab:: @ 85A0E66
-	.string "SCORCHED SLAB$"
-
-gMapName_IslandCave:: @ 85A0E74
-	.string "ISLAND CAVE$"
-
-gMapName_DesertRuins:: @ 85A0E80
-	.string "DESERT RUINS$"
-
-gMapName_AncientTomb:: @ 85A0E8D
-	.string "ANCIENT TOMB$"
-
-gMapName_InsideOfTruck:: @ 85A0E9A
-	.string "INSIDE OF TRUCK$"
-
-gMapName_SkyPillar:: @ 85A0EAA
-	.string "SKY PILLAR$"
-
-gMapName_SecretBase:: @ 85A0EB5
-	.string "SECRET BASE$"
-
-gMapName_None:: @ 85A0EC1
-	.string "$"
-
-gMapName_PalletTown:: @ 85A0EC2
-	.string "PALLET TOWN$"
-
-gMapName_ViridianCity:: @ 85A0ECE
-	.string "VIRIDIAN CITY$"
-
-gMapName_PewterCity:: @ 85A0EDC
-	.string "PEWTER CITY$"
-
-gMapName_CeruleanCity:: @ 85A0EE8
-	.string "CERULEAN CITY$"
-
-gMapName_LavenderTown:: @ 85A0EF6
-	.string "LAVENDER TOWN$"
-
-gMapName_VermilionCity:: @ 85A0F04
-	.string "VERMILION CITY$"
-
-gMapName_CeladonCity:: @ 85A0F13
-	.string "CELADON CITY$"
-
-gMapName_FuchsiaCity:: @ 85A0F20
-	.string "FUCHSIA CITY$"
-
-gMapName_CinnabarIsland:: @ 85A0F2D
-	.string "CINNABAR ISLAND$"
-
-gMapName_IndigoPlateau:: @ 85A0F3D
-	.string "INDIGO PLATEAU$"
-
-gMapName_SaffronCity:: @ 85A0F4C
-	.string "SAFFRON CITY$"
-
-gMapName_Route4:: @ 85A0F59
-	.string "ROUTE 4$"
-
-gMapName_Route10:: @ 85A0F61
-	.string "ROUTE 10$"
-
-gMapName_Route1:: @ 85A0F6A
-	.string "ROUTE 1$"
-
-gMapName_Route2:: @ 85A0F72
-	.string "ROUTE 2$"
-
-gMapName_Route3:: @ 85A0F7A
-	.string "ROUTE 3$"
-
-gMapName_Route4_2:: @ 85A0F82
-	.string "ROUTE 4$"
-
-gMapName_Route5:: @ 85A0F8A
-	.string "ROUTE 5$"
-
-gMapName_Route6:: @ 85A0F92
-	.string "ROUTE 6$"
-
-gMapName_Route7:: @ 85A0F9A
-	.string "ROUTE 7$"
-
-gMapName_Route8:: @ 85A0FA2
-	.string "ROUTE 8$"
-
-gMapName_Route9:: @ 85A0FAA
-	.string "ROUTE 9$"
-
-gMapName_Route10_2:: @ 85A0FB2
-	.string "ROUTE 10$"
-
-gMapName_Route11:: @ 85A0FBB
-	.string "ROUTE 11$"
-
-gMapName_Route12:: @ 85A0FC4
-	.string "ROUTE 12$"
-
-gMapName_Route13:: @ 85A0FCD
-	.string "ROUTE 13$"
-
-gMapName_Route14:: @ 85A0FD6
-	.string "ROUTE 14$"
-
-gMapName_Route15:: @ 85A0FDF
-	.string "ROUTE 15$"
-
-gMapName_Route16:: @ 85A0FE8
-	.string "ROUTE 16$"
-
-gMapName_Route17:: @ 85A0FF1
-	.string "ROUTE 17$"
-
-gMapName_Route18:: @ 85A0FFA
-	.string "ROUTE 18$"
-
-gMapName_Route19:: @ 85A1003
-	.string "ROUTE 19$"
-
-gMapName_Route20:: @ 85A100C
-	.string "ROUTE 20$"
-
-gMapName_Route21:: @ 85A1015
-	.string "ROUTE 21$"
-
-gMapName_Route22:: @ 85A101E
-	.string "ROUTE 22$"
-
-gMapName_Route23:: @ 85A1027
-	.string "ROUTE 23$"
-
-gMapName_Route24:: @ 85A1030
-	.string "ROUTE 24$"
-
-gMapName_Route25:: @ 85A1039
-	.string "ROUTE 25$"
-
-gMapName_ViridianForest:: @ 85A1042
-	.string "VIRIDIAN FOREST$"
-
-gMapName_MtMoon:: @ 85A1052
-	.string "MT. MOON$"
-
-gMapName_SSAnne:: @ 85A105B
-	.string "S.S. ANNE$"
-
-gMapName_UndergroundPath:: @ 85A1065
-	.string "UNDERGROUND PATH$"
-
-gMapName_UndergroundPath2:: @ 85A1076
-	.string "UNDERGROUND PATH$"
-
-gMapName_DiglettsCave:: @ 85A1087
-	.string "DIGLETT’S CAVE$"
-
-gMapName_KantoVictoryRoad:: @ 85A1096
-	.string "VICTORY ROAD$"
-
-gMapName_RocketHideout:: @ 85A10A3
-	.string "ROCKET HIDEOUT$"
-
-gMapName_SilphCo:: @ 85A10B2
-	.string "SILPH CO.$"
-
-gMapName_PokemonMansion:: @ 85A10BC
-	.string "POKéMON MANSION$"
-
-gMapName_KantoSafariZone:: @ 85A10CC
-	.string "SAFARI ZONE$"
-
-gMapName_PokemonLeague:: @ 85A10D8
-	.string "POKéMON LEAGUE$"
-
-gMapName_RockTunnel:: @ 85A10E7
-	.string "ROCK TUNNEL$"
-
-gMapName_SeafoamIslands:: @ 85A10F3
-	.string "SEAFOAM ISLANDS$"
-
-gMapName_PokemonTower:: @ 85A1103
-	.string "POKéMON TOWER$"
-
-gMapName_CeruleanCave:: @ 85A1111
-	.string "CERULEAN CAVE$"
-
-gMapName_PowerPlant:: @ 85A111F
-	.string "POWER PLANT$"
-
-gMapName_OneIsland:: @ 85A112B
-	.string "ONE ISLAND$"
-
-gMapName_TwoIsland:: @ 85A1136
-	.string "TWO ISLAND$"
-
-gMapName_ThreeIsland:: @ 85A1141
-	.string "THREE ISLAND$"
-
-gMapName_FourIsland:: @ 85A114E
-	.string "FOUR ISLAND$"
-
-gMapName_FiveIsland:: @ 85A115A
-	.string "FIVE ISLAND$"
-
-gMapName_SevenIsland:: @ 85A1166
-	.string "SEVEN ISLAND$"
-
-gMapName_SixIsland:: @ 85A1173
-	.string "SIX ISLAND$"
-
-gMapName_KindleRoad:: @ 85A117E
-	.string "KINDLE ROAD$"
-
-gMapName_TreasureBeach:: @ 85A118A
-	.string "TREASURE BEACH$"
-
-gMapName_CapeBrink:: @ 85A1199
-	.string "CAPE BRINK$"
-
-gMapName_BondBridge:: @ 85A11A4
-	.string "BOND BRIDGE$"
-
-gMapName_ThreeIslePort:: @ 85A11B0
-	.string "THREE ISLE PORT$"
-
-gMapName_SeviiIsle6:: @ 85A11C0
-	.string "SEVII ISLE 6$"
-
-gMapName_SeviiIsle7:: @ 85A11CD
-	.string "SEVII ISLE 7$"
-
-gMapName_SeviiIsle8:: @ 85A11DA
-	.string "SEVII ISLE 8$"
-
-gMapName_SeviiIsle9:: @ 85A11E7
-	.string "SEVII ISLE 9$"
-
-gMapName_ResortGorgeous:: @ 85A11F4
-	.string "RESORT GORGEOUS$"
-
-gMapName_WaterLabyrinth:: @ 85A1204
-	.string "WATER LABYRINTH$"
-
-gMapName_FiveIsleMeadow:: @ 85A1214
-	.string "FIVE ISLE MEADOW$"
-
-gMapName_MemorialPillar:: @ 85A1225
-	.string "MEMORIAL PILLAR$"
-
-gMapName_OutcastIsland:: @ 85A1235
-	.string "OUTCAST ISLAND$"
-
-gMapName_GreenPath:: @ 85A1244
-	.string "GREEN PATH$"
-
-gMapName_WaterPath:: @ 85A124F
-	.string "WATER PATH$"
-
-gMapName_RuinValley:: @ 85A125A
-	.string "RUIN VALLEY$"
-
-gMapName_TrainerTower:: @ 85A1266
-	.string "TRAINER TOWER$"
-
-gMapName_CanyonEntrance:: @ 85A1274
-	.string "CANYON ENTRANCE$"
-
-gMapName_SevaultCanyon:: @ 85A1284
-	.string "SEVAULT CANYON$"
-
-gMapName_TanobyRuins:: @ 85A1293
-	.string "TANOBY RUINS$"
-
-gMapName_SeviiIsle22:: @ 85A12A0
-	.string "SEVII ISLE 22$"
-
-gMapName_SeviiIsle23:: @ 85A12AE
-	.string "SEVII ISLE 23$"
-
-gMapName_SeviiIsle24:: @ 85A12BC
-	.string "SEVII ISLE 24$"
-
-gMapName_NavelRock:: @ 85A12CA
-	.string "NAVEL ROCK$"
-
-gMapName_MtEmber:: @ 85A12D5
-	.string "MT. EMBER$"
-
-gMapName_BerryForest:: @ 85A12DF
-	.string "BERRY FOREST$"
-
-gMapName_IcefallCave:: @ 85A12EC
-	.string "ICEFALL CAVE$"
-
-gMapName_RocketWarehouse:: @ 85A12F9
-	.string "ROCKET WAREHOUSE$"
-
-gMapName_TrainerTower2:: @ 85A130A
-	.string "TRAINER TOWER$"
-
-gMapName_DottedHole:: @ 85A1318
-	.string "DOTTED HOLE$"
-
-gMapName_LostCave:: @ 85A1324
-	.string "LOST CAVE$"
-
-gMapName_PatternBush:: @ 85A132E
-	.string "PATTERN BUSH$"
-
-gMapName_AlteringCave:: @ 85A133B
-	.string "ALTERING CAVE$"
-
-gMapName_TanobyChambers:: @ 85A1349
-	.string "TANOBY CHAMBERS$"
-
-gMapName_ThreeIslePath:: @ 85A1359
-	.string "THREE ISLE PATH$"
-
-gMapName_TanobyKey:: @ 85A1369
-	.string "TANOBY KEY$"
-
-gMapName_BirthIsland:: @ 85A1374
-	.string "BIRTH ISLAND$"
-
-gMapName_MoneanChamber:: @ 85A1381
-	.string "MONEAN CHAMBER$"
-
-gMapName_LiptooChamber:: @ 85A1390
-	.string "LIPTOO CHAMBER$"
-
-gMapName_WeepthChamber:: @ 85A139F
-	.string "WEEPTH CHAMBER$"
-
-gMapName_DilfordChamber:: @ 85A13AE
-	.string "DILFORD CHAMBER$"
-
-gMapName_ScufibChamber:: @ 85A13BE
-	.string "SCUFIB CHAMBER$"
-
-gMapName_RixyChamber:: @ 85A13CD
-	.string "RIXY CHAMBER$"
-
-gMapName_ViapoisChamber:: @ 85A13DA
-	.string "VIAPOIS CHAMBER$"
-
-gMapName_EmberSpa:: @ 85A13EA
-	.string "EMBER SPA$"
-
-gMapName_SpecialArea:: @ 85A13F4
-	.string "SPECIAL AREA$"
-
-gMapName_AquaHideout:: @ 85A1401
-	.string "AQUA HIDEOUT$"
-
-gMapName_MagmaHideout:: @ 85A140E
-	.string "MAGMA HIDEOUT$"
-
-gMapName_MirageTower:: @ 85A141C
-	.string "MIRAGE TOWER$"
-
-gMapName_FarawayIsland:: @ 85A1429
-	.string "FARAWAY ISLAND$"
-
-gMapName_ArtisanCave:: @ 85A1438
-	.string "ARTISAN CAVE$"
-
-gMapName_MarineCave:: @ 85A1445
-	.string "MARINE CAVE$"
-
-gMapName_TerraCave:: @ 85A1451
-	.string "TERRA CAVE$"
-
-gMapName_DesertUnderpass:: @ 85A145C
-	.string "DESERT UNDERPASS$"
-
-gMapName_TrainerHill:: @ 85A146D
-	.string "TRAINER HILL$"
-
-	.align 2
-gRegionMapEntries:: @ 85A147C
-	region_map_entry  4, 11, 1, 1, LittlerootTown
-	region_map_entry  4,  9, 1, 1, OldaleTown
-	region_map_entry  2, 14, 1, 1, DewfordTown
-	region_map_entry  5,  3, 1, 1, LavaridgeTown
-	region_map_entry  3,  0, 1, 1, FallarborTown
-	region_map_entry  4,  6, 1, 1, VerdanturfTown
-	region_map_entry 17, 10, 1, 1, PacifidlogTown
-	region_map_entry  1,  9, 1, 1, PetalburgCity
-	region_map_entry  8, 10, 1, 2, SlateportCity
-	region_map_entry  8,  6, 2, 1, MauvilleCity
-	region_map_entry  0,  5, 1, 2, RustboroCity
-	region_map_entry 12,  0, 1, 1, FortreeCity
-	region_map_entry 18,  3, 2, 1, LilycoveCity
-	region_map_entry 24,  5, 2, 1, MossdeepCity
-	region_map_entry 21,  7, 1, 1, SootopolisCity
-	region_map_entry 27,  8, 1, 2, EverGrandeCity
-	region_map_entry  4, 10, 1, 1, Route101
-	region_map_entry  2,  9, 2, 1, Route102
-	region_map_entry  4,  8, 4, 1, Route103
-	region_map_entry  0,  7, 1, 3, Route104
-	region_map_entry  0, 10, 1, 3, Route105
-	region_map_entry  0, 13, 2, 1, Route106
-	region_map_entry  3, 14, 3, 1, Route107
-	region_map_entry  6, 14, 2, 1, Route108
-	region_map_entry  8, 12, 1, 3, Route109
-	region_map_entry  8,  7, 1, 3, Route110
-	region_map_entry  8,  0, 1, 6, Route111
-	region_map_entry  6,  3, 2, 1, Route112
-	region_map_entry  4,  0, 4, 1, Route113
-	region_map_entry  1,  0, 2, 3, Route114
-	region_map_entry  0,  2, 1, 3, Route115
-	region_map_entry  1,  5, 4, 1, Route116
-	region_map_entry  5,  6, 3, 1, Route117
-	region_map_entry 10,  6, 2, 1, Route118
-	region_map_entry 11,  0, 1, 6, Route119
-	region_map_entry 13,  0, 1, 4, Route120
-	region_map_entry 14,  3, 4, 1, Route121
-	region_map_entry 16,  4, 1, 2, Route122
-	region_map_entry 12,  6, 5, 1, Route123
-	region_map_entry 20,  3, 4, 3, Route124
-	region_map_entry 24,  3, 2, 2, Route125
-	region_map_entry 20,  6, 3, 3, Route126
-	region_map_entry 23,  6, 3, 3, Route127
-	region_map_entry 23,  9, 4, 1, Route128
-	region_map_entry 24, 10, 2, 1, Route129
-	region_map_entry 21, 10, 3, 1, Route130
-	region_map_entry 18, 10, 3, 1, Route131
-	region_map_entry 15, 10, 2, 1, Route132
-	region_map_entry 12, 10, 3, 1, Route133
-	region_map_entry  9, 10, 3, 1, Route134
-	region_map_entry 20,  3, 4, 3, Underwater
-	region_map_entry 20,  6, 3, 3, Underwater
-	region_map_entry 23,  6, 3, 3, Underwater
-	region_map_entry 23,  9, 4, 1, Underwater
-	region_map_entry 21,  7, 1, 1, Underwater
-	region_map_entry  1, 13, 1, 1, GraniteCave
-	region_map_entry  6,  2, 1, 1, MtChimney
-	region_map_entry 16,  2, 1, 1, SafariZone
-	region_map_entry 22, 12, 1, 1, BattleFrontier
-	region_map_entry  0,  8, 1, 1, PetalburgWoods
-	region_map_entry  2,  5, 1, 1, RusturfTunnel
-	region_map_entry  6, 14, 1, 1, AbandonedShip
-	region_map_entry  8,  7, 1, 1, NewMauville
-	region_map_entry  0,  3, 1, 1, MeteorFalls
-	region_map_entry  1,  2, 1, 1, MeteorFalls
-	region_map_entry 16,  4, 1, 1, MtPyre
-	region_map_entry 19,  3, 1, 1, AquaHideoutOld
-	region_map_entry 24,  4, 1, 1, ShoalCave
-	region_map_entry 24,  9, 1, 1, SeafloorCavern
-	region_map_entry 24,  9, 1, 1, Underwater
-	region_map_entry 27,  9, 1, 1, VictoryRoad
-	region_map_entry 17, 10, 1, 1, MirageIsland
-	region_map_entry 21,  7, 1, 1, CaveOfOrigin
-	region_map_entry 12, 14, 1, 1, SouthernIsland
-	region_map_entry  6,  3, 1, 1, FieryPath
-	region_map_entry  7,  3, 1, 1, FieryPath
-	region_map_entry  6,  3, 1, 1, JaggedPass
-	region_map_entry  7,  2, 1, 1, JaggedPass
-	region_map_entry 11, 10, 1, 1, SealedChamber
-	region_map_entry 11, 10, 1, 1, Underwater
-	region_map_entry 13,  0, 1, 1, ScorchedSlab
-	region_map_entry  0, 10, 1, 1, IslandCave
-	region_map_entry  8,  3, 1, 1, DesertRuins
-	region_map_entry 13,  2, 1, 1, AncientTomb
-	region_map_entry  0,  0, 1, 1, InsideOfTruck
-	region_map_entry 19, 10, 1, 1, SkyPillar
-	region_map_entry  0,  0, 1, 1, SecretBase
-	region_map_entry  0,  0, 1, 1, None
-	region_map_entry  0,  0, 1, 1, PalletTown
-	region_map_entry  0,  0, 1, 1, ViridianCity
-	region_map_entry  0,  0, 1, 1, PewterCity
-	region_map_entry  0,  0, 1, 1, CeruleanCity
-	region_map_entry  0,  0, 1, 1, LavenderTown
-	region_map_entry  0,  0, 1, 1, VermilionCity
-	region_map_entry  0,  0, 1, 1, CeladonCity
-	region_map_entry  0,  0, 1, 1, FuchsiaCity
-	region_map_entry  0,  0, 1, 1, CinnabarIsland
-	region_map_entry  0,  0, 1, 1, IndigoPlateau
-	region_map_entry  0,  0, 1, 1, SaffronCity
-	region_map_entry  0,  0, 1, 1, Route4
-	region_map_entry  0,  0, 1, 1, Route10
-	region_map_entry  0,  0, 1, 1, Route1
-	region_map_entry  0,  0, 1, 1, Route2
-	region_map_entry  0,  0, 1, 1, Route3
-	region_map_entry  0,  0, 1, 1, Route4_2
-	region_map_entry  0,  0, 1, 1, Route5
-	region_map_entry  0,  0, 1, 1, Route6
-	region_map_entry  0,  0, 1, 1, Route7
-	region_map_entry  0,  0, 1, 1, Route8
-	region_map_entry  0,  0, 1, 1, Route9
-	region_map_entry  0,  0, 1, 1, Route10_2
-	region_map_entry  0,  0, 1, 1, Route11
-	region_map_entry  0,  0, 1, 1, Route12
-	region_map_entry  0,  0, 1, 1, Route13
-	region_map_entry  0,  0, 1, 1, Route14
-	region_map_entry  0,  0, 1, 1, Route15
-	region_map_entry  0,  0, 1, 1, Route16
-	region_map_entry  0,  0, 1, 1, Route17
-	region_map_entry  0,  0, 1, 1, Route18
-	region_map_entry  0,  0, 1, 1, Route19
-	region_map_entry  0,  0, 1, 1, Route20
-	region_map_entry  0,  0, 1, 1, Route21
-	region_map_entry  0,  0, 1, 1, Route22
-	region_map_entry  0,  0, 1, 1, Route23
-	region_map_entry  0,  0, 1, 1, Route24
-	region_map_entry  0,  0, 1, 1, Route25
-	region_map_entry  0,  0, 1, 1, ViridianForest
-	region_map_entry  0,  0, 1, 1, MtMoon
-	region_map_entry  0,  0, 1, 1, SSAnne
-	region_map_entry  0,  0, 1, 1, UndergroundPath
-	region_map_entry  0,  0, 1, 1, UndergroundPath2
-	region_map_entry  0,  0, 1, 1, DiglettsCave
-	region_map_entry  0,  0, 1, 1, KantoVictoryRoad
-	region_map_entry  0,  0, 1, 1, RocketHideout
-	region_map_entry  0,  0, 1, 1, SilphCo
-	region_map_entry  0,  0, 1, 1, PokemonMansion
-	region_map_entry  0,  0, 1, 1, KantoSafariZone
-	region_map_entry  0,  0, 1, 1, PokemonLeague
-	region_map_entry  0,  0, 1, 1, RockTunnel
-	region_map_entry  0,  0, 1, 1, SeafoamIslands
-	region_map_entry  0,  0, 1, 1, PokemonTower
-	region_map_entry  0,  0, 1, 1, CeruleanCave
-	region_map_entry  0,  0, 1, 1, PowerPlant
-	region_map_entry  0,  0, 1, 1, OneIsland
-	region_map_entry  0,  0, 1, 1, TwoIsland
-	region_map_entry  0,  0, 1, 1, ThreeIsland
-	region_map_entry  0,  0, 1, 1, FourIsland
-	region_map_entry  0,  0, 1, 1, FiveIsland
-	region_map_entry  0,  0, 1, 1, SevenIsland
-	region_map_entry  0,  0, 1, 1, SixIsland
-	region_map_entry  0,  0, 1, 1, KindleRoad
-	region_map_entry  0,  0, 1, 1, TreasureBeach
-	region_map_entry  0,  0, 1, 1, CapeBrink
-	region_map_entry  0,  0, 1, 1, BondBridge
-	region_map_entry  0,  0, 1, 1, ThreeIslePort
-	region_map_entry  0,  0, 1, 1, SeviiIsle6
-	region_map_entry  0,  0, 1, 1, SeviiIsle7
-	region_map_entry  0,  0, 1, 1, SeviiIsle8
-	region_map_entry  0,  0, 1, 1, SeviiIsle9
-	region_map_entry  0,  0, 1, 1, ResortGorgeous
-	region_map_entry  0,  0, 1, 1, WaterLabyrinth
-	region_map_entry  0,  0, 1, 1, FiveIsleMeadow
-	region_map_entry  0,  0, 1, 1, MemorialPillar
-	region_map_entry  0,  0, 1, 1, OutcastIsland
-	region_map_entry  0,  0, 1, 1, GreenPath
-	region_map_entry  0,  0, 1, 1, WaterPath
-	region_map_entry  0,  0, 1, 1, RuinValley
-	region_map_entry  0,  0, 1, 1, TrainerTower
-	region_map_entry  0,  0, 1, 1, CanyonEntrance
-	region_map_entry  0,  0, 1, 1, SevaultCanyon
-	region_map_entry  0,  0, 1, 1, TanobyRuins
-	region_map_entry  0,  0, 1, 1, SeviiIsle22
-	region_map_entry  0,  0, 1, 1, SeviiIsle23
-	region_map_entry  0,  0, 1, 1, SeviiIsle24
-	region_map_entry  0,  0, 1, 1, NavelRock
-	region_map_entry  0,  0, 1, 1, MtEmber
-	region_map_entry  0,  0, 1, 1, BerryForest
-	region_map_entry  0,  0, 1, 1, IcefallCave
-	region_map_entry  0,  0, 1, 1, RocketWarehouse
-	region_map_entry  0,  0, 1, 1, TrainerTower2
-	region_map_entry  0,  0, 1, 1, DottedHole
-	region_map_entry  0,  0, 1, 1, LostCave
-	region_map_entry  0,  0, 1, 1, PatternBush
-	region_map_entry  0,  0, 1, 1, AlteringCave
-	region_map_entry  0,  0, 1, 1, TanobyChambers
-	region_map_entry  0,  0, 1, 1, ThreeIslePath
-	region_map_entry  0,  0, 1, 1, TanobyKey
-	region_map_entry  0,  0, 1, 1, BirthIsland
-	region_map_entry  0,  0, 1, 1, MoneanChamber
-	region_map_entry  0,  0, 1, 1, LiptooChamber
-	region_map_entry  0,  0, 1, 1, WeepthChamber
-	region_map_entry  0,  0, 1, 1, DilfordChamber
-	region_map_entry  0,  0, 1, 1, ScufibChamber
-	region_map_entry  0,  0, 1, 1, RixyChamber
-	region_map_entry  0,  0, 1, 1, ViapoisChamber
-	region_map_entry  0,  0, 1, 1, EmberSpa
-	region_map_entry  0,  0, 1, 1, SpecialArea
-	region_map_entry 19,  3, 1, 1, AquaHideout
-	region_map_entry  6,  3, 1, 1, MagmaHideout
-	region_map_entry  8,  2, 1, 1, MirageTower
-	region_map_entry  0,  0, 1, 1, BirthIsland
-	region_map_entry  0,  0, 1, 1, FarawayIsland
-	region_map_entry 22, 12, 1, 1, ArtisanCave
-	region_map_entry  0,  0, 1, 1, MarineCave
-	region_map_entry  0,  0, 1, 1, Underwater
-	region_map_entry  0,  0, 1, 1, TerraCave
-	region_map_entry  0, 10, 1, 3, Underwater
-	region_map_entry 24,  3, 2, 2, Underwater
-	region_map_entry 24, 10, 2, 1, Underwater
-	region_map_entry  2,  0, 1, 1, DesertUnderpass
-	region_map_entry  6,  8, 1, 1, AlteringCave
-	region_map_entry  0,  0, 1, 1, NavelRock
-	region_map_entry  8,  4, 1, 1, TrainerHill
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index c38305f20..71e3303b5 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -1058,7 +1058,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_277626:: @ 8277626
-	specialvar VAR_RESULT, sub_80C7008
+	specialvar VAR_RESULT, CountPartyNonEggMons
 	compare_var_to_value VAR_RESULT, 2
 	goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_27764C
 	specialvar VAR_RESULT, sub_80F9370
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index 63ebafe4f..27e617128 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -1,8 +1,8 @@
 Route117_EventScript_291C18:: @ 8291C18
 	lock
 	faceplayer
-	special sp0B5_daycare
-	specialvar VAR_RESULT, sp0B6_daycare
+	special GetDaycareMonNicknames
+	specialvar VAR_RESULT, GetDaycareState
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route117_EventScript_291C4D
 	compare_var_to_value VAR_RESULT, 2
@@ -21,8 +21,8 @@ Route117_EventScript_291C4D:: @ 8291C4D
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route117_EventScript_291C83
 	msgbox Route117_Text_292149, 4
-	clearflag FLAG_0x086
-	special sub_8070728
+	clearflag FLAG_PENDING_DAYCARE_EGG
+	special RejectEggFromDayCare
 	release
 	end
 
@@ -40,8 +40,8 @@ Route117_EventScript_291C9D:: @ 8291C9D
 	waitfanfare
 	waitbuttonpress
 	msgbox Route117_Text_2921CF, 4
-	special sp0B8_daycare
-	clearflag FLAG_0x086
+	special GiveEggFromDaycare
+	clearflag FLAG_PENDING_DAYCARE_EGG
 	release
 	end
 
@@ -56,7 +56,7 @@ Route117_EventScript_291CC8:: @ 8291CC8
 	return
 
 Route117_EventScript_291CD1:: @ 8291CD1
-	special sp0B5_daycare
+	special GetDaycareMonNicknames
 	msgbox Route117_Text_292114, 4
 	setvar VAR_0x8004, 0
 	call Route117_EventScript_291CB7
@@ -64,9 +64,9 @@ Route117_EventScript_291CD1:: @ 8291CD1
 	end
 
 Route117_EventScript_291CE8:: @ 8291CE8
-	special sp0B5_daycare
+	special GetDaycareMonNicknames
 	msgbox Route117_Text_292299, 4
-	special sp0B9_daycare_relationship_comment
+	special SetDaycareCompatibilityString
 	special sub_8138AC0
 	waitmessage
 	waitbuttonpress
@@ -80,7 +80,7 @@ Route117_EventScript_291CE8:: @ 8291CE8
 Route117_PokemonDayCare_EventScript_291D11:: @ 8291D11
 	lock
 	faceplayer
-	specialvar VAR_RESULT, sp0B6_daycare
+	specialvar VAR_RESULT, GetDaycareState
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route117_PokemonDayCare_EventScript_291E0B
 	compare_var_to_value VAR_RESULT, 2
@@ -95,7 +95,7 @@ Route117_PokemonDayCare_EventScript_291D11:: @ 8291D11
 	end
 
 Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56
-	specialvar VAR_RESULT, sub_80C7008
+	specialvar VAR_RESULT, CountPartyNonEggMons
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route117_PokemonDayCare_EventScript_291DED
 	specialvar VAR_RESULT, sub_80722E0
@@ -103,21 +103,21 @@ Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56
 	goto_eq Route117_PokemonDayCare_EventScript_291E01
 	msgbox Route117_PokemonDayCare_Text_292349, 4
 	fadescreen 1
-	special sub_8071330
+	special ChooseSendDaycareMon
 	waitstate
 	compare_var_to_value VAR_0x8004, 255
 	goto_eq Route117_PokemonDayCare_EventScript_291DCA
-	specialvar VAR_RESULT, sub_80C70AC
+	specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
 	compare_var_to_value VAR_RESULT, 0
 	goto_eq Route117_PokemonDayCare_EventScript_291DF7
-	specialvar VAR_0x8005, sub_8070C58
+	specialvar VAR_0x8005, GetSelectedMonNickAndSpecies
 	waitse
 	playmoncry VAR_0x8005, 0
 	msgbox Route117_PokemonDayCare_Text_292370, 4
 	waitmoncry
-	special daycare_send_selected_pokemon
+	special StoreSelectedPokemonInDaycare
 	incrementgamestat 47
-	specialvar VAR_RESULT, sp0B6_daycare
+	specialvar VAR_RESULT, GetDaycareState
 	compare_var_to_value VAR_RESULT, 2
 	goto_eq Route117_PokemonDayCare_EventScript_291DD4
 	release
@@ -160,7 +160,7 @@ Route117_PokemonDayCare_EventScript_291E15:: @ 8291E15
 	return
 
 Route117_PokemonDayCare_EventScript_291E1E:: @ 8291E1E
-	specialvar VAR_RESULT, sub_806FF30
+	specialvar VAR_RESULT, GetNumLevelsGainedFromDaycare
 	compare_var_to_value VAR_RESULT, 0
 	call_if 5, Route117_PokemonDayCare_EventScript_291E15
 	return
@@ -182,11 +182,11 @@ Route117_PokemonDayCare_EventScript_291E6D:: @ 8291E6D
 	specialvar VAR_RESULT, CalculatePlayerPartyCount
 	compare_var_to_value VAR_RESULT, 6
 	goto_eq Route117_PokemonDayCare_EventScript_291F3D
-	specialvar VAR_RESULT, sp0B6_daycare
+	specialvar VAR_RESULT, GetDaycareState
 	setvar VAR_0x8004, 0
 	compare_var_to_value VAR_RESULT, 2
 	goto_eq Route117_PokemonDayCare_EventScript_291EAC
-	special sub_80712C0
+	special ShowDaycareLevelMenu
 	waitstate
 	copyvar VAR_0x8004, VAR_RESULT
 	compare_var_to_value VAR_RESULT, 2
@@ -195,7 +195,7 @@ Route117_PokemonDayCare_EventScript_291E6D:: @ 8291E6D
 	end
 
 Route117_PokemonDayCare_EventScript_291EAC:: @ 8291EAC
-	special sub_806FED8
+	special GetDaycareCost
 	msgbox Route117_PokemonDayCare_Text_292549, 5
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route117_PokemonDayCare_EventScript_291EC8
@@ -213,7 +213,7 @@ Route117_PokemonDayCare_EventScript_291EC8:: @ 8291EC8
 Route117_PokemonDayCare_EventScript_291EE2:: @ 8291EE2
 	applymovement 1, Route117_PokemonDayCare_Movement_291F47
 	waitmovement 0
-	specialvar VAR_RESULT, sub_806FDC4
+	specialvar VAR_RESULT, TakePokemonFromDaycare
 	special SubtractMoneyFromVar0x8005
 	playse SE_REGI
 	msgbox Route117_PokemonDayCare_Text_292575, 4
@@ -221,7 +221,7 @@ Route117_PokemonDayCare_EventScript_291EE2:: @ 8291EE2
 	playmoncry VAR_RESULT, 0
 	msgbox Route117_PokemonDayCare_Text_292593, 4
 	waitmoncry
-	specialvar VAR_RESULT, sp0B6_daycare
+	specialvar VAR_RESULT, GetDaycareState
 	compare_var_to_value VAR_RESULT, 2
 	goto_eq Route117_PokemonDayCare_EventScript_291F24
 	goto Route117_PokemonDayCare_EventScript_291DCA
@@ -278,12 +278,12 @@ Route117_PokemonDayCare_EventScript_291F5C:: @ 8291F5C
 	end
 
 Route117_PokemonDayCare_EventScript_291F95:: @ 8291F95
-	special sub_80712C0
+	special ShowDaycareLevelMenu
 	waitstate
 	compare_var_to_value VAR_RESULT, 2
 	goto_eq Route117_PokemonDayCare_EventScript_291DCA
 	copyvar VAR_0x8004, VAR_RESULT
-	specialvar VAR_RESULT, sub_806FDC4
+	specialvar VAR_RESULT, TakePokemonFromDaycare
 	msgbox Route117_PokemonDayCare_Text_292575, 4
 	msgbox Route117_PokemonDayCare_Text_292476, 4
 	release
diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc
index 23551d372..01463516b 100644
--- a/data/scripts/maps/Route117.inc
+++ b/data/scripts/maps/Route117.inc
@@ -7,7 +7,7 @@ Route117_MapScript1_1F3983: @ 81F3983
 	end
 
 Route117_EventScript_1F3989:: @ 81F3989
-	checkflag FLAG_0x086
+	checkflag FLAG_PENDING_DAYCARE_EGG
 	goto_if 0, Route117_EventScript_1F3999
 	setobjectxyperm 3, 47, 6
 
diff --git a/data/specials.inc b/data/specials.inc
index 49f6b91a0..51bb34dff 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -142,8 +142,8 @@ gSpecials:: @ 81DBA64
 	def_special sub_8122A30
 	def_special sub_80D6EDC
 	def_special CalculatePlayerPartyCount
-	def_special sub_80C7008
-	def_special sub_80C70AC
+	def_special CountPartyNonEggMons
+	def_special CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
 	def_special sub_80F88E8
 	def_special sub_80F88DC
 	def_special sub_80F8864
@@ -191,18 +191,18 @@ gSpecials:: @ 81DBA64
 	def_special GabbyAndTyGetLastBattleTrivia
 	def_special GabbyAndTySetScriptVarsToFieldObjectLocalIds
 	def_special sub_8138B80
-	def_special sp0B5_daycare
-	def_special sp0B6_daycare
-	def_special sub_8070728
-	def_special sp0B8_daycare
-	def_special sp0B9_daycare_relationship_comment
-	def_special sub_8070C58
-	def_special daycare_send_selected_pokemon
-	def_special sub_8071330
-	def_special sub_80712C0
-	def_special sub_806FF30
-	def_special sub_806FED8
-	def_special sub_806FDC4
+	def_special GetDaycareMonNicknames
+	def_special GetDaycareState
+	def_special RejectEggFromDayCare
+	def_special GiveEggFromDaycare
+	def_special SetDaycareCompatibilityString
+	def_special GetSelectedMonNickAndSpecies
+	def_special StoreSelectedPokemonInDaycare
+	def_special ChooseSendDaycareMon
+	def_special ShowDaycareLevelMenu
+	def_special GetNumLevelsGainedFromDaycare
+	def_special GetDaycareCost
+	def_special TakePokemonFromDaycare
 	def_special ScriptHatchMon
 	def_special EggHatch
 	def_special sub_8071614
@@ -534,4 +534,3 @@ gSpecials:: @ 81DBA64
 	def_special sub_813C5A0
 	def_special sub_8139C10
 	def_special sub_80B3BC4
-
diff --git a/data/strings.s b/data/strings.s
index 42dcc2316..484c26d6e 100644
--- a/data/strings.s
+++ b/data/strings.s
@@ -3149,10 +3149,10 @@ gText_SelectTheAnswer:: @ 85EC752
 gText_LyricsCantBeDeleted:: @ 85EC765
 	.string "The lyrics can’t be deleted.$"
 
-gUnknown_085EC782:: @ 85EC782
+gText_PokemonLeague:: @ 85EC782
 	.string "POKéMON LEAGUE$"
 
-gUnknown_085EC791:: @ 85EC791
+gText_PokemonCenter:: @ 85EC791
 	.string "POKéMON CENTER$"
 
 gText_GetsAPokeBlockQuestion:: @ 85EC7A0
@@ -5121,16 +5121,16 @@ gText_YouDontHaveThreeCoins:: @ 85EF734
 gText_ReelTimeHelp:: @ 85EF750
 	.string "REEL TIME\nHere’s your chance to take\naim and nail marks!\nReel Time continues for the\nawarded number of spins.\nIt all ends on a Big Bonus.$"
 
-gUnknown_085EF7DA:: @ 85EF7DA
+gDaycareText_GetAlongVeryWell:: @ 85EF7DA
 	.string "The two seem to get along\nvery well.$"
 
-gUnknown_085EF7FF:: @ 85EF7FF
+gDaycareText_GetAlong:: @ 85EF7FF
 	.string "The two seem to get along.$"
 
-gUnknown_085EF81A:: @ 85EF81A
+gDaycareText_DontLikeOther:: @ 85EF81A
 	.string "The two don’t seem to like\neach other much.$"
 
-gUnknown_085EF846:: @ 85EF846
+gDaycareText_PlayOther:: @ 85EF846
 	.string "The two prefer to play with other\nPOKéMON than each other.$"
 
 gText_NewLine2:: @ 85EF881
diff --git a/data/trade.s b/data/trade.s
index 601b597ed..3150269b0 100644
--- a/data/trade.s
+++ b/data/trade.s
@@ -19,13 +19,13 @@ gUnknown_0832D2BC:: @ 832D2BC
 gUnknown_0832DABC:: @ 832DABC
 	.incbin "baserom.gba", 0x32dabc, 0xb
 
-gUnknown_0832DAC7:: @ 832DAC7
-	.incbin "baserom.gba", 0x32dac7, 0x2
+gText_MaleSymbol4:: @ 832DAC7
+	.string "♂$"
 
-gUnknown_0832DAC9:: @ 832DAC9
-	.incbin "baserom.gba", 0x32dac9, 0x2
+gText_FemaleSymbol4:: @ 832DAC9
+	.string "♀$"
 
-gUnknown_0832DACB:: @ 832DACB
+gText_GenderlessSymbol:: @ 832DACB
 	.incbin "baserom.gba", 0x32dacb, 0x7
 
 gUnknown_0832DAD2:: @ 832DAD2