Edit some learnsets.

Rangi42 · Sep 20, 2016 · 29772c5 · 29772c5
1 parent 664357d
commit 29772c5
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -201,6 +201,11 @@ These changes have been made since the current 2.1.0 release. If you build the p
 * Add: Natures (thanks to FredrIQ) (based on Atk/Def DV, not personality value).
 * Add: Descriptive text for certain rock features.
 * Add: Edit some trainers' rosters, including better natures.
+* Add: Vulpix can learn Moonlight.
+* Add: Staryu+Starmie can learn Calm Mind.
+* Add: Wobbuffet can learn Recover.
+* Add: Entei can learn Earthquake.
+* Add: Lugia can learn Hurricane.
 * Fix: Lugia's room music loops.
 * Fix: Dragonite can learn Hurricane.
 * Fix: Metronome cannot become Transform.

diff --git a/data/base_stats/entei.asm b/data/base_stats/entei.asm
@@ -18,5 +18,5 @@
 	dn NO_EGGS, NO_EGGS ; egg groups
 
 	; tmhm
-	tmhm CURSE, CALM_MIND, ROAR, TOXIC, HIDDEN_POWER, SUNNY_DAY, HYPER_BEAM, PROTECT, RAIN_DANCE, SOLAR_BEAM, IRON_TAIL, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, REFLECT, FLAMETHROWER, SANDSTORM, FIRE_BLAST, SWIFT, STONE_EDGE, REST, SUBSTITUTE, BODY_SLAM, ENDURE, WILL_O_WISP, CUT, STRENGTH, FLASH, ROCK_SMASH, DOUBLE_EDGE, HEADBUTT, IRON_HEAD, SLEEP_TALK, SWAGGER
+	tmhm CURSE, CALM_MIND, ROAR, TOXIC, HIDDEN_POWER, SUNNY_DAY, HYPER_BEAM, PROTECT, RAIN_DANCE, SOLAR_BEAM, IRON_TAIL, EARTHQUAKE, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, REFLECT, FLAMETHROWER, SANDSTORM, FIRE_BLAST, SWIFT, STONE_EDGE, REST, SUBSTITUTE, BODY_SLAM, ENDURE, WILL_O_WISP, CUT, STRENGTH, FLASH, ROCK_SMASH, DOUBLE_EDGE, HEADBUTT, IRON_HEAD, SLEEP_TALK, SWAGGER
 	; end
diff --git a/data/base_stats/starmie.asm b/data/base_stats/starmie.asm
@@ -18,5 +18,5 @@
 	dn INVERTEBRATE, INVERTEBRATE ; egg groups
 
 	; tmhm
-	tmhm CURSE, TOXIC, HAIL, HIDDEN_POWER, ICE_BEAM, BLIZZARD, HYPER_BEAM, LIGHT_SCREEN, PROTECT, RAIN_DANCE, THUNDERBOLT, THUNDER, RETURN, PSYCHIC, DOUBLE_TEAM, REFLECT, FLASH_CANNON, SWIFT, AVALANCHE, REST, ATTRACT, SUBSTITUTE, SCALD, ENDURE, DAZZLINGLEAM, THUNDER_WAVE, SURF, FLASH, WHIRLPOOL, WATERFALL, DOUBLE_EDGE, DREAM_EATER, ICY_WIND, ROLLOUT, SLEEP_TALK, SWAGGER, WATER_PULSE, ZAP_CANNON
+	tmhm CURSE, CALM_MIND, TOXIC, HAIL, HIDDEN_POWER, ICE_BEAM, BLIZZARD, HYPER_BEAM, LIGHT_SCREEN, PROTECT, RAIN_DANCE, THUNDERBOLT, THUNDER, RETURN, PSYCHIC, DOUBLE_TEAM, REFLECT, FLASH_CANNON, SWIFT, AVALANCHE, REST, ATTRACT, SUBSTITUTE, SCALD, ENDURE, DAZZLINGLEAM, THUNDER_WAVE, SURF, FLASH, WHIRLPOOL, WATERFALL, DOUBLE_EDGE, DREAM_EATER, ICY_WIND, ROLLOUT, SLEEP_TALK, SWAGGER, WATER_PULSE, ZAP_CANNON
 	; end
