Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Misty 2023-10-29 18:08:50 -04:00
commit 5d1bf81944
154 changed files with 1200 additions and 184 deletions

View file

@ -16,6 +16,13 @@ EggMovePointers1:
dw NoEggMoves1
dw NoEggMoves1
dw NoEggMoves1
dw NoEggMoves1 ; Gentlarva
dw NoEggMoves1 ; Pupal
dw NoEggMoves1 ; Carapthor
dw KotoraEggMoves
dw NoEggMoves1 ; Gaotora
dw NoEggMoves1 ; Gorotora
dw NoEggMoves1 ; Raitora
dw PidgeyEggMoves
dw NoEggMoves1
dw NoEggMoves1
@ -39,28 +46,35 @@ EggMovePointers1:
dw NoEggMoves1 ; Nidoreign
dw NoEggMoves1
dw NoEggMoves1
dw VulpixEggMoves
dw VulpiiiEggMoves
dw NoEggMoves1
dw NoEggMoves1
dw NoEggMoves1
dw ZubatEggMoves
dw NoEggMoves1
dw BittybatEggMoves
dw NoEggMoves1
dw NoEggMoves1
dw OddishEggMoves
dw NoEggMoves1
dw NoEggMoves1
dw ParasEggMoves
dw ParasporEggMoves
dw NoEggMoves1
dw NoEggMoves1
dw VenonatEggMoves
dw NoEggMoves1
dw DiglettEggMoves
dw NoEggMoves1
dw MeowthEggMoves
dw CoinpurEggMoves
dw NoEggMoves1
dw NoEggMoves1
dw NoEggMoves1 ; Perrserker
dw PsyduckEggMoves
dw NoEggMoves1
dw MankeyEggMoves
dw NoEggMoves1
dw GrowlitheEggMoves
dw NoEggMoves1 ; Annihilape
dw PupperonEggMoves
dw NoEggMoves1
dw NoEggMoves1
dw PoliwagEggMoves
dw NoEggMoves1
@ -156,7 +170,7 @@ EggMovePointers1:
dw NoEggMoves1
dw AerodactylEggMoves
dw MunchlaxEggMoves ; Munchlax
dw SnorlaxEggMoves ; Should this even exist?
dw NoEggMoves1 ; Should this even exist?
dw NoEggMoves1
dw NoEggMoves1
dw NoEggMoves1
@ -193,6 +207,12 @@ SquirtleEggMoves:
dw FLAIL
dw -1 ; end
KotoraEggMoves:
dw SCREECH
dw CHARM
dw CRUNCH
dw -1 ; end
PidgeyEggMoves:
dw PURSUIT
dw FAINT_ATTACK
@ -252,7 +272,7 @@ NidoranMEggMoves:
dw BEAT_UP
dw -1 ; end
VulpixEggMoves:
VulpiiiEggMoves:
dw FAINT_ATTACK
dw HYPNOSIS
dw FLAIL
@ -260,7 +280,7 @@ VulpixEggMoves:
dw DISABLE
dw -1 ; end
ZubatEggMoves:
BittybatEggMoves:
dw QUICK_ATTACK
dw PURSUIT
dw FAINT_ATTACK
@ -275,7 +295,7 @@ OddishEggMoves:
dw SYNTHESIS
dw -1 ; end
ParasEggMoves:
ParasporEggMoves:
dw FALSE_SWIPE
dw SCREECH
dw COUNTER
@ -300,7 +320,7 @@ DiglettEggMoves:
dw BEAT_UP
dw -1 ; end
MeowthEggMoves:
CoinpurEggMoves:
dw SPITE
dw CHARM
dw HYPNOSIS
@ -327,7 +347,7 @@ MankeyEggMoves:
dw BEAT_UP
dw -1 ; end
GrowlitheEggMoves:
PupperonEggMoves:
dw BODY_SLAM
dw SAFEGUARD
dw CRUNCH
@ -604,10 +624,6 @@ MunchlaxEggMoves:
dw LICK
dw -1 ; end
SnorlaxEggMoves:
dw LICK
dw -1 ; end
DratiniEggMoves:
dw LIGHT_SCREEN
dw MIST