Changeset 355

Timestamp:

10/24/07 20:54:55 (2 years ago)

Author:

eevee

Message:

Two major problems fixed here:
1. Seven Pokemon had Slam and Headbutt reversed in their egg moves in every version before D/P. Hopefully NOW the damn Slam/Headbutt saga is over. (#147, which is already closed but I didn't realize this was part of it)
2. Pokemon no longer own the egg moves that their baby forms get. This means that egg move display is finally consistent, and the egg moves shown for any given Pokemon will be the ones you get when that Pokemon pops out of an egg. (#20)

Files:

• veekun/trunk/script/pokedex.sql (modified) (86 diffs)

veekun/trunk/script/pokedex.sql

@@ -16487 +16487 @@
 (22,432,0,'dp','machine'),
 (22,445,0,'dp','machine'),
-(23,21,0,'dp','egg'),
+(23,21,0,'gs,c,rusa,e,frlg,dp','egg'),
 (23,29,0,'gs,c','machine'),
-(23,29,0,'gs,c,rusa,e,frlg','egg'),
 (23,34,0,'rb,y','machine'),
 (23,34,0,'e,frlg','tutor'),
@@ -16677 +16676 @@
 (24,441,56,'dp','level'),
 (24,445,0,'dp','machine'),
-(25,3,0,'gs,c,rusa,e,frlg,dp','egg'),
 (25,5,0,'rb,y','machine'),
 (25,5,0,'e,frlg','tutor'),
@@ -16735 +16733 @@
 (25,115,0,'rb,y','machine'),
 (25,117,0,'rb,y','machine'),
-(25,117,0,'gs,c,rusa,e,frlg,dp','egg'),
 (25,129,0,'rb,y,gs,c','machine'),
 (25,129,0,'e','tutor'),
@@ -16747 +16744 @@
 (25,173,0,'e','tutor'),
 (25,174,0,'gs,c','machine'),
-(25,179,0,'gs,c,rusa,e,frlg,dp','egg'),
 (25,182,0,'gs,c,rusa,e,frlg,dp','machine'),
 (25,189,0,'gs,c','machine'),
@@ -16763 +16759 @@
 (25,214,0,'gs,c,dp','machine'),
 (25,216,0,'gs,c,rusa,e,frlg,dp','machine'),
-(25,217,0,'gs,c,rusa,e,frlg,dp','egg'),
 (25,218,0,'gs,c,rusa,e,frlg,dp','machine'),
 (25,223,0,'gs,c','machine'),
 (25,223,0,'e','tutor'),
-(25,227,0,'gs,c,rusa,e,frlg,dp','egg'),
 (25,231,0,'gs,c,rusa,e,frlg,dp','machine'),
 (25,237,0,'gs,c,rusa,e,frlg,dp','machine'),
@@ -16774 +16768 @@
 (25,263,0,'rusa,e,frlg,dp','machine'),
 (25,264,0,'rusa,e,frlg,dp','machine'),
-(25,268,0,'rusa,e,frlg,dp','egg'),
-(25,273,0,'rusa,e,frlg,dp','egg'),
 (25,280,0,'rusa,e,frlg,dp','machine'),
 (25,290,0,'rusa,e,frlg,dp','machine'),
@@ -17783 +17775 @@
 (35,102,0,'rb,y','machine'),
 (35,102,0,'e,frlg','tutor'),
-(35,102,0,'gs,c,rusa,e,frlg,dp','egg'),
 (35,104,0,'rb,y,gs,c,rusa,e,frlg,dp','machine'),
 (35,107,19,'gs,c,dp','level'),
@@ -17803 +17794 @@
 (35,118,0,'rb,y','machine'),
 (35,118,0,'e,frlg','tutor'),
-(35,118,0,'gs,c,rusa,e,frlg,dp','egg'),
 (35,118,29,'rusa,e,frlg','level'),
 (35,118,31,'rb,y,dp','level'),
@@ -17809 +17799 @@
 (35,126,0,'rb,y,gs,c,rusa,e,frlg,dp','machine'),
 (35,130,0,'rb,y','machine'),
-(35,133,0,'gs,c,rusa,e,frlg,dp','egg'),
 (35,135,0,'e,frlg','tutor'),
 (35,138,0,'e,frlg','tutor'),
@@ -17815 +17804 @@
 (35,148,0,'rb,y,gs,c,rusa,e,frlg,dp','machine'),
 (35,149,0,'rb,y','machine'),
-(35,150,0,'gs,c,rusa,e,frlg,dp','egg'),
 (35,156,0,'rb,y,gs,c,rusa,e,frlg,dp','machine'),
 (35,161,0,'rb,y','machine'),
 (35,164,0,'e,frlg','tutor'),
 (35,164,0,'rb,y,dp','machine'),
-(35,164,0,'rusa,e,frlg,dp','egg'),
 (35,171,0,'gs,c','machine'),
 (35,173,0,'gs,c','machine'),
@@ -17826 +17813 @@
 (35,174,0,'gs,c','machine'),
 (35,182,0,'gs,c,rusa,e,frlg,dp','machine'),
-(35,187,0,'gs,c,rusa,e,frlg,dp','egg'),
 (35,189,0,'gs,c','machine'),
 (35,189,0,'e','tutor'),
@@ -17841 +17827 @@
 (35,214,0,'gs,c,dp','machine'),
 (35,216,0,'gs,c,rusa,e,frlg,dp','machine'),
-(35,217,0,'gs,c,rusa,e,frlg,dp','egg'),
 (35,218,0,'gs,c,rusa,e,frlg,dp','machine'),
 (35,219,0,'rusa,e,frlg,dp','machine'),
@@ -17862 +17847 @@
 (35,266,16,'dp','level'),
 (35,266,17,'rusa,e,frlg','level'),
-(35,273,0,'rusa,e,frlg,dp','egg'),
 (35,278,0,'dp','machine'),
 (35,280,0,'rusa,e,frlg,dp','machine'),
@@ -18243 +18227 @@
 (39,174,0,'gs,c','machine'),
 (39,182,0,'gs,c,rusa,e,frlg,dp','machine'),
-(39,185,0,'gs,c,rusa,e,frlg,dp','egg'),
 (39,189,0,'gs,c','machine'),
 (39,189,0,'e','tutor'),
 (39,192,0,'gs,c','machine'),
-(39,195,0,'gs,c,rusa,e,frlg,dp','egg'),
 (39,197,0,'gs,c','machine'),
 (39,203,0,'e','tutor'),
@@ -18261 +18243 @@
 (39,214,0,'gs,c,dp','machine'),
 (39,216,0,'gs,c,rusa,e,frlg,dp','machine'),
-(39,217,0,'gs,c,rusa,e,frlg,dp','egg'),
 (39,218,0,'gs,c,rusa,e,frlg,dp','machine'),
 (39,219,0,'rusa,e,frlg,dp','machine'),
@@ -18274 +18255 @@
 (39,263,0,'rusa,e,frlg,dp','machine'),
 (39,264,0,'rusa,e,frlg,dp','machine'),
-(39,273,0,'rusa,e,frlg,dp','egg'),
 (39,278,0,'dp','machine'),
 (39,280,0,'rusa,e,frlg,dp','machine'),
@@ -18281 +18261 @@
 (39,304,44,'rusa,e,frlg','level'),
 (39,304,45,'dp','level'),
-(39,313,0,'rusa,e,frlg,dp','egg'),
 (39,351,0,'rusa,e,frlg,dp','machine'),
 (39,352,0,'rusa,e,frlg,dp','machine'),
@@ -22823 +22802 @@
 (85,445,0,'dp','machine'),
 (86,6,0,'rb,y','machine'),
-(86,21,0,'dp','egg'),
+(86,21,0,'gs,c,rusa,e,frlg,dp','egg'),
 (86,29,0,'gs,c','machine'),
-(86,29,0,'gs,c,rusa,e,frlg','egg'),
 (86,29,1,'rb,y,gs,c,rusa,e,frlg,dp','level'),
 (86,32,0,'rb,y','machine'),
@@ -24113 +24091 @@
 (98,14,0,'rusa,e,frlg,dp','egg'),
 (98,15,0,'rb,y,gs,c,rusa,e,frlg,dp','machine'),
-(98,21,0,'dp','egg'),
+(98,21,0,'gs,c,rusa,e,frlg,dp','egg'),
 (98,21,35,'dp','level'),
 (98,23,23,'gs,c','level'),
@@ -24119 +24097 @@
 (98,23,27,'rusa,e,frlg','level'),
 (98,23,30,'rb,y','level'),
-(98,29,0,'gs,c,rusa,e,frlg','egg'),
 (98,34,0,'rb,y','machine'),
 (98,34,0,'e,frlg','tutor'),
@@ -24951 +24928 @@
 (106,129,0,'e','tutor'),
 (106,130,0,'rb,y','machine'),
-(106,136,0,'gs,c,rusa,e,frlg,dp','egg'),
 (106,136,26,'gs,c,rusa,e,frlg','level'),
 (106,136,29,'dp','level'),
@@ -24961 +24937 @@
 (106,164,0,'rb,y,dp','machine'),
 (106,168,0,'gs,c,rusa,e,frlg,dp','machine'),
-(106,170,0,'gs,c,rusa,e,frlg,dp','egg'),
 (106,170,31,'gs,c,rusa,e,frlg','level'),
 (106,170,33,'dp','level'),
@@ -24970 +24945 @@
 (106,179,57,'dp','level'),
 (106,182,0,'gs,c,rusa,e,frlg,dp','machine'),
-(106,183,0,'gs,c,rusa,e,frlg,dp','egg'),
 (106,189,0,'gs,c','machine'),
 (106,189,0,'e','tutor'),
@@ -24990 +24964 @@
 (106,223,0,'gs,c','machine'),
 (106,223,0,'e','tutor'),
-(106,229,0,'gs,c,rusa,e,frlg,dp','egg'),
 (106,237,0,'gs,c,rusa,e,frlg,dp','machine'),
 (106,240,0,'rusa,e,frlg,dp','machine'),
@@ -24997 +24970 @@
 (106,263,0,'rusa,e,frlg,dp','machine'),
 (106,264,0,'rusa,e,frlg,dp','machine'),
-(106,270,0,'rusa,e,frlg,dp','egg'),
 (106,279,1,'rusa,e,frlg,dp','level'),
 (106,280,0,'rusa,e,frlg,dp','machine'),
@@ -26897 +26869 @@
 (124,8,0,'gs,c','machine'),
 (124,8,0,'e','tutor'),
-(124,8,0,'rusa,e,frlg','egg'),
 (124,8,18,'dp','level'),
 (124,8,25,'gs,c,rusa,e,frlg','level'),
@@ -26931 +26902 @@
 (124,92,0,'rb,y,gs,c,rusa,e,frlg,dp','machine'),
 (124,94,0,'rb,y,gs,c,rusa,e,frlg,dp','machine'),
-(124,96,0,'gs,c,rusa,e,frlg','egg'),
 (124,99,0,'rb,y','machine'),
 (124,100,0,'rb,y','machine'),
@@ -26988 +26958 @@
 (124,240,0,'gs,c,rusa,e,frlg,dp','machine'),
 (124,244,0,'e','tutor'),
-(124,244,0,'rusa,e,frlg','egg'),
 (124,244,0,'gs,c,dp','machine'),
 (124,247,0,'gs,c,rusa,e,frlg,dp','machine'),
-(124,252,0,'rusa,e,frlg','egg'),
 (124,258,0,'rusa,e,frlg,dp','machine'),
 (124,259,0,'rusa,e,frlg,dp','machine'),
@@ -26997 +26965 @@
 (124,264,0,'rusa,e,frlg,dp','machine'),
 (124,269,0,'rusa,e,frlg,dp','machine'),
-(124,273,0,'rusa,e,frlg','egg'),
 (124,278,0,'dp','machine'),
 (124,280,0,'rusa,e,frlg,dp','machine'),
@@ -27020 +26987 @@
 (124,445,0,'dp','machine'),
 (124,447,0,'dp','machine'),
-(125,2,0,'gs,c,rusa,e,frlg','egg'),
 (125,5,0,'rb,y','machine'),
 (125,5,0,'e,frlg','tutor'),
 (125,7,0,'gs,c','machine'),
 (125,7,0,'e','tutor'),
-(125,7,0,'rusa,e,frlg','egg'),
 (125,8,0,'gs,c','machine'),
 (125,8,0,'e','tutor'),
-(125,8,0,'rusa,e,frlg','egg'),
 (125,9,0,'gs,c','machine'),
 (125,9,0,'e','tutor'),
@@ -27037 +27001 @@
 (125,25,0,'rb,y','machine'),
 (125,25,0,'e,frlg','tutor'),
-(125,27,0,'gs,c,rusa,e,frlg','egg'),
 (125,29,0,'gs,c','machine'),
 (125,34,0,'rb,y','machine'),
@@ -27067 +27030 @@
 (125,92,0,'rb,y,gs,c,rusa,e,frlg,dp','machine'),
 (125,94,0,'rb,y,gs,c,rusa,e,frlg,dp','machine'),
-(125,96,0,'gs,c,rusa,e,frlg','egg'),
 (125,98,1,'rb,y,gs,c,rusa,e,frlg,dp','level'),
 (125,99,0,'rb,y','machine'),
@@ -27077 +27039 @@
 (125,103,52,'dp','level'),
 (125,104,0,'rb,y,gs,c,rusa,e,frlg,dp','machine'),
-(125,112,0,'gs,c,rusa,e,frlg','egg'),
 (125,113,0,'rusa,e,frlg,dp','machine'),
 (125,113,17,'gs,c,rusa,e,frlg','level'),
@@ -27117 +27078 @@
 (125,231,0,'gs,c,rusa,e,frlg,dp','machine'),
 (125,237,0,'gs,c,rusa,e,frlg,dp','machine'),
-(125,238,0,'c,rusa,e,frlg','egg'),
 (125,240,0,'gs,c,rusa,e,frlg,dp','machine'),
 (125,249,0,'gs,c,rusa,e,frlg,dp','machine'),
@@ -27135 +27095 @@
 (125,445,0,'dp','machine'),
 (125,451,0,'dp','machine'),
-(126,2,0,'gs,c,rusa,e,frlg','egg'),
 (126,5,0,'rb,y','machine'),
 (126,5,0,'e,frlg','tutor'),
-(126,5,0,'gs,c,rusa,e,frlg','egg'),
 (126,7,0,'gs,c','machine'),
 (126,7,0,'e','tutor'),
@@ -27147 +27105 @@
 (126,9,0,'gs,c','machine'),
 (126,9,0,'e','tutor'),
-(126,9,0,'rusa,e,frlg','egg'),
 (126,25,0,'rb,y','machine'),
 (126,25,0,'e,frlg','tutor'),
@@ -27179 +27136 @@
 (126,102,0,'rb,y','machine'),
 (126,102,0,'e,frlg','tutor'),
-(126,103,0,'gs,c,rusa,e,frlg','egg'),
 (126,104,0,'rb,y,gs,c,rusa,e,frlg,dp','machine'),
 (126,108,10,'dp','level'),
@@ -27187 +27143 @@
 (126,109,39,'rb,y','level'),
 (126,109,49,'gs,c,rusa,e,frlg','level'),
-(126,112,0,'gs,c,rusa,e,frlg','egg'),
 (126,117,0,'rb,y','machine'),
 (126,118,0,'rb,y','machine'),
@@ -27223 +27178 @@
 (126,231,0,'gs,c,rusa,e,frlg,dp','machine'),
 (126,237,0,'gs,c,rusa,e,frlg,dp','machine'),
-(126,238,0,'c,rusa,e,frlg','egg'),
 (126,241,0,'gs,c,rusa,e,frlg,dp','machine'),
 (126,241,33,'gs,c,rusa,e,frlg','level'),
@@ -28114 +28068 @@
 (137,435,40,'dp','level'),
 (137,451,0,'dp','machine'),
-(138,21,0,'dp','egg'),
+(138,21,0,'gs,c,rusa,e,frlg,dp','egg'),
 (138,29,0,'gs,c','machine'),
-(138,29,0,'gs,c,rusa,e,frlg','egg'),
 (138,30,34,'rb,y','level'),
 (138,34,0,'rb,y','machine'),
@@ -31438 +31391 @@
 (171,445,0,'dp','machine'),
 (171,451,0,'dp','machine'),
+(172,3,0,'gs,c,rusa,e,frlg,dp','egg'),
 (172,5,0,'e,frlg','tutor'),
 (172,9,0,'dp','egg'),
@@ -31465 +31419 @@
 (172,111,0,'e','tutor'),
 (172,113,0,'rusa,e,frlg,dp','machine'),
+(172,117,0,'gs,c,rusa,e,frlg,dp','egg'),
 (172,129,0,'gs,c','machine'),
 (172,129,0,'e','tutor'),
@@ -31476 +31431 @@
 (172,173,0,'e','tutor'),
 (172,174,0,'gs,c','machine'),
+(172,179,0,'gs,c,rusa,e,frlg,dp','egg'),
 (172,182,0,'gs,c,rusa,e,frlg,dp','machine'),
 (172,184,0,'','pokecenter'),
@@ -31495 +31451 @@
 (172,214,0,'gs,c,dp','machine'),
 (172,216,0,'gs,c,rusa,e,frlg,dp','machine'),
+(172,217,0,'gs,c,rusa,e,frlg,dp','egg'),
 (172,218,0,'gs,c,rusa,e,frlg,dp','machine'),
+(172,227,0,'gs,c,rusa,e,frlg,dp','egg'),
 (172,231,0,'gs,c,rusa,e,frlg,dp','machine'),
 (172,237,0,'gs,c,rusa,e,frlg,dp','machine'),
@@ -31501 +31459 @@
 (172,252,0,'dp','egg'),
 (172,263,0,'rusa,e,frlg,dp','machine'),
+(172,268,0,'rusa,e,frlg,dp','egg'),
+(172,273,0,'rusa,e,frlg,dp','egg'),
 (172,290,0,'rusa,e,frlg,dp','machine'),
 (172,321,0,'dp','egg'),
@@ -31531 +31491 @@
 (173,94,0,'gs,c,rusa,e,frlg,dp','machine'),
 (173,102,0,'e,frlg','tutor'),
+(173,102,0,'gs,c,rusa,e,frlg,dp','egg'),
 (173,104,0,'gs,c,rusa,e,frlg,dp','machine'),
 (173,111,0,'gs,c','machine'),
@@ -31537 +31498 @@
 (173,115,0,'rusa,e,frlg,dp','machine'),
 (173,118,0,'e,frlg','tutor'),
+(173,118,0,'gs,c,rusa,e,frlg,dp','egg'),
 (173,126,0,'gs,c,rusa,e,frlg,dp','machine'),
 (173,129,0,'','pokecenter'),
+(173,133,0,'gs,c,rusa,e,frlg,dp','egg'),
 (173,135,0,'e,frlg','tutor'),
 (173,138,0,'e,frlg','tutor'),
@@ -31544 +31507 @@
 (173,146,0,'','crystal'),
 (173,148,0,'gs,c,rusa,e,frlg,dp','machine'),
+(173,150,0,'gs,c,rusa,e,frlg,dp','egg'),
 (173,156,0,'gs,c,rusa,e,frlg,dp','machine'),
 (173,164,0,'e,frlg','tutor'),
 (173,164,0,'dp','machine'),
+(173,164,0,'rusa,e,frlg,dp','egg'),
 (173,171,0,'gs,c','machine'),
 (173,173,0,'gs,c','machine'),
@@ -31555 +31520 @@
 (173,186,10,'dp','level'),
 (173,186,13,'gs,c,rusa,e,frlg','level'),
+(173,187,0,'gs,c,rusa,e,frlg,dp','egg'),
 (173,189,0,'gs,c','machine'),
 (173,189,0,'e','tutor'),
@@ -31572 +31538 @@
 (173,214,0,'gs,c,dp','machine'),
 (173,216,0,'gs,c,rusa,e,frlg,dp','machine'),
+(173,217,0,'gs,c,rusa,e,frlg,dp','egg'),
 (173,218,0,'gs,c,rusa,e,frlg,dp','machine'),
 (173,219,0,'rusa,e,frlg,dp','machine'),
@@ -31584 +31551 @@
 (173,247,0,'gs,c,rusa,e,frlg,dp','machine'),
 (173,263,0,'rusa,e,frlg,dp','machine'),
+(173,273,0,'rusa,e,frlg,dp','egg'),
 (173,278,0,'dp','machine'),
 (173,290,0,'rusa,e,frlg,dp','machine'),
@@ -31638 +31606 @@
 (174,182,0,'gs,c,rusa,e,frlg,dp','machine'),
 (174,184,0,'','pokecenter'),
+(174,185,0,'gs,c,rusa,e,frlg,dp','egg'),
 (174,186,13,'dp','level'),
 (174,186,14,'gs,c,rusa,e,frlg','level'),
@@ -31643 +31612 @@
 (174,189,0,'e','tutor'),
 (174,192,0,'gs,c','machine'),
+(174,195,0,'gs,c,rusa,e,frlg,dp','egg'),
 (174,196,0,'gs,c','machine'),
 (174,196,0,'e','tutor'),
@@ -31657 +31627 @@
 (174,214,0,'gs,c,dp','machine'),
 (174,216,0,'gs,c,rusa,e,frlg,dp','machine'),
+(174,217,0,'gs,c,rusa,e,frlg,dp','egg'),
 (174,218,0,'gs,c,rusa,e,frlg,dp','machine'),
 (174,219,0,'rusa,e,frlg,dp','machine'),
@@ -31666 +31637 @@
 (174,247,0,'gs,c,rusa,e,frlg,dp','machine'),
 (174,263,0,'rusa,e,frlg,dp','machine'),
+(174,273,0,'rusa,e,frlg,dp','egg'),
 (174,278,0,'dp','machine'),
 (174,290,0,'rusa,e,frlg,dp','machine'),
+(174,313,0,'rusa,e,frlg,dp','egg'),
 (174,343,0,'dp','egg'),
 (174,351,0,'rusa,e,frlg,dp','machine'),
@@ -32363 +32336 @@
 (183,8,0,'gs,c','machine'),
 (183,8,0,'e','tutor'),
-(183,21,0,'rusa,e,frlg','egg'),
 (183,25,0,'e,frlg','tutor'),
 (183,29,0,'gs,c','machine'),
@@ -32373 +32345 @@
 (183,39,6,'gs,c,rusa,e,frlg','level'),
 (183,39,7,'dp','level'),
-(183,47,0,'rusa,e,frlg','egg'),
-(183,48,0,'gs,c,dp','egg'),
+(183,48,0,'gs,c,rusa,e,frlg,dp','egg'),
 (183,55,10,'gs,c,rusa,e,frlg,dp','level'),
 (183,56,0,'','pokecenter'),
@@ -32395 +32366 @@
 (183,111,2,'dp','level'),
 (183,111,3,'gs,c,rusa,e,frlg','level'),
-(183,113,0,'gs,c,dp','egg'),
+(183,113,0,'gs,c,rusa,e,frlg,dp','egg'),
 (183,127,0,'gs,c,rusa,e,frlg,dp','machine'),
 (183,129,0,'gs,c','machine'),
 (183,129,0,'e','tutor'),
-(183,133,0,'gs,c,dp','egg'),
+(183,133,0,'gs,c,rusa,e,frlg,dp','egg'),
 (183,146,0,'','pokecenter'),
 (183,156,0,'gs,c,rusa,e,frlg,dp','machine'),
 (183,164,0,'e,frlg','tutor'),
-(183,164,0,'dp','egg'),
 (183,164,0,'dp','machine'),
+(183,164,0,'rusa,e,frlg,dp','egg'),
 (183,173,0,'gs,c','machine'),
 (183,173,0,'e','tutor'),
@@ -32410 +32381 @@
 (183,182,0,'gs,c,rusa,e,frlg,dp','machine'),
 (183,184,0,'','pokecenter'),
-(183,187,0,'gs,c,dp','egg'),
+(183,187,0,'gs,c,rusa,e,frlg,dp','egg'),
 (183,189,0,'gs,c','machine'),
 (183,189,0,'e','tutor'),
 (183,193,0,'gs,c','egg'),
-(183,195,0,'gs,c,dp','egg'),
+(183,195,0,'gs,c,rusa,e,frlg,dp','egg'),
 (183,196,0,'gs,c','machine'),
 (183,196,0,'e','tutor'),
@@ -32428 +32399 @@
 (183,214,0,'gs,c,dp','machine'),
 (183,216,0,'gs,c,rusa,e,frlg,dp','machine'),
-(183,217,0,'gs,c,dp','egg'),
+(183,217,0,'gs,c,rusa,e,frlg,dp','egg'),
 (183,218,0,'gs,c,rusa,e,frlg,dp','machine'),
 (183,223,0,'gs,c','machine'),
 (183,223,0,'e','tutor'),
-(183,227,0,'rusa,e,frlg','egg'),
 (183,231,0,'gs,c,rusa,e,frlg,dp','machine'),
 (183,237,0,'gs,c,rusa,e,frlg,dp','machine'),
@@ -32438 +32408 @@
 (183,240,32,'dp','level'),
 (183,240,36,'gs,c,rusa,e,frlg','level'),
-(183,248,0,'gs,c,dp','egg'),
+(183,248,0,'gs,c,rusa,e,frlg,dp','egg'),
 (183,249,0,'rusa,e,frlg,dp','machine'),
 (183,250,0,'gs,c','machine'),
@@ -32446 +32416 @@
 (183,276,0,'dp','egg'),
 (183,280,0,'rusa,e,frlg,dp','machine'),
-(183,287,0,'rusa,e,frlg,dp','egg'),
+(183,287,0,'dp','egg'),
 (183,290,0,'rusa,e,frlg,dp','machine'),
 (183,291,0,'rusa,e,frlg','machine'),
-(183,321,0,'rusa,e,frlg','egg'),
 (183,352,0,'rusa,e,frlg,dp','machine'),
 (183,363,0,'dp','machine'),
@@ -32950 +32919 @@
 (190,10,1,'gs,c,rusa,e,frlg,dp','level'),
 (190,15,0,'gs,c,rusa,e,frlg,dp','machine'),
-(190,21,0,'dp','egg'),
+(190,21,0,'gs,c,rusa,e,frlg,dp','egg'),
 (190,25,0,'e,frlg','tutor'),
 (190,28,4,'dp','level'),
 (190,28,6,'gs,c,rusa,e,frlg','level'),
 (190,29,0,'gs,c','machine'),
-(190,29,0,'gs,c,rusa,e,frlg','egg'),
 (190,34,0,'e,frlg','tutor'),
 (190,38,0,'e,frlg','tutor'),
@@ -34190 +34158 @@
 (205,445,0,'dp','machine'),
 (205,446,0,'dp','machine'),
-(206,21,0,'rusa,e,frlg','egg'),
 (206,29,0,'gs,c','machine'),
-(206,29,0,'dp','egg'),
+(206,29,0,'rusa,e,frlg,dp','egg'),
 (206,31,0,'','pokecenter'),
 (206,32,0,'','pokecenter'),
@@ -36058 +36025 @@
 (226,17,36,'rusa,e,frlg','level'),
 (226,17,40,'gs,c','level'),
-(226,21,0,'dp','egg'),
+(226,21,0,'gs,c,rusa,e,frlg,dp','egg'),
 (226,29,0,'gs,c','machine'),
-(226,29,0,'gs,c,rusa,e,frlg','egg'),
 (226,29,13,'dp','level'),
 (226,33,1,'gs,c,rusa,e,frlg,dp','level'),
@@ -36852 +36818 @@
 (236,129,0,'gs,c','machine'),
 (236,129,0,'e','tutor'),
+(236,136,0,'gs,c,rusa,e,frlg,dp','egg'),
 (236,146,0,'','crystal'),
 (236,156,0,'gs,c,rusa,e,frlg,dp','machine'),
@@ -36859 +36826 @@
 (236,164,0,'dp','machine'),
 (236,168,0,'gs,c,rusa,e,frlg,dp','machine'),
+(236,170,0,'gs,c,rusa,e,frlg,dp','egg'),
 (236,173,0,'gs,c','machine'),
 (236,173,0,'e','tutor'),
 (236,174,0,'gs,c','machine'),
 (236,182,0,'gs,c,rusa,e,frlg,dp','machine'),
+(236,183,0,'gs,c,rusa,e,frlg,dp','egg'),
 (236,189,0,'gs,c','machine'),
 (236,189,0,'e','tutor'),
@@ -36875 +36844 @@
 (236,216,0,'gs,c,rusa,e,frlg,dp','machine'),
 (236,218,0,'gs,c,rusa,e,frlg,dp','machine'),
+(236,229,0,'gs,c,rusa,e,frlg,dp','egg'),
 (236,237,0,'gs,c,rusa,e,frlg,dp','machine'),
 (236,240,0,'rusa,e,frlg,dp','machine'),
@@ -36881 +36851 @@
 (236,252,1,'dp','level'),
 (236,263,0,'rusa,e,frlg,dp','machine'),
+(236,270,0,'rusa,e,frlg,dp','egg'),
 (236,270,1,'dp','level'),
 (236,280,0,'rusa,e,frlg,dp','machine'),
@@ -36966 +36937 @@
 (238,8,0,'gs,c','machine'),
 (238,8,0,'e','tutor'),
-(238,8,0,'dp','egg'),
+(238,8,0,'rusa,e,frlg,dp','egg'),
 (238,25,0,'e,frlg','tutor'),
 (238,34,0,'e,frlg','tutor'),
@@ -36988 +36959 @@
 (238,94,37,'gs,c','level'),
 (238,94,45,'rusa,e,frlg','level'),
-(238,96,0,'dp','egg'),
+(238,96,0,'gs,c,rusa,e,frlg,dp','egg'),
 (238,102,0,'e,frlg','tutor'),
 (238,104,0,'gs,c,rusa,e,frlg,dp','machine'),
@@ -37039 +37010 @@
 (238,240,0,'gs,c,rusa,e,frlg,dp','machine'),
 (238,244,0,'e','tutor'),
-(238,244,0,'dp','egg'),
 (238,244,0,'gs,c,dp','machine'),
+(238,244,0,'rusa,e,frlg,dp','egg'),
 (238,247,0,'gs,c,rusa,e,frlg,dp','machine'),
-(238,252,0,'dp','egg'),
+(238,252,0,'rusa,e,frlg,dp','egg'),
 (238,258,0,'rusa,e,frlg,dp','machine'),
 (238,263,0,'rusa,e,frlg,dp','machine'),
-(238,273,0,'dp','egg'),
+(238,273,0,'rusa,e,frlg,dp','egg'),
 (238,278,0,'dp','machine'),
 (238,285,0,'rusa,e,frlg,dp','machine'),
@@ -37064 +37035 @@
 (238,445,0,'dp','machine'),
 (238,447,0,'dp','machine'),
-(239,2,0,'dp','egg'),
+(239,2,0,'gs,c,rusa,e,frlg,dp','egg'),
 (239,5,0,'e,frlg','tutor'),
 (239,7,0,'gs,c','machine'),
 (239,7,0,'e','tutor'),
-(239,7,0,'dp','egg'),
+(239,7,0,'rusa,e,frlg,dp','egg'),
 (239,8,0,'gs,c','machine'),
 (239,8,0,'e','tutor'),
-(239,8,0,'dp','egg'),
+(239,8,0,'rusa,e,frlg,dp','egg'),
 (239,9,0,'gs,c','machine'),
 (239,9,0,'e','tutor'),
@@ -37077 +37048 @@
 (239,9,28,'dp','level'),
 (239,25,0,'e,frlg','tutor'),
-(239,27,0,'dp','egg'),
+(239,27,0,'gs,c,rusa,e,frlg,dp','egg'),
 (239,29,0,'gs,c','machine'),
 (239,34,0,'e,frlg','tutor'),
@@ -37097 +37068 @@
 (239,92,0,'gs,c,rusa,e,frlg,dp','machine'),
 (239,94,0,'gs,c,rusa,e,frlg,dp','machine'),
-(239,96,0,'dp','egg'),
+(239,96,0,'gs,c,rusa,e,frlg,dp','egg'),
 (239,98,1,'gs,c,rusa,e,frlg,dp','level'),
 (239,102,0,'e,frlg','tutor'),
@@ -37103 +37074 @@
 (239,103,43,'dp','level'),
 (239,104,0,'gs,c,rusa,e,frlg,dp','machine'),
-(239,112,0,'dp','egg'),
+(239,112,0,'gs,c,rusa,e,frlg,dp','egg'),
 (239,113,0,'rusa,e,frlg,dp','machine'),
 (239,113,17,'gs,c,rusa,e,frlg','level'),
@@ -37140 +37111 @@
 (239,228,0,'','pokecenter'),
 (239,237,0,'gs,c,rusa,e,frlg,dp','machine'),
-(239,238,0,'dp','egg'),
+(239,238,0,'c,rusa,e,frlg,dp','egg'),
 (239,240,0,'gs,c,rusa,e,frlg,dp','machine'),
 (239,249,0,'rusa,e,frlg,dp','machine'),
@@ -37154 +37125 @@
 (239,445,0,'dp','machine'),
 (239,451,0,'dp','machine'),
-(240,2,0,'dp','egg'),
+(240,2,0,'gs,c,rusa,e,frlg,dp','egg'),
 (240,5,0,'e,frlg','tutor'),
-(240,5,0,'dp','egg'),
+(240,5,0,'gs,c,rusa,e,frlg,dp','egg'),
 (240,7,0,'gs,c','machine'),
 (240,7,0,'e','tutor'),
@@ -37163 +37134 @@
 (240,9,0,'gs,c','machine'),
 (240,9,0,'e','tutor'),
-(240,9,0,'dp','egg'),
+(240,9,0,'rusa,e,frlg,dp','egg'),
 (240,25,0,'e,frlg','tutor'),
 (240,29,0,'gs,c','machine'),
@@ -37181 +37152 @@
 (240,94,0,'gs,c,rusa,e,frlg,dp','machine'),
 (240,102,0,'e,frlg','tutor'),
-(240,103,0,'dp','egg'),
+(240,103,0,'gs,c,rusa,e,frlg,dp','egg'),
 (240,104,0,'gs,c,rusa,e,frlg,dp','machine'),
 (240,108,10,'dp','level'),
@@ -37187 +37158 @@
 (240,109,25,'dp','level'),
 (240,109,43,'gs,c,rusa,e,frlg','level'),
-(240,112,0,'dp','egg'),
+(240,112,0,'gs,c,rusa,e,frlg,dp','egg'),
 (240,123,1,'dp','level'),
 (240,123,13,'gs,c,rusa,e,frlg','level'),
@@ -37222 +37193 @@
 (240,231,0,'gs,c,rusa,e,frlg,dp','machine'),
 (240,237,0,'gs,c,rusa,e,frlg,dp','machine'),
-(240,238,0,'dp','egg'),
+(240,238,0,'c,rusa,e,frlg,dp','egg'),
 (240,241,0,'gs,c,rusa,e,frlg,dp','machine'),
 (240,241,31,'gs,c,rusa,e,frlg','level'),
@@ -41291 +41262 @@
 (297,444,0,'dp','machine'),
 (297,445,0,'dp','machine'),
-(298,21,0,'dp','egg'),
+(298,21,0,'rusa,e,frlg,dp','egg'),
 (298,21,15,'rusa,e,frlg,dp','level'),
 (298,34,0,'e,frlg','tutor'),
@@ -41297 +41268 @@
 (298,39,6,'rusa,e,frlg','level'),
 (298,39,7,'dp','level'),
-(298,47,0,'dp','egg'),
+(298,47,0,'rusa,e,frlg,dp','egg'),
 (298,55,18,'dp','level'),
 (298,55,21,'rusa,e,frlg','level'),
@@ -41330 +41301 @@
 (298,216,0,'rusa,e,frlg,dp','machine'),
 (298,218,0,'rusa,e,frlg,dp','machine'),
-(298,227,0,'dp','egg'),
+(298,227,0,'rusa,e,frlg,dp','egg'),
 (298,231,0,'rusa,e,frlg,dp','machine'),
 (298,237,0,'rusa,e,frlg,dp','machine'),
@@ -41336 +41307 @@
 (298,258,0,'rusa,e,frlg,dp','machine'),
 (298,263,0,'rusa,e,frlg,dp','machine'),
-(298,287,0,'dp','egg'),
+(298,287,0,'rusa,e,frlg,dp','egg'),
 (298,290,0,'rusa,e,frlg,dp','machine'),
 (298,313,0,'dp','egg'),
-(298,321,0,'dp','egg'),
+(298,321,0,'rusa,e,frlg,dp','egg'),
 (298,352,0,'rusa,e,frlg,dp','machine'),
 (298,363,0,'dp','machine'),