Leahnaya/Dynamic-Pokemon-Expansion
1
0
Fork 0
mirror of https://github.com/Skeli789/Dynamic-Pokemon-Expansion.git synced 2026-04-25 07:36:55 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Other Unbound Fixes & Updates

Browse Source 
-Hook in SeenAllRegionalMons funcs for scripts repo
-Prevent Gen 8 mons from affecting dex count
-Nickit & Thievul Technician
_Learnset updates
-Fix incorrect Borrius dex positions
This commit is contained in:
Skeli 2022-01-02 13:51:02 +02:00
parent 99cbfa1546
commit dc9ce5be12
6 changed files with 110 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hooks
View File

@ -41,4 +41,5 @@ PokemonStorageSystemManaphyEggHook10 808F414 1
PartyMenuManaphyEggHook 8122214 0
SummaryScreenManaphyEggHook 8139978 1
##Other Repo Hooks
sp1B9_SeenAllRegionalMons 801D844 0

3
special_inserts.asm
View File

@ -4,6 +4,7 @@
.equ EVOS_PER_MON, 16
.equ FINAL_DEX_ENTRY, 898
.equ FINAL_GEN_7_DEX_ENTRY, 809
@;.equ SEEN_DEX_FLAGS, 0x202583C
@;.equ CAUGHT_DEX_FLAGS, (SEEN_DEX_FLAGS + (FINAL_DEX_ENTRY / 8) + 1)
@ -39,7 +40,7 @@ add r3, #EVOS_PER_MON * 8
@@Fix Dex Views@@
.org 0x88EA4, 0xFF @Pokedex Count
.word FINAL_DEX_ENTRY - 1
.word FINAL_GEN_7_DEX_ENTRY - 1
.org 0x1037D4, 0xFF @Weight View
.word FINAL_DEX_ENTRY - 1

4
src/Base_Stats.c
View File

@ -36211,7 +36211,7 @@ const struct BaseStats gBaseStats[] =
.growthRate = GROWTH_FAST,
.eggGroup1 = EGG_GROUP_FIELD,
.eggGroup2 = EGG_GROUP_FIELD,
.ability1 = ABILITY_RUNAWAY,
.ability1 = ABILITY_TECHNICIAN,
.ability2 = ABILITY_UNBURDEN,
.safariZoneFleeRate = 0,
.hiddenAbility = ABILITY_STAKEOUT,
@ -36244,7 +36244,7 @@ const struct BaseStats gBaseStats[] =
.growthRate = GROWTH_FAST,
.eggGroup1 = EGG_GROUP_FIELD,
.eggGroup2 = EGG_GROUP_FIELD,
.ability1 = ABILITY_RUNAWAY,
.ability1 = ABILITY_TECHNICIAN,
.ability2 = ABILITY_UNBURDEN,
.safariZoneFleeRate = 0,
.hiddenAbility = ABILITY_STAKEOUT,

2
src/Egg_Moves.c
View File

@ -678,7 +678,6 @@ const u16 gEggMoves[] =
MOVE_COUNTER,
MOVE_GRAVITY,
MOVE_MUDBOMB,
MOVE_NATURALGIFT,
MOVE_ENDURE,
MOVE_SEISMICTOSS,
MOVE_BESTOW,
@ -1430,7 +1429,6 @@ const u16 gEggMoves[] =
MOVE_RAPIDSPIN,
MOVE_ICEBALL,
MOVE_ICESHARD,
MOVE_DESTINYBOND,
MOVE_COUNTER,
MOVE_AURORAVEIL,
MOVE_MEMENTO),

179
src/Learnsets.c
View File