diff --git a/data/base_stats/staryu.asm b/data/base_stats/staryu.asm
@@ -18,5 +18,5 @@
 	dn INVERTEBRATE, INVERTEBRATE ; egg groups
 
 	; tmhm
-	tmhm CURSE, TOXIC, HAIL, HIDDEN_POWER, ICE_BEAM, BLIZZARD, LIGHT_SCREEN, PROTECT, RAIN_DANCE, THUNDERBOLT, THUNDER, RETURN, PSYCHIC, DOUBLE_TEAM, REFLECT, FLASH_CANNON, SWIFT, REST, ATTRACT, SUBSTITUTE, SCALD, ENDURE, DAZZLINGLEAM, THUNDER_WAVE, SURF, FLASH, WHIRLPOOL, WATERFALL, DOUBLE_EDGE, ICY_WIND, ROLLOUT, SLEEP_TALK, SWAGGER, WATER_PULSE, ZAP_CANNON
+	tmhm CURSE, CALM_MIND, TOXIC, HAIL, HIDDEN_POWER, ICE_BEAM, BLIZZARD, LIGHT_SCREEN, PROTECT, RAIN_DANCE, THUNDERBOLT, THUNDER, RETURN, PSYCHIC, DOUBLE_TEAM, REFLECT, FLASH_CANNON, SWIFT, REST, ATTRACT, SUBSTITUTE, SCALD, ENDURE, DAZZLINGLEAM, THUNDER_WAVE, SURF, FLASH, WHIRLPOOL, WATERFALL, DOUBLE_EDGE, ICY_WIND, ROLLOUT, SLEEP_TALK, SWAGGER, WATER_PULSE, ZAP_CANNON
 	; end
diff --git a/data/evos_attacks.asm b/data/evos_attacks.asm
@@ -667,6 +667,7 @@ VulpixEvosAttacks:
 	db 44, SHADOW_BALL ; Grudge → TM move
 	db 47, DISABLE ; Captivate → egg move
 	db 50, FLARE_BLITZ ; Inferno → egg move
+	db 53, MOONLIGHT ; new move
 	db 0 ; no more level-up moves
 
 NinetalesEvosAttacks:
@@ -3351,7 +3352,7 @@ MareepEvosAttacks:
 	db 29, POWER_GEM
 	db 32, THUNDERBOLT ; Discharge → TM move
 	db 36, SAFEGUARD ; Cotton Guard → egg move
-	db 39, BODY_SLAM ; Signal Beam → egg move
+	db 39, FLASH_CANNON ; Signal Beam → TM move
 	db 43, LIGHT_SCREEN
 	db 46, THUNDER
 	db 0 ; no more level-up moves
@@ -3371,7 +3372,7 @@ FlaaffyEvosAttacks:
 	db 34, POWER_GEM
 	db 38, THUNDERBOLT ; Discharge → TM move
 	db 43, SAFEGUARD ; Cotton Guard → egg move
-	db 47, BODY_SLAM ; Signal Beam → egg move
+	db 47, FLASH_CANNON ; Signal Beam → TM move
 	db 52, LIGHT_SCREEN
 	db 56, THUNDER
 	db 0 ; no more level-up moves
@@ -3392,7 +3393,7 @@ AmpharosEvosAttacks:
 	db 35, POWER_GEM
 	db 40, THUNDERBOLT ; Discharge → TM move
 	db 46, SAFEGUARD ; Cotton Guard → egg move
-	db 51, BODY_SLAM ; Signal Beam → egg move
+	db 51, FLASH_CANNON ; Signal Beam → TM move
 	db 57, LIGHT_SCREEN
 	db 62, THUNDER
 	db 65, DRAGON_PULSE
@@ -3658,7 +3659,7 @@ MurkrowEvosAttacks:
 	db 11, HAZE
 	db 15, WING_ATTACK
 	db 21, NIGHT_SHADE
-	db 25, CONFUSE_RAY ; Assurance → egg move
+	db 25, THIEF ; Assurance → TM move
 	db 31, NIGHTMARE ; Taunt → GSC TM move
 	db 35, FEINT_ATTACK
 	db 41, MEAN_LOOK
