diff --git a/src/data/pokemon/egg_moves.h b/src/data/pokemon/egg_moves.h
index 41c1e0963d..5e7d5e5b3d 100644
--- a/src/data/pokemon/egg_moves.h
+++ b/src/data/pokemon/egg_moves.h
@@ -4088,7 +4088,7 @@ const u16 gEggMoves[] = {
 		MOVE_ANCIENT_POWER,
 		MOVE_BEAT_UP,
 		MOVE_ENDURE,
-		MOVE_FEINT_ATTACK,
+		MOVE_FAINT_ATTACK,
 		MOVE_FINAL_GAMBIT,
 		MOVE_HEADBUTT,
 		MOVE_MEMENTO,
diff --git a/src/pokemon.c b/src/pokemon.c
index 33c1ae59af..93023ecb7a 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -318,13 +318,16 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to
 	SPECIES_TO_NATIONAL(PIDGEOTTO),
 	SPECIES_TO_NATIONAL(PIDGEOT),
 	SPECIES_TO_NATIONAL(RATTATA),
+	[SPECIES_ALOLAN_RATTATA - 1] = NATIONAL_DEX_RATTATA,
 	SPECIES_TO_NATIONAL(RATICATE),
+	[SPECIES_ALOLAN_RATICATE - 1] = NATIONAL_DEX_RATICATE,
 	SPECIES_TO_NATIONAL(SPEAROW),
 	SPECIES_TO_NATIONAL(FEAROW),
 	SPECIES_TO_NATIONAL(EKANS),
 	SPECIES_TO_NATIONAL(ARBOK),
 	SPECIES_TO_NATIONAL(PIKACHU),
 	SPECIES_TO_NATIONAL(RAICHU),
+	[SPECIES_ALOLAN_RAICHU - 1] = NATIONAL_DEX_RAICHU,
 	SPECIES_TO_NATIONAL(SANDSHREW),
 	SPECIES_TO_NATIONAL(SANDSLASH),
 	SPECIES_TO_NATIONAL(NIDORAN_F),
@@ -336,7 +339,9 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to
 	SPECIES_TO_NATIONAL(CLEFAIRY),
 	SPECIES_TO_NATIONAL(CLEFABLE),
 	SPECIES_TO_NATIONAL(VULPIX),
+	[SPECIES_ALOLAN_VULPIX - 1] = NATIONAL_DEX_VULPIX,
 	SPECIES_TO_NATIONAL(NINETALES),
+	[SPECIES_ALOLAN_NINETALES - 1] = NATIONAL_DEX_NINETALES,
 	SPECIES_TO_NATIONAL(JIGGLYPUFF),
 	SPECIES_TO_NATIONAL(WIGGLYTUFF),
 	SPECIES_TO_NATIONAL(ZUBAT),
@@ -349,9 +354,13 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to
 	SPECIES_TO_NATIONAL(VENONAT),
 	SPECIES_TO_NATIONAL(VENOMOTH),
 	SPECIES_TO_NATIONAL(DIGLETT),
+	[SPECIES_ALOLAN_DIGLETT - 1] = NATIONAL_DEX_DIGLETT,
 	SPECIES_TO_NATIONAL(DUGTRIO),
+	[SPECIES_ALOLAN_DUGTRIO - 1] = NATIONAL_DEX_DUGTRIO,
 	SPECIES_TO_NATIONAL(MEOWTH),
+	[SPECIES_ALOLAN_MEOWTH - 1] = NATIONAL_DEX_MEOWTH,
 	SPECIES_TO_NATIONAL(PERSIAN),
+	[SPECIES_ALOLAN_PERSIAN - 1] = NATIONAL_DEX_PERSIAN,
 	SPECIES_TO_NATIONAL(PSYDUCK),
 	SPECIES_TO_NATIONAL(GOLDUCK),
 	SPECIES_TO_NATIONAL(MANKEY),
@@ -373,8 +382,11 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to
 	SPECIES_TO_NATIONAL(TENTACOOL),
 	SPECIES_TO_NATIONAL(TENTACRUEL),
 	SPECIES_TO_NATIONAL(GEODUDE),
+	[SPECIES_ALOLAN_GEODUDE - 1] = NATIONAL_DEX_GEODUDE,
 	SPECIES_TO_NATIONAL(GRAVELER),
+	[SPECIES_ALOLAN_GRAVELER - 1] = NATIONAL_DEX_GRAVELER,
 	SPECIES_TO_NATIONAL(GOLEM),
+	[SPECIES_ALOLAN_GOLEM - 1] = NATIONAL_DEX_GOLEM,
 	SPECIES_TO_NATIONAL(PONYTA),
 	SPECIES_TO_NATIONAL(RAPIDASH),
 	SPECIES_TO_NATIONAL(SLOWPOKE),
@@ -387,7 +399,9 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to
 	SPECIES_TO_NATIONAL(SEEL),
 	SPECIES_TO_NATIONAL(DEWGONG),
 	SPECIES_TO_NATIONAL(GRIMER),
+	[SPECIES_ALOLAN_GRIMER - 1] = NATIONAL_DEX_GRIMER,
 	SPECIES_TO_NATIONAL(MUK),
+	[SPECIES_ALOLAN_MUK - 1] = NATIONAL_DEX_MUK,
 	SPECIES_TO_NATIONAL(SHELLDER),
 	SPECIES_TO_NATIONAL(CLOYSTER),
 	SPECIES_TO_NATIONAL(GASTLY),
@@ -402,8 +416,10 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to
 	SPECIES_TO_NATIONAL(ELECTRODE),
 	SPECIES_TO_NATIONAL(EXEGGCUTE),
 	SPECIES_TO_NATIONAL(EXEGGUTOR),
+	[SPECIES_ALOLAN_EXEGGUTOR - 1] = NATIONAL_DEX_EXEGGUTOR,
 	SPECIES_TO_NATIONAL(CUBONE),
 	SPECIES_TO_NATIONAL(MAROWAK),
+	[SPECIES_ALOLAN_MAROWAK - 1] = NATIONAL_DEX_MAROWAK,
 	SPECIES_TO_NATIONAL(HITMONLEE),
 	SPECIES_TO_NATIONAL(HITMONCHAN),
 	SPECIES_TO_NATIONAL(LICKITUNG),