@ -2496,31 +2496,34 @@ static const struct LevelUpMove sRhydonLevelUpLearnset[] = {
};
static const struct LevelUpMove sChanseyLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_REFRESH),
LEVEL_UP_MOVE( 1, MOVE_POUND),
LEVEL_UP_MOVE( 1, MOVE_COPYCAT),
LEVEL_UP_MOVE( 1, MOVE_SWEETKISS),
LEVEL_UP_MOVE( 1, MOVE_DISARMINGVOICE),
LEVEL_UP_MOVE( 1, MOVE_COVET),
LEVEL_UP_MOVE( 1, MOVE_CHARM),
LEVEL_UP_MOVE( 1, MOVE_MINIMIZE),
LEVEL_UP_MOVE( 1, MOVE_REFRESH),
LEVEL_UP_MOVE( 1, MOVE_GROWL),
LEVEL_UP_MOVE( 1, MOVE_POUND),
LEVEL_UP_MOVE( 1, MOVE_COPYCAT),
LEVEL_UP_MOVE( 1, MOVE_DOUBLESLAP),
LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL),
LEVEL_UP_MOVE( 4, MOVE_TAILWHIP),
LEVEL_UP_MOVE( 8, MOVE_ECHOEDVOICE),
LEVEL_UP_MOVE(12, MOVE_LIFEDEW),
LEVEL_UP_MOVE(14, MOVE_DOUBLESLAP),
LEVEL_UP_MOVE(16, MOVE_SING),
LEVEL_UP_MOVE(20, MOVE_FLING),
LEVEL_UP_MOVE(24, MOVE_TAKEDOWN),
LEVEL_UP_MOVE( 8, MOVE_TAKEDOWN),
LEVEL_UP_MOVE(12, MOVE_SING),
LEVEL_UP_MOVE(16, MOVE_EGGBOMB),
LEVEL_UP_MOVE(20, MOVE_HELPINGHAND),
LEVEL_UP_MOVE(24, MOVE_ECHOEDVOICE),
LEVEL_UP_MOVE(28, MOVE_HEALPULSE),
LEVEL_UP_MOVE(32, MOVE_HELPINGHAND),
LEVEL_UP_MOVE(36, MOVE_EGGBOMB),
LEVEL_UP_MOVE(40, MOVE_LIGHTSCREEN),
LEVEL_UP_MOVE(44, MOVE_DOUBLEEDGE),
LEVEL_UP_MOVE(48, MOVE_SOFTBOILED),
LEVEL_UP_MOVE(52, MOVE_LASTRESORT),
LEVEL_UP_MOVE(56, MOVE_HEALINGWISH),
LEVEL_UP_MOVE(32, MOVE_DOUBLEEDGE),
LEVEL_UP_MOVE(36, MOVE_LIGHTSCREEN),
LEVEL_UP_MOVE(40, MOVE_NATURALGIFT),
LEVEL_UP_MOVE(44, MOVE_HYPERVOICE),
LEVEL_UP_MOVE(48, MOVE_FLING),
LEVEL_UP_MOVE(56, MOVE_LIFEDEW),
LEVEL_UP_MOVE(60, MOVE_LASTRESORT),
LEVEL_UP_MOVE(64, MOVE_HYPERBEAM),
LEVEL_UP_MOVE(68, MOVE_HEALINGWISH),
LEVEL_UP_MOVE(72, MOVE_MINIMIZE),
LEVEL_UP_MOVE(76, MOVE_SOFTBOILED),
LEVEL_UP_END
};
@ -2832,10 +2835,10 @@ static const struct LevelUpMove sPinsirLevelUpLearnset[] = {
LEVEL_UP_MOVE(16, MOVE_BUGBITE),
LEVEL_UP_MOVE(20, MOVE_VITALTHROW),
LEVEL_UP_MOVE(24, MOVE_DOUBLEHIT),
LEVEL_UP_MOVE(28, MOVE_STORMTHROW),
LEVEL_UP_MOVE(28, MOVE_BRICKBREAK),
LEVEL_UP_MOVE(32, MOVE_XSCISSOR),
LEVEL_UP_MOVE(36, MOVE_STRENGTH),
LEVEL_UP_MOVE(40, MOVE_BRICKBREAK),
LEVEL_UP_MOVE(40, MOVE_STORMTHROW),
LEVEL_UP_MOVE(44, MOVE_SWORDSDANCE),
LEVEL_UP_MOVE(48, MOVE_THRASH),
LEVEL_UP_MOVE(52, MOVE_SUBMISSION),
@ -4992,6 +4995,7 @@ static const struct LevelUpMove sDelibirdLevelUpLearnset[] = {
LEVEL_UP_MOVE(34, MOVE_ICEPUNCH),
LEVEL_UP_MOVE(37, MOVE_DEFOG),
LEVEL_UP_MOVE(39, MOVE_BRAVEBIRD),
LEVEL_UP_MOVE(76, MOVE_DESTINYBOND),
LEVEL_UP_END
};
@ -5330,31 +5334,34 @@ static const struct LevelUpMove sMiltankLevelUpLearnset[] = {
};
static const struct LevelUpMove sBlisseyLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_REFRESH),
LEVEL_UP_MOVE( 1, MOVE_POUND),
LEVEL_UP_MOVE( 1, MOVE_COPYCAT),
LEVEL_UP_MOVE( 1, MOVE_SWEETKISS),
LEVEL_UP_MOVE( 1, MOVE_DISARMINGVOICE),
LEVEL_UP_MOVE( 1, MOVE_COVET),
LEVEL_UP_MOVE( 1, MOVE_CHARM),
LEVEL_UP_MOVE( 1, MOVE_MINIMIZE),
LEVEL_UP_MOVE( 1, MOVE_REFRESH),
LEVEL_UP_MOVE( 1, MOVE_GROWL),
LEVEL_UP_MOVE( 1, MOVE_POUND),
LEVEL_UP_MOVE( 1, MOVE_COPYCAT),
LEVEL_UP_MOVE( 1, MOVE_DOUBLESLAP),
LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL),
LEVEL_UP_MOVE( 4, MOVE_TAILWHIP),
LEVEL_UP_MOVE( 8, MOVE_ECHOEDVOICE),
LEVEL_UP_MOVE(12, MOVE_LIFEDEW),
LEVEL_UP_MOVE(14, MOVE_DOUBLESLAP),
LEVEL_UP_MOVE(16, MOVE_SING),
LEVEL_UP_MOVE(20, MOVE_FLING),
LEVEL_UP_MOVE(24, MOVE_TAKEDOWN),
LEVEL_UP_MOVE( 8, MOVE_TAKEDOWN),
LEVEL_UP_MOVE(12, MOVE_SING),
LEVEL_UP_MOVE(16, MOVE_EGGBOMB),
LEVEL_UP_MOVE(20, MOVE_HELPINGHAND),
LEVEL_UP_MOVE(24, MOVE_ECHOEDVOICE),
LEVEL_UP_MOVE(28, MOVE_HEALPULSE),
LEVEL_UP_MOVE(32, MOVE_HELPINGHAND),
LEVEL_UP_MOVE(36, MOVE_EGGBOMB),
LEVEL_UP_MOVE(40, MOVE_LIGHTSCREEN),
LEVEL_UP_MOVE(44, MOVE_DOUBLEEDGE),
LEVEL_UP_MOVE(48, MOVE_SOFTBOILED),
LEVEL_UP_MOVE(52, MOVE_LASTRESORT),
LEVEL_UP_MOVE(56, MOVE_HEALINGWISH),
LEVEL_UP_MOVE(32, MOVE_DOUBLEEDGE),
LEVEL_UP_MOVE(36, MOVE_LIGHTSCREEN),
LEVEL_UP_MOVE(40, MOVE_NATURALGIFT),
LEVEL_UP_MOVE(44, MOVE_HYPERVOICE),
LEVEL_UP_MOVE(48, MOVE_FLING),
LEVEL_UP_MOVE(56, MOVE_LIFEDEW),
LEVEL_UP_MOVE(60, MOVE_LASTRESORT),
LEVEL_UP_MOVE(64, MOVE_HYPERBEAM),
LEVEL_UP_MOVE(68, MOVE_HEALINGWISH),
LEVEL_UP_MOVE(72, MOVE_MINIMIZE),
LEVEL_UP_MOVE(76, MOVE_SOFTBOILED),
LEVEL_UP_END
};
@ -7075,7 +7082,7 @@ static const struct LevelUpMove sCacneaLevelUpLearnset[] = {
LEVEL_UP_MOVE(40, MOVE_ENERGYBALL),
LEVEL_UP_MOVE(44, MOVE_COTTONSPORE),
LEVEL_UP_MOVE(48, MOVE_SANDSTORM),
LEVEL_UP_MOVE(52, MOVE_DESTINYBOND),
LEVEL_UP_MOVE(76, MOVE_DESTINYBOND),
LEVEL_UP_END
};
@ -7100,7 +7107,7 @@ static const struct LevelUpMove sCacturneLevelUpLearnset[] = {
LEVEL_UP_MOVE(42, MOVE_ENERGYBALL),
LEVEL_UP_MOVE(48, MOVE_COTTONSPORE),
LEVEL_UP_MOVE(54, MOVE_SANDSTORM),
LEVEL_UP_MOVE(60, MOVE_DESTINYBOND),
LEVEL_UP_MOVE(76, MOVE_DESTINYBOND),
LEVEL_UP_END
};
@ -9582,7 +9589,6 @@ static const struct LevelUpMove sMimeJrLevelUpLearnset[] = {
static const struct LevelUpMove sHappinyLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_REFRESH),
LEVEL_UP_MOVE( 1, MOVE_MINIMIZE),
LEVEL_UP_MOVE( 1, MOVE_POUND),
LEVEL_UP_MOVE( 1, MOVE_COPYCAT),
LEVEL_UP_MOVE( 4, MOVE_DEFENSECURL),
@ -11556,14 +11562,14 @@ static const struct LevelUpMove sDrilburLevelUpLearnset[] = {
LEVEL_UP_MOVE(12, MOVE_FURYSWIPES),
LEVEL_UP_MOVE(16, MOVE_METALCLAW),
LEVEL_UP_MOVE(20, MOVE_SANDSTORM),
LEVEL_UP_MOVE(24, MOVE_CRUSHCLAW),
LEVEL_UP_MOVE(28, MOVE_ROCKSLIDE),
LEVEL_UP_MOVE(32, MOVE_DIG),
LEVEL_UP_MOVE(34, MOVE_SLASH),
LEVEL_UP_MOVE(36, MOVE_SWORDSDANCE),
LEVEL_UP_MOVE(40, MOVE_DRILLRUN),
LEVEL_UP_MOVE(44, MOVE_EARTHQUAKE),
LEVEL_UP_MOVE(48, MOVE_FISSURE),
LEVEL_UP_MOVE(24, MOVE_SLASH),
LEVEL_UP_MOVE(28, MOVE_DIG),
LEVEL_UP_MOVE(32, MOVE_CRUSHCLAW),
LEVEL_UP_MOVE(36, MOVE_ROCKSLIDE),
LEVEL_UP_MOVE(40, MOVE_SWORDSDANCE),
LEVEL_UP_MOVE(45, MOVE_DRILLRUN),
LEVEL_UP_MOVE(50, MOVE_EARTHQUAKE),
LEVEL_UP_MOVE(55, MOVE_FISSURE),
LEVEL_UP_END
};
@ -11573,20 +11579,20 @@ static const struct LevelUpMove sExcadrillLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_MUDSPORT),
LEVEL_UP_MOVE( 1, MOVE_MUDSLAP),
LEVEL_UP_MOVE( 1, MOVE_RAPIDSPIN),
LEVEL_UP_MOVE( 4, MOVE_SCRATCH),
LEVEL_UP_MOVE( 8, MOVE_HONECLAWS),
LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
LEVEL_UP_MOVE( 1, MOVE_HONECLAWS),
LEVEL_UP_MOVE(12, MOVE_FURYSWIPES),
LEVEL_UP_MOVE(16, MOVE_METALCLAW),
LEVEL_UP_MOVE(20, MOVE_SANDSTORM),
LEVEL_UP_MOVE(24, MOVE_CRUSHCLAW),
LEVEL_UP_MOVE(28, MOVE_ROCKSLIDE),
LEVEL_UP_MOVE(24, MOVE_SLASH),
LEVEL_UP_MOVE(28, MOVE_DIG),
LEVEL_UP_MOVE(30, MOVE_HORNDRILL),
LEVEL_UP_MOVE(34, MOVE_DIG),
LEVEL_UP_MOVE(34, MOVE_SLASH),
LEVEL_UP_MOVE(40, MOVE_SWORDSDANCE),
LEVEL_UP_MOVE(46, MOVE_DRILLRUN),
LEVEL_UP_MOVE(52, MOVE_EARTHQUAKE),
LEVEL_UP_MOVE(58, MOVE_FISSURE),
LEVEL_UP_MOVE(34, MOVE_CRUSHCLAW),
LEVEL_UP_MOVE(39, MOVE_ROCKSLIDE),
LEVEL_UP_MOVE(44, MOVE_SWORDSDANCE),
LEVEL_UP_MOVE(50, MOVE_DRILLRUN),
LEVEL_UP_MOVE(56, MOVE_EARTHQUAKE),
LEVEL_UP_MOVE(62, MOVE_FISSURE),
LEVEL_UP_END
};
@ -12233,6 +12239,7 @@ static const struct LevelUpMove sScraftyLevelUpLearnset[] = {
LEVEL_UP_MOVE(48, MOVE_DUALCHOP),
LEVEL_UP_MOVE(54, MOVE_HIGHJUMPKICK),
LEVEL_UP_MOVE(58, MOVE_HEADSMASH),
LEVEL_UP_END
};
static const struct LevelUpMove sSigilyphLevelUpLearnset[] = {
@ -14162,6 +14169,8 @@ static const struct LevelUpMove sMeloettaLevelUpLearnset[] = {
};
static const struct LevelUpMove sGenesectLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_SHIFTGEAR),
LEVEL_UP_MOVE( 1, MOVE_EXTREMESPEED),
LEVEL_UP_MOVE( 1, MOVE_BLAZEKICK),
LEVEL_UP_MOVE( 1, MOVE_FURYCUTTER),
LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK),
@ -14510,37 +14519,37 @@ static const struct LevelUpMove sGreninjaLevelUpLearnset[] = {
};
static const struct LevelUpMove sBunnelbyLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_ODORSLEUTH),
LEVEL_UP_MOVE( 1, MOVE_MUDSLAP),
LEVEL_UP_MOVE( 1, MOVE_LEER),
LEVEL_UP_MOVE( 3, MOVE_TACKLE),
LEVEL_UP_MOVE( 6, MOVE_LASERFOCUS),
LEVEL_UP_MOVE( 9, MOVE_QUICKATTACK),
LEVEL_UP_MOVE(12, MOVE_MUDSHOT),
LEVEL_UP_MOVE(15, MOVE_DOUBLESLAP),
LEVEL_UP_MOVE(18, MOVE_DOUBLEKICK),
LEVEL_UP_MOVE(21, MOVE_BULLDOZE),
LEVEL_UP_MOVE(24, MOVE_FACADE),
LEVEL_UP_MOVE(27, MOVE_DIG),
LEVEL_UP_MOVE(30, MOVE_BOUNCE),
LEVEL_UP_MOVE(33, MOVE_AGILITY),
LEVEL_UP_MOVE(36, MOVE_TAKEDOWN),
LEVEL_UP_MOVE(39, MOVE_SWORDSDANCE),
LEVEL_UP_MOVE(42, MOVE_FLAIL),
LEVEL_UP_MOVE(45, MOVE_EARTHQUAKE),
LEVEL_UP_MOVE(48, MOVE_SUPERFANG),
LEVEL_UP_END
LEVEL_UP_MOVE( 1, MOVE_ODORSLEUTH),
LEVEL_UP_MOVE( 1, MOVE_LEER),
LEVEL_UP_MOVE( 1, MOVE_MUDSLAP),
LEVEL_UP_MOVE( 3, MOVE_TACKLE),
LEVEL_UP_MOVE( 6, MOVE_LASERFOCUS),
LEVEL_UP_MOVE( 9, MOVE_QUICKATTACK),
LEVEL_UP_MOVE(12, MOVE_MUDSHOT),
LEVEL_UP_MOVE(15, MOVE_DOUBLESLAP),
LEVEL_UP_MOVE(18, MOVE_DOUBLEKICK),
LEVEL_UP_MOVE(21, MOVE_BULLDOZE),
LEVEL_UP_MOVE(24, MOVE_FACADE),
LEVEL_UP_MOVE(27, MOVE_DIG),
LEVEL_UP_MOVE(30, MOVE_BOUNCE),
LEVEL_UP_MOVE(33, MOVE_AGILITY),
LEVEL_UP_MOVE(36, MOVE_TAKEDOWN),
LEVEL_UP_MOVE(40, MOVE_SWORDSDANCE),
LEVEL_UP_MOVE(43, MOVE_FLAIL),
LEVEL_UP_MOVE(46, MOVE_EARTHQUAKE),
LEVEL_UP_MOVE(49, MOVE_SUPERFANG),
LEVEL_UP_END
};
static const struct LevelUpMove sDiggersbyLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_ROTOTILLER),
LEVEL_UP_MOVE( 1, MOVE_FLAIL),
LEVEL_UP_MOVE( 1, MOVE_ODORSLEUTH),
LEVEL_UP_MOVE( 1, MOVE_MUDSLAP),
LEVEL_UP_MOVE( 1, MOVE_LEER),
LEVEL_UP_MOVE( 3, MOVE_TACKLE),
LEVEL_UP_MOVE( 6, MOVE_LASERFOCUS),
LEVEL_UP_MOVE( 9, MOVE_QUICKATTACK),
LEVEL_UP_MOVE( 1, MOVE_MUDSLAP),
LEVEL_UP_MOVE( 1, MOVE_TACKLE),
LEVEL_UP_MOVE( 1, MOVE_LASERFOCUS),
LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK),
LEVEL_UP_MOVE(12, MOVE_MUDSHOT),
LEVEL_UP_MOVE(15, MOVE_DOUBLESLAP),
LEVEL_UP_MOVE(18, MOVE_DOUBLEKICK),
@ -14550,10 +14559,10 @@ static const struct LevelUpMove sDiggersbyLevelUpLearnset[] = {
LEVEL_UP_MOVE(35, MOVE_BOUNCE),
LEVEL_UP_MOVE(39, MOVE_AGILITY),
LEVEL_UP_MOVE(43, MOVE_TAKEDOWN),
LEVEL_UP_MOVE(47, MOVE_SWORDSDANCE),
LEVEL_UP_MOVE(51, MOVE_HAMMERARM),
LEVEL_UP_MOVE(55, MOVE_EARTHQUAKE),
LEVEL_UP_MOVE(59, MOVE_SUPERFANG),
LEVEL_UP_MOVE(48, MOVE_SWORDSDANCE),
LEVEL_UP_MOVE(52, MOVE_HAMMERARM),
LEVEL_UP_MOVE(56, MOVE_EARTHQUAKE),
LEVEL_UP_MOVE(60, MOVE_SUPERFANG),
LEVEL_UP_END
};