@@ -3744,6 +3745,10 @@ UnownEvosAttacks:
 
 WobbuffetEvosAttacks:
 	db 0 ; no more evolutions
+	db 1, SPLASH
+	db 1, CHARM
+	db 1, ENCORE
+	db 1, RECOVER
 	db 1, COUNTER
 	db 1, MIRROR_COAT
 	db 1, SAFEGUARD
@@ -4666,38 +4671,38 @@ TyranitarEvosAttacks:
 LugiaEvosAttacks:
 	db 0 ; no more evolutions
 	db 1, WHIRLWIND
-	db 1, GUST
+	db 8, GUST
 	db 15, TWISTER ; Dragon Rush → HGSS tutor move
-	db 23, EXTRASENSORY
+	db 22, EXTRASENSORY
 	db 29, RAIN_DANCE
-	db 37, HYDRO_PUMP
+	db 36, HYDRO_PUMP
 	db 43, DRAGON_PULSE ; Aeroblast → TM move
 	db 50, AEROBLAST ; Punishment → Aeroblast
 	db 57, ANCIENTPOWER
-	db 65, SAFEGUARD
+	db 64, SAFEGUARD
 	db 71, RECOVER
-	db 79, FUTURE_SIGHT
+	db 78, FUTURE_SIGHT
 	db 85, REFLECT ; Natural Gift → TM move
-	db 93, CALM_MIND
-	db 99, SKY_ATTACK
+	db 92, CALM_MIND
+	db 99, HURRICANE ; Sky Attack → new move
 	db 0 ; no more level-up moves
 
 HoOhEvosAttacks:
 	db 0 ; no more evolutions
 	db 1, WHIRLWIND
-	db 1, GUST
+	db 8, GUST
 	db 15, TWISTER ; Brave Bird → HGSS tutor move
-	db 23, EXTRASENSORY
+	db 22, EXTRASENSORY
 	db 29, SUNNY_DAY
-	db 37, FIRE_BLAST
+	db 36, FIRE_BLAST
 	db 43, SOLAR_BEAM ; Sacred Fire → Solar Beam
 	db 50, SACRED_FIRE ; Punishment → Sacred Fire
 	db 57, ANCIENTPOWER
-	db 65, SAFEGUARD
+	db 64, SAFEGUARD
 	db 71, RECOVER
-	db 79, FUTURE_SIGHT
+	db 78, FUTURE_SIGHT
 	db 85, LIGHT_SCREEN ; Natural Gift → TM move
-	db 93, CALM_MIND
+	db 92, CALM_MIND
 	db 99, SKY_ATTACK
 	db 0 ; no more level-up moves
 

diff --git a/trainers/trainers.asm b/trainers/trainers.asm
@@ -2230,8 +2230,8 @@ LeafGroup:
 		db HYPER_VOICE
 
 	db 98, AERODACTYL, MUSCLE_BAND
+		db HONE_CLAWS
 		db CRUNCH
-		db DRAGON_CLAW
 		db EARTHQUAKE
 		db ROCK_SLIDE
 
@@ -12284,8 +12284,8 @@ LawrenceGroup:
 	db 68, DRAGONITE, LEFTOVERS
 		db DRAGON_DANCE
 		db OUTRAGE
-		db HYPER_BEAM
 		db AQUA_TAIL
+		db EARTHQUAKE
 
 	db 67, TYRANITAR, KINGS_ROCK
 		db EARTHQUAKE
@@ -12589,12 +12589,12 @@ TowerTycoonGroup:
 	; unused
 	; TOWERTYCOON
 	db "Palmer@"
-	db 2 ; item
+	db 0 ; normal
 
 	; party
-	db 50, GYARADOS, MUSCLE_BAND
-	db 50, RHYPERIOR, LEFTOVERS
-	db 50, DRAGONITE, WISE_GLASSES
+	db 50, GYARADOS
+	db 50, RHYPERIOR
+	db 50, DRAGONITE
 
 	db $ff ; end
 
@@ -12619,7 +12619,7 @@ TowerTycoonGroup:
 		db AVALANCHE
 
 	db 75, DRAGONITE, WISE_GLASSES
-		db HYPER_BEAM
+		db HURRICANE
 		db DRAGON_PULSE
 		db FIRE_BLAST
 		db BLIZZARD