From 0f66ae5dca52ea7ce6d8130166d684c1d63de96f Mon Sep 17 00:00:00 2001 From: Skeli Date: Thu, 2 Jan 2020 23:16:07 +0200 Subject: [PATCH] Update Early Game Learnets --- scripts/insert.py | 2 +- scripts/make.py | 2 +- src/Learnsets.c | 272 ++++++++++++++++++++++++---------------------- 3 files changed, 143 insertions(+), 133 deletions(-) diff --git a/scripts/insert.py b/scripts/insert.py index 9309f8b..795ea0a 100644 --- a/scripts/insert.py +++ b/scripts/insert.py @@ -7,7 +7,7 @@ import sys from datetime import datetime import _io -OFFSET_TO_PUT = 0x17b09a0 +OFFSET_TO_PUT = 0x17b1480 SOURCE_ROM = "Pokemon Unbound.gba" ROM_NAME = "test.gba" diff --git a/scripts/make.py b/scripts/make.py index c6e4b7a..224e675 100644 --- a/scripts/make.py +++ b/scripts/make.py @@ -9,7 +9,7 @@ import sys ############ ROM_NAME = "Pokemon Unbound.gba" # The name of your rom -OFFSET_TO_PUT = 0x17b09a0 +OFFSET_TO_PUT = 0x17b1480 SEARCH_FREE_SPACE = False # Set to True if you want the script to search for free space # Set to False if you don't want to search for free space as you update the engine diff --git a/src/Learnsets.c b/src/Learnsets.c index dbc9b8b..4ab67ea 100644 --- a/src/Learnsets.c +++ b/src/Learnsets.c @@ -4963,64 +4963,74 @@ static const struct LevelUpMove sSuicuneLevelUpLearnset[] = { }; static const struct LevelUpMove sLarvitarLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_BITE), + LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_LEER), - LEVEL_UP_MOVE( 5, MOVE_SANDSTORM), - LEVEL_UP_MOVE(10, MOVE_SCREECH), - LEVEL_UP_MOVE(14, MOVE_CHIPAWAY), - LEVEL_UP_MOVE(19, MOVE_ROCKSLIDE), - LEVEL_UP_MOVE(23, MOVE_SCARYFACE), - LEVEL_UP_MOVE(28, MOVE_THRASH), - LEVEL_UP_MOVE(32, MOVE_DARKPULSE), - LEVEL_UP_MOVE(37, MOVE_PAYBACK), - LEVEL_UP_MOVE(41, MOVE_CRUNCH), - LEVEL_UP_MOVE(46, MOVE_EARTHQUAKE), - LEVEL_UP_MOVE(50, MOVE_STONEEDGE), - LEVEL_UP_MOVE(55, MOVE_HYPERBEAM), + LEVEL_UP_MOVE( 3, MOVE_ROCKTHROW), + LEVEL_UP_MOVE( 6, MOVE_SANDSTORM), + LEVEL_UP_MOVE( 9, MOVE_BITE), + LEVEL_UP_MOVE(12, MOVE_SCARYFACE), + LEVEL_UP_MOVE(14, MOVE_PAYBACK), + LEVEL_UP_MOVE(15, MOVE_ROCKSLIDE), + LEVEL_UP_MOVE(18, MOVE_STOMPINGTANTRUM), + LEVEL_UP_MOVE(21, MOVE_SCREECH), + LEVEL_UP_MOVE(24, MOVE_DARKPULSE), + LEVEL_UP_MOVE(27, MOVE_CRUNCH), + LEVEL_UP_MOVE(31, MOVE_EARTHQUAKE), + LEVEL_UP_MOVE(33, MOVE_STONEEDGE), + LEVEL_UP_MOVE(36, MOVE_CHIPAWAY), + LEVEL_UP_MOVE(39, MOVE_THRASH), + LEVEL_UP_MOVE(42, MOVE_HYPERBEAM), LEVEL_UP_END }; static const struct LevelUpMove sPupitarLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_BITE), + LEVEL_UP_MOVE( 0, MOVE_IRONDEFENSE), + LEVEL_UP_MOVE( 1, MOVE_IRONDEFENSE), + LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_LEER), - LEVEL_UP_MOVE( 1, MOVE_SANDSTORM), - LEVEL_UP_MOVE( 1, MOVE_SCREECH), - LEVEL_UP_MOVE( 5, MOVE_SANDSTORM), - LEVEL_UP_MOVE(10, MOVE_SCREECH), - LEVEL_UP_MOVE(14, MOVE_CHIPAWAY), - LEVEL_UP_MOVE(19, MOVE_ROCKSLIDE), - LEVEL_UP_MOVE(23, MOVE_SCARYFACE), - LEVEL_UP_MOVE(28, MOVE_THRASH), - LEVEL_UP_MOVE(34, MOVE_DARKPULSE), - LEVEL_UP_MOVE(41, MOVE_PAYBACK), - LEVEL_UP_MOVE(47, MOVE_CRUNCH), - LEVEL_UP_MOVE(54, MOVE_EARTHQUAKE), - LEVEL_UP_MOVE(60, MOVE_STONEEDGE), - LEVEL_UP_MOVE(67, MOVE_HYPERBEAM), + LEVEL_UP_MOVE( 3, MOVE_ROCKTHROW), + LEVEL_UP_MOVE( 6, MOVE_SANDSTORM), + LEVEL_UP_MOVE( 9, MOVE_BITE), + LEVEL_UP_MOVE(12, MOVE_SCARYFACE), + LEVEL_UP_MOVE(14, MOVE_PAYBACK), + LEVEL_UP_MOVE(15, MOVE_ROCKSLIDE), + LEVEL_UP_MOVE(18, MOVE_STOMPINGTANTRUM), + LEVEL_UP_MOVE(21, MOVE_SCREECH), + LEVEL_UP_MOVE(24, MOVE_DARKPULSE), + LEVEL_UP_MOVE(27, MOVE_CRUNCH), + LEVEL_UP_MOVE(29, MOVE_IRONDEFENSE), + LEVEL_UP_MOVE(33, MOVE_EARTHQUAKE), + LEVEL_UP_MOVE(37, MOVE_STONEEDGE), + LEVEL_UP_MOVE(42, MOVE_CHIPAWAY), + LEVEL_UP_MOVE(47, MOVE_THRASH), + LEVEL_UP_MOVE(52, MOVE_HYPERBEAM), LEVEL_UP_END }; static const struct LevelUpMove sTyranitarLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_IRONDEFENSE), LEVEL_UP_MOVE( 1, MOVE_THUNDERFANG), LEVEL_UP_MOVE( 1, MOVE_ICEFANG), LEVEL_UP_MOVE( 1, MOVE_FIREFANG), - LEVEL_UP_MOVE( 1, MOVE_BITE), + LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_LEER), - LEVEL_UP_MOVE( 1, MOVE_SANDSTORM), - LEVEL_UP_MOVE( 1, MOVE_SCREECH), - LEVEL_UP_MOVE( 5, MOVE_SANDSTORM), - LEVEL_UP_MOVE(10, MOVE_SCREECH), - LEVEL_UP_MOVE(14, MOVE_CHIPAWAY), - LEVEL_UP_MOVE(19, MOVE_ROCKSLIDE), - LEVEL_UP_MOVE(23, MOVE_SCARYFACE), - LEVEL_UP_MOVE(28, MOVE_THRASH), - LEVEL_UP_MOVE(34, MOVE_DARKPULSE), - LEVEL_UP_MOVE(41, MOVE_PAYBACK), - LEVEL_UP_MOVE(47, MOVE_CRUNCH), - LEVEL_UP_MOVE(54, MOVE_EARTHQUAKE), - LEVEL_UP_MOVE(63, MOVE_STONEEDGE), - LEVEL_UP_MOVE(73, MOVE_HYPERBEAM), - LEVEL_UP_MOVE(82, MOVE_GIGAIMPACT), + LEVEL_UP_MOVE( 3, MOVE_ROCKTHROW), + LEVEL_UP_MOVE( 6, MOVE_SANDSTORM), + LEVEL_UP_MOVE( 9, MOVE_BITE), + LEVEL_UP_MOVE(12, MOVE_SCARYFACE), + LEVEL_UP_MOVE(14, MOVE_PAYBACK), + LEVEL_UP_MOVE(15, MOVE_ROCKSLIDE), + LEVEL_UP_MOVE(18, MOVE_STOMPINGTANTRUM), + LEVEL_UP_MOVE(21, MOVE_SCREECH), + LEVEL_UP_MOVE(24, MOVE_DARKPULSE), + LEVEL_UP_MOVE(27, MOVE_CRUNCH), + LEVEL_UP_MOVE(29, MOVE_IRONDEFENSE), + LEVEL_UP_MOVE(33, MOVE_EARTHQUAKE), + LEVEL_UP_MOVE(37, MOVE_STONEEDGE), + LEVEL_UP_MOVE(42, MOVE_CHIPAWAY), + LEVEL_UP_MOVE(47, MOVE_THRASH), + LEVEL_UP_MOVE(52, MOVE_HYPERBEAM), + LEVEL_UP_MOVE(59, MOVE_GIGAIMPACT), LEVEL_UP_END }; @@ -6497,43 +6507,42 @@ static const struct LevelUpMove sCacturneLevelUpLearnset[] = { }; static const struct LevelUpMove sSnoruntLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_BITE), - LEVEL_UP_MOVE( 1, MOVE_LEER), - LEVEL_UP_MOVE( 5, MOVE_DOUBLETEAM), + LEVEL_UP_MOVE( 1, MOVE_ASTONISH), + LEVEL_UP_MOVE( 5, MOVE_LEER), + LEVEL_UP_MOVE(10, MOVE_DOUBLETEAM), LEVEL_UP_MOVE(11, MOVE_POWDERSNOW), - LEVEL_UP_MOVE(14, MOVE_ICESHARD), - LEVEL_UP_MOVE(19, MOVE_ICYWIND), - LEVEL_UP_MOVE(23, MOVE_ICEFANG), - LEVEL_UP_MOVE(28, MOVE_HEADBUTT), - LEVEL_UP_MOVE(32, MOVE_PROTECT), - LEVEL_UP_MOVE(37, MOVE_FROSTBREATH), - LEVEL_UP_MOVE(41, MOVE_CRUNCH), - LEVEL_UP_MOVE(46, MOVE_BLIZZARD), - LEVEL_UP_MOVE(50, MOVE_HAIL), + LEVEL_UP_MOVE(13, MOVE_BITE), + LEVEL_UP_MOVE(15, MOVE_ICESHARD), + LEVEL_UP_MOVE(20, MOVE_ICEFANG), + LEVEL_UP_MOVE(25, MOVE_ICYWIND), + LEVEL_UP_MOVE(30, MOVE_FROSTBREATH), + LEVEL_UP_MOVE(35, MOVE_PROTECT), + LEVEL_UP_MOVE(40, MOVE_HAIL), + LEVEL_UP_MOVE(45, MOVE_HEADBUTT), + LEVEL_UP_MOVE(50, MOVE_CRUNCH), + LEVEL_UP_MOVE(55, MOVE_BLIZZARD), LEVEL_UP_END }; static const struct LevelUpMove sGlalieLevelUpLearnset[] = { - LEVEL_UP_MOVE( 0, MOVE_FREEZEDRY), + LEVEL_UP_MOVE( 1, MOVE_FREEZEDRY), LEVEL_UP_MOVE( 1, MOVE_SHEERCOLD), - LEVEL_UP_MOVE( 1, MOVE_BITE), + LEVEL_UP_MOVE( 1, MOVE_ASTONISH), LEVEL_UP_MOVE( 1, MOVE_LEER), - LEVEL_UP_MOVE( 1, MOVE_DOUBLETEAM), LEVEL_UP_MOVE( 1, MOVE_POWDERSNOW), - LEVEL_UP_MOVE( 5, MOVE_DOUBLETEAM), - LEVEL_UP_MOVE(11, MOVE_POWDERSNOW), - LEVEL_UP_MOVE(14, MOVE_ICESHARD), - LEVEL_UP_MOVE(19, MOVE_ICYWIND), - LEVEL_UP_MOVE(23, MOVE_ICEFANG), - LEVEL_UP_MOVE(28, MOVE_HEADBUTT), - LEVEL_UP_MOVE(32, MOVE_PROTECT), - LEVEL_UP_MOVE(37, MOVE_FROSTBREATH), - LEVEL_UP_MOVE(41, MOVE_CRUNCH), - LEVEL_UP_MOVE(41, MOVE_FREEZEDRY), - LEVEL_UP_MOVE(48, MOVE_BLIZZARD), - LEVEL_UP_MOVE(54, MOVE_HAIL), - LEVEL_UP_MOVE(61, MOVE_SHEERCOLD), + LEVEL_UP_MOVE(13, MOVE_BITE), + LEVEL_UP_MOVE(15, MOVE_ICESHARD), + LEVEL_UP_MOVE(20, MOVE_ICEFANG), + LEVEL_UP_MOVE(25, MOVE_ICYWIND), + LEVEL_UP_MOVE(30, MOVE_FROSTBREATH), + LEVEL_UP_MOVE(35, MOVE_PROTECT), + LEVEL_UP_MOVE(40, MOVE_ICEFANG), + LEVEL_UP_MOVE(47, MOVE_HAIL), + LEVEL_UP_MOVE(54, MOVE_HEADBUTT), + LEVEL_UP_MOVE(61, MOVE_CRUNCH), + LEVEL_UP_MOVE(68, MOVE_BLIZZARD), + LEVEL_UP_MOVE(75, MOVE_SHEERCOLD), LEVEL_UP_END }; @@ -9736,26 +9745,33 @@ static const struct LevelUpMove sDusknoirLevelUpLearnset[] = { }; static const struct LevelUpMove sFroslassLevelUpLearnset[] = { + LEVEL_UP_MOVE( 0, MOVE_HEX), LEVEL_UP_MOVE( 0, MOVE_OMINOUSWIND), + LEVEL_UP_MOVE( 1, MOVE_HEX), LEVEL_UP_MOVE( 1, MOVE_DESTINYBOND), + LEVEL_UP_MOVE( 1, MOVE_PROTECT), + LEVEL_UP_MOVE( 1, MOVE_BITE), + LEVEL_UP_MOVE( 1, MOVE_ICEFANG), + LEVEL_UP_MOVE( 1, MOVE_HEADBUTT), + LEVEL_UP_MOVE( 1, MOVE_CRUNCH), LEVEL_UP_MOVE( 1, MOVE_POWDERSNOW), + LEVEL_UP_MOVE( 1, MOVE_ASTONISH), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 1, MOVE_DOUBLETEAM), - LEVEL_UP_MOVE( 1, MOVE_ICESHARD), - LEVEL_UP_MOVE( 5, MOVE_DOUBLETEAM), - LEVEL_UP_MOVE(10, MOVE_ICESHARD), - LEVEL_UP_MOVE(14, MOVE_ICYWIND), - LEVEL_UP_MOVE(19, MOVE_ASTONISH), - LEVEL_UP_MOVE(23, MOVE_DRAININGKISS), - LEVEL_UP_MOVE(25, MOVE_OMINOUSWIND), - LEVEL_UP_MOVE(28, MOVE_WILLOWISP), - LEVEL_UP_MOVE(32, MOVE_CONFUSERAY), + LEVEL_UP_MOVE(15, MOVE_ICESHARD), + LEVEL_UP_MOVE(20, MOVE_DRAININGKISS), + LEVEL_UP_MOVE(23, MOVE_OMINOUSWIND), + LEVEL_UP_MOVE(25, MOVE_ICYWIND), + LEVEL_UP_MOVE(30, MOVE_FROSTBREATH), + LEVEL_UP_MOVE(35, MOVE_CONFUSERAY), LEVEL_UP_MOVE(37, MOVE_WAKEUPSLAP), - LEVEL_UP_MOVE(41, MOVE_CAPTIVATE), - LEVEL_UP_MOVE(42, MOVE_SHADOWBALL), - LEVEL_UP_MOVE(48, MOVE_BLIZZARD), - LEVEL_UP_MOVE(54, MOVE_HAIL), - LEVEL_UP_MOVE(61, MOVE_DESTINYBOND), + LEVEL_UP_MOVE(40, MOVE_HAIL), + LEVEL_UP_MOVE(42, MOVE_CAPTIVATE), + LEVEL_UP_MOVE(47, MOVE_WILLOWISP), + LEVEL_UP_MOVE(54, MOVE_AURORAVEIL), + LEVEL_UP_MOVE(61, MOVE_SHADOWBALL), + LEVEL_UP_MOVE(68, MOVE_BLIZZARD), + LEVEL_UP_MOVE(75, MOVE_DESTINYBOND), LEVEL_UP_END }; @@ -11829,67 +11845,61 @@ static const struct LevelUpMove sSwannaLevelUpLearnset[] = { static const struct LevelUpMove sVanilliteLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_ASTONISH), - LEVEL_UP_MOVE( 4, MOVE_HARDEN), - LEVEL_UP_MOVE(10, MOVE_UPROAR), - LEVEL_UP_MOVE(11, MOVE_ICICLESPEAR), - LEVEL_UP_MOVE(13, MOVE_ICYWIND), - LEVEL_UP_MOVE(16, MOVE_MIST), - LEVEL_UP_MOVE(19, MOVE_AVALANCHE), - LEVEL_UP_MOVE(22, MOVE_TAUNT), + LEVEL_UP_MOVE( 1, MOVE_HARDEN), + LEVEL_UP_MOVE( 4, MOVE_TAUNT), + LEVEL_UP_MOVE( 8, MOVE_MIST), + LEVEL_UP_MOVE(12, MOVE_ICYWIND), + LEVEL_UP_MOVE(16, MOVE_AVALANCHE), + LEVEL_UP_MOVE(20, MOVE_HAIL), + LEVEL_UP_MOVE(24, MOVE_ICICLESPEAR), LEVEL_UP_MOVE(26, MOVE_MIRRORSHOT), - LEVEL_UP_MOVE(31, MOVE_ACIDARMOR), - LEVEL_UP_MOVE(35, MOVE_ICEBEAM), - LEVEL_UP_MOVE(40, MOVE_HAIL), - LEVEL_UP_MOVE(44, MOVE_MIRRORCOAT), - LEVEL_UP_MOVE(49, MOVE_BLIZZARD), - LEVEL_UP_MOVE(53, MOVE_SHEERCOLD), + LEVEL_UP_MOVE(28, MOVE_UPROAR), + LEVEL_UP_MOVE(32, MOVE_ACIDARMOR), + LEVEL_UP_MOVE(36, MOVE_MIRRORCOAT), + LEVEL_UP_MOVE(40, MOVE_ICEBEAM), + LEVEL_UP_MOVE(44, MOVE_BLIZZARD), + LEVEL_UP_MOVE(48, MOVE_SHEERCOLD), LEVEL_UP_END }; static const struct LevelUpMove sVanillishLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_ASTONISH), LEVEL_UP_MOVE( 1, MOVE_HARDEN), - LEVEL_UP_MOVE( 1, MOVE_UPROAR), - LEVEL_UP_MOVE( 1, MOVE_ICICLESPEAR), - LEVEL_UP_MOVE( 4, MOVE_HARDEN), - LEVEL_UP_MOVE(10, MOVE_UPROAR), - LEVEL_UP_MOVE(11, MOVE_ICICLESPEAR), - LEVEL_UP_MOVE(13, MOVE_ICYWIND), - LEVEL_UP_MOVE(16, MOVE_MIST), - LEVEL_UP_MOVE(19, MOVE_AVALANCHE), - LEVEL_UP_MOVE(22, MOVE_TAUNT), + LEVEL_UP_MOVE( 1, MOVE_TAUNT), + LEVEL_UP_MOVE( 1, MOVE_MIST), + LEVEL_UP_MOVE(12, MOVE_ICYWIND), + LEVEL_UP_MOVE(16, MOVE_AVALANCHE), + LEVEL_UP_MOVE(20, MOVE_HAIL), + LEVEL_UP_MOVE(24, MOVE_ICICLESPEAR), LEVEL_UP_MOVE(26, MOVE_MIRRORSHOT), - LEVEL_UP_MOVE(31, MOVE_ACIDARMOR), - LEVEL_UP_MOVE(36, MOVE_ICEBEAM), - LEVEL_UP_MOVE(42, MOVE_HAIL), - LEVEL_UP_MOVE(47, MOVE_MIRRORCOAT), - LEVEL_UP_MOVE(53, MOVE_BLIZZARD), - LEVEL_UP_MOVE(58, MOVE_SHEERCOLD), + LEVEL_UP_MOVE(28, MOVE_UPROAR), + LEVEL_UP_MOVE(32, MOVE_ACIDARMOR), + LEVEL_UP_MOVE(38, MOVE_MIRRORCOAT), + LEVEL_UP_MOVE(44, MOVE_ICEBEAM), + LEVEL_UP_MOVE(50, MOVE_BLIZZARD), + LEVEL_UP_MOVE(56, MOVE_SHEERCOLD), LEVEL_UP_END }; static const struct LevelUpMove sVanilluxeLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_SHEERCOLD), - LEVEL_UP_MOVE( 1, MOVE_FREEZEDRY), LEVEL_UP_MOVE( 1, MOVE_WEATHERBALL), + LEVEL_UP_MOVE( 1, MOVE_ICICLECRASH), + LEVEL_UP_MOVE( 1, MOVE_FREEZEDRY), LEVEL_UP_MOVE( 1, MOVE_ASTONISH), LEVEL_UP_MOVE( 1, MOVE_HARDEN), - LEVEL_UP_MOVE( 1, MOVE_UPROAR), - LEVEL_UP_MOVE( 1, MOVE_ICICLESPEAR), - LEVEL_UP_MOVE( 4, MOVE_HARDEN), - LEVEL_UP_MOVE(10, MOVE_UPROAR), - LEVEL_UP_MOVE(11, MOVE_ICICLESPEAR), - LEVEL_UP_MOVE(13, MOVE_ICYWIND), - LEVEL_UP_MOVE(16, MOVE_MIST), - LEVEL_UP_MOVE(19, MOVE_AVALANCHE), - LEVEL_UP_MOVE(22, MOVE_TAUNT), + LEVEL_UP_MOVE( 1, MOVE_TAUNT), + LEVEL_UP_MOVE( 1, MOVE_MIST), + LEVEL_UP_MOVE(12, MOVE_ICYWIND), + LEVEL_UP_MOVE(16, MOVE_AVALANCHE), + LEVEL_UP_MOVE(20, MOVE_HAIL), + LEVEL_UP_MOVE(24, MOVE_ICICLESPEAR), LEVEL_UP_MOVE(26, MOVE_MIRRORSHOT), - LEVEL_UP_MOVE(31, MOVE_ACIDARMOR), - LEVEL_UP_MOVE(36, MOVE_ICEBEAM), - LEVEL_UP_MOVE(42, MOVE_HAIL), - LEVEL_UP_MOVE(50, MOVE_MIRRORCOAT), - LEVEL_UP_MOVE(59, MOVE_BLIZZARD), - LEVEL_UP_MOVE(67, MOVE_SHEERCOLD), + LEVEL_UP_MOVE(28, MOVE_UPROAR), + LEVEL_UP_MOVE(32, MOVE_ACIDARMOR), + LEVEL_UP_MOVE(38, MOVE_MIRRORCOAT), + LEVEL_UP_MOVE(44, MOVE_ICEBEAM), + LEVEL_UP_MOVE(52, MOVE_BLIZZARD), + LEVEL_UP_MOVE(60, MOVE_SHEERCOLD), LEVEL_UP_END };