20
src/Pokedex_Orders.c
View File

@ -11,8 +11,6 @@ const u16 gPokedexOrder_Regional[] =
SPECIES_VANILLUXE,
SPECIES_DELIBIRD,
SPECIES_MINIOR_SHIELD,
SPECIES_SNEASEL,
SPECIES_WEAVILE,
SPECIES_ZUBAT,
SPECIES_GOLBAT,
SPECIES_CROBAT,
@ -160,8 +158,8 @@ const u16 gPokedexOrder_Regional[] =
SPECIES_SWELLOW,
SPECIES_MURKROW,
SPECIES_HONCHKROW,
SPECIES_BUNNELBY,
SPECIES_DIGGERSBY,
SPECIES_LICKITUNG,
SPECIES_LICKILICKY,
SPECIES_NIDORAN_M,
SPECIES_NIDORINO,
SPECIES_NIDOKING,
@ -177,9 +175,9 @@ const u16 gPokedexOrder_Regional[] =
SPECIES_VENONAT,
SPECIES_VENOMOTH,
SPECIES_PURRLOIN,
SPECIES_LIEPARD,
SPECIES_ELGYEM,
SPECIES_BEHEEYEM,
SPECIES_LIEPARD,
SPECIES_ARON,
SPECIES_LAIRON,
SPECIES_AGGRON,
@ -187,13 +185,14 @@ const u16 gPokedexOrder_Regional[] =
SPECIES_PROBOPASS,
SPECIES_NOIBAT,
SPECIES_NOIVERN,
SPECIES_CARBINK,
SPECIES_PHANPY,
SPECIES_DONPHAN,
SPECIES_GLIGAR,
SPECIES_GLISCOR,
SPECIES_DUNSPARCE,
SPECIES_ZIGZAGOON,
SPECIES_LINOONE,
SPECIES_BUNNELBY,
SPECIES_DIGGERSBY,
SPECIES_LEDYBA,
SPECIES_LEDIAN,
SPECIES_SPINARAK,
@ -232,8 +231,9 @@ const u16 gPokedexOrder_Regional[] =
SPECIES_BRONZONG,
SPECIES_ONIX,
SPECIES_STEELIX,
SPECIES_SNEASEL,
SPECIES_WEAVILE,
SPECIES_CRYOGONAL,
SPECIES_CARBINK,
SPECIES_SNOVER,
SPECIES_ABOMASNOW,
SPECIES_CUBCHOO,
@ -261,8 +261,8 @@ const u16 gPokedexOrder_Regional[] =
SPECIES_TYMPOLE,
SPECIES_PALPITOAD,
SPECIES_SEISMITOAD,
SPECIES_LICKITUNG,
SPECIES_LICKILICKY,
SPECIES_ZIGZAGOON,
SPECIES_LINOONE,
SPECIES_GOOMY,
SPECIES_SLIGGOO,
SPECIES_GOODRA,