diff --git a/data/egg_locations.inc b/data/egg_locations.inc
new file mode 100644
index 00000000..36b182d0
--- /dev/null
+++ b/data/egg_locations.inc
@@ -0,0 +1,56 @@
+gEggLocations:: @ 0x086A4A38
+	@ Ruby Field
+	.2byte SPECIES_WURMPLE
+	.2byte SPECIES_SEEDOT
+	.2byte SPECIES_RALTS
+	.2byte SPECIES_SHROOMISH
+	.2byte SPECIES_WHISMUR
+	.2byte SPECIES_SKITTY
+	.2byte SPECIES_ZUBAT
+	.2byte SPECIES_ARON
+	.2byte SPECIES_PLUSLE
+	.2byte SPECIES_MINUN
+	.2byte SPECIES_ODDISH
+	.2byte SPECIES_SPOINK
+	.2byte SPECIES_SANDSHREW
+	.2byte SPECIES_SPINDA
+	.2byte SPECIES_TRAPINCH
+	.2byte SPECIES_SHUPPET
+	.2byte SPECIES_CHIMECHO
+	.2byte SPECIES_WYNAUT
+	.2byte SPECIES_NATU
+	.2byte SPECIES_PHANPY
+	.2byte SPECIES_SNORUNT
+	.2byte SPECIES_SPHEAL
+	.2byte SPECIES_CORSOLA
+	.2byte SPECIES_HORSEA
+	.2byte SPECIES_BAGON
+	.2byte SPECIES_PICHU @ Unreferenced
+	
+	@ Sapphire Field
+	.2byte SPECIES_WURMPLE
+	.2byte SPECIES_LOTAD
+	.2byte SPECIES_RALTS
+	.2byte SPECIES_SURSKIT
+	.2byte SPECIES_WHISMUR
+	.2byte SPECIES_AZURILL
+	.2byte SPECIES_ZUBAT
+	.2byte SPECIES_ARON
+	.2byte SPECIES_ODDISH
+	.2byte SPECIES_GULPIN
+	.2byte SPECIES_SPOINK
+	.2byte SPECIES_SANDSHREW
+	.2byte SPECIES_SPINDA
+	.2byte SPECIES_TRAPINCH
+	.2byte SPECIES_IGGLYBUFF
+	.2byte SPECIES_SHUPPET
+	.2byte SPECIES_CHIMECHO
+	.2byte SPECIES_NATU
+	.2byte SPECIES_PHANPY
+	.2byte SPECIES_SNORUNT
+	.2byte SPECIES_SPHEAL
+	.2byte SPECIES_CORSOLA
+	.2byte SPECIES_CHINCHOU
+	.2byte SPECIES_HORSEA
+	.2byte SPECIES_BAGON
+	.2byte SPECIES_PICHU @ Unreferenced
diff --git a/data/rom.s b/data/rom.s
index 26602502..3e2c354b 100644
--- a/data/rom.s
+++ b/data/rom.s
@@ -2056,8 +2056,7 @@ gUnknown_086A2FA0:: @ 0x086A2FA0
 gSpeciesInfo:: @ 0x086A3700
 	.incbin "baserom.gba", 0x6A3700, 0x1338
 
-gUnknown_086A4A38:: @ 0x086A4A38
-	.incbin "baserom.gba", 0x6A4A38, 0x68
+.include "data/egg_locations.inc"
 
 gIntrTableTemplate:: @ 0x086A4AA0
 	.4byte SerialIntr
diff --git a/expected_objs/sub_2414.o b/expected_objs/sub_2414.o
deleted file mode 100644
index 745ce976..00000000
Binary files a/expected_objs/sub_2414.o and /dev/null differ
diff --git a/expected_objs/sub_4ABC8.o b/expected_objs/sub_4ABC8.o
deleted file mode 100644
index c29c8027..00000000
Binary files a/expected_objs/sub_4ABC8.o and /dev/null differ
diff --git a/src/rom_31F6C.c b/src/rom_31F6C.c
index 4d7ff21b..4c1cb2e1 100644
--- a/src/rom_31F6C.c
+++ b/src/rom_31F6C.c
@@ -8,7 +8,7 @@
 #include "main.h"
 
 extern const u16 gWildMonLocations[][2][8];
-extern const u16 gUnknown_086A4A38[2][26];
+extern const u16 gEggLocations[2][26];
 
 static inline u32 GetTimeAdjustedRandom()
 {
@@ -222,9 +222,9 @@ void sub_32484(void)
 
     gCurrentPinballGame->unk12E = 0;
 
-    for (i = 0; i < 0x19; i++)
+    for (i = 0; i < 25; i++)
     {
-        currentSpecies = gUnknown_086A4A38[gMain.selectedField][i];
+        currentSpecies = gEggLocations[gMain.selectedField][i];
 
         if (currentSpecies == SPECIES_ODDISH)
         {
@@ -252,7 +252,7 @@ void sub_32484(void)
                 }
             }
 
-            currentSpecies = gUnknown_086A4A38[gMain.selectedField][i];
+            currentSpecies = gEggLocations[gMain.selectedField][i];
             if (gCurrentPinballGame->caughtMonCount == 0)
             {
                 if (gSpeciesInfo[currentSpecies].evolutionTarget >= SPECIES_NONE)
@@ -297,7 +297,7 @@ void sub_325E0(void)
 
         for (i = 0; i < 25 && gCurrentPinballGame->unk130[i] <= rand; i++);
 
-        gCurrentPinballGame->currentSpecies = gUnknown_086A4A38[gMain.selectedField][i];
+        gCurrentPinballGame->currentSpecies = gEggLocations[gMain.selectedField][i];
     }
 
     gCurrentPinballGame->lastEggSpecies = gCurrentPinballGame->currentSpecies;