Index: /veekun/trunk/vee.yml =================================================================== --- /veekun/trunk/vee.yml (revision 109) +++ /veekun/trunk/vee.yml (revision 406) @@ -9,15 +9,4 @@ password_hash_type: SHA-1 -authorization: - dbic: - role_class: DBIC::Permissions - # The name of the field in the 'roles' table that contains the role name - role_field: permission - # The name of the accessor used to map a role to the users who have this role - # See the has_many() in MyAppDB/Role.pm - role_rel: users - # The name of the field in the user_role table that references the user - user_role_user_field: userid - session: dbic_class: DBIC::Sessions @@ -25,5 +14,5 @@ id_field: id data_field: data - expires_field: expires + expires_field: time_expires static: Index: /veekun/trunk/t/dex-pokemon.t =================================================================== --- /veekun/trunk/t/dex-pokemon.t (revision 347) +++ /veekun/trunk/t/dex-pokemon.t (revision 406) @@ -70,5 +70,5 @@ # TODO: Any way to flesh these out without just doing one big is_deeply? # These are just spot checks for arbitrary moves. -is $s_eevee->{moves}{level}[-1]{moveid}, 376, "Eevee's last move is Trump Card"; +is $s_eevee->{moves}{level}[-1]{move_id}, 376, "Eevee's last move is Trump Card"; #use Data::Dumper; $Data::Dumper::Maxdepth = 3; warn Dumper $s_eevee; Index: /veekun/trunk/t/dex-search-pokemon.t =================================================================== --- /veekun/trunk/t/dex-search-pokemon.t (revision 349) +++ /veekun/trunk/t/dex-search-pokemon.t (revision 406) @@ -43,13 +43,13 @@ # Gender dropdown had a few problems at one point, so I gave it several tests -search_ok { gender => 254, generation => 0 }, +search_ok { gender_rate => 254, generation => 0 }, [qw/ 29 30 31 113 115 124 /], "Female-only (+ generation)"; -search_ok { name => 'voltorb', gender => 'not255' }, +search_ok { name => 'voltorb', gender_rate => 'not255' }, [qw/ /], "Any gender (+ name)"; -search_ok { name => 'eevee', gender => 255 }, +search_ok { name => 'eevee', gender_rate => 255 }, [qw/ /], "No gender (+ impossible name)"; Index: /veekun/trunk/t/dex-search-moves.t =================================================================== --- /veekun/trunk/t/dex-search-moves.t (revision 349) +++ /veekun/trunk/t/dex-search-moves.t (revision 406) @@ -61,5 +61,5 @@ "Lower and upper bounds on power"; -search_ok { acc_lb => 30, acc_ub => 30 }, +search_ok { accuracy_lb => 30, accuracy_ub => 30 }, [qw/ 12 32 90 329 /], "Exact accuracy"; Index: /veekun/trunk/t/shoutbox.t =================================================================== --- /veekun/trunk/t/shoutbox.t (revision 404) +++ /veekun/trunk/t/shoutbox.t (revision 406) @@ -21,5 +21,5 @@ my $posted_res = request( POST '/shoutbox/post' => { name => 'Tester', - message => 'Test message', + content => 'Test message', } ); ok $posted_res->is_redirect, 'Shoutbox post results in redirect'; @@ -31,6 +31,6 @@ ok defined $shout, 'Shoutbox table contains a shout'; is $shout->name, 'Tester', 'Shout name is correct'; -is $shout->message, 'Test message', 'Shout message is correct'; -ok !defined $shout->userid, 'Shout user is NULL'; +is $shout->content, 'Test message', 'Shout message is correct'; +ok !defined $shout->user_id, 'Shout user is NULL'; ok abs($shout->time - time) < 3, 'Shout time is reasonably close to now'; Index: /veekun/trunk/script/base_data.sql =================================================================== --- /veekun/trunk/script/base_data.sql (revision 381) +++ /veekun/trunk/script/base_data.sql (revision 406) @@ -1,8 +1,8 @@ -LOCK TABLES forums WRITE, grouppermissions WRITE, groups WRITE, usergroups WRITE, users WRITE; +LOCK TABLES forums WRITE, group_permissions WRITE, groups WRITE, user_groups WRITE, users WRITE; -INSERT INTO forums (id, name, lastpostid, threadct, postct, flags, accessibility, blurb) +INSERT INTO forums (id, name, last_post_id, thread_count, post_count, flags, accessibility, blurb) VALUES (1, 'News', NULL, 0, 0, '', 'normal', 'News and updates show up here.'); -INSERT INTO grouppermissions (groupid, permission, scope, polarity) +INSERT INTO group_permissions (group_id, permission, scope, polarity) VALUES (1, 'splat', '', 'allow'); @@ -11,9 +11,9 @@ (2, '', 'Users'); -INSERT INTO usergroups (userid, groupid, priority) +INSERT INTO user_groups (user_id, group_id, priority) VALUES (0, 2, 1), (1, 1, 1); -INSERT INTO users (id, name, password, joindate, signature, thread_view_cutoff) +INSERT INTO users (id, name, password, time_joined, signature, thread_view_cutoff) VALUES (1, 'admin', '5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8', UNIX_TIMESTAMP(), 'Default signature', UNIX_TIMESTAMP()); Index: /veekun/trunk/script/base.sql =================================================================== --- /veekun/trunk/script/base.sql (revision 330) +++ /veekun/trunk/script/base.sql (revision 406) @@ -17,22 +17,22 @@ CREATE TABLE edits ( id int(10) unsigned NOT NULL auto_increment, - postid int(10) unsigned NOT NULL default '0', - userid int(10) unsigned NOT NULL default '0', - `time` int(10) unsigned NOT NULL default '0', - oldmessage text NOT NULL, - PRIMARY KEY (id), - KEY POSTID (postid) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Table structure for table `errorlog` --- - -DROP TABLE IF EXISTS errorlog; -CREATE TABLE errorlog ( - id int(10) unsigned NOT NULL auto_increment, - `time` int(10) unsigned NOT NULL, - userid int(10) unsigned NOT NULL, - ip int(10) unsigned NOT NULL, + post_id int(10) unsigned NOT NULL default '0', + user_id int(10) unsigned NOT NULL default '0', + `time` int(10) unsigned NOT NULL default '0', + old_content text NOT NULL, + PRIMARY KEY (id), + KEY POSTID USING BTREE (post_id) +) ENGINE=MyISAM DEFAULT CHARSET=latin1; + +-- +-- Table structure for table `error_log` +-- + +DROP TABLE IF EXISTS error_log; +CREATE TABLE error_log ( + id int(10) unsigned NOT NULL auto_increment, + `time` int(10) unsigned NOT NULL default '0', + user_id int(10) unsigned NOT NULL default '0', + ip int(10) unsigned NOT NULL default '0', path tinytext NOT NULL, method enum('POST','GET') default NULL, @@ -50,25 +50,25 @@ id int(10) unsigned NOT NULL auto_increment, `name` varchar(80) NOT NULL default 'Untitled Forum', - lastpostid int(10) unsigned default NULL, - threadct int(10) unsigned NOT NULL default '0', - postct int(10) unsigned NOT NULL default '0', + last_post_id int(10) unsigned default NULL, + thread_count int(10) unsigned NOT NULL default '0', + post_count int(10) unsigned NOT NULL default '0', flags set('header') NOT NULL, accessibility enum('normal','locked','archive','hidden') NOT NULL default 'normal', - blurb varchar(255) NOT NULL default '', - PRIMARY KEY (id) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; - --- --- Table structure for table `grouppermissions` --- - -DROP TABLE IF EXISTS grouppermissions; -CREATE TABLE grouppermissions ( - groupid int(10) unsigned NOT NULL, + description varchar(255) NOT NULL, + PRIMARY KEY (id) +) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC; + +-- +-- Table structure for table `group_permissions` +-- + +DROP TABLE IF EXISTS group_permissions; +CREATE TABLE group_permissions ( + group_id int(10) unsigned NOT NULL default '0', permission varchar(64) NOT NULL default '', scope varchar(64) NOT NULL default '', polarity enum('allow','deny') default NULL, - PRIMARY KEY (groupid,permission,scope) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; + PRIMARY KEY USING BTREE (group_id,permission,scope) +) ENGINE=MyISAM DEFAULT CHARSET=latin1; -- @@ -82,5 +82,5 @@ `name` tinytext NOT NULL, UNIQUE KEY id (id) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; -- @@ -91,7 +91,7 @@ CREATE TABLE messages ( id int(10) unsigned NOT NULL auto_increment, - from_user_id int(10) unsigned NOT NULL, - to_user_id int(10) unsigned NOT NULL, - `time` int(10) unsigned NOT NULL, + from_user_id int(10) unsigned NOT NULL default '0', + to_user_id int(10) unsigned NOT NULL default '0', + `time` int(10) unsigned NOT NULL default '0', `subject` tinytext NOT NULL, message text NOT NULL, @@ -106,15 +106,15 @@ CREATE TABLE posts ( id int(10) unsigned NOT NULL auto_increment, - threadid int(10) unsigned NOT NULL default '0', - userid int(10) unsigned NOT NULL default '0', + thread_id int(10) unsigned NOT NULL default '0', + user_id int(10) unsigned NOT NULL default '0', flags set('deleted') NOT NULL default '', `time` int(10) unsigned NOT NULL default '0', format enum('bbcode','raw','html') NOT NULL default 'raw', - message text NOT NULL, - lasteditid int(10) unsigned NOT NULL default '0', - PRIMARY KEY (id), - KEY THREAD (threadid), - KEY `USER` (userid) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; + content text NOT NULL, + last_edit_id int(10) unsigned NOT NULL default '0', + PRIMARY KEY (id), + KEY THREAD USING BTREE (thread_id), + KEY `USER` USING BTREE (user_id) +) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=FIXED; -- @@ -124,10 +124,10 @@ DROP TABLE IF EXISTS sessions; CREATE TABLE sessions ( - id char(72) NOT NULL default '', - userid int(10) unsigned NOT NULL default '0', - expires int(10) unsigned default NULL, + id varchar(72) NOT NULL default '', + user_id int(10) unsigned NOT NULL default '0', + time_expires int(10) unsigned default NULL, `data` text, - PRIMARY KEY (id), - KEY USERID (userid) + PRIMARY KEY USING BTREE (id), + KEY USER_ID USING BTREE (user_id) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; @@ -140,8 +140,8 @@ id int(10) unsigned NOT NULL auto_increment, `name` varchar(24) NOT NULL default 'Anonymous', - userid int(10) unsigned default NULL, + user_id int(10) unsigned default NULL, ip int(10) unsigned NOT NULL default '0', `time` int(10) unsigned NOT NULL default '0', - message text NOT NULL, + content text NOT NULL, PRIMARY KEY (id) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; @@ -154,16 +154,16 @@ CREATE TABLE threads ( id int(10) unsigned NOT NULL auto_increment, - forumid int(10) unsigned NOT NULL default '0', + forum_id int(10) unsigned NOT NULL default '0', `subject` varchar(48) NOT NULL default 'Untitled Thread', blurb varchar(96) NOT NULL default '', - firstpostid int(10) unsigned NOT NULL, - lastpostid int(10) unsigned NOT NULL, - lasttime int(10) unsigned NOT NULL default '0', - postct int(10) unsigned NOT NULL default '0', - hitct int(10) unsigned NOT NULL default '0', + first_post_id int(10) unsigned NOT NULL, + last_post_id int(10) unsigned NOT NULL, + last_post_time int(10) unsigned NOT NULL default '0', + post_count int(10) unsigned NOT NULL default '0', + view_count int(10) unsigned NOT NULL default '0', flags set('locked','sticky','announcement','deleted') NOT NULL default '', PRIMARY KEY (id), - KEY FORUMID (forumid) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; + KEY FORUMID USING BTREE (forum_id) +) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC; -- @@ -180,29 +180,16 @@ -- --- Table structure for table `usergroups` --- - -DROP TABLE IF EXISTS usergroups; -CREATE TABLE usergroups ( - userid int(10) unsigned NOT NULL, - groupid tinyint(3) unsigned NOT NULL, - priority tinyint(3) unsigned NOT NULL, - PRIMARY KEY (userid,groupid,priority), - KEY userid (userid), - KEY groupid (groupid) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; - --- --- Table structure for table `userpermissions` --- - -DROP TABLE IF EXISTS userpermissions; -CREATE TABLE userpermissions ( - userid int(10) NOT NULL, - permission varchar(64) NOT NULL default '', - scope varchar(64) NOT NULL default '', - polarity enum('allow','deny') default NULL, - PRIMARY KEY (userid,permission,scope) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +-- Table structure for table `user_groups` +-- + +DROP TABLE IF EXISTS user_groups; +CREATE TABLE user_groups ( + user_id int(10) unsigned NOT NULL default '0', + group_id tinyint(3) unsigned NOT NULL default '0', + priority tinyint(3) unsigned NOT NULL default '0', + PRIMARY KEY USING BTREE (user_id,group_id,priority), + KEY user_id USING BTREE (user_id), + KEY group_id USING BTREE (group_id) +) ENGINE=MyISAM DEFAULT CHARSET=latin1; -- @@ -215,10 +202,10 @@ `name` varchar(20) NOT NULL default '', `password` varchar(40) NOT NULL, - joindate int(10) unsigned NOT NULL default '0', - lastactive int(10) unsigned NOT NULL default '0', + time_joined int(10) unsigned NOT NULL default '0', + time_active int(10) unsigned NOT NULL default '0', thread_view_cutoff int(10) unsigned NOT NULL, - postct int(10) unsigned NOT NULL default '0', + post_count int(10) unsigned NOT NULL default '0', flags set('lockedsig','lockedavatar','lockedtitle') NOT NULL default '', - newspic varchar(64) default NULL, + news_pic varchar(64) default NULL, avatar varchar(64) default NULL, contact_aim varchar(32) NOT NULL default '', @@ -229,6 +216,6 @@ contact_homepage varchar(96) NOT NULL default '', contact_email varchar(32) NOT NULL default '', - pmicon enum('bead','bellossom','dream','duskull','eatmail','gorgeous','letter','magnemite','pika','retro','slakoth','vee','wailmer','wingull','zigzagoon') NOT NULL default 'letter', - customtitle varchar(32) NOT NULL default '', + pm_icon enum('bead','bellossom','dream','duskull','eatmail','gorgeous','letter','magnemite','pika','retro','slakoth','vee','wailmer','wingull','zigzagoon') NOT NULL default 'letter', + custom_title varchar(32) NOT NULL, signature text NOT NULL, is_dumb tinyint(1) NOT NULL default '0', Index: /veekun/trunk/script/gallery.sql =================================================================== --- /veekun/trunk/script/gallery.sql (revision 48) +++ /veekun/trunk/script/gallery.sql (revision 406) @@ -17,10 +17,9 @@ CREATE TABLE creators ( id int(10) unsigned NOT NULL auto_increment, - userid int(10) unsigned default NULL, - `name` varchar(20) default NULL, - itemct int(10) unsigned NOT NULL default '0', - PRIMARY KEY (id), - UNIQUE KEY userid (userid) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; + user_id int(10) unsigned NOT NULL, + `name` varchar(32) NOT NULL, + item_count tinyint(3) unsigned default NULL, + PRIMARY KEY (id) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; -- @@ -49,9 +48,9 @@ -- --- Table structure for table `gallerykeywords` +-- Table structure for table `gallery_keywords` -- -DROP TABLE IF EXISTS gallerykeywords; -CREATE TABLE gallerykeywords ( +DROP TABLE IF EXISTS gallery_keywords; +CREATE TABLE gallery_keywords ( id int(10) unsigned NOT NULL auto_increment, keyword varchar(48) NOT NULL default '', @@ -63,9 +62,9 @@ -- --- Table structure for table `itemkeywords` +-- Table structure for table `item_keywords` -- -DROP TABLE IF EXISTS itemkeywords; -CREATE TABLE itemkeywords ( +DROP TABLE IF EXISTS item_keywords; +CREATE TABLE item_keywords ( itemid int(10) unsigned NOT NULL default '0', keywordid int(10) unsigned NOT NULL default '0', Index: /veekun/trunk/script/pokedex.sql =================================================================== --- /veekun/trunk/script/pokedex.sql (revision 399) +++ /veekun/trunk/script/pokedex.sql (revision 406) @@ -18,6 +18,6 @@ id tinyint(3) unsigned NOT NULL default '0', `name` varchar(24) NOT NULL default '', - gameblurb tinytext NOT NULL, - effect tinytext NOT NULL, + blurb_dp tinytext NOT NULL, + description tinytext NOT NULL, PRIMARY KEY (id) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; @@ -251,24 +251,24 @@ -- --- Table structure for table `contestmoves` +-- Table structure for table `contest_effects` -- -DROP TABLE IF EXISTS contestmoves; -CREATE TABLE contestmoves ( +DROP TABLE IF EXISTS contest_effects; +CREATE TABLE contest_effects ( id tinyint(4) NOT NULL default '0', appeal tinyint(4) NOT NULL default '0', jam tinyint(4) NOT NULL default '0', + blurb_rusa tinytext NOT NULL, description tinytext NOT NULL, - effect tinytext NOT NULL, PRIMARY KEY (id) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- --- Dumping data for table `contestmoves` +-- Dumping data for table `contest_effects` -- -LOCK TABLES contestmoves WRITE; -/*!40000 ALTER TABLE contestmoves DISABLE KEYS */; -INSERT INTO contestmoves VALUES (1,4,0,'A highly appealing move.','Gives a high number of appeal points wth no other effects.'), +LOCK TABLES contest_effects WRITE; +/*!40000 ALTER TABLE contest_effects DISABLE KEYS */; +INSERT INTO contest_effects VALUES (1,4,0,'A highly appealing move.','Gives a high number of appeal points wth no other effects.'), (2,3,0,'Affected by how well the appeal in front goes.','If the Pokemon that appealed before the user earned less than three appeal points, user earns six; if three, user earns three; if more than three, user earns none.'), (3,6,0,'After this move, the user is more easily startled.','If the user is jammed this turn after using this move, it will receive twice as many jam points.'), @@ -303,21 +303,16 @@ (32,1,0,'Ups the user\'s condition. Helps prevent nervousness.','User gains one star.'), (33,3,0,'Worsens the condition of those that made appeals.','Removes all stars from all Pokemon that have appealed this turn.'); -/*!40000 ALTER TABLE contestmoves ENABLE KEYS */; +/*!40000 ALTER TABLE contest_effects ENABLE KEYS */; UNLOCK TABLES; -- --- Table structure for table `evchains` +-- Table structure for table `evo_chains` -- -DROP TABLE IF EXISTS evchains; -CREATE TABLE evchains ( +DROP TABLE IF EXISTS evo_chains; +CREATE TABLE evo_chains ( id tinyint(3) unsigned NOT NULL default '0', - base smallint(5) unsigned NOT NULL default '0', - growth enum('slow','medium','fast','poly','superfast','superslow') default NULL, - `chain` tinytext NOT NULL, + growth_rate enum('slow','medium','fast','poly','superfast','superslow') default NULL, steps mediumint(8) unsigned default '0', - babygs tinytext, - babyc tinytext, - babyrusa tinytext, baby_item varchar(12) NOT NULL, PRIMARY KEY (id) @@ -325,279 +320,279 @@ -- --- Dumping data for table `evchains` +-- Dumping data for table `evo_chains` -- -LOCK TABLES evchains WRITE; -/*!40000 ALTER TABLE evchains DISABLE KEYS */; -INSERT INTO evchains VALUES (1,1,'poly','[0,\"\",[1,\"L16\",[2,\"L32\"]]]',5120,'112 129 218 012 079','112 129 218 012 079','079 112 129 173 203 218 319 344',''), -(2,4,'poly','[3,\"\",[4,\"L16\",[5,\"L36\"]]]',5120,'186 245 156 043 199 250','186 245 156 043 199 250','186 245 156 043 199 250 013 348',''), -(3,7,'poly','[6,\"\",[7,\"L16\",[8,\"L36\"]]]',5120,'242 113 053 092 192 174','242 113 053 092 192 174','242 113 053 192 174 286 299 280',''), -(4,10,'medium','[9,\"\",[10,\"L7\",[11,\"L10\"]]]',3840,NULL,NULL,NULL,''), -(5,13,'medium','[12,\"\",[13,\"L7\",[14,\"L10\"]]]',3840,NULL,NULL,NULL,''), -(6,16,'poly','[15,\"\",[16,\"L18\",[17,\"L36\"]]]',3840,'227 184 192','227 184 192','227 184 192 210 313',''), -(7,19,'medium','[18,\"\",[19,\"L20\"]]',3840,'102 171 153 043 067 178','102 171 153 043 067 178','102 171 153 043 067 178 252 206',''), -(8,21,'medium','[20,\"\",[21,\"L20\"]]',3840,'184 205 183 097 160','184 205 183 097 160','184 205 183 097 160 309 142',''), -(9,23,'medium','[22,\"\",[23,\"L22\"]]',5120,'227 028 179 250','227 028 179 250 241','227 028 179 250 304',''), -(10,25,'medium','[171,\"\",[24,\"H\",[25,\"T\"]]]',2560,'178 116 216 226 002','178 116 216 226 002','178 116 216 226 002 272 267',''), -(11,27,'medium','[26,\"\",[27,\"L22\"]]',5120,'174 218 067 228','174 218 067 228 231','174 218 067 228 156 231 013 305',''), -(12,29,'poly','[28,\"\",[29,\"L16\",[30,\"M\"]]]',5120,'047 049 035 115 203 067 250','047 049 035 115 203 067 250','047 049 035 115 203 067 250',''), -(13,32,'poly','[31,\"\",[32,\"L16\",[33,\"M\"]]]',5120,'047 049 035 092 132 067 250','047 049 035 092 132 067 250','067 049 047 035 132 092 250',''), -(14,35,'fast','[172,\"\",[34,\"H\",[35,\"M\"]]]',2560,'216 117 132 186 149 101','216 117 132 186 149 101','216 117 132 186 149 101 272 163',''), -(15,37,'medium','[36,\"\",[37,\"F\"]]',5120,'184 094 174 179 049','184 094 174 179 049','184 094 174 179 049 335 243 256',''), -(16,39,'fast','[173,\"\",[38,\"H\",[39,\"M\"]]]',2560,'194 216 184','194 216 184','194 216 184 272 312',''), -(17,41,'medium','[40,\"\",[41,\"L22\",[168,\"H\"]]]',3840,'097 227 184 015 017','097 227 184 015 017','097 227 184 015 017 173',''), -(18,43,'poly','[42,\"\",[43,\"L21\",[44,\"P\"],[181,\"S\"]]]',5120,'013 074 174 234','013 074 174 234','013 074 174 234 203 274',''), -(19,46,'medium','[45,\"\",[46,\"L24\"]]',5120,'205 102 067 059 174 112 227','205 102 067 059 174 112 227','205 102 067 059 174 229 112 227',''), -(20,48,'medium','[47,\"\",[48,\"L31\"]]',5120,'225 102 201','225 102 201','225 102 201 323',''), -(21,50,'medium','[49,\"\",[50,\"L26\"]]',5120,'184 102 245 227 250','184 102 245 227 250','184 102 245 227 250 252 156',''), -(22,52,'medium','[51,\"\",[52,\"L28\"]]',5120,'179 203 094 132','179 203 094 132','179 203 094 132 243 273',''), -(23,54,'medium','[53,\"\",[54,\"L33\"]]',5120,'057 094 059 192 112 247 093','057 094 059 192 112 247 093 237','094 059 192 112 247 093 237 286',''), -(24,56,'medium','[55,\"\",[56,\"L28\"]]',5120,'156 192 095 067 178 250','156 192 095 067 178 250','156 192 095 067 178 250 278 264',''), -(25,58,'slow','[57,\"\",[58,\"F\"]]',5120,'033 218 241 036 082','033 218 241 036 082','033 218 241 036 082 335 256',''), -(26,60,'poly','[59,\"\",[60,\"L25\",[61,\"W\"],[185,\"IKing\'s Rock\"]]]',5120,'053 149 060 113 169','053 149 060 113 169','053 149 060 113 169 345 300',''), -(27,63,'poly','[62,\"\",[63,\"L16\",[64,\"R\"]]]',5120,'112 226 111','112 226 111','226 111 281 006 008 007',''), -(28,66,'poly','[65,\"\",[66,\"L28\",[67,\"R\"]]]',5120,'112 095 026 226','112 095 026 226','112 095 026 226 264 067 156',''), -(29,69,'poly','[68,\"\",[69,\"L21\",[70,\"P\"]]]',5120,'013 226 114 234 140','013 226 114 234 140','013 226 114 234 140 274 344',''), -(30,72,'slow','[71,\"\",[72,\"L30\"]]',5120,'061 242 228 113 218','061 242 228 113 218','061 242 228 113 218 108',''), -(31,74,'poly','[73,\"\",[74,\"L25\",[75,\"R\"]]]',3840,'004 156','004 156','004 156 334',''), -(32,77,'medium','[76,\"\",[77,\"L40\"]]',5120,'171 036 023 094 203 097','171 036 023 094 203 097','171 036 023 094 203 037',''), -(33,79,'medium','[78,\"\",[79,\"L37\"],[198,\"IKing\'s Rock\"]]',5120,'218 186 247 022','218 186 247 022','218 186 247 022 299 213 172',''), -(34,81,'medium','[80,\"\",[81,\"L30\"]]',5120,NULL,NULL,NULL,''), -(35,83,'medium','[82,\"\"]',5120,'192 118 015 097 174','192 118 015 097 174','210 192 118 015 097 174 296 173',''), -(36,84,'medium','[83,\"\",[84,\"L31\"]]',5120,'097 047 113 184 174','097 047 113 184 174','097 047 113 184 174 282',''), -(37,86,'medium','[85,\"\",[86,\"L34\"]]',5120,'121 194 049 063 028 226','121 194 049 063 028 226','121 194 049 031 028 226 251 332',''), -(38,88,'medium','[87,\"\",[88,\"L38\"]]',5120,'113 211 121','113 211 121','113 211 121 285 173 324 152',''), -(39,90,'slow','[89,\"\",[90,\"W\"]]',5120,'060 035 111 228 102','060 035 111 228 102','060 035 111 228 102 332',''), -(40,92,'poly','[91,\"\",[92,\"L25\",[93,\"R\"]]]',5120,'148 194 113','148 194 113','148 194 113 309 260 287 152',''), -(41,95,'medium','[94,\"\",[207,\"IMetal Coat\"]]',6400,'156 174','156 174','156 174 152 334',''), -(42,96,'medium','[95,\"\",[96,\"L26\"]]',5120,'112 111','112 111','111 273 271 006 008 007',''), -(43,98,'medium','[97,\"\",[98,\"L28\"]]',5120,'090 113 132 174 028','090 113 132 174 028','090 113 132 174 028 281 013',''), -(44,100,'medium','[99,\"\",[100,\"L30\"]]',5120,NULL,NULL,NULL,''), -(45,102,'slow','[101,\"\",[102,\"P\"]]',5120,'234 235 114 071 245','234 235 114 071 245','234 235 114 245 243 274 173',''), -(46,104,'medium','[103,\"\",[104,\"L28\"]]',5120,'156 245 186 102 129 194','156 245 186 102 129 194 013','156 245 186 102 129 194 013',''), -(47,106,'medium','[235,\"\",[105,\"a20\"],[106,\"d20\"],[236,\"e20\"]]',6400,'228 135 182 169','228 135 182 169','228 135 182 169 269',''), -(48,108,'medium','[107,\"\"]',5120,'186 221 033','186 221 033','186 221 033 173 264 213 172 163',''), -(49,109,'medium','[108,\"\",[109,\"L35\"]]',5120,'102 148 059 193 219','102 148 059 193 219','102 148 059 193 219 260',''), -(50,111,'slow','[110,\"\",[111,\"L42\"]]',5120,'241 178 156 036 227 067 221','241 178 156 036 227 067 221','241 178 156 067 221 013 173 305',''), -(51,113,'fast','[112,\"\",[241,\"H\"]]',10240,'216 117 214','216 117 214','216 117 214 311 163','Luck Incense'), -(52,114,'medium','[113,\"\"]',5120,'174 092 071 114 132','174 092 071 114 132','174 092 071 114 132 072 266',''), -(53,115,'medium','[114,\"\"]',5120,'022 192 115 218 049','022 192 115 218 049','022 192 115 218 049 067 305 163',''), -(54,116,'medium','[115,\"\",[116,\"L32\",[229,\"IDragon Scale\"]]]',5120,'174 061 189 049 149 081','174 061 189 049 149 081','174 061 189 049 149 081 224',''), -(55,118,'medium','[117,\"\",[118,\"L33\"]]',5120,'059 113 055','059 113 055','059 113 055 213 299',''), -(56,120,'slow','[119,\"\",[120,\"W\"]]',5120,'061 111 047',NULL,NULL,''), -(57,122,'medium','[121,\"\"]',6400,'247 094 101','247 094 101','247 094 101 243 251 270','Odd Incense'), -(58,123,'medium','[122,\"\",[211,\"IMetal Coat\"]]',6400,'067 218 225 012 178 112','067 218 225 012 178 112','067 218 225 012 178 112 202 317',''), -(59,124,'medium','[237,\"\",[123,\"L30\"]]',6400,'095','095','095 243 251 272 007',''), -(60,125,'medium','[238,\"\",[124,\"L30\"]]',6400,'001 111 026 095','001 111 026 095 237','001 111 026 095 237 006 007',''), -(61,126,'medium','[239,\"\",[125,\"L30\"]]',6400,'001 004 111 102','001 004 111 102 237','001 004 111 102 237 008',''), -(62,127,'slow','[126,\"\"]',6400,'030 174','030 174','030 174 205 184',''), -(63,128,'slow','[127,\"\"]',5120,NULL,NULL,NULL,''), -(64,129,'slow','[128,\"\",[129,\"L20\"]]',1280,NULL,NULL,NULL,''), -(65,131,'slow','[130,\"\"]',10240,'061 192','061 192','192 163 320 286 348 173 213 031',''), -(66,132,'medium','[131,\"\"]',5120,NULL,NULL,NULL,''), -(67,133,'medium','[132,\"\",[133,\"W\"],[134,\"T\"],[135,\"F\"],[195,\"DH\"],[196,\"NH\"]]',8960,'174 203','174 203','203 174 202 173 320 272',''), -(68,137,'medium','[136,\"\",[232,\"IUp-Grade\"]]',5120,NULL,NULL,NULL,''), -(69,138,'medium','[137,\"\",[138,\"L40\"]]',7680,'060 061 028 047 113','060 061 028 047 113','060 061 028 047 113 156 190',''), -(70,140,'medium','[139,\"\",[140,\"L40\"]]',7680,'060 061 228 090 174','060 061 228 090 174','060 061 228 090 174 281 108',''), -(71,142,'slow','[141,\"\"]',8960,'017 227 192','017 227 192','017 227 192 210 224 173',''), -(72,143,'slow','[142,\"\"]',10240,'121','121','121 203 037 173 089 163','Full Incense'), -(73,144,'slow','[143,\"\"]',20480,NULL,NULL,NULL,''), -(74,145,'slow','[144,\"\"]',20480,NULL,NULL,NULL,''), -(75,146,'slow','[145,\"\"]',20480,NULL,NULL,NULL,''), -(76,147,'slow','[146,\"\",[147,\"L30\",[148,\"L55\"]]]',10240,'112 053 113 047','112 053 113 047','112 053 113 047 224 348',''), -(77,150,'slow','[149,\"\"]',30720,NULL,NULL,NULL,''), -(78,151,'poly','[150,\"\"]',30720,NULL,NULL,NULL,''), -(79,152,'poly','[151,\"\",[152,\"L16\",[153,\"L32\"]]]',5120,'021 072 067 245 174','021 072 067 245 174 013','021 072 067 245 174 266 274 319',''), -(80,155,'poly','[154,\"\",[155,\"L14\",[156,\"L36\"]]]',5120,'153 097 178 036 192','153 097 178 036 192 065','153 097 178 036 192 342 335 305',''), -(81,158,'poly','[157,\"\",[158,\"L18\",[159,\"L30\"]]]',5120,'241 036 055 245 012 156','241 036 055 245 012 156','241 036 055 245 156 299 345 336',''), -(82,161,'medium','[160,\"\",[161,\"L15\"]]',3840,'037 227 162 115 178','037 227 162 115 178','037 227 162 115 178 163 270 273',''), -(83,163,'medium','[162,\"\",[163,\"L20\"]]',3840,'118 047 184 016 017','118 047 184 016 017 142','118 047 184 016 017 142 296',''), -(84,165,'fast','[164,\"\",[165,\"L18\"]]',3840,'059 116 112','059 116 112','059 116 317',''), -(85,167,'fast','[166,\"\",[167,\"L22\"]]',3840,'059 049 048 225 227','059 049 048 225 227','059 049 048 225 227 323',''), -(86,170,'slow','[169,\"\",[170,\"L27\"]]',5120,'174 047 102','174 047 102','174 102 132',''), -(87,175,'fast','[174,\"\",[175,\"H\"]]',2560,'216 118 063 192 247','216 118 063 192 247','216 118 063 192 247 163 243',''), -(88,177,'medium','[176,\"\",[177,\"L25\"]]',5120,'113 064 097 184 210','113 064 097 184 210','113 064 097 184 210 243 296 286',''), -(89,179,'poly','[178,\"\",[179,\"L15\",[180,\"L30\"]]]',5120,'084 035 033 218 102 114','084 035 033 218 102 114','035 033 218 102 114 315 267',''), -(90,183,'fast','[297,\"\",[182,\"H\",[183,\"L18\"]]]',2560,'112 216 132 247 186 194 047 192','112 216 132 247 186 194 047 192','226 046 286 020 320','Sea Incense'), -(91,185,'medium','[184,\"\"]',5120,'119','119','119','Rock Incense'), -(92,187,'poly','[186,\"\",[187,\"L18\",[188,\"L27\"]]]',5120,'092 044 226 037 114 132 005','092 044 226 037 114 132 005','092 226 037 114 132 269 243',''), -(93,190,'fast','[189,\"\"]',5120,'067 102 227 096 179 028 002 250','067 102 227 096 179 028 002 250','067 102 227 096 179 028 002 250',''), -(94,191,'poly','[190,\"\",[191,\"S\"]]',5120,NULL,NULL,'319 226 072 266 173 269',''), -(95,193,'medium','[192,\"\"]',5120,'017 178 140','017 178 140','017 178 140 323 317',''), -(96,194,'medium','[193,\"\",[194,\"L20\"]]',5120,'033 245 218','033 245 218','033 245 218 173 299 253 255 254',''), -(97,198,'poly','[197,\"\"]',5120,'017 064 097 118 016','017 064 097 118 016 142','017 064 118 016 142 108 296 194',''), -(98,200,'fast','[199,\"\"]',6400,'102 193','102 193','102 193 243 285',''), -(99,201,'medium','[200,\"\"]',10240,NULL,NULL,NULL,''), -(100,202,'medium','[359,\"\",[201,\"L15\"]]',5120,NULL,NULL,NULL,'Lax Incense'), -(101,203,'medium','[202,\"\"]',5120,'035 132 192 247 250','035 132 192 247 250','035 132 192 247 250 243 272 276',''), -(102,204,'medium','[203,\"\",[204,\"L31\"]]',5120,'114 041 174 128','114 041 174 128','114 041 174 128 067 327',''), -(103,206,'medium','[205,\"\"]',5120,'116 245 156 043 098','116 245 156 043 098','116 245 156 043 020 309 173',''), -(104,207,'poly','[206,\"\"]',5120,'231 016 012 067','231 016 012 067','231 016 012 067 327',''), -(105,209,'fast','[208,\"\",[209,\"L23\"]]',5120,'117 184 114 216 241 214 121 042','117 184 114 216 241 214 121 042','117 184 114 216 241 214 172 264',''), -(106,211,'medium','[210,\"\"]',5120,'174 113 060 047','174 113 060 047','174 113 060 047 309',''), -(107,213,'poly','[212,\"\"]',5120,'229','229','229',''), -(108,214,'slow','[213,\"\"]',6400,'105 116 174','105 116 174','105 116 174 205',''), -(109,215,'poly','[214,\"\"]',5120,'067 179 192 114 043','067 179 192 114 043','067 179 192 114 043 305 251',''), -(110,216,'medium','[215,\"\",[216,\"L30\"]]',5120,'241 035 068 115 067','241 035 068 115 067 231','241 035 068 067 231 312 280 213',''), -(111,218,'medium','[217,\"\",[218,\"L38\"]]',5120,'150','150','150 256',''), -(112,220,'slow','[219,\"\",[220,\"L33\"]]',5120,'035 043 033 156 245','035 043 033 156 245','035 043 033 156 245 340 332 037',''), -(113,222,'fast','[221,\"\"]',5120,'156 218 102 053 132','156 218 102 053 132','156 102 053 132 111 274 108 332',''), -(114,223,'medium','[222,\"\",[223,\"L25\"]]',5120,'061 189 047 113 102','061 189 047 113 102','061 189 047 113 102 085 349',''), -(115,225,'fast','[224,\"\"]',5120,'061 097 247 149 228','061 097 247 149 228','061 097 247 149 228 300',''), -(116,226,'slow','[225,\"\"]',6400,'238 055 113 028','238 055 113 028','238 055 113 028 299 156','Wave Incense'), -(117,227,'slow','[226,\"\"]',6400,'064 227 017','064 227 017 142','064 227 017 142 173',''), -(118,228,'slow','[227,\"\",[228,\"L24\"]]',5120,'082 098 227 067 179 178 250','082 098 227 067 179 178 250','082 098 227 067 179 178 250 260',''), -(119,231,'medium','[230,\"\",[231,\"L25\"]]',5120,'115 033 245','115 033 245 054','115 033 245 172 067 089',''), -(120,234,'slow','[233,\"\"]',5120,'114 179 049 112 043','114 179 049 112 043','179 049 043 206 243 325',''), -(121,235,'fast','[234,\"\"]',5120,NULL,NULL,NULL,''), -(122,241,'slow','[240,\"\"]',5120,'216 178 068','216 178 068','216 178 068 202 243 173 269 213',''), -(123,243,'slow','[242,\"\"]',20480,NULL,NULL,NULL,''), -(124,244,'slow','[243,\"\"]',20480,NULL,NULL,NULL,''), -(125,245,'slow','[244,\"\"]',20480,NULL,NULL,NULL,''), -(126,246,'slow','[245,\"\",[246,\"L30\",[247,\"L55\"]]]',10240,'227 022 199 115 245','227 022 199 115 245','227 022 199 115 245 348 173',''), -(127,249,'slow','[248,\"\"]',30720,NULL,NULL,NULL,''), -(128,250,'slow','[249,\"\"]',30720,NULL,NULL,NULL,''), -(129,251,'poly','[250,\"\"]',30720,NULL,NULL,NULL,''), -(130,252,'poly','[251,\"\",[252,\"L16\",[253,\"L36\"]]]',5120,NULL,NULL,'241 299 282 072 224 305',''), -(131,255,'poly','[254,\"\",[255,\"L16\",[256,\"L36\"]]]',5120,NULL,NULL,'067 178 202 206 156 264',''), -(132,258,'poly','[257,\"\",[258,\"L16\",[259,\"L36\"]]]',5120,NULL,NULL,'286 252 173 022 300 242',''), -(133,261,'medium','[260,\"\",[261,\"L20\"]]',3840,NULL,NULL,'309 304 342 042 280',''), -(134,263,'medium','[262,\"\",[263,\"L20\"]]',3840,NULL,NULL,'203 227 163 320 270',''), -(135,265,'medium','[264,\"\",[265,\"L7\",[266,\"L10\"]],[267,\"L7\",[268,\"L10\"]]]',3840,NULL,NULL,NULL,''), -(136,270,'poly','[269,\"\",[270,\"L14\",[271,\"W\"]]]',3840,NULL,NULL,'234 074 229 072 174 054',''), -(137,273,'poly','[272,\"\",[273,\"L16\",[274,\"P\"]]]',3840,NULL,NULL,'072 132 097 012 035 205',''), -(138,276,'poly','[275,\"\",[276,\"L22\"]]',3840,NULL,NULL,'227 047 286 118 098 142',''), -(139,278,'medium','[277,\"\",[278,\"L25\"]]',5120,NULL,NULL,'053 238 096 015 345',''), -(140,280,'slow','[279,\"\",[280,\"L20\",[281,\"L30\"]]]',5120,NULL,NULL,'049 260 211 261 193',''), -(141,283,'medium','[282,\"\",[283,\"L22\"]]',3840,NULL,NULL,'192 340 059 055 169',''), -(142,285,'superslow','[284,\"\",[285,\"L23\"]]',3840,NULL,NULL,'312 206 203 205 269',''), -(143,287,'slow','[286,\"\",[287,\"L18\",[288,\"L36\"]]]',3840,NULL,NULL,'227 162 033 172 305 173 213',''), -(144,290,'superfast','[289,\"\",[290,\"L20\"],[291,\"E290\"]]',3840,NULL,NULL,'202 184 015 317',''), -(145,293,'poly','[292,\"\",[293,\"L20\",[294,\"L40\"]]]',5120,NULL,NULL,'035 172 206 325 264',''), -(146,296,'superslow','[295,\"\",[296,\"L24\"]]',5120,NULL,NULL,'184 196 192 269 237 278 222 067',''), -(147,299,'medium','[298,\"\"]',5120,NULL,NULL,'221 204 152',''), -(148,300,'fast','[299,\"\",[300,\"M\"]]',3840,NULL,NULL,'269 243 252 312 272 225 163 320',''), -(149,302,'poly','[301,\"\"]',6400,NULL,NULL,'243 104 235',''), -(150,303,'fast','[302,\"\"]',5120,NULL,NULL,'013 205 304 243 245 320',''), -(151,304,'slow','[303,\"\",[304,\"L32\",[305,\"L42\"]]]',8960,NULL,NULL,'282 033 022 264',''), -(152,307,'medium','[306,\"\",[307,\"L37\"]]',5120,NULL,NULL,'006 008 007 192 251 225 222',''), -(153,309,'slow','[308,\"\",[309,\"L26\"]]',5120,NULL,NULL,'241 028 252 173 128',''), -(154,311,'medium','[310,\"\"]',5120,NULL,NULL,'163 272',''), -(155,312,'medium','[311,\"\"]',5120,NULL,NULL,'163 272',''), -(156,313,'superfast','[312,\"\"]',3840,NULL,NULL,'225 317 270',''), -(157,314,'superslow','[313,\"\"]',3840,NULL,NULL,'225 317 073',''), -(158,315,'poly','[314,\"\"]',5120,NULL,NULL,'190 234 041 177','Rose Incense'), -(159,316,'superslow','[315,\"\",[316,\"L26\"]]',5120,NULL,NULL,'137 150 122 219',''), -(160,318,'slow','[317,\"\",[318,\"L30\"]]',5120,NULL,NULL,'055 037 036',''), -(161,320,'superslow','[319,\"\",[320,\"L40\"]]',10240,NULL,NULL,'037 036 206 172 213 173 089 320',''), -(162,322,'medium','[321,\"\",[322,\"L33\"]]',5120,NULL,NULL,'335 183 033 204 110 022',''), -(163,324,'medium','[323,\"\"]',5120,NULL,NULL,'283 202 213 280',''), -(164,325,'fast','[324,\"\",[325,\"L32\"]]',5120,NULL,NULL,'247 325 163 270',''), -(165,327,'fast','[326,\"\"]',3840,NULL,NULL,'226 156 273 049 225 272 270 264',''), -(166,328,'poly','[327,\"\",[328,\"L35\",[329,\"L45\"]]]',5120,NULL,NULL,'115 097 015',''), -(167,331,'poly','[330,\"\",[331,\"L32\"]]',5120,NULL,NULL,'319 050 297 222 067',''), -(168,333,'superfast','[332,\"\",[333,\"L35\"]]',5120,NULL,NULL,'096 113 227 098',''), -(169,335,'superfast','[334,\"\"]',5120,NULL,NULL,'174 023 012 067 045 173',''), -(170,336,'superslow','[335,\"\"]',5120,NULL,NULL,'253 255 254 033',''), -(171,337,'fast','[336,\"\"]',6400,NULL,NULL,NULL,''), -(172,338,'fast','[337,\"\"]',6400,NULL,NULL,NULL,''), -(173,339,'medium','[338,\"\",[339,\"L30\"]]',5120,NULL,NULL,'036 249 208',''), -(174,341,'superslow','[340,\"\",[341,\"L30\"]]',3840,NULL,NULL,'299 282 033 245',''), -(175,343,'medium','[342,\"\",[343,\"L36\"]]',5120,NULL,NULL,NULL,''), -(176,345,'superfast','[344,\"\",[345,\"L40\"]]',7680,NULL,NULL,'111 104 242 156',''), -(177,347,'superfast','[346,\"\",[347,\"L40\"]]',7680,NULL,NULL,'228 281 013 156',''), -(178,349,'superfast','[348,\"\",[349,\"B\"]]',5120,NULL,NULL,'242 224 299 094 112 108',''), -(179,351,'medium','[350,\"\"]',6400,NULL,NULL,'247 243',''), -(180,352,'poly','[351,\"\"]',5120,NULL,NULL,'049 276 270',''), -(181,353,'fast','[352,\"\",[353,\"L37\"]]',6400,NULL,NULL,'049 193 192 309 285',''), -(182,355,'fast','[354,\"\",[355,\"L37\"]]',6400,NULL,NULL,'285 193 219 287 261 184',''), -(183,357,'slow','[356,\"\"]',6400,NULL,NULL,'028 020 012 072 266',''), -(184,358,'fast','[357,\"\"]',6400,NULL,NULL,'049 173 094 137','Pure Incense'), -(185,359,'poly','[358,\"\"]',6400,NULL,NULL,'225 184 037 276 173 163',''), -(186,361,'medium','[360,\"\",[361,\"L42\"]]',5120,NULL,NULL,'334 190',''), -(187,363,'poly','[362,\"\",[363,\"L32\",[364,\"L44\"]]]',5120,NULL,NULL,'345 253 255 254 280 156 173 089',''), -(188,366,'superfast','[365,\"\",[366,\"IDeepseatooth\"],[367,\"IDeepseascale\"]]',5120,NULL,NULL,'286 299 033 047 111 108',''), -(189,369,'slow','[368,\"\"]',10240,NULL,NULL,'221 129 345 132 213 156',''), -(190,370,'fast','[369,\"\"]',5120,NULL,NULL,'149 047 345 299',''), -(191,371,'slow','[370,\"\",[371,\"L30\",[372,\"L50\"]]]',10240,NULL,NULL,'055 036 081 238 348 186',''), -(192,374,'slow','[373,\"\",[374,\"L20\",[375,\"L45\"]]]',10240,NULL,NULL,NULL,''), -(193,377,'slow','[376,\"\"]',20480,NULL,NULL,NULL,''), -(194,378,'slow','[377,\"\"]',20480,NULL,NULL,NULL,''), -(195,379,'slow','[378,\"\"]',20480,NULL,NULL,NULL,''), -(196,380,'slow','[379,\"\"]',30720,NULL,NULL,NULL,''), -(197,381,'slow','[380,\"\"]',30720,NULL,NULL,NULL,''), -(198,382,'slow','[381,\"\"]',30720,NULL,NULL,NULL,''), -(199,383,'slow','[382,\"\"]',30720,NULL,NULL,NULL,''), -(200,384,'slow','[383,\"\"]',30720,NULL,NULL,NULL,''), -(201,385,'slow','[384,\"\"]',30720,NULL,NULL,NULL,''), -(202,386,'slow','[385,\"\"]',30720,NULL,NULL,NULL,''), -(0,0,NULL,'',0,NULL,NULL,NULL,''), -(203,387,'poly','',5120,'','','',''), -(204,390,'poly','',5120,'','','',''), -(205,393,'poly','',5120,'','','',''), -(206,396,'poly','',3840,'','','',''), -(207,399,'medium','',3840,'','','',''), -(208,401,'poly','',3840,'','','',''), -(209,403,'poly','',5120,'','','',''), -(211,408,'superfast','',7680,'','','',''), -(212,410,'superfast','',7680,'','','',''), -(213,412,'medium','',3840,'','','',''), -(214,415,'poly','',3840,'','','',''), -(215,417,'medium','',2560,'','','',''), -(216,418,'medium','',5120,'','','',''), -(217,420,'medium','',5120,'','','',''), -(218,422,'medium','',5120,'','','',''), -(219,425,'superslow','',7680,'','','',''), -(220,427,'medium','',5120,'','','',''), -(221,431,'fast','',5120,'','','',''), -(223,434,'medium','',5120,'','','',''), -(224,436,'medium','',5120,'','','',''), -(228,441,'poly','',5120,'','','',''), -(229,442,'medium','',7680,'','','',''), -(230,443,'slow','',10240,'','','',''), -(232,447,'poly','',6400,'','','',''), -(233,449,'slow','',7680,'','','',''), -(234,451,'slow','',5120,'','','',''), -(235,453,'medium','',2560,'','','',''), -(236,455,'slow','',6400,'','','',''), -(237,456,'superfast','',5120,'','','',''), -(239,459,'slow','',5120,'','','',''), -(240,479,'medium','',5120,'','','',''), -(241,480,'slow','',20480,'','','',''), -(242,481,'slow','',20480,'','','',''), -(243,482,'slow','',20480,'','','',''), -(244,483,'slow','',30720,'','','',''), -(245,484,'slow','',30720,'','','',''), -(246,485,'slow','',2560,'','','',''), -(247,486,'slow','',30720,'','','',''), -(248,487,'slow','',30720,'','','',''), -(249,488,'slow','',30720,'','','',''), -(250,490,'slow','',10240,'','','',''), -(251,490,'slow','',2560,'','','',''), -(252,491,'slow','',30720,'','','',''), -(253,492,'poly','',30720,'','','',''), -(254,493,'slow','',30720,'','','',''); -/*!40000 ALTER TABLE evchains ENABLE KEYS */; +LOCK TABLES evo_chains WRITE; +/*!40000 ALTER TABLE evo_chains DISABLE KEYS */; +INSERT INTO evo_chains VALUES (1,'poly',5120,''), +(2,'poly',5120,''), +(3,'poly',5120,''), +(4,'medium',3840,''), +(5,'medium',3840,''), +(6,'poly',3840,''), +(7,'medium',3840,''), +(8,'medium',3840,''), +(9,'medium',5120,''), +(10,'medium',2560,''), +(11,'medium',5120,''), +(12,'poly',5120,''), +(13,'poly',5120,''), +(14,'fast',2560,''), +(15,'medium',5120,''), +(16,'fast',2560,''), +(17,'medium',3840,''), +(18,'poly',5120,''), +(19,'medium',5120,''), +(20,'medium',5120,''), +(21,'medium',5120,''), +(22,'medium',5120,''), +(23,'medium',5120,''), +(24,'medium',5120,''), +(25,'slow',5120,''), +(26,'poly',5120,''), +(27,'poly',5120,''), +(28,'poly',5120,''), +(29,'poly',5120,''), +(30,'slow',5120,''), +(31,'poly',3840,''), +(32,'medium',5120,''), +(33,'medium',5120,''), +(34,'medium',5120,''), +(35,'medium',5120,''), +(36,'medium',5120,''), +(37,'medium',5120,''), +(38,'medium',5120,''), +(39,'slow',5120,''), +(40,'poly',5120,''), +(41,'medium',6400,''), +(42,'medium',5120,''), +(43,'medium',5120,''), +(44,'medium',5120,''), +(45,'slow',5120,''), +(46,'medium',5120,''), +(47,'medium',6400,''), +(48,'medium',5120,''), +(49,'medium',5120,''), +(50,'slow',5120,''), +(51,'fast',10240,'Luck Incense'), +(52,'medium',5120,''), +(53,'medium',5120,''), +(54,'medium',5120,''), +(55,'medium',5120,''), +(56,'slow',5120,''), +(57,'medium',6400,'Odd Incense'), +(58,'medium',6400,''), +(59,'medium',6400,''), +(60,'medium',6400,''), +(61,'medium',6400,''), +(62,'slow',6400,''), +(63,'slow',5120,''), +(64,'slow',1280,''), +(65,'slow',10240,''), +(66,'medium',5120,''), +(67,'medium',8960,''), +(68,'medium',5120,''), +(69,'medium',7680,''), +(70,'medium',7680,''), +(71,'slow',8960,''), +(72,'slow',10240,'Full Incense'), +(73,'slow',20480,''), +(74,'slow',20480,''), +(75,'slow',20480,''), +(76,'slow',10240,''), +(77,'slow',30720,''), +(78,'poly',30720,''), +(79,'poly',5120,''), +(80,'poly',5120,''), +(81,'poly',5120,''), +(82,'medium',3840,''), +(83,'medium',3840,''), +(84,'fast',3840,''), +(85,'fast',3840,''), +(86,'slow',5120,''), +(87,'fast',2560,''), +(88,'medium',5120,''), +(89,'poly',5120,''), +(90,'fast',2560,'Sea Incense'), +(91,'medium',5120,'Rock Incense'), +(92,'poly',5120,''), +(93,'fast',5120,''), +(94,'poly',5120,''), +(95,'medium',5120,''), +(96,'medium',5120,''), +(97,'poly',5120,''), +(98,'fast',6400,''), +(99,'medium',10240,''), +(100,'medium',5120,'Lax Incense'), +(101,'medium',5120,''), +(102,'medium',5120,''), +(103,'medium',5120,''), +(104,'poly',5120,''), +(105,'fast',5120,''), +(106,'medium',5120,''), +(107,'poly',5120,''), +(108,'slow',6400,''), +(109,'poly',5120,''), +(110,'medium',5120,''), +(111,'medium',5120,''), +(112,'slow',5120,''), +(113,'fast',5120,''), +(114,'medium',5120,''), +(115,'fast',5120,''), +(116,'slow',6400,'Wave Incense'), +(117,'slow',6400,''), +(118,'slow',5120,''), +(119,'medium',5120,''), +(120,'slow',5120,''), +(121,'fast',5120,''), +(122,'slow',5120,''), +(123,'slow',20480,''), +(124,'slow',20480,''), +(125,'slow',20480,''), +(126,'slow',10240,''), +(127,'slow',30720,''), +(128,'slow',30720,''), +(129,'poly',30720,''), +(130,'poly',5120,''), +(131,'poly',5120,''), +(132,'poly',5120,''), +(133,'medium',3840,''), +(134,'medium',3840,''), +(135,'medium',3840,''), +(136,'poly',3840,''), +(137,'poly',3840,''), +(138,'poly',3840,''), +(139,'medium',5120,''), +(140,'slow',5120,''), +(141,'medium',3840,''), +(142,'superslow',3840,''), +(143,'slow',3840,''), +(144,'superfast',3840,''), +(145,'poly',5120,''), +(146,'superslow',5120,''), +(147,'medium',5120,''), +(148,'fast',3840,''), +(149,'poly',6400,''), +(150,'fast',5120,''), +(151,'slow',8960,''), +(152,'medium',5120,''), +(153,'slow',5120,''), +(154,'medium',5120,''), +(155,'medium',5120,''), +(156,'superfast',3840,''), +(157,'superslow',3840,''), +(158,'poly',5120,'Rose Incense'), +(159,'superslow',5120,''), +(160,'slow',5120,''), +(161,'superslow',10240,''), +(162,'medium',5120,''), +(163,'medium',5120,''), +(164,'fast',5120,''), +(165,'fast',3840,''), +(166,'poly',5120,''), +(167,'poly',5120,''), +(168,'superfast',5120,''), +(169,'superfast',5120,''), +(170,'superslow',5120,''), +(171,'fast',6400,''), +(172,'fast',6400,''), +(173,'medium',5120,''), +(174,'superslow',3840,''), +(175,'medium',5120,''), +(176,'superfast',7680,''), +(177,'superfast',7680,''), +(178,'superfast',5120,''), +(179,'medium',6400,''), +(180,'poly',5120,''), +(181,'fast',6400,''), +(182,'fast',6400,''), +(183,'slow',6400,''), +(184,'fast',6400,'Pure Incense'), +(185,'poly',6400,''), +(186,'medium',5120,''), +(187,'poly',5120,''), +(188,'superfast',5120,''), +(189,'slow',10240,''), +(190,'fast',5120,''), +(191,'slow',10240,''), +(192,'slow',10240,''), +(193,'slow',20480,''), +(194,'slow',20480,''), +(195,'slow',20480,''), +(196,'slow',30720,''), +(197,'slow',30720,''), +(198,'slow',30720,''), +(199,'slow',30720,''), +(200,'slow',30720,''), +(201,'slow',30720,''), +(202,'slow',30720,''), +(0,NULL,0,''), +(203,'poly',5120,''), +(204,'poly',5120,''), +(205,'poly',5120,''), +(206,'poly',3840,''), +(207,'medium',3840,''), +(208,'poly',3840,''), +(209,'poly',5120,''), +(211,'superfast',7680,''), +(212,'superfast',7680,''), +(213,'medium',3840,''), +(214,'poly',3840,''), +(215,'medium',2560,''), +(216,'medium',5120,''), +(217,'medium',5120,''), +(218,'medium',5120,''), +(219,'superslow',7680,''), +(220,'medium',5120,''), +(221,'fast',5120,''), +(223,'medium',5120,''), +(224,'medium',5120,''), +(228,'poly',5120,''), +(229,'medium',7680,''), +(230,'slow',10240,''), +(232,'poly',6400,''), +(233,'slow',7680,''), +(234,'slow',5120,''), +(235,'medium',2560,''), +(236,'slow',6400,''), +(237,'superfast',5120,''), +(239,'slow',5120,''), +(240,'medium',5120,''), +(241,'slow',20480,''), +(242,'slow',20480,''), +(243,'slow',20480,''), +(244,'slow',30720,''), +(245,'slow',30720,''), +(246,'slow',2560,''), +(247,'slow',30720,''), +(248,'slow',30720,''), +(249,'slow',30720,''), +(250,'slow',10240,''), +(251,'slow',2560,''), +(252,'slow',30720,''), +(253,'poly',30720,''), +(254,'slow',30720,''); +/*!40000 ALTER TABLE evo_chains ENABLE KEYS */; UNLOCK TABLES; -- --- Table structure for table `flavortext` +-- Table structure for table `flavor_text` -- -DROP TABLE IF EXISTS flavortext; -CREATE TABLE flavortext ( - pokeid smallint(5) unsigned NOT NULL default '0', +DROP TABLE IF EXISTS flavor_text; +CREATE TABLE flavor_text ( + pokemon_id smallint(5) unsigned NOT NULL default '0', generation enum('rb','y','g','s','c','ru','sa','e','fr','lg','d','p') NOT NULL default 'rb', `text` tinytext NOT NULL, - PRIMARY KEY (pokeid,generation) + PRIMARY KEY USING BTREE (pokemon_id,generation) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- --- Dumping data for table `flavortext` +-- Dumping data for table `flavor_text` -- -LOCK TABLES flavortext WRITE; -/*!40000 ALTER TABLE flavortext DISABLE KEYS */; -INSERT INTO flavortext VALUES (1,'rb','A strange seed was planted in its back at birth. The plant sprouts and grows with this Pokemon.'), +LOCK TABLES flavor_text WRITE; +/*!40000 ALTER TABLE flavor_text DISABLE KEYS */; +INSERT INTO flavor_text VALUES (1,'rb','A strange seed was planted in its back at birth. The plant sprouts and grows with this Pokemon.'), (1,'y','It can go for days without eating a single morsel. In the bulb on its back, it stores energy.'), (1,'g','The seed on its back is filled with nutrients. The seed grows steadily larger as its body grows.'), @@ -4085,5 +4080,5 @@ (492,'p','It can dissolve toxins in the air to instantly transform ruined land into a lush field of flowers.'), (493,'p','It is told in mythology that this Pokémon was born before the universe even existed.'); -/*!40000 ALTER TABLE flavortext ENABLE KEYS */; +/*!40000 ALTER TABLE flavor_text ENABLE KEYS */; UNLOCK TABLES; @@ -4130,8 +4125,8 @@ happiness3 tinyint(4) NOT NULL, is_underground tinyint(1) NOT NULL, - dpblurb varchar(128) NOT NULL, + blurb_dp varchar(128) NOT NULL, description text NOT NULL, PRIMARY KEY (id) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; -- @@ -11532,5 +11527,5 @@ generation tinyint(3) unsigned NOT NULL default '0', cost smallint(3) unsigned NOT NULL default '0', - moveid smallint(5) unsigned NOT NULL default '0', + move_id smallint(5) unsigned NOT NULL default '0', location tinytext NOT NULL, PRIMARY KEY (id,generation) @@ -11829,5 +11824,5 @@ power tinyint(3) unsigned default NULL, pp tinyint(2) NOT NULL default '0', - acc tinyint(3) unsigned NOT NULL default '0', + accuracy tinyint(3) unsigned NOT NULL default '0', target enum('all','allies','ally','enemies','enemy','enemyfield','lastenemy','others','randenemy','unknown1','unknown2','user') NOT NULL, class enum('physical','special','none') NOT NULL, @@ -11839,10 +11834,10 @@ `status` varchar(25) default NULL, move_effect_id int(10) unsigned NOT NULL, - gameblurb tinytext NOT NULL, - dpblurb tinytext character set utf8 NOT NULL, - contype enum('cute','tough','smart','cool','beauty') NOT NULL default 'cute', - coneffect tinyint(4) NOT NULL default '0', + blurb_rusa tinytext NOT NULL, + blurb_dp tinytext character set utf8 NOT NULL, + contest_type enum('cute','tough','smart','cool','beauty') NOT NULL default 'cute', + contest_effect_id tinyint(4) NOT NULL default '0', notes text, - newflags char(13) default NULL, + XXX_new_flags char(13) default NULL, PRIMARY KEY (id) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; @@ -12343,5 +12338,5 @@ id int(10) unsigned NOT NULL, priority tinyint(4) NOT NULL, - blurb varchar(128) NOT NULL, + short_description varchar(128) NOT NULL, description text NOT NULL, PRIMARY KEY (id) @@ -12628,8 +12623,8 @@ name_jp tinyblob NOT NULL, name_romaji varchar(16) NOT NULL default '', - evid smallint(3) unsigned NOT NULL default '0', - evparent smallint(3) NOT NULL, - evmethod enum('level','levelmale','levelfemale','levelarea','trade','item','itemmale','itemfemale','holdday','holdnight','move','happiness','happinessday','happinessnight','beauty','divineintervention','level+attack','level+defense','level+equal','dnadigivolve','none') default NULL, - evparam varchar(32) NOT NULL, + evo_chain_id smallint(3) unsigned NOT NULL default '0', + evo_parent_id smallint(3) NOT NULL, + evo_method enum('level','levelmale','levelfemale','levelarea','trade','item','itemmale','itemfemale','holdday','holdnight','move','happiness','happinessday','happinessnight','beauty','divineintervention','level+attack','level+defense','level+equal','dnadigivolve','none') default NULL, + evo_param varchar(32) NOT NULL, height tinyint(3) unsigned NOT NULL default '0', weight smallint(5) unsigned NOT NULL default '0', @@ -12646,15 +12641,12 @@ stat_hp tinyint(3) unsigned NOT NULL default '0', effort varchar(6) NOT NULL default '', - oldgs tinyint(3) unsigned default NULL, - caprate tinyint(3) unsigned NOT NULL default '0', - baseexp tinyint(3) unsigned NOT NULL default '0', - gender tinyint(3) unsigned NOT NULL default '0', - happiness tinyint(3) unsigned NOT NULL, - root tinytext NOT NULL, - eventred tinytext, - eventblue tinytext, + gameshark_rby tinyint(3) unsigned default NULL, + capture_rate tinyint(3) unsigned NOT NULL default '0', + base_exp tinyint(3) unsigned NOT NULL default '0', + gender_rate tinyint(3) unsigned NOT NULL default '0', + base_happiness tinyint(3) unsigned NOT NULL, notes text, flags set('baby','dpfem','dpfemback') NOT NULL default '', - real_id int(10) unsigned NOT NULL, + real_pokemon_id int(10) unsigned NOT NULL, PRIMARY KEY (id), KEY ATTACK (stat_at), @@ -12664,5 +12656,5 @@ KEY SPEED (stat_sp), KEY HP (stat_hp), - KEY REALID (real_id) + KEY REALID USING BTREE (real_pokemon_id) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; @@ -12673,504 +12665,504 @@ LOCK TABLES pokemon WRITE; /*!40000 ALTER TABLE pokemon DISABLE KEYS */; -INSERT INTO pokemon VALUES (1,226,0,0,'Bulbasaur','','フシギダネ','Fushigidane',1,0,NULL,'',7,69,'grass','poison','Seed','green','grassland',49,49,65,65,45,45,'000100',153,45,64,31,70,'BULB + SAUR','Select from the Professor Oak\'s offer of Bulbasaur, Charmander, and Squirtle at the beginning of the game.','Select from the Professor Oak\'s offer of Bulbasaur, Charmander, and Squirtle at the beginning of the game.',NULL,'',1), -(2,227,0,0,'Ivysaur','','フシギ゜り','Fushigisou',1,1,'level','16',10,130,'grass','poison','Seed','green','grassland',62,63,80,80,60,60,'000110',9,45,141,31,70,'IVY + SAUR',NULL,NULL,NULL,'',2), -(3,228,0,0,'Venusaur','','フシギバナ','Fushigibana',1,2,'level','32',20,1000,'grass','poison','Seed','green','grassland',82,83,100,100,80,80,'000210',154,45,208,31,70,'VENUS + SAUR',NULL,NULL,NULL,'dpfem,dpfemback',3), -(4,229,0,0,'Charmander','','ヒトカゲ','Hitokage',2,0,NULL,'',6,85,'fire',NULL,'Lizard','red','mountain',52,43,60,50,65,39,'000001',176,45,65,31,70,'CHAR + SALAMANDER','Select from the Professor Oak\'s offer of Bulbasaur, Charmander, and Squirtle at the beginning of the game.','Select from the Professor Oak\'s offer of Bulbasaur, Charmander, and Squirtle at the beginning of the game.',NULL,'',4), -(5,230,0,0,'Charmeleon','','リザヌド','Rizaado',2,4,'level','16',11,190,'fire',NULL,'Flame','red','mountain',64,58,80,65,80,58,'000101',178,45,142,31,70,'CHAR + CHAMELEON',NULL,NULL,NULL,'',5), -(6,231,0,0,'Charizard','','リザヌドン','Rizaadon',2,5,'level','36',17,905,'fire','flying','Flame','red','mountain',84,78,109,85,100,78,'000300',180,45,209,31,70,'CHAR + LIZARD',NULL,NULL,NULL,'',6), -(7,232,0,0,'Squirtle','','れニガメ','Zenigame',3,0,NULL,'',5,90,'water',NULL,'Tiny Turtle','blue','water\'s edge',48,65,50,64,43,44,'001000',177,45,66,31,70,'SQUIRT + TURTLE','Select from the Professor Oak\'s offer of Bulbasaur, Charmander, and Squirtle at the beginning of the game.','Select from the Professor Oak\'s offer of Bulbasaur, Charmander, and Squirtle at the beginning of the game.',NULL,'',7), -(8,233,0,0,'Wartortle','','カメヌル','Kameeru',3,7,'level','16',10,225,'water',NULL,'Turtle','blue','water\'s edge',63,80,65,80,58,59,'001010',179,45,143,31,70,'WAR + TORTOISE + TURTLE',NULL,NULL,NULL,'',8), -(9,234,0,0,'Blastoise','','カメックス','Kamekkusu',3,8,'level','36',16,855,'water',NULL,'Shellfish','blue','water\'s edge',83,100,85,105,78,79,'000030',28,45,210,31,70,'BLAST + TORTOISE',NULL,NULL,NULL,'',9), -(10,24,0,0,'Caterpie','','キャタピヌ','Kyatapii',4,0,NULL,'',3,29,'bug',NULL,'Worm','green','forest',30,35,20,20,45,45,'100000',123,255,53,127,70,'variation of CATERPILLAR',NULL,NULL,NULL,'',10), -(11,25,0,0,'Metapod','','トランセル','Toranseru',4,10,'level','7',7,99,'bug',NULL,'Cocoon','green','forest',20,55,25,25,30,50,'002000',124,120,72,127,70,'METAMORPHOSIS + POD',NULL,NULL,NULL,'',11), -(12,26,0,0,'Butterfree','','バタフリヌ','Batafurii',4,11,'level','10',11,320,'bug','flying','Butterfly','white','forest',45,50,80,80,70,60,'000210',125,45,160,127,70,'BUTTERFLY + FREE',NULL,NULL,NULL,'dpfem,dpfemback',12), -(13,27,0,0,'Weedle','','ビヌドル','Biidoru',5,0,NULL,'',3,32,'bug','poison','Hairy Bug','brown','forest',35,30,20,20,50,40,'000001',112,255,52,127,70,'WEE + NEEDLE',NULL,NULL,NULL,'',13), -(14,28,0,0,'Kakuna','','コクヌン','Kokuun',5,13,'level','7',6,100,'bug','poison','Cocoon','yellow','forest',25,50,25,25,35,45,'002000',113,120,71,127,70,'variation of COCOON',NULL,NULL,NULL,'',14), -(15,29,0,0,'Beedrill','','スピアヌ','Supiaa',5,14,'level','10',10,295,'bug','poison','Poison Bee','yellow','forest',80,40,45,80,75,65,'020010',114,45,159,127,70,'BEE + DRILL',NULL,NULL,NULL,'',15), -(16,10,0,0,'Pidgey','','ポッポ','Poppo',6,0,NULL,'',3,18,'normal','flying','Tiny Bird','brown','forest',45,40,35,35,56,40,'000001',36,255,55,127,70,'variation of PIDGEON',NULL,NULL,NULL,'',16), -(17,11,0,0,'Pidgeotto','','ピゞョン','Pijon',6,16,'level','18',11,300,'normal','flying','Bird','brown','forest',60,55,50,50,71,63,'000002',150,120,113,127,70,'variation of PIDGEON',NULL,NULL,NULL,'',17), -(18,12,0,0,'Pidgeot','','ピゞョット','Pijotto',6,17,'level','36',15,395,'normal','flying','Bird','brown','forest',80,75,70,70,91,83,'000003',151,45,172,127,70,'variation of PIDGEON',NULL,NULL,NULL,'',18), -(19,17,0,0,'Rattata','','コラッタ','Koratta',7,0,NULL,'',3,35,'normal',NULL,'Mouse','purple','grassland',56,35,25,35,72,30,'000001',165,255,57,127,70,'RAT + RAT-A-TAT-TAT (sound of a machinegun)',NULL,NULL,NULL,'dpfem,dpfemback',19), -(20,18,0,0,'Raticate','','ラッタ','Ratta',7,19,'level','20',7,185,'normal',NULL,'Mouse','brown','grassland',81,60,50,70,97,55,'000002',166,127,116,127,70,'RAT + ERADICATE',NULL,NULL,NULL,'dpfem,dpfemback',20), -(21,13,0,0,'Spearow','','オニスズメ','Onisuzume',8,0,NULL,'',3,20,'normal','flying','Tiny Bird','brown','rough terrain',60,30,31,31,70,40,'000001',5,255,58,127,70,'SPEAR + SPARROW',NULL,NULL,NULL,'',21), -(22,14,0,0,'Fearow','','オニドリル','Onidoriru',8,21,'level','20',12,380,'normal','flying','Beak','brown','rough terrain',90,65,61,61,100,65,'000002',35,90,162,127,70,'FEAR + SPARROW',NULL,NULL,NULL,'',22), -(23,50,0,0,'Ekans','','アヌボ','Aabo',9,0,NULL,'',20,69,'poison',NULL,'Snake','purple','grassland',60,44,40,54,55,35,'010000',108,255,62,127,70,'reversal of SNAKE',NULL,NULL,NULL,'',23), -(24,51,0,0,'Arbok','','アヌボック','Aabokku',9,23,'level','22',35,650,'poison',NULL,'Cobra','purple','grassland',85,69,65,79,80,60,'020000',45,90,147,127,70,'variation/reversal of COBRA',NULL,NULL,NULL,'',24), -(25,22,156,104,'Pikachu','','ピカチュり','Pikachuu',10,172,'happiness','',4,60,'electric',NULL,'Mouse','yellow','forest',55,30,50,40,90,35,'000002',84,190,82,127,70,'PIKA (a type of rodent) + CHU (Japanese: mouse noise)',NULL,NULL,NULL,'dpfem,dpfemback',25), -(26,23,157,105,'Raichu','','ラむチュり','Raichuu',10,25,'item','Thunderstone',8,300,'electric',NULL,'Mouse','yellow','forest',90,55,90,80,100,60,'000003',85,75,122,127,70,'RAIKOU (Japanese: lightning) + CHU (Japanese: mouse noise)',NULL,NULL,NULL,'dpfem',26), -(27,48,112,0,'Sandshrew','','サンド','Sando',11,0,NULL,'',6,120,'ground',NULL,'Mouse','yellow','rough terrain',75,85,20,30,40,50,'001000',96,255,93,127,70,'SAND + SHREW (a type of rodent)',NULL,NULL,'Before D/P: Took 6400 steps to hatch.','',27), -(28,49,113,0,'Sandslash','','サンドパン','Sandopan',11,27,'level','22',10,295,'ground',NULL,'Mouse','yellow','rough terrain',100,110,45,55,65,75,'002000',97,90,163,127,70,'SAND + SLASH',NULL,NULL,'Before D/P: Took 6400 steps to hatch.','',28), -(29,95,0,0,'Nidoran F','','ニドラン♀','Nidoran F',12,0,NULL,'',4,70,'poison',NULL,'Poison Pin','blue','grassland',47,52,40,40,41,55,'100000',15,235,59,254,70,'variation of NEEDLE + RAT NUTRIA (a very large rodent)',NULL,NULL,NULL,'',29), -(30,96,0,0,'Nidorina','','ニドリヌナ','Nidoriina',12,29,'level','16',8,200,'poison',NULL,'Poison Pin','blue','grassland',62,67,55,55,56,70,'200000',168,120,117,254,70,'variation of NEEDLE + RHINO','Buy in Celadon City Coin Exchange for 1200 coins.',NULL,NULL,'',30), -(31,97,0,0,'Nidoqueen','','ニドクむン','Nidokuin',12,30,'item','Moon Stone',13,600,'poison','ground','Drill','blue','grassland',82,87,75,85,76,90,'300000',16,45,194,254,70,'variation of NEEDLE + QUEEN',NULL,NULL,NULL,'',31), -(32,98,0,0,'Nidoran M','','ニドラン♂','Nidoran M',13,0,NULL,'',5,90,'poison',NULL,'Poison Pin','purple','grassland',57,40,40,40,50,46,'010000',3,235,60,0,70,'variation of NEEDLE + RAT NUTRIA (a very large rodent)',NULL,NULL,NULL,'',32), -(33,99,0,0,'Nidorino','','ニドリヌノ','Nidoriino',13,32,'level','16',9,195,'poison',NULL,'Poison Pin','purple','grassland',72,57,55,55,65,61,'020000',167,120,118,0,70,'variation of NEEDLE + RHINO',NULL,'Buy in Celadon City Coin Exchange for 1200 coins.',NULL,'',33), -(34,100,0,0,'Nidoking','','ニドキング','Nidokingu',13,33,'item','Moon Stone',14,620,'poison','ground','Drill','purple','grassland',92,77,85,75,85,81,'030000',7,45,195,0,70,'variation of NEEDLE + KING',NULL,NULL,NULL,'',34), -(35,41,0,100,'Clefairy','','ピッピ','Pippi',14,173,'happiness','',6,75,'normal',NULL,'Fairy','pink','mountain',45,48,60,65,35,70,'200000',4,150,68,191,140,'CLEF (a musical term) + FAIRY','Buy in Celadon City Coin Exchange for 500 coins.','Buy in Celadon City Coin Exchange for 750 coins.',NULL,'',35), -(36,42,0,101,'Clefable','','ピクシヌ','Pikushii',14,35,'item','Moon Stone',13,400,'normal',NULL,'Fairy','pink','mountain',70,73,85,90,60,95,'300000',142,25,129,191,140,'CLEF (a musical term) + FABLE',NULL,NULL,NULL,'',36), -(37,125,153,0,'Vulpix','','ロコン','Rokon',15,0,NULL,'',6,99,'fire',NULL,'Fox','brown','grassland',41,40,50,65,65,38,'000001',82,190,63,191,70,'VULPIS (Latin: fox) + SIX',NULL,NULL,NULL,'',37), -(38,126,154,0,'Ninetales','','キュりコン','Kyuukon',15,37,'item','Fire Stone',11,199,'fire',NULL,'Fox','yellow','grassland',76,75,81,100,100,73,'000011',83,75,178,191,70,'NINE + variation of TAILS',NULL,NULL,NULL,'',38), -(39,44,138,0,'Jigglypuff','','プリン','Purin',16,174,'happiness','',5,55,'normal',NULL,'Balloon','pink','grassland',45,20,45,25,20,115,'200000',100,170,76,191,70,'JIGGLE + PUFF',NULL,NULL,NULL,'',39), -(40,45,139,0,'Wigglytuff','','プクリン','Pukurin',16,39,'item','Moon Stone',10,120,'normal',NULL,'Balloon','pink','grassland',70,45,75,50,45,140,'300000',101,50,109,191,70,'WIGGLE + variation of TOUGH',NULL,NULL,NULL,'',40), -(41,37,63,28,'Zubat','','ズバット','Zubatto',17,0,NULL,'',8,75,'poison','flying','Bat','purple','cave',45,35,30,40,55,40,'000001',107,255,54,127,70,'variation of BAT',NULL,NULL,NULL,'dpfem,dpfemback',41), -(42,38,64,29,'Golbat','','ゎルバット','Gorubatto',17,41,'level','22',16,550,'poison','flying','Bat','purple','cave',80,70,65,75,90,75,'000002',130,90,171,127,70,'variation of BAT',NULL,NULL,NULL,'dpfem,dpfemback',42), -(43,83,88,0,'Oddish','','ナゟノクサ','Nazonokusa',18,0,NULL,'',5,54,'grass','poison','Weed','blue','grassland',50,55,75,65,30,45,'000100',185,255,78,127,70,'ODD + RADISH',NULL,NULL,NULL,'',43), -(44,84,89,0,'Gloom','','クサむハナ','Kusaihana',18,43,'level','21',8,86,'grass','poison','Weed','blue','grassland',65,70,85,75,40,60,'000200',186,120,132,127,70,'GLOOM',NULL,NULL,NULL,'dpfem,dpfemback',44), -(45,85,90,0,'Vileplume','','ラフレシア','Rafureshia',18,44,'item','Leaf Stone',12,186,'grass','poison','Flower','red','grassland',80,85,100,90,50,75,'000300',187,45,184,127,70,'VILE + PLUME',NULL,NULL,NULL,'dpfem,dpfemback',45), -(46,70,0,0,'Paras','','パラス','Parasu',19,0,NULL,'',3,54,'bug','grass','Mushroom','red','forest',70,55,45,55,25,35,'010000',109,190,70,127,70,'PARASITE',NULL,NULL,NULL,'',46), -(47,71,0,0,'Parasect','','パラセクト','Parasekuto',19,46,'level','24',10,295,'bug','grass','Mushroom','red','forest',95,80,60,80,30,60,'021000',46,75,128,127,70,'PARASITE + INSECT',NULL,NULL,NULL,'',47), -(48,108,0,0,'Venonat','','コンパン','Konpan',20,0,NULL,'',10,300,'bug','poison','Insect','purple','forest',55,50,40,55,45,60,'000010',65,190,75,127,70,'VENOM + GNAT',NULL,NULL,'Before D/P: Took 6400 steps to hatch.','',48), -(49,109,0,0,'Venomoth','','モルフォン','Morufon',20,48,'level','31',15,125,'bug','poison','Poison Moth','purple','forest',65,60,90,75,90,70,'000101',119,75,138,127,70,'VENOM + MOTH',NULL,NULL,'Before D/P: Took 6400 steps to hatch.','',49), -(50,132,0,0,'Diglett','','ディグダ','Diguda',21,0,NULL,'',2,8,'ground',NULL,'Mole','brown','cave',55,25,35,45,95,10,'000001',59,255,81,127,70,'DIG + -LET (small)',NULL,NULL,NULL,'',50), -(51,133,0,0,'Dugtrio','','ダグトリオ','Dagutorio',21,50,'level','26',7,333,'ground',NULL,'Mole','brown','cave',80,50,50,70,120,35,'000002',118,50,153,127,70,'DIG + TRIO',NULL,NULL,NULL,'',51), -(52,136,0,0,'Meowth','','ニャヌス','Nyaasu',22,0,NULL,'',4,42,'normal',NULL,'Scratch Cat','yellow','urban',45,35,40,40,90,40,'000001',77,255,69,127,70,'variation of MEOW',NULL,NULL,NULL,'',52), -(53,137,0,0,'Persian','','ペルシアン','Perushian',22,52,'level','28',10,320,'normal',NULL,'Classy Cat','yellow','urban',70,60,65,65,115,65,'000002',144,90,148,127,70,'PERSIAN',NULL,NULL,NULL,'',53), -(54,138,158,43,'Psyduck','','コダック','Kodakku',23,0,NULL,'',8,196,'water',NULL,'Duck','yellow','water\'s edge',52,48,65,50,55,50,'000100',47,190,80,127,70,'PSYCHIC + DUCK',NULL,NULL,NULL,'',54), -(55,139,159,44,'Golduck','','ゎルダック','Gorudakku',23,54,'level','33',17,766,'water',NULL,'Duck','blue','water\'s edge',82,78,95,80,85,80,'000200',128,75,174,127,70,'GOLD + DUCK',NULL,NULL,NULL,'',55), -(56,134,0,0,'Mankey','','マンキヌ','Mankii',24,0,NULL,'',5,280,'fighting',NULL,'Pig Monkey','brown','mountain',80,35,35,45,70,40,'010000',57,190,74,127,70,'variation of MONKEY',NULL,NULL,NULL,'',56), -(57,135,0,0,'Primeape','','オコリザル','Okorizaru',24,56,'level','28',10,320,'fighting',NULL,'Pig Monkey','brown','mountain',105,60,60,70,95,65,'020000',117,75,149,127,70,'PRIME + APE',NULL,NULL,NULL,'',57), -(58,127,0,0,'Growlithe','','ガヌディ','Gaadi',25,0,NULL,'',7,190,'fire',NULL,'Puppy','brown','grassland',70,45,70,50,60,55,'010000',33,190,91,63,70,'GROWL + LITHE',NULL,NULL,NULL,'',58), -(59,128,0,0,'Arcanine','','りむンディ','Uindi',25,58,'item','Fire Stone',19,1550,'fire',NULL,'Legendary','brown','grassland',110,80,100,80,95,90,'020000',20,75,213,63,70,'ARCANE + CANINE',NULL,NULL,NULL,'',59), -(60,72,0,0,'Poliwag','','ニョロモ','Nyoromo',26,0,NULL,'',6,124,'water',NULL,'Tadpole','blue','water\'s edge',50,40,40,40,90,40,'000001',71,255,77,127,70,'POLIWOG + WAG',NULL,NULL,NULL,'',60), -(61,73,0,0,'Poliwhirl','','ニョロゟ','Nyorozo',26,60,'level','25',10,200,'water',NULL,'Tadpole','blue','water\'s edge',65,65,50,50,90,65,'000002',110,120,131,127,70,'POLIWOG + WHIRL',NULL,NULL,NULL,'',61), -(62,74,0,0,'Poliwrath','','ニョロボン','Nyorobon',26,61,'item','Water Stone',13,540,'water','fighting','Tadpole','blue','water\'s edge',85,95,70,90,70,90,'003000',111,45,185,127,70,'POLIWOG + WRATH',NULL,NULL,NULL,'',62), -(63,89,39,20,'Abra','','ケヌシィ','Keeshii',27,0,NULL,'',9,195,'psychic',NULL,'Psi','brown','urban',20,15,105,55,90,25,'000100',148,200,75,63,70,'from ABRACADABRA','Buy in Celadon City Coin Exchange for 180 coins.','Buy in Celadon City Coin Exchange for 120 coins.','Before D/P: Base EXP was 73.','',63), -(64,90,40,21,'Kadabra','','ナンゲラヌ','Yungeraa',27,63,'level','16',13,565,'psychic',NULL,'Psi','brown','urban',35,30,120,70,105,40,'000200',38,100,145,63,70,'from ABRACADABRA',NULL,NULL,NULL,'dpfem,dpfemback',64), -(65,91,41,22,'Alakazam','','フヌディン','Fuudin',27,64,'trade','',15,480,'psychic',NULL,'Psi','brown','urban',50,45,135,85,120,55,'000300',149,50,186,63,70,'ALAKAZAM',NULL,NULL,NULL,'dpfem,dpfemback',65), -(66,140,73,40,'Machop','','ワンリキヌ','Wanrikii',28,0,NULL,'',8,195,'fighting',NULL,'Superpower','gray','mountain',80,50,35,35,35,70,'010000',106,180,75,63,70,'MACHO + CHOP',NULL,NULL,'Before D/P: Base EXP was 88.','',66), -(67,141,74,41,'Machoke','','ゎヌリキヌ','Goorikii',28,66,'level','28',15,705,'fighting',NULL,'Superpower','gray','mountain',100,70,50,60,45,80,'020000',41,90,146,63,70,'MACHO + CHOKE',NULL,NULL,NULL,'',67), -(68,142,75,42,'Machamp','','カむリキヌ','Kairikii',28,67,'trade','',16,1300,'fighting',NULL,'Superpower','gray','mountain',130,80,65,85,55,90,'030000',126,45,193,63,70,'MACHO + CHAMP',NULL,NULL,NULL,'',68), -(69,64,0,0,'Bellsprout','','マダツボミ','Madatsubomi',29,0,NULL,'',7,40,'grass','poison','Flower','green','forest',75,35,70,30,40,50,'010000',188,255,84,127,70,'BELL + SPROUT',NULL,NULL,NULL,'',69), -(70,65,0,0,'Weepinbell','','りツドン','Utsudon',29,69,'level','21',10,64,'grass','poison','Flycatcher','green','forest',90,50,85,45,55,65,'020000',189,120,151,127,70,'WEEPING + BELL',NULL,NULL,NULL,'',70), -(71,66,0,0,'Victreebel','','りツボット','Utsubotto',29,70,'item','Leaf Stone',17,155,'grass','poison','Flycatcher','green','forest',105,65,100,60,70,80,'030000',190,45,191,127,70,'VICTORY + BELL',NULL,NULL,NULL,'',71), -(72,162,66,136,'Tentacool','','メノクラゲ','Menokurage',30,0,NULL,'',9,455,'water','poison','Jellyfish','blue','sea',40,35,50,100,70,40,'000010',24,190,105,127,70,'TENTACLE + COOL',NULL,NULL,NULL,'',72), -(73,163,67,137,'Tentacruel','','ドククラゲ','Dokukurage',30,72,'level','30',16,550,'water','poison','Jellyfish','blue','sea',70,65,80,120,100,80,'000020',155,60,205,127,70,'TENTACLE + CRUEL',NULL,NULL,NULL,'',73), -(74,34,57,31,'Geodude','','むシツブテ','Ishitsubute',31,0,NULL,'',4,200,'rock','ground','Rock','brown','mountain',80,100,30,30,20,40,'001000',169,255,73,127,70,'GEO- (rock) + DUDE',NULL,NULL,'Before D/P: Base EXP was 86.','',74), -(75,35,58,32,'Graveler','','ゎロヌン','Goroon',31,74,'level','25',10,1050,'rock','ground','Rock','brown','mountain',95,115,45,45,35,55,'002000',39,120,134,127,70,'variation of GRAVEL',NULL,NULL,NULL,'',75), -(76,36,59,33,'Golem','','ゎロヌニャ','Goroonya',31,75,'trade','',14,3000,'rock','ground','Megaton','brown','mountain',110,130,55,65,45,80,'003000',49,45,177,127,70,'GOLEM (a body without a soul)',NULL,NULL,NULL,'',76), -(77,201,0,90,'Ponyta','','ポニヌタ','Poniita',32,0,NULL,'',10,300,'fire',NULL,'Fire Horse','yellow','grassland',85,55,65,65,90,50,'000001',163,190,152,127,70,'variation of PONYTAIL',NULL,NULL,NULL,'',77), -(78,202,0,91,'Rapidash','','ギャロップ','Gyaroppu',32,77,'level','40',17,950,'fire',NULL,'Fire Horse','yellow','grassland',100,70,80,80,105,65,'000002',164,60,192,127,70,'RAPID + DASH',NULL,NULL,NULL,'',78), -(79,80,0,0,'Slowpoke','','ダドン','Yadon',33,0,NULL,'',12,360,'water','psychic','Dopey','pink','water\'s edge',65,65,40,40,15,90,'100000',37,190,99,127,70,'SLOW + POKE (to move slowly)',NULL,NULL,NULL,'',79), -(80,81,0,0,'Slowbro','','ダドラン','Yadoran',33,79,'level','37',16,785,'water','psychic','Hermit Crab','pink','water\'s edge',75,110,100,80,30,95,'002000',8,75,164,127,70,'SLOW + BRO (brother)',NULL,NULL,NULL,'',80), -(81,118,82,0,'Magnemite','','コむル','Koiru',34,0,NULL,'',3,60,'electric','steel','Magnet','gray','rough terrain',35,70,95,55,45,25,'000100',173,190,89,255,70,'MAGNET + MITE (small)',NULL,NULL,NULL,'',81), -(82,119,83,0,'Magneton','','レアコむル','Reakoiru',34,81,'level','30',10,600,'electric','steel','Magnet','gray','rough terrain',60,95,120,70,70,50,'000200',54,60,161,255,70,'MAGNET + TON',NULL,NULL,NULL,'',82), -(83,158,0,0,'Farfetch\'d','','カモネギ','Kamonegi',35,0,NULL,'',8,150,'normal','flying','Wild Duck','brown','grassland',65,55,58,62,60,52,'010000',64,45,94,127,70,'variation of FAR-FETCHED (hard to believe)','Trade a Spearow to the boy in the house next to the Pokemon Fan Club in Vermilion City.',NULL,NULL,'',83), -(84,199,92,0,'Doduo','','ドヌドヌ','Doodoo',36,0,NULL,'',14,392,'normal','flying','Twin Bird','brown','grassland',85,45,35,35,75,35,'010000',70,190,96,127,70,'DODO (extinct nonflying bird) + DUO (set of two)',NULL,NULL,NULL,'dpfem,dpfemback',84), -(85,200,93,0,'Dodrio','','ドヌドリオ','Doodorio',36,84,'level','31',18,852,'normal','flying','Triple Bird','brown','grassland',110,70,60,60,100,60,'020000',116,45,158,127,70,'DODO (extinct nonflying bird) + TRIO (set of three)',NULL,NULL,NULL,'dpfem,dpfemback',85), -(86,176,0,0,'Seel','','パりワり','Pauwau',37,0,NULL,'',11,900,'water',NULL,'Sea Lion','white','sea',45,55,45,70,45,65,'000010',58,190,100,127,70,'variation of SEAL',NULL,NULL,NULL,'',86), -(87,177,0,0,'Dewgong','','ゞュゎン','Jugon',37,86,'level','34',17,1200,'water','ice','Sea Lion','white','sea',70,80,70,95,70,90,'000020',120,75,176,127,70,'variation of DUGONG (a type of related animal)',NULL,NULL,NULL,'',87), -(88,116,106,0,'Grimer','','ベトベタヌ','Betobetaa',38,0,NULL,'',9,300,'poison',NULL,'Sludge','purple','urban',80,50,40,50,25,80,'100000',13,190,90,127,70,'GRIME (dirt)',NULL,NULL,NULL,'',88), -(89,117,107,0,'Muk','','ベトベトン','Betobeton',38,88,'level','38',12,300,'poison',NULL,'Sludge','purple','urban',105,75,65,100,50,105,'110000',136,75,157,127,70,'MUCK (dirt)',NULL,NULL,NULL,'',89), -(90,169,0,0,'Shellder','','シェルダヌ','Sherudaa',39,0,NULL,'',3,40,'water',NULL,'Bivalve','purple','sea',65,100,45,25,40,30,'001000',23,190,97,127,70,'SHELL + SHELTER',NULL,NULL,NULL,'',90), -(91,170,0,0,'Cloyster','','パルシェン','Parushen',39,90,'item','Water Stone',15,1325,'water','ice','Bivalve','purple','sea',95,180,85,45,70,50,'002000',139,60,203,127,70,'CLOISTER (to shut away) + OYSTER (clam)',NULL,NULL,NULL,'',91), -(92,58,0,69,'Gastly','','ゎヌス','Goosu',40,0,NULL,'',13,1,'ghost','poison','Gas','purple','cave',35,30,100,35,80,30,'000100',25,190,95,127,70,'GAS + GHASTLY (horrible)',NULL,NULL,NULL,'',92), -(93,59,0,70,'Haunter','','ゎヌスト','Goosuto',40,92,'level','25',16,1,'ghost','poison','Gas','purple','cave',50,45,115,55,95,45,'000200',147,90,126,127,70,'HAUNT',NULL,NULL,NULL,'',93), -(94,60,0,71,'Gengar','','ゲンガヌ','Gengaa',40,93,'trade','',15,405,'ghost','poison','Shadow','purple','cave',65,60,130,75,110,60,'000300',14,45,190,127,70,'GANGRENE (a icky disease) + EDGAR (i.e. Allen Poe)',NULL,NULL,NULL,'',94), -(95,62,0,34,'Onix','','むワヌク','Iwaaku',41,0,NULL,'',88,2100,'rock','ground','Rock Snake','gray','cave',45,160,30,45,70,35,'001000',34,45,108,127,70,'variation of ONYX (a precious stone)',NULL,NULL,NULL,'',95), -(96,87,0,0,'Drowzee','','スリヌプ','Suriipu',42,0,NULL,'',10,324,'psychic',NULL,'Hypnosis','yellow','grassland',48,45,43,90,42,60,'000010',48,190,102,127,70,'variation of DROWSY (tired)',NULL,NULL,NULL,'',96), -(97,88,0,0,'Hypno','','スリヌパヌ','Suriipaa',42,96,'level','26',16,756,'psychic',NULL,'Hypnosis','yellow','grassland',73,70,73,115,67,85,'000020',129,75,165,127,70,'variation of HYPNOSIS (to put to sleep)',NULL,NULL,NULL,'dpfem,dpfemback',97), -(98,164,0,0,'Krabby','','クラブ','Kurabu',43,0,NULL,'',4,65,'water',NULL,'River Crab','red','water\'s edge',105,90,25,25,50,30,'010000',78,225,115,127,70,'variation of CRABBY (cranky)',NULL,NULL,NULL,'',98), -(99,165,0,0,'Kingler','','キングラヌ','Kinguraa',43,98,'level','28',13,600,'water',NULL,'Pincer','red','water\'s edge',130,115,50,50,75,55,'020000',138,60,206,127,70,'KING CRAB (a big type of crab) + LER (Irish: sea)',NULL,NULL,NULL,'',99), -(100,120,84,0,'Voltorb','','ビリリダマ','Biriridama',44,0,NULL,'',5,104,'electric',NULL,'Ball','red','urban',30,50,55,55,100,40,'000001',6,190,103,255,70,'VOLT (electric unit) + ORB (ball)',NULL,NULL,NULL,'',100), -(101,121,85,0,'Electrode','','マルマむン','Marumain',44,100,'level','30',12,666,'electric',NULL,'Ball','red','urban',50,70,80,80,140,60,'000002',141,60,150,255,70,'ELECTRODE (a certain type of conductor)',NULL,NULL,NULL,'',101), -(102,104,0,0,'Exeggcute','','タマタマ','Tamatama',45,0,NULL,'',4,25,'grass','psychic','Egg','pink','forest',40,80,60,45,40,60,'001000',12,90,98,127,70,'EGG + EXECUTE (to do)',NULL,NULL,NULL,'',102), -(103,105,0,0,'Exeggutor','','ナッシヌ','Nasshii',45,102,'item','Leaf Stone',20,1200,'grass','psychic','Coconut','yellow','forest',95,85,125,65,55,95,'000200',10,45,212,127,70,'EGG + EXECUTOR (someone who does something)',NULL,NULL,NULL,'',103), -(104,203,0,0,'Cubone','','カラカラ','Karakara',46,0,NULL,'',4,65,'ground',NULL,'Lonely','brown','mountain',50,95,40,50,35,50,'001000',17,190,87,127,70,'CUB (baby animal) + BONE',NULL,NULL,NULL,'',104), -(105,204,0,0,'Marowak','','ガラガラ','Garagara',46,104,'level','28',10,450,'ground',NULL,'Bone Keeper','brown','mountain',80,110,50,80,45,60,'002000',145,75,124,127,70,'MARROW (part of a bone) + WHACK',NULL,NULL,NULL,'',105), -(106,144,0,0,'Hitmonlee','','サワムラヌ','Sawamuraa',47,236,'level+attack','20',15,498,'fighting',NULL,'Kicking','brown','urban',120,53,35,110,87,50,'020000',43,45,139,0,70,'-',NULL,NULL,NULL,'',106), -(107,145,0,0,'Hitmonchan','','゚ビワラヌ','Ebiwaraa',47,236,'level+defense','20',14,502,'fighting',NULL,'Punching','brown','urban',105,79,35,110,76,50,'000020',44,45,140,0,70,'-',NULL,NULL,NULL,'',107), -(108,178,0,0,'Lickitung','','ベロリンガ','Beroringa',48,0,NULL,'',12,655,'normal',NULL,'Licking','pink','grassland',55,75,60,75,30,90,'200000',11,45,127,127,70,'LICK + TONGUE',NULL,NULL,NULL,'',108), -(109,114,108,0,'Koffing','','ドガヌス','Dogaasu',49,0,NULL,'',6,10,'poison',NULL,'Poison Gas','purple','urban',65,95,60,45,35,40,'001000',55,190,114,127,70,'COUGHING',NULL,NULL,NULL,'',109), -(110,115,109,0,'Weezing','','マタドガス','Matadogasu',49,109,'level','35',12,95,'poison',NULL,'Poison Gas','purple','urban',90,120,85,70,60,65,'002000',143,60,173,127,70,'WHEEZING',NULL,NULL,NULL,'',110), -(111,206,169,0,'Rhyhorn','','サむホヌン','Saihoon',50,0,NULL,'',10,1150,'ground','rock','Spikes','gray','rough terrain',85,95,30,30,25,80,'001000',1,120,135,127,70,'RHINO + HORN',NULL,NULL,NULL,'dpfem,dpfemback',111), -(112,207,170,0,'Rhydon','','サむドン','Saidon',50,111,'level','42',19,1200,'ground','rock','Drill','gray','rough terrain',130,120,45,45,40,105,'020000',18,60,204,127,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',112), -(113,217,0,97,'Chansey','','ラッキヌ','Rakkii',51,440,'holdday','Oval Stone',11,346,'normal',NULL,'Egg','pink','urban',5,5,35,105,50,250,'200000',40,30,255,254,140,'-',NULL,NULL,NULL,'',113), -(114,179,0,0,'Tangela','','モンゞャラ','Monjara',52,0,NULL,'',10,350,'grass',NULL,'Vine','blue','grassland',55,115,100,40,60,65,'001000',30,45,166,127,70,'-',NULL,NULL,NULL,'',114), -(115,205,0,0,'Kangaskhan','','ガルヌラ','Garuura',53,0,NULL,'',22,800,'normal',NULL,'Parent','brown','grassland',95,80,40,80,90,105,'200000',2,45,175,254,70,'KANGAROO + GENGHIS KHAN',NULL,NULL,NULL,'',115), -(116,186,184,0,'Horsea','','タッツヌ','Tattsuu',54,0,NULL,'',4,80,'water',NULL,'Dragon','blue','sea',40,70,70,25,60,30,'000100',92,225,83,127,70,'HORSE + SEA',NULL,NULL,NULL,'',116), -(117,187,185,0,'Seadra','','シヌドラ','Shiidora',54,116,'level','32',12,250,'water',NULL,'Dragon','blue','sea',65,95,95,45,85,55,'001100',93,75,155,127,70,'-',NULL,NULL,NULL,'',117), -(118,78,50,78,'Goldeen','','トサキント','Tosakinto',55,0,NULL,'',6,150,'water',NULL,'Goldfish','red','water\'s edge',67,60,35,50,63,45,'010000',157,225,111,127,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',118), -(119,79,51,79,'Seaking','','アズマオり','Azumaou',55,118,'level','33',13,390,'water',NULL,'Goldfish','red','water\'s edge',92,65,65,80,68,80,'020000',158,60,170,127,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',119), -(120,167,143,0,'Staryu','','ヒトデマン','Hitodeman',56,0,NULL,'',8,345,'water',NULL,'Star Shape','brown','sea',45,55,70,55,85,30,'000001',27,225,106,255,70,'STAR + YOU',NULL,NULL,NULL,'',120), -(121,168,144,0,'Starmie','','スタヌミヌ','Sutaamii',56,120,'item','Water Stone',11,800,'water','psychic','Mysterious','purple','sea',75,85,100,85,115,60,'000002',152,60,207,255,70,'STAR + ME',NULL,NULL,NULL,'',121), -(122,156,0,95,'Mr. Mime','','バリダヌド','Bariyaado',57,439,'move','102',13,545,'psychic',NULL,'Barrier','pink','urban',45,65,100,120,90,40,'000020',42,45,136,127,70,'-','Trade an Abra to the kid in the house in the northeast corner of Route 2.',NULL,NULL,'',122), -(123,110,0,0,'Scyther','','ストラむク','Sutoraiku',58,0,NULL,'',15,560,'bug','flying','Mantis','green','grassland',110,80,55,80,105,70,'010000',26,45,187,127,70,'-','Buy in Celadon City Coin Exchange for 5500 coins.',NULL,NULL,'dpfem',123), -(124,153,0,0,'Jynx','','ルヌゞュラ','Ruujura',59,238,'level','30',14,406,'ice','psychic','Human Shape','red','urban',50,35,115,95,95,65,'000200',72,45,137,254,70,'JINX','Trade a Poliwhirl to the old man next to the Cerulean Pokemon Center.',NULL,NULL,'',124), -(125,155,0,0,'Electabuzz','','゚レブヌ','Erebuu',60,239,'level','30',11,300,'electric',NULL,'Electric','yellow','grassland',83,57,95,85,105,65,'000002',53,45,156,63,70,'-',NULL,NULL,NULL,'',125), -(126,151,0,0,'Magmar','','ブヌバヌ','Buubaa',61,240,'level','30',13,445,'fire',NULL,'Spitfire','red','mountain',95,57,100,85,93,65,'000200',51,45,167,63,70,'-',NULL,NULL,NULL,'',126), -(127,112,167,0,'Pinsir','','カむロス','Kairosu',62,0,NULL,'',15,550,'bug',NULL,'Stag Beetle','brown','forest',125,100,55,70,85,65,'020000',29,45,200,127,70,'-',NULL,'Buy in Celadon City Coin Exchange for 2500 coins.',NULL,'',127), -(128,148,0,0,'Tauros','','ケンタロス','Kentarosu',63,0,NULL,'',14,884,'normal',NULL,'Wild Bull','brown','grassland',100,95,40,70,110,75,'010001',60,45,211,0,70,'-',NULL,NULL,NULL,'',128), -(129,76,52,23,'Magikarp','','コむキング','Koikingu',64,0,NULL,'',9,100,'water',NULL,'Fish','red','water\'s edge',10,55,15,20,80,20,'000001',133,255,20,127,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',129), -(130,77,53,24,'Gyarados','','ギャラドス','Gyaradosu',64,129,'level','20',65,2350,'water','flying','Atrocious','blue','water\'s edge',125,79,60,100,81,95,'020000',22,45,214,127,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',130), -(131,219,0,0,'Lapras','','ラプラス','Rapurasu',65,0,NULL,'',25,2200,'water','ice','Transport','blue','sea',85,80,85,95,60,130,'200000',19,45,219,127,70,'-',NULL,NULL,NULL,'',131), -(132,92,0,0,'Ditto','','メタモン','Metamon',66,0,NULL,'',3,40,'normal',NULL,'Transform','purple','urban',48,48,48,48,48,48,'100000',76,35,61,255,70,'-',NULL,NULL,NULL,'',132), -(133,180,0,0,'Eevee','','むヌブむ','Iibui',67,0,NULL,'',3,65,'normal',NULL,'Evolution','brown','urban',55,50,45,65,55,55,'000010',102,45,92,31,70,'-','Obtain on the roof of Pokemon Mansion in Celadon City; enter from the rear of the building and go into the small room on the top floor.','Obtain on the roof of Pokemon Mansion in Celadon City; enter from the rear of the building and go into the small room on the top floor.',NULL,'',133), -(134,181,0,0,'Vaporeon','','シャワヌズ','Shawaazu',67,133,'item','Water Stone',10,290,'water',NULL,'Bubble Jet','blue','urban',65,60,110,95,65,130,'200000',105,45,196,31,70,'-',NULL,NULL,NULL,'',134), -(135,182,0,0,'Jolteon','','サンダヌス','Sandaasu',67,133,'item','Thunderstone',8,245,'electric',NULL,'Lightning','yellow','urban',65,60,110,95,130,65,'000002',104,45,197,31,70,'-',NULL,NULL,NULL,'',135), -(136,183,0,0,'Flareon','','ブヌスタヌ','Buusutaa',67,133,'item','Fire Stone',9,250,'fire',NULL,'Flame','red','urban',130,60,95,110,65,65,'020000',103,45,198,31,70,'-',NULL,NULL,NULL,'',136), -(137,215,0,0,'Porygon','','ポリゎン','Porigon',68,0,NULL,'',8,365,'normal',NULL,'Virtual','pink','urban',60,70,85,75,40,65,'000100',170,45,130,255,70,'-','Buy in Celadon City Coin Exchange for 9999 coins.','Buy in Celadon City Coin Exchange for 6500 coins.',NULL,'',137), -(138,220,0,0,'Omanyte','','オムナむト','Omunaito',69,0,NULL,'',4,75,'rock','water','Spiral','blue','sea',40,100,90,55,35,35,'001000',98,45,99,31,70,'-',NULL,NULL,'Before D/P: Base EXP was 120.','',138), -(139,221,0,0,'Omastar','','オムスタヌ','Omusutaa',69,138,'level','40',10,350,'rock','water','Spiral','blue','sea',60,125,115,70,55,70,'002000',99,45,199,31,70,'-',NULL,NULL,NULL,'',139), -(140,222,0,0,'Kabuto','','カブト','Kabuto',70,0,NULL,'',5,115,'rock','water','Shellfish','brown','sea',80,90,55,45,55,30,'001000',90,45,99,31,70,'-',NULL,NULL,'Before D/P: Base EXP was 119.','',140), -(141,223,0,0,'Kabutops','','カブトプス','Kabutopusu',70,140,'level','40',13,405,'rock','water','Shellfish','brown','sea',115,105,65,70,80,60,'020000',91,45,199,31,70,'-',NULL,NULL,'Before D/P: Base EXP was 201.','',141), -(142,224,0,0,'Aerodactyl','','プテラ','Putera',71,0,NULL,'',18,590,'rock','flying','Fossil','purple','mountain',105,65,60,75,130,80,'000002',171,45,202,31,70,'AERO (Greek: air) + possibly DACTYL (Greek: finger, digit)',NULL,NULL,NULL,'',142), -(143,225,0,113,'Snorlax','','カビゎン','Kabigon',72,446,'happiness','',21,4600,'normal',NULL,'Sleeping','black','mountain',110,65,65,110,30,160,'200000',132,25,154,31,70,'SNORE + LAX (similar to \'relaxed\')',NULL,NULL,NULL,'',143), -(144,235,0,0,'Articuno','','フリヌザヌ','Furiizaa',73,0,NULL,'',17,554,'ice','flying','Freeze','blue','rare',85,100,95,125,85,90,'000030',74,3,215,255,35,'ARTIC (cold) + UNO (Spanish for 1)',NULL,NULL,NULL,'',144), -(145,236,0,0,'Zapdos','','サンダヌ','Sandaa',74,0,NULL,'',16,526,'electric','flying','Electric','yellow','rare',90,85,125,90,100,90,'000300',75,3,216,255,35,'ZAP + DOS (Spanish for 2)',NULL,NULL,NULL,'',145), -(146,237,0,0,'Moltres','','ファむダヌ','Faiyaa',75,0,NULL,'',20,600,'fire','flying','Flame','yellow','rare',100,90,125,85,90,90,'000300',73,3,217,255,35,'MOLTEN (hot; melted) + TRES (Spanish for 3)',NULL,NULL,NULL,'',146), -(147,241,0,0,'Dratini','','ミニリュり','Miniryuu',76,0,NULL,'',18,33,'dragon',NULL,'Dragon','blue','water\'s edge',64,45,50,50,50,41,'010000',88,45,67,127,35,'-','Buy in Celadon City Coin Exchange for 2800 coins.','Buy in Celadon City Coin Exchange for 4600 coins.',NULL,'',147), -(148,242,0,0,'Dragonair','','ハクリュヌ','Hakuryuu',76,147,'level','30',40,165,'dragon',NULL,'Dragon','blue','water\'s edge',84,65,70,70,70,61,'020000',89,45,144,127,35,'-',NULL,NULL,NULL,'',148), -(149,243,0,0,'Dragonite','','カむリュヌ','Kairyuu',76,148,'level','55',22,2100,'dragon','flying','Dragon','brown','water\'s edge',134,95,100,100,80,91,'030000',66,45,218,127,35,'-',NULL,NULL,NULL,'',149), -(150,249,0,0,'Mewtwo','','ミュりツヌ','Myuutsuu',77,0,NULL,'',20,1220,'psychic',NULL,'Genetic','purple','rare',110,90,154,90,130,106,'000300',131,3,220,255,0,'MEW + TWO (Mewtwo is the second one)',NULL,NULL,NULL,'',150), -(151,250,0,0,'Mew','','ミュり','Myuu',78,0,NULL,'',4,40,'psychic',NULL,'New Species','pink','rare',100,100,100,100,100,100,'300000',21,45,64,255,100,'MEW (sound of a kitty)',NULL,NULL,NULL,'',151), -(152,1,0,0,'Chikorita','','チコリヌタ','Chikoriita',79,0,NULL,'',9,64,'grass',NULL,'Leaf','green','grassland',49,65,49,65,45,45,'000010',NULL,45,64,31,70,'-',NULL,NULL,NULL,'',152), -(153,2,0,0,'Bayleef','','べむリヌフ','Beiriifu',79,152,'level','16',12,158,'grass',NULL,'Leaf','green','grassland',62,80,63,80,60,60,'001010',NULL,45,141,31,70,'-',NULL,NULL,NULL,'',153), -(154,3,0,0,'Meganium','','メガニりム','Meganiumu',79,153,'level','32',18,1005,'grass',NULL,'Herb','green','grassland',82,100,83,100,80,80,'001020',NULL,45,208,31,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',154), -(155,4,0,0,'Cyndaquil','','ヒノアラシ','Hinoarashi',80,0,NULL,'',5,79,'fire',NULL,'Fire Mouse','yellow','grassland',52,43,60,50,65,39,'000001',NULL,45,65,31,70,'-',NULL,NULL,NULL,'',155), -(156,5,0,0,'Quilava','','マグマラシ','Magumarashi',80,155,'level','14',9,190,'fire',NULL,'Volcano','yellow','grassland',64,58,80,65,80,58,'000101',NULL,45,142,31,70,'-',NULL,NULL,NULL,'',156), -(157,6,0,0,'Typhlosion','','バクフヌン','Bakufuun',80,156,'level','36',17,795,'fire',NULL,'Volcano','yellow','grassland',84,78,109,85,100,78,'000300',NULL,45,209,31,70,'-',NULL,NULL,NULL,'',157), -(158,7,0,0,'Totodile','','ワニノコ','Waninoko',81,0,NULL,'',6,95,'water',NULL,'Big Jaw','blue','water\'s edge',65,64,44,48,43,50,'010000',NULL,45,66,31,70,'-',NULL,NULL,NULL,'',158), -(159,8,0,0,'Croconaw','','アリゲむツ','Arigeitsu',81,158,'level','18',11,250,'water',NULL,'Big Jaw','blue','water\'s edge',80,80,59,63,58,65,'011000',NULL,45,143,31,70,'-',NULL,NULL,NULL,'',159), -(160,9,0,0,'Feraligatr','','オヌダむル','Oodairu',81,159,'level','30',23,888,'water',NULL,'Big Jaw','blue','water\'s edge',105,100,79,83,78,85,'021000',NULL,45,210,31,70,'-',NULL,NULL,NULL,'',160), -(161,19,0,0,'Sentret','','オタチ','Otachi',82,0,NULL,'',8,60,'normal',NULL,'Scout','brown','grassland',46,34,35,45,20,35,'010000',NULL,255,57,127,70,'-',NULL,NULL,NULL,'',161), -(162,20,0,0,'Furret','','オオタチ','Ootachi',82,161,'level','15',18,325,'normal',NULL,'Long Body','brown','grassland',76,64,45,55,90,85,'000002',NULL,90,116,127,70,'-',NULL,NULL,NULL,'',162), -(163,15,0,106,'Hoothoot','','ホヌホヌ','Hoohoo',83,0,NULL,'',7,212,'normal','flying','Owl','brown','forest',30,30,36,56,50,60,'100000',NULL,255,58,127,70,'-',NULL,NULL,NULL,'',163), -(164,16,0,107,'Noctowl','','ペルノズク','Yorunozuku',83,163,'level','20',16,408,'normal','flying','Owl','brown','forest',50,50,76,96,70,100,'200000',NULL,90,162,127,70,'-',NULL,NULL,NULL,'',164), -(165,30,0,0,'Ledyba','','レディバ','Rediba',84,0,NULL,'',10,108,'bug','flying','Five Star','red','forest',20,30,40,80,55,40,'000010',NULL,255,54,127,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',165), -(166,31,0,0,'Ledian','','レディアン','Redian',84,165,'level','18',14,356,'bug','flying','Five Star','red','forest',35,50,55,110,85,55,'000020',NULL,90,134,127,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',166), -(167,32,0,0,'Spinarak','','むトマル','Itomaru',85,0,NULL,'',5,85,'bug','poison','String Spit','green','forest',60,40,40,40,30,40,'010000',NULL,255,54,127,70,'-',NULL,NULL,NULL,'',167), -(168,33,0,0,'Ariados','','アリアドス','Ariadosu',85,167,'level','22',11,335,'bug','poison','Long Leg','red','forest',90,70,60,60,40,70,'020000',NULL,90,134,127,70,'-',NULL,NULL,NULL,'',168), -(169,39,65,30,'Crobat','','クロバット','Kurobatto',17,42,'happiness','',18,750,'poison','flying','Bat','purple','cave',90,80,70,80,130,85,'000003',NULL,90,204,127,70,'-',NULL,NULL,NULL,'',169), -(170,174,181,0,'Chinchou','','チョンチヌ','Chonchii',86,0,NULL,'',5,120,'water','electric','Angler','blue','sea',38,38,56,56,67,75,'100000',NULL,190,90,127,70,'-',NULL,NULL,NULL,'',170), -(171,175,182,0,'Lanturn','','ランタヌン','Rantaan',86,170,'level','27',12,225,'water','electric','Light','blue','sea',58,58,76,76,67,125,'200000',NULL,75,156,127,70,'-',NULL,NULL,NULL,'',171), -(172,21,155,103,'Pichu','','ピチュヌ','Pichuu',10,0,NULL,'',3,20,'electric',NULL,'Tiny Mouse','yellow','forest',40,15,35,35,60,20,'000001',NULL,190,42,127,70,'-',NULL,NULL,NULL,'baby',172), -(173,40,0,99,'Cleffa','','ピィ','Pii',14,0,NULL,'',3,30,'normal',NULL,'Star Shape','pink','mountain',25,28,45,55,15,50,'000010',NULL,150,37,191,140,'-',NULL,NULL,NULL,'baby',173), -(174,43,137,0,'Igglybuff','','ププリン','Pupurin',16,0,NULL,'',3,10,'normal',NULL,'Balloon','pink','grassland',30,15,40,20,15,90,'100000',NULL,170,39,191,70,'-',NULL,NULL,NULL,'baby',174), -(175,46,0,0,'Togepi','','トゲピヌ','Togepii',87,0,NULL,'',3,15,'normal',NULL,'Spike Ball','white','forest',20,65,40,65,20,35,'000010',NULL,190,74,31,70,'-',NULL,NULL,NULL,'',175), -(176,47,0,0,'Togetic','','トゲチック','Togechikku',87,175,'happiness','',6,32,'normal','flying','Happiness','white','forest',40,85,80,105,40,55,'000020',NULL,75,114,31,70,'-',NULL,NULL,NULL,'',176), -(177,159,162,0,'Natu','','ネむティ','Neiti',88,0,NULL,'',2,20,'psychic','flying','Tiny Bird','green','forest',50,45,70,45,70,40,'000100',NULL,190,73,127,70,'-',NULL,NULL,NULL,'',177), -(178,160,163,0,'Xatu','','ネむティオ','Neitio',88,177,'level','25',15,150,'psychic','flying','Mystic','green','forest',75,70,95,70,95,65,'000101',NULL,75,171,127,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',178), -(179,53,0,0,'Mareep','','メリヌプ','Meriipu',89,0,NULL,'',6,78,'electric',NULL,'Wool','white','grassland',40,40,65,45,35,55,'000100',NULL,235,59,127,70,'-',NULL,NULL,NULL,'',179), -(180,54,0,0,'Flaaffy','','モココ','Mokoko',89,179,'level','15',8,133,'electric',NULL,'Wool','pink','grassland',55,55,80,60,45,70,'000200',NULL,120,117,127,70,'-',NULL,NULL,NULL,'',180), -(181,55,0,0,'Ampharos','','デンリュり','Denryuu',89,180,'level','30',14,615,'electric',NULL,'Light','yellow','grassland',75,75,115,90,55,90,'000300',NULL,45,194,127,70,'-',NULL,NULL,NULL,'',181), -(182,86,91,0,'Bellossom','','キレむハナ','Kireihana',18,44,'item','Sun Stone',4,58,'grass',NULL,'Flower','green','grassland',80,85,90,100,50,75,'000030',NULL,45,184,127,70,'-',NULL,NULL,NULL,'',182), -(183,130,55,125,'Marill','','マリル','Mariru',90,298,'happiness','',4,85,'water',NULL,'Aqua Mouse','blue','water\'s edge',20,50,20,50,40,70,'200000',NULL,190,58,127,70,'-',NULL,NULL,NULL,'',183), -(184,131,56,126,'Azumarill','','マリルリ','Mariruri',90,183,'level','18',8,285,'water',NULL,'Aqua Rabbit','blue','water\'s edge',50,80,50,80,50,100,'300000',NULL,75,153,127,70,'-',NULL,NULL,NULL,'',184), -(185,106,0,93,'Sudowoodo','','り゜ッキヌ','Usokkii',91,438,'move','102',12,380,'rock',NULL,'Imitation','brown','forest',100,115,30,65,30,70,'002000',NULL,65,135,127,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',185), -(186,75,0,0,'Politoed','','ニョロトノ','Nyorotono',26,61,'trade','King\'s Rock',11,339,'water',NULL,'Frog','green','water\'s edge',75,75,90,100,70,90,'000030',NULL,45,185,127,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',186), -(187,67,0,0,'Hoppip','','ハネッコ','Hanekko',92,0,NULL,'',4,5,'grass','flying','Cottonweed','pink','grassland',35,40,35,55,50,35,'000010',NULL,255,74,127,70,'-',NULL,NULL,NULL,'',187), -(188,68,0,0,'Skiploom','','ポポッコ','Popokko',92,187,'level','18',6,10,'grass','flying','Cottonweed','green','grassland',45,50,45,65,80,55,'000002',NULL,120,136,127,70,'-',NULL,NULL,NULL,'',188), -(189,69,0,0,'Jumpluff','','ワタッコ','Watakko',92,188,'level','27',8,30,'grass','flying','Cottonweed','blue','grassland',55,70,55,85,110,75,'000003',NULL,45,176,127,70,'-',NULL,NULL,NULL,'',189), -(190,122,0,63,'Aipom','','゚むパム','Eipamu',93,0,NULL,'',8,115,'normal',NULL,'Long Tail','purple','forest',70,55,40,55,85,55,'000001',NULL,45,94,127,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',190), -(191,102,0,0,'Sunkern','','ヒマナッツ','Himanattsu',94,0,NULL,'',3,18,'grass',NULL,'Seed','yellow','grassland',30,30,30,30,30,30,'000100',NULL,235,52,127,70,'-',NULL,NULL,NULL,'',191), -(192,103,0,0,'Sunflora','','キマワリ','Kimawari',94,191,'item','Sun Stone',8,85,'grass',NULL,'Sun','yellow','grassland',75,55,105,85,30,75,'000200',NULL,120,146,127,70,'-',NULL,NULL,NULL,'',192), -(193,101,0,0,'Yanma','','ダンダンマ','Yanyanma',95,0,NULL,'',12,380,'bug','flying','Clear Wing','red','forest',65,45,75,45,95,65,'000001',NULL,75,147,127,70,'-',NULL,NULL,'Before D/P: Effort points were 2 speed.','',193), -(194,56,0,117,'Wooper','','りパヌ','Upaa',96,0,NULL,'',4,85,'water','ground','Water Fish','blue','water\'s edge',45,45,25,25,15,55,'100000',NULL,255,52,127,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',194), -(195,57,0,118,'Quagsire','','ヌオヌ','Nuoo',96,194,'level','20',14,750,'water','ground','Water Fish','blue','water\'s edge',85,85,65,65,35,95,'200000',NULL,90,137,127,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',195), -(196,184,0,0,'Espeon','','゚ヌフィ','Eefi',67,133,'happinessday','Sun Shard',9,265,'psychic',NULL,'Sun','purple','urban',65,60,130,95,110,65,'000200',NULL,45,197,31,70,'-',NULL,NULL,NULL,'',196), -(197,185,0,0,'Umbreon','','ブラッキヌ','Burakkii',67,133,'happinessnight','Moon Shard',10,270,'dark',NULL,'Moonlight','black','urban',65,110,60,130,65,95,'000020',NULL,45,197,31,35,'-',NULL,NULL,NULL,'',197), -(198,208,0,74,'Murkrow','','ダミカラス','Yamikarasu',97,0,NULL,'',5,21,'dark','flying','Darkness','black','forest',85,42,85,42,91,60,'000001',NULL,30,107,127,35,'-',NULL,NULL,NULL,'dpfem,dpfemback',198), -(199,82,0,0,'Slowking','','ダドキング','Yadokingu',33,79,'trade','King\'s Rock',20,795,'water','psychic','Royal','pink','water\'s edge',75,80,100,110,30,95,'000030',NULL,70,164,127,70,'-',NULL,NULL,NULL,'',199), -(200,214,0,72,'Misdreavus','','ムりマ','Muuma',98,0,NULL,'',7,10,'ghost',NULL,'Screech','gray','cave',60,60,85,85,85,60,'000010',NULL,45,147,127,35,'-',NULL,NULL,'Before D/P: Effort points were 1 Special Attack and 1 Special Defense.','',200), -(201,61,0,114,'Unown','','アンノヌン','Annoon',99,0,NULL,'',5,50,'psychic',NULL,'Symbol','black','rare',72,48,72,48,48,48,'010100',NULL,225,61,255,70,'-',NULL,NULL,NULL,'',201), -(202,107,161,0,'Wobbuffet','','゜ヌナンス','Soonansu',100,360,'level','15',13,285,'psychic',NULL,'Patient','blue','cave',33,58,33,58,33,190,'200000',NULL,45,177,127,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',202), -(203,147,164,121,'Girafarig','','キリンリキ','Kirinriki',101,0,NULL,'',15,415,'normal','psychic','Long Neck','yellow','grassland',80,65,90,65,85,70,'000200',NULL,60,149,127,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',203), -(204,93,0,0,'Pineco','','クヌギダマ','Kunugidama',102,0,NULL,'',6,72,'bug',NULL,'Bagworm','gray','forest',65,90,35,35,15,50,'001000',NULL,190,60,127,70,'-',NULL,NULL,NULL,'',204), -(205,94,0,0,'Forretress','','フォレトス','Foretosu',102,204,'level','31',12,1258,'bug','steel','Bagworm','purple','forest',90,140,60,60,40,75,'002000',NULL,75,118,127,70,'-',NULL,NULL,NULL,'',205), -(206,52,0,0,'Dunsparce','','ノコッチ','Nokocchi',103,0,NULL,'',15,140,'normal',NULL,'Land Snake','yellow','cave',70,70,65,65,45,100,'100000',NULL,190,125,127,70,'-',NULL,NULL,'Before D/P: Base EXP was 75.','',206), -(207,189,0,0,'Gligar','','グラむガヌ','Guraigaa',104,0,NULL,'',11,648,'ground','flying','FlyScorpion','purple','mountain',75,105,35,65,85,65,'001000',NULL,60,108,127,70,'-',NULL,NULL,NULL,'dpfem',207), -(208,63,0,35,'Steelix','','ハガネヌル','Haganeeru',41,95,'trade','Metal Coat',92,4000,'steel','ground','Iron Snake','gray','cave',85,200,55,65,30,75,'002000',NULL,25,196,127,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',208), -(209,123,0,0,'Snubbull','','ブルヌ','Buruu',105,0,NULL,'',6,78,'normal',NULL,'Fairy','pink','urban',80,50,40,40,30,60,'010000',NULL,190,63,191,70,'-',NULL,NULL,NULL,'',209), -(210,124,0,0,'Granbull','','グランブル','Guranburu',105,209,'level','23',14,487,'normal',NULL,'Fairy','purple','urban',120,75,60,60,45,90,'020000',NULL,75,178,191,70,'-',NULL,NULL,NULL,'',210), -(211,161,0,0,'Qwilfish','','ハリヌセン','Hariisen',106,0,NULL,'',5,39,'water','poison','Balloon','gray','sea',95,75,55,55,85,65,'010000',NULL,45,100,127,70,'-',NULL,NULL,NULL,'',211), -(212,111,0,0,'Scizor','','ハッサム','Hassamu',58,123,'trade','Metal Coat',18,1180,'bug','steel','Pincer','red','grassland',130,100,55,80,65,70,'020000',NULL,25,200,127,70,'-',NULL,NULL,NULL,'dpfem',212), -(213,166,0,0,'Shuckle','','ツボツボ','Tsubotsubo',107,0,NULL,'',6,205,'bug','rock','Mold','yellow','mountain',10,230,10,230,5,20,'001010',NULL,190,80,127,70,'-',NULL,NULL,NULL,'',213), -(214,113,168,62,'Heracross','','ぞラクロス','Herakurosu',108,0,NULL,'',15,540,'bug','fighting','Single Horn','blue','forest',125,75,40,95,85,80,'020000',NULL,45,200,127,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',214), -(215,213,0,144,'Sneasel','','ニュヌラ','Nyuura',109,0,NULL,'',9,280,'dark','ice','Sharp Claw','black','forest',95,55,35,75,115,55,'000001',NULL,60,132,127,35,'-',NULL,NULL,NULL,'dpfem,dpfemback',215), -(216,193,0,0,'Teddiursa','','ヒメグマ','Himeguma',110,0,NULL,'',6,88,'normal',NULL,'Little Bear','brown','mountain',80,50,50,50,40,60,'010000',NULL,120,124,127,70,'-',NULL,NULL,NULL,'',216), -(217,194,0,0,'Ursaring','','リングマ','Ringuma',110,216,'level','30',18,1258,'normal',NULL,'Hibernator','brown','mountain',130,75,75,75,55,90,'020000',NULL,60,189,127,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',217), -(218,211,103,0,'Slugma','','マグマッグ','Magumaggu',111,0,NULL,'',7,350,'fire',NULL,'Lava','red','mountain',40,40,70,40,20,40,'000100',NULL,190,78,127,70,'-',NULL,NULL,NULL,'',218), -(219,212,104,0,'Magcargo','','マグカルゎ','Magukarugo',111,218,'level','38',8,550,'fire','rock','Lava','red','mountain',50,120,80,80,30,50,'002000',NULL,75,154,127,70,'-',NULL,NULL,NULL,'',219), -(220,191,0,0,'Swinub','','りリムヌ','Urimuu',112,0,NULL,'',4,65,'ice','ground','Pig','brown','cave',50,40,30,30,50,50,'010000',NULL,225,78,127,70,'-',NULL,NULL,NULL,'',220), -(221,192,0,0,'Piloswine','','むノムヌ','Inomuu',112,220,'level','33',11,558,'ice','ground','Swine','brown','cave',100,80,60,60,50,100,'110000',NULL,75,160,127,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',221), -(222,171,180,0,'Corsola','','サニヌゎ','Saniigo',113,0,NULL,'',6,50,'water','rock','Coral','pink','sea',55,85,65,85,35,55,'001010',NULL,60,113,191,70,'-',NULL,NULL,NULL,'',222), -(223,172,0,132,'Remoraid','','テッポりオ','Teppouo',114,0,NULL,'',6,120,'water',NULL,'Jet','gray','sea',65,35,65,35,65,35,'000100',NULL,190,78,127,70,'-',NULL,NULL,NULL,'',223), -(224,173,0,133,'Octillery','','オクタン','Okutan',114,223,'level','25',9,285,'water',NULL,'Jet','red','sea',105,75,105,75,45,75,'010100',NULL,75,164,127,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',224), -(225,190,0,0,'Delibird','','デリバヌド','Deribaado',115,0,NULL,'',9,160,'ice','flying','Delivery','red','mountain',55,45,65,45,75,45,'000001',NULL,45,183,127,70,'-',NULL,NULL,NULL,'',225), -(226,197,0,141,'Mantine','','マンタむン','Mantain',116,458,'dnadigivolve','223',21,2200,'water','flying','Kite','purple','sea',40,70,80,140,70,65,'000020',NULL,25,168,127,70,'-',NULL,NULL,NULL,'',226), -(227,198,115,0,'Skarmory','','゚アヌムド','Eaamudo',117,0,NULL,'',17,505,'steel','flying','Armor Bird','gray','rough terrain',80,140,40,70,70,65,'002000',NULL,25,168,127,70,'-',NULL,NULL,NULL,'',227), -(228,209,0,0,'Houndour','','デルビル','Derubiru',118,0,NULL,'',6,108,'dark','fire','Dark','black','rough terrain',60,30,80,50,65,45,'000100',NULL,120,114,127,35,'-',NULL,NULL,NULL,'',228), -(229,210,0,0,'Houndoom','','ぞルガヌ','Herugaa',118,228,'level','24',14,350,'dark','fire','Dark','black','rough terrain',90,50,110,80,95,75,'000200',NULL,45,204,127,35,'-',NULL,NULL,NULL,'dpfem,dpfemback',229), -(230,188,186,0,'Kingdra','','キングドラ','Kingudora',54,117,'trade','Dragon Scale',18,1520,'water','dragon','Dragon','blue','sea',95,95,95,95,85,75,'010110',NULL,45,207,127,70,'-',NULL,NULL,NULL,'',230), -(231,195,165,0,'Phanpy','','ゎマゟり','Gomazou',119,0,NULL,'',5,335,'ground',NULL,'Long Nose','blue','rough terrain',60,60,40,40,40,90,'100000',NULL,120,124,127,70,'-',NULL,NULL,NULL,'',231), -(232,196,166,0,'Donphan','','ドンファン','Donfan',119,231,'level','25',11,1200,'ground',NULL,'Armor','gray','rough terrain',120,120,60,60,50,90,'011000',NULL,60,189,127,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',232), -(233,216,0,0,'Porygon2','','ポリゎン','Porigon2',68,137,'trade','Up-Grade',6,325,'normal',NULL,'Virtual','red','urban',80,90,105,95,60,85,'000200',NULL,45,180,255,70,'-',NULL,NULL,NULL,'',233), -(234,129,0,0,'Stantler','','オドシシ','Odoshishi',120,0,NULL,'',14,712,'normal',NULL,'Big Horn','brown','forest',95,62,85,65,85,73,'010000',NULL,45,165,127,70,'-',NULL,NULL,NULL,'',234), -(235,157,0,0,'Smeargle','','ドヌブル','Dooburu',121,0,NULL,'',12,580,'normal',NULL,'Painter','white','urban',20,35,20,45,75,55,'000001',NULL,45,106,127,70,'-',NULL,NULL,NULL,'',235), -(236,143,0,0,'Tyrogue','','バルキヌ','Barukii',47,0,NULL,'',7,210,'fighting',NULL,'Scuffle','purple','urban',35,35,35,35,35,35,'010000',NULL,75,91,0,70,'-',NULL,NULL,NULL,'baby',236), -(237,146,0,0,'Hitmontop','','カポ゚ラヌ','Kapoeraa',47,236,'level+equal','20',14,480,'fighting',NULL,'Handstand','brown','urban',95,95,35,110,70,50,'000020',NULL,45,138,0,70,'-',NULL,NULL,NULL,'',237), -(238,152,0,0,'Smoochum','','ムチュヌル','Muchuuru',59,0,NULL,'',4,60,'ice','psychic','Kiss','pink','urban',30,15,85,65,65,45,'000100',NULL,45,87,254,70,'-',NULL,NULL,NULL,'baby',238), -(239,154,0,0,'Elekid','','゚レキッド','Erekiddo',60,0,NULL,'',6,235,'electric',NULL,'Electric','yellow','grassland',63,37,65,55,95,45,'000001',NULL,45,106,63,70,'-',NULL,NULL,NULL,'baby',239), -(240,150,0,0,'Magby','','ブビィ','Bubii',61,0,NULL,'',7,214,'fire',NULL,'Live Coal','red','mountain',75,37,70,55,83,45,'000001',NULL,45,117,63,70,'-',NULL,NULL,NULL,'baby',240), -(241,149,0,0,'Miltank','','ミルタンク','Mirutanku',122,0,NULL,'',12,755,'normal',NULL,'Milk Cow','pink','grassland',80,105,40,70,100,95,'002000',NULL,45,200,254,70,'-',NULL,NULL,NULL,'',241), -(242,218,0,98,'Blissey','','ハピナス','Hapinasu',51,113,'happiness','',15,468,'normal',NULL,'Happiness','pink','urban',10,10,75,135,55,255,'300000',NULL,30,255,254,140,'-',NULL,NULL,'Before D/P: Effort points were 2 HP.','',242), -(243,238,0,0,'Raikou','','ラむコり','Raikou',123,0,NULL,'',19,1780,'electric',NULL,'Thunder','yellow','grassland',85,75,115,100,115,90,'000102',NULL,3,216,255,35,'-',NULL,NULL,NULL,'',243), -(244,239,0,0,'Entei','','゚ンテむ','Entei',124,0,NULL,'',21,1980,'fire',NULL,'Volcano','brown','grassland',115,85,90,75,100,115,'120000',NULL,3,217,255,35,'-',NULL,NULL,NULL,'',244), -(245,240,0,0,'Suicune','','スむクン','Suikun',125,0,NULL,'',20,1870,'water',NULL,'Aurora','blue','grassland',75,115,90,115,85,100,'001020',NULL,3,215,255,35,'-',NULL,NULL,NULL,'',245), -(246,244,0,0,'Larvitar','','ペヌギラス','Yoogirasu',126,0,NULL,'',6,720,'rock','ground','Rock Skin','green','mountain',64,50,45,50,41,50,'010000',NULL,45,67,127,35,'-',NULL,NULL,NULL,'',246), -(247,245,0,0,'Pupitar','','サナギラス','Sanagirasu',126,246,'level','30',12,1520,'rock','ground','Hard Shell','gray','mountain',84,70,65,70,51,70,'020000',NULL,45,144,127,35,'-',NULL,NULL,NULL,'',247), -(248,246,0,0,'Tyranitar','','バンギラス','Bangirasu',126,247,'level','55',20,2020,'rock','dark','Armor','green','mountain',134,110,95,100,61,100,'030000',NULL,45,218,127,35,'-',NULL,NULL,NULL,'',248), -(249,247,0,0,'Lugia','','ルギア','Rugia',127,0,NULL,'',52,2160,'psychic','flying','Diving','white','rare',90,130,90,154,110,106,'000030',NULL,3,220,255,0,'-',NULL,NULL,NULL,'',249), -(250,248,0,0,'Ho-oh','','ホりオり','Houou',128,0,NULL,'',38,1990,'fire','flying','Rainbow','red','rare',130,90,110,154,90,106,'000030',NULL,3,220,255,0,'-',NULL,NULL,NULL,'',250), -(251,251,0,0,'Celebi','','セレビィ','Serebii',129,0,NULL,'',6,50,'psychic','grass','Time Travel','green','forest',100,100,100,100,100,100,'300000',NULL,45,64,255,100,'-',NULL,NULL,NULL,'',251), -(252,0,1,0,'Treecko','','キモリ','Kimori',130,0,NULL,'',5,50,'grass',NULL,'Wood Gecko','green','forest',45,35,65,55,70,40,'000001',NULL,45,65,31,70,'-',NULL,NULL,NULL,'',252), -(253,0,2,0,'Grovyle','','ゞュプトル','Juputoru',130,252,'level','16',9,216,'grass',NULL,'Wood Gecko','green','forest',65,45,85,65,95,50,'000002',NULL,45,141,31,70,'-',NULL,NULL,NULL,'',253), -(254,0,3,0,'Sceptile','','ゞュカむン','Jukain',130,253,'level','36',17,522,'grass',NULL,'Forest','green','forest',85,65,105,85,120,70,'000003',NULL,45,208,31,70,'-',NULL,NULL,NULL,'',254), -(255,0,4,0,'Torchic','','アチャモ','Achamo',131,0,NULL,'',4,25,'fire',NULL,'Chick','red','grassland',60,40,70,50,45,45,'000100',NULL,45,65,31,70,'-',NULL,NULL,NULL,'dpfemback',255), -(256,0,5,0,'Combusken','','ワカシャモ','Wakashamo',131,255,'level','16',9,195,'fire','fighting','Young Fowl','red','grassland',85,60,85,60,55,60,'010100',NULL,45,142,31,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',256), -(257,0,6,0,'Blaziken','','バシャヌモ','Bashaamo',131,256,'level','36',19,520,'fire','fighting','Blaze','red','grassland',120,70,110,70,80,80,'030000',NULL,45,209,31,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',257), -(258,0,7,0,'Mudkip','','ミズゎロり','Mizugorou',132,0,NULL,'',4,76,'water',NULL,'Mud Fish','blue','water\'s edge',70,50,50,50,40,50,'010000',NULL,45,65,31,70,'-',NULL,NULL,NULL,'',258), -(259,0,8,0,'Marshtomp','','ヌマクロヌ','Numakuroo',132,258,'level','16',7,280,'water','ground','Mud Fish','blue','water\'s edge',85,70,60,70,50,70,'020000',NULL,45,143,31,70,'-',NULL,NULL,NULL,'',259), -(260,0,9,0,'Swampert','','ラグラヌゞ','Raguraaji',132,259,'level','36',15,819,'water','ground','Mud Fish','blue','water\'s edge',110,90,85,90,60,100,'030000',NULL,45,210,31,70,'-',NULL,NULL,NULL,'',260), -(261,0,10,0,'Poochyena','','ポチ゚ナ','Pochiena',133,0,NULL,'',5,136,'dark',NULL,'Bite','gray','grassland',55,35,30,30,35,35,'010000',NULL,255,55,127,70,'-',NULL,NULL,NULL,'',261), -(262,0,11,0,'Mightyena','','グラ゚ナ','Guraena',133,261,'level','18',10,370,'dark',NULL,'Bite','gray','grassland',90,70,60,60,70,70,'020000',NULL,127,128,127,70,'-',NULL,NULL,NULL,'',262), -(263,0,12,0,'Zigzagoon','','ゞグザグマ','Jiguzaguma',134,0,NULL,'',4,175,'normal',NULL,'TinyRaccoon','brown','grassland',30,41,30,41,60,38,'000001',NULL,255,60,127,70,'-',NULL,NULL,NULL,'',263), -(264,0,13,0,'Linoone','','マッスグマ','Massuguma',134,263,'level','20',5,325,'normal',NULL,'Rushing','white','grassland',70,61,50,61,100,78,'000002',NULL,90,128,127,70,'-',NULL,NULL,NULL,'',264), -(265,0,14,48,'Wurmple','','ケムッ゜','Kemusso',135,0,NULL,'',3,36,'bug',NULL,'Worm','red','forest',45,35,20,30,20,45,'100000',NULL,255,54,127,70,'-',NULL,NULL,NULL,'',265), -(266,0,15,49,'Silcoon','','カラサリス','Karasarisu',135,265,'level','7',6,100,'bug',NULL,'Cocoon','white','forest',35,55,25,25,15,50,'002000',NULL,120,72,127,70,'-',NULL,NULL,'Before D/P: Base EXP was 71.','',266), -(267,0,16,50,'Beautifly','','アゲハント','Agehanto',135,266,'level','10',10,284,'bug','flying','Butterfly','yellow','forest',70,50,90,50,65,60,'000300',NULL,45,161,127,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',267), -(268,0,17,51,'Cascoon','','マナルド','Mayurudo',135,265,'level','7',7,115,'bug',NULL,'Cocoon','purple','forest',35,55,25,25,15,50,'002000',NULL,120,72,127,70,'-',NULL,NULL,NULL,'',268), -(269,0,18,52,'Dustox','','ドクケむル','Dokukeiru',135,268,'level','10',12,316,'bug','poison','Poison Moth','green','forest',50,70,50,90,65,60,'000030',NULL,45,161,127,70,'-',NULL,NULL,'Before D/P: Base EXP was 160.','dpfem,dpfemback',269), -(270,0,19,0,'Lotad','','ハスボヌ','Hasuboo',136,0,NULL,'',5,26,'water','grass','Water Weed','green','water\'s edge',30,30,40,50,30,40,'000010',NULL,255,74,127,70,'-',NULL,NULL,NULL,'',270), -(271,0,20,0,'Lombre','','ハスブレロ','Hasuburero',136,270,'level','14',12,325,'water','grass','Jolly','green','water\'s edge',50,50,60,70,50,60,'000020',NULL,120,141,127,70,'-',NULL,NULL,NULL,'',271), -(272,0,21,0,'Ludicolo','','ルンパッパ','Runpappa',136,271,'item','Water Stone',15,550,'water','grass','Carefree','green','water\'s edge',70,70,90,100,70,80,'000030',NULL,45,181,127,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',272), -(273,0,22,0,'Seedot','','タネボヌ','Taneboo',137,0,NULL,'',5,40,'grass',NULL,'Acorn','brown','forest',40,50,30,30,30,40,'001000',NULL,255,74,127,70,'-',NULL,NULL,NULL,'',273), -(274,0,23,0,'Nuzleaf','','コノハナ','Konohana',137,273,'level','14',10,280,'grass','dark','Wily','brown','forest',70,40,60,40,60,70,'020000',NULL,120,141,127,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',274), -(275,0,24,0,'Shiftry','','ダヌテング','Daatengu',137,274,'item','Leaf Stone',13,596,'grass','dark','Wicked','brown','forest',100,60,90,60,80,90,'030000',NULL,45,181,127,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',275), -(276,0,25,0,'Taillow','','スバメ','Subame',138,0,NULL,'',3,23,'normal','flying','TinySwallow','blue','grassland',55,30,30,30,85,40,'000001',NULL,200,59,127,70,'-',NULL,NULL,NULL,'',276), -(277,0,26,0,'Swellow','','オオスバメ','Oosubame',138,276,'level','22',7,198,'normal','flying','Swallow','blue','grassland',85,60,50,50,125,60,'000002',NULL,45,162,127,70,'-',NULL,NULL,NULL,'',277), -(278,0,27,119,'Wingull','','キャモメ','Kyamome',139,0,NULL,'',6,95,'water','flying','Seagull','white','sea',30,30,55,30,85,40,'000001',NULL,190,64,127,70,'-',NULL,NULL,NULL,'',278), -(279,0,28,120,'Pelipper','','ペリッパヌ','Perippaa',139,278,'level','25',12,280,'water','flying','Water Bird','yellow','sea',50,100,85,70,65,60,'002000',NULL,45,164,127,70,'-',NULL,NULL,NULL,'',279), -(280,0,29,0,'Ralts','','ラルトス','Rarutosu',140,0,NULL,'',4,66,'psychic',NULL,'Feeling','white','urban',25,25,45,35,40,28,'000100',NULL,235,70,127,35,'-',NULL,NULL,NULL,'',280), -(281,0,30,0,'Kirlia','','キルリア','Kiruria',140,280,'level','20',8,202,'psychic',NULL,'Emotion','white','urban',35,35,65,55,50,38,'000200',NULL,120,140,127,35,'-',NULL,NULL,NULL,'',281), -(282,0,31,0,'Gardevoir','','サヌナむト','Saanaito',140,281,'level','30',16,484,'psychic',NULL,'Embrace','white','urban',65,65,125,115,80,68,'000300',NULL,45,208,127,35,'-',NULL,NULL,NULL,'',282), -(283,0,32,0,'Surskit','','アメタマ','Ametama',141,0,NULL,'',5,17,'bug','water','Pond Skater','blue','water\'s edge',30,32,50,52,65,40,'000001',NULL,200,63,127,70,'-',NULL,NULL,NULL,'',283), -(284,0,33,0,'Masquerain','','アメモヌス','Amemoosu',141,283,'level','22',8,36,'bug','flying','Eyeball','blue','water\'s edge',60,62,80,82,60,70,'000110',NULL,75,128,127,70,'-',NULL,NULL,NULL,'',284), -(285,0,34,0,'Shroomish','','キノココ','Kinokoko',142,0,NULL,'',4,45,'grass',NULL,'Mushroom','brown','forest',40,60,40,60,35,60,'100000',NULL,255,65,127,70,'-',NULL,NULL,NULL,'',285), -(286,0,35,0,'Breloom','','キノガッサ','Kinogassa',142,285,'level','23',12,392,'grass','fighting','Mushroom','green','forest',130,80,60,60,70,60,'020000',NULL,90,165,127,70,'-',NULL,NULL,NULL,'',286), -(287,0,36,0,'Slakoth','','ナマケロ','Namakero',143,0,NULL,'',8,240,'normal',NULL,'Slacker','brown','forest',60,60,35,35,30,60,'100000',NULL,255,83,127,70,'-',NULL,NULL,NULL,'',287), -(288,0,37,0,'Vigoroth','','ダルキモノ','Yarukimono',143,287,'level','18',14,465,'normal',NULL,'Wild Monkey','white','forest',80,80,55,55,90,80,'000002',NULL,120,126,127,70,'-',NULL,NULL,NULL,'',288), -(289,0,38,0,'Slaking','','ケッキング','Kekkingu',143,288,'level','36',20,1305,'normal',NULL,'Lazy','brown','forest',160,100,95,65,100,150,'300000',NULL,45,210,127,70,'-',NULL,NULL,NULL,'',289), -(290,0,42,0,'Nincada','','ツチニン','Tsuchinin',144,0,NULL,'',5,55,'bug','ground','Trainee','gray','forest',45,90,30,30,40,31,'001000',NULL,255,65,127,70,'-',NULL,NULL,NULL,'',290), -(291,0,43,0,'Ninjask','','テッカニン','Tekkanin',144,290,'level','20',8,120,'bug','flying','Ninja','yellow','forest',90,45,50,50,160,61,'000002',NULL,120,155,127,70,'-',NULL,NULL,NULL,'',291), -(292,0,44,0,'Shedinja','','ヌケニン','Nukenin',144,290,'divineintervention','Ninjask',8,12,'bug','ghost','Shed','brown','forest',90,45,30,30,40,1,'200000',NULL,45,95,255,70,'-',NULL,NULL,NULL,'',292), -(293,0,45,0,'Whismur','','ゎニョニョ','Gonyonyo',145,0,NULL,'',6,163,'normal',NULL,'Whisper','pink','cave',51,23,51,23,28,64,'100000',NULL,190,68,127,70,'-',NULL,NULL,NULL,'',293), -(294,0,46,0,'Loudred','','ドゎヌム','Dogoomu',145,293,'level','20',10,405,'normal',NULL,'Big Voice','blue','cave',71,43,71,43,48,84,'200000',NULL,120,126,127,70,'-',NULL,NULL,NULL,'',294), -(295,0,47,0,'Exploud','','バクオング','Bakuongu',145,294,'level','40',15,840,'normal',NULL,'Loud Noise','blue','cave',91,63,91,63,68,104,'300000',NULL,45,184,127,70,'-',NULL,NULL,NULL,'',295), -(296,0,48,0,'Makuhita','','マクノシタ','Makunoshita',146,0,NULL,'',10,864,'fighting',NULL,'Guts','yellow','mountain',60,30,20,30,25,72,'100000',NULL,180,87,63,70,'-',NULL,NULL,NULL,'',296), -(297,0,49,0,'Hariyama','','ハリテダマ','Hariteyama',146,296,'level','24',23,2538,'fighting',NULL,'Arm Thrust','brown','mountain',120,60,40,60,50,144,'200000',NULL,200,184,63,70,'-',NULL,NULL,NULL,'',297), -(298,0,54,124,'Azurill','','ルリリ','Ruriri',90,0,NULL,'',2,20,'normal',NULL,'Polka Dot','blue','water\'s edge',20,40,20,40,20,50,'100000',NULL,150,33,191,70,'-',NULL,NULL,NULL,'baby',298), -(299,0,60,0,'Nosepass','','ノズパス','Nozupasu',147,0,NULL,'',10,970,'rock',NULL,'Compass','gray','cave',45,135,45,90,30,30,'001000',NULL,255,108,127,70,'-',NULL,NULL,NULL,'',299), -(300,0,61,0,'Skitty','','゚ネコ','Eneko',148,0,NULL,'',6,110,'normal',NULL,'Kitten','pink','forest',45,45,35,35,50,50,'000001',NULL,255,65,191,70,'-',NULL,NULL,NULL,'',300), -(301,0,62,0,'Delcatty','','゚ネコロロ','Enekororo',148,300,'item','Moon Stone',11,326,'normal',NULL,'Prim','purple','forest',65,65,55,55,70,70,'100001',NULL,60,138,191,70,'-',NULL,NULL,NULL,'',301), -(302,0,68,0,'Sableye','','ダミラミ','Yamirami',149,0,NULL,'',5,110,'dark','ghost','Darkness','purple','cave',75,75,65,65,50,50,'011000',NULL,45,98,127,35,'-',NULL,NULL,NULL,'',302), -(303,0,69,0,'Mawile','','クチヌト','Kuchiito',150,0,NULL,'',6,115,'steel',NULL,'Deceiver','black','cave',85,85,55,55,50,50,'011000',NULL,45,98,127,70,'-',NULL,NULL,NULL,'',303), -(304,0,70,0,'Aron','','ココドラ','Kokodora',151,0,NULL,'',4,600,'steel','rock','Iron Armor','gray','mountain',70,100,40,40,30,50,'001000',NULL,180,96,127,35,'-',NULL,NULL,NULL,'',304), -(305,0,71,0,'Lairon','','コドラ','Kodora',151,304,'level','32',9,1200,'steel','rock','Iron Armor','gray','mountain',90,140,50,50,40,60,'002000',NULL,90,152,127,35,'-',NULL,NULL,NULL,'',305), -(306,0,72,0,'Aggron','','ボスゎドラ','Bosugodora',151,305,'level','42',21,3600,'steel','rock','Iron Armor','gray','mountain',110,180,60,60,50,70,'003000',NULL,45,205,127,35,'-',NULL,NULL,NULL,'',306), -(307,0,76,86,'Meditite','','アサナン','Asanan',152,0,NULL,'',6,112,'fighting','psychic','Meditate','blue','mountain',40,55,40,55,60,30,'000001',NULL,180,91,127,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',307), -(308,0,77,87,'Medicham','','チャヌレム','Chaaremu',152,307,'level','37',13,315,'fighting','psychic','Meditate','red','mountain',60,75,60,75,80,60,'000002',NULL,90,153,127,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',308), -(309,0,78,0,'Electrike','','ラクラむ','Rakurai',153,0,NULL,'',6,152,'electric',NULL,'Lightning','green','grassland',45,40,65,40,65,40,'000001',NULL,120,104,127,70,'-',NULL,NULL,NULL,'',309), -(310,0,79,0,'Manectric','','ラむボルト','Raiboruto',153,309,'level','26',15,402,'electric',NULL,'Discharge','yellow','grassland',75,60,105,60,105,70,'000002',NULL,45,168,127,70,'-',NULL,NULL,NULL,'',310), -(311,0,80,0,'Plusle','','プラスル','Purasuru',154,0,NULL,'',4,42,'electric',NULL,'Cheering','yellow','grassland',50,40,85,75,95,60,'000001',NULL,200,120,127,70,'-',NULL,NULL,NULL,'',311), -(312,0,81,0,'Minun','','マむナン','Mainan',155,0,NULL,'',4,42,'electric',NULL,'Cheering','yellow','grassland',40,50,75,85,95,60,'000001',NULL,200,120,127,70,'-',NULL,NULL,NULL,'',312), -(313,0,86,0,'Volbeat','','バルビヌト','Barubiito',156,0,NULL,'',7,177,'bug',NULL,'Firefly','gray','forest',73,55,47,75,85,65,'000001',NULL,150,146,0,70,'-',NULL,NULL,NULL,'',313), -(314,0,87,0,'Illumise','','むルミヌれ','Irumiize',157,0,NULL,'',6,177,'bug',NULL,'Firefly','purple','forest',47,55,73,75,85,65,'000001',NULL,150,146,254,70,'-',NULL,NULL,NULL,'',314), -(315,0,94,26,'Roselia','','ロれリア','Rozeria',158,406,'happinessday','',3,20,'grass','poison','Thorn','green','grassland',60,45,100,80,65,50,'000200',NULL,150,152,127,70,'-',NULL,NULL,'Before D/P: Effort points were 1 Special Attack.','dpfem,dpfemback',315), -(316,0,95,0,'Gulpin','','ゎクリン','Gokurin',159,0,NULL,'',4,103,'poison',NULL,'Stomach','green','grassland',43,53,43,53,40,70,'100000',NULL,225,75,127,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',316), -(317,0,96,0,'Swalot','','マルノヌム','Marunoomu',159,316,'level','26',17,800,'poison',NULL,'Poison Bag','purple','grassland',73,83,73,83,55,100,'200000',NULL,75,168,127,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',317), -(318,0,97,0,'Carvanha','','キバニア','Kibania',160,0,NULL,'',8,208,'water','dark','Savage','red','sea',90,20,65,20,65,45,'010000',NULL,225,88,127,35,'-',NULL,NULL,NULL,'',318), -(319,0,98,0,'Sharpedo','','サメハダヌ','Samehadaa',160,318,'level','30',18,888,'water','dark','Brutal','blue','sea',120,40,95,40,95,70,'020000',NULL,60,175,127,35,'-',NULL,NULL,NULL,'',319), -(320,0,99,0,'Wailmer','','ポルコ','Hoeruko',161,0,NULL,'',20,1300,'water',NULL,'Ball Whale','blue','sea',70,35,70,35,60,130,'100000',NULL,125,137,127,70,'-',NULL,NULL,NULL,'',320), -(321,0,100,0,'Wailord','','ポルオヌ','Hoeruoo',161,320,'level','40',145,3980,'water',NULL,'Float Whale','blue','sea',90,45,90,45,60,170,'200000',NULL,60,206,127,70,'-',NULL,NULL,NULL,'',321), -(322,0,101,0,'Numel','','ドンメル','Donmeru',162,0,NULL,'',7,240,'fire','ground','Numb','yellow','mountain',60,40,65,45,35,60,'000100',NULL,255,88,127,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',322), -(323,0,102,0,'Camerupt','','バクヌダ','Bakuuda',162,322,'level','33',19,2200,'fire','ground','Eruption','red','mountain',100,70,105,75,40,70,'010100',NULL,150,175,127,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',323), -(324,0,105,0,'Torkoal','','コヌタス','Kootasu',163,0,NULL,'',5,804,'fire',NULL,'Coal','brown','mountain',85,140,85,70,20,70,'002000',NULL,90,161,127,70,'-',NULL,NULL,NULL,'',324), -(325,0,110,0,'Spoink','','バネブヌ','Banebuu',164,0,NULL,'',7,306,'psychic',NULL,'Bounce','black','mountain',25,35,70,80,60,60,'000010',NULL,255,89,127,70,'-',NULL,NULL,NULL,'',325), -(326,0,111,0,'Grumpig','','ブヌピッグ','Buupiggu',164,325,'level','32',9,715,'psychic',NULL,'Manipulate','purple','mountain',45,65,90,110,80,80,'000020',NULL,60,164,127,70,'-',NULL,NULL,NULL,'',326), -(327,0,114,0,'Spinda','','パッチヌル','Pacchiiru',165,0,NULL,'',11,50,'normal',NULL,'Spot Panda','brown','mountain',60,60,60,60,60,60,'000100',NULL,255,85,127,70,'-',NULL,NULL,NULL,'',327), -(328,0,116,0,'Trapinch','','ナックラヌ','Nakkuraa',166,0,NULL,'',7,150,'ground',NULL,'Ant Pit','brown','rough terrain',100,45,45,45,10,45,'010000',NULL,255,73,127,70,'-',NULL,NULL,NULL,'',328), -(329,0,117,0,'Vibrava','','ビブラヌバ','Biburaaba',166,328,'level','35',11,153,'ground','dragon','Vibration','green','rough terrain',70,50,50,50,70,50,'010001',NULL,120,126,127,70,'-',NULL,NULL,NULL,'',329), -(330,0,118,0,'Flygon','','フラむゎン','Furaigon',166,329,'level','45',20,820,'ground','dragon','Mystic','green','rough terrain',100,80,80,80,100,80,'010002',NULL,45,197,127,70,'-',NULL,NULL,NULL,'',330), -(331,0,119,0,'Cacnea','','サボネア','Sabonea',167,0,NULL,'',4,513,'grass',NULL,'Cactus','green','rough terrain',85,40,85,40,35,50,'000100',NULL,190,97,127,35,'-',NULL,NULL,NULL,'',331), -(332,0,120,0,'Cacturne','','ノクタス','Nokutasu',167,331,'level','32',13,774,'grass','dark','Scarecrow','green','rough terrain',115,60,115,60,55,70,'010100',NULL,60,177,127,35,'-',NULL,NULL,NULL,'dpfem',332), -(333,0,121,0,'Swablu','','チルット','Chirutto',168,0,NULL,'',4,12,'normal','flying','Cotton Bird','blue','forest',40,60,40,75,50,45,'000010',NULL,255,74,127,70,'-',NULL,NULL,NULL,'',333), -(334,0,122,0,'Altaria','','チルタリス','Chirutarisu',168,333,'level','35',11,206,'dragon','flying','Humming','blue','forest',70,90,70,105,80,75,'000020',NULL,45,188,127,70,'-',NULL,NULL,NULL,'',334), -(335,0,123,0,'Zangoose','','ザングヌス','Zanguusu',169,0,NULL,'',13,403,'normal',NULL,'Cat Ferret','white','grassland',115,60,60,60,90,73,'020000',NULL,90,165,127,70,'-',NULL,NULL,NULL,'',335), -(336,0,124,0,'Seviper','','ハブネヌク','Habuneeku',170,0,NULL,'',27,525,'poison',NULL,'Fang Snake','black','grassland',100,60,100,60,65,73,'010100',NULL,90,165,127,70,'-',NULL,NULL,NULL,'',336), -(337,0,125,0,'Lunatone','','ルナトヌン','Runatoon',171,0,NULL,'',10,1680,'rock','psychic','Meteorite','yellow','cave',55,65,95,85,70,70,'000200',NULL,45,150,255,70,'-',NULL,NULL,NULL,'',337), -(338,0,126,0,'Solrock','','゜ルロック','Sorurokku',172,0,NULL,'',12,1540,'rock','psychic','Meteorite','red','cave',95,85,55,65,70,70,'020000',NULL,45,150,255,70,'-',NULL,NULL,NULL,'',338), -(339,0,127,80,'Barboach','','ドゞョッチ','Dojocchi',173,0,NULL,'',4,19,'water','ground','Whiskers','gray','water\'s edge',48,43,46,41,60,50,'100000',NULL,190,92,127,70,'-',NULL,NULL,NULL,'',339), -(340,0,128,81,'Whiscash','','ナマズン','Namazun',173,339,'level','30',9,236,'water','ground','Whiskers','blue','water\'s edge',78,73,76,71,60,110,'200000',NULL,75,158,127,70,'-',NULL,NULL,NULL,'',340), -(341,0,129,0,'Corphish','','ヘむガニ','Heigani',174,0,NULL,'',6,115,'water',NULL,'Ruffian','red','water\'s edge',80,65,50,35,35,43,'010000',NULL,205,111,127,70,'-',NULL,NULL,NULL,'',341), -(342,0,130,0,'Crawdaunt','','シザリガヌ','Shizarigaa',174,341,'level','30',11,328,'water','dark','Rogue','red','water\'s edge',120,85,90,55,55,63,'020000',NULL,155,161,127,70,'-',NULL,NULL,NULL,'',342), -(343,0,131,0,'Baltoy','','ダゞロン','Yajiron',175,0,NULL,'',5,215,'ground','psychic','Clay Doll','brown','rough terrain',40,55,40,70,55,40,'000010',NULL,255,58,255,70,'-',NULL,NULL,NULL,'',343), -(344,0,132,0,'Claydol','','ネンドヌル','Nendooru',175,343,'level','36',15,1080,'ground','psychic','Clay Doll','black','rough terrain',70,105,70,120,75,60,'000020',NULL,90,189,255,70,'-',NULL,NULL,NULL,'',344), -(345,0,133,0,'Lileep','','リリヌラ','Ririira',176,0,NULL,'',10,238,'rock','grass','Sea Lily','purple','sea',41,77,61,87,23,66,'000010',NULL,45,99,31,70,'-',NULL,NULL,'Before D/P: Base EXP was 121.','',345), -(346,0,134,0,'Cradily','','ナレむドル','Yureidoru',176,345,'level','40',15,604,'rock','grass','Barnacle','green','sea',81,97,81,107,43,86,'000020',NULL,45,199,31,70,'-',NULL,NULL,'Before D/P: Base EXP was 201.','',346), -(347,0,135,0,'Anorith','','アノプス','Anopusu',177,0,NULL,'',7,125,'rock','bug','Old Shrimp','gray','water\'s edge',95,50,40,50,75,45,'010000',NULL,45,99,31,70,'-',NULL,NULL,'Before D/P: Base EXP was 119.','',347), -(348,0,136,0,'Armaldo','','アヌマルド','Aamarudo',177,347,'level','40',15,682,'rock','bug','Plate','gray','water\'s edge',125,100,70,80,45,75,'020000',NULL,45,199,31,70,'-',NULL,NULL,'Before D/P: Base EXP was 200.','',348), -(349,0,140,138,'Feebas','','ヒンバス','Hinbasu',178,0,NULL,'',6,74,'water',NULL,'Fish','brown','water\'s edge',15,20,10,55,80,20,'000001',NULL,255,61,127,70,'-',NULL,NULL,NULL,'',349), -(350,0,141,139,'Milotic','','ミロカロス','Mirokarosu',178,349,'beauty','170',62,1620,'water',NULL,'Tender','pink','water\'s edge',60,79,100,125,81,95,'000020',NULL,60,213,127,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',350), -(351,0,142,0,'Castform','','ポワルン','Powarun',179,0,NULL,'',3,8,'normal',NULL,'Weather','white','grassland',70,70,70,70,70,70,'100000',NULL,45,145,127,70,'-',NULL,NULL,NULL,'',351), -(352,0,145,0,'Kecleon','','カクレオン','Kakureon',180,0,NULL,'',10,220,'normal',NULL,'Color Swap','green','forest',90,70,60,120,40,60,'000010',NULL,200,132,127,70,'-',NULL,NULL,NULL,'',352), -(353,0,146,0,'Shuppet','','カゲボりズ','Kagebouzu',181,0,NULL,'',6,23,'ghost',NULL,'Puppet','black','urban',75,35,63,33,45,44,'010000',NULL,225,97,127,35,'-',NULL,NULL,NULL,'',353), -(354,0,147,0,'Banette','','ゞュペッタ','Jupetta',181,353,'level','37',11,125,'ghost',NULL,'Marionette','black','urban',115,65,83,63,65,64,'020000',NULL,45,179,127,35,'-',NULL,NULL,NULL,'',354), -(355,0,148,0,'Duskull','','ペマワル','Yomawaru',182,0,NULL,'',8,150,'ghost',NULL,'Requiem','black','forest',40,90,30,90,25,20,'000010',NULL,190,97,127,35,'-',NULL,NULL,'Before D/P: Effort points were 1 Defense and 1 Special Defense.','',355), -(356,0,149,0,'Dusclops','','サマペヌル','Samayooru',182,355,'level','37',16,306,'ghost',NULL,'Beckon','black','forest',70,130,60,130,25,40,'001010',NULL,90,179,127,35,'-',NULL,NULL,'Before D/P: Effort points were 1 Defense and 2 Special Defense.','',356), -(357,0,150,0,'Tropius','','トロピりス','Toropiusu',183,0,NULL,'',20,1000,'grass','flying','Fruit','green','forest',68,83,72,87,51,99,'200000',NULL,200,169,127,70,'-',NULL,NULL,NULL,'',357), -(358,0,151,83,'Chimecho','','チリヌン','Chiriin',184,433,'happinessnight','',6,10,'psychic',NULL,'Wind Chime','blue','grassland',50,70,95,80,65,65,'000110',NULL,45,147,127,70,'-',NULL,NULL,NULL,'',358), -(359,0,152,0,'Absol','','アブ゜ル','Abusoru',185,0,NULL,'',12,470,'dark',NULL,'Disaster','white','mountain',130,60,75,60,75,65,'020000',NULL,30,174,127,35,'-',NULL,NULL,NULL,'',359), -(360,0,160,0,'Wynaut','','゜ヌナノ','Soonano',100,0,NULL,'',6,140,'psychic',NULL,'Bright','blue','cave',23,48,23,48,23,95,'100000',NULL,125,44,127,70,'-',NULL,NULL,NULL,'baby',360), -(361,0,171,0,'Snorunt','','ナキワラシ','Yukiwarashi',186,0,NULL,'',7,168,'ice',NULL,'Snow Hat','gray','cave',50,50,50,50,50,50,'100000',NULL,190,74,127,70,'-',NULL,NULL,NULL,'',361), -(362,0,172,0,'Glalie','','オニゎヌリ','Onigoori',186,361,'level','42',15,2565,'ice',NULL,'Face','gray','cave',80,80,80,80,80,80,'200000',NULL,75,187,127,70,'-',NULL,NULL,NULL,'',362), -(363,0,173,0,'Spheal','','タマザラシ','Tamazarashi',187,0,NULL,'',8,395,'ice','water','Clap','blue','sea',40,50,55,50,25,70,'100000',NULL,255,75,127,70,'-',NULL,NULL,NULL,'',363), -(364,0,174,0,'Sealeo','','トドグラヌ','Todoguraa',187,363,'level','32',11,876,'ice','water','Ball Roll','blue','sea',60,70,75,70,45,90,'200000',NULL,120,128,127,70,'-',NULL,NULL,NULL,'',364), -(365,0,175,0,'Walrein','','トドれルガ','Todozeruga',187,364,'level','44',14,1506,'ice','water','Ice Break','blue','sea',80,90,95,90,65,110,'300000',NULL,45,192,127,70,'-',NULL,NULL,NULL,'',365), -(366,0,176,0,'Clamperl','','パヌルル','Paaruru',188,0,NULL,'',4,525,'water',NULL,'Bivalve','blue','sea',64,85,74,55,32,35,'001000',NULL,255,142,127,70,'-',NULL,NULL,NULL,'',366), -(367,0,177,0,'Huntail','','ハンテヌル','Hanteeru',188,366,'trade','DeepSeaTooth',17,270,'water',NULL,'Deep Sea','blue','sea',104,105,94,75,52,55,'011000',NULL,60,178,127,70,'-',NULL,NULL,NULL,'',367), -(368,0,178,0,'Gorebyss','','サクラビス','Sakurabisu',188,366,'trade','DeepSeaScale',18,226,'water',NULL,'South Sea','pink','sea',84,105,114,75,52,55,'000200',NULL,60,178,127,70,'-',NULL,NULL,NULL,'',368), -(369,0,179,0,'Relicanth','','ゞヌランス','Jiiransu',189,0,NULL,'',10,234,'water','rock','Longevity','gray','sea',90,130,45,65,55,100,'101000',NULL,25,198,31,70,'-',NULL,NULL,NULL,'dpfem,dpfemback',369), -(370,0,183,0,'Luvdisc','','ラブカス','Rabukasu',190,0,NULL,'',6,87,'water',NULL,'Rendezvous','pink','sea',30,55,40,65,97,43,'000001',NULL,225,110,191,70,'-',NULL,NULL,NULL,'',370), -(371,0,187,0,'Bagon','','タツベむ','Tatsubei',191,0,NULL,'',6,421,'dragon',NULL,'Rock Head','blue','rough terrain',75,60,40,30,50,45,'010000',NULL,45,89,127,35,'-',NULL,NULL,NULL,'',371), -(372,0,188,0,'Shelgon','','コモルヌ','Komoruu',191,371,'level','30',11,1105,'dragon',NULL,'Endurance','white','rough terrain',95,100,60,50,50,65,'002000',NULL,45,144,127,35,'-',NULL,NULL,NULL,'',372), -(373,0,189,0,'Salamence','','ボヌマンダ','Boomanda',191,372,'level','50',15,1026,'dragon','flying','Dragon','blue','rough terrain',135,80,110,80,100,95,'030000',NULL,45,218,127,35,'-',NULL,NULL,NULL,'',373), -(374,0,190,0,'Beldum','','ダンバル','Danbaru',192,0,NULL,'',6,952,'steel','psychic','Iron Ball','blue','rough terrain',55,80,35,60,30,40,'001000',NULL,3,103,255,35,'-',NULL,NULL,NULL,'',374), -(375,0,191,0,'Metang','','メタング','Metangu',192,374,'level','20',12,2025,'steel','psychic','Iron Claw','blue','rough terrain',75,100,55,80,50,60,'002000',NULL,3,153,255,35,'-',NULL,NULL,NULL,'',375), -(376,0,192,0,'Metagross','','メタグロス','Metagurosu',192,375,'level','45',16,5500,'steel','psychic','Iron Leg','blue','rough terrain',135,130,95,90,70,80,'003000',NULL,3,210,255,35,'-',NULL,NULL,NULL,'',376), -(377,0,193,0,'Regirock','','レゞロック','Rejirokku',193,0,NULL,'',17,2300,'rock',NULL,'Rock Peak','brown','cave',100,200,50,100,50,80,'003000',NULL,3,217,255,35,'-',NULL,NULL,NULL,'',377), -(378,0,194,0,'Regice','','レゞアむス','Rejiaisu',194,0,NULL,'',18,1750,'ice',NULL,'Iceberg','blue','cave',50,100,100,200,50,80,'000030',NULL,3,216,255,35,'-',NULL,NULL,NULL,'',378), -(379,0,195,0,'Registeel','','レゞスチル','Rejisuchiru',195,0,NULL,'',19,2050,'steel',NULL,'Iron','gray','cave',75,150,75,150,50,80,'002010',NULL,3,215,255,35,'-',NULL,NULL,NULL,'',379), -(380,0,196,0,'Latias','','ラティアス','Ratiasu',196,0,NULL,'',14,400,'dragon','psychic','Eon','red','water\'s edge',80,90,110,130,110,80,'000030',NULL,3,211,254,90,'-',NULL,NULL,NULL,'',380), -(381,0,197,0,'Latios','','ラティオス','Ratiosu',197,0,NULL,'',20,600,'dragon','psychic','Eon','blue','water\'s edge',90,80,130,110,110,80,'000300',NULL,3,211,0,90,'-',NULL,NULL,NULL,'',381), -(382,0,198,0,'Kyogre','','カむオヌガ','Kaiooga',198,0,NULL,'',45,3520,'water',NULL,'Sea Basin','blue','sea',100,90,150,140,90,100,'000300',NULL,5,218,255,0,'-',NULL,NULL,NULL,'',382), -(383,0,199,0,'Groudon','','グラヌドン','Guraadon',199,0,NULL,'',35,9500,'ground',NULL,'Continent','red','rough terrain',150,140,100,90,90,100,'030000',NULL,5,218,255,0,'-',NULL,NULL,NULL,'',383), -(384,0,200,0,'Rayquaza','','レックりザ','Rekkuuza',200,0,NULL,'',70,2065,'dragon','flying','Sky High','green','rare',150,90,150,90,95,105,'020100',NULL,3,220,255,0,'-',NULL,NULL,NULL,'',384), -(385,0,201,0,'Jirachi','','ゞラヌチ','Jiraachi',201,0,NULL,'',3,11,'steel','psychic','Wish','yellow','mountain',100,100,100,100,100,100,'300000',NULL,3,215,255,100,'-',NULL,NULL,NULL,'',385), -(386,0,202,0,'Deoxys','normal','デオキシス','Deokishisu',202,0,NULL,'',17,608,'psychic',NULL,'DNA','red','rare',150,50,150,50,150,50,'010101',NULL,3,215,255,0,'-',NULL,NULL,NULL,'',386), -(387,0,0,1,'Turtwig','','ナ゚トル','Naetoru',203,0,NULL,'',4,102,'grass',NULL,'Tiny Leaf','green','',68,64,45,55,31,55,'010000',NULL,45,64,31,70,'','','','','',387), -(388,0,0,2,'Grotle','','ハダシガメ','Hayashigame',203,387,'level','18',11,970,'grass',NULL,'Grove','green','',89,85,55,65,36,75,'011000',NULL,45,141,31,70,'','','','','',388), -(389,0,0,3,'Torterra','','ドダむトス','Dodaitosu',203,388,'level','32',22,3100,'grass','ground','Continent','green*','',109,105,75,85,56,95,'021000',NULL,45,208,31,70,'','','','','',389), -(390,0,0,4,'Chimchar','','ヒコザル','Hikozaru',204,0,NULL,'',5,62,'fire',NULL,'Chimp','brown*','',58,44,58,44,61,44,'000001',NULL,45,65,31,70,'','','','','',390), -(391,0,0,5,'Monferno','','モりカザル','Moukazaru',204,390,'level','14',9,220,'fire','fighting','Playful','brown*','',78,52,78,52,81,64,'000101',NULL,45,142,31,70,'','','','','',391), -(392,0,0,6,'Infernape','','ゎりカザル','Goukazaru',204,391,'level','36',12,550,'fire','fighting','Flame','brown','',104,71,104,71,108,76,'010101',NULL,45,209,31,70,'','','','','',392), -(393,0,0,7,'Piplup','','ポッチャマ','Pocchama',205,0,NULL,'',4,52,'water',NULL,'Penguin','blue','',51,53,61,56,40,53,'000100',NULL,45,66,31,70,'','','','','',393), -(394,0,0,8,'Prinplup','','ポッタむシ','Pottaishi',205,393,'level','16',8,230,'water',NULL,'Penguin','blue','',66,68,81,76,50,64,'000200',NULL,45,143,31,70,'','','','','',394), -(395,0,0,9,'Empoleon','','゚ンペルト','Enperuto',205,394,'level','36',17,845,'water','steel','Emperor','blue','',86,88,111,101,60,84,'000300',NULL,45,210,31,70,'','','','','',395), -(396,0,0,10,'Starly','','ムックル','Mukkuru',206,0,NULL,'',3,20,'normal','flying','Starling','brown','',55,30,30,30,60,40,'000001',NULL,255,56,127,70,'','','','','dpfem,dpfemback',396), -(397,0,0,11,'Staravia','','ムクバヌド','Mukubaado',206,396,'level','14',6,155,'normal','flying','Starling','brown','',75,50,40,40,80,55,'000002',NULL,120,113,127,70,'','','','','dpfem,dpfemback',397), -(398,0,0,12,'Staraptor','','ムクホヌク','Mukuhooku',206,397,'level','34',12,249,'normal','flying','Predator','brown','',120,70,50,50,100,85,'030000',NULL,45,172,127,70,'','','','','dpfem',398), -(399,0,0,13,'Bidoof','','ビッパ','Bippa',207,0,NULL,'',5,200,'normal',NULL,'Plump Mouse','brown','',45,40,35,40,31,59,'100000',NULL,255,58,127,70,'','','','','dpfem,dpfemback',399), -(400,0,0,14,'Bibarel','','ビヌダル','Biidaru',207,399,'level','15',10,315,'normal','water','Beaver','brown','',85,60,55,60,71,79,'020000',NULL,127,116,127,70,'','','','','dpfem',400), -(401,0,0,15,'Kricketot','','コロボヌシ','Korobooshi',208,0,NULL,'',3,22,'bug',NULL,'Cricket','red','',25,41,25,41,25,37,'001000',NULL,255,54,127,70,'','','','','dpfem,dpfemback',401), -(402,0,0,16,'Kricketune','','コロトック','Korotokku',208,401,'level','10',10,255,'bug',NULL,'Cricket','red','',85,51,55,51,65,77,'020000',NULL,45,159,127,70,'','','','','dpfem,dpfemback',402), -(403,0,0,17,'Shinx','','コリンク','Korinku',209,0,NULL,'',5,95,'electric',NULL,'Flash','blue','',65,34,40,34,45,45,'010000',NULL,235,60,127,70,'','','','','dpfem,dpfemback',403), -(404,0,0,18,'Luxio','','ルクシオ','Rukushio',209,403,'level','15',9,305,'electric',NULL,'Spark','blue','',85,49,60,49,60,60,'020000',NULL,120,117,127,100,'','','','','dpfem,dpfemback',404), -(405,0,0,19,'Luxray','','レントラヌ','Rentoraa',209,404,'level','30',14,420,'electric',NULL,'Gleam Eyes','blue','',120,79,95,79,70,80,'030000',NULL,45,194,127,70,'','','','','dpfem,dpfemback',405), -(406,0,0,25,'Budew','','スボミヌ','Subomii',158,0,NULL,'',2,12,'grass','poison','Bud','green*','',30,35,50,70,55,40,'000100',NULL,255,68,127,70,'','','','','baby',406), -(407,0,0,27,'Roserade','','ロズレむド','Rozureido',158,315,'item','Shiny Stone',9,145,'grass','poison','Bouquet','green*','',70,55,125,105,90,60,'000300',NULL,75,204,127,70,'','','','','dpfem',407), -(408,0,0,36,'Cranidos','','ズガむドス','Zugaidosu',211,0,NULL,'',9,315,'rock',NULL,'Head Butt','blue','',125,40,30,30,58,67,'010000',NULL,45,99,31,70,'','','','','',408), -(409,0,0,37,'Rampardos','','ラムパルド','Ramuparudo',211,408,'level','30',16,1025,'rock',NULL,'Head Butt','blue','',165,60,65,50,58,97,'020000',NULL,45,199,31,70,'','','','','',409), -(410,0,0,38,'Shieldon','','タテトプス','Tatetopusu',212,0,NULL,'',5,570,'rock','steel','Shield','gray','',42,118,42,88,30,30,'001000',NULL,45,99,31,70,'','','','','',410), -(411,0,0,39,'Bastiodon','','トリデプス','Toridepusu',212,410,'level','30',13,1495,'rock','steel','Shield','gray','',52,168,47,138,30,60,'002000',NULL,45,199,31,70,'','','','','',411), -(412,0,0,45,'Burmy','','ミノムッチ','Minomucchi',213,0,NULL,'',2,34,'bug',NULL,'Bagworm','gray','',29,45,29,45,36,40,'000010',NULL,120,61,127,70,'','','','','',412), -(413,0,0,46,'Wormadam','grass','ミノマダム','Minomadamu',213,412,'levelfemale','20',5,65,'bug','grass','Bagworm','gray','',59,85,79,105,36,60,'000020',NULL,45,159,254,70,'','','','','',413), -(414,0,0,47,'Mothim','','ガヌメむル','Gaameiru',213,412,'levelmale','20',9,233,'bug','flying','Moth','yellow','',94,50,94,50,66,70,'010100',NULL,45,159,0,70,'','','','','',414), -(415,0,0,53,'Combee','','ミツハニヌ','Mitsuhanii',214,0,NULL,'',3,55,'bug','flying','Tiny Bee','yellow','',30,42,30,42,70,30,'000001',NULL,120,63,31,70,'','','','','dpfem',415), -(416,0,0,54,'Vespiquen','','ビヌクむン','Biikuin',214,415,'levelfemale','21',12,385,'bug','flying','Beehive','yellow','',80,102,80,102,40,70,'001010',NULL,45,188,254,70,'','','','','',416), -(417,0,0,55,'Pachirisu','','パチリス','Pachirisu',215,0,NULL,'',4,39,'electric',NULL,'EleSquirrel','white','',45,70,45,90,95,60,'000001',NULL,200,120,127,100,'','','','','dpfem',417), -(418,0,0,56,'Buizel','','ブむれル','Buizeru',216,0,NULL,'',7,295,'water',NULL,'Sea Weasel','brown','',65,35,60,30,85,55,'000001',NULL,190,75,127,70,'','','','','dpfemback',418), -(419,0,0,57,'Floatzel','','フロヌれル','Furoozeru',216,418,'level','26',11,335,'water',NULL,'Sea Weasel','brown','',105,55,85,50,115,85,'000002',NULL,75,178,127,70,'','','','','dpfemback',419), -(420,0,0,58,'Cherubi','','チェリンボ','Cherinbo',217,0,NULL,'',4,33,'grass',NULL,'Cherry','pink','',35,45,62,53,35,45,'000100',NULL,190,68,127,70,'','','','','',420), -(421,0,0,59,'Cherrim','','チェリム','Cherimu',217,420,'level','25',5,93,'grass',NULL,'Blossom','pink','',60,70,87,78,85,70,'000200',NULL,75,133,127,70,'','','','','',421), -(422,0,0,60,'Shellos','','カラナクシ','Karanakushi',218,0,NULL,'',3,63,'water',NULL,'Sea Slug','purple','',48,48,57,62,34,76,'100000',NULL,190,73,127,70,'','','','','',422), -(423,0,0,61,'Gastrodon','','トリトドン','Toritodon',218,422,'level','30',9,299,'water','ground','Sea Slug','purple','',83,68,92,82,39,111,'200000',NULL,75,176,127,70,'','','','','',423), -(424,0,0,64,'Ambipom','','゚テボヌス','Eteboosu',93,190,'move','458',12,203,'normal',NULL,'Long Tail','purple','',100,66,60,66,115,75,'000002',NULL,45,186,127,100,'','','','','dpfem,dpfemback',424), -(425,0,0,65,'Drifloon','','フワンテ','Fuwante',219,0,NULL,'',4,12,'ghost','flying','Balloon','purple','',50,34,60,44,70,90,'100000',NULL,125,127,127,70,'','','','','',425), -(426,0,0,66,'Drifblim','','フワラむド','Fuwaraido',219,425,'level','28',12,150,'ghost','flying','Blimp','purple','',80,44,90,54,80,150,'200000',NULL,60,204,127,70,'','','','','',426), -(427,0,0,67,'Buneary','','ミミロル','Mimiroru',220,0,NULL,'',4,55,'normal',NULL,'Rabbit','brown','',66,44,44,56,85,55,'000001',NULL,190,84,127,0,'','','','','',427), -(428,0,0,68,'Lopunny','','ミミロップ','Mimiroppu',220,427,'happiness','',12,333,'normal',NULL,'Rabbit','brown','',76,84,54,96,105,65,'000002',NULL,60,178,127,140,'','','','','',428), -(429,0,0,73,'Mismagius','','ムりマヌゞ','Muumaaji',98,200,'item','Dusk Stone',9,44,'ghost',NULL,'Magical','purple','',60,60,105,105,105,60,'000110',NULL,45,187,127,35,'','','','','',429), -(430,0,0,75,'Honchkrow','','ドンカラス','Donkarasu',97,198,'item','Dusk Stone',9,273,'dark','flying','Big Boss','black','',125,52,105,52,71,100,'020000',NULL,30,187,127,35,'','','','','',430), -(431,0,0,76,'Glameow','','ニャルマヌ','Nyarumaa',221,0,NULL,'',5,39,'normal',NULL,'Catty','gray','',55,42,42,37,85,49,'000001',NULL,190,71,191,70,'','','','','',431), -(432,0,0,77,'Purugly','','ブニャット','Bunyatto',221,431,'level','38',10,438,'normal',NULL,'Tiger Cat','gray','',82,64,64,59,112,71,'000002',NULL,75,183,191,70,'','','','','',432), -(433,0,0,82,'Chingling','','リヌシャン','Riishan',184,0,NULL,'',2,6,'psychic',NULL,'Bell','yellow','',30,50,65,50,45,45,'000100',NULL,120,74,127,70,'','','','','baby',433), -(434,0,0,84,'Stunky','','スカンプヌ','Sukanpuu',223,0,NULL,'',4,192,'poison','dark','Skunk','purple','',63,47,41,41,74,63,'000001',NULL,225,79,127,70,'','','','','',434), -(435,0,0,85,'Skuntank','','スカタンク','Sukatanku',223,434,'level','34',10,380,'poison','dark','Skunk','purple','',93,67,71,61,84,103,'200000',NULL,60,209,127,70,'','','','','',435), -(436,0,0,88,'Bronzor','','ドヌミラヌ','Doomiraa',224,0,NULL,'',5,605,'steel','psychic','Bronze','green','',24,86,24,86,23,57,'001000',NULL,255,72,255,70,'','','','','',436), -(437,0,0,89,'Bronzong','','ドヌタクン','Dootakun',224,436,'level','33',13,1870,'steel','psychic','Bronze Bell','green','',89,116,79,116,33,67,'001010',NULL,90,188,255,70,'','','','','',437), -(438,0,0,92,'Bonsly','','り゜ハチ','Usohachi',91,0,NULL,'',5,150,'rock',NULL,'Bonsai','brown','',80,95,10,45,10,50,'001000',NULL,255,68,127,70,'','','','','baby',438), -(439,0,0,94,'Mime Jr.','','マネネ','Manene',57,0,NULL,'',6,130,'psychic',NULL,'Mime','pink','',25,45,70,90,60,20,'000010',NULL,145,78,127,70,'','','','','baby',439), -(440,0,0,96,'Happiny','','ピンプク','Pinpuku',51,0,NULL,'',6,244,'normal',NULL,'Playhouse','pink','',5,5,15,65,30,100,'100000',NULL,130,255,254,140,'','','','','baby',440), -(441,0,0,102,'Chatot','','ペラップ','Perappu',228,0,NULL,'',5,19,'normal','flying','Music Note','black','',65,45,92,42,91,76,'010000',NULL,30,107,127,35,'','','','','',441), -(442,0,0,108,'Spiritomb','','ミカルゲ','Mikaruge',229,0,NULL,'',10,1080,'ghost','dark','Forbidden','purple','',92,108,92,108,35,50,'001010',NULL,100,168,127,70,'','','','','',442), -(443,0,0,109,'Gible','','フカマル','Fukamaru',230,0,NULL,'',7,205,'dragon','ground','Land Shark','blue','',70,45,40,45,42,58,'010000',NULL,45,67,127,70,'','','','','dpfem,dpfemback',443), -(444,0,0,110,'Gabite','','ガバむト','Gabaito',230,443,'level','24',14,560,'dragon','ground','Cave','blue','',90,65,50,55,82,68,'020000',NULL,45,144,127,70,'','','','','dpfem,dpfemback',444), -(445,0,0,111,'Garchomp','','ガブリアス','Gaburiasu',230,444,'level','48',19,950,'dragon','ground','Mach','blue','',130,95,80,85,102,108,'030000',NULL,45,218,127,70,'','','','','dpfem',445), -(446,0,0,112,'Munchlax','','ゎンベ','Gonbe',72,0,NULL,'',6,1050,'normal',NULL,'Big Eater','black','',85,40,40,85,5,135,'100000',NULL,50,94,31,70,'','','','','baby',446), -(447,0,0,115,'Riolu','','リオル','Rioru',232,0,NULL,'',7,202,'fighting',NULL,'Emanation','blue','',70,40,35,40,60,40,'010000',NULL,75,72,31,70,'','','','','',447), -(448,0,0,116,'Lucario','','ルカリオ','Rukario',232,447,'happinessday','',12,540,'fighting','steel','Aura','blue','',110,70,115,70,90,70,'010100',NULL,45,204,31,70,'','','','','',448), -(449,0,0,122,'Hippopotas','','ヒポポタス','Hipopotasu',233,0,NULL,'',8,495,'ground',NULL,'Hippo','brown','',72,78,38,42,32,68,'001000',NULL,140,95,127,70,'','','','','dpfem,dpfemback',449), -(450,0,0,123,'Hippowdon','','カバルドン','Kabarudon',233,449,'level','34',20,3000,'ground',NULL,'Heavyweight','brown','',112,118,68,72,47,108,'002000',NULL,60,198,127,70,'','','','','dpfem,dpfemback',450), -(451,0,0,127,'Skorupi','','スコルピ','Sukorupi',234,0,NULL,'',8,120,'poison','bug','Scorpion','purple','',50,90,30,55,65,40,'001000',NULL,120,114,127,70,'','','','','',451), -(452,0,0,128,'Drapion','','ドラピオン','Dorapion',234,451,'level','40',13,615,'poison','dark','Ogre Scorp','purple','',90,110,60,75,95,70,'002000',NULL,45,204,127,70,'','','','','',452), -(453,0,0,129,'Croagunk','','グレッグル','Guregguru',235,0,NULL,'',7,230,'poison','fighting','Toxic Mouth','blue','',61,40,61,40,50,48,'010000',NULL,140,83,127,100,'','','','','dpfem,dpfemback',453), -(454,0,0,130,'Toxicroak','','ドクロック','Dokurokku',235,453,'level','37',13,444,'poison','fighting','Toxic Mouth','blue','',106,65,86,65,85,83,'020000',NULL,75,181,127,70,'','','','In D/P: Technically the number of steps to hatch is 5,120, but since you will never get an egg with a non-baby in it I used the baby\'s steps instead.','dpfem,dpfemback',454), -(455,0,0,131,'Carnivine','','マスキッパ','Masukippa',236,0,NULL,'',14,270,'grass',NULL,'Bug Catcher','green','',100,72,90,72,46,74,'020000',NULL,200,164,127,70,'','','','','',455), -(456,0,0,134,'Finneon','','ケむコりオ','Keikouo',237,0,NULL,'',4,70,'water',NULL,'Wing Fish','blue','',49,56,49,61,66,49,'000001',NULL,190,90,127,70,'','','','','dpfem,dpfemback',456), -(457,0,0,135,'Lumineon','','ネオラント','Neoranto',237,456,'level','31',12,240,'water',NULL,'Neon','blue','',69,76,69,86,91,69,'000002',NULL,75,156,127,70,'','','','','dpfem,dpfemback',457), -(458,0,0,140,'Mantyke','','タマンタ','Tamanta',116,0,NULL,'',10,650,'water','flying','Kite','blue','',20,50,60,120,50,45,'000010',NULL,25,108,127,70,'','','','','baby',458), -(459,0,0,142,'Snover','','ナキカブリ','Yukikaburi',239,0,NULL,'',10,505,'grass','ice','Frost Tree','white','',62,50,62,60,40,60,'010000',NULL,120,131,127,70,'','','','','dpfem,dpfemback',459), -(460,0,0,143,'Abomasnow','','ナキノオヌ','Yukinooo',239,459,'level','40',22,1355,'grass','ice','Frost Tree','white','',92,75,92,85,60,90,'010100',NULL,60,214,127,70,'','','','','dpfem',460), -(461,0,0,145,'Weavile','','マニュヌラ','Manyuura',109,215,'holdnight','Razor Claw',11,340,'dark','ice','Sharp Claw','black','',120,65,45,85,125,70,'010001',NULL,45,199,127,35,'','','','','dpfem,dpfemback',461), -(462,0,0,0,'Magnezone','','ゞバコむル','Jibakoiru',34,82,'levelarea','Mt. Coronet',12,1800,'electric','steel','Magnet Area','gray','',70,115,130,90,60,70,'000300',NULL,30,211,255,70,'','','','','',462), -(463,0,0,0,'Lickilicky','','ベロベルド','Beroberudo',48,108,'move','205',17,1400,'normal',NULL,'Licking','pink','',85,95,80,95,50,110,'300000',NULL,30,193,127,70,'','','','','',463), -(464,0,0,0,'Rhyperior','','ドサむドン','Dosaidon',50,112,'trade','Protector',24,2828,'ground','rock','Drill','gray','',140,130,55,55,40,115,'030000',NULL,30,217,127,70,'','','','','dpfem,dpfemback',464), -(465,0,0,0,'Tangrowth','','モゞャンボ','Mojanbo',52,114,'move','246',20,1286,'grass',NULL,'Vine','blue','',100,125,110,50,50,100,'002000',NULL,30,211,127,70,'','','','','dpfem',465), -(466,0,0,0,'Electivire','','゚レキブル','Erekiburu',60,125,'trade','Electirizer',18,1386,'electric',NULL,'Thunderbolt','yellow','',123,67,95,85,95,75,'030000',NULL,30,199,63,70,'','','','','',466), -(467,0,0,0,'Magmortar','','ブヌバヌン','Buubaan',61,126,'trade','Magmarizer',16,680,'fire',NULL,'Blast','red*','',95,67,125,95,83,75,'000300',NULL,30,199,63,70,'','','','','',467), -(468,0,0,0,'Togekiss','','トゲキッス','Togekissu',87,176,'item','Shiny Stone',15,380,'normal','flying','Jubilee','white*','',50,95,120,115,80,85,'000210',NULL,30,220,31,70,'','','','','',468), -(469,0,0,0,'Yanmega','','メガダンマ','Megayanma',95,193,'move','246',19,515,'bug','flying','Ogre Darner','green','',76,86,116,56,95,86,'020000',NULL,30,198,127,70,'','','','','',469), -(470,0,0,0,'Leafeon','','リヌフィア','Riifia',67,133,'levelarea','Moss Rock in Eterna Forest',10,255,'grass',NULL,'Verdant','green','',110,130,60,65,95,65,'002000',NULL,45,196,31,35,'','','','','',470), -(471,0,0,0,'Glaceon','','グレむシア','Gureishia',67,133,'levelarea','Ice Rock on Route 217',8,259,'ice',NULL,'Fresh Snow','blue','',60,110,130,95,65,65,'000200',NULL,45,196,31,35,'','','','','',471), -(472,0,0,0,'Gliscor','','グラむオン','Guraion',104,207,'holdnight','Razor Fang',20,425,'ground','flying','Fang Scorp','purple','',95,125,45,75,95,75,'002000',NULL,30,192,127,70,'','','','','',472), -(473,0,0,0,'Mamoswine','','マンムヌ','Manmuu',112,221,'move','246',25,2910,'ice','ground','Twin Tusk','brown','',130,80,70,60,80,110,'030000',NULL,50,207,127,70,'','','','','dpfem',473), -(474,0,0,0,'Porygon-Z','','ポリゎン','PorigonZ',68,233,'trade','Dubious Disc',9,340,'normal',NULL,'Virtual','red','',80,70,135,75,90,85,'000300',NULL,30,185,255,70,'','','','','',474), -(475,0,0,0,'Gallade','','゚ルレむド','Erureido',140,281,'itemmale','Dawn Stone',16,520,'psychic','fighting','Blade','white','',125,65,65,115,80,68,'030000',NULL,45,208,0,35,'','','','','',475), -(476,0,0,0,'Probopass','','ダむノヌズ','Dainoozu',147,299,'levelarea','Mt. Coronet',14,3400,'rock','steel','Compass','gray','',55,145,75,150,40,60,'001020',NULL,60,198,127,70,'','','','','',476), -(477,0,0,0,'Dusknoir','','ペノワヌル','Yonowaaru',182,356,'trade','Reaper Cloth',22,1066,'ghost',NULL,'Gripper','black','',100,135,65,135,45,45,'001020',NULL,45,210,127,35,'','','','','',477), -(478,0,0,0,'Froslass','','ナキメノコ','Yukimenoko',186,361,'itemfemale','Dawn Stone',13,266,'ice','ghost','Snow Land','white','',80,70,80,70,110,70,'000002',NULL,75,187,254,70,'','','','','',478), -(479,0,0,0,'Rotom','','ロトム','Rotomu',240,0,NULL,'',3,3,'electric','ghost','Plasma','red','',50,77,95,77,91,50,'000101',NULL,45,132,255,70,'','','','','',479), -(480,0,0,146,'Uxie','','ナクシヌ','Yukushii',241,0,NULL,'',3,3,'psychic',NULL,'Knowledge','yellow','',75,130,75,130,95,75,'002010',NULL,3,210,255,140,'','','','','',480), -(481,0,0,147,'Mesprit','','゚ムリット','Emuritto',242,0,NULL,'',3,3,'psychic',NULL,'Emotion','pink','',105,105,105,105,80,80,'010110',NULL,3,210,255,140,'','','','','',481), -(482,0,0,148,'Azelf','','アグノム','Agunomu',243,0,NULL,'',3,3,'psychic',NULL,'Willpower','blue','',125,70,125,70,115,75,'020100',NULL,3,210,255,140,'','','','','',482), -(483,0,0,149,'Dialga','','ディアルガ','Diaruga',244,0,NULL,'',54,6830,'steel','dragon','Temporal','white','',120,120,150,100,90,100,'000300',NULL,30,220,255,0,'','','','','',483), -(484,0,0,150,'Palkia','','パルキア','Parukia',245,0,NULL,'',42,3360,'water','dragon','Spatial','purple','',120,100,150,120,100,90,'000300',NULL,30,220,255,0,'','','','','',484), -(485,0,0,0,'Heatran','','ヒヌドラン','Hiidoran',246,0,NULL,'',17,4300,'fire','steel','Lava Dome','brown','',90,106,130,106,77,91,'000300',NULL,3,215,127,100,'','','','','',485), -(486,0,0,0,'Regigigas','','レゞギガス','Rejigigasu',247,0,NULL,'',37,4200,'normal',NULL,'Colossal','white','',160,110,80,110,100,110,'030000',NULL,3,220,255,0,'','','','','',486), -(487,0,0,0,'Giratina','','ギラティナ','Giratina',248,0,NULL,'',45,7500,'ghost','dragon','Renegade','black','',100,120,100,120,90,150,'300000',NULL,3,220,255,0,'','','','','',487), -(488,0,0,0,'Cresselia','','クレセリア','Kureseria',249,0,NULL,'',15,856,'psychic',NULL,'Lunar','yellow','',70,120,75,130,85,120,'000030',NULL,3,210,254,100,'','','','','',488), -(489,0,0,0,'Phione','','フィオネ','Fione',250,0,NULL,'',4,31,'water',NULL,'Sea Drifter','blue','',80,80,80,80,80,80,'100000',NULL,30,165,255,70,'','','','','baby',489), -(490,0,0,151,'Manaphy','','マナフィ','Manafi',250,489,'none','',3,14,'water',NULL,'Seafaring','blue','',100,100,100,100,100,100,'300000',NULL,3,215,255,70,'','','','','',490), -(491,0,0,0,'Darkrai','','ダヌクラむ','Daakurai',252,0,NULL,'',15,505,'dark',NULL,'Pitch-Black','black','',90,90,135,90,125,70,'000201',NULL,3,210,255,0,'','','','','',491), -(492,0,0,0,'Shaymin','','シェむミ','Sheimi',253,0,NULL,'',2,21,'grass',NULL,'Gratitude','green','',100,100,100,100,100,100,'300000',NULL,45,64,255,100,'','','','','',492), -(493,0,0,0,'Arceus','','アルセりス','Aruseusu',254,0,NULL,'',32,3200,'normal',NULL,'Alpha','gray','',120,120,120,120,120,120,'300000',NULL,3,255,255,0,'','','','','',493), -(494,0,0,0,'Pokemon494','','','',0,0,NULL,'',0,0,'normal',NULL,'','','',10,10,10,10,10,10,'000000',NULL,3,255,255,0,'','','','','',494), -(495,0,0,0,'Pokemon495','','','',0,0,NULL,'',0,0,'normal',NULL,'','','',10,10,10,10,10,10,'000000',NULL,3,255,255,0,'','','','','',495), -(496,0,202,0,'Deoxys','attack','','Deokishisu',202,0,NULL,'',17,608,'psychic',NULL,'DNA','red','rare',180,20,180,20,150,50,'020100',NULL,3,215,255,0,'','','','','',386), -(497,0,202,0,'Deoxys','defense','','Deokishisu',202,0,NULL,'',17,608,'psychic',NULL,'DNA','red','rare',70,160,70,160,90,50,'002010',NULL,3,215,255,0,'','','','','',386), -(498,0,202,0,'Deoxys','speed','','Deokishisu',202,0,NULL,'',17,608,'psychic',NULL,'DNA','red','rare',95,90,95,90,180,50,'000003',NULL,3,215,255,0,'','','','','',386), -(499,0,0,46,'Wormadam','ground','ミノマダム','Minomadamu',213,0,NULL,'',5,65,'bug','ground','Bagworm','gray','',79,105,59,85,36,60,'002000',NULL,45,159,254,70,'','','','','',413), -(500,0,0,46,'Wormadam','steel','ミノマダム','Minomadamu',213,0,NULL,'',5,65,'bug','steel','Bagworm','gray','',69,95,69,95,36,60,'001010',NULL,45,159,254,70,'','','','','',413); +INSERT INTO pokemon VALUES (1,226,0,0,'Bulbasaur','','フシギダネ','Fushigidane',1,0,NULL,'',7,69,'grass','poison','Seed','green','grassland',49,49,65,65,45,45,'000100',153,45,64,31,70,NULL,'',1), +(2,227,0,0,'Ivysaur','','フシギ゜り','Fushigisou',1,1,'level','16',10,130,'grass','poison','Seed','green','grassland',62,63,80,80,60,60,'000110',9,45,141,31,70,NULL,'',2), +(3,228,0,0,'Venusaur','','フシギバナ','Fushigibana',1,2,'level','32',20,1000,'grass','poison','Seed','green','grassland',82,83,100,100,80,80,'000210',154,45,208,31,70,NULL,'dpfem,dpfemback',3), +(4,229,0,0,'Charmander','','ヒトカゲ','Hitokage',2,0,NULL,'',6,85,'fire',NULL,'Lizard','red','mountain',52,43,60,50,65,39,'000001',176,45,65,31,70,NULL,'',4), +(5,230,0,0,'Charmeleon','','リザヌド','Rizaado',2,4,'level','16',11,190,'fire',NULL,'Flame','red','mountain',64,58,80,65,80,58,'000101',178,45,142,31,70,NULL,'',5), +(6,231,0,0,'Charizard','','リザヌドン','Rizaadon',2,5,'level','36',17,905,'fire','flying','Flame','red','mountain',84,78,109,85,100,78,'000300',180,45,209,31,70,NULL,'',6), +(7,232,0,0,'Squirtle','','れニガメ','Zenigame',3,0,NULL,'',5,90,'water',NULL,'Tiny Turtle','blue','water\'s edge',48,65,50,64,43,44,'001000',177,45,66,31,70,NULL,'',7), +(8,233,0,0,'Wartortle','','カメヌル','Kameeru',3,7,'level','16',10,225,'water',NULL,'Turtle','blue','water\'s edge',63,80,65,80,58,59,'001010',179,45,143,31,70,NULL,'',8), +(9,234,0,0,'Blastoise','','カメックス','Kamekkusu',3,8,'level','36',16,855,'water',NULL,'Shellfish','blue','water\'s edge',83,100,85,105,78,79,'000030',28,45,210,31,70,NULL,'',9), +(10,24,0,0,'Caterpie','','キャタピヌ','Kyatapii',4,0,NULL,'',3,29,'bug',NULL,'Worm','green','forest',30,35,20,20,45,45,'100000',123,255,53,127,70,NULL,'',10), +(11,25,0,0,'Metapod','','トランセル','Toranseru',4,10,'level','7',7,99,'bug',NULL,'Cocoon','green','forest',20,55,25,25,30,50,'002000',124,120,72,127,70,NULL,'',11), +(12,26,0,0,'Butterfree','','バタフリヌ','Batafurii',4,11,'level','10',11,320,'bug','flying','Butterfly','white','forest',45,50,80,80,70,60,'000210',125,45,160,127,70,NULL,'dpfem,dpfemback',12), +(13,27,0,0,'Weedle','','ビヌドル','Biidoru',5,0,NULL,'',3,32,'bug','poison','Hairy Bug','brown','forest',35,30,20,20,50,40,'000001',112,255,52,127,70,NULL,'',13), +(14,28,0,0,'Kakuna','','コクヌン','Kokuun',5,13,'level','7',6,100,'bug','poison','Cocoon','yellow','forest',25,50,25,25,35,45,'002000',113,120,71,127,70,NULL,'',14), +(15,29,0,0,'Beedrill','','スピアヌ','Supiaa',5,14,'level','10',10,295,'bug','poison','Poison Bee','yellow','forest',80,40,45,80,75,65,'020010',114,45,159,127,70,NULL,'',15), +(16,10,0,0,'Pidgey','','ポッポ','Poppo',6,0,NULL,'',3,18,'normal','flying','Tiny Bird','brown','forest',45,40,35,35,56,40,'000001',36,255,55,127,70,NULL,'',16), +(17,11,0,0,'Pidgeotto','','ピゞョン','Pijon',6,16,'level','18',11,300,'normal','flying','Bird','brown','forest',60,55,50,50,71,63,'000002',150,120,113,127,70,NULL,'',17), +(18,12,0,0,'Pidgeot','','ピゞョット','Pijotto',6,17,'level','36',15,395,'normal','flying','Bird','brown','forest',80,75,70,70,91,83,'000003',151,45,172,127,70,NULL,'',18), +(19,17,0,0,'Rattata','','コラッタ','Koratta',7,0,NULL,'',3,35,'normal',NULL,'Mouse','purple','grassland',56,35,25,35,72,30,'000001',165,255,57,127,70,NULL,'dpfem,dpfemback',19), +(20,18,0,0,'Raticate','','ラッタ','Ratta',7,19,'level','20',7,185,'normal',NULL,'Mouse','brown','grassland',81,60,50,70,97,55,'000002',166,127,116,127,70,NULL,'dpfem,dpfemback',20), +(21,13,0,0,'Spearow','','オニスズメ','Onisuzume',8,0,NULL,'',3,20,'normal','flying','Tiny Bird','brown','rough terrain',60,30,31,31,70,40,'000001',5,255,58,127,70,NULL,'',21), +(22,14,0,0,'Fearow','','オニドリル','Onidoriru',8,21,'level','20',12,380,'normal','flying','Beak','brown','rough terrain',90,65,61,61,100,65,'000002',35,90,162,127,70,NULL,'',22), +(23,50,0,0,'Ekans','','アヌボ','Aabo',9,0,NULL,'',20,69,'poison',NULL,'Snake','purple','grassland',60,44,40,54,55,35,'010000',108,255,62,127,70,NULL,'',23), +(24,51,0,0,'Arbok','','アヌボック','Aabokku',9,23,'level','22',35,650,'poison',NULL,'Cobra','purple','grassland',85,69,65,79,80,60,'020000',45,90,147,127,70,NULL,'',24), +(25,22,156,104,'Pikachu','','ピカチュり','Pikachuu',10,172,'happiness','',4,60,'electric',NULL,'Mouse','yellow','forest',55,30,50,40,90,35,'000002',84,190,82,127,70,NULL,'dpfem,dpfemback',25), +(26,23,157,105,'Raichu','','ラむチュり','Raichuu',10,25,'item','Thunderstone',8,300,'electric',NULL,'Mouse','yellow','forest',90,55,90,80,100,60,'000003',85,75,122,127,70,NULL,'dpfem',26), +(27,48,112,0,'Sandshrew','','サンド','Sando',11,0,NULL,'',6,120,'ground',NULL,'Mouse','yellow','rough terrain',75,85,20,30,40,50,'001000',96,255,93,127,70,'Before D/P: Took 6400 steps to hatch.','',27), +(28,49,113,0,'Sandslash','','サンドパン','Sandopan',11,27,'level','22',10,295,'ground',NULL,'Mouse','yellow','rough terrain',100,110,45,55,65,75,'002000',97,90,163,127,70,'Before D/P: Took 6400 steps to hatch.','',28), +(29,95,0,0,'Nidoran F','','ニドラン♀','Nidoran F',12,0,NULL,'',4,70,'poison',NULL,'Poison Pin','blue','grassland',47,52,40,40,41,55,'100000',15,235,59,254,70,NULL,'',29), +(30,96,0,0,'Nidorina','','ニドリヌナ','Nidoriina',12,29,'level','16',8,200,'poison',NULL,'Poison Pin','blue','grassland',62,67,55,55,56,70,'200000',168,120,117,254,70,NULL,'',30), +(31,97,0,0,'Nidoqueen','','ニドクむン','Nidokuin',12,30,'item','Moon Stone',13,600,'poison','ground','Drill','blue','grassland',82,87,75,85,76,90,'300000',16,45,194,254,70,NULL,'',31), +(32,98,0,0,'Nidoran M','','ニドラン♂','Nidoran M',13,0,NULL,'',5,90,'poison',NULL,'Poison Pin','purple','grassland',57,40,40,40,50,46,'010000',3,235,60,0,70,NULL,'',32), +(33,99,0,0,'Nidorino','','ニドリヌノ','Nidoriino',13,32,'level','16',9,195,'poison',NULL,'Poison Pin','purple','grassland',72,57,55,55,65,61,'020000',167,120,118,0,70,NULL,'',33), +(34,100,0,0,'Nidoking','','ニドキング','Nidokingu',13,33,'item','Moon Stone',14,620,'poison','ground','Drill','purple','grassland',92,77,85,75,85,81,'030000',7,45,195,0,70,NULL,'',34), +(35,41,0,100,'Clefairy','','ピッピ','Pippi',14,173,'happiness','',6,75,'normal',NULL,'Fairy','pink','mountain',45,48,60,65,35,70,'200000',4,150,68,191,140,NULL,'',35), +(36,42,0,101,'Clefable','','ピクシヌ','Pikushii',14,35,'item','Moon Stone',13,400,'normal',NULL,'Fairy','pink','mountain',70,73,85,90,60,95,'300000',142,25,129,191,140,NULL,'',36), +(37,125,153,0,'Vulpix','','ロコン','Rokon',15,0,NULL,'',6,99,'fire',NULL,'Fox','brown','grassland',41,40,50,65,65,38,'000001',82,190,63,191,70,NULL,'',37), +(38,126,154,0,'Ninetales','','キュりコン','Kyuukon',15,37,'item','Fire Stone',11,199,'fire',NULL,'Fox','yellow','grassland',76,75,81,100,100,73,'000011',83,75,178,191,70,NULL,'',38), +(39,44,138,0,'Jigglypuff','','プリン','Purin',16,174,'happiness','',5,55,'normal',NULL,'Balloon','pink','grassland',45,20,45,25,20,115,'200000',100,170,76,191,70,NULL,'',39), +(40,45,139,0,'Wigglytuff','','プクリン','Pukurin',16,39,'item','Moon Stone',10,120,'normal',NULL,'Balloon','pink','grassland',70,45,75,50,45,140,'300000',101,50,109,191,70,NULL,'',40), +(41,37,63,28,'Zubat','','ズバット','Zubatto',17,0,NULL,'',8,75,'poison','flying','Bat','purple','cave',45,35,30,40,55,40,'000001',107,255,54,127,70,NULL,'dpfem,dpfemback',41), +(42,38,64,29,'Golbat','','ゎルバット','Gorubatto',17,41,'level','22',16,550,'poison','flying','Bat','purple','cave',80,70,65,75,90,75,'000002',130,90,171,127,70,NULL,'dpfem,dpfemback',42), +(43,83,88,0,'Oddish','','ナゟノクサ','Nazonokusa',18,0,NULL,'',5,54,'grass','poison','Weed','blue','grassland',50,55,75,65,30,45,'000100',185,255,78,127,70,NULL,'',43), +(44,84,89,0,'Gloom','','クサむハナ','Kusaihana',18,43,'level','21',8,86,'grass','poison','Weed','blue','grassland',65,70,85,75,40,60,'000200',186,120,132,127,70,NULL,'dpfem,dpfemback',44), +(45,85,90,0,'Vileplume','','ラフレシア','Rafureshia',18,44,'item','Leaf Stone',12,186,'grass','poison','Flower','red','grassland',80,85,100,90,50,75,'000300',187,45,184,127,70,NULL,'dpfem,dpfemback',45), +(46,70,0,0,'Paras','','パラス','Parasu',19,0,NULL,'',3,54,'bug','grass','Mushroom','red','forest',70,55,45,55,25,35,'010000',109,190,70,127,70,NULL,'',46), +(47,71,0,0,'Parasect','','パラセクト','Parasekuto',19,46,'level','24',10,295,'bug','grass','Mushroom','red','forest',95,80,60,80,30,60,'021000',46,75,128,127,70,NULL,'',47), +(48,108,0,0,'Venonat','','コンパン','Konpan',20,0,NULL,'',10,300,'bug','poison','Insect','purple','forest',55,50,40,55,45,60,'000010',65,190,75,127,70,'Before D/P: Took 6400 steps to hatch.','',48), +(49,109,0,0,'Venomoth','','モルフォン','Morufon',20,48,'level','31',15,125,'bug','poison','Poison Moth','purple','forest',65,60,90,75,90,70,'000101',119,75,138,127,70,'Before D/P: Took 6400 steps to hatch.','',49), +(50,132,0,0,'Diglett','','ディグダ','Diguda',21,0,NULL,'',2,8,'ground',NULL,'Mole','brown','cave',55,25,35,45,95,10,'000001',59,255,81,127,70,NULL,'',50), +(51,133,0,0,'Dugtrio','','ダグトリオ','Dagutorio',21,50,'level','26',7,333,'ground',NULL,'Mole','brown','cave',80,50,50,70,120,35,'000002',118,50,153,127,70,NULL,'',51), +(52,136,0,0,'Meowth','','ニャヌス','Nyaasu',22,0,NULL,'',4,42,'normal',NULL,'Scratch Cat','yellow','urban',45,35,40,40,90,40,'000001',77,255,69,127,70,NULL,'',52), +(53,137,0,0,'Persian','','ペルシアン','Perushian',22,52,'level','28',10,320,'normal',NULL,'Classy Cat','yellow','urban',70,60,65,65,115,65,'000002',144,90,148,127,70,NULL,'',53), +(54,138,158,43,'Psyduck','','コダック','Kodakku',23,0,NULL,'',8,196,'water',NULL,'Duck','yellow','water\'s edge',52,48,65,50,55,50,'000100',47,190,80,127,70,NULL,'',54), +(55,139,159,44,'Golduck','','ゎルダック','Gorudakku',23,54,'level','33',17,766,'water',NULL,'Duck','blue','water\'s edge',82,78,95,80,85,80,'000200',128,75,174,127,70,NULL,'',55), +(56,134,0,0,'Mankey','','マンキヌ','Mankii',24,0,NULL,'',5,280,'fighting',NULL,'Pig Monkey','brown','mountain',80,35,35,45,70,40,'010000',57,190,74,127,70,NULL,'',56), +(57,135,0,0,'Primeape','','オコリザル','Okorizaru',24,56,'level','28',10,320,'fighting',NULL,'Pig Monkey','brown','mountain',105,60,60,70,95,65,'020000',117,75,149,127,70,NULL,'',57), +(58,127,0,0,'Growlithe','','ガヌディ','Gaadi',25,0,NULL,'',7,190,'fire',NULL,'Puppy','brown','grassland',70,45,70,50,60,55,'010000',33,190,91,63,70,NULL,'',58), +(59,128,0,0,'Arcanine','','りむンディ','Uindi',25,58,'item','Fire Stone',19,1550,'fire',NULL,'Legendary','brown','grassland',110,80,100,80,95,90,'020000',20,75,213,63,70,NULL,'',59), +(60,72,0,0,'Poliwag','','ニョロモ','Nyoromo',26,0,NULL,'',6,124,'water',NULL,'Tadpole','blue','water\'s edge',50,40,40,40,90,40,'000001',71,255,77,127,70,NULL,'',60), +(61,73,0,0,'Poliwhirl','','ニョロゟ','Nyorozo',26,60,'level','25',10,200,'water',NULL,'Tadpole','blue','water\'s edge',65,65,50,50,90,65,'000002',110,120,131,127,70,NULL,'',61), +(62,74,0,0,'Poliwrath','','ニョロボン','Nyorobon',26,61,'item','Water Stone',13,540,'water','fighting','Tadpole','blue','water\'s edge',85,95,70,90,70,90,'003000',111,45,185,127,70,NULL,'',62), +(63,89,39,20,'Abra','','ケヌシィ','Keeshii',27,0,NULL,'',9,195,'psychic',NULL,'Psi','brown','urban',20,15,105,55,90,25,'000100',148,200,75,63,70,'Before D/P: Base EXP was 73.','',63), +(64,90,40,21,'Kadabra','','ナンゲラヌ','Yungeraa',27,63,'level','16',13,565,'psychic',NULL,'Psi','brown','urban',35,30,120,70,105,40,'000200',38,100,145,63,70,NULL,'dpfem,dpfemback',64), +(65,91,41,22,'Alakazam','','フヌディン','Fuudin',27,64,'trade','',15,480,'psychic',NULL,'Psi','brown','urban',50,45,135,85,120,55,'000300',149,50,186,63,70,NULL,'dpfem,dpfemback',65), +(66,140,73,40,'Machop','','ワンリキヌ','Wanrikii',28,0,NULL,'',8,195,'fighting',NULL,'Superpower','gray','mountain',80,50,35,35,35,70,'010000',106,180,75,63,70,'Before D/P: Base EXP was 88.','',66), +(67,141,74,41,'Machoke','','ゎヌリキヌ','Goorikii',28,66,'level','28',15,705,'fighting',NULL,'Superpower','gray','mountain',100,70,50,60,45,80,'020000',41,90,146,63,70,NULL,'',67), +(68,142,75,42,'Machamp','','カむリキヌ','Kairikii',28,67,'trade','',16,1300,'fighting',NULL,'Superpower','gray','mountain',130,80,65,85,55,90,'030000',126,45,193,63,70,NULL,'',68), +(69,64,0,0,'Bellsprout','','マダツボミ','Madatsubomi',29,0,NULL,'',7,40,'grass','poison','Flower','green','forest',75,35,70,30,40,50,'010000',188,255,84,127,70,NULL,'',69), +(70,65,0,0,'Weepinbell','','りツドン','Utsudon',29,69,'level','21',10,64,'grass','poison','Flycatcher','green','forest',90,50,85,45,55,65,'020000',189,120,151,127,70,NULL,'',70), +(71,66,0,0,'Victreebel','','りツボット','Utsubotto',29,70,'item','Leaf Stone',17,155,'grass','poison','Flycatcher','green','forest',105,65,100,60,70,80,'030000',190,45,191,127,70,NULL,'',71), +(72,162,66,136,'Tentacool','','メノクラゲ','Menokurage',30,0,NULL,'',9,455,'water','poison','Jellyfish','blue','sea',40,35,50,100,70,40,'000010',24,190,105,127,70,NULL,'',72), +(73,163,67,137,'Tentacruel','','ドククラゲ','Dokukurage',30,72,'level','30',16,550,'water','poison','Jellyfish','blue','sea',70,65,80,120,100,80,'000020',155,60,205,127,70,NULL,'',73), +(74,34,57,31,'Geodude','','むシツブテ','Ishitsubute',31,0,NULL,'',4,200,'rock','ground','Rock','brown','mountain',80,100,30,30,20,40,'001000',169,255,73,127,70,'Before D/P: Base EXP was 86.','',74), +(75,35,58,32,'Graveler','','ゎロヌン','Goroon',31,74,'level','25',10,1050,'rock','ground','Rock','brown','mountain',95,115,45,45,35,55,'002000',39,120,134,127,70,NULL,'',75), +(76,36,59,33,'Golem','','ゎロヌニャ','Goroonya',31,75,'trade','',14,3000,'rock','ground','Megaton','brown','mountain',110,130,55,65,45,80,'003000',49,45,177,127,70,NULL,'',76), +(77,201,0,90,'Ponyta','','ポニヌタ','Poniita',32,0,NULL,'',10,300,'fire',NULL,'Fire Horse','yellow','grassland',85,55,65,65,90,50,'000001',163,190,152,127,70,NULL,'',77), +(78,202,0,91,'Rapidash','','ギャロップ','Gyaroppu',32,77,'level','40',17,950,'fire',NULL,'Fire Horse','yellow','grassland',100,70,80,80,105,65,'000002',164,60,192,127,70,NULL,'',78), +(79,80,0,0,'Slowpoke','','ダドン','Yadon',33,0,NULL,'',12,360,'water','psychic','Dopey','pink','water\'s edge',65,65,40,40,15,90,'100000',37,190,99,127,70,NULL,'',79), +(80,81,0,0,'Slowbro','','ダドラン','Yadoran',33,79,'level','37',16,785,'water','psychic','Hermit Crab','pink','water\'s edge',75,110,100,80,30,95,'002000',8,75,164,127,70,NULL,'',80), +(81,118,82,0,'Magnemite','','コむル','Koiru',34,0,NULL,'',3,60,'electric','steel','Magnet','gray','rough terrain',35,70,95,55,45,25,'000100',173,190,89,255,70,NULL,'',81), +(82,119,83,0,'Magneton','','レアコむル','Reakoiru',34,81,'level','30',10,600,'electric','steel','Magnet','gray','rough terrain',60,95,120,70,70,50,'000200',54,60,161,255,70,NULL,'',82), +(83,158,0,0,'Farfetch\'d','','カモネギ','Kamonegi',35,0,NULL,'',8,150,'normal','flying','Wild Duck','brown','grassland',65,55,58,62,60,52,'010000',64,45,94,127,70,NULL,'',83), +(84,199,92,0,'Doduo','','ドヌドヌ','Doodoo',36,0,NULL,'',14,392,'normal','flying','Twin Bird','brown','grassland',85,45,35,35,75,35,'010000',70,190,96,127,70,NULL,'dpfem,dpfemback',84), +(85,200,93,0,'Dodrio','','ドヌドリオ','Doodorio',36,84,'level','31',18,852,'normal','flying','Triple Bird','brown','grassland',110,70,60,60,100,60,'020000',116,45,158,127,70,NULL,'dpfem,dpfemback',85), +(86,176,0,0,'Seel','','パりワり','Pauwau',37,0,NULL,'',11,900,'water',NULL,'Sea Lion','white','sea',45,55,45,70,45,65,'000010',58,190,100,127,70,NULL,'',86), +(87,177,0,0,'Dewgong','','ゞュゎン','Jugon',37,86,'level','34',17,1200,'water','ice','Sea Lion','white','sea',70,80,70,95,70,90,'000020',120,75,176,127,70,NULL,'',87), +(88,116,106,0,'Grimer','','ベトベタヌ','Betobetaa',38,0,NULL,'',9,300,'poison',NULL,'Sludge','purple','urban',80,50,40,50,25,80,'100000',13,190,90,127,70,NULL,'',88), +(89,117,107,0,'Muk','','ベトベトン','Betobeton',38,88,'level','38',12,300,'poison',NULL,'Sludge','purple','urban',105,75,65,100,50,105,'110000',136,75,157,127,70,NULL,'',89), +(90,169,0,0,'Shellder','','シェルダヌ','Sherudaa',39,0,NULL,'',3,40,'water',NULL,'Bivalve','purple','sea',65,100,45,25,40,30,'001000',23,190,97,127,70,NULL,'',90), +(91,170,0,0,'Cloyster','','パルシェン','Parushen',39,90,'item','Water Stone',15,1325,'water','ice','Bivalve','purple','sea',95,180,85,45,70,50,'002000',139,60,203,127,70,NULL,'',91), +(92,58,0,69,'Gastly','','ゎヌス','Goosu',40,0,NULL,'',13,1,'ghost','poison','Gas','purple','cave',35,30,100,35,80,30,'000100',25,190,95,127,70,NULL,'',92), +(93,59,0,70,'Haunter','','ゎヌスト','Goosuto',40,92,'level','25',16,1,'ghost','poison','Gas','purple','cave',50,45,115,55,95,45,'000200',147,90,126,127,70,NULL,'',93), +(94,60,0,71,'Gengar','','ゲンガヌ','Gengaa',40,93,'trade','',15,405,'ghost','poison','Shadow','purple','cave',65,60,130,75,110,60,'000300',14,45,190,127,70,NULL,'',94), +(95,62,0,34,'Onix','','むワヌク','Iwaaku',41,0,NULL,'',88,2100,'rock','ground','Rock Snake','gray','cave',45,160,30,45,70,35,'001000',34,45,108,127,70,NULL,'',95), +(96,87,0,0,'Drowzee','','スリヌプ','Suriipu',42,0,NULL,'',10,324,'psychic',NULL,'Hypnosis','yellow','grassland',48,45,43,90,42,60,'000010',48,190,102,127,70,NULL,'',96), +(97,88,0,0,'Hypno','','スリヌパヌ','Suriipaa',42,96,'level','26',16,756,'psychic',NULL,'Hypnosis','yellow','grassland',73,70,73,115,67,85,'000020',129,75,165,127,70,NULL,'dpfem,dpfemback',97), +(98,164,0,0,'Krabby','','クラブ','Kurabu',43,0,NULL,'',4,65,'water',NULL,'River Crab','red','water\'s edge',105,90,25,25,50,30,'010000',78,225,115,127,70,NULL,'',98), +(99,165,0,0,'Kingler','','キングラヌ','Kinguraa',43,98,'level','28',13,600,'water',NULL,'Pincer','red','water\'s edge',130,115,50,50,75,55,'020000',138,60,206,127,70,NULL,'',99), +(100,120,84,0,'Voltorb','','ビリリダマ','Biriridama',44,0,NULL,'',5,104,'electric',NULL,'Ball','red','urban',30,50,55,55,100,40,'000001',6,190,103,255,70,NULL,'',100), +(101,121,85,0,'Electrode','','マルマむン','Marumain',44,100,'level','30',12,666,'electric',NULL,'Ball','red','urban',50,70,80,80,140,60,'000002',141,60,150,255,70,NULL,'',101), +(102,104,0,0,'Exeggcute','','タマタマ','Tamatama',45,0,NULL,'',4,25,'grass','psychic','Egg','pink','forest',40,80,60,45,40,60,'001000',12,90,98,127,70,NULL,'',102), +(103,105,0,0,'Exeggutor','','ナッシヌ','Nasshii',45,102,'item','Leaf Stone',20,1200,'grass','psychic','Coconut','yellow','forest',95,85,125,65,55,95,'000200',10,45,212,127,70,NULL,'',103), +(104,203,0,0,'Cubone','','カラカラ','Karakara',46,0,NULL,'',4,65,'ground',NULL,'Lonely','brown','mountain',50,95,40,50,35,50,'001000',17,190,87,127,70,NULL,'',104), +(105,204,0,0,'Marowak','','ガラガラ','Garagara',46,104,'level','28',10,450,'ground',NULL,'Bone Keeper','brown','mountain',80,110,50,80,45,60,'002000',145,75,124,127,70,NULL,'',105), +(106,144,0,0,'Hitmonlee','','サワムラヌ','Sawamuraa',47,236,'level+attack','20',15,498,'fighting',NULL,'Kicking','brown','urban',120,53,35,110,87,50,'020000',43,45,139,0,70,NULL,'',106), +(107,145,0,0,'Hitmonchan','','゚ビワラヌ','Ebiwaraa',47,236,'level+defense','20',14,502,'fighting',NULL,'Punching','brown','urban',105,79,35,110,76,50,'000020',44,45,140,0,70,NULL,'',107), +(108,178,0,0,'Lickitung','','ベロリンガ','Beroringa',48,0,NULL,'',12,655,'normal',NULL,'Licking','pink','grassland',55,75,60,75,30,90,'200000',11,45,127,127,70,NULL,'',108), +(109,114,108,0,'Koffing','','ドガヌス','Dogaasu',49,0,NULL,'',6,10,'poison',NULL,'Poison Gas','purple','urban',65,95,60,45,35,40,'001000',55,190,114,127,70,NULL,'',109), +(110,115,109,0,'Weezing','','マタドガス','Matadogasu',49,109,'level','35',12,95,'poison',NULL,'Poison Gas','purple','urban',90,120,85,70,60,65,'002000',143,60,173,127,70,NULL,'',110), +(111,206,169,0,'Rhyhorn','','サむホヌン','Saihoon',50,0,NULL,'',10,1150,'ground','rock','Spikes','gray','rough terrain',85,95,30,30,25,80,'001000',1,120,135,127,70,NULL,'dpfem,dpfemback',111), +(112,207,170,0,'Rhydon','','サむドン','Saidon',50,111,'level','42',19,1200,'ground','rock','Drill','gray','rough terrain',130,120,45,45,40,105,'020000',18,60,204,127,70,NULL,'dpfem,dpfemback',112), +(113,217,0,97,'Chansey','','ラッキヌ','Rakkii',51,440,'holdday','Oval Stone',11,346,'normal',NULL,'Egg','pink','urban',5,5,35,105,50,250,'200000',40,30,255,254,140,NULL,'',113), +(114,179,0,0,'Tangela','','モンゞャラ','Monjara',52,0,NULL,'',10,350,'grass',NULL,'Vine','blue','grassland',55,115,100,40,60,65,'001000',30,45,166,127,70,NULL,'',114), +(115,205,0,0,'Kangaskhan','','ガルヌラ','Garuura',53,0,NULL,'',22,800,'normal',NULL,'Parent','brown','grassland',95,80,40,80,90,105,'200000',2,45,175,254,70,NULL,'',115), +(116,186,184,0,'Horsea','','タッツヌ','Tattsuu',54,0,NULL,'',4,80,'water',NULL,'Dragon','blue','sea',40,70,70,25,60,30,'000100',92,225,83,127,70,NULL,'',116), +(117,187,185,0,'Seadra','','シヌドラ','Shiidora',54,116,'level','32',12,250,'water',NULL,'Dragon','blue','sea',65,95,95,45,85,55,'001100',93,75,155,127,70,NULL,'',117), +(118,78,50,78,'Goldeen','','トサキント','Tosakinto',55,0,NULL,'',6,150,'water',NULL,'Goldfish','red','water\'s edge',67,60,35,50,63,45,'010000',157,225,111,127,70,NULL,'dpfem,dpfemback',118), +(119,79,51,79,'Seaking','','アズマオり','Azumaou',55,118,'level','33',13,390,'water',NULL,'Goldfish','red','water\'s edge',92,65,65,80,68,80,'020000',158,60,170,127,70,NULL,'dpfem,dpfemback',119), +(120,167,143,0,'Staryu','','ヒトデマン','Hitodeman',56,0,NULL,'',8,345,'water',NULL,'Star Shape','brown','sea',45,55,70,55,85,30,'000001',27,225,106,255,70,NULL,'',120), +(121,168,144,0,'Starmie','','スタヌミヌ','Sutaamii',56,120,'item','Water Stone',11,800,'water','psychic','Mysterious','purple','sea',75,85,100,85,115,60,'000002',152,60,207,255,70,NULL,'',121), +(122,156,0,95,'Mr. Mime','','バリダヌド','Bariyaado',57,439,'move','102',13,545,'psychic',NULL,'Barrier','pink','urban',45,65,100,120,90,40,'000020',42,45,136,127,70,NULL,'',122), +(123,110,0,0,'Scyther','','ストラむク','Sutoraiku',58,0,NULL,'',15,560,'bug','flying','Mantis','green','grassland',110,80,55,80,105,70,'010000',26,45,187,127,70,NULL,'dpfem',123), +(124,153,0,0,'Jynx','','ルヌゞュラ','Ruujura',59,238,'level','30',14,406,'ice','psychic','Human Shape','red','urban',50,35,115,95,95,65,'000200',72,45,137,254,70,NULL,'',124), +(125,155,0,0,'Electabuzz','','゚レブヌ','Erebuu',60,239,'level','30',11,300,'electric',NULL,'Electric','yellow','grassland',83,57,95,85,105,65,'000002',53,45,156,63,70,NULL,'',125), +(126,151,0,0,'Magmar','','ブヌバヌ','Buubaa',61,240,'level','30',13,445,'fire',NULL,'Spitfire','red','mountain',95,57,100,85,93,65,'000200',51,45,167,63,70,NULL,'',126), +(127,112,167,0,'Pinsir','','カむロス','Kairosu',62,0,NULL,'',15,550,'bug',NULL,'Stag Beetle','brown','forest',125,100,55,70,85,65,'020000',29,45,200,127,70,NULL,'',127), +(128,148,0,0,'Tauros','','ケンタロス','Kentarosu',63,0,NULL,'',14,884,'normal',NULL,'Wild Bull','brown','grassland',100,95,40,70,110,75,'010001',60,45,211,0,70,NULL,'',128), +(129,76,52,23,'Magikarp','','コむキング','Koikingu',64,0,NULL,'',9,100,'water',NULL,'Fish','red','water\'s edge',10,55,15,20,80,20,'000001',133,255,20,127,70,NULL,'dpfem,dpfemback',129), +(130,77,53,24,'Gyarados','','ギャラドス','Gyaradosu',64,129,'level','20',65,2350,'water','flying','Atrocious','blue','water\'s edge',125,79,60,100,81,95,'020000',22,45,214,127,70,NULL,'dpfem,dpfemback',130), +(131,219,0,0,'Lapras','','ラプラス','Rapurasu',65,0,NULL,'',25,2200,'water','ice','Transport','blue','sea',85,80,85,95,60,130,'200000',19,45,219,127,70,NULL,'',131), +(132,92,0,0,'Ditto','','メタモン','Metamon',66,0,NULL,'',3,40,'normal',NULL,'Transform','purple','urban',48,48,48,48,48,48,'100000',76,35,61,255,70,NULL,'',132), +(133,180,0,0,'Eevee','','むヌブむ','Iibui',67,0,NULL,'',3,65,'normal',NULL,'Evolution','brown','urban',55,50,45,65,55,55,'000010',102,45,92,31,70,NULL,'',133), +(134,181,0,0,'Vaporeon','','シャワヌズ','Shawaazu',67,133,'item','Water Stone',10,290,'water',NULL,'Bubble Jet','blue','urban',65,60,110,95,65,130,'200000',105,45,196,31,70,NULL,'',134), +(135,182,0,0,'Jolteon','','サンダヌス','Sandaasu',67,133,'item','Thunderstone',8,245,'electric',NULL,'Lightning','yellow','urban',65,60,110,95,130,65,'000002',104,45,197,31,70,NULL,'',135), +(136,183,0,0,'Flareon','','ブヌスタヌ','Buusutaa',67,133,'item','Fire Stone',9,250,'fire',NULL,'Flame','red','urban',130,60,95,110,65,65,'020000',103,45,198,31,70,NULL,'',136), +(137,215,0,0,'Porygon','','ポリゎン','Porigon',68,0,NULL,'',8,365,'normal',NULL,'Virtual','pink','urban',60,70,85,75,40,65,'000100',170,45,130,255,70,NULL,'',137), +(138,220,0,0,'Omanyte','','オムナむト','Omunaito',69,0,NULL,'',4,75,'rock','water','Spiral','blue','sea',40,100,90,55,35,35,'001000',98,45,99,31,70,'Before D/P: Base EXP was 120.','',138), +(139,221,0,0,'Omastar','','オムスタヌ','Omusutaa',69,138,'level','40',10,350,'rock','water','Spiral','blue','sea',60,125,115,70,55,70,'002000',99,45,199,31,70,NULL,'',139), +(140,222,0,0,'Kabuto','','カブト','Kabuto',70,0,NULL,'',5,115,'rock','water','Shellfish','brown','sea',80,90,55,45,55,30,'001000',90,45,99,31,70,'Before D/P: Base EXP was 119.','',140), +(141,223,0,0,'Kabutops','','カブトプス','Kabutopusu',70,140,'level','40',13,405,'rock','water','Shellfish','brown','sea',115,105,65,70,80,60,'020000',91,45,199,31,70,'Before D/P: Base EXP was 201.','',141), +(142,224,0,0,'Aerodactyl','','プテラ','Putera',71,0,NULL,'',18,590,'rock','flying','Fossil','purple','mountain',105,65,60,75,130,80,'000002',171,45,202,31,70,NULL,'',142), +(143,225,0,113,'Snorlax','','カビゎン','Kabigon',72,446,'happiness','',21,4600,'normal',NULL,'Sleeping','black','mountain',110,65,65,110,30,160,'200000',132,25,154,31,70,NULL,'',143), +(144,235,0,0,'Articuno','','フリヌザヌ','Furiizaa',73,0,NULL,'',17,554,'ice','flying','Freeze','blue','rare',85,100,95,125,85,90,'000030',74,3,215,255,35,NULL,'',144), +(145,236,0,0,'Zapdos','','サンダヌ','Sandaa',74,0,NULL,'',16,526,'electric','flying','Electric','yellow','rare',90,85,125,90,100,90,'000300',75,3,216,255,35,NULL,'',145), +(146,237,0,0,'Moltres','','ファむダヌ','Faiyaa',75,0,NULL,'',20,600,'fire','flying','Flame','yellow','rare',100,90,125,85,90,90,'000300',73,3,217,255,35,NULL,'',146), +(147,241,0,0,'Dratini','','ミニリュり','Miniryuu',76,0,NULL,'',18,33,'dragon',NULL,'Dragon','blue','water\'s edge',64,45,50,50,50,41,'010000',88,45,67,127,35,NULL,'',147), +(148,242,0,0,'Dragonair','','ハクリュヌ','Hakuryuu',76,147,'level','30',40,165,'dragon',NULL,'Dragon','blue','water\'s edge',84,65,70,70,70,61,'020000',89,45,144,127,35,NULL,'',148), +(149,243,0,0,'Dragonite','','カむリュヌ','Kairyuu',76,148,'level','55',22,2100,'dragon','flying','Dragon','brown','water\'s edge',134,95,100,100,80,91,'030000',66,45,218,127,35,NULL,'',149), +(150,249,0,0,'Mewtwo','','ミュりツヌ','Myuutsuu',77,0,NULL,'',20,1220,'psychic',NULL,'Genetic','purple','rare',110,90,154,90,130,106,'000300',131,3,220,255,0,NULL,'',150), +(151,250,0,0,'Mew','','ミュり','Myuu',78,0,NULL,'',4,40,'psychic',NULL,'New Species','pink','rare',100,100,100,100,100,100,'300000',21,45,64,255,100,NULL,'',151), +(152,1,0,0,'Chikorita','','チコリヌタ','Chikoriita',79,0,NULL,'',9,64,'grass',NULL,'Leaf','green','grassland',49,65,49,65,45,45,'000010',NULL,45,64,31,70,NULL,'',152), +(153,2,0,0,'Bayleef','','べむリヌフ','Beiriifu',79,152,'level','16',12,158,'grass',NULL,'Leaf','green','grassland',62,80,63,80,60,60,'001010',NULL,45,141,31,70,NULL,'',153), +(154,3,0,0,'Meganium','','メガニりム','Meganiumu',79,153,'level','32',18,1005,'grass',NULL,'Herb','green','grassland',82,100,83,100,80,80,'001020',NULL,45,208,31,70,NULL,'dpfem,dpfemback',154), +(155,4,0,0,'Cyndaquil','','ヒノアラシ','Hinoarashi',80,0,NULL,'',5,79,'fire',NULL,'Fire Mouse','yellow','grassland',52,43,60,50,65,39,'000001',NULL,45,65,31,70,NULL,'',155), +(156,5,0,0,'Quilava','','マグマラシ','Magumarashi',80,155,'level','14',9,190,'fire',NULL,'Volcano','yellow','grassland',64,58,80,65,80,58,'000101',NULL,45,142,31,70,NULL,'',156), +(157,6,0,0,'Typhlosion','','バクフヌン','Bakufuun',80,156,'level','36',17,795,'fire',NULL,'Volcano','yellow','grassland',84,78,109,85,100,78,'000300',NULL,45,209,31,70,NULL,'',157), +(158,7,0,0,'Totodile','','ワニノコ','Waninoko',81,0,NULL,'',6,95,'water',NULL,'Big Jaw','blue','water\'s edge',65,64,44,48,43,50,'010000',NULL,45,66,31,70,NULL,'',158), +(159,8,0,0,'Croconaw','','アリゲむツ','Arigeitsu',81,158,'level','18',11,250,'water',NULL,'Big Jaw','blue','water\'s edge',80,80,59,63,58,65,'011000',NULL,45,143,31,70,NULL,'',159), +(160,9,0,0,'Feraligatr','','オヌダむル','Oodairu',81,159,'level','30',23,888,'water',NULL,'Big Jaw','blue','water\'s edge',105,100,79,83,78,85,'021000',NULL,45,210,31,70,NULL,'',160), +(161,19,0,0,'Sentret','','オタチ','Otachi',82,0,NULL,'',8,60,'normal',NULL,'Scout','brown','grassland',46,34,35,45,20,35,'010000',NULL,255,57,127,70,NULL,'',161), +(162,20,0,0,'Furret','','オオタチ','Ootachi',82,161,'level','15',18,325,'normal',NULL,'Long Body','brown','grassland',76,64,45,55,90,85,'000002',NULL,90,116,127,70,NULL,'',162), +(163,15,0,106,'Hoothoot','','ホヌホヌ','Hoohoo',83,0,NULL,'',7,212,'normal','flying','Owl','brown','forest',30,30,36,56,50,60,'100000',NULL,255,58,127,70,NULL,'',163), +(164,16,0,107,'Noctowl','','ペルノズク','Yorunozuku',83,163,'level','20',16,408,'normal','flying','Owl','brown','forest',50,50,76,96,70,100,'200000',NULL,90,162,127,70,NULL,'',164), +(165,30,0,0,'Ledyba','','レディバ','Rediba',84,0,NULL,'',10,108,'bug','flying','Five Star','red','forest',20,30,40,80,55,40,'000010',NULL,255,54,127,70,NULL,'dpfem,dpfemback',165), +(166,31,0,0,'Ledian','','レディアン','Redian',84,165,'level','18',14,356,'bug','flying','Five Star','red','forest',35,50,55,110,85,55,'000020',NULL,90,134,127,70,NULL,'dpfem,dpfemback',166), +(167,32,0,0,'Spinarak','','むトマル','Itomaru',85,0,NULL,'',5,85,'bug','poison','String Spit','green','forest',60,40,40,40,30,40,'010000',NULL,255,54,127,70,NULL,'',167), +(168,33,0,0,'Ariados','','アリアドス','Ariadosu',85,167,'level','22',11,335,'bug','poison','Long Leg','red','forest',90,70,60,60,40,70,'020000',NULL,90,134,127,70,NULL,'',168), +(169,39,65,30,'Crobat','','クロバット','Kurobatto',17,42,'happiness','',18,750,'poison','flying','Bat','purple','cave',90,80,70,80,130,85,'000003',NULL,90,204,127,70,NULL,'',169), +(170,174,181,0,'Chinchou','','チョンチヌ','Chonchii',86,0,NULL,'',5,120,'water','electric','Angler','blue','sea',38,38,56,56,67,75,'100000',NULL,190,90,127,70,NULL,'',170), +(171,175,182,0,'Lanturn','','ランタヌン','Rantaan',86,170,'level','27',12,225,'water','electric','Light','blue','sea',58,58,76,76,67,125,'200000',NULL,75,156,127,70,NULL,'',171), +(172,21,155,103,'Pichu','','ピチュヌ','Pichuu',10,0,NULL,'',3,20,'electric',NULL,'Tiny Mouse','yellow','forest',40,15,35,35,60,20,'000001',NULL,190,42,127,70,NULL,'baby',172), +(173,40,0,99,'Cleffa','','ピィ','Pii',14,0,NULL,'',3,30,'normal',NULL,'Star Shape','pink','mountain',25,28,45,55,15,50,'000010',NULL,150,37,191,140,NULL,'baby',173), +(174,43,137,0,'Igglybuff','','ププリン','Pupurin',16,0,NULL,'',3,10,'normal',NULL,'Balloon','pink','grassland',30,15,40,20,15,90,'100000',NULL,170,39,191,70,NULL,'baby',174), +(175,46,0,0,'Togepi','','トゲピヌ','Togepii',87,0,NULL,'',3,15,'normal',NULL,'Spike Ball','white','forest',20,65,40,65,20,35,'000010',NULL,190,74,31,70,NULL,'',175), +(176,47,0,0,'Togetic','','トゲチック','Togechikku',87,175,'happiness','',6,32,'normal','flying','Happiness','white','forest',40,85,80,105,40,55,'000020',NULL,75,114,31,70,NULL,'',176), +(177,159,162,0,'Natu','','ネむティ','Neiti',88,0,NULL,'',2,20,'psychic','flying','Tiny Bird','green','forest',50,45,70,45,70,40,'000100',NULL,190,73,127,70,NULL,'',177), +(178,160,163,0,'Xatu','','ネむティオ','Neitio',88,177,'level','25',15,150,'psychic','flying','Mystic','green','forest',75,70,95,70,95,65,'000101',NULL,75,171,127,70,NULL,'dpfem,dpfemback',178), +(179,53,0,0,'Mareep','','メリヌプ','Meriipu',89,0,NULL,'',6,78,'electric',NULL,'Wool','white','grassland',40,40,65,45,35,55,'000100',NULL,235,59,127,70,NULL,'',179), +(180,54,0,0,'Flaaffy','','モココ','Mokoko',89,179,'level','15',8,133,'electric',NULL,'Wool','pink','grassland',55,55,80,60,45,70,'000200',NULL,120,117,127,70,NULL,'',180), +(181,55,0,0,'Ampharos','','デンリュり','Denryuu',89,180,'level','30',14,615,'electric',NULL,'Light','yellow','grassland',75,75,115,90,55,90,'000300',NULL,45,194,127,70,NULL,'',181), +(182,86,91,0,'Bellossom','','キレむハナ','Kireihana',18,44,'item','Sun Stone',4,58,'grass',NULL,'Flower','green','grassland',80,85,90,100,50,75,'000030',NULL,45,184,127,70,NULL,'',182), +(183,130,55,125,'Marill','','マリル','Mariru',90,298,'happiness','',4,85,'water',NULL,'Aqua Mouse','blue','water\'s edge',20,50,20,50,40,70,'200000',NULL,190,58,127,70,NULL,'',183), +(184,131,56,126,'Azumarill','','マリルリ','Mariruri',90,183,'level','18',8,285,'water',NULL,'Aqua Rabbit','blue','water\'s edge',50,80,50,80,50,100,'300000',NULL,75,153,127,70,NULL,'',184), +(185,106,0,93,'Sudowoodo','','り゜ッキヌ','Usokkii',91,438,'move','102',12,380,'rock',NULL,'Imitation','brown','forest',100,115,30,65,30,70,'002000',NULL,65,135,127,70,NULL,'dpfem,dpfemback',185), +(186,75,0,0,'Politoed','','ニョロトノ','Nyorotono',26,61,'trade','King\'s Rock',11,339,'water',NULL,'Frog','green','water\'s edge',75,75,90,100,70,90,'000030',NULL,45,185,127,70,NULL,'dpfem,dpfemback',186), +(187,67,0,0,'Hoppip','','ハネッコ','Hanekko',92,0,NULL,'',4,5,'grass','flying','Cottonweed','pink','grassland',35,40,35,55,50,35,'000010',NULL,255,74,127,70,NULL,'',187), +(188,68,0,0,'Skiploom','','ポポッコ','Popokko',92,187,'level','18',6,10,'grass','flying','Cottonweed','green','grassland',45,50,45,65,80,55,'000002',NULL,120,136,127,70,NULL,'',188), +(189,69,0,0,'Jumpluff','','ワタッコ','Watakko',92,188,'level','27',8,30,'grass','flying','Cottonweed','blue','grassland',55,70,55,85,110,75,'000003',NULL,45,176,127,70,NULL,'',189), +(190,122,0,63,'Aipom','','゚むパム','Eipamu',93,0,NULL,'',8,115,'normal',NULL,'Long Tail','purple','forest',70,55,40,55,85,55,'000001',NULL,45,94,127,70,NULL,'dpfem,dpfemback',190), +(191,102,0,0,'Sunkern','','ヒマナッツ','Himanattsu',94,0,NULL,'',3,18,'grass',NULL,'Seed','yellow','grassland',30,30,30,30,30,30,'000100',NULL,235,52,127,70,NULL,'',191), +(192,103,0,0,'Sunflora','','キマワリ','Kimawari',94,191,'item','Sun Stone',8,85,'grass',NULL,'Sun','yellow','grassland',75,55,105,85,30,75,'000200',NULL,120,146,127,70,NULL,'',192), +(193,101,0,0,'Yanma','','ダンダンマ','Yanyanma',95,0,NULL,'',12,380,'bug','flying','Clear Wing','red','forest',65,45,75,45,95,65,'000001',NULL,75,147,127,70,'Before D/P: Effort points were 2 speed.','',193), +(194,56,0,117,'Wooper','','りパヌ','Upaa',96,0,NULL,'',4,85,'water','ground','Water Fish','blue','water\'s edge',45,45,25,25,15,55,'100000',NULL,255,52,127,70,NULL,'dpfem,dpfemback',194), +(195,57,0,118,'Quagsire','','ヌオヌ','Nuoo',96,194,'level','20',14,750,'water','ground','Water Fish','blue','water\'s edge',85,85,65,65,35,95,'200000',NULL,90,137,127,70,NULL,'dpfem,dpfemback',195), +(196,184,0,0,'Espeon','','゚ヌフィ','Eefi',67,133,'happinessday','Sun Shard',9,265,'psychic',NULL,'Sun','purple','urban',65,60,130,95,110,65,'000200',NULL,45,197,31,70,NULL,'',196), +(197,185,0,0,'Umbreon','','ブラッキヌ','Burakkii',67,133,'happinessnight','Moon Shard',10,270,'dark',NULL,'Moonlight','black','urban',65,110,60,130,65,95,'000020',NULL,45,197,31,35,NULL,'',197), +(198,208,0,74,'Murkrow','','ダミカラス','Yamikarasu',97,0,NULL,'',5,21,'dark','flying','Darkness','black','forest',85,42,85,42,91,60,'000001',NULL,30,107,127,35,NULL,'dpfem,dpfemback',198), +(199,82,0,0,'Slowking','','ダドキング','Yadokingu',33,79,'trade','King\'s Rock',20,795,'water','psychic','Royal','pink','water\'s edge',75,80,100,110,30,95,'000030',NULL,70,164,127,70,NULL,'',199), +(200,214,0,72,'Misdreavus','','ムりマ','Muuma',98,0,NULL,'',7,10,'ghost',NULL,'Screech','gray','cave',60,60,85,85,85,60,'000010',NULL,45,147,127,35,'Before D/P: Effort points were 1 Special Attack and 1 Special Defense.','',200), +(201,61,0,114,'Unown','','アンノヌン','Annoon',99,0,NULL,'',5,50,'psychic',NULL,'Symbol','black','rare',72,48,72,48,48,48,'010100',NULL,225,61,255,70,NULL,'',201), +(202,107,161,0,'Wobbuffet','','゜ヌナンス','Soonansu',100,360,'level','15',13,285,'psychic',NULL,'Patient','blue','cave',33,58,33,58,33,190,'200000',NULL,45,177,127,70,NULL,'dpfem,dpfemback',202), +(203,147,164,121,'Girafarig','','キリンリキ','Kirinriki',101,0,NULL,'',15,415,'normal','psychic','Long Neck','yellow','grassland',80,65,90,65,85,70,'000200',NULL,60,149,127,70,NULL,'dpfem,dpfemback',203), +(204,93,0,0,'Pineco','','クヌギダマ','Kunugidama',102,0,NULL,'',6,72,'bug',NULL,'Bagworm','gray','forest',65,90,35,35,15,50,'001000',NULL,190,60,127,70,NULL,'',204), +(205,94,0,0,'Forretress','','フォレトス','Foretosu',102,204,'level','31',12,1258,'bug','steel','Bagworm','purple','forest',90,140,60,60,40,75,'002000',NULL,75,118,127,70,NULL,'',205), +(206,52,0,0,'Dunsparce','','ノコッチ','Nokocchi',103,0,NULL,'',15,140,'normal',NULL,'Land Snake','yellow','cave',70,70,65,65,45,100,'100000',NULL,190,125,127,70,'Before D/P: Base EXP was 75.','',206), +(207,189,0,0,'Gligar','','グラむガヌ','Guraigaa',104,0,NULL,'',11,648,'ground','flying','FlyScorpion','purple','mountain',75,105,35,65,85,65,'001000',NULL,60,108,127,70,NULL,'dpfem',207), +(208,63,0,35,'Steelix','','ハガネヌル','Haganeeru',41,95,'trade','Metal Coat',92,4000,'steel','ground','Iron Snake','gray','cave',85,200,55,65,30,75,'002000',NULL,25,196,127,70,NULL,'dpfem,dpfemback',208), +(209,123,0,0,'Snubbull','','ブルヌ','Buruu',105,0,NULL,'',6,78,'normal',NULL,'Fairy','pink','urban',80,50,40,40,30,60,'010000',NULL,190,63,191,70,NULL,'',209), +(210,124,0,0,'Granbull','','グランブル','Guranburu',105,209,'level','23',14,487,'normal',NULL,'Fairy','purple','urban',120,75,60,60,45,90,'020000',NULL,75,178,191,70,NULL,'',210), +(211,161,0,0,'Qwilfish','','ハリヌセン','Hariisen',106,0,NULL,'',5,39,'water','poison','Balloon','gray','sea',95,75,55,55,85,65,'010000',NULL,45,100,127,70,NULL,'',211), +(212,111,0,0,'Scizor','','ハッサム','Hassamu',58,123,'trade','Metal Coat',18,1180,'bug','steel','Pincer','red','grassland',130,100,55,80,65,70,'020000',NULL,25,200,127,70,NULL,'dpfem',212), +(213,166,0,0,'Shuckle','','ツボツボ','Tsubotsubo',107,0,NULL,'',6,205,'bug','rock','Mold','yellow','mountain',10,230,10,230,5,20,'001010',NULL,190,80,127,70,NULL,'',213), +(214,113,168,62,'Heracross','','ぞラクロス','Herakurosu',108,0,NULL,'',15,540,'bug','fighting','Single Horn','blue','forest',125,75,40,95,85,80,'020000',NULL,45,200,127,70,NULL,'dpfem,dpfemback',214), +(215,213,0,144,'Sneasel','','ニュヌラ','Nyuura',109,0,NULL,'',9,280,'dark','ice','Sharp Claw','black','forest',95,55,35,75,115,55,'000001',NULL,60,132,127,35,NULL,'dpfem,dpfemback',215), +(216,193,0,0,'Teddiursa','','ヒメグマ','Himeguma',110,0,NULL,'',6,88,'normal',NULL,'Little Bear','brown','mountain',80,50,50,50,40,60,'010000',NULL,120,124,127,70,NULL,'',216), +(217,194,0,0,'Ursaring','','リングマ','Ringuma',110,216,'level','30',18,1258,'normal',NULL,'Hibernator','brown','mountain',130,75,75,75,55,90,'020000',NULL,60,189,127,70,NULL,'dpfem,dpfemback',217), +(218,211,103,0,'Slugma','','マグマッグ','Magumaggu',111,0,NULL,'',7,350,'fire',NULL,'Lava','red','mountain',40,40,70,40,20,40,'000100',NULL,190,78,127,70,NULL,'',218), +(219,212,104,0,'Magcargo','','マグカルゎ','Magukarugo',111,218,'level','38',8,550,'fire','rock','Lava','red','mountain',50,120,80,80,30,50,'002000',NULL,75,154,127,70,NULL,'',219), +(220,191,0,0,'Swinub','','りリムヌ','Urimuu',112,0,NULL,'',4,65,'ice','ground','Pig','brown','cave',50,40,30,30,50,50,'010000',NULL,225,78,127,70,NULL,'',220), +(221,192,0,0,'Piloswine','','むノムヌ','Inomuu',112,220,'level','33',11,558,'ice','ground','Swine','brown','cave',100,80,60,60,50,100,'110000',NULL,75,160,127,70,NULL,'dpfem,dpfemback',221), +(222,171,180,0,'Corsola','','サニヌゎ','Saniigo',113,0,NULL,'',6,50,'water','rock','Coral','pink','sea',55,85,65,85,35,55,'001010',NULL,60,113,191,70,NULL,'',222), +(223,172,0,132,'Remoraid','','テッポりオ','Teppouo',114,0,NULL,'',6,120,'water',NULL,'Jet','gray','sea',65,35,65,35,65,35,'000100',NULL,190,78,127,70,NULL,'',223), +(224,173,0,133,'Octillery','','オクタン','Okutan',114,223,'level','25',9,285,'water',NULL,'Jet','red','sea',105,75,105,75,45,75,'010100',NULL,75,164,127,70,NULL,'dpfem,dpfemback',224), +(225,190,0,0,'Delibird','','デリバヌド','Deribaado',115,0,NULL,'',9,160,'ice','flying','Delivery','red','mountain',55,45,65,45,75,45,'000001',NULL,45,183,127,70,NULL,'',225), +(226,197,0,141,'Mantine','','マンタむン','Mantain',116,458,'dnadigivolve','223',21,2200,'water','flying','Kite','purple','sea',40,70,80,140,70,65,'000020',NULL,25,168,127,70,NULL,'',226), +(227,198,115,0,'Skarmory','','゚アヌムド','Eaamudo',117,0,NULL,'',17,505,'steel','flying','Armor Bird','gray','rough terrain',80,140,40,70,70,65,'002000',NULL,25,168,127,70,NULL,'',227), +(228,209,0,0,'Houndour','','デルビル','Derubiru',118,0,NULL,'',6,108,'dark','fire','Dark','black','rough terrain',60,30,80,50,65,45,'000100',NULL,120,114,127,35,NULL,'',228), +(229,210,0,0,'Houndoom','','ぞルガヌ','Herugaa',118,228,'level','24',14,350,'dark','fire','Dark','black','rough terrain',90,50,110,80,95,75,'000200',NULL,45,204,127,35,NULL,'dpfem,dpfemback',229), +(230,188,186,0,'Kingdra','','キングドラ','Kingudora',54,117,'trade','Dragon Scale',18,1520,'water','dragon','Dragon','blue','sea',95,95,95,95,85,75,'010110',NULL,45,207,127,70,NULL,'',230), +(231,195,165,0,'Phanpy','','ゎマゟり','Gomazou',119,0,NULL,'',5,335,'ground',NULL,'Long Nose','blue','rough terrain',60,60,40,40,40,90,'100000',NULL,120,124,127,70,NULL,'',231), +(232,196,166,0,'Donphan','','ドンファン','Donfan',119,231,'level','25',11,1200,'ground',NULL,'Armor','gray','rough terrain',120,120,60,60,50,90,'011000',NULL,60,189,127,70,NULL,'dpfem,dpfemback',232), +(233,216,0,0,'Porygon2','','ポリゎン','Porigon2',68,137,'trade','Up-Grade',6,325,'normal',NULL,'Virtual','red','urban',80,90,105,95,60,85,'000200',NULL,45,180,255,70,NULL,'',233), +(234,129,0,0,'Stantler','','オドシシ','Odoshishi',120,0,NULL,'',14,712,'normal',NULL,'Big Horn','brown','forest',95,62,85,65,85,73,'010000',NULL,45,165,127,70,NULL,'',234), +(235,157,0,0,'Smeargle','','ドヌブル','Dooburu',121,0,NULL,'',12,580,'normal',NULL,'Painter','white','urban',20,35,20,45,75,55,'000001',NULL,45,106,127,70,NULL,'',235), +(236,143,0,0,'Tyrogue','','バルキヌ','Barukii',47,0,NULL,'',7,210,'fighting',NULL,'Scuffle','purple','urban',35,35,35,35,35,35,'010000',NULL,75,91,0,70,NULL,'baby',236), +(237,146,0,0,'Hitmontop','','カポ゚ラヌ','Kapoeraa',47,236,'level+equal','20',14,480,'fighting',NULL,'Handstand','brown','urban',95,95,35,110,70,50,'000020',NULL,45,138,0,70,NULL,'',237), +(238,152,0,0,'Smoochum','','ムチュヌル','Muchuuru',59,0,NULL,'',4,60,'ice','psychic','Kiss','pink','urban',30,15,85,65,65,45,'000100',NULL,45,87,254,70,NULL,'baby',238), +(239,154,0,0,'Elekid','','゚レキッド','Erekiddo',60,0,NULL,'',6,235,'electric',NULL,'Electric','yellow','grassland',63,37,65,55,95,45,'000001',NULL,45,106,63,70,NULL,'baby',239), +(240,150,0,0,'Magby','','ブビィ','Bubii',61,0,NULL,'',7,214,'fire',NULL,'Live Coal','red','mountain',75,37,70,55,83,45,'000001',NULL,45,117,63,70,NULL,'baby',240), +(241,149,0,0,'Miltank','','ミルタンク','Mirutanku',122,0,NULL,'',12,755,'normal',NULL,'Milk Cow','pink','grassland',80,105,40,70,100,95,'002000',NULL,45,200,254,70,NULL,'',241), +(242,218,0,98,'Blissey','','ハピナス','Hapinasu',51,113,'happiness','',15,468,'normal',NULL,'Happiness','pink','urban',10,10,75,135,55,255,'300000',NULL,30,255,254,140,'Before D/P: Effort points were 2 HP.','',242), +(243,238,0,0,'Raikou','','ラむコり','Raikou',123,0,NULL,'',19,1780,'electric',NULL,'Thunder','yellow','grassland',85,75,115,100,115,90,'000102',NULL,3,216,255,35,NULL,'',243), +(244,239,0,0,'Entei','','゚ンテむ','Entei',124,0,NULL,'',21,1980,'fire',NULL,'Volcano','brown','grassland',115,85,90,75,100,115,'120000',NULL,3,217,255,35,NULL,'',244), +(245,240,0,0,'Suicune','','スむクン','Suikun',125,0,NULL,'',20,1870,'water',NULL,'Aurora','blue','grassland',75,115,90,115,85,100,'001020',NULL,3,215,255,35,NULL,'',245), +(246,244,0,0,'Larvitar','','ペヌギラス','Yoogirasu',126,0,NULL,'',6,720,'rock','ground','Rock Skin','green','mountain',64,50,45,50,41,50,'010000',NULL,45,67,127,35,NULL,'',246), +(247,245,0,0,'Pupitar','','サナギラス','Sanagirasu',126,246,'level','30',12,1520,'rock','ground','Hard Shell','gray','mountain',84,70,65,70,51,70,'020000',NULL,45,144,127,35,NULL,'',247), +(248,246,0,0,'Tyranitar','','バンギラス','Bangirasu',126,247,'level','55',20,2020,'rock','dark','Armor','green','mountain',134,110,95,100,61,100,'030000',NULL,45,218,127,35,NULL,'',248), +(249,247,0,0,'Lugia','','ルギア','Rugia',127,0,NULL,'',52,2160,'psychic','flying','Diving','white','rare',90,130,90,154,110,106,'000030',NULL,3,220,255,0,NULL,'',249), +(250,248,0,0,'Ho-oh','','ホりオり','Houou',128,0,NULL,'',38,1990,'fire','flying','Rainbow','red','rare',130,90,110,154,90,106,'000030',NULL,3,220,255,0,NULL,'',250), +(251,251,0,0,'Celebi','','セレビィ','Serebii',129,0,NULL,'',6,50,'psychic','grass','Time Travel','green','forest',100,100,100,100,100,100,'300000',NULL,45,64,255,100,NULL,'',251), +(252,0,1,0,'Treecko','','キモリ','Kimori',130,0,NULL,'',5,50,'grass',NULL,'Wood Gecko','green','forest',45,35,65,55,70,40,'000001',NULL,45,65,31,70,NULL,'',252), +(253,0,2,0,'Grovyle','','ゞュプトル','Juputoru',130,252,'level','16',9,216,'grass',NULL,'Wood Gecko','green','forest',65,45,85,65,95,50,'000002',NULL,45,141,31,70,NULL,'',253), +(254,0,3,0,'Sceptile','','ゞュカむン','Jukain',130,253,'level','36',17,522,'grass',NULL,'Forest','green','forest',85,65,105,85,120,70,'000003',NULL,45,208,31,70,NULL,'',254), +(255,0,4,0,'Torchic','','アチャモ','Achamo',131,0,NULL,'',4,25,'fire',NULL,'Chick','red','grassland',60,40,70,50,45,45,'000100',NULL,45,65,31,70,NULL,'dpfemback',255), +(256,0,5,0,'Combusken','','ワカシャモ','Wakashamo',131,255,'level','16',9,195,'fire','fighting','Young Fowl','red','grassland',85,60,85,60,55,60,'010100',NULL,45,142,31,70,NULL,'dpfem,dpfemback',256), +(257,0,6,0,'Blaziken','','バシャヌモ','Bashaamo',131,256,'level','36',19,520,'fire','fighting','Blaze','red','grassland',120,70,110,70,80,80,'030000',NULL,45,209,31,70,NULL,'dpfem,dpfemback',257), +(258,0,7,0,'Mudkip','','ミズゎロり','Mizugorou',132,0,NULL,'',4,76,'water',NULL,'Mud Fish','blue','water\'s edge',70,50,50,50,40,50,'010000',NULL,45,65,31,70,NULL,'',258), +(259,0,8,0,'Marshtomp','','ヌマクロヌ','Numakuroo',132,258,'level','16',7,280,'water','ground','Mud Fish','blue','water\'s edge',85,70,60,70,50,70,'020000',NULL,45,143,31,70,NULL,'',259), +(260,0,9,0,'Swampert','','ラグラヌゞ','Raguraaji',132,259,'level','36',15,819,'water','ground','Mud Fish','blue','water\'s edge',110,90,85,90,60,100,'030000',NULL,45,210,31,70,NULL,'',260), +(261,0,10,0,'Poochyena','','ポチ゚ナ','Pochiena',133,0,NULL,'',5,136,'dark',NULL,'Bite','gray','grassland',55,35,30,30,35,35,'010000',NULL,255,55,127,70,NULL,'',261), +(262,0,11,0,'Mightyena','','グラ゚ナ','Guraena',133,261,'level','18',10,370,'dark',NULL,'Bite','gray','grassland',90,70,60,60,70,70,'020000',NULL,127,128,127,70,NULL,'',262), +(263,0,12,0,'Zigzagoon','','ゞグザグマ','Jiguzaguma',134,0,NULL,'',4,175,'normal',NULL,'TinyRaccoon','brown','grassland',30,41,30,41,60,38,'000001',NULL,255,60,127,70,NULL,'',263), +(264,0,13,0,'Linoone','','マッスグマ','Massuguma',134,263,'level','20',5,325,'normal',NULL,'Rushing','white','grassland',70,61,50,61,100,78,'000002',NULL,90,128,127,70,NULL,'',264), +(265,0,14,48,'Wurmple','','ケムッ゜','Kemusso',135,0,NULL,'',3,36,'bug',NULL,'Worm','red','forest',45,35,20,30,20,45,'100000',NULL,255,54,127,70,NULL,'',265), +(266,0,15,49,'Silcoon','','カラサリス','Karasarisu',135,265,'level','7',6,100,'bug',NULL,'Cocoon','white','forest',35,55,25,25,15,50,'002000',NULL,120,72,127,70,'Before D/P: Base EXP was 71.','',266), +(267,0,16,50,'Beautifly','','アゲハント','Agehanto',135,266,'level','10',10,284,'bug','flying','Butterfly','yellow','forest',70,50,90,50,65,60,'000300',NULL,45,161,127,70,NULL,'dpfem,dpfemback',267), +(268,0,17,51,'Cascoon','','マナルド','Mayurudo',135,265,'level','7',7,115,'bug',NULL,'Cocoon','purple','forest',35,55,25,25,15,50,'002000',NULL,120,72,127,70,NULL,'',268), +(269,0,18,52,'Dustox','','ドクケむル','Dokukeiru',135,268,'level','10',12,316,'bug','poison','Poison Moth','green','forest',50,70,50,90,65,60,'000030',NULL,45,161,127,70,'Before D/P: Base EXP was 160.','dpfem,dpfemback',269), +(270,0,19,0,'Lotad','','ハスボヌ','Hasuboo',136,0,NULL,'',5,26,'water','grass','Water Weed','green','water\'s edge',30,30,40,50,30,40,'000010',NULL,255,74,127,70,NULL,'',270), +(271,0,20,0,'Lombre','','ハスブレロ','Hasuburero',136,270,'level','14',12,325,'water','grass','Jolly','green','water\'s edge',50,50,60,70,50,60,'000020',NULL,120,141,127,70,NULL,'',271), +(272,0,21,0,'Ludicolo','','ルンパッパ','Runpappa',136,271,'item','Water Stone',15,550,'water','grass','Carefree','green','water\'s edge',70,70,90,100,70,80,'000030',NULL,45,181,127,70,NULL,'dpfem,dpfemback',272), +(273,0,22,0,'Seedot','','タネボヌ','Taneboo',137,0,NULL,'',5,40,'grass',NULL,'Acorn','brown','forest',40,50,30,30,30,40,'001000',NULL,255,74,127,70,NULL,'',273), +(274,0,23,0,'Nuzleaf','','コノハナ','Konohana',137,273,'level','14',10,280,'grass','dark','Wily','brown','forest',70,40,60,40,60,70,'020000',NULL,120,141,127,70,NULL,'dpfem,dpfemback',274), +(275,0,24,0,'Shiftry','','ダヌテング','Daatengu',137,274,'item','Leaf Stone',13,596,'grass','dark','Wicked','brown','forest',100,60,90,60,80,90,'030000',NULL,45,181,127,70,NULL,'dpfem,dpfemback',275), +(276,0,25,0,'Taillow','','スバメ','Subame',138,0,NULL,'',3,23,'normal','flying','TinySwallow','blue','grassland',55,30,30,30,85,40,'000001',NULL,200,59,127,70,NULL,'',276), +(277,0,26,0,'Swellow','','オオスバメ','Oosubame',138,276,'level','22',7,198,'normal','flying','Swallow','blue','grassland',85,60,50,50,125,60,'000002',NULL,45,162,127,70,NULL,'',277), +(278,0,27,119,'Wingull','','キャモメ','Kyamome',139,0,NULL,'',6,95,'water','flying','Seagull','white','sea',30,30,55,30,85,40,'000001',NULL,190,64,127,70,NULL,'',278), +(279,0,28,120,'Pelipper','','ペリッパヌ','Perippaa',139,278,'level','25',12,280,'water','flying','Water Bird','yellow','sea',50,100,85,70,65,60,'002000',NULL,45,164,127,70,NULL,'',279), +(280,0,29,0,'Ralts','','ラルトス','Rarutosu',140,0,NULL,'',4,66,'psychic',NULL,'Feeling','white','urban',25,25,45,35,40,28,'000100',NULL,235,70,127,35,NULL,'',280), +(281,0,30,0,'Kirlia','','キルリア','Kiruria',140,280,'level','20',8,202,'psychic',NULL,'Emotion','white','urban',35,35,65,55,50,38,'000200',NULL,120,140,127,35,NULL,'',281), +(282,0,31,0,'Gardevoir','','サヌナむト','Saanaito',140,281,'level','30',16,484,'psychic',NULL,'Embrace','white','urban',65,65,125,115,80,68,'000300',NULL,45,208,127,35,NULL,'',282), +(283,0,32,0,'Surskit','','アメタマ','Ametama',141,0,NULL,'',5,17,'bug','water','Pond Skater','blue','water\'s edge',30,32,50,52,65,40,'000001',NULL,200,63,127,70,NULL,'',283), +(284,0,33,0,'Masquerain','','アメモヌス','Amemoosu',141,283,'level','22',8,36,'bug','flying','Eyeball','blue','water\'s edge',60,62,80,82,60,70,'000110',NULL,75,128,127,70,NULL,'',284), +(285,0,34,0,'Shroomish','','キノココ','Kinokoko',142,0,NULL,'',4,45,'grass',NULL,'Mushroom','brown','forest',40,60,40,60,35,60,'100000',NULL,255,65,127,70,NULL,'',285), +(286,0,35,0,'Breloom','','キノガッサ','Kinogassa',142,285,'level','23',12,392,'grass','fighting','Mushroom','green','forest',130,80,60,60,70,60,'020000',NULL,90,165,127,70,NULL,'',286), +(287,0,36,0,'Slakoth','','ナマケロ','Namakero',143,0,NULL,'',8,240,'normal',NULL,'Slacker','brown','forest',60,60,35,35,30,60,'100000',NULL,255,83,127,70,NULL,'',287), +(288,0,37,0,'Vigoroth','','ダルキモノ','Yarukimono',143,287,'level','18',14,465,'normal',NULL,'Wild Monkey','white','forest',80,80,55,55,90,80,'000002',NULL,120,126,127,70,NULL,'',288), +(289,0,38,0,'Slaking','','ケッキング','Kekkingu',143,288,'level','36',20,1305,'normal',NULL,'Lazy','brown','forest',160,100,95,65,100,150,'300000',NULL,45,210,127,70,NULL,'',289), +(290,0,42,0,'Nincada','','ツチニン','Tsuchinin',144,0,NULL,'',5,55,'bug','ground','Trainee','gray','forest',45,90,30,30,40,31,'001000',NULL,255,65,127,70,NULL,'',290), +(291,0,43,0,'Ninjask','','テッカニン','Tekkanin',144,290,'level','20',8,120,'bug','flying','Ninja','yellow','forest',90,45,50,50,160,61,'000002',NULL,120,155,127,70,NULL,'',291), +(292,0,44,0,'Shedinja','','ヌケニン','Nukenin',144,290,'divineintervention','Ninjask',8,12,'bug','ghost','Shed','brown','forest',90,45,30,30,40,1,'200000',NULL,45,95,255,70,NULL,'',292), +(293,0,45,0,'Whismur','','ゎニョニョ','Gonyonyo',145,0,NULL,'',6,163,'normal',NULL,'Whisper','pink','cave',51,23,51,23,28,64,'100000',NULL,190,68,127,70,NULL,'',293), +(294,0,46,0,'Loudred','','ドゎヌム','Dogoomu',145,293,'level','20',10,405,'normal',NULL,'Big Voice','blue','cave',71,43,71,43,48,84,'200000',NULL,120,126,127,70,NULL,'',294), +(295,0,47,0,'Exploud','','バクオング','Bakuongu',145,294,'level','40',15,840,'normal',NULL,'Loud Noise','blue','cave',91,63,91,63,68,104,'300000',NULL,45,184,127,70,NULL,'',295), +(296,0,48,0,'Makuhita','','マクノシタ','Makunoshita',146,0,NULL,'',10,864,'fighting',NULL,'Guts','yellow','mountain',60,30,20,30,25,72,'100000',NULL,180,87,63,70,NULL,'',296), +(297,0,49,0,'Hariyama','','ハリテダマ','Hariteyama',146,296,'level','24',23,2538,'fighting',NULL,'Arm Thrust','brown','mountain',120,60,40,60,50,144,'200000',NULL,200,184,63,70,NULL,'',297), +(298,0,54,124,'Azurill','','ルリリ','Ruriri',90,0,NULL,'',2,20,'normal',NULL,'Polka Dot','blue','water\'s edge',20,40,20,40,20,50,'100000',NULL,150,33,191,70,NULL,'baby',298), +(299,0,60,0,'Nosepass','','ノズパス','Nozupasu',147,0,NULL,'',10,970,'rock',NULL,'Compass','gray','cave',45,135,45,90,30,30,'001000',NULL,255,108,127,70,NULL,'',299), +(300,0,61,0,'Skitty','','゚ネコ','Eneko',148,0,NULL,'',6,110,'normal',NULL,'Kitten','pink','forest',45,45,35,35,50,50,'000001',NULL,255,65,191,70,NULL,'',300), +(301,0,62,0,'Delcatty','','゚ネコロロ','Enekororo',148,300,'item','Moon Stone',11,326,'normal',NULL,'Prim','purple','forest',65,65,55,55,70,70,'100001',NULL,60,138,191,70,NULL,'',301), +(302,0,68,0,'Sableye','','ダミラミ','Yamirami',149,0,NULL,'',5,110,'dark','ghost','Darkness','purple','cave',75,75,65,65,50,50,'011000',NULL,45,98,127,35,NULL,'',302), +(303,0,69,0,'Mawile','','クチヌト','Kuchiito',150,0,NULL,'',6,115,'steel',NULL,'Deceiver','black','cave',85,85,55,55,50,50,'011000',NULL,45,98,127,70,NULL,'',303), +(304,0,70,0,'Aron','','ココドラ','Kokodora',151,0,NULL,'',4,600,'steel','rock','Iron Armor','gray','mountain',70,100,40,40,30,50,'001000',NULL,180,96,127,35,NULL,'',304), +(305,0,71,0,'Lairon','','コドラ','Kodora',151,304,'level','32',9,1200,'steel','rock','Iron Armor','gray','mountain',90,140,50,50,40,60,'002000',NULL,90,152,127,35,NULL,'',305), +(306,0,72,0,'Aggron','','ボスゎドラ','Bosugodora',151,305,'level','42',21,3600,'steel','rock','Iron Armor','gray','mountain',110,180,60,60,50,70,'003000',NULL,45,205,127,35,NULL,'',306), +(307,0,76,86,'Meditite','','アサナン','Asanan',152,0,NULL,'',6,112,'fighting','psychic','Meditate','blue','mountain',40,55,40,55,60,30,'000001',NULL,180,91,127,70,NULL,'dpfem,dpfemback',307), +(308,0,77,87,'Medicham','','チャヌレム','Chaaremu',152,307,'level','37',13,315,'fighting','psychic','Meditate','red','mountain',60,75,60,75,80,60,'000002',NULL,90,153,127,70,NULL,'dpfem,dpfemback',308), +(309,0,78,0,'Electrike','','ラクラむ','Rakurai',153,0,NULL,'',6,152,'electric',NULL,'Lightning','green','grassland',45,40,65,40,65,40,'000001',NULL,120,104,127,70,NULL,'',309), +(310,0,79,0,'Manectric','','ラむボルト','Raiboruto',153,309,'level','26',15,402,'electric',NULL,'Discharge','yellow','grassland',75,60,105,60,105,70,'000002',NULL,45,168,127,70,NULL,'',310), +(311,0,80,0,'Plusle','','プラスル','Purasuru',154,0,NULL,'',4,42,'electric',NULL,'Cheering','yellow','grassland',50,40,85,75,95,60,'000001',NULL,200,120,127,70,NULL,'',311), +(312,0,81,0,'Minun','','マむナン','Mainan',155,0,NULL,'',4,42,'electric',NULL,'Cheering','yellow','grassland',40,50,75,85,95,60,'000001',NULL,200,120,127,70,NULL,'',312), +(313,0,86,0,'Volbeat','','バルビヌト','Barubiito',156,0,NULL,'',7,177,'bug',NULL,'Firefly','gray','forest',73,55,47,75,85,65,'000001',NULL,150,146,0,70,NULL,'',313), +(314,0,87,0,'Illumise','','むルミヌれ','Irumiize',157,0,NULL,'',6,177,'bug',NULL,'Firefly','purple','forest',47,55,73,75,85,65,'000001',NULL,150,146,254,70,NULL,'',314), +(315,0,94,26,'Roselia','','ロれリア','Rozeria',158,406,'happinessday','',3,20,'grass','poison','Thorn','green','grassland',60,45,100,80,65,50,'000200',NULL,150,152,127,70,'Before D/P: Effort points were 1 Special Attack.','dpfem,dpfemback',315), +(316,0,95,0,'Gulpin','','ゎクリン','Gokurin',159,0,NULL,'',4,103,'poison',NULL,'Stomach','green','grassland',43,53,43,53,40,70,'100000',NULL,225,75,127,70,NULL,'dpfem,dpfemback',316), +(317,0,96,0,'Swalot','','マルノヌム','Marunoomu',159,316,'level','26',17,800,'poison',NULL,'Poison Bag','purple','grassland',73,83,73,83,55,100,'200000',NULL,75,168,127,70,NULL,'dpfem,dpfemback',317), +(318,0,97,0,'Carvanha','','キバニア','Kibania',160,0,NULL,'',8,208,'water','dark','Savage','red','sea',90,20,65,20,65,45,'010000',NULL,225,88,127,35,NULL,'',318), +(319,0,98,0,'Sharpedo','','サメハダヌ','Samehadaa',160,318,'level','30',18,888,'water','dark','Brutal','blue','sea',120,40,95,40,95,70,'020000',NULL,60,175,127,35,NULL,'',319), +(320,0,99,0,'Wailmer','','ポルコ','Hoeruko',161,0,NULL,'',20,1300,'water',NULL,'Ball Whale','blue','sea',70,35,70,35,60,130,'100000',NULL,125,137,127,70,NULL,'',320), +(321,0,100,0,'Wailord','','ポルオヌ','Hoeruoo',161,320,'level','40',145,3980,'water',NULL,'Float Whale','blue','sea',90,45,90,45,60,170,'200000',NULL,60,206,127,70,NULL,'',321), +(322,0,101,0,'Numel','','ドンメル','Donmeru',162,0,NULL,'',7,240,'fire','ground','Numb','yellow','mountain',60,40,65,45,35,60,'000100',NULL,255,88,127,70,NULL,'dpfem,dpfemback',322), +(323,0,102,0,'Camerupt','','バクヌダ','Bakuuda',162,322,'level','33',19,2200,'fire','ground','Eruption','red','mountain',100,70,105,75,40,70,'010100',NULL,150,175,127,70,NULL,'dpfem,dpfemback',323), +(324,0,105,0,'Torkoal','','コヌタス','Kootasu',163,0,NULL,'',5,804,'fire',NULL,'Coal','brown','mountain',85,140,85,70,20,70,'002000',NULL,90,161,127,70,NULL,'',324), +(325,0,110,0,'Spoink','','バネブヌ','Banebuu',164,0,NULL,'',7,306,'psychic',NULL,'Bounce','black','mountain',25,35,70,80,60,60,'000010',NULL,255,89,127,70,NULL,'',325), +(326,0,111,0,'Grumpig','','ブヌピッグ','Buupiggu',164,325,'level','32',9,715,'psychic',NULL,'Manipulate','purple','mountain',45,65,90,110,80,80,'000020',NULL,60,164,127,70,NULL,'',326), +(327,0,114,0,'Spinda','','パッチヌル','Pacchiiru',165,0,NULL,'',11,50,'normal',NULL,'Spot Panda','brown','mountain',60,60,60,60,60,60,'000100',NULL,255,85,127,70,NULL,'',327), +(328,0,116,0,'Trapinch','','ナックラヌ','Nakkuraa',166,0,NULL,'',7,150,'ground',NULL,'Ant Pit','brown','rough terrain',100,45,45,45,10,45,'010000',NULL,255,73,127,70,NULL,'',328), +(329,0,117,0,'Vibrava','','ビブラヌバ','Biburaaba',166,328,'level','35',11,153,'ground','dragon','Vibration','green','rough terrain',70,50,50,50,70,50,'010001',NULL,120,126,127,70,NULL,'',329), +(330,0,118,0,'Flygon','','フラむゎン','Furaigon',166,329,'level','45',20,820,'ground','dragon','Mystic','green','rough terrain',100,80,80,80,100,80,'010002',NULL,45,197,127,70,NULL,'',330), +(331,0,119,0,'Cacnea','','サボネア','Sabonea',167,0,NULL,'',4,513,'grass',NULL,'Cactus','green','rough terrain',85,40,85,40,35,50,'000100',NULL,190,97,127,35,NULL,'',331), +(332,0,120,0,'Cacturne','','ノクタス','Nokutasu',167,331,'level','32',13,774,'grass','dark','Scarecrow','green','rough terrain',115,60,115,60,55,70,'010100',NULL,60,177,127,35,NULL,'dpfem',332), +(333,0,121,0,'Swablu','','チルット','Chirutto',168,0,NULL,'',4,12,'normal','flying','Cotton Bird','blue','forest',40,60,40,75,50,45,'000010',NULL,255,74,127,70,NULL,'',333), +(334,0,122,0,'Altaria','','チルタリス','Chirutarisu',168,333,'level','35',11,206,'dragon','flying','Humming','blue','forest',70,90,70,105,80,75,'000020',NULL,45,188,127,70,NULL,'',334), +(335,0,123,0,'Zangoose','','ザングヌス','Zanguusu',169,0,NULL,'',13,403,'normal',NULL,'Cat Ferret','white','grassland',115,60,60,60,90,73,'020000',NULL,90,165,127,70,NULL,'',335), +(336,0,124,0,'Seviper','','ハブネヌク','Habuneeku',170,0,NULL,'',27,525,'poison',NULL,'Fang Snake','black','grassland',100,60,100,60,65,73,'010100',NULL,90,165,127,70,NULL,'',336), +(337,0,125,0,'Lunatone','','ルナトヌン','Runatoon',171,0,NULL,'',10,1680,'rock','psychic','Meteorite','yellow','cave',55,65,95,85,70,70,'000200',NULL,45,150,255,70,NULL,'',337), +(338,0,126,0,'Solrock','','゜ルロック','Sorurokku',172,0,NULL,'',12,1540,'rock','psychic','Meteorite','red','cave',95,85,55,65,70,70,'020000',NULL,45,150,255,70,NULL,'',338), +(339,0,127,80,'Barboach','','ドゞョッチ','Dojocchi',173,0,NULL,'',4,19,'water','ground','Whiskers','gray','water\'s edge',48,43,46,41,60,50,'100000',NULL,190,92,127,70,NULL,'',339), +(340,0,128,81,'Whiscash','','ナマズン','Namazun',173,339,'level','30',9,236,'water','ground','Whiskers','blue','water\'s edge',78,73,76,71,60,110,'200000',NULL,75,158,127,70,NULL,'',340), +(341,0,129,0,'Corphish','','ヘむガニ','Heigani',174,0,NULL,'',6,115,'water',NULL,'Ruffian','red','water\'s edge',80,65,50,35,35,43,'010000',NULL,205,111,127,70,NULL,'',341), +(342,0,130,0,'Crawdaunt','','シザリガヌ','Shizarigaa',174,341,'level','30',11,328,'water','dark','Rogue','red','water\'s edge',120,85,90,55,55,63,'020000',NULL,155,161,127,70,NULL,'',342), +(343,0,131,0,'Baltoy','','ダゞロン','Yajiron',175,0,NULL,'',5,215,'ground','psychic','Clay Doll','brown','rough terrain',40,55,40,70,55,40,'000010',NULL,255,58,255,70,NULL,'',343), +(344,0,132,0,'Claydol','','ネンドヌル','Nendooru',175,343,'level','36',15,1080,'ground','psychic','Clay Doll','black','rough terrain',70,105,70,120,75,60,'000020',NULL,90,189,255,70,NULL,'',344), +(345,0,133,0,'Lileep','','リリヌラ','Ririira',176,0,NULL,'',10,238,'rock','grass','Sea Lily','purple','sea',41,77,61,87,23,66,'000010',NULL,45,99,31,70,'Before D/P: Base EXP was 121.','',345), +(346,0,134,0,'Cradily','','ナレむドル','Yureidoru',176,345,'level','40',15,604,'rock','grass','Barnacle','green','sea',81,97,81,107,43,86,'000020',NULL,45,199,31,70,'Before D/P: Base EXP was 201.','',346), +(347,0,135,0,'Anorith','','アノプス','Anopusu',177,0,NULL,'',7,125,'rock','bug','Old Shrimp','gray','water\'s edge',95,50,40,50,75,45,'010000',NULL,45,99,31,70,'Before D/P: Base EXP was 119.','',347), +(348,0,136,0,'Armaldo','','アヌマルド','Aamarudo',177,347,'level','40',15,682,'rock','bug','Plate','gray','water\'s edge',125,100,70,80,45,75,'020000',NULL,45,199,31,70,'Before D/P: Base EXP was 200.','',348), +(349,0,140,138,'Feebas','','ヒンバス','Hinbasu',178,0,NULL,'',6,74,'water',NULL,'Fish','brown','water\'s edge',15,20,10,55,80,20,'000001',NULL,255,61,127,70,NULL,'',349), +(350,0,141,139,'Milotic','','ミロカロス','Mirokarosu',178,349,'beauty','170',62,1620,'water',NULL,'Tender','pink','water\'s edge',60,79,100,125,81,95,'000020',NULL,60,213,127,70,NULL,'dpfem,dpfemback',350), +(351,0,142,0,'Castform','','ポワルン','Powarun',179,0,NULL,'',3,8,'normal',NULL,'Weather','white','grassland',70,70,70,70,70,70,'100000',NULL,45,145,127,70,NULL,'',351), +(352,0,145,0,'Kecleon','','カクレオン','Kakureon',180,0,NULL,'',10,220,'normal',NULL,'Color Swap','green','forest',90,70,60,120,40,60,'000010',NULL,200,132,127,70,NULL,'',352), +(353,0,146,0,'Shuppet','','カゲボりズ','Kagebouzu',181,0,NULL,'',6,23,'ghost',NULL,'Puppet','black','urban',75,35,63,33,45,44,'010000',NULL,225,97,127,35,NULL,'',353), +(354,0,147,0,'Banette','','ゞュペッタ','Jupetta',181,353,'level','37',11,125,'ghost',NULL,'Marionette','black','urban',115,65,83,63,65,64,'020000',NULL,45,179,127,35,NULL,'',354), +(355,0,148,0,'Duskull','','ペマワル','Yomawaru',182,0,NULL,'',8,150,'ghost',NULL,'Requiem','black','forest',40,90,30,90,25,20,'000010',NULL,190,97,127,35,'Before D/P: Effort points were 1 Defense and 1 Special Defense.','',355), +(356,0,149,0,'Dusclops','','サマペヌル','Samayooru',182,355,'level','37',16,306,'ghost',NULL,'Beckon','black','forest',70,130,60,130,25,40,'001010',NULL,90,179,127,35,'Before D/P: Effort points were 1 Defense and 2 Special Defense.','',356), +(357,0,150,0,'Tropius','','トロピりス','Toropiusu',183,0,NULL,'',20,1000,'grass','flying','Fruit','green','forest',68,83,72,87,51,99,'200000',NULL,200,169,127,70,NULL,'',357), +(358,0,151,83,'Chimecho','','チリヌン','Chiriin',184,433,'happinessnight','',6,10,'psychic',NULL,'Wind Chime','blue','grassland',50,70,95,80,65,65,'000110',NULL,45,147,127,70,NULL,'',358), +(359,0,152,0,'Absol','','アブ゜ル','Abusoru',185,0,NULL,'',12,470,'dark',NULL,'Disaster','white','mountain',130,60,75,60,75,65,'020000',NULL,30,174,127,35,NULL,'',359), +(360,0,160,0,'Wynaut','','゜ヌナノ','Soonano',100,0,NULL,'',6,140,'psychic',NULL,'Bright','blue','cave',23,48,23,48,23,95,'100000',NULL,125,44,127,70,NULL,'baby',360), +(361,0,171,0,'Snorunt','','ナキワラシ','Yukiwarashi',186,0,NULL,'',7,168,'ice',NULL,'Snow Hat','gray','cave',50,50,50,50,50,50,'100000',NULL,190,74,127,70,NULL,'',361), +(362,0,172,0,'Glalie','','オニゎヌリ','Onigoori',186,361,'level','42',15,2565,'ice',NULL,'Face','gray','cave',80,80,80,80,80,80,'200000',NULL,75,187,127,70,NULL,'',362), +(363,0,173,0,'Spheal','','タマザラシ','Tamazarashi',187,0,NULL,'',8,395,'ice','water','Clap','blue','sea',40,50,55,50,25,70,'100000',NULL,255,75,127,70,NULL,'',363), +(364,0,174,0,'Sealeo','','トドグラヌ','Todoguraa',187,363,'level','32',11,876,'ice','water','Ball Roll','blue','sea',60,70,75,70,45,90,'200000',NULL,120,128,127,70,NULL,'',364), +(365,0,175,0,'Walrein','','トドれルガ','Todozeruga',187,364,'level','44',14,1506,'ice','water','Ice Break','blue','sea',80,90,95,90,65,110,'300000',NULL,45,192,127,70,NULL,'',365), +(366,0,176,0,'Clamperl','','パヌルル','Paaruru',188,0,NULL,'',4,525,'water',NULL,'Bivalve','blue','sea',64,85,74,55,32,35,'001000',NULL,255,142,127,70,NULL,'',366), +(367,0,177,0,'Huntail','','ハンテヌル','Hanteeru',188,366,'trade','DeepSeaTooth',17,270,'water',NULL,'Deep Sea','blue','sea',104,105,94,75,52,55,'011000',NULL,60,178,127,70,NULL,'',367), +(368,0,178,0,'Gorebyss','','サクラビス','Sakurabisu',188,366,'trade','DeepSeaScale',18,226,'water',NULL,'South Sea','pink','sea',84,105,114,75,52,55,'000200',NULL,60,178,127,70,NULL,'',368), +(369,0,179,0,'Relicanth','','ゞヌランス','Jiiransu',189,0,NULL,'',10,234,'water','rock','Longevity','gray','sea',90,130,45,65,55,100,'101000',NULL,25,198,31,70,NULL,'dpfem,dpfemback',369), +(370,0,183,0,'Luvdisc','','ラブカス','Rabukasu',190,0,NULL,'',6,87,'water',NULL,'Rendezvous','pink','sea',30,55,40,65,97,43,'000001',NULL,225,110,191,70,NULL,'',370), +(371,0,187,0,'Bagon','','タツベむ','Tatsubei',191,0,NULL,'',6,421,'dragon',NULL,'Rock Head','blue','rough terrain',75,60,40,30,50,45,'010000',NULL,45,89,127,35,NULL,'',371), +(372,0,188,0,'Shelgon','','コモルヌ','Komoruu',191,371,'level','30',11,1105,'dragon',NULL,'Endurance','white','rough terrain',95,100,60,50,50,65,'002000',NULL,45,144,127,35,NULL,'',372), +(373,0,189,0,'Salamence','','ボヌマンダ','Boomanda',191,372,'level','50',15,1026,'dragon','flying','Dragon','blue','rough terrain',135,80,110,80,100,95,'030000',NULL,45,218,127,35,NULL,'',373), +(374,0,190,0,'Beldum','','ダンバル','Danbaru',192,0,NULL,'',6,952,'steel','psychic','Iron Ball','blue','rough terrain',55,80,35,60,30,40,'001000',NULL,3,103,255,35,NULL,'',374), +(375,0,191,0,'Metang','','メタング','Metangu',192,374,'level','20',12,2025,'steel','psychic','Iron Claw','blue','rough terrain',75,100,55,80,50,60,'002000',NULL,3,153,255,35,NULL,'',375), +(376,0,192,0,'Metagross','','メタグロス','Metagurosu',192,375,'level','45',16,5500,'steel','psychic','Iron Leg','blue','rough terrain',135,130,95,90,70,80,'003000',NULL,3,210,255,35,NULL,'',376), +(377,0,193,0,'Regirock','','レゞロック','Rejirokku',193,0,NULL,'',17,2300,'rock',NULL,'Rock Peak','brown','cave',100,200,50,100,50,80,'003000',NULL,3,217,255,35,NULL,'',377), +(378,0,194,0,'Regice','','レゞアむス','Rejiaisu',194,0,NULL,'',18,1750,'ice',NULL,'Iceberg','blue','cave',50,100,100,200,50,80,'000030',NULL,3,216,255,35,NULL,'',378), +(379,0,195,0,'Registeel','','レゞスチル','Rejisuchiru',195,0,NULL,'',19,2050,'steel',NULL,'Iron','gray','cave',75,150,75,150,50,80,'002010',NULL,3,215,255,35,NULL,'',379), +(380,0,196,0,'Latias','','ラティアス','Ratiasu',196,0,NULL,'',14,400,'dragon','psychic','Eon','red','water\'s edge',80,90,110,130,110,80,'000030',NULL,3,211,254,90,NULL,'',380), +(381,0,197,0,'Latios','','ラティオス','Ratiosu',197,0,NULL,'',20,600,'dragon','psychic','Eon','blue','water\'s edge',90,80,130,110,110,80,'000300',NULL,3,211,0,90,NULL,'',381), +(382,0,198,0,'Kyogre','','カむオヌガ','Kaiooga',198,0,NULL,'',45,3520,'water',NULL,'Sea Basin','blue','sea',100,90,150,140,90,100,'000300',NULL,5,218,255,0,NULL,'',382), +(383,0,199,0,'Groudon','','グラヌドン','Guraadon',199,0,NULL,'',35,9500,'ground',NULL,'Continent','red','rough terrain',150,140,100,90,90,100,'030000',NULL,5,218,255,0,NULL,'',383), +(384,0,200,0,'Rayquaza','','レックりザ','Rekkuuza',200,0,NULL,'',70,2065,'dragon','flying','Sky High','green','rare',150,90,150,90,95,105,'020100',NULL,3,220,255,0,NULL,'',384), +(385,0,201,0,'Jirachi','','ゞラヌチ','Jiraachi',201,0,NULL,'',3,11,'steel','psychic','Wish','yellow','mountain',100,100,100,100,100,100,'300000',NULL,3,215,255,100,NULL,'',385), +(386,0,202,0,'Deoxys','normal','デオキシス','Deokishisu',202,0,NULL,'',17,608,'psychic',NULL,'DNA','red','rare',150,50,150,50,150,50,'010101',NULL,3,215,255,0,NULL,'',386), +(387,0,0,1,'Turtwig','','ナ゚トル','Naetoru',203,0,NULL,'',4,102,'grass',NULL,'Tiny Leaf','green','',68,64,45,55,31,55,'010000',NULL,45,64,31,70,'','',387), +(388,0,0,2,'Grotle','','ハダシガメ','Hayashigame',203,387,'level','18',11,970,'grass',NULL,'Grove','green','',89,85,55,65,36,75,'011000',NULL,45,141,31,70,'','',388), +(389,0,0,3,'Torterra','','ドダむトス','Dodaitosu',203,388,'level','32',22,3100,'grass','ground','Continent','green*','',109,105,75,85,56,95,'021000',NULL,45,208,31,70,'','',389), +(390,0,0,4,'Chimchar','','ヒコザル','Hikozaru',204,0,NULL,'',5,62,'fire',NULL,'Chimp','brown*','',58,44,58,44,61,44,'000001',NULL,45,65,31,70,'','',390), +(391,0,0,5,'Monferno','','モりカザル','Moukazaru',204,390,'level','14',9,220,'fire','fighting','Playful','brown*','',78,52,78,52,81,64,'000101',NULL,45,142,31,70,'','',391), +(392,0,0,6,'Infernape','','ゎりカザル','Goukazaru',204,391,'level','36',12,550,'fire','fighting','Flame','brown','',104,71,104,71,108,76,'010101',NULL,45,209,31,70,'','',392), +(393,0,0,7,'Piplup','','ポッチャマ','Pocchama',205,0,NULL,'',4,52,'water',NULL,'Penguin','blue','',51,53,61,56,40,53,'000100',NULL,45,66,31,70,'','',393), +(394,0,0,8,'Prinplup','','ポッタむシ','Pottaishi',205,393,'level','16',8,230,'water',NULL,'Penguin','blue','',66,68,81,76,50,64,'000200',NULL,45,143,31,70,'','',394), +(395,0,0,9,'Empoleon','','゚ンペルト','Enperuto',205,394,'level','36',17,845,'water','steel','Emperor','blue','',86,88,111,101,60,84,'000300',NULL,45,210,31,70,'','',395), +(396,0,0,10,'Starly','','ムックル','Mukkuru',206,0,NULL,'',3,20,'normal','flying','Starling','brown','',55,30,30,30,60,40,'000001',NULL,255,56,127,70,'','dpfem,dpfemback',396), +(397,0,0,11,'Staravia','','ムクバヌド','Mukubaado',206,396,'level','14',6,155,'normal','flying','Starling','brown','',75,50,40,40,80,55,'000002',NULL,120,113,127,70,'','dpfem,dpfemback',397), +(398,0,0,12,'Staraptor','','ムクホヌク','Mukuhooku',206,397,'level','34',12,249,'normal','flying','Predator','brown','',120,70,50,50,100,85,'030000',NULL,45,172,127,70,'','dpfem',398), +(399,0,0,13,'Bidoof','','ビッパ','Bippa',207,0,NULL,'',5,200,'normal',NULL,'Plump Mouse','brown','',45,40,35,40,31,59,'100000',NULL,255,58,127,70,'','dpfem,dpfemback',399), +(400,0,0,14,'Bibarel','','ビヌダル','Biidaru',207,399,'level','15',10,315,'normal','water','Beaver','brown','',85,60,55,60,71,79,'020000',NULL,127,116,127,70,'','dpfem',400), +(401,0,0,15,'Kricketot','','コロボヌシ','Korobooshi',208,0,NULL,'',3,22,'bug',NULL,'Cricket','red','',25,41,25,41,25,37,'001000',NULL,255,54,127,70,'','dpfem,dpfemback',401), +(402,0,0,16,'Kricketune','','コロトック','Korotokku',208,401,'level','10',10,255,'bug',NULL,'Cricket','red','',85,51,55,51,65,77,'020000',NULL,45,159,127,70,'','dpfem,dpfemback',402), +(403,0,0,17,'Shinx','','コリンク','Korinku',209,0,NULL,'',5,95,'electric',NULL,'Flash','blue','',65,34,40,34,45,45,'010000',NULL,235,60,127,70,'','dpfem,dpfemback',403), +(404,0,0,18,'Luxio','','ルクシオ','Rukushio',209,403,'level','15',9,305,'electric',NULL,'Spark','blue','',85,49,60,49,60,60,'020000',NULL,120,117,127,100,'','dpfem,dpfemback',404), +(405,0,0,19,'Luxray','','レントラヌ','Rentoraa',209,404,'level','30',14,420,'electric',NULL,'Gleam Eyes','blue','',120,79,95,79,70,80,'030000',NULL,45,194,127,70,'','dpfem,dpfemback',405), +(406,0,0,25,'Budew','','スボミヌ','Subomii',158,0,NULL,'',2,12,'grass','poison','Bud','green*','',30,35,50,70,55,40,'000100',NULL,255,68,127,70,'','baby',406), +(407,0,0,27,'Roserade','','ロズレむド','Rozureido',158,315,'item','Shiny Stone',9,145,'grass','poison','Bouquet','green*','',70,55,125,105,90,60,'000300',NULL,75,204,127,70,'','dpfem',407), +(408,0,0,36,'Cranidos','','ズガむドス','Zugaidosu',211,0,NULL,'',9,315,'rock',NULL,'Head Butt','blue','',125,40,30,30,58,67,'010000',NULL,45,99,31,70,'','',408), +(409,0,0,37,'Rampardos','','ラムパルド','Ramuparudo',211,408,'level','30',16,1025,'rock',NULL,'Head Butt','blue','',165,60,65,50,58,97,'020000',NULL,45,199,31,70,'','',409), +(410,0,0,38,'Shieldon','','タテトプス','Tatetopusu',212,0,NULL,'',5,570,'rock','steel','Shield','gray','',42,118,42,88,30,30,'001000',NULL,45,99,31,70,'','',410), +(411,0,0,39,'Bastiodon','','トリデプス','Toridepusu',212,410,'level','30',13,1495,'rock','steel','Shield','gray','',52,168,47,138,30,60,'002000',NULL,45,199,31,70,'','',411), +(412,0,0,45,'Burmy','','ミノムッチ','Minomucchi',213,0,NULL,'',2,34,'bug',NULL,'Bagworm','gray','',29,45,29,45,36,40,'000010',NULL,120,61,127,70,'','',412), +(413,0,0,46,'Wormadam','grass','ミノマダム','Minomadamu',213,412,'levelfemale','20',5,65,'bug','grass','Bagworm','gray','',59,85,79,105,36,60,'000020',NULL,45,159,254,70,'','',413), +(414,0,0,47,'Mothim','','ガヌメむル','Gaameiru',213,412,'levelmale','20',9,233,'bug','flying','Moth','yellow','',94,50,94,50,66,70,'010100',NULL,45,159,0,70,'','',414), +(415,0,0,53,'Combee','','ミツハニヌ','Mitsuhanii',214,0,NULL,'',3,55,'bug','flying','Tiny Bee','yellow','',30,42,30,42,70,30,'000001',NULL,120,63,31,70,'','dpfem',415), +(416,0,0,54,'Vespiquen','','ビヌクむン','Biikuin',214,415,'levelfemale','21',12,385,'bug','flying','Beehive','yellow','',80,102,80,102,40,70,'001010',NULL,45,188,254,70,'','',416), +(417,0,0,55,'Pachirisu','','パチリス','Pachirisu',215,0,NULL,'',4,39,'electric',NULL,'EleSquirrel','white','',45,70,45,90,95,60,'000001',NULL,200,120,127,100,'','dpfem',417), +(418,0,0,56,'Buizel','','ブむれル','Buizeru',216,0,NULL,'',7,295,'water',NULL,'Sea Weasel','brown','',65,35,60,30,85,55,'000001',NULL,190,75,127,70,'','dpfemback',418), +(419,0,0,57,'Floatzel','','フロヌれル','Furoozeru',216,418,'level','26',11,335,'water',NULL,'Sea Weasel','brown','',105,55,85,50,115,85,'000002',NULL,75,178,127,70,'','dpfemback',419), +(420,0,0,58,'Cherubi','','チェリンボ','Cherinbo',217,0,NULL,'',4,33,'grass',NULL,'Cherry','pink','',35,45,62,53,35,45,'000100',NULL,190,68,127,70,'','',420), +(421,0,0,59,'Cherrim','','チェリム','Cherimu',217,420,'level','25',5,93,'grass',NULL,'Blossom','pink','',60,70,87,78,85,70,'000200',NULL,75,133,127,70,'','',421), +(422,0,0,60,'Shellos','','カラナクシ','Karanakushi',218,0,NULL,'',3,63,'water',NULL,'Sea Slug','purple','',48,48,57,62,34,76,'100000',NULL,190,73,127,70,'','',422), +(423,0,0,61,'Gastrodon','','トリトドン','Toritodon',218,422,'level','30',9,299,'water','ground','Sea Slug','purple','',83,68,92,82,39,111,'200000',NULL,75,176,127,70,'','',423), +(424,0,0,64,'Ambipom','','゚テボヌス','Eteboosu',93,190,'move','458',12,203,'normal',NULL,'Long Tail','purple','',100,66,60,66,115,75,'000002',NULL,45,186,127,100,'','dpfem,dpfemback',424), +(425,0,0,65,'Drifloon','','フワンテ','Fuwante',219,0,NULL,'',4,12,'ghost','flying','Balloon','purple','',50,34,60,44,70,90,'100000',NULL,125,127,127,70,'','',425), +(426,0,0,66,'Drifblim','','フワラむド','Fuwaraido',219,425,'level','28',12,150,'ghost','flying','Blimp','purple','',80,44,90,54,80,150,'200000',NULL,60,204,127,70,'','',426), +(427,0,0,67,'Buneary','','ミミロル','Mimiroru',220,0,NULL,'',4,55,'normal',NULL,'Rabbit','brown','',66,44,44,56,85,55,'000001',NULL,190,84,127,0,'','',427), +(428,0,0,68,'Lopunny','','ミミロップ','Mimiroppu',220,427,'happiness','',12,333,'normal',NULL,'Rabbit','brown','',76,84,54,96,105,65,'000002',NULL,60,178,127,140,'','',428), +(429,0,0,73,'Mismagius','','ムりマヌゞ','Muumaaji',98,200,'item','Dusk Stone',9,44,'ghost',NULL,'Magical','purple','',60,60,105,105,105,60,'000110',NULL,45,187,127,35,'','',429), +(430,0,0,75,'Honchkrow','','ドンカラス','Donkarasu',97,198,'item','Dusk Stone',9,273,'dark','flying','Big Boss','black','',125,52,105,52,71,100,'020000',NULL,30,187,127,35,'','',430), +(431,0,0,76,'Glameow','','ニャルマヌ','Nyarumaa',221,0,NULL,'',5,39,'normal',NULL,'Catty','gray','',55,42,42,37,85,49,'000001',NULL,190,71,191,70,'','',431), +(432,0,0,77,'Purugly','','ブニャット','Bunyatto',221,431,'level','38',10,438,'normal',NULL,'Tiger Cat','gray','',82,64,64,59,112,71,'000002',NULL,75,183,191,70,'','',432), +(433,0,0,82,'Chingling','','リヌシャン','Riishan',184,0,NULL,'',2,6,'psychic',NULL,'Bell','yellow','',30,50,65,50,45,45,'000100',NULL,120,74,127,70,'','baby',433), +(434,0,0,84,'Stunky','','スカンプヌ','Sukanpuu',223,0,NULL,'',4,192,'poison','dark','Skunk','purple','',63,47,41,41,74,63,'000001',NULL,225,79,127,70,'','',434), +(435,0,0,85,'Skuntank','','スカタンク','Sukatanku',223,434,'level','34',10,380,'poison','dark','Skunk','purple','',93,67,71,61,84,103,'200000',NULL,60,209,127,70,'','',435), +(436,0,0,88,'Bronzor','','ドヌミラヌ','Doomiraa',224,0,NULL,'',5,605,'steel','psychic','Bronze','green','',24,86,24,86,23,57,'001000',NULL,255,72,255,70,'','',436), +(437,0,0,89,'Bronzong','','ドヌタクン','Dootakun',224,436,'level','33',13,1870,'steel','psychic','Bronze Bell','green','',89,116,79,116,33,67,'001010',NULL,90,188,255,70,'','',437), +(438,0,0,92,'Bonsly','','り゜ハチ','Usohachi',91,0,NULL,'',5,150,'rock',NULL,'Bonsai','brown','',80,95,10,45,10,50,'001000',NULL,255,68,127,70,'','baby',438), +(439,0,0,94,'Mime Jr.','','マネネ','Manene',57,0,NULL,'',6,130,'psychic',NULL,'Mime','pink','',25,45,70,90,60,20,'000010',NULL,145,78,127,70,'','baby',439), +(440,0,0,96,'Happiny','','ピンプク','Pinpuku',51,0,NULL,'',6,244,'normal',NULL,'Playhouse','pink','',5,5,15,65,30,100,'100000',NULL,130,255,254,140,'','baby',440), +(441,0,0,102,'Chatot','','ペラップ','Perappu',228,0,NULL,'',5,19,'normal','flying','Music Note','black','',65,45,92,42,91,76,'010000',NULL,30,107,127,35,'','',441), +(442,0,0,108,'Spiritomb','','ミカルゲ','Mikaruge',229,0,NULL,'',10,1080,'ghost','dark','Forbidden','purple','',92,108,92,108,35,50,'001010',NULL,100,168,127,70,'','',442), +(443,0,0,109,'Gible','','フカマル','Fukamaru',230,0,NULL,'',7,205,'dragon','ground','Land Shark','blue','',70,45,40,45,42,58,'010000',NULL,45,67,127,70,'','dpfem,dpfemback',443), +(444,0,0,110,'Gabite','','ガバむト','Gabaito',230,443,'level','24',14,560,'dragon','ground','Cave','blue','',90,65,50,55,82,68,'020000',NULL,45,144,127,70,'','dpfem,dpfemback',444), +(445,0,0,111,'Garchomp','','ガブリアス','Gaburiasu',230,444,'level','48',19,950,'dragon','ground','Mach','blue','',130,95,80,85,102,108,'030000',NULL,45,218,127,70,'','dpfem',445), +(446,0,0,112,'Munchlax','','ゎンベ','Gonbe',72,0,NULL,'',6,1050,'normal',NULL,'Big Eater','black','',85,40,40,85,5,135,'100000',NULL,50,94,31,70,'','baby',446), +(447,0,0,115,'Riolu','','リオル','Rioru',232,0,NULL,'',7,202,'fighting',NULL,'Emanation','blue','',70,40,35,40,60,40,'010000',NULL,75,72,31,70,'','',447), +(448,0,0,116,'Lucario','','ルカリオ','Rukario',232,447,'happinessday','',12,540,'fighting','steel','Aura','blue','',110,70,115,70,90,70,'010100',NULL,45,204,31,70,'','',448), +(449,0,0,122,'Hippopotas','','ヒポポタス','Hipopotasu',233,0,NULL,'',8,495,'ground',NULL,'Hippo','brown','',72,78,38,42,32,68,'001000',NULL,140,95,127,70,'','dpfem,dpfemback',449), +(450,0,0,123,'Hippowdon','','カバルドン','Kabarudon',233,449,'level','34',20,3000,'ground',NULL,'Heavyweight','brown','',112,118,68,72,47,108,'002000',NULL,60,198,127,70,'','dpfem,dpfemback',450), +(451,0,0,127,'Skorupi','','スコルピ','Sukorupi',234,0,NULL,'',8,120,'poison','bug','Scorpion','purple','',50,90,30,55,65,40,'001000',NULL,120,114,127,70,'','',451), +(452,0,0,128,'Drapion','','ドラピオン','Dorapion',234,451,'level','40',13,615,'poison','dark','Ogre Scorp','purple','',90,110,60,75,95,70,'002000',NULL,45,204,127,70,'','',452), +(453,0,0,129,'Croagunk','','グレッグル','Guregguru',235,0,NULL,'',7,230,'poison','fighting','Toxic Mouth','blue','',61,40,61,40,50,48,'010000',NULL,140,83,127,100,'','dpfem,dpfemback',453), +(454,0,0,130,'Toxicroak','','ドクロック','Dokurokku',235,453,'level','37',13,444,'poison','fighting','Toxic Mouth','blue','',106,65,86,65,85,83,'020000',NULL,75,181,127,70,'In D/P: Technically the number of steps to hatch is 5,120, but since you will never get an egg with a non-baby in it I used the baby\'s steps instead.','dpfem,dpfemback',454), +(455,0,0,131,'Carnivine','','マスキッパ','Masukippa',236,0,NULL,'',14,270,'grass',NULL,'Bug Catcher','green','',100,72,90,72,46,74,'020000',NULL,200,164,127,70,'','',455), +(456,0,0,134,'Finneon','','ケむコりオ','Keikouo',237,0,NULL,'',4,70,'water',NULL,'Wing Fish','blue','',49,56,49,61,66,49,'000001',NULL,190,90,127,70,'','dpfem,dpfemback',456), +(457,0,0,135,'Lumineon','','ネオラント','Neoranto',237,456,'level','31',12,240,'water',NULL,'Neon','blue','',69,76,69,86,91,69,'000002',NULL,75,156,127,70,'','dpfem,dpfemback',457), +(458,0,0,140,'Mantyke','','タマンタ','Tamanta',116,0,NULL,'',10,650,'water','flying','Kite','blue','',20,50,60,120,50,45,'000010',NULL,25,108,127,70,'','baby',458), +(459,0,0,142,'Snover','','ナキカブリ','Yukikaburi',239,0,NULL,'',10,505,'grass','ice','Frost Tree','white','',62,50,62,60,40,60,'010000',NULL,120,131,127,70,'','dpfem,dpfemback',459), +(460,0,0,143,'Abomasnow','','ナキノオヌ','Yukinooo',239,459,'level','40',22,1355,'grass','ice','Frost Tree','white','',92,75,92,85,60,90,'010100',NULL,60,214,127,70,'','dpfem',460), +(461,0,0,145,'Weavile','','マニュヌラ','Manyuura',109,215,'holdnight','Razor Claw',11,340,'dark','ice','Sharp Claw','black','',120,65,45,85,125,70,'010001',NULL,45,199,127,35,'','dpfem,dpfemback',461), +(462,0,0,0,'Magnezone','','ゞバコむル','Jibakoiru',34,82,'levelarea','Mt. Coronet',12,1800,'electric','steel','Magnet Area','gray','',70,115,130,90,60,70,'000300',NULL,30,211,255,70,'','',462), +(463,0,0,0,'Lickilicky','','ベロベルド','Beroberudo',48,108,'move','205',17,1400,'normal',NULL,'Licking','pink','',85,95,80,95,50,110,'300000',NULL,30,193,127,70,'','',463), +(464,0,0,0,'Rhyperior','','ドサむドン','Dosaidon',50,112,'trade','Protector',24,2828,'ground','rock','Drill','gray','',140,130,55,55,40,115,'030000',NULL,30,217,127,70,'','dpfem,dpfemback',464), +(465,0,0,0,'Tangrowth','','モゞャンボ','Mojanbo',52,114,'move','246',20,1286,'grass',NULL,'Vine','blue','',100,125,110,50,50,100,'002000',NULL,30,211,127,70,'','dpfem',465), +(466,0,0,0,'Electivire','','゚レキブル','Erekiburu',60,125,'trade','Electirizer',18,1386,'electric',NULL,'Thunderbolt','yellow','',123,67,95,85,95,75,'030000',NULL,30,199,63,70,'','',466), +(467,0,0,0,'Magmortar','','ブヌバヌン','Buubaan',61,126,'trade','Magmarizer',16,680,'fire',NULL,'Blast','red*','',95,67,125,95,83,75,'000300',NULL,30,199,63,70,'','',467), +(468,0,0,0,'Togekiss','','トゲキッス','Togekissu',87,176,'item','Shiny Stone',15,380,'normal','flying','Jubilee','white*','',50,95,120,115,80,85,'000210',NULL,30,220,31,70,'','',468), +(469,0,0,0,'Yanmega','','メガダンマ','Megayanma',95,193,'move','246',19,515,'bug','flying','Ogre Darner','green','',76,86,116,56,95,86,'020000',NULL,30,198,127,70,'','',469), +(470,0,0,0,'Leafeon','','リヌフィア','Riifia',67,133,'levelarea','Moss Rock in Eterna Forest',10,255,'grass',NULL,'Verdant','green','',110,130,60,65,95,65,'002000',NULL,45,196,31,35,'','',470), +(471,0,0,0,'Glaceon','','グレむシア','Gureishia',67,133,'levelarea','Ice Rock on Route 217',8,259,'ice',NULL,'Fresh Snow','blue','',60,110,130,95,65,65,'000200',NULL,45,196,31,35,'','',471), +(472,0,0,0,'Gliscor','','グラむオン','Guraion',104,207,'holdnight','Razor Fang',20,425,'ground','flying','Fang Scorp','purple','',95,125,45,75,95,75,'002000',NULL,30,192,127,70,'','',472), +(473,0,0,0,'Mamoswine','','マンムヌ','Manmuu',112,221,'move','246',25,2910,'ice','ground','Twin Tusk','brown','',130,80,70,60,80,110,'030000',NULL,50,207,127,70,'','dpfem',473), +(474,0,0,0,'Porygon-Z','','ポリゎン','PorigonZ',68,233,'trade','Dubious Disc',9,340,'normal',NULL,'Virtual','red','',80,70,135,75,90,85,'000300',NULL,30,185,255,70,'','',474), +(475,0,0,0,'Gallade','','゚ルレむド','Erureido',140,281,'itemmale','Dawn Stone',16,520,'psychic','fighting','Blade','white','',125,65,65,115,80,68,'030000',NULL,45,208,0,35,'','',475), +(476,0,0,0,'Probopass','','ダむノヌズ','Dainoozu',147,299,'levelarea','Mt. Coronet',14,3400,'rock','steel','Compass','gray','',55,145,75,150,40,60,'001020',NULL,60,198,127,70,'','',476), +(477,0,0,0,'Dusknoir','','ペノワヌル','Yonowaaru',182,356,'trade','Reaper Cloth',22,1066,'ghost',NULL,'Gripper','black','',100,135,65,135,45,45,'001020',NULL,45,210,127,35,'','',477), +(478,0,0,0,'Froslass','','ナキメノコ','Yukimenoko',186,361,'itemfemale','Dawn Stone',13,266,'ice','ghost','Snow Land','white','',80,70,80,70,110,70,'000002',NULL,75,187,254,70,'','',478), +(479,0,0,0,'Rotom','','ロトム','Rotomu',240,0,NULL,'',3,3,'electric','ghost','Plasma','red','',50,77,95,77,91,50,'000101',NULL,45,132,255,70,'','',479), +(480,0,0,146,'Uxie','','ナクシヌ','Yukushii',241,0,NULL,'',3,3,'psychic',NULL,'Knowledge','yellow','',75,130,75,130,95,75,'002010',NULL,3,210,255,140,'','',480), +(481,0,0,147,'Mesprit','','゚ムリット','Emuritto',242,0,NULL,'',3,3,'psychic',NULL,'Emotion','pink','',105,105,105,105,80,80,'010110',NULL,3,210,255,140,'','',481), +(482,0,0,148,'Azelf','','アグノム','Agunomu',243,0,NULL,'',3,3,'psychic',NULL,'Willpower','blue','',125,70,125,70,115,75,'020100',NULL,3,210,255,140,'','',482), +(483,0,0,149,'Dialga','','ディアルガ','Diaruga',244,0,NULL,'',54,6830,'steel','dragon','Temporal','white','',120,120,150,100,90,100,'000300',NULL,30,220,255,0,'','',483), +(484,0,0,150,'Palkia','','パルキア','Parukia',245,0,NULL,'',42,3360,'water','dragon','Spatial','purple','',120,100,150,120,100,90,'000300',NULL,30,220,255,0,'','',484), +(485,0,0,0,'Heatran','','ヒヌドラン','Hiidoran',246,0,NULL,'',17,4300,'fire','steel','Lava Dome','brown','',90,106,130,106,77,91,'000300',NULL,3,215,127,100,'','',485), +(486,0,0,0,'Regigigas','','レゞギガス','Rejigigasu',247,0,NULL,'',37,4200,'normal',NULL,'Colossal','white','',160,110,80,110,100,110,'030000',NULL,3,220,255,0,'','',486), +(487,0,0,0,'Giratina','','ギラティナ','Giratina',248,0,NULL,'',45,7500,'ghost','dragon','Renegade','black','',100,120,100,120,90,150,'300000',NULL,3,220,255,0,'','',487), +(488,0,0,0,'Cresselia','','クレセリア','Kureseria',249,0,NULL,'',15,856,'psychic',NULL,'Lunar','yellow','',70,120,75,130,85,120,'000030',NULL,3,210,254,100,'','',488), +(489,0,0,0,'Phione','','フィオネ','Fione',250,0,NULL,'',4,31,'water',NULL,'Sea Drifter','blue','',80,80,80,80,80,80,'100000',NULL,30,165,255,70,'','baby',489), +(490,0,0,151,'Manaphy','','マナフィ','Manafi',250,489,'none','',3,14,'water',NULL,'Seafaring','blue','',100,100,100,100,100,100,'300000',NULL,3,215,255,70,'','',490), +(491,0,0,0,'Darkrai','','ダヌクラむ','Daakurai',252,0,NULL,'',15,505,'dark',NULL,'Pitch-Black','black','',90,90,135,90,125,70,'000201',NULL,3,210,255,0,'','',491), +(492,0,0,0,'Shaymin','','シェむミ','Sheimi',253,0,NULL,'',2,21,'grass',NULL,'Gratitude','green','',100,100,100,100,100,100,'300000',NULL,45,64,255,100,'','',492), +(493,0,0,0,'Arceus','','アルセりス','Aruseusu',254,0,NULL,'',32,3200,'normal',NULL,'Alpha','gray','',120,120,120,120,120,120,'300000',NULL,3,255,255,0,'','',493), +(494,0,0,0,'Pokemon494','','','',0,0,NULL,'',0,0,'normal',NULL,'','','',10,10,10,10,10,10,'000000',NULL,3,255,255,0,'','',494), +(495,0,0,0,'Pokemon495','','','',0,0,NULL,'',0,0,'normal',NULL,'','','',10,10,10,10,10,10,'000000',NULL,3,255,255,0,'','',495), +(496,0,202,0,'Deoxys','attack','','Deokishisu',202,0,NULL,'',17,608,'psychic',NULL,'DNA','red','rare',180,20,180,20,150,50,'020100',NULL,3,215,255,0,'','',386), +(497,0,202,0,'Deoxys','defense','','Deokishisu',202,0,NULL,'',17,608,'psychic',NULL,'DNA','red','rare',70,160,70,160,90,50,'002010',NULL,3,215,255,0,'','',386), +(498,0,202,0,'Deoxys','speed','','Deokishisu',202,0,NULL,'',17,608,'psychic',NULL,'DNA','red','rare',95,90,95,90,180,50,'000003',NULL,3,215,255,0,'','',386), +(499,0,0,46,'Wormadam','ground','ミノマダム','Minomadamu',213,0,NULL,'',5,65,'bug','ground','Bagworm','gray','',79,105,59,85,36,60,'002000',NULL,45,159,254,70,'','',413), +(500,0,0,46,'Wormadam','steel','ミノマダム','Minomadamu',213,0,NULL,'',5,65,'bug','steel','Bagworm','gray','',69,95,69,95,36,60,'001010',NULL,45,159,254,70,'','',413); /*!40000 ALTER TABLE pokemon ENABLE KEYS */; UNLOCK TABLES; @@ -13182,10 +13174,10 @@ DROP TABLE IF EXISTS pokemon_abilities; CREATE TABLE pokemon_abilities ( - pokeid int(10) unsigned NOT NULL, - abilityid int(10) unsigned NOT NULL, + pokemon_id int(10) unsigned NOT NULL, + ability_id int(10) unsigned NOT NULL, slot tinyint(1) unsigned NOT NULL, - PRIMARY KEY (pokeid,abilityid,slot), - KEY pokeid (pokeid), - KEY abilityid (abilityid) + PRIMARY KEY USING BTREE (pokemon_id,ability_id,slot), + KEY pokeid USING BTREE (pokemon_id), + KEY abilityid USING BTREE (ability_id) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; @@ -13975,9 +13967,9 @@ DROP TABLE IF EXISTS pokemon_breeds; CREATE TABLE pokemon_breeds ( - pokeid int(10) unsigned NOT NULL, + pokemon_id int(10) unsigned NOT NULL, breed tinyint(3) unsigned NOT NULL, - PRIMARY KEY (pokeid,breed), - KEY pokeid (pokeid), - KEY breed (breed) + PRIMARY KEY USING BTREE (pokemon_id,breed), + KEY breed (breed), + KEY pokeid USING BTREE (pokemon_id) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; @@ -14886,28 +14878,28 @@ -- --- Table structure for table `pokemoves` +-- Table structure for table `pokemon_moves` -- -DROP TABLE IF EXISTS pokemoves; -CREATE TABLE pokemoves ( - pokeid smallint(5) unsigned NOT NULL default '0', - moveid smallint(5) unsigned NOT NULL default '0', +DROP TABLE IF EXISTS pokemon_moves; +CREATE TABLE pokemon_moves ( + pokemon_id smallint(5) unsigned NOT NULL default '0', + move_id smallint(5) unsigned NOT NULL default '0', `level` tinyint(4) NOT NULL default '0', - version set('rb','y','gs','c','rusa','e','frlg','dp') NOT NULL default '', + versions set('rb','y','gs','c','rusa','e','frlg','dp') NOT NULL, method enum('level','egg','tutor','machine','crystal','xd','stadium1','stadium2','event','pokecenter','box','pikalightball') NOT NULL default 'level', - PRIMARY KEY (pokeid,moveid,`level`,version,method), - KEY POKEID (pokeid), - KEY MOVEID (moveid), - KEY VERSION (version), - KEY METHOD (method) + PRIMARY KEY USING BTREE (pokemon_id,move_id,`level`,versions,method), + KEY METHOD (method), + KEY POKEID USING BTREE (pokemon_id), + KEY MOVEID USING BTREE (move_id), + KEY VERSION USING BTREE (versions) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -- --- Dumping data for table `pokemoves` +-- Dumping data for table `pokemon_moves` -- -LOCK TABLES pokemoves WRITE; -/*!40000 ALTER TABLE pokemoves DISABLE KEYS */; -INSERT INTO pokemoves VALUES (1,13,0,'gs,c','egg'), +LOCK TABLES pokemon_moves WRITE; +/*!40000 ALTER TABLE pokemon_moves DISABLE KEYS */; +INSERT INTO pokemon_moves VALUES (1,13,0,'gs,c','egg'), (1,14,0,'e,frlg','tutor'), (1,14,0,'rb,y,dp','machine'), @@ -54114,5 +54106,5 @@ (500,445,35,'dp','level'), (500,446,0,'dp','machine'); -/*!40000 ALTER TABLE pokemoves ENABLE KEYS */; +/*!40000 ALTER TABLE pokemon_moves ENABLE KEYS */; UNLOCK TABLES; @@ -54128,5 +54120,5 @@ rank tinyint(2) NOT NULL default '0', id tinyint(2) NOT NULL default '0', - internalid tinyint(4) NOT NULL default '0', + internal_id tinyint(4) NOT NULL default '0', new_effects varchar(17) default NULL, old_effects varchar(17) default NULL, Index: /veekun/trunk/script/dump_sql.pl =================================================================== --- /veekun/trunk/script/dump_sql.pl (revision 396) +++ /veekun/trunk/script/dump_sql.pl (revision 406) @@ -11,7 +11,7 @@ my %TABLES = ( - base => [qw/ edits errorlog forums grouppermissions groups messages posts sessions shoutbox threads thread_views usergroups userpermissions users /], - gallery => [qw/ creators gallery gallerykeywords itemkeywords /], - pokedex => [qw/ abilities berries contestmoves evchains flavortext items locations location_sections location_encounters machines moves move_effects pokemon pokemon_abilities pokemon_breeds pokemon_items pokemoves types /], + base => [qw/ edits error_log forums group_permissions groups messages posts sessions shoutbox threads thread_views user_groups users /], + gallery => [qw/ creators gallery gallery_keywords item_keywords /], + pokedex => [qw/ abilities berries contest_effects evo_chains flavor_text items locations location_sections location_encounters machines moves move_effects pokemon pokemon_abilities pokemon_breeds pokemon_items pokemon_moves types /], ); Index: /veekun/trunk/lib/Vee/Bot.pm =================================================================== --- /veekun/trunk/lib/Vee/Bot.pm (revision 262) +++ /veekun/trunk/lib/Vee/Bot.pm (revision 406) @@ -73,5 +73,5 @@ my $ability = $schema->resultset('Abilities')->find($hashref->{id}); return sprintf "%s: %s", - $ability->name, $ability->effect; + $ability->name, $ability->description; } else { @@ -204,8 +204,8 @@ } - my @pm = $schema->resultset('PokeMoves')->search({ - pokeid => $pokemon_id, - moveid => $move_id, - -nest => \ "FIND_IN_SET('$ver', version)", + my @pm = $schema->resultset('PokemonMoves')->search({ + pokemon_id => $pokemon_id, + move_id => $move_id, + -nest => \ "FIND_IN_SET('$ver', versions)", }); Index: /veekun/trunk/lib/Vee/Schema/Types.pm =================================================================== --- /veekun/trunk/lib/Vee/Schema/Types.pm (revision 350) +++ /veekun/trunk/lib/Vee/Schema/Types.pm (revision 406) @@ -14,5 +14,5 @@ __PACKAGE__->table('types'); __PACKAGE__->add_columns(qw/ - name abbr color rank id internalid new_effects old_effects + name abbr color rank id internal_id new_effects old_effects /); __PACKAGE__->set_primary_key('name'); Index: /veekun/trunk/lib/Vee/Schema/Abilities.pm =================================================================== --- /veekun/trunk/lib/Vee/Schema/Abilities.pm (revision 350) +++ /veekun/trunk/lib/Vee/Schema/Abilities.pm (revision 406) @@ -13,8 +13,8 @@ __PACKAGE__->load_components('Core'); __PACKAGE__->table('abilities'); -__PACKAGE__->add_columns(qw/ id name gameblurb effect /); +__PACKAGE__->add_columns(qw/ id name blurb_dp description /); __PACKAGE__->set_primary_key('id'); -__PACKAGE__->has_many(pokemon_abilities => 'Vee::Schema::PokemonAbilities', 'abilityid'); +__PACKAGE__->has_many(pokemon_abilities => 'Vee::Schema::PokemonAbilities', 'ability_id'); __PACKAGE__->many_to_many(pokemon => 'pokemon_abilities', 'pokemon'); Index: /veekun/trunk/lib/Vee/Schema/Shoutbox.pm =================================================================== --- /veekun/trunk/lib/Vee/Schema/Shoutbox.pm (revision 404) +++ /veekun/trunk/lib/Vee/Schema/Shoutbox.pm (revision 406) @@ -15,10 +15,10 @@ __PACKAGE__->add_columns( qw/ id name /, - userid => { is_nullable => 1 }, - qw/ ip time message / + user_id => { is_nullable => 1 }, + qw/ ip time content / ); __PACKAGE__->set_primary_key('id'); -__PACKAGE__->might_have(user => 'Vee::Schema::Users', { 'foreign.id' => 'self.userid' }); +__PACKAGE__->might_have(user => 'Vee::Schema::Users', { 'foreign.id' => 'self.user_id' }); =head1 SEE ALSO Index: /veekun/trunk/lib/Vee/Schema/UserGroups.pm =================================================================== --- /veekun/trunk/lib/Vee/Schema/UserGroups.pm (revision 350) +++ /veekun/trunk/lib/Vee/Schema/UserGroups.pm (revision 406) @@ -7,16 +7,16 @@ =head1 NAME -Vee::Schema::UserGroups - DBIC class for the C table +Vee::Schema::UserGroups - DBIC class for the C table =cut __PACKAGE__->load_components('Core'); -__PACKAGE__->table('usergroups'); -__PACKAGE__->add_columns(qw/ userid groupid priority /); -__PACKAGE__->set_primary_key(qw/ userid groupid priority /); +__PACKAGE__->table('user_groups'); +__PACKAGE__->add_columns(qw/ user_id group_id priority /); +__PACKAGE__->set_primary_key(qw/ user_id group_id priority /); -__PACKAGE__->belongs_to(user => 'Vee::Schema::Users', 'userid'); +__PACKAGE__->belongs_to(user => 'Vee::Schema::Users', 'user_id'); # Temporary hack to get around problem with `` quoting -__PACKAGE__->belongs_to(group_hax => 'Vee::Schema::Groups', 'groupid'); +__PACKAGE__->belongs_to(group_hax => 'Vee::Schema::Groups', 'group_id'); =head1 SEE ALSO Index: /veekun/trunk/lib/Vee/Schema/ContestEffects.pm =================================================================== --- /veekun/trunk/lib/Vee/Schema/ContestEffects.pm (revision 406) +++ /veekun/trunk/lib/Vee/Schema/ContestEffects.pm (revision 406) @@ -0,0 +1,34 @@ +package Vee::Schema::ContestEffects; + +use strict; +use warnings; +use base 'DBIx::Class'; + +=head1 NAME + +Vee::Schema::ContestEffects - DBIC class for the C table + +=cut + +__PACKAGE__->load_components('Core'); +__PACKAGE__->table('contest_effects'); +__PACKAGE__->add_columns(qw/ id appeal jam blurb_rusa description /); +__PACKAGE__->set_primary_key('id'); + +=head1 SEE ALSO + +L, L + +=head1 AUTHOR + +Maintainer: Alex "Eevee" Munroe (C) + +See the included F file for a full list of contributers. + +=head1 LICENSE + +See the included F file. + +=cut + +1; Index: /veekun/trunk/lib/Vee/Schema/EvoChains.pm =================================================================== --- /veekun/trunk/lib/Vee/Schema/EvoChains.pm (revision 406) +++ /veekun/trunk/lib/Vee/Schema/EvoChains.pm (revision 406) @@ -0,0 +1,41 @@ +package Vee::Schema::EvoChains; + +use strict; +use warnings; +use base 'DBIx::Class'; + +=head1 NAME + +Vee::Schema::EvoChains - DBIC class for the C table + +=cut + +__PACKAGE__->load_components('Core'); +__PACKAGE__->table('evo_chains'); +__PACKAGE__->add_columns(qw/ + id + growth_rate + steps + baby_item +/); +__PACKAGE__->set_primary_key('id'); + +__PACKAGE__->has_many(pokemon => 'Vee::Schema::Pokemon', 'evo_chain_id'); + +=head1 SEE ALSO + +L, L + +=head1 AUTHOR + +Maintainer: Alex "Eevee" Munroe (C) + +See the included F file for a full list of contributers. + +=head1 LICENSE + +See the included F file. + +=cut + +1; Index: /veekun/trunk/lib/Vee/Schema/Groups.pm =================================================================== --- /veekun/trunk/lib/Vee/Schema/Groups.pm (revision 350) +++ /veekun/trunk/lib/Vee/Schema/Groups.pm (revision 406) @@ -16,6 +16,6 @@ __PACKAGE__->set_primary_key('id'); -__PACKAGE__->has_many(user_groups => 'Vee::Schema::UserGroups', 'groupid'); -__PACKAGE__->has_many(permissions => 'Vee::Schema::GroupPermissions', 'groupid'); +__PACKAGE__->has_many(user_groups => 'Vee::Schema::UserGroups', 'group_id'); +__PACKAGE__->has_many(permissions => 'Vee::Schema::GroupPermissions', 'group_id'); __PACKAGE__->many_to_many('users' => 'user_groups', 'user'); Index: /veekun/trunk/lib/Vee/Schema/PokemonMoves.pm =================================================================== --- /veekun/trunk/lib/Vee/Schema/PokemonMoves.pm (revision 406) +++ /veekun/trunk/lib/Vee/Schema/PokemonMoves.pm (revision 406) @@ -0,0 +1,38 @@ +package Vee::Schema::PokemonMoves; + +use strict; +use warnings; +use base 'DBIx::Class'; + +=head1 NAME + +Vee::Schema::PokemonMoves - DBIC class for the C table + +=cut + +__PACKAGE__->load_components('Core'); +__PACKAGE__->table('pokemon_moves'); +__PACKAGE__->add_columns(qw/ pokemon_id move_id level versions method /); + +__PACKAGE__->set_primary_key(qw/ pokemon_id move_id level versions method /); + +__PACKAGE__->belongs_to(pokemon => 'Vee::Schema::Pokemon', 'pokemon_id'); +__PACKAGE__->belongs_to(move => 'Vee::Schema::Moves', 'move_id'); + +=head1 SEE ALSO + +L, L + +=head1 AUTHOR + +Maintainer: Alex "Eevee" Munroe (C) + +See the included F file for a full list of contributers. + +=head1 LICENSE + +See the included F file. + +=cut + +1; Index: /veekun/trunk/lib/Vee/Schema/GroupPermissions.pm =================================================================== --- /veekun/trunk/lib/Vee/Schema/GroupPermissions.pm (revision 350) +++ /veekun/trunk/lib/Vee/Schema/GroupPermissions.pm (revision 406) @@ -7,12 +7,12 @@ =head1 NAME -Vee::Schema::GroupPermissions - DBIC class for the C table +Vee::Schema::GroupPermissions - DBIC class for the C table =cut __PACKAGE__->load_components('Core'); -__PACKAGE__->table('grouppermissions'); -__PACKAGE__->add_columns(qw/ groupid permission scope polarity /); -__PACKAGE__->set_primary_key(qw/ groupid permission scope /); +__PACKAGE__->table('group_permissions'); +__PACKAGE__->add_columns(qw/ group_id permission scope polarity /); +__PACKAGE__->set_primary_key(qw/ group_id permission scope /); 1; Index: /veekun/trunk/lib/Vee/Schema/Moves.pm =================================================================== --- /veekun/trunk/lib/Vee/Schema/Moves.pm (revision 350) +++ /veekun/trunk/lib/Vee/Schema/Moves.pm (revision 406) @@ -21,5 +21,5 @@ power pp - acc + accuracy target class @@ -30,15 +30,15 @@ status move_effect_id - gameblurb - dpblurb - contype - coneffect + blurb_rusa + blurb_dp + contest_type + contest_effect_id notes /); __PACKAGE__->set_primary_key('id'); -__PACKAGE__->belongs_to(contest => 'Vee::Schema::ContestMoves', 'coneffect'); +__PACKAGE__->belongs_to(contest_effect => 'Vee::Schema::ContestEffects', 'contest_effect_id'); __PACKAGE__->belongs_to(effect => 'Vee::Schema::MoveEffects', 'move_effect_id'); -__PACKAGE__->has_many(pokemoves => 'Vee::Schema::PokeMoves', 'moveid'); +__PACKAGE__->has_many(pokemon_moves => 'Vee::Schema::PokemonMoves', 'move_id'); =head1 METHODS @@ -88,21 +88,15 @@ } -=head2 blurb +=head2 short_description -Returns a short blurb for this move, suitable for putting in a move table. +Returns a short description for this move, suitable for putting in a move table. Applies C<_format_description> effects. - -If this move's move effect has no blurb, the full description will be used -instead. This should no longer happen, but was necessary for some degree of -completion when the blurbs were still being written. =cut -sub blurb { +sub short_description { my ($self) = @_; - return $self->_format_description( - $self->effect->blurb || $self->effect->description - ); + return $self->_format_description( $self->effect->short_description ); } @@ -110,5 +104,5 @@ Inserts this move's effect chance and priority into the provided string, if -applicable. Used by C and C. +applicable. Used by C and C. =cut Index: /veekun/trunk/lib/Vee/Schema/Threads.pm =================================================================== --- /veekun/trunk/lib/Vee/Schema/Threads.pm (revision 386) +++ /veekun/trunk/lib/Vee/Schema/Threads.pm (revision 406) @@ -14,12 +14,12 @@ __PACKAGE__->table('threads'); __PACKAGE__->add_columns(qw/ - id forumid subject blurb firstpostid lastpostid lasttime postct hitct flags + id forum_id subject blurb first_post_id last_post_id last_post_time post_count view_count flags /); __PACKAGE__->set_primary_key('id'); -__PACKAGE__->belongs_to(forum => 'Vee::Schema::Forums', 'forumid'); -__PACKAGE__->has_many(posts => 'Vee::Schema::Posts', 'threadid'); -__PACKAGE__->belongs_to(lastpost => 'Vee::Schema::Posts', 'lastpostid'); -__PACKAGE__->belongs_to(firstpost => 'Vee::Schema::Posts', 'firstpostid'); +__PACKAGE__->belongs_to(forum => 'Vee::Schema::Forums', 'forum_id'); +__PACKAGE__->has_many(posts => 'Vee::Schema::Posts', 'thread_id'); +__PACKAGE__->belongs_to(last_post => 'Vee::Schema::Posts', 'last_post_id'); +__PACKAGE__->belongs_to(first_post => 'Vee::Schema::Posts', 'first_post_id'); __PACKAGE__->has_many(thread_views => 'Vee::Schema::ThreadViews', 'thread_id', { join_type => 'LEFT' }); @@ -37,5 +37,5 @@ return $self->search( [ \ 'FIND_IN_SET("announcement", me.flags) AND NOT FIND_IN_SET("deleted", me.flags)' ], - { prefetch => [ 'forum', { firstpost => 'user', lastpost => 'user' } ] } + { prefetch => [ 'forum', { first_post => 'user', last_post => 'user' } ] } ); } @@ -53,8 +53,8 @@ # ambiguity errors return map { $_->id } $self->search( { - 'me.lasttime' => { '>' => $user->thread_view_cutoff }, - 'thread_views.last_viewed' => [ undef, \'< me.lasttime' ], + 'me.last_post_time' => { '>' => $user->thread_view_cutoff }, + 'thread_views.last_viewed' => [ undef, \'< me.last_post_time' ], }, { - # XXX: This is very naughty, but the only way to stuff the user id in + # n.b.: This is very naughty, but the only way to stuff the user id in # the ON clause from => [ Index: /veekun/trunk/lib/Vee/Schema/MoveEffects.pm =================================================================== --- /veekun/trunk/lib/Vee/Schema/MoveEffects.pm (revision 350) +++ /veekun/trunk/lib/Vee/Schema/MoveEffects.pm (revision 406) @@ -13,5 +13,5 @@ __PACKAGE__->load_components('Core'); __PACKAGE__->table('move_effects'); -__PACKAGE__->add_columns(qw/ id priority blurb description /); +__PACKAGE__->add_columns(qw/ id priority short_description description /); __PACKAGE__->set_primary_key('id'); Index: /veekun/trunk/lib/Vee/Schema/Sessions.pm =================================================================== --- /veekun/trunk/lib/Vee/Schema/Sessions.pm (revision 404) +++ /veekun/trunk/lib/Vee/Schema/Sessions.pm (revision 406) @@ -17,7 +17,7 @@ __PACKAGE__->add_columns( 'id', - userid => { is_nullable => 1 }, - expires => { is_nullable => 1 }, - data => { is_nullable => 1 }, + user_id => { is_nullable => 1 }, + time_expires => { is_nullable => 1 }, + data => { is_nullable => 1 }, ); __PACKAGE__->set_primary_key('id'); Index: /veekun/trunk/lib/Vee/Schema/Edits.pm =================================================================== --- /veekun/trunk/lib/Vee/Schema/Edits.pm (revision 350) +++ /veekun/trunk/lib/Vee/Schema/Edits.pm (revision 406) @@ -13,9 +13,9 @@ __PACKAGE__->load_components('Core'); __PACKAGE__->table('edits'); -__PACKAGE__->add_columns(qw/ id postid userid time oldmessage /); +__PACKAGE__->add_columns(qw/ id post_id user_id time old_content /); __PACKAGE__->set_primary_key('id'); -__PACKAGE__->might_have(post => 'Vee::Schema::Posts', { 'foreign.id' => 'self.postid' }); -__PACKAGE__->might_have(user => 'Vee::Schema::Users', { 'foreign.id' => 'self.userid' }); +__PACKAGE__->might_have(post => 'Vee::Schema::Posts', { 'foreign.id' => 'self.post_id' }); +__PACKAGE__->might_have(user => 'Vee::Schema::Users', { 'foreign.id' => 'self.user_id' }); =head1 SEE ALSO Index: /veekun/trunk/lib/Vee/Schema/Pokemon.pm =================================================================== --- /veekun/trunk/lib/Vee/Schema/Pokemon.pm (revision 393) +++ /veekun/trunk/lib/Vee/Schema/Pokemon.pm (revision 406) @@ -26,8 +26,8 @@ name_romaji - evid - evparent - evmethod - evparam + evo_chain_id + evo_parent_id + evo_method + evo_param height @@ -47,25 +47,22 @@ effort - oldgs - caprate - baseexp - gender - happiness - root - eventred - eventblue + gameshark_rby + capture_rate + base_exp + gender_rate + base_happiness notes flags - real_id + real_pokemon_id /); __PACKAGE__->set_primary_key('id'); -__PACKAGE__->belongs_to(evchain => 'Vee::Schema::EvChains', 'evid'); -__PACKAGE__->has_many(pokemoves => 'Vee::Schema::PokeMoves', 'pokeid'); -__PACKAGE__->has_many(flavors => 'Vee::Schema::FlavorText', 'pokeid'); +__PACKAGE__->belongs_to(evo_chain => 'Vee::Schema::EvoChains', 'evo_chain_id'); +__PACKAGE__->has_many(pokemon_moves => 'Vee::Schema::PokemonMoves', 'pokemon_id'); +__PACKAGE__->has_many(flavors => 'Vee::Schema::FlavorText', 'pokemon_id'); __PACKAGE__->has_many(encounters => 'Vee::Schema::LocationEncounters', 'pokemon_id'); -__PACKAGE__->has_many(breeds => 'Vee::Schema::PokemonBreeds', 'pokeid'); +__PACKAGE__->has_many(breeds => 'Vee::Schema::PokemonBreeds', 'pokemon_id'); -__PACKAGE__->has_many(pokemon_abilities => 'Vee::Schema::PokemonAbilities', 'pokeid', { order_by => 'slot ASC' }); +__PACKAGE__->has_many(pokemon_abilities => 'Vee::Schema::PokemonAbilities', 'pokemon_id', { order_by => 'slot ASC' }); __PACKAGE__->many_to_many(abilities => 'pokemon_abilities', 'ability'); @@ -73,6 +70,6 @@ __PACKAGE__->many_to_many(items => 'pokemon_items', 'item'); -__PACKAGE__->might_have(parent => 'Vee::Schema::Pokemon', 'evparent'); -__PACKAGE__->has_many(descendants => 'Vee::Schema::Pokemon', 'evparent'); +__PACKAGE__->might_have(parent => 'Vee::Schema::Pokemon', 'evo_parent_id'); +__PACKAGE__->has_many(descendants => 'Vee::Schema::Pokemon', 'evo_parent_id'); =head1 METHODS Index: /veekun/trunk/lib/Vee/Schema/Posts.pm =================================================================== --- /veekun/trunk/lib/Vee/Schema/Posts.pm (revision 350) +++ /veekun/trunk/lib/Vee/Schema/Posts.pm (revision 406) @@ -13,11 +13,11 @@ __PACKAGE__->load_components('Core'); __PACKAGE__->table('posts'); -__PACKAGE__->add_columns(qw/ id threadid userid flags time format message lasteditid /); +__PACKAGE__->add_columns(qw/ id thread_id user_id flags time format content last_edit_id /); __PACKAGE__->set_primary_key('id'); -__PACKAGE__->belongs_to(thread => 'Vee::Schema::Threads', 'threadid'); -__PACKAGE__->might_have(user => 'Vee::Schema::Users', { 'foreign.id' => 'self.userid' }); -__PACKAGE__->has_many(edits => 'Vee::Schema::Edits', 'postid'); -__PACKAGE__->might_have(lastedit => 'Vee::Schema::Edits', { 'foreign.id' => 'self.lasteditid' }); +__PACKAGE__->belongs_to(thread => 'Vee::Schema::Threads', 'thread_id'); +__PACKAGE__->might_have(user => 'Vee::Schema::Users', { 'foreign.id' => 'self.user_id' }); +__PACKAGE__->has_many(edits => 'Vee::Schema::Edits', 'post_id'); +__PACKAGE__->might_have(lastedit => 'Vee::Schema::Edits', { 'foreign.id' => 'self.last_edit_id' }); =head1 SEE ALSO Index: /veekun/trunk/lib/Vee/Schema/Forums.pm =================================================================== --- /veekun/trunk/lib/Vee/Schema/Forums.pm (revision 386) +++ /veekun/trunk/lib/Vee/Schema/Forums.pm (revision 406) @@ -14,10 +14,10 @@ __PACKAGE__->table('forums'); __PACKAGE__->add_columns(qw/ - id name lastpostid threadct postct flags accessibility blurb + id name last_post_id thread_count post_count flags accessibility description /); __PACKAGE__->set_primary_key('id'); -__PACKAGE__->has_many(threads => 'Vee::Schema::Threads', 'forumid'); -__PACKAGE__->might_have(lastpost => 'Vee::Schema::Posts', { 'foreign.id' => 'self.lastpostid' }); +__PACKAGE__->has_many(threads => 'Vee::Schema::Threads', 'forum_id'); +__PACKAGE__->might_have(last_post => 'Vee::Schema::Posts', { 'foreign.id' => 'self.last_post_id' }); =head2 unread_ids($user) @@ -33,6 +33,6 @@ # ambiguity errors return map { $_->id } $self->search( { - 'threads.lasttime' => { '>' => $user->thread_view_cutoff }, - 'thread_views.last_viewed' => [ undef, \'< threads.lasttime' ], + 'threads.last_post_time' => { '>' => $user->thread_view_cutoff }, + 'thread_views.last_viewed' => [ undef, \'< threads.last_post_time' ], }, { # XXX: This is very naughty, but the only way to stuff the user id in @@ -53,5 +53,5 @@ ], ], - { 'me.id' => 'threads.forumid' }, + { 'me.id' => 'threads.forum_id' }, ], ], Index: /veekun/trunk/lib/Vee/Schema/Items.pm =================================================================== --- /veekun/trunk/lib/Vee/Schema/Items.pm (revision 350) +++ /veekun/trunk/lib/Vee/Schema/Items.pm (revision 406) @@ -13,5 +13,5 @@ __PACKAGE__->load_components('Core'); __PACKAGE__->table('items'); -__PACKAGE__->add_columns(qw/ id game_id berry_id name category cost col5 hp_plus_maybe fling_power fling_effect natural_gift_power natural_gift_type col12 col13 col14 col15 col16 col17 col18 col19 col20 col21 col22 col23 effort_hp effort_at effort_de effort_sp effort_sa effort_sd hp_restored pp_restored happiness1 happiness2 happiness3 is_underground dpblurb description /); +__PACKAGE__->add_columns(qw/ id game_id berry_id name category cost col5 hp_plus_maybe fling_power fling_effect natural_gift_power natural_gift_type col12 col13 col14 col15 col16 col17 col18 col19 col20 col21 col22 col23 effort_hp effort_at effort_de effort_sp effort_sa effort_sd hp_restored pp_restored happiness1 happiness2 happiness3 is_underground blurb_dp description /); __PACKAGE__->set_primary_key('id'); Index: /veekun/trunk/lib/Vee/Schema/Creators.pm =================================================================== --- /veekun/trunk/lib/Vee/Schema/Creators.pm (revision 350) +++ /veekun/trunk/lib/Vee/Schema/Creators.pm (revision 406) @@ -13,7 +13,6 @@ __PACKAGE__->load_components('Core'); __PACKAGE__->table('creators'); -__PACKAGE__->add_columns(qw/ id userid name itemct /); +__PACKAGE__->add_columns(qw/ id user_id name item_count /); __PACKAGE__->set_primary_key('id'); -__PACKAGE__->add_unique_constraint(userid => ['userid']); =head1 SEE ALSO Index: /veekun/trunk/lib/Vee/Schema/ItemKeywords.pm =================================================================== --- /veekun/trunk/lib/Vee/Schema/ItemKeywords.pm (revision 350) +++ /veekun/trunk/lib/Vee/Schema/ItemKeywords.pm (revision 406) @@ -12,5 +12,5 @@ __PACKAGE__->load_components('Core'); -__PACKAGE__->table('itemkeywords'); +__PACKAGE__->table('item_keywords'); __PACKAGE__->add_columns(qw/ itemid keywordid /); __PACKAGE__->set_primary_key(qw/ itemid keywordid /); Index: /veekun/trunk/lib/Vee/Schema/GalleryKeywords.pm =================================================================== --- /veekun/trunk/lib/Vee/Schema/GalleryKeywords.pm (revision 350) +++ /veekun/trunk/lib/Vee/Schema/GalleryKeywords.pm (revision 406) @@ -12,8 +12,7 @@ __PACKAGE__->load_components('Core'); -__PACKAGE__->table('gallerykeywords'); +__PACKAGE__->table('gallery_keywords'); __PACKAGE__->add_columns(qw/ id keyword category description /); __PACKAGE__->set_primary_key('id'); -__PACKAGE__->add_unique_constraint("keyword", ["keyword"]); =head1 SEE ALSO Index: /veekun/trunk/lib/Vee/Schema/Machines.pm =================================================================== --- /veekun/trunk/lib/Vee/Schema/Machines.pm (revision 350) +++ /veekun/trunk/lib/Vee/Schema/Machines.pm (revision 406) @@ -13,5 +13,5 @@ __PACKAGE__->load_components('Core'); __PACKAGE__->table('machines'); -__PACKAGE__->add_columns(qw/ id generation cost moveid location /); +__PACKAGE__->add_columns(qw/ id generation cost move_id location /); __PACKAGE__->set_primary_key(qw/ id generation /); Index: /veekun/trunk/lib/Vee/Schema/ErrorLog.pm =================================================================== --- /veekun/trunk/lib/Vee/Schema/ErrorLog.pm (revision 350) +++ /veekun/trunk/lib/Vee/Schema/ErrorLog.pm (revision 406) @@ -7,11 +7,11 @@ =head1 NAME -Vee::Schema::ErrorLog - DBIC class for the C table +Vee::Schema::ErrorLog - DBIC class for the C table =cut __PACKAGE__->load_components('Core'); -__PACKAGE__->table('errorlog'); -__PACKAGE__->add_columns(qw/ id time userid ip path method query error /); +__PACKAGE__->table('error_log'); +__PACKAGE__->add_columns(qw/ id time user_id ip path method query error /); __PACKAGE__->set_primary_key('id'); Index: /veekun/trunk/lib/Vee/Schema/PokemonBreeds.pm =================================================================== --- /veekun/trunk/lib/Vee/Schema/PokemonBreeds.pm (revision 350) +++ /veekun/trunk/lib/Vee/Schema/PokemonBreeds.pm (revision 406) @@ -13,8 +13,8 @@ __PACKAGE__->load_components('Core'); __PACKAGE__->table('pokemon_breeds'); -__PACKAGE__->add_columns(qw/ pokeid breed /); -__PACKAGE__->set_primary_key(qw/ pokeid breed /); +__PACKAGE__->add_columns(qw/ pokemon_id breed /); +__PACKAGE__->set_primary_key(qw/ pokemon_id breed /); -__PACKAGE__->belongs_to(pokemon => 'Vee::Schema::Pokemon', 'pokeid'); +__PACKAGE__->belongs_to(pokemon => 'Vee::Schema::Pokemon', 'pokemon_id'); =head1 SEE ALSO Index: /veekun/trunk/lib/Vee/Schema/PokemonAbilities.pm =================================================================== --- /veekun/trunk/lib/Vee/Schema/PokemonAbilities.pm (revision 350) +++ /veekun/trunk/lib/Vee/Schema/PokemonAbilities.pm (revision 406) @@ -13,9 +13,9 @@ __PACKAGE__->load_components('Core'); __PACKAGE__->table('pokemon_abilities'); -__PACKAGE__->add_columns(qw/ pokeid abilityid slot /); -__PACKAGE__->set_primary_key(qw/ pokeid abilityid /); +__PACKAGE__->add_columns(qw/ pokemon_id ability_id slot /); +__PACKAGE__->set_primary_key(qw/ pokemon_id ability_id /); -__PACKAGE__->belongs_to(pokemon => 'Vee::Schema::Pokemon', 'pokeid'); -__PACKAGE__->belongs_to(ability => 'Vee::Schema::Abilities', 'abilityid'); +__PACKAGE__->belongs_to(pokemon => 'Vee::Schema::Pokemon', 'pokemon_id'); +__PACKAGE__->belongs_to(ability => 'Vee::Schema::Abilities', 'ability_id'); =head1 SEE ALSO Index: /veekun/trunk/lib/Vee/Schema/FlavorText.pm =================================================================== --- /veekun/trunk/lib/Vee/Schema/FlavorText.pm (revision 350) +++ /veekun/trunk/lib/Vee/Schema/FlavorText.pm (revision 406) @@ -7,13 +7,13 @@ =head1 NAME -Vee::Schema::FlavorText - DBIC class for the C table +Vee::Schema::FlavorText - DBIC class for the C table =cut __PACKAGE__->load_components('Core'); -__PACKAGE__->table('flavortext'); -__PACKAGE__->add_columns(qw/ pokeid generation text /); +__PACKAGE__->table('flavor_text'); +__PACKAGE__->add_columns(qw/ pokemon_id generation text /); -__PACKAGE__->belongs_to(pokemon => 'Vee::Schema::Pokemon', 'pokeid'); +__PACKAGE__->belongs_to(pokemon => 'Vee::Schema::Pokemon', 'pokemon_id'); =head1 SEE ALSO Index: /veekun/trunk/lib/Vee/Schema/Users.pm =================================================================== --- /veekun/trunk/lib/Vee/Schema/Users.pm (revision 350) +++ /veekun/trunk/lib/Vee/Schema/Users.pm (revision 406) @@ -17,10 +17,10 @@ name password - joindate - lastactive + time_joined + time_active thread_view_cutoff - postct + post_count flags - newspic + news_pic avatar contact_aim @@ -31,6 +31,6 @@ contact_homepage contact_email - pmicon - customtitle + pm_icon + custom_title signature is_dumb @@ -39,7 +39,7 @@ __PACKAGE__->add_unique_constraint(name => ['name']); -__PACKAGE__->has_many(posts => 'Vee::Schema::Posts', 'userid'); -__PACKAGE__->has_many(shouts => 'Vee::Schema::Shoutbox', 'userid'); -__PACKAGE__->has_many(user_groups => 'Vee::Schema::UserGroups', 'userid'); +__PACKAGE__->has_many(posts => 'Vee::Schema::Posts', 'user_id'); +__PACKAGE__->has_many(shouts => 'Vee::Schema::Shoutbox', 'user_id'); +__PACKAGE__->has_many(user_groups => 'Vee::Schema::UserGroups', 'user_id'); __PACKAGE__->has_many(sent_messages => 'Vee::Schema::Messages', 'from_user_id'); __PACKAGE__->has_many(received_messages => 'Vee::Schema::Messages', 'to_user_id'); Index: /ekun/trunk/lib/Vee/Schema/PokeMoves.pm =================================================================== --- /veekun/trunk/lib/Vee/Schema/PokeMoves.pm (revision 350) +++ (revision ) @@ -1,38 +1,0 @@ -package Vee::Schema::PokeMoves; - -use strict; -use warnings; -use base 'DBIx::Class'; - -=head1 NAME - -Vee::Schema::PokeMoves - DBIC class for the C table - -=cut - -__PACKAGE__->load_components('Core'); -__PACKAGE__->table('pokemoves'); -__PACKAGE__->add_columns(qw/ pokeid moveid level version method /); - -__PACKAGE__->set_primary_key(qw/ pokeid moveid level version method /); - -__PACKAGE__->belongs_to(pokemon => 'Vee::Schema::Pokemon', 'pokeid'); -__PACKAGE__->belongs_to(move => 'Vee::Schema::Moves', 'moveid'); - -=head1 SEE ALSO - -L, L - -=head1 AUTHOR - -Maintainer: Alex "Eevee" Munroe (C) - -See the included F file for a full list of contributers. - -=head1 LICENSE - -See the included F file. - -=cut - -1; Index: /ekun/trunk/lib/Vee/Schema/EvChains.pm =================================================================== --- /veekun/trunk/lib/Vee/Schema/EvChains.pm (revision 356) +++ (revision ) @@ -1,59 +1,0 @@ -package Vee::Schema::EvChains; - -use strict; -use warnings; -use base 'DBIx::Class'; - -# NOTE FOR WHEN THIS IS REFACTORED: -# I *believe* that base is not actually used anywhere except in pokemon_list, -# but the IDEA is that it is essentially the Pokemon with the LOWEST NATIONAL -# DEX NUMBER, thus making it the ORIGINAL FORM of the Pokemon. -# My SOLE EXCEPTION to this is Manaphy, which is the base of its chain, but -# only because that's not a real chain anyway. -# NOTE AGAIN: -# Nevermind! base is now unused. Delete to your heart's content. - -=head1 NAME - -Vee::Schema::EvChains - DBIC class for the C table - -=cut - -__PACKAGE__->load_components('Core'); -__PACKAGE__->table('evchains'); -__PACKAGE__->add_columns(qw/ - id - base - growth - chain - steps - - babygs - babyc - babyrusa - - baby_item -/); -__PACKAGE__->set_primary_key('id'); - -__PACKAGE__->has_many(pokemon => 'Vee::Schema::Pokemon', 'evid'); -# TODO: delete the _pokemon suffix -__PACKAGE__->belongs_to(base_pokemon => 'Vee::Schema::Pokemon', 'base'); - -=head1 SEE ALSO - -L, L - -=head1 AUTHOR - -Maintainer: Alex "Eevee" Munroe (C) - -See the included F file for a full list of contributers. - -=head1 LICENSE - -See the included F file. - -=cut - -1; Index: /ekun/trunk/lib/Vee/Schema/Permissions.pm =================================================================== --- /veekun/trunk/lib/Vee/Schema/Permissions.pm (revision 350) +++ (revision ) @@ -1,34 +1,0 @@ -package Vee::Schema::Permissions; - -use strict; -use warnings; -use base 'DBIx::Class'; - -=head1 NAME - -Vee::Schema::Permissions - DBIC class for the C table - -=cut - -__PACKAGE__->load_components('Core'); -__PACKAGE__->table('permissions'); -__PACKAGE__->add_columns(qw/ groupid permission scope polarity /); -__PACKAGE__->set_primary_key(qw/ groupid permission scope polarity /); - -=head1 SEE ALSO - -L, L - -=head1 AUTHOR - -Maintainer: Alex "Eevee" Munroe (C) - -See the included F file for a full list of contributers. - -=head1 LICENSE - -See the included F file. - -=cut - -1; Index: /ekun/trunk/lib/Vee/Schema/ContestMoves.pm =================================================================== --- /veekun/trunk/lib/Vee/Schema/ContestMoves.pm (revision 350) +++ (revision ) @@ -1,34 +1,0 @@ -package Vee::Schema::ContestMoves; - -use strict; -use warnings; -use base 'DBIx::Class'; - -=head1 NAME - -Vee::Schema::ContestMoves - DBIC class for the C table - -=cut - -__PACKAGE__->load_components('Core'); -__PACKAGE__->table('contestmoves'); -__PACKAGE__->add_columns(qw/ id appeal jam description effect /); -__PACKAGE__->set_primary_key('id'); - -=head1 SEE ALSO - -L, L - -=head1 AUTHOR - -Maintainer: Alex "Eevee" Munroe (C) - -See the included F file for a full list of contributers. - -=head1 LICENSE - -See the included F file. - -=cut - -1; Index: /veekun/trunk/lib/Vee/Controller/Dex/Search.pm =================================================================== --- /veekun/trunk/lib/Vee/Controller/Dex/Search.pm (revision 348) +++ /veekun/trunk/lib/Vee/Controller/Dex/Search.pm (revision 406) @@ -49,5 +49,5 @@ breed => { type => 'select', options => [ [ 0 => 'n/a' ], map { [ $_ => ($_ ? "$_: " : '') . $BreedingGroups[$_] ] } 1 .. $#BreedingGroups ], count => 2 }, breed_mode => { type => 'select', options => [ [ and => 'exactly' ], [ or => 'either of' ] ], default => 'or' }, - gender => { type => 'select', options => [ [ any => 'anything' ], [ 255 => 'no gender' ], [ not255 => 'any gender' ], map { [ $_ => lc gender_text($_) ] } qw/0 31 63 127 191 254/ ] }, + gender_rate => { type => 'select', options => [ [ any => 'anything' ], [ 255 => 'no gender' ], [ not255 => 'any gender' ], map { [ $_ => lc gender_text($_) ] } qw/0 31 63 127 191 254/ ] }, ability => { type => 'text', size => 20, title => 'Enter the name or number of an ability' }, color => { type => 'select', options => [qw/any black blue brown gray green pink purple red white yellow/], title => 'I have no explanation for why this is here' }, @@ -123,5 +123,5 @@ if ($ability) { $joins{pokemon_abilities} = 1; - $criteria{'pokemon_abilities.abilityid'} = $ability->id; + $criteria{'pokemon_abilities.ability_id'} = $ability->id; } } @@ -142,9 +142,9 @@ # BREEDING AND STUFF - if (defined $p->{gender} and $p->{gender} ne 'any') { - if ($p->{gender} eq 'not255') { - $criteria{'me.gender'} = { '!=' => 255 }; + if (defined $p->{gender_rate} and $p->{gender_rate} ne 'any') { + if ($p->{gender_rate} eq 'not255') { + $criteria{'me.gender_rate'} = { '!=' => 255 }; } else { - $criteria{'me.gender'} = $p->{gender}; + $criteria{'me.gender_rate'} = $p->{gender_rate}; } } @@ -154,5 +154,5 @@ $criteria{'breeds.breed'} = \@breeds; if ($p->{breed_mode} eq 'and') { - $clauses{having}{'COUNT(DISTINCT breeds.pokeid, breeds.breed)'} = scalar @breeds; + $clauses{having}{'COUNT(DISTINCT breeds.pokemon_id, breeds.breed)'} = scalar @breeds; if (@breeds == 1) { @@ -192,17 +192,17 @@ for my $move (@{ $p->{move} }) { # XXX: show some message if a move is invalid? - my $moveid = get_move($move); - push @moveids, $moveid if defined $moveid; + my $move_id = get_move($move); + push @moveids, $move_id if defined $move_id; } if (@moveids) { - $joins{pokemoves} = 1; - $criteria{'pokemoves.moveid'} = \@moveids; - $clauses{having}{'COUNT(DISTINCT pokemoves.pokeid, pokemoves.moveid)'} = scalar @moveids; + $joins{pokemon_moves} = 1; + $criteria{'pokemon_moves.move_id'} = \@moveids; + $clauses{having}{'COUNT(DISTINCT pokemon_moves.pokemon_id, pokemon_moves.move_id)'} = scalar @moveids; if ($p->{move_method}) { - $criteria{'pokemoves.method'} = $p->{move_method}; + $criteria{'pokemon_moves.method'} = $p->{move_method}; } if ($p->{move_version}) { - push @{$criteria{'-and'}}, { '-or', [ map { \ "FIND_IN_SET('$_', pokemoves.version)" } Vee::Utils::array($p->{move_version}) ] }; + push @{$criteria{'-and'}}, { '-or', [ map { \ "FIND_IN_SET('$_', pokemon_moves.versions)" } Vee::Utils::array($p->{move_version}) ] }; } } @@ -237,5 +237,5 @@ if ($evo_stages{base}) { - $criteria{'me.evparent'} = 0; + $criteria{'me.evo_parent_id'} = 0; } @@ -308,5 +308,5 @@ }; -for my $col (qw/power acc pp effect_chance priority/) { +for my $col (qw/power accuracy pp effect_chance priority/) { for my $endpoint (keys %endpoints) { $move_search_fields->{ $col . '_' . $endpoint } = { type => 'text', size => 4, maxlength => 3, title => "\u$endpoints{$endpoint}{english} $col" }; @@ -366,13 +366,13 @@ } if (@pokemonids) { - $joins{pokemoves} = 1; - $criteria{'pokemoves.pokeid'} = \@pokemonids; - $clauses{having}{'COUNT(DISTINCT pokemoves.pokeid, pokemoves.moveid)'} = scalar @pokemonids; + $joins{pokemon_moves} = 1; + $criteria{'pokemon_moves.pokemon_id'} = \@pokemonids; + $clauses{having}{'COUNT(DISTINCT pokemon_moves.pokemon_id, pokemon_moves.move_id)'} = scalar @pokemonids; if ($p->{move_method}) { - $criteria{'pokemoves.method'} = $p->{move_method}; + $criteria{'pokemon_moves.method'} = $p->{move_method}; } if ($p->{move_version}) { - push @{$criteria{'-and'}}, { '-or', [ map { \ "FIND_IN_SET('$_', pokemoves.version)" } Vee::Utils::array($p->{move_version}) ] }; + push @{$criteria{'-and'}}, { '-or', [ map { \ "FIND_IN_SET('$_', pokemon_moves.versions)" } Vee::Utils::array($p->{move_version}) ] }; } } @@ -380,5 +380,5 @@ # NUMBERS - for my $numbar (qw/power acc pp effect_chance priority/) { + for my $numbar (qw/power accuracy pp effect_chance priority/) { for my $endpoint (keys %endpoints) { my $value = $p->{$numbar . '_' . $endpoint}; Index: /veekun/trunk/lib/Vee/Controller/Dex/Utils.pm =================================================================== --- /veekun/trunk/lib/Vee/Controller/Dex/Utils.pm (revision 371) +++ /veekun/trunk/lib/Vee/Controller/Dex/Utils.pm (revision 406) @@ -102,5 +102,5 @@ my @pokemon; - my (@rows, @pokemoves); + my (@rows, @pokemon_moves); # only do this if there are actually correct Pokemon to look up! if (@pokemon_ids) { @@ -116,17 +116,17 @@ # get moves - my $move_rs = $c->model('DBIC::PokeMoves')->search({ - pokeid => [ keys %pokemon_order ], - method => [qw/level machine egg tutor/], - -nest => \ "FIND_IN_SET('$version', version)", + my $move_rs = $c->model('DBIC::PokemonMoves')->search({ + pokemon_id => [ keys %pokemon_order ], + method => [qw/level machine egg tutor/], + -nest => \ "FIND_IN_SET('$version', versions)", }); while (my $row = $move_rs->next) { - push @{ $pokemoves[ $_ ]{ $row->method } }, $row for @{ $pokemon_order{$row->pokeid} } - } - } - - $s->{pokemon} = \@pokemon; - $s->{pokemon_raw} = \@pokemon_raw; - $s->{pokemoves} = \@pokemoves; + push @{ $pokemon_moves[ $_ ]{ $row->method } }, $row for @{ $pokemon_order{$row->pokemon_id} } + } + } + + $s->{pokemon} = \@pokemon; + $s->{pokemon_raw} = \@pokemon_raw; + $s->{pokemon_moves} = \@pokemon_moves; $s->{template} = 'dex/utils/compare-results.tt'; @@ -173,14 +173,14 @@ # ensure this move is actually inheritable # TODO: should I error if the move is learnable normally? - my $inheritable_ct = $c->model('DBIC::PokeMoves')->count({ - pokeid => $pokemon->id, - moveid => $move->id, - method => [qw/ egg machine /], - -nest => \ "FIND_IN_SET('$gen', version)", + my $inheritable_ct = $c->model('DBIC::PokemonMoves')->count({ + pokemon_id => $pokemon->id, + move_id => $move->id, + method => [qw/ egg machine /], + -nest => \ "FIND_IN_SET('$gen', versions)", }); $c->vee_stop('', $pokemon->name, " can't inherit ", $move->name, '.') unless $inheritable_ct; my $gender_restriction; - if ($pokemon->gender == 255) { + if ($pokemon->gender_rate == 255) { # must also be genderless, i.e. bred with Ditto $gender_restriction = 255; @@ -192,9 +192,9 @@ ### grab the methods by which any Pokemon learn the move - my $methods_rs = $c->model('DBIC::PokeMoves')->search({ - moveid => $move->id, - method => [qw[ level egg machine ]], - -nest => \ "FIND_IN_SET('$gen', version)", - 'pokemon.gender' => $gender_restriction, + my $methods_rs = $c->model('DBIC::PokemonMoves')->search({ + move_id => $move->id, + method => [qw[ level egg machine ]], + -nest => \ "FIND_IN_SET('$gen', versions)", + 'pokemon.gender_rate' => $gender_restriction, }, { join => 'pokemon', @@ -208,5 +208,5 @@ $method = 'TM/HM'; } - push @{ $learn_methods{ $row->pokeid } }, $method; + push @{ $learn_methods{ $row->pokemon_id } }, $method; } @@ -259,19 +259,19 @@ my %branches; - while (my $pokeid = shift @this_level) { - my $this_poke = $pokemon{$pokeid}; + while (my $pokemon_id = shift @this_level) { + my $this_poke = $pokemon{$pokemon_id}; my $hashref = shift @this_level; - for my $pokeid (keys %pokemon) { - next if not $this_poke->can_breed_with( $pokemon{$pokeid} ); - - if (exists $seen{ $pokeid }) { + for my $pokemon_id (keys %pokemon) { + next if not $this_poke->can_breed_with( $pokemon{$pokemon_id} ); + + if (exists $seen{ $pokemon_id }) { # don't put anything if this Pokemon has been seen higher # in the chain; needless descending is bad - $hashref->{ $pokeid } = undef - unless $seen{ $pokeid } < $cur_level; + $hashref->{ $pokemon_id } = undef + unless $seen{ $pokemon_id } < $cur_level; } else { - $hashref->{ $pokeid } = ( $branches{$pokeid} ||= {} ); - $seen{ $pokeid } = $cur_level; + $hashref->{$pokemon_id} = ( $branches{$pokemon_id} ||= {} ); + $seen{$pokemon_id} = $cur_level; } } Index: /veekun/trunk/lib/Vee/Controller/Users/Stats.pm =================================================================== --- /veekun/trunk/lib/Vee/Controller/Users/Stats.pm (revision 383) +++ /veekun/trunk/lib/Vee/Controller/Users/Stats.pm (revision 406) @@ -53,9 +53,9 @@ my $posters_rs = $c->model('DBIC::Users')->search({ - postct => { '!=', 0 }, + post_count => { '!=', 0 }, }, { - order_by => 'postct DESC', - rows => 10, - columns => [qw[ name postct ]], + order_by => 'post_count DESC', + rows => 10, + columns => [qw[ name post_count ]], }); # TODO: when we figure out what "counts" as a post, adjust this to compensate @@ -63,5 +63,5 @@ my @fields = $posters_rs->get_column('name')->all; - my @data = $posters_rs->get_column('postct')->all; + my @data = $posters_rs->get_column('post_count')->all; my $top_total = sum @data; if ($total_posts > $top_total) { @@ -86,5 +86,5 @@ my $loudmouths_rs = $c->model('DBIC::Shoutbox')->search(undef, { - group_by => 'userid', + group_by => 'user_id', '+select' => \'COUNT(*) AS shout_count', '+as' => 'shout_count', Index: /veekun/trunk/lib/Vee/Controller/Index.pm =================================================================== --- /veekun/trunk/lib/Vee/Controller/Index.pm (revision 386) +++ /veekun/trunk/lib/Vee/Controller/Index.pm (revision 406) @@ -31,5 +31,5 @@ my $shoutbox_fields = { name => { type => 'text', size => 20, maxlength => 20 }, - message => { type => 'textarea', rows => 3, cols => 20 }, + content => { type => 'textarea', rows => 3, cols => 20 }, }; @@ -45,5 +45,5 @@ my $page_sizes = $c->site_opts->{page_sizes}{index}; - $s->{recent_news} = $news_forum->threads( undef, { prefetch => 'firstpost', order_by => 'me.id DESC', rows => $page_sizes->{news} } ); + $s->{recent_news} = $news_forum->threads( undef, { prefetch => 'first_post', order_by => 'me.id DESC', rows => $page_sizes->{news} } ); $s->{recent_news} = $s->{recent_news}->search(\ 'NOT FIND_IN_SET("deleted", me.flags)') unless $c->can_i(override_thread_deleted => $news_forum->id); @@ -55,11 +55,11 @@ $threads_rs = $threads_rs->search({ 'me.flags' => { '!=', 'deleted' } }) unless $c->can_i('override_thread_deleted'); $s->{recent_posts} = $threads_rs->search( undef, { - order_by => 'lastpost.time DESC', + order_by => 'last_post.time DESC', rows => $page_sizes->{forum}, - prefetch => { lastpost => 'user' }, + prefetch => { last_post => 'user' }, } ); # NOT FIND_IN_SET breaks here; why? - $s->{recent_posts} = $s->{recent_posts}->search({ 'lastpost.flags' => { '!=', 'deleted' } }) unless $c->can_i('override_thread_deleted'); + $s->{recent_posts} = $s->{recent_posts}->search({ 'last_post.flags' => { '!=', 'deleted' } }) unless $c->can_i('override_thread_deleted'); # Grab a list of unread threads @@ -102,6 +102,6 @@ $s->{recent_users} = $c->model('DBIC::Users')->search( - { lastactive => { '>', time - $c->site_opts->{user_activity_timeout} } }, - { order_by => 'me.lastactive DESC' } + { time_active => { '>', time - $c->site_opts->{user_activity_timeout} } }, + { order_by => 'me.time_active DESC' } ); Index: /veekun/trunk/lib/Vee/Controller/Forum.pm =================================================================== --- /veekun/trunk/lib/Vee/Controller/Forum.pm (revision 386) +++ /veekun/trunk/lib/Vee/Controller/Forum.pm (revision 406) @@ -58,5 +58,5 @@ $s->{announcements_rs} = $c->model('DBIC::Threads')->search_announcements; - $s->{forums_rs} = $c->model('DBIC::Forums')->search(undef, { prefetch => { lastpost => 'user' } }); + $s->{forums_rs} = $c->model('DBIC::Forums')->search(undef, { prefetch => { last_post => 'user' } }); # Grab a list of forums with unread threads @@ -97,6 +97,6 @@ $s->{skip} = $skip; $s->{threads_rs} = $forum->search_related('threads', undef, { - order_by => 'FIND_IN_SET("sticky", me.flags) > 0 DESC, lastpost.time DESC', - prefetch => { firstpost => 'user', lastpost => 'user' }, + order_by => 'FIND_IN_SET("sticky", me.flags) > 0 DESC, last_post.time DESC', + prefetch => { first_post => 'user', last_post => 'user' }, offset => $skip, rows => $perpage, @@ -117,5 +117,5 @@ # form generation stuff my $reply_fields = { - message => { type => 'textarea', rows => '10', cols => '100' }, + content => { type => 'textarea', rows => '10', cols => '100' }, id => { type => 'hidden' }, subject => { type => 'text', maxlength => 48 }, @@ -148,5 +148,5 @@ my $thread = $c->model('DBIC::Threads')->find($id, { prefetch => 'forum' }) or $c->vee_abort('There is no thread with id ', $id, '.'); - $thread->hitct( $thread->hitct + 1 ); $thread->update; + $thread->view_count( $thread->view_count + 1 ); $thread->update; if ($thread->flags =~ /deleted/ and not $c->can_i(override_thread_deleted => $thread->forum->id)) { @@ -161,5 +161,5 @@ $filter_user = $c->model('DBIC::Users')->search({ name => $filter })->first; if ($filter_user) { - my $posts_shown = $c->model('DBIC::Posts')->count({ threadid => $id, userid => $filter_user->id }); + my $posts_shown = $c->model('DBIC::Posts')->count({ thread_id => $id, user_id => $filter_user->id }); } else { push @{ $s->{error_msg} }, "Can't find user " . $c->vee_cleanse($filter) . " in the database."; @@ -169,10 +169,10 @@ my $perpage = $c->site_opts->{page_sizes}{posts}; - my $lastpage = ($skip + $perpage >= $thread->postct); + my $lastpage = ($skip + $perpage >= $thread->post_count); my $posts_rs = $c->model('DBIC::Posts')->search( - { 'me.threadid' => $id, ( $filter_user ? ( 'me.userid' => $filter_user->id ) : () ) }, + { 'me.thread_id' => $id, ( $filter_user ? ( 'me.user_id' => $filter_user->id ) : () ) }, { prefetch => [ 'user', { 'lastedit', 'user' } ], order_by => 'me.time ASC', offset => $skip, rows => $perpage + 1 } ); - my $postct = $c->model('DBIC::Posts')->count({ 'me.threadid' => $id, ( $filter_user ? ( 'me.userid' => $filter_user->id ) : () ) }); + my $post_count = $c->model('DBIC::Posts')->count({ 'me.thread_id' => $id, ( $filter_user ? ( 'me.user_id' => $filter_user->id ) : () ) }); my @flags = split /,/, $thread->flags; @@ -211,5 +211,5 @@ # form generation stuff my $reply_fields = { - message => { type => 'textarea', rows => '10', cols => '100' }, + content => { type => 'textarea', rows => '10', cols => '100' }, id => { type => 'hidden' }, }; @@ -236,5 +236,5 @@ $s->{page_islast} = $lastpage; $s->{posts_rs} = $posts_rs; - $s->{postct} = $postct; + $s->{post_count} = $post_count; $s->{skip} = $skip; $s->{filter} = $filter; @@ -257,5 +257,5 @@ # slurp up the number of (visible) posts before the requested one my $offset = $c->model('DBIC::Posts')->count({ - threadid => $post->threadid, + thread_id => $post->thread_id, -or => [ { time => $post->time, id => { '<', $post->id } }, @@ -266,5 +266,5 @@ my $perpage = $c->site_opts->{page_sizes}{posts}; my $skip = $offset - $offset % $perpage; - $c->res->redirect( $c->uri('Forum', 'thread', $post->threadid, ($skip ? { skip => $skip } : ()) ) . "#p$id" ); + $c->res->redirect( $c->uri('Forum', 'thread', $post->thread_id, ($skip ? { skip => $skip } : ()) ) . "#p$id" ); } @@ -276,12 +276,12 @@ sub thread_flags : LocalRegex('^thread/(\d*)/(announcement|sticky|locked)') : Args(0) { - my ( $self, $c ) = @_; - my ( $threadid, $flag ) = @{ $c->req->captures }; - - my $thread = $c->model('DBIC::Threads')->find($threadid); + my ($self, $c) = @_; + my ($thread_id, $flag) = @{ $c->req->captures }; + + my $thread = $c->model('DBIC::Threads')->find($thread_id); toggleflag($thread, $flag) or $c->vee_abort("Whoops! Error setting flag '", $flag, "'. Not much more can be said about this."); - $c->res->redirect($c->uri('Forum', 'thread', $threadid)); + $c->res->redirect($c->uri('Forum', 'thread', $thread_id)); } Index: /veekun/trunk/lib/Vee/Controller/Shoutbox.pm =================================================================== --- /veekun/trunk/lib/Vee/Controller/Shoutbox.pm (revision 288) +++ /veekun/trunk/lib/Vee/Controller/Shoutbox.pm (revision 406) @@ -59,13 +59,13 @@ my $s = $c->stash; - my $message = Vee::Utils::fix_newlines( $c->req->params->{message} ); + my $content = Vee::Utils::fix_newlines( $c->req->params->{content} ); my $name = $c->req->params->{name} || ($c->user ? $c->user->name : 'Anonymous'); - if (!$message) { + if (!$content) { $c->vee_abort("Sorry, no mimes allowed."); } - (my $linect = $message) =~ tr/\x0a//cd; + (my $linect = $content) =~ tr/\x0a//cd; if (length($linect) >= 10) { # TODO: make me a pref! $c->vee_abort("Your shoutbox entry has too many lines, sorry."); @@ -73,5 +73,5 @@ # TODO: better spamproofing of some sort later, maybe? - if ($message =~ m!|\[url=|\[/url\]!) { + if ($content =~ m!|\[url=|\[/url\]!) { $c->vee_abort("Your shoutbox entry contains links. This usually means you are a spambot, in which case you can shove your online poker ads where the sun don't shine. If you are not, simply go back and try again without the code; HTML and bbcode don't work in the shoutbox anyway."); } @@ -79,8 +79,8 @@ $c->model('DBIC::Shoutbox')->create({ name => $name, - userid => ($c->user ? $c->user->obj->id : undef), + user_id => ($c->user ? $c->user->obj->id : undef), ip => Vee::Utils::inet_aton($c->req->address), time => time, - message => $message, + content => $content, }); Index: /veekun/trunk/lib/Vee/Controller/Forum/Post.pm =================================================================== --- /veekun/trunk/lib/Vee/Controller/Forum/Post.pm (revision 327) +++ /veekun/trunk/lib/Vee/Controller/Forum/Post.pm (revision 406) @@ -51,14 +51,14 @@ sub utils : LocalRegex('^(\d*)/(delete|undelete|nuke)') : Args(0) { my ( $self, $c ) = @_; - my ($postid, $method) = @{ $c->req->captures }; - - my $forumid = undef; + my ($post_id, $method) = @{ $c->req->captures }; + + my $forum_id = undef; # This is the post to be deleted, as well as the entire result set of things to be modified - my $post = $c->model('DBIC::Posts')->find({ 'me.id' => $postid }, { prefetch => ['user', { 'thread' => 'forum' }], }) - or $c->vee_abort("There is no post with id of ", $postid, ". Perhaps another admin nuked it?"); - $c->vee_abort("The post with id of ", $postid, " has already been ", $method, "d.") + my $post = $c->model('DBIC::Posts')->find({ 'me.id' => $post_id }, { prefetch => ['user', { 'thread' => 'forum' }], }) + or $c->vee_abort("There is no post with id of ", $post_id, ". Perhaps another admin nuked it?"); + $c->vee_abort("The post with id of ", $post_id, " has already been ", $method, "d.") if (($post->flags =~ /deleted/ && $method eq 'delete') || ($post->flags !~ /deleted/ && $method eq 'undelete')); $c->vee_abort("You don't have permission to ", $method, " this post.") - unless (($c->user->obj->id == $post->userid && $method ne 'nuke') || $c->can_i("post$method")); + unless (($c->user->obj->id == $post->user_id && $method ne 'nuke') || $c->can_i("post$method")); # Do everything in a transaction for rollback purposes @@ -66,44 +66,44 @@ my ($thread, $forum, $user) = ($post->thread, $post->thread->forum, $post->user); # If any of the post (or thread) counts are 0 or less, this will break. Of course, if that's the case, something is broken - return undef unless (($forum->postct >= 0 || $forum->threadct >= 0 || $thread->postct >= 0 || $user->postct >= 0) || ($method eq 'undelete')); - my $thread_postct = $c->model('DBIC::Posts')->count({ 'me.threadid' => $post->threadid, 'me.flags' => { '!=', 'deleted' } }); + return undef unless (($forum->post_count >= 0 || $forum->thread_count >= 0 || $thread->post_count >= 0 || $user->post_count >= 0) || ($method eq 'undelete')); + my $thread_postct = $c->model('DBIC::Posts')->count({ 'me.thread_id' => $post->thread_id, 'me.flags' => { '!=', 'deleted' } }); # Unfortunately, this must be done here, since this needs to include deleted posts as well - my ($lastpostid, $lasttime) = ((map {($_->id)} $c->model('DBIC::Posts')->search({ 'thread.forumid' => $forum->id, 'me.threadid' => $post->threadid }, { prefetch => 'thread', columns => [qw/me.id me.threadid thread.forumid/], order_by => 'me.time DESC' })), undef); - - if ($method eq 'nuke') { $c->model('DBIC::Posts')->search({ 'me.id' => $postid})->delete; } + my ($last_post_id, $last_post_time) = ((map {($_->id)} $c->model('DBIC::Posts')->search({ 'thread.forum_id' => $forum->id, 'me.thread_id' => $post->thread_id }, { prefetch => 'thread', columns => [qw/me.id me.thread_id thread.forum_id/], order_by => 'me.time DESC' })), undef); + + if ($method eq 'nuke') { $c->model('DBIC::Posts')->search({ 'me.id' => $post_id })->delete; } else { toggleflag( $post, 'deleted' ) or return undef; } # If there's only one post left, delete the thread as well - if ($thread_postct > 1 && $lastpostid == $post->id) { - ($lasttime, $lastpostid) = map {($_->time, $_->id)} $c->model('DBIC::Posts')->search({ 'thread.forumid' => $forum->id, 'me.threadid' => $post->threadid, 'me.flags' => { '!=', 'deleted' } }, { prefetch => 'thread', rows => 1, order_by => 'me.time DESC' }); + if ($thread_postct > 1 && $last_post_id == $post->id) { + ($last_post_time, $last_post_id) = map {($_->time, $_->id)} $c->model('DBIC::Posts')->search({ 'thread.forum_id' => $forum->id, 'me.thread_id' => $post->thread_id, 'me.flags' => { '!=', 'deleted' } }, { prefetch => 'thread', rows => 1, order_by => 'me.time DESC' }); } elsif ($thread_postct <= 1) { #try moving this elsewhere later, i hate it here - if ($method eq 'nuke') { $c->model('DBIC::Threads')->search({ 'me.id' => $post->threadid })->delete; } + if ($method eq 'nuke') { $c->model('DBIC::Threads')->search({ 'me.id' => $post->thread_id })->delete; } elsif (($method eq 'undelete' && $thread_postct == 0) || ($method eq 'delete' && $thread_postct <= 1)) { toggleflag( $thread, 'deleted' ) or return undef; } - ($lasttime, $lastpostid) = map {($_->time, $_->id)} $c->model('DBIC::Posts')->search({ 'thread.forumid' => $forum->id, 'thread.flags' => { '!=', 'deleted' }, 'me.flags' => { '!=', 'deleted' } }, { prefetch => 'thread', rows => 1, order_by => 'me.time DESC' }); - $forumid = $forum->id; - $lastpostid = 0 unless $lastpostid; + ($last_post_time, $last_post_id) = map {($_->time, $_->id)} $c->model('DBIC::Posts')->search({ 'thread.forum_id' => $forum->id, 'thread.flags' => { '!=', 'deleted' }, 'me.flags' => { '!=', 'deleted' } }, { prefetch => 'thread', rows => 1, order_by => 'me.time DESC' }); + $forum_id = $forum->id; + $last_post_id = 0 unless $last_post_id; } if (($method eq 'nuke' && $post->flags !~ /deleted/) || ($method eq 'delete')) { - $thread->postct($thread->postct - 1); - $forum->postct($forum->postct - 1); - $forum->threadct($forum->threadct - 1) unless ($thread_postct > 1); - $user->postct($user->postct - 1); + $thread->post_count($thread->post_count - 1); + $forum->post_count($forum->post_count - 1); + $forum->thread_count($forum->thread_count - 1) unless ($thread_postct > 1); + $user->post_count($user->post_count - 1); } elsif ($method eq 'undelete') { - $thread->postct($thread->postct + 1); - $forum->postct($forum->postct + 1); - $forum->threadct($forum->threadct + 1) unless ($thread_postct > 1); - $user->postct($user->postct + 1); - } - # Only update lastpost and lasttime if this is actually the last post - if ($lasttime && $post->id == $thread->lastpostid) { - $thread->lastpostid($lastpostid); - $thread->lasttime($lasttime); + $thread->post_count($thread->post_count + 1); + $forum->post_count($forum->post_count + 1); + $forum->thread_count($forum->thread_count + 1) unless ($thread_postct > 1); + $user->post_count($user->post_count + 1); + } + # Only update last post and time if this is actually the last post + if ($last_post_time && $post->id == $thread->last_post_id) { + $thread->last_post_id($last_post_id); + $thread->last_post_time($last_post_time); } # Needs to be done here, in case the deleted post is the last post in a forum :( - $forum->lastpostid($lastpostid) if $post->id == $forum->lastpostid; + $forum->last_post_id($last_post_id) if $post->id == $forum->last_post_id; $thread->update if ($method ne 'nuke'); $forum->update; @@ -114,5 +114,5 @@ $c->error("This error message should never be displayed unless someone is screwing with things; sorry.") unless $action; - $c->res->redirect("/forum/" . (($forumid) ? "$forumid" : "post/$postid")); + $c->res->redirect("/forum/" . (($forum_id) ? "$forum_id" : "post/$post_id")); } @@ -125,9 +125,9 @@ sub edits : LocalRegex('^(\d*)/edits') { my ($self, $c) = @_; - my ($s, $postid) = ($c->stash, $c->req->captures->[0]); + my ($s, $post_id) = ($c->stash, $c->req->captures->[0]); $c->vee_abort("You don't have permission to view post edits.") unless ($c->can_i('post_edits')); - my $post = $c->model('DBIC::Posts')->find({ 'me.id' => $postid}, { prefetch => [qw/user edits/, { thread => 'forum' }], order_by => 'edits.time DESC' }); + my $post = $c->model('DBIC::Posts')->find({ 'me.id' => $post_id}, { prefetch => [qw/user edits/, { thread => 'forum' }], order_by => 'edits.time DESC' }); $s->{post} = $post; @@ -143,5 +143,5 @@ my $reply_fields = { - message => { type => 'textarea', rows => '10', cols => '100' }, + content => { type => 'textarea', rows => '10', cols => '100' }, id => { type => 'hidden' }, }; @@ -149,13 +149,13 @@ sub edit : LocalRegex('^(\d*)/edit') : Args(0) { my ($self, $c) = @_; - my ($s, $postid) = ($c->stash, $c->req->captures->[0]); - - my $post_rs = $c->model('DBIC::Posts')->search({ 'me.id' => $postid }, { prefetch => 'user' })->single; + my ($s, $post_id) = ($c->stash, $c->req->captures->[0]); + + my $post_rs = $c->model('DBIC::Posts')->search({ 'me.id' => $post_id }, { prefetch => 'user' })->single; $c->vee_abort("You must be logged in to edit posts.") unless $c->user; - $c->vee_abort("You don't have permission to edit posts.") unless ($c->can_i('post_edit') || $c->user->obj->id == $post_rs->userid); + $c->vee_abort("You don't have permission to edit posts.") unless ($c->can_i('post_edit') || $c->user->obj->id == $post_rs->user_id); # Form submited stuff if ('post' eq lc $c->req->params->{submit}) { - my ($parsed_message, @bbcode_errors) = Vee::BBCode::validate_bbcode( $c->req->params->{message} ); + my ($parsed_message, @bbcode_errors) = Vee::BBCode::validate_bbcode( $c->req->params->{content} ); if (@bbcode_errors) { $c->vee_abort("Your post contains invalid bbcode. Please go back and fix it."); @@ -164,15 +164,15 @@ # If post wasn't edited, don't do anything further; results in redirect only - unless ($parsed_message eq $post_rs->message) { + unless ($parsed_message eq $post_rs->content) { my $post = $c->model('DBIC')->schema->txn_do( sub { my $edit = $c->model('DBIC::Edits')->create({ - postid => $post_rs->id, - userid => $c->user->obj->id, - time => time, - oldmessage => $post_rs->message, + post_id => $post_rs->id, + user_id => $c->user->obj->id, + time => time, + old_content => $post_rs->content, }); - $post_rs->lasteditid( $edit->id ); - $post_rs->message( $parsed_message ); + $post_rs->last_edit_id( $edit->id ); + $post_rs->content($parsed_message); $post_rs->update; @@ -189,6 +189,6 @@ copy_params => 1, ); - $form->force( id => $post_rs->threadid ); - $form->force( message => $c->req->params->{message} || $post_rs->message || '' ); + $form->force( id => $post_rs->thread_id ); + $form->force( content => $c->req->params->{content} || $post_rs->content || '' ); $s->{page_header} = "Edit Post"; Index: /veekun/trunk/lib/Vee/Controller/Forum/Create.pm =================================================================== --- /veekun/trunk/lib/Vee/Controller/Forum/Create.pm (revision 384) +++ /veekun/trunk/lib/Vee/Controller/Forum/Create.pm (revision 406) @@ -50,5 +50,5 @@ # TODO: make these redir to an actual post page when one exists - $c->vee_abort('Please enter a message.') unless $c->req->params->{message} =~ /\S/; + $c->vee_abort('Please enter a message.') unless $c->req->params->{content} =~ /\S/; $c->vee_abort('No thread id specified. This should not happen. Sorry?') unless $c->req->params->{id}; @@ -60,5 +60,5 @@ } - my ($parsed_message, @bbcode_errors) = Vee::BBCode::validate_bbcode( $c->req->params->{message} ); + my ($parsed_message, @bbcode_errors) = Vee::BBCode::validate_bbcode( $c->req->params->{content} ); if (@bbcode_errors) { $c->vee_abort("Your post contains invalid bbcode. Please go back and fix it."); @@ -73,14 +73,14 @@ # TODO: apply this to thread creation too? not as common.. and merge as well? my $last_post = $c->model('DBIC::Posts')->search({ - threadid => $thread->id, - time => { '>=', time - $c->site_opts->{post_automerge_time} }, + thread_id => $thread->id, + time => { '>=', time - $c->site_opts->{post_automerge_time} }, }, { - order_by => 'time DESC', + order_by => 'time DESC', })->single; my $post; # only do merging/prevention if the last post is this user's - if ($last_post and $last_post->userid == $c->user->obj->id and $last_post->flags !~ /deleted/) { - if ($last_post->message eq $parsed_message) { + if ($last_post and $last_post->user_id == $c->user->obj->id and $last_post->flags !~ /deleted/) { + if ($last_post->content eq $parsed_message) { $c->vee_abort("You have already posted that message recently."); } @@ -90,20 +90,20 @@ $post = $c->model('DBIC')->schema->txn_do( sub { my $edit = $c->model('DBIC::Edits')->create({ - postid => $last_post->id, - userid => $c->user->obj->id, - time => time, - oldmessage => $last_post->message, + post_id => $last_post->id, + user_id => $c->user->obj->id, + time => time, + old_content => $last_post->content, }); - $last_post->message( - $last_post->message . + $last_post->content( + $last_post->content . "\n[hr][i]Automerged:[/i]\n" . $parsed_message ); - $last_post->lasteditid( $edit->id ); + $last_post->last_edit_id( $edit->id ); $last_post->time( time ); $last_post->update; - $thread->lastpostid( $last_post->id ); - $thread->lasttime( time ); + $thread->last_post_id( $last_post->id ); + $thread->last_post_time( time ); $thread->update; @@ -114,21 +114,21 @@ $post = $c->model('DBIC')->schema->txn_do( sub { my $post = $c->model('DBIC::Posts')->create({ - threadid => $thread->id, - userid => $c->user->obj->id, - time => time, - format => 'bbcode', - message => $parsed_message, + thread_id => $thread->id, + user_id => $c->user->obj->id, + time => time, + format => 'bbcode', + content => $parsed_message, }); # update thread's last-post stats - $thread->lastpostid( $post->id ); - $thread->lasttime( time ); - $thread->postct( $thread->postct + 1 ); + $thread->last_post_id( $post->id ); + $thread->last_post_time( time ); + $thread->post_count( $thread->post_count + 1 ); $thread->update; # update forum's last-post stats - $thread->forum->lastpostid( $post->id ); - $thread->forum->postct( $thread->forum->postct + 1 ); + $thread->forum->last_post_id( $post->id ); + $thread->forum->post_count( $thread->forum->post_count + 1 ); $thread->forum->update; # update user's postcount - $c->user->obj->postct( $c->user->postct + 1 ); + $c->user->obj->post_count( $c->user->post_count + 1 ); $c->user->obj->update; return $post; @@ -149,5 +149,5 @@ my $s = $c->stash; - my ($parsed_message, @bbcode_errors) = Vee::BBCode::validate_bbcode( $c->req->params->{message} ); + my ($parsed_message, @bbcode_errors) = Vee::BBCode::validate_bbcode( $c->req->params->{content} ); if (@bbcode_errors) { $c->vee_abort("Your post contains invalid bbcode. Please go back and fix it."); @@ -156,8 +156,8 @@ my $rows = $c->site_opts->{page_sizes}{posts_preview}; - my $offset = $c->model('DBIC::Posts')->count({ threadid => $thread->id }, { order_by => 'me.time ASC' } ); + my $offset = $c->model('DBIC::Posts')->count({ thread_id => $thread->id }, { order_by => 'me.time ASC' } ); $offset = $offset - $rows; - my $posts_rs = $c->model('DBIC::Posts')->search({ threadid => $thread->id }, { + my $posts_rs = $c->model('DBIC::Posts')->search({ thread_id => $thread->id }, { order_by => 'me.time ASC', offset => $offset, @@ -167,5 +167,5 @@ # form generation stuff my $reply_fields = { - message => { type => 'textarea', rows => '10', cols => '100' }, + content => { type => 'textarea', rows => '10', cols => '100' }, id => { type => 'hidden' }, }; @@ -207,8 +207,8 @@ # TODO: make these redir to an actual post page when one exists - $c->vee_abort("You must enter a message.") unless $c->req->params->{message} =~ /\S/; + $c->vee_abort("You must enter a message.") unless $c->req->params->{content} =~ /\S/; $c->vee_abort("You must enter a subject.") unless $c->req->params->{subject} =~ /\S/; - my ($parsed_message, @bbcode_errors) = Vee::BBCode::validate_bbcode( $c->req->params->{message} ); + my ($parsed_message, @bbcode_errors) = Vee::BBCode::validate_bbcode( $c->req->params->{content} ); if (@bbcode_errors) { $c->detach('thread_preview'); @@ -229,31 +229,31 @@ my $thread = $c->model('DBIC')->schema->txn_do( sub { my $thread = $c->model('DBIC::Threads')->create({ - forumid => $forum->id, - subject => $subject, - firstpostid => 0, - lastpostid => 0, - lasttime => time, - postct => 1, - blurb => $blurb, + forum_id => $forum->id, + subject => $subject, + first_post_id => 0, + last_post_id => 0, + last_post_time => time, + post_count => 1, + blurb => $blurb, }); # create the post my $post = $c->model('DBIC::Posts')->create({ - threadid => $thread->id, - userid => $c->user->obj->id, - time => time, - format => 'bbcode', - message => Vee::Utils::fix_newlines( $parsed_message ), + thread_id => $thread->id, + user_id => $c->user->obj->id, + time => time, + format => 'bbcode', + content => Vee::Utils::fix_newlines( $parsed_message ), }); # update thread's last-post stats - $thread->firstpostid( $post->id ); - $thread->lastpostid( $post->id ); + $thread->first_post_id( $post->id ); + $thread->last_post_id( $post->id ); $thread->update; # update forum's last-post stats - $forum->lastpostid( $post->id ); - $forum->postct( $forum->postct + 1 ); - $forum->threadct( $forum->threadct + 1 ); + $forum->last_post_id( $post->id ); + $forum->post_count( $forum->post_count + 1 ); + $forum->thread_count( $forum->thread_count + 1 ); $forum->update; # update user's postcount - $c->user->obj->postct( $c->user->postct + 1 ); + $c->user->obj->post_count( $c->user->post_count + 1 ); $c->user->obj->update; return $thread; @@ -275,5 +275,5 @@ my $subject = $c->req->params->{subject}; my $blurb = $c->req->params->{blurb}; - my $message = $c->req->params->{message}; + my $content = $c->req->params->{content}; my $forum = $c->model('DBIC::Forums')->find( $c->req->params->{id} ) or $c->vee_abort('There is no forum with an id of ', $c->req->params->{id}, '. It may have been deleted while you were typing?'); @@ -283,5 +283,5 @@ } - my ($parsed_message, @bbcode_errors) = Vee::BBCode::validate_bbcode( $message ); + my ($parsed_message, @bbcode_errors) = Vee::BBCode::validate_bbcode($content); if (@bbcode_errors) { $c->vee_abort("Your post contains invalid bbcode. Please fix it."); @@ -290,5 +290,5 @@ # form generation stuff my $reply_fields = { - message => { type => 'textarea', rows => '10', cols => '100' }, + content => { type => 'textarea', rows => '10', cols => '100' }, id => { type => 'hidden' }, subject => { type => 'text', maxlength => 48 }, Index: /veekun/trunk/lib/Vee/Controller/Dex.pm =================================================================== --- /veekun/trunk/lib/Vee/Controller/Dex.pm (revision 400) +++ /veekun/trunk/lib/Vee/Controller/Dex.pm (revision 406) @@ -281,5 +281,5 @@ group_by => 'me.id', join => 'pokemon_abilities', - '+select' => 'COUNT(DISTINCT pokemon_abilities.pokeid)', + '+select' => 'COUNT(DISTINCT pokemon_abilities.pokemon_id)', '+as' => 'pokemon_count', }); @@ -353,5 +353,5 @@ # check to see if there is only one move, ever, that corresponds to this TM - my %set = map { $_->moveid => 1 } @tms; + my %set = map { $_->move_id => 1 } @tms; if (!@tms) { @@ -359,5 +359,5 @@ } elsif (1 == scalar keys %set) { # TODO: remove this? - $c->res->redirect( $c->uri('Dex', 'moves', lc $MoveData[ $tms[0]->moveid ]->name) ); + $c->res->redirect( $c->uri('Dex', 'moves', lc $MoveData[ $tms[0]->move_id ]->name) ); } @@ -453,7 +453,7 @@ %query, }, { - join => { evchain => 'pokemon' }, + join => { evo_chain => 'pokemon' }, prefetch => { pokemon_abilities => 'ability' }, - group_by => [ 'me.id', 'pokemon_abilities.abilityid' ], + group_by => [ 'me.id', 'pokemon_abilities.ability_id' ], order_by => [ @extra_order, "pokemon.id ASC", "FIND_IN_SET('baby', me.flags) DESC", 'me.id ASC' ], }); @@ -482,5 +482,5 @@ delete $c->session->{last_pokemon_view}; - $s->{page_title} = $row->name . ' - Pokémon #' . $row->real_id; + $s->{page_title} = $row->name . ' - Pokémon #' . $row->real_pokemon_id; $s->{page_header} = $row->name; $s->{extra_js} = ['dexutils']; @@ -507,5 +507,5 @@ $s->{this} = $row; $s->{pid} = Vee::Utils::pad($row->id, 3); - $s->{generation} = my $generation = ( grep { $Generations[$_]{maxid} >= $row->real_id } 0 .. $#Generations )[0]; + $s->{generation} = my $generation = ( grep { $Generations[$_]{maxid} >= $row->real_pokemon_id } 0 .. $#Generations )[0]; # alt forms @@ -513,5 +513,5 @@ my @alts; my $alt_rs = $c->model('DBIC::Pokemon')->search({ - real_id => $row->real_id, + real_pokemon_id => $row->real_pokemon_id, }, { columns => ['alt_form'], @@ -525,9 +525,9 @@ # evolution chain - my @family = $row->evchain->pokemon( \'id = real_id', { columns => [qw/id evparent evmethod evparam/] } ); + my @family = $row->evo_chain->pokemon( \'id = real_pokemon_id', { columns => [qw/id evo_parent_id evo_method evo_param/] } ); my %evtrees; - $evtrees{$_->id} = { id => $_->id, parent => $_->evparent, method => $_->evmethod, param => $_->evparam, children => [] } for @family; + $evtrees{$_->id} = { id => $_->id, parent => $_->evo_parent_id, method => $_->evo_method, param => $_->evo_param, children => [] } for @family; push @{ $evtrees{ $_->{parent} }{children} }, $_ for sort { $a->{id} <=> $b->{id} } grep { $_->{parent} } values %evtrees; - for my $node (values %evtrees) { add_evolution_desc($node, $row->evchain) } + for my $node (values %evtrees) { add_evolution_desc($node, $row->evo_chain) } $s->{evtree} = ( grep { !$_->{parent} } values %evtrees )[0]; # should only be one with no parent: the root calculate_tree_width($s->{evtree}); @@ -547,5 +547,5 @@ $s->{compatibility}{all} = $compat_rs->count; # TODO: this is actually wrong; fix when bug #88 is fixed please - $s->{compatibility}{base} = $compat_rs->search({ evparent => 0 })->count; + $s->{compatibility}{base} = $compat_rs->search({ evo_parent_id => 0 })->count; # held items @@ -563,8 +563,6 @@ # moves from here down # slurp everything this Pokemon can learn, complete with egg moves if necessary - my $moves_rs = $c->model('DBIC::PokeMoves')->search( { - pokeid => $row->id, - }, { - columns => [qw/moveid method level version/] + my $moves_rs = $c->model('DBIC::PokemonMoves')->search( { + pokemon_id => $row->id, } ); @@ -578,7 +576,7 @@ while (my $move_row = $moves_rs->next) { my $table_row = { - moveid => $move_row->moveid, + move_id => $move_row->move_id, level => $move_row->level, - versions => { map { $_ => $move_row->level || 1 } split /,/, $move_row->version }, + versions => { map { $_ => $move_row->level || 1 } split /,/, $move_row->versions }, }; @@ -595,5 +593,5 @@ @{ $moves{$_} } = sort { $a->{level} <=> $b->{level} or - $MoveData[ $a->{moveid} ]->name cmp $MoveData[ $b->{moveid} ]->name + $MoveData[ $a->{move_id} ]->name cmp $MoveData[ $b->{move_id} ]->name } @{ $moves{$_} } for qw/ level egg machine /; @@ -633,6 +631,6 @@ my $i = -1; while (++$i <= $#$lev_moves) { # shouldn't use a for since the size of the array changes - # find the next row index with the same moveid - my $next_idx = first { $lev_moves->[$_]{moveid} == $lev_moves->[$i]{moveid} } $i + 1 .. $#$lev_moves; + # find the next row index with the same move id + my $next_idx = first { $lev_moves->[$_]{move_id} == $lev_moves->[$i]{move_id} } $i + 1 .. $#$lev_moves; next if not defined $next_idx; @@ -673,5 +671,5 @@ } if (scalar keys %{ $from->{versions} } == 0) { - # only moveid left, so delete this row and redo to hit the next one + # only move id left, so delete this row and redo to hit the next one splice @$lev_moves, $from_idx, 1; redo; @@ -704,5 +702,5 @@ map { $_->generation => $_->text } $row->flavors }; - $s->{generation} = ( grep { $Generations[$_]{maxid} >= $row->real_id } 0 .. $#Generations )[0]; + $s->{generation} = ( grep { $Generations[$_]{maxid} >= $row->real_pokemon_id } 0 .. $#Generations )[0]; $s->{page_title} = $row->name . ' - Flavor Text and Images'; @@ -785,5 +783,5 @@ ? Vee::Utils::round( $c->model('DBIC::Moves')->count({ power => { '!=' => undef, '<' => $row->power } }) / $DamagingMoveCount * 100, 1 ) :'n/a'; - $s->{tm_info} = { map { $_->generation => $_ } $c->model('DBIC::Machines')->search({ moveid => $row->id }) }; + $s->{tm_info} = { map { $_->generation => $_ } $c->model('DBIC::Machines')->search({ move_id => $row->id }) }; # status effect @@ -805,9 +803,9 @@ # contest stuffs - my $contest_family_rs = $c->model('DBIC::Moves')->search({ coneffect => $row->coneffect, id => { '!=', $row->id } }, { columns => [qw/id name contype/], order_by => 'name ASC' }); + my $contest_family_rs = $c->model('DBIC::Moves')->search({ contest_effect_id => $row->contest_effect_id, id => { '!=', $row->id } }, { columns => [qw/id name contest_type/], order_by => 'name ASC' }); my %contest_family; $s->{contest_family_count} = 0; while (my $move = $contest_family_rs->next) { - push @{ $contest_family{ $move->contype } }, $move; + push @{ $contest_family{ $move->contest_type } }, $move; $s->{contest_family_count}++; } @@ -818,5 +816,5 @@ my %pokemon_count; my %valid_methods = map { $_ => 1 } qw/level egg tutor machine/; - my $pokemoves_rs = $c->model('DBIC::PokeMoves')->search({ moveid => $row->id }); + my $pokemoves_rs = $c->model('DBIC::PokemonMoves')->search({ move_id => $row->id }); my %pokemon_hash; # method => pokemon id => version => level while (my $pm = $pokemoves_rs->next) { @@ -829,12 +827,12 @@ @versions = ('all'); } else { - @versions = split /,/, $pm->version; + @versions = split /,/, $pm->versions; } for my $ver (@versions) { - $pokemon_hash{$method}{$pm->pokeid}{pokemon} ||= $pm->pokemon; - $pokemon_hash{$method}{$pm->pokeid}{$ver} = $pm->level || 1; - } - $pokemon_count{ $pm->pokeid } = 1; + $pokemon_hash{$method}{$pm->pokemon_id}{pokemon} ||= $pm->pokemon; + $pokemon_hash{$method}{$pm->pokemon_id}{$ver} = $pm->level || 1; + } + $pokemon_count{ $pm->pokemon_id } = 1; } @@ -903,5 +901,5 @@ $c->forward('/cache', [ $row->id ]); - $s->{hid} = $row->internalid + 1; + $s->{hid} = $row->internal_id + 1; $s->{generation} = ($row->name eq 'dark' || $row->name eq 'steel') ? 1 : 0; @@ -1190,6 +1188,6 @@ my @extra; # n.b.: can ONLY prefetch one has_many here; DBIx::Class will refuse more due to cross-product effect - if ($table eq 'Pokemon') { @extra = ( prefetch => [qw/evchain pokemoves/], order_by => 'pokemoves.moveid ASC' ) } - elsif ($table eq 'Moves') { @extra = ( prefetch => 'pokemoves', order_by => 'pokemoves.pokeid ASC' ) } + if ($table eq 'Pokemon') { @extra = ( prefetch => [qw/evo_chain pokemon_moves/], order_by => 'pokemon_moves.move_id ASC' ) } + elsif ($table eq 'Moves') { @extra = ( prefetch => 'pokemon_moves', order_by => 'pokemon_moves.pokemon_id ASC' ) } if ($id eq 'random') { Index: /veekun/trunk/lib/Vee/Controller/Users.pm =================================================================== --- /veekun/trunk/lib/Vee/Controller/Users.pm (revision 397) +++ /veekun/trunk/lib/Vee/Controller/Users.pm (revision 406) @@ -104,6 +104,6 @@ name => $p->{username}, password => sha1_hex( $p->{password}[0] ), - joindate => time, - lastactive => time, + time_joined => time, + time_active => time, signature => '', thread_view_cutoff => time, @@ -205,5 +205,5 @@ my $skip = $c->req->params->{skip} || 0; - unless (Vee::Utils::in($order => qw/id name lastactive joindate postct/)) { $order = 'id'; } + unless (Vee::Utils::in($order => qw/id name time_active time_joined post_count/)) { $order = 'id'; } unless (Vee::Utils::in($sort => qw/asc desc/)) { $sort = 'asc'; } @@ -242,5 +242,5 @@ $s->{crumbs } = [ 'Users', $user->name ]; $s->{ContactTypes} = \@ContactTypes; - $s->{recent_post} = $c->model('DBIC::Posts')->search({ -and => [ userid => $c->req->args->[0], \'NOT FIND_IN_SET("deleted", me.flags)' ] }, { + $s->{recent_post} = $c->model('DBIC::Posts')->search({ -and => [ user_id => $c->req->args->[0], \'NOT FIND_IN_SET("deleted", me.flags)' ] }, { order_by => 'me.time DESC', rows => 1 @@ -349,16 +349,16 @@ # Working with text data (sigs, title, etc) # Title - if ($changes{customtitle}) { + if ($changes{custom_title}) { # no fathomable reason this should ever be needed un-filtered, so just sanitize it now - $changes{customtitle} =~ s:[\x0d\x0a]::g; - $changes{customtitle} = Vee::Utils::cleanse( $changes{customtitle} ); - - if (length $query->{customtitle} >= $user_limits->{customtitle}) { - push @errors, 'Custom title is longer than the maximum of ' . $user_limits->{customtitle} . ' characters.'; - delete $changes{customtitle}; + $changes{custom_title} =~ s:[\x0d\x0a]::g; + $changes{custom_title} = Vee::Utils::cleanse( $changes{custom_title} ); + + if (length $query->{custom_title} >= $user_limits->{custom_title}) { + push @errors, 'Custom title is longer than the maximum of ' . $user_limits->{custom_title} . ' characters.'; + delete $changes{custom_title}; } else { - push @success, 'Updated your custom title to "' . $changes{customtitle} . '".'; - } - } elsif (exists $changes{customtitle} and $c->user->customtitle) { + push @success, 'Updated your custom title to "' . $changes{custom_title} . '".'; + } + } elsif (exists $changes{custom_title} and $c->user->custom_title) { push @success, 'Deleted your custom title.'; } Index: /veekun/trunk/lib/Vee/Controller/Root.pm =================================================================== --- /veekun/trunk/lib/Vee/Controller/Root.pm (revision 363) +++ /veekun/trunk/lib/Vee/Controller/Root.pm (revision 406) @@ -49,5 +49,5 @@ $storage->debug(1); - if ($c->user) { $c->user->obj->lastactive(time); $c->user->obj->update; } + if ($c->user) { $c->user->obj->time_active(time); $c->user->obj->update; } if ($c->flash and %{$c->flash}) { @@ -97,11 +97,11 @@ eval { $c->model('DBIC::ErrorLog')->create({ - time => time, - userid => $c->user ? $c->user->obj->id : 0, - ip => Vee::Utils::inet_aton($c->req->address), - path => $c->req->path, - method => $c->req->method, - query => Dumper($c->req->params), - error => join "\n", @{$c->error}, + time => time, + user_id => $c->user ? $c->user->obj->id : 0, + ip => Vee::Utils::inet_aton($c->req->address), + path => $c->req->path, + method => $c->req->method, + query => Dumper($c->req->params), + error => join "\n", @{$c->error}, }); }; Index: /veekun/trunk/lib/Vee/Authorization.pm =================================================================== --- /veekun/trunk/lib/Vee/Authorization.pm (revision 385) +++ /veekun/trunk/lib/Vee/Authorization.pm (revision 406) @@ -34,10 +34,10 @@ return 0 unless $c->user; - my @usergroups = $c->model('UserGroups')->search({ userid => [ 0, $c->user->obj->id ] })->get_column('groupid')->all; + my @usergroups = $c->model('UserGroups')->search({ user_id => [ 0, $c->user->obj->id ] })->get_column('group_id')->all; # my %seen; # TODO: get group parents! my @groupperms = $c->model('GroupPermissions')->search({ - groupid => { -in => \@usergroups }, + group_id => { -in => \@usergroups }, permission => [ $permission, 'splat' ], scope => $scope, Index: /veekun/trunk/lib/Vee/Dex.pm =================================================================== --- /veekun/trunk/lib/Vee/Dex.pm (revision 362) +++ /veekun/trunk/lib/Vee/Dex.pm (revision 406) @@ -235,7 +235,7 @@ $DamagingMoveCount = $schema->resultset('Moves')->search({ power => { '!=' => undef } })->count; - %TypeData = map { $_->name => $_ } $schema->resultset('Types')->search({ internalid => { '!=' => -1 } }); + %TypeData = map { $_->name => $_ } $schema->resultset('Types')->search({ internal_id => { '!=' => -1 } }); @TypeNames = sort keys %TypeData; - %OldTypeOrder = map { $_->internalid + 1 => $_->name } values %TypeData; # for Compat.pm + %OldTypeOrder = map { $_->internal_id + 1 => $_->name } values %TypeData; # for Compat.pm @NewTypeOrder = map { $_->name } sort { $a->id <=> $b->id } grep { $_->id >= 0 } values %TypeData; @@ -255,7 +255,7 @@ # machines - my @tms = $schema->resultset('Machines')->search(undef, { columns => ['id', 'generation', 'moveid'], order_by => 'id ASC' }); + my @tms = $schema->resultset('Machines')->search(undef, { columns => ['id', 'generation', 'move_id'], order_by => 'id ASC' }); for my $row (@tms) { - $TMs[ $row->generation ][ $row->id ] = $row->moveid + $TMs[ $row->generation ][ $row->id ] = $row->move_id } @@ -558,10 +558,10 @@ my @gender_fractions = ('no', '⅛', '¼', '⅜', '½', '⅝', '¾', '⅞', 'all'); sub gender_text { - my $gendercode = shift; + my $gender_rate = shift; my $compact = shift; - my $gender = int($gendercode / 32 + 0.5); + my $gender = int($gender_rate / 32 + 0.5); my ($img, $text); - if ($gendercode == 255) { + if ($gender_rate == 255) { $img = 'x'; $text = 'No gender'; } else { Index: /veekun/trunk/lib/Vee/Utils.pm =================================================================== --- /veekun/trunk/lib/Vee/Utils.pm (revision 283) +++ /veekun/trunk/lib/Vee/Utils.pm (revision 406) @@ -50,10 +50,10 @@ sub postrank { - my ($postct) = @_; + my ($post_count) = @_; for my $rank ( sort { $b <=> $a } keys %{ Vee->config->{site}->{post_ranks} } ) { - return Vee->config->{site}->{post_ranks}->{$rank} if $rank <= $postct; + return Vee->config->{site}->{post_ranks}->{$rank} if $rank <= $post_count; } return "ERRORZ0RZ"; @@ -63,6 +63,6 @@ # XXX: decide the best way to do this, preferably a smooth log curve sub post_width { - my ($postct) = @_; - return $postct / 1000; + my ($post_count) = @_; + return $post_count / 1000; } @@ -109,4 +109,26 @@ } +# URL-validation regex +# Inferred from the W3's BNF: http://www.w3.org/Addressing/URL/5_BNF.html +# n.b.: Technically, the BNF says hostname parts (as delimited by dots) +# should begin with a letter, but given that 'xalpha' includes dot this was +# a bit clumsy to pull off in practice, so I left it lazy. +my $url_xalphas = qr/[-$_@.&+!*"'(),a-zA-Z0-9]/; +our $IsValidURL = qr/ ^ + (?: http | https | ftp ) :\/\/ # protocol + (?: + [a-zA-Z] $url_xalphas* # hostname + | (?: \d{1,3} \. ){3} \d{1,3} # IP + ) + (?: : [0-9]+ )? # port + (?: \/ # path: leading slash + (?: $url_xalphas* # path: path part name + | %[a-fA-F][a-fA-F] )* # path: escape + )* # path: as many as you want + (?: \? $url_xalphas+ )? # query string + (?: \# $url_xalphas+ )? # anchor +$ /x; + + sub pad { sprintf "%0$_[1]d", $_[0] } sub round { $_[1] ||= 0; return int($_[0] * 10 ** $_[1] + .5) / 10 ** $_[1]; } Index: /veekun/trunk/templates/dex/utils/backtrace.tt =================================================================== --- /veekun/trunk/templates/dex/utils/backtrace.tt (revision 329) +++ /veekun/trunk/templates/dex/utils/backtrace.tt (revision 406) @@ -4,6 +4,6 @@ [% FOREACH chain IN optimal %]

-[% FOREACH pokeid IN chain %] -[% pokemon.$pokeid.name %] +[% FOREACH pokemon_id IN chain %] +[% pokemon.$pokemon_id.name %] [% UNLESS loop.last %] to @@ -19,15 +19,15 @@ [% MACRO breeding_branch(branch, depth) BLOCK %] -[% FOREACH pokeid IN branch.keys %] +[% FOREACH popokemon_idkeid IN branch.keys %] [% color_hack.0 = 3 - color_hack.0 %] - [% pokemon.$pokeid.name %] + [% pokemon.$pokemon_id.name %] [%# TODO: lol I am being so lazy with these 8V %] - [% learn_methods.$pokeid.join('
') %] -[% pokemon_cells(pokemon.$pokeid) %] + [% learn_methods.$pokemon_id.join('
') %] +[% pokemon_cells(pokemon.$pokemon_id) %] -[% IF branch.$pokeid.keys.size %] +[% IF branch.$pokemon_id.keys.size %] [% next_depth = depth + 1 %] -[% breeding_branch(branch.$pokeid, next_depth) %] +[% breeding_branch(branch.$pokemon_id, next_depth) %] [% END %] [% END %] Index: /veekun/trunk/templates/dex/utils/compare-results.tt =================================================================== --- /veekun/trunk/templates/dex/utils/compare-results.tt (revision 371) +++ /veekun/trunk/templates/dex/utils/compare-results.tt (revision 406) @@ -3,5 +3,4 @@ [%# XXX: same goes for trainer %] [%# XXX: goddamn this code is ugly %] -[% move_column = 'moves' _ version %] [% IF version == 'rb' OR version == 'y'; generation = 0 %] [% ELSIF version == 'gs' OR version == 'c'; generation = 1 %] @@ -9,7 +8,4 @@ [% ELSIF version == 'dp'; generation = 3 %] [% END %] -[% tm_column = Generations.$generation.short _ 'tm' %] -[% baby_column = 'baby' _ version %] -[% IF version == 'frlg'; baby_column = 'babyrusa'; END %] [% max_height = 0; FOREACH p IN pokemon; NEXT UNLESS p; SET max_height = p.height IF max_height < p.height; END %] [% max_weight = 0; FOREACH p IN pokemon; NEXT UNLESS p; SET max_weight = p.weight IF max_weight < p.weight; END %] @@ -151,5 +147,5 @@ Gender [% MACRO block_row BLOCK %] - [% gender_text(p.gender) %] + [% gender_text(p.gender_rate) %] [% END %] [% print_row %] @@ -201,10 +197,10 @@ [% NEXT IF seen.$p %] [% seen.$p = 1 %] -[% FOREACH move_row IN pokemoves.$i.level %] +[% FOREACH move_row IN pokemon_moves.$i.level %] [% DEFAULT levels.${move_row.level} = {} %] [% DEFAULT levels.${move_row.level}.$p = [] %] -[% levels.${move_row.level}.$p.push(move_row.moveid) %] -[% move_row.level = move_row.level + 0; move_row.moveid = move_row.moveid + 0 %] -[% moves.${move_row.moveid}.$p = (move_row.level == 1 ? 'born with' : 'level ' _ move_row.level) %] +[% levels.${move_row.level}.$p.push(move_row.move_id) %] +[% move_row.level = move_row.level + 0; move_row.move_id = move_row.move_id + 0 %] +[% moves.${move_row.move_id}.$p = (move_row.level == 1 ? 'born with' : 'level ' _ move_row.level) %] [% END %] [% END %] @@ -232,5 +228,5 @@ [% level == 1 ? '--' : level + 0 %] [% MACRO block_row BLOCK %] - [% FOREACH moveid IN levels.$level.$p %][% MoveData.$moveid.name %][% '
' UNLESS loop.last %][% END %] + [% FOREACH move_id IN levels.$level.$p %][% MoveData.$move_id.name %][% '
' UNLESS loop.last %][% END %] [% END %] [% print_row %] @@ -245,9 +241,9 @@ [% thead %] -[% FOREACH moveid IN sort_by_move(moves.keys) %] +[% FOREACH move_id IN sort_by_move(moves.keys) %] - [% MoveData.$moveid.name %] -[% MACRO block_row BLOCK %] - [% moves.$moveid.$p %] + [% MoveData.$move_id.name %] +[% MACRO block_row BLOCK %] + [% moves.$move_id.$p %] [% END %] [% print_row %] @@ -267,6 +263,6 @@ [% FOREACH j IN [ 0 .. pokemon.max ] %] [% NEXT UNLESS pokemon.$j %] -[% FOREACH move_row IN pokemoves.$j.${move_types.$i} %] -[% moves.${move_row.moveid}.${pokemon.$j.id} = 1 %] +[% FOREACH move_row IN pokemon_moves.$j.${move_types.$i} %] +[% moves.${move_row.move_id}.${pokemon.$j.id} = 1 %] [% END %] [% END %] @@ -280,9 +276,9 @@ [% thead %] -[% FOREACH moveid IN sort_by_move(moves.keys) %] +[% FOREACH move_id IN sort_by_move(moves.keys) %] - [% MoveData.$moveid.name %] + [% MoveData.$move_id.name %] [% FOREACH p IN pokemon %] - [% '•' IF moves.$moveid.${p.id} %] + [% '•' IF moves.$move_id.${p.id} %] [% END %] [% extra_cells %] Index: /veekun/trunk/templates/dex/search/moves.tt =================================================================== --- /veekun/trunk/templates/dex/search/moves.tt (revision 392) +++ /veekun/trunk/templates/dex/search/moves.tt (revision 406) @@ -92,6 +92,6 @@ Numbers - [% nonstat_names = { power => 'Power', acc => 'Accuracy', pp => 'PP', effect_chance => 'Effect chance', priority => 'Priority'} %] -[% FOREACH nonstat IN [ 'power', 'acc', 'pp', 'effect_chance', 'priority' ] %] + [% nonstat_names = { power => 'Power', accuracy => 'Accuracy', pp => 'PP', effect_chance => 'Effect chance', priority => 'Priority'} %] +[% FOREACH nonstat IN [ 'power', 'accuracy', 'pp', 'effect_chance', 'priority' ] %] [% END %] Index: /veekun/trunk/templates/dex/search/pokemon.tt =================================================================== --- /veekun/trunk/templates/dex/search/pokemon.tt (revision 392) +++ /veekun/trunk/templates/dex/search/pokemon.tt (revision 406) @@ -69,5 +69,5 @@
Breeding -

Gender distribution is [% form.get_tag('gender') %]

+

Gender distribution is [% form.get_tag('gender_rate') %]

Breeding groups include [% form.get_tag('breed_mode') %] [%+ form.get_tag('breed', 0) %] and [% form.get_tag('breed', 1) %]

Index: /veekun/trunk/templates/dex/list/moves.tt =================================================================== --- /veekun/trunk/templates/dex/list/moves.tt (revision 109) +++ /veekun/trunk/templates/dex/list/moves.tt (revision 406) @@ -25,8 +25,8 @@ [% color = 1 %] -[% FOREACH moveid IN [ min .. Generations.$gen.maxmoveid ] %] +[% FOREACH move_id IN [ min .. Generations.$gen.maxmoveid ] %] - -[% move_cells(moveid) %] + +[% move_cells(move_id) %] [% color = 3 - color %] Index: /veekun/trunk/templates/dex/list/berries.tt =================================================================== --- /veekun/trunk/templates/dex/list/berries.tt (revision 213) +++ /veekun/trunk/templates/dex/list/berries.tt (revision 406) @@ -34,5 +34,5 @@ - + [% color = 3 - color %] Index: /veekun/trunk/templates/dex/list/abilities.tt =================================================================== --- /veekun/trunk/templates/dex/list/abilities.tt (revision 156) +++ /veekun/trunk/templates/dex/list/abilities.tt (revision 406) @@ -14,5 +14,5 @@ - + Index: /veekun/trunk/templates/dex/list/pokemon.tt =================================================================== --- /veekun/trunk/templates/dex/list/pokemon.tt (revision 314) +++ /veekun/trunk/templates/dex/list/pokemon.tt (revision 406) @@ -41,13 +41,13 @@ [% poke_indents = {} %] -[% last_evid = 0 %] +[% last_evo_id = 0 %] [% color = 1 %] [% WHILE (poke = pokemon_rs.next) %] -[% IF poke_indents.exists(poke.evparent) %] -[% poke_indents.${poke.id} = poke_indents.${poke.evparent} + 1 %] +[% IF poke_indents.exists(poke.evo_parent_id) %] +[% poke_indents.${poke.id} = poke_indents.${poke.evo_parent_id} + 1 %] [% ELSE %] [% poke_indents.${poke.id} = poke.flags.match('baby') ? 0 : 1 %] [% END %] - + [% IF region_column %] @@ -57,5 +57,5 @@ [% pokemon_cells(poke) %] -[% last_evid = poke.evid %] +[% last_evo_id = poke.evo_chain_id %] [% color = 3 - color %] [% END %] Index: /veekun/trunk/templates/dex/page/ability.tt =================================================================== --- /veekun/trunk/templates/dex/page/ability.tt (revision 400) +++ /veekun/trunk/templates/dex/page/ability.tt (revision 406) @@ -16,7 +16,7 @@
[% Icons.dp %] Flavor text
-
[% polish_desc(c, this.gameblurb, this.name) %]
+
[% polish_desc(c, this.blurb_dp, this.name) %]
Eevine summary
-
[% polish_desc(c, this.effect, this.name) %]
+
[% polish_desc(c, this.description, this.name) %]
Index: /veekun/trunk/templates/dex/page/item.tt =================================================================== --- /veekun/trunk/templates/dex/page/item.tt (revision 360) +++ /veekun/trunk/templates/dex/page/item.tt (revision 406) @@ -22,5 +22,5 @@
[% this.cost %]
[% Icons.dp %] Flavor text
-
[% polish_desc(c, this.dpblurb, this.name) %]
+
[% polish_desc(c, this.blurb_dp, this.name) %]
Fling effect
[% this.fling_description %]
Index: /veekun/trunk/templates/dex/page/tm.tt =================================================================== --- /veekun/trunk/templates/dex/page/tm.tt (revision 109) +++ /veekun/trunk/templates/dex/page/tm.tt (revision 406) @@ -11,5 +11,5 @@ -[% move_cells(tm.moveid) %] +[% move_cells(tm.move_id) %] [% color = 3 - color %] Index: /veekun/trunk/templates/dex/page/type.tt =================================================================== --- /veekun/trunk/templates/dex/page/type.tt (revision 185) +++ /veekun/trunk/templates/dex/page/type.tt (revision 406) @@ -11,5 +11,5 @@ - [% this.internalid %]
[% this.name %] + [% this.internal_id %]
[% this.name %]

@@ -17,5 +17,5 @@
[% this.name %]
-
[% this.name %] [% class = this.internalid < 20 ? 'physical' : 'special'; type_name(class) %]
+
[% this.name %] [% class = this.internal_id < 20 ? 'physical' : 'special'; type_name(class) %]

[% Icons.${Generations.$generation.abbr} %] [%+ Generations.$generation.abbr | upper %]

Index: /veekun/trunk/templates/dex/page/move.tt =================================================================== --- /veekun/trunk/templates/dex/page/move.tt (revision 380) +++ /veekun/trunk/templates/dex/page/move.tt (revision 406) @@ -24,7 +24,7 @@
[% Icons.dp %] Flavor text
-
[% polish_desc(c, this.dpblurb, this.name) %]
+
[% polish_desc(c, this.blurb_dp, this.name) %]
Eevine summary
-
[% polish_desc(c, this.blurb, this.name) %]
+
[% polish_desc(c, this.short_description, this.name) %]
@@ -54,5 +54,5 @@
[% this.power || 'n/a' %]
Accuracy
-
[% this.acc %]%
+
[% this.accuracy %]%
PP
[% this.pp %]; maximum is [% this.pp * 8 / 5 %]
@@ -62,5 +62,5 @@
[% this.effect_chance ? this.effect_chance _ '%' : 'n/a' %]
Power × accuracy
-
[% IF this.power; this.power * this.acc / 100 | format('%.01f'); ELSE; 'n/a'; END %]
+
[% IF this.power; this.power * this.accuracy / 100 | format('%.01f'); ELSE; 'n/a'; END %]
Power percentile
[% percentile %]
@@ -115,5 +115,5 @@

Effect Details

-[% this.description # TODO: move description() out of sql %] +[% this.description %] [% IF this.notes %]

Notes, Changes, Bugs, Etc

@@ -122,5 +122,5 @@ [% IF generation <= 2 %]

[% Icons.rse %] Flavor Text

-

[% polish_desc(c, this.gameblurb, this.name) %]

+

[% polish_desc(c, this.blurb_rusa, this.name) %]

[% END %] @@ -133,11 +133,11 @@
Type
-
[% type_name(this.contype) %]
+
[% type_name(this.contest_type) %]
Appeal
-
[% this.contest.appeal %] [%+ FOR x IN [ 1 .. this.contest.appeal ] %][% this.contest.appeal %][% END %]
+
[% this.contest_effect.appeal %] [%+ FOR x IN [ 1 .. this.contest_effect.appeal ] %][% this.contest_effect.appeal %][% END %]
Jam
-
[% this.contest.jam %] [%+ FOR x IN [ 1 .. this.contest.jam ] %][% this.contest.jam %][% END %]
+
[% this.contest_effect.jam %] [%+ FOR x IN [ 1 .. this.contest_effect.jam ] %][% this.contest_effect.jam %][% END %]
Flavor text
-
[% this.contest.description %]
+
[% this.contest_effect.description %]
@@ -145,7 +145,7 @@

Similar Moves

-[% FOREACH contype IN contest_family.keys.sort %] -
[% type_name(contype) %]
-
[% FOREACH move IN contest_family.$contype %][% move.name %][% ', ' UNLESS loop.last; END %]
+[% FOREACH contest_type IN contest_family.keys.sort %] +
[% type_name(contest_type) %]
+
[% FOREACH move IN contest_family.$contest_type %][% move.name %][% ', ' UNLESS loop.last; END %]
[% END %]
@@ -156,6 +156,6 @@
Use [% this.name %] before
-[% FOREACH moveid IN sort_by_move(this.combos.split(',')) %] - [% MoveData.$moveid.name %] +[% FOREACH move_id IN sort_by_move(this.combos.split(',')) %] + [% MoveData.$move_id.name %] [% ', ' UNLESS loop.last %] [% END %] @@ -164,6 +164,6 @@
Use [% this.name %] after
-[% FOREACH moveid IN sort_by_move(reverse_combos) %] - [% MoveData.$moveid.name %] +[% FOREACH move_id IN sort_by_move(reverse_combos) %] + [% MoveData.$move_id.name %] [% ', ' UNLESS loop.last %] [% END %] Index: /veekun/trunk/templates/dex/page/pokemon.tt =================================================================== --- /veekun/trunk/templates/dex/page/pokemon.tt (revision 394) +++ /veekun/trunk/templates/dex/page/pokemon.tt (revision 406) @@ -1,5 +1,5 @@ [% PROCESS 'dex/common.tt' %] -[% image_name = this.real_id.pad(3); SET image_name = image_name _ '-' _ this.alt_form IF this.id != this.real_id %] +[% image_name = this.real_pokemon_id.pad(3); SET image_name = image_name _ '-' _ this.alt_form IF this.id != this.real_pokemon_id %]

@@ -45,5 +45,5 @@ [% NEXT IF seen_abilities.${a.ability.id} %]

[% a.ability.name %]
-
[% polish_desc(c, a.ability.effect, this.name) %]
+
[% polish_desc(c, a.ability.description, this.name) %]
[% seen_abilities.${a.ability.id} = 1 %] [% END %] @@ -103,5 +103,5 @@
R/B/Y code
-
[% hex_blurb(this.oldgs) %]
+
[% hex_blurb(this.gameshark_rby) %]
@@ -110,5 +110,5 @@
Gender
-
[% gender_text(this.gender) %] (code: [% hex_blurb(this.gender) %])
+
[% gender_text(this.gender_rate) %] (code: [% hex_blurb(this.gender_rate) %])
Breeding groups
[% FOREACH b IN this.breeds %] @@ -117,5 +117,5 @@ [% END %]
Steps to hatch
-
[% IF this.evchain.steps; this.evchain.steps.chunk(-3).join(','); ELSE; 'n/a'; END %]
+
[% IF this.evo_chain.steps; this.evo_chain.steps.chunk(-3).join(','); ELSE; 'n/a'; END %]
Compatible with
@@ -124,5 +124,5 @@ [% ELSIF this.breeding_code == 255 %] Cannot breed -[% ELSIF this.gender == 255 %] +[% ELSIF this.gender_rate == 255 %] Genderless; can only breed with Ditto [% ELSE %] @@ -135,11 +135,11 @@
Base EXP
-
[% hex_blurb(this.baseexp) %]
+
[% hex_blurb(this.base_exp) %]
Capture rate
-
[% hex_blurb(this.caprate) %]
+
[% hex_blurb(this.capture_rate) %]
Base happiness
-
[% hex_blurb(this.happiness) %]
+
[% hex_blurb(this.base_happiness) %]
Growth rate
-
[% this.evchain.growth %]
+
[% this.evo_chain.growth %]
Effort points
[% effort_points = [ ] %] @@ -166,9 +166,9 @@ [% FOREACH node IN nodes %]
[% INCLUDE nodelist_table nodes=node.children %] @@ -252,8 +252,8 @@

Flavor

- - - - + + + +

See also: All versions' flavor text and sprites

@@ -382,5 +382,5 @@ [% END %] -[%+ move_cells(move.moveid) %] +[%+ move_cells(move.move_id) %] [% color = 3 - color %] @@ -391,7 +391,7 @@ [% version_headers %] [% FOREACH move IN moves.egg %] -[% moveid = move.moveid %] +[% move_id = move.move_id %] - + [% IF generation == 0 %] [% IF move_columns_inv.y %] [% END %][% END %] [% IF generation <= 1 %] @@ -405,5 +405,5 @@ [% END %] -[%+ move_cells(move.moveid) %] +[%+ move_cells(move.move_id) %] [% color = 3 - color %] @@ -415,5 +415,5 @@ [% version_headers %] [% FOREACH move IN moves.tutor %] -[% moveid = move.moveid %] +[% move_id = move.move_id %] @@ -433,5 +433,5 @@ [% END %] -[% move_cells(moveid) %] +[% move_cells(move_id) %] [% color = 3 - color %] @@ -443,9 +443,9 @@ [% version_headers %] [% FOREACH move IN moves.other %] -[% moveid = move.moveid %] +[% move_id = move.move_id %] -[% move_cells(moveid) %] +[% move_cells(move_id) %] [% color = 3 - color %] @@ -460,12 +460,12 @@ [% version_headers %] [% FOR move IN moves.machine %] -[% moveid = move.moveid %] +[% move_id = move.move_id %] - + [% FOR ver_col IN header_icons %] [% ver = base_versions.$ver_col || ver_col %] - -[% END %] -[% move_cells(moveid) %] + +[% END %] +[% move_cells(move_id) %] [% color = 3 - color %] Index: /veekun/trunk/templates/dex/common.tt =================================================================== --- /veekun/trunk/templates/dex/common.tt (revision 393) +++ /veekun/trunk/templates/dex/common.tt (revision 406) @@ -15,9 +15,9 @@ [%# creates most of the columns in the move table %] -[% MACRO move_cells(moveid) BLOCK %][%# moveid %] -[% type = MoveData.$moveid.type %] +[% MACRO move_cells(move_id) BLOCK %] +[% type = MoveData.$move_id.type %] [% type_bg = (type == '?????') ? 'none' : type %] -[% power = MoveData.$moveid.power %] -[% kind = MoveData.$moveid.kind %] +[% power = MoveData.$move_id.power %] +[% kind = MoveData.$move_id.kind %] [% IF power == 1 %] [% power = 'varies' %] @@ -25,5 +25,5 @@ [% power = '--' %] [% END %] - + [% IF type == '?????' %] @@ -31,7 +31,7 @@ [% END %] - - - + + + [%+ END %] @@ -44,7 +44,7 @@ [%# creates most of the columns in the move table %] [% MACRO contest_cells(move) BLOCK %] -[% moveid = move.id %] -[% power = MoveData.$moveid.power %] -[% kind = MoveData.$moveid.kind %] +[% move_id = move.id %] +[% power = MoveData.$move_id.power %] +[% kind = MoveData.$move_id.kind %] [% IF power < 2 %] [% FOREACH flag IN PowerLabels %] @@ -53,6 +53,6 @@ [% SET power = '?! (error!)' IF !power %] [% END %] - - + + - + - + [% IF can_nuke %] @@ -27,12 +27,12 @@ - [% IF can_nuke %] Index: /veekun/trunk/templates/users/info.tt =================================================================== --- /veekun/trunk/templates/users/info.tt (revision 140) +++ /veekun/trunk/templates/users/info.tt (revision 406) @@ -5,8 +5,8 @@ [% IF user.avatar %][% ELSE %]No avatar[% END %] -[% IF user.newspic; "\n" %][% END %] +[% IF user.news_pic; "\n" %][% END %]

[% user.name %]

-

User since [% user.joindate | date %]

-

Last active on [% user.lastactive | date %], which was [% time - user.lastactive | timespan %] ago

+

User since [% user.time_joined | date %]

+

Last active on [% user.time_active | date %], which was [% time - user.time_active | timespan %] ago


@@ -15,7 +15,7 @@

Numbers

[% cur_time = time %] -
[% INCLUDE postbar posts=user.postct %]
-

Posts: [% user.postct %] ([% postrank(user.postct) %])

-

Average posts per day: [% IF cur_time == user.joindate %]infinity[% ELSE %][% tmp = user.postct / (time - user.joindate) * 24 * 60 * 60; round(tmp, 3) %][% END %]

+
[% INCLUDE postbar posts=user.post_count %]
+

Posts: [% user.post_count %] ([% postrank(user.post_ct) %])

+

Average posts per day: [% IF cur_time == user.time_joined %]infinity[% ELSE %][% tmp = user.post_count / (time - user.time_joined) * 24 * 60 * 60; round(tmp, 3) %][% END %]

@@ -42,5 +42,5 @@

Last post by [% user.name %] ([% recent_post.time | date %])

- [% recent_post.message | bbcode %] + [% recent_post.content | bbcode %]
[% ELSE %] Index: /veekun/trunk/templates/users/list.tt =================================================================== --- /veekun/trunk/templates/users/list.tt (revision 140) +++ /veekun/trunk/templates/users/list.tt (revision 406) @@ -17,5 +17,5 @@ @@ -34,13 +34,13 @@ - + Index: /veekun/trunk/templates/users/edit.tt =================================================================== --- /veekun/trunk/templates/users/edit.tt (revision 137) +++ /veekun/trunk/templates/users/edit.tt (revision 406) @@ -13,5 +13,5 @@

Title

-

+

Signature

Index: /veekun/trunk/templates/wrapper.tt =================================================================== --- /veekun/trunk/templates/wrapper.tt (revision 359) +++ /veekun/trunk/templates/wrapper.tt (revision 406) @@ -1,12 +1,11 @@ +[% DEFAULT skip_wrapper = 0 %] [% UNLESS skip_wrapper %] -[% DEFAULT link_name = template.link_name %] -[% DEFAULT link_name = '' %] -[% DEFAULT page_title = template.page_title %] -[% DEFAULT page_title = 'Untitled' %] +[% DEFAULT link_name = template.link_name || '' %] +[% DEFAULT page_title = template.page_title || 'Untitled' %] [% DEFAULT page_header = page_title %] [% DEFAULT extra_headers = [] %] -[% DEFAULT extra_css = [] %] +[% DEFAULT extra_css = template.extra_css || [] %] [% DEFAULT extra_js = [] %] -[% extra_css.push(template.extra_css) IF template.extra_css %] +[% extra_css.push(template.extra_css) %] Index: /veekun/trunk/templates/forum/view.tt =================================================================== --- /veekun/trunk/templates/forum/view.tt (revision 392) +++ /veekun/trunk/templates/forum/view.tt (revision 406) @@ -3,5 +3,5 @@ [% IF forum.blurb %]
[% forum.blurb %]
[% END %] -[% this_pagelist = pagelist(skip, c.site_opts.page_sizes.threads, forum.threadct, "/forum/${forum.id}", c.req.params); this_pagelist %] +[% this_pagelist = pagelist(skip, c.site_opts.page_sizes.threads, forum.thread_count, "/forum/${forum.id}", c.req.params); this_pagelist %] [% INCLUDE show_announcements announcements_rs=announcements_rs %] [% forum_flags = BLOCK %] Index: /veekun/trunk/templates/forum/preview.tt =================================================================== --- /veekun/trunk/templates/forum/preview.tt (revision 325) +++ /veekun/trunk/templates/forum/preview.tt (revision 406) @@ -4,9 +4,9 @@
[% user.name %]
-
[% user.customtitle %]
+
[% user.custom_title %]
- Posts: [% user.postct %] - [% INCLUDE postbar posts=user.postct %] + Posts: [% user.post_count %] + [% INCLUDE postbar posts=user.post_count %]
@@ -15,7 +15,7 @@
-
+
[%+ text | bbcode | indent(8) %] -
+
[% user.signature | bbcode %]
@@ -25,3 +25,3 @@

Edit post

-[%+ INCLUDE post_form id=tid message=text url=c.uri('Forum::Create', 'thread') %] +[%+ INCLUDE post_form id=tid content=text url=c.uri('Forum::Create', 'thread') %] Index: /veekun/trunk/templates/forum/thread/view.tt =================================================================== --- /veekun/trunk/templates/forum/thread/view.tt (revision 392) +++ /veekun/trunk/templates/forum/thread/view.tt (revision 406) @@ -12,7 +12,7 @@
[% thread.blurb || '(no blurb)' %]
-
[% thread.postct %] post[% 's' IF thread.postct != 1 %]; [% thread.hitct %] view[% 's' IF thread.hitct != 1 %]
+
[% thread.post_count %] post[% 's' IF thread.post_count != 1 %]; [% thread.view_count %] view[% 's' IF thread.view_count != 1 %]
-[% this_pagelist = pagelist(skip, c.site_opts.page_sizes.posts, postct, "/forum/thread/${thread.id}", c.req.params); this_pagelist %] +[% this_pagelist = pagelist(skip, c.site_opts.page_sizes.posts, post_count, "/forum/thread/${thread.id}", c.req.params); this_pagelist %] [% IF flags AND 0 %]
Flags: [% FOREACH flag IN flags %][% flag FILTER ucfirst %] [% END %]
@@ -48,5 +48,5 @@

There are no visible posts for this thread. This should not happen. So, um, sorry.

[% END %] -[% ELSIF skip >= postct %] +[% ELSIF skip >= post_count %]

You've successfully navigated past the end of the thread.

WELCOME TO THE END OF THE INTERNET :O

@@ -89,5 +89,5 @@ [% END %] [% END %] -[% IF user AND physical_lastpost.userid AND physical_lastpost.userid == user.id %] +[% IF user AND physical_lastpost.user_id AND physical_lastpost.user_id == user.id %]

The last post on this thread is yours; if you reply again, your new post will be combined with the old one and the thread will be bumped. If you like, you can manually edit the last post instead.

[% END %] Index: /veekun/trunk/templates/forum/thread/preview.tt =================================================================== --- /veekun/trunk/templates/forum/thread/preview.tt (revision 325) +++ /veekun/trunk/templates/forum/thread/preview.tt (revision 406) @@ -24,9 +24,9 @@
[% user.name %]
-
[% user.customtitle %]
+
[% user.custom_title %]
- Posts: [% user.postct %] - [% INCLUDE postbar posts=user.postct %] + Posts: [% user.post_count %] + [% INCLUDE postbar posts=user.post_count %]
Index: /veekun/trunk/templates/forum/thread/edit.tt =================================================================== --- /veekun/trunk/templates/forum/thread/edit.tt (revision 326) +++ /veekun/trunk/templates/forum/thread/edit.tt (revision 406) @@ -5,9 +5,9 @@
[% user.name %]
-
[% user.customtitle %]
+
[% user.custom_title %]
- Posts: [% user.postct %] - [% INCLUDE postbar posts=user.postct %] + Posts: [% user.post_count %] + [% INCLUDE postbar posts=user.post_count %]
@@ -16,6 +16,6 @@
-
- [%+ post.message | bbcode | indent(8) %] +
+ [%+ post.content | bbcode | indent(8) %]
[% user.signature | bbcode %]
@@ -23,14 +23,14 @@
-[% IF c.req.params.message %] +[% IF c.req.params.content %]

Edit preview

[% user.name %]
-
[% user.customtitle %]
+
[% user.custom_title %]
- Posts: [% user.postct %] - [% INCLUDE postbar posts=user.postct %] + Posts: [% user.post_count %] + [% INCLUDE postbar posts=user.post_count %]
@@ -39,7 +39,7 @@
-
- [%+ c.req.params.message | bbcode | indent(8) %] -
+
+ [%+ c.req.params.content | bbcode | indent(8) %] +
[% user.signature | bbcode %]
Index: /veekun/trunk/templates/forum/thread/edits.tt =================================================================== --- /veekun/trunk/templates/forum/thread/edits.tt (revision 327) +++ /veekun/trunk/templates/forum/thread/edits.tt (revision 406) @@ -11,9 +11,9 @@
[% post.user.name %]
-
[% post.user.customtitle %]
+
[% post.user.custom_title %]
- Posts: [% post.user.postct %] - [% INCLUDE postbar posts=post.user.postct %] + Posts: [% post.user.post_count %] + [% INCLUDE postbar posts=post.user.post_count %]
@@ -23,5 +23,5 @@
- [%+ edit.oldmessage | bbcode | indent(8) %] + [%+ edit.old_content | bbcode | indent(8) %]
[% post.user.signature | bbcode %]
Index: /veekun/trunk/templates/forum/common.tt =================================================================== --- /veekun/trunk/templates/forum/common.tt (revision 386) +++ /veekun/trunk/templates/forum/common.tt (revision 406) @@ -34,5 +34,5 @@ [% END %] [% END %] - [% '
' IF style == 2 %]Send private message [% 'PM
not yet' IF style == 2 %] + [% '
' IF style == 2 %]Send private message [% 'PM
not yet' IF style == 2 %] [% END %] @@ -44,5 +44,5 @@

[% IF form.exists('subject'); ''; END %]

[% IF form.exists('blurb'); ''; END %]

-

[% form.get_tag('id') %][% IF form.exists('message'); form.get_tag('message'); END %]

+

[% form.get_tag('id') %][% IF form.exists('content'); form.get_tag('content'); END %]

@@ -53,6 +53,6 @@ [% BLOCK post_buttons -%][%# post, thread, forum %] [% is_deleted = post.flags.match('deleted') %] -[% IF c.can_i("postedit", post) OR post.userid == c.user.obj.id; can_edit = 1; END %] -[% IF c.can_i("postdelete", post) OR (post.userid == c.user.obj.id AND post.id == thread.lastpostid); can_delete = 1; END %] +[% IF c.can_i("postedit", post) OR post.user_id == c.user.obj.id; can_edit = 1; END %] +[% IF c.can_i("postdelete", post) OR (post.user_id == c.user.obj.id AND post.id == thread.last_post_id); can_delete = 1; END %] [% IF c.can_i("postnuke"); can_nuke = 1; END %] [% RETURN UNLESS can_edit || can_delete || can_nuke %] @@ -93,5 +93,5 @@
- This post by [% post.user.name %] has been deleted. + This post by [% post.user.name %] has been deleted. [% IF c.can_i("postdelete", post) %] Restore it? Or read it? @@ -103,11 +103,11 @@
[% groups = post.user.groups.split(' '); primary_group = groups.shift %] -
[% UserGroups.$primary_group.name %] [% post.user.name %]
-
[% post.user.customtitle %][% ELSE %]">[% UserGroups.$primary_group.name %][% END %]
+
[% UserGroups.$primary_group.name %] [% post.user.name %]
+
[% post.user.custom_title %][% ELSE %]">[% UserGroups.$primary_group.name %][% END %]
[% IF post.user.is_dumb %]PSA: THIS USER IS DUMB[% END %][% IF post.user.avatar %][% ELSE %]No avatar[% END %]
- [%# postrank(post.user.postct) %] - Posts: [% post.user.postct %] - [% INCLUDE postbar posts=post.user.postct %] + [%# postrank(post.user.post_count) %] + Posts: [% post.user.post_count %] + [% INCLUDE postbar posts=post.user.post_count %]
@@ -124,6 +124,6 @@
-[% IF post.newspic %] - [% post.name %]'s newspic +[% IF post.news_pic %] + [% post.name %]'s news pic [% END %] [% IF post.lastedit %] @@ -131,5 +131,5 @@ [% END %]
-[%+ post.message | bbcode | indent(12) %] +[%+ post.content | bbcode | indent(12) %]
[% IF post.user.signature %] @@ -172,14 +172,14 @@ [% IF show_forum %] -
in forum "[% thread.forum.name %]"
-[% END %] - -
- +
in forum "[% thread.forum.name %]"
+[% END %] + + + @@ -188,6 +188,6 @@ [% END -%] -[% BLOCK threads_message %][%# message -%] - +[% BLOCK threads_message %][%# content -%] + [% END -%] @@ -222,9 +222,9 @@ - + +[% BLOCK forums_message %][%# content -%] + [% END %] Index: /veekun/trunk/templates/fatal.tt =================================================================== --- /veekun/trunk/templates/fatal.tt (revision 245) +++ /veekun/trunk/templates/fatal.tt (revision 406) @@ -19,5 +19,5 @@
time
[% time %]
-
userid +
user_id
[% c.user ? c.user.obj.id : 0 %]
ip Index: /veekun/trunk/templates/index.tt =================================================================== --- /veekun/trunk/templates/index.tt (revision 325) +++ /veekun/trunk/templates/index.tt (revision 406) @@ -31,9 +31,9 @@ [% WHILE (t = recent_news.next) %]
- [% IF t.firstpost.user.newspic %][% t.firstpost.user.name %][% ELSE; t.firstpost.user.name; END %] -
[% format_date(t.firstpost.time) %]
+ [% IF t.first_post.user.news_pic %][% t.first_post.user.name %][% ELSE; t.first_post.user.name; END %] +
[% format_date(t.first_post.time) %]
[% t.subject %]
-
[% t.firstpost.message | bbcode %]
- View thread or post a comment ([% t.postct - 1 %] so far) +
[% t.first_post.content | bbcode %]
+ View thread or post a comment ([% t.post_count - 1 %] so far)
[% END %] @@ -50,7 +50,7 @@
- - - + + + [% color = 3 - color%] @@ -67,6 +67,6 @@ [% last_user = 0 %] [% WHILE (u = recent_users.next) %] -[% IF NOT done_user_sep AND last_user AND last_user.lastactive < now - 600; done_user_sep = 1 %] | [% END %] -[% u.name %] +[% IF NOT done_user_sep AND last_user AND last_user.time_active < now - 600; done_user_sep = 1 %] | [% END %] +[% u.name %] [% last_user = u %] [% END %] @@ -91,10 +91,10 @@ [% s.time | date %] [% END %] -[% IF s.userid %] - [% s.name %][% '*' UNLESS s.name == s.user.name %] +[% IF s.user_id %] + [% s.name %][% '*' UNLESS s.name == s.user.name %] [% ELSE %] [% s.name %] [% END %] -
[% s.message | html | html_line_break %]
+
[% s.content | html | html_line_break %]
[% END %] @@ -105,5 +105,5 @@ [% IF 1 OR allowed('shoutbox.post') %] -

[% shoutbox_form.get_tag('message') %]

+

[% shoutbox_form.get_tag('content') %]

[% nonstat_names.$nonstat %]:between [% form.get_tag("${nonstat}_lb") %] and [% form.get_tag("${nonstat}_ub") %]
[% moveid %][% move_id %]
[% berry.sour || '' %] [% berry.smoothness %][% polish_desc(c, berry.item.dpblurb, berry.item.name) %][% polish_desc(c, berry.item.blurb_dp, berry.item.name) %]
[% abil.id %] [% abil.name %] [% polish_desc(c, abil.effect) %] [% polish_desc(c, abil.description) %] [% abil.get_column('pokemon_count') %]
[% poke.id %]
[% Icons.${Generations.${tm.generation}.abbr} %]
-[% IF node.id != this.real_id %] [% END %] +[% IF node.id != this.real_pokemon_id %] [% END %] [% node.id %] - [% PokemonNames.${node.id} %] + [% PokemonNames.${node.id} %] [% node.blurb %] -[% '' IF node.id != this.real_id %] +[% '' IF node.id != this.real_pokemon_id %] [% move.versions.$ver ? ( move.versions.$ver == 1 ? '--' : move.versions.$ver ) : '' %]
Egg moves [% IF moves.machine.size %](Pokémon can also inherit any TMs they are compatible with)[% END %]
ChainsChains [% Icons.dp IF move.versions.dp %]
Tutored moves
[% Icons.dp IF move.versions.dp %]
Miscellaneous moves
[% move.method %]
TMs and HMs
[% IF move.versions.dp %]Chains[% END %][% IF move.versions.dp %]Chains[% END %] [% IF move.versions.$ver; tm_short_name(MoveTMs.$moveid.${machine_versions.$ver}); END %] [% IF move.versions.$ver; tm_short_name(MoveTMs.$move_id.${machine_versions.$ver}); END %]
[% MoveData.$moveid.name %] [% MoveData.$move_id.name %] ?????[% type_name(type) %] [% MoveData.$moveid.class %] [% MoveData.$moveid.pp %] [% power %] [% MoveData.$moveid.acc %]% [% MoveData.$moveid.priority || '' %] [% MoveData.$moveid.blurb %] [% MoveData.$move_id.class %] [% MoveData.$move_id.pp %] [% power %] [% MoveData.$move_id.accuracy %]% [% MoveData.$move_id.priority || '' %] [% MoveData.$move_id.blurb %] [% MoveData.$moveid.name %] [% move.contype %] [% MoveData.$move_id.name %] [% move.contest_type %] [% move.contest.appeal %] @@ -85,5 +85,5 @@ [% type_name(pokemon.type2) IF pokemon.type2 %] [% gender_text(pokemon.gender, 1) %][% gender_text(pokemon.gender_rate, 1) %] [% FOREACH b IN pokemon.breeds %] Index: /veekun/trunk/templates/shoutbox.tt =================================================================== --- /veekun/trunk/templates/shoutbox.tt (revision 283) +++ /veekun/trunk/templates/shoutbox.tt (revision 406) @@ -16,5 +16,5 @@ IP UserShoutShoutActions[% can_ip ? inet_ntoa(s.ip) : tripcode(s.ip) %] -[% IF s.userid %] - [% s.name %][% '*' UNLESS s.name == s.user.name %] +[% IF s.user_id %] + [% s.name %][% '*' UNLESS s.name == s.user.name %] [% ELSE %] [% s.name %] [% END %] -[% s.message | html | html_line_break | indent(8) %] + +[% s.content | html | html_line_break | indent(8) %] Contact Info - [%# sorting, add again later, or completely remove? %] + [%# sorting, add again later, or completely remove? %] Join Date [% user.name %] [% INCLUDE contact_icons users=user %][% user.joindate | date %][% user.time_joined | date %] -[% IF time - user.lastactive <= 900 %]Active[% ELSE %][% time - user.lastactive | timespan %][% END %] +[% IF time - user.time_active <= 900 %]Active[% ELSE %][% time - user.time_active | timespan %][% END %]
- [% INCLUDE postbar posts=user.postct %] - Posts: [% user.postct %] - [% postrank(user.postct) %] + [% INCLUDE postbar posts=user.post_count %] + Posts: [% user.post_count %] + [% postrank(user.post_count) %]
[% thread.firstpost.user.name %] [% thread.firstpost.time | date %][%# this is stupid fix it lati, but if all posts are deleted this will show -1 %][% IF thread.postct > 0; thread.postct - 1; ELSE; thread.postct; END %][% thread.hitct %][% thread.firstpost.user.name %] [% thread.firstpost.time | date %][%# this is stupid fix it lati, but if all posts are deleted this will show -1 %][% IF thread.post_count > 0; thread.post_count - 1; ELSE; thread.post_count; END %][% thread.view_count %] -[% IF thread.postct <= 1 -%] +[% IF thread.post_count <= 1 -%] - [% ELSE %] -[% thread.lastpost.user.name %] [% thread.lastpost.time | date %] +[% thread.lastpost.user.name %] [% thread.lastpost.time | date %] [% END -%]
[% message %]
[% content %]
[% forum.threadct %][% forum.postct %][% forum.thread_count %][% forum.post_count %] -[% IF forum.lastpostid %] +[% IF forum.last_post_id %] [% IF 25 < forum.lastpost.thread.subject.length; subject = last_thread.subject.substr(0, 22) _ '...'; ELSE; subject = forum.lastpost.thread.subject; END -%] -[% subject %] [% forum.lastpost.user.name %] [% forum.lastpost.time | date %] +[% subject %] [% forum.lastpost.user.name %] [% forum.lastpost.time | date %] [% ELSE %] (no posts) @@ -235,6 +235,6 @@ [% END %] -[% BLOCK forums_message %][%# message -%] -
[% message %]
[% content %]
[% IF is_unread(t) %]Unread posts[% END %][% t.subject %][% t.lastpost.user.name %][% t.lastpost.time | date %][% t.subject %][% t.last_post.user.name %][% t.last_post.time | date %]