From 1135c614f172a4c124a5abe178aba9a76cb1721b Mon Sep 17 00:00:00 2001
From: WhenGryphonsFly <84215159+WhenGryphonsFly@users.noreply.github.com>
Date: Sun, 16 Feb 2025 15:37:12 -0600
Subject: [PATCH 1/2] Clean up expected_objs

---
 expected_objs/sub_2414.o  | Bin 1144 -> 0 bytes
 expected_objs/sub_4ABC8.o | Bin 872 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 expected_objs/sub_2414.o
 delete mode 100644 expected_objs/sub_4ABC8.o

diff --git a/expected_objs/sub_2414.o b/expected_objs/sub_2414.o
deleted file mode 100644
index 745ce97636b3dc514197bf5234c44d5578b8801a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1144
zcma)5O>YuW6umP8Ez=N1<Hx8Z(pn=)&16a@mUIOJJduE!+Nc{-XVPhDA_>A^>`II#
zvb3zwl_sv*4GT@WVBw-afV3-j?%Z~#Zlw1D51!rVC3ns_@11wwCoeL2CP@<TkRS?U
z1rSpDJ$|zfQBWZOhhHAB+bqMre}2`5w{lbUsX=KgnulxAY<;E))8XFFKRuY1T5qhy
z{oP15CBHwX8I4@H$sjt{Z2-JWXi)SwWaBqn%&Ql+p+Dlvjuqbjz|QBkSTFLLErz?0
zWNGai1m>S=cf;VD3{KUZMwW#VI8oy<Vx#^L+m+ys_2XcPg?v&_YQ41f4&pvIqqO6l
z7W>Gy*<nZS1a9&@_HcvA%cyMEb~Zpdi`1W7Dl9Cg3%6iG4oIqa1bo;CmA_61K*66F
z3iysWBy0iL9hoFJfxIJV4f!WQ&mh+YeI0pA&^M5O6?6i5QP4T$;(VhnBntSUfXFv_
z8rglp5JLXwm>$>0H$i=~9;_H~!-$!w6lZCJGb_%S8RIND_L;nGAqBImP^~#DF>~I8
zRJnG~^<e#uU9xIxYi<SBGo`Y(i8^h2Hcm_DGIbJQd5E+}85cxnDWAfRUfnEtwu9(Z
z23X{*;y%$m_qhl9Dizb6Y87<6cir~9%7#<(+$t9Mzo6$s=QlC5)Bj^{$O-7aDK25E
zm<ddZwhRzKq;WK!d;!d>L(N~(FVtd?mtqc+{QvS915X*DA5<?gp#3keM~F)rg@z3g
m%t>saH%jZH`=&kcIgvsf2R$P)3|^0}K=gIdm*6Hu?mGhTwTcA*

diff --git a/expected_objs/sub_4ABC8.o b/expected_objs/sub_4ABC8.o
deleted file mode 100644
index c29c802704f3814a3882890ea657f091a97d2d91..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 872
zcma)4&r1S96n^8jruKshf+#2t212l`BDmc&(-86!9lXgdE+tfmJA$41SNbQqb?E4^
zKcWAkTlT#fN7ud7Ti$%%oB7_Gw=?t7ylx30$e5raEhEgP)QVkEP^2tnh~8%3KQneJ
z+MkS8dpZ&BbSU2GN>{3%0R7Mp1|;@D?fOlpdVASvQ#zFq*_ADH#&Wb)J0J^R+$>s4
zC<JDR4i_Rp+u-?Fd;oqNix(8cBAbqYrl~!!)0kif+)2dML|jY6RFKqjJ-1T7XqFeu
zqe7peanQqb!&9tODmCV$>dwizM|T~6@PwLt{J9)ansI~Ff8{pyzooV?=|s<u(hq=g
zr19RcQTX7<a3aa+`_d;Th$3=u4~{S8Xb_BL7@@%bjIWc=hx=gT_fSww4}AV?e2!Uo
z4bJw8q&$%GIG=TRLF#-tHaFV^j~lPCoxxfEm(JCiAwU_|%WJAeQ;$(UX}vfBe8Jb@
h+&A~f_s!hw2})fgwwTP#)Z0ZI*L`52W<)@v`vo_}NUQ(=


From eac10b99431db95a6184bfd0ac3120bcc7b28bad Mon Sep 17 00:00:00 2001
From: WhenGryphonsFly <84215159+WhenGryphonsFly@users.noreply.github.com>
Date: Mon, 17 Feb 2025 13:30:51 -0600
Subject: [PATCH 2/2] Document gEggLocations

---
 data/egg_locations.inc | 56 ++++++++++++++++++++++++++++++++++++++++++
 data/rom.s             |  3 +--
 src/rom_31F6C.c        | 10 ++++----
 3 files changed, 62 insertions(+), 7 deletions(-)
 create mode 100644 data/egg_locations.inc

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/src/rom_31F6C.c b/src/rom_31F6C.c
index 959adbfd..6ba7ecde 100644
--- a/src/rom_31F6C.c
+++ b/src/rom_31F6C.c
@@ -7,7 +7,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()
 {
@@ -221,9 +221,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)
         {
@@ -251,7 +251,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)
@@ -296,7 +296,7 @@ void sub_325E0(void)
 
         for (i = 0; i < 25 && gCurrentPinballGame->unk130[i] <= rand; i++);
 
-        gCurrentPinballGame->unk598 = gUnknown_086A4A38[gMain.selectedField][i];
+        gCurrentPinballGame->unk598 = gEggLocations[gMain.selectedField][i];
     }
 
     gCurrentPinballGame->unk59E = gCurrentPinballGame->unk